thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix packed normals (#797)

Browse source 
* Fix packed normals

* Clear packed normals on obj_sanitize_gfx

* Isaac review

* Peachy review
This commit is contained in:
ManIsCat2 2025-05-10 02:47:26 +03:30 • committed by GitHub
parent 2e7cc82c46
commit 10154b75d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/rendering_graph_node.c
View file

@ -70,7 +70,7 @@ Mtx sPrevCamTranf, sCurrCamTranf = {
}; };
static Gfx obj_sanitize_gfx[] = { static Gfx obj_sanitize_gfx[] = {
gsSPClearGeometryMode(G_TEXTURE_GEN), gsSPClearGeometryMode(G_TEXTURE_GEN | G_PACKED_NORMALS_EXT),
gsSPSetGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_LIGHTING),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPTexture(0xFFFF, 0xFFFF, 0, 0, G_OFF), gsSPTexture(0xFFFF, 0xFFFF, 0, 0, G_OFF),

68
src/pc/gfx/gfx_pc.c
View file

@ -842,38 +842,36 @@ static void OPTIMIZE_O3 gfx_sp_vertex(size_t n_vertices, size_t dest_index, cons
float g = rsp.current_lights[rsp.current_num_lights - 1].col[1] * globalLightCached[1][1]; float g = rsp.current_lights[rsp.current_num_lights - 1].col[1] * globalLightCached[1][1];
float b = rsp.current_lights[rsp.current_num_lights - 1].col[2] * globalLightCached[1][2]; float b = rsp.current_lights[rsp.current_num_lights - 1].col[2] * globalLightCached[1][2];
signed char nx = vn->n[0];
signed char ny = vn->n[1];
signed char nz = vn->n[2];
if (rsp.geometry_mode & G_PACKED_NORMALS_EXT) {
unsigned short packedNormal = vn->flag;
int xo = packedNormal >> 8;
int yo = packedNormal & 0xFF;
nx = xo & 0x7F;
ny = yo & 0x7F;
nz = (nx + ny) ^ 0x7F;
if (nz & 0x80) {
nx ^= 0x7F;
ny ^= 0x7F;
}
nx = (xo & 0x80) ? -nx : nx;
ny = (yo & 0x80) ? -ny : ny;
SUPPORT_CHECK(absi(nx) + absi(ny) + absi(nz) == 127);
}
for (int32_t i = 0; i < rsp.current_num_lights - 1; i++) { for (int32_t i = 0; i < rsp.current_num_lights - 1; i++) {
float intensity = 0; float intensity = 0;
if (rsp.geometry_mode & G_PACKED_NORMALS_EXT) {
// original f3dex3 algorithm translated to c (from fast64 source code)
unsigned short packedNormal = vn->flag;
int xo = packedNormal >> 8;
int yo = packedNormal & 0xFF;
int x = xo & 0x7F;
int y = yo & 0x7F;
int z = x + y;
int x2 = x ^ 0x7F;
int y2 = y ^ 0x7F;
z = z ^ 0x7F;
if (z & 0x80) {
x = x2;
y = y2;
}
x = (xo & 0x80) ? -x : x; intensity += nx * rsp.current_lights_coeffs[i][0];
y = (yo & 0x80) ? -y : y; intensity += ny * rsp.current_lights_coeffs[i][1];
z = (z & 0x80) ? (z - 0x100) : z; intensity += nz * rsp.current_lights_coeffs[i][2];
SUPPORT_CHECK(absi(x) + absi(y) + absi(z) == 127);
intensity += x * rsp.current_lights_coeffs[i][0];
intensity += y * rsp.current_lights_coeffs[i][1];
intensity += z * rsp.current_lights_coeffs[i][2];
} else {
intensity += vn->n[0] * rsp.current_lights_coeffs[i][0];
intensity += vn->n[1] * rsp.current_lights_coeffs[i][1];
intensity += vn->n[2] * rsp.current_lights_coeffs[i][2];
}
intensity /= 127.0f; intensity /= 127.0f;
if (intensity > 0.0f) { if (intensity > 0.0f) {
@ -904,12 +902,12 @@ static void OPTIMIZE_O3 gfx_sp_vertex(size_t n_vertices, size_t dest_index, cons
if (rsp.geometry_mode & G_TEXTURE_GEN) { if (rsp.geometry_mode & G_TEXTURE_GEN) {
float dotx = 0, doty = 0; float dotx = 0, doty = 0;
dotx += vn->n[0] * rsp.current_lookat_coeffs[0][0]; dotx += nx * rsp.current_lookat_coeffs[0][0];
dotx += vn->n[1] * rsp.current_lookat_coeffs[0][1]; dotx += ny * rsp.current_lookat_coeffs[0][1];
dotx += vn->n[2] * rsp.current_lookat_coeffs[0][2]; dotx += nz * rsp.current_lookat_coeffs[0][2];
doty += vn->n[0] * rsp.current_lookat_coeffs[1][0]; doty += nx * rsp.current_lookat_coeffs[1][0];
doty += vn->n[1] * rsp.current_lookat_coeffs[1][1]; doty += ny * rsp.current_lookat_coeffs[1][1];
doty += vn->n[2] * rsp.current_lookat_coeffs[1][2]; doty += nz * rsp.current_lookat_coeffs[1][2];
U = (int32_t)((dotx / 127.0f + 1.0f) / 4.0f * rsp.texture_scaling_factor.s); U = (int32_t)((dotx / 127.0f + 1.0f) / 4.0f * rsp.texture_scaling_factor.s);
V = (int32_t)((doty / 127.0f + 1.0f) / 4.0f * rsp.texture_scaling_factor.t); V = (int32_t)((doty / 127.0f + 1.0f) / 4.0f * rsp.texture_scaling_factor.t);