mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-14 04:33:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

[graphics] tie generic (#1341)

Browse Source 
* [gtie] tie inst and proto functions

* first chain input to generic ee looks good

* m

* works

* ugh

* add tie generic

* rm debug print

* rm generic ties from fr3
This commit is contained in:
water111
2022-04-29 23:44:53 -04:00
committed by GitHub
parent 08d701bb26
commit a51536de8d
26 changed files with 5513 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/graphics/opengl_renderer/foreground/Generic2_Build.cpp
+16 -7
View File
@@ -108,16 +108,25 @@ void Generic2::determine_draw_modes() {
u64 bonus_adgif_data[4];
memcpy(bonus_adgif_data, frag.header + (5 * 16), 4 * sizeof(u64));
// ADGIF 5
ASSERT((u8)bonus_adgif_data[1] == (u8)(GsRegisterAddress::TEST_1));
u64 final_test = bonus_adgif_data[0];
// ADGIF 6
if ((u8)bonus_adgif_data[3] == (u8)(GsRegisterAddress::ALPHA_1)) {
final_alpha = bonus_adgif_data[2];
} else {
u64 final_test;
if ((u8)bonus_adgif_data[1] == (u8)(GsRegisterAddress::ALPHA_1)) {
ASSERT((u8)bonus_adgif_data[1] == (u8)(GsRegisterAddress::ALPHA_1));
final_alpha = bonus_adgif_data[0];
ASSERT((u8)bonus_adgif_data[3] == (u8)(GsRegisterAddress::TEST_1));
final_test = bonus_adgif_data[2];
} else {
// ADGIF 5
ASSERT((u8)bonus_adgif_data[1] == (u8)(GsRegisterAddress::TEST_1));
final_test = bonus_adgif_data[0];
// ADGIF 6
if ((u8)bonus_adgif_data[3] == (u8)(GsRegisterAddress::ALPHA_1)) {
final_alpha = bonus_adgif_data[2];
} else {
ASSERT((u8)bonus_adgif_data[3] == (u8)(GsRegisterAddress::TEST_1));
final_test = bonus_adgif_data[2];
}
}
if (final_alpha) {
game/graphics/opengl_renderer/shaders/collision.vert
+1 -1
View File
@@ -58,7 +58,7 @@ void main() {
// color
if (mode == 0) {
fragment_color = vec4(0.4, 0.5, 0.5, 1);
fragment_color = vec4((normal_in + 1)*.5, 1);
fragment_color.xyz *= (pow(cam_dot, 3) + 0.3);
} else {
fragment_color = vec4(0.0, 0.3, 0.3, 1);