thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-07-12 17:31:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Get first done

Browse source
This commit is contained in:
EmeraldLoc 2026-06-19 16:08:44 -05:00
parent 450a72e7c4
commit 82360f44d9
4 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/pc/gfx/gfx.h
View file

@ -4,6 +4,9 @@
#include <math.h>
#include <assert.h>
#include "types.h"
#include "macros.h"
#define SUPPORT_CHECK(x) assert(x)
// SCALE_M_N: upscale/downscale M-bit integer to N-bit
@ -42,9 +45,9 @@ struct Box {
struct GfxVertex {
float x, y, z, w;
float clipW;
float u, v;
struct RGBA color;
ALIGNED16 Mat4 MP_matrix;
uint8_t fog_z;
uint8_t clip_rej;
uint8_t world_geometry;

1
src/pc/gfx/gfx_opengl.c
View file

@ -715,6 +715,7 @@ static void gfx_opengl_set_use_alpha(bool use_alpha) {
static void gfx_opengl_draw_triangles(float buf_vbo[], size_t buf_vbo_len, size_t buf_vbo_num_tris) {
//printf("flushing %d tris\n", buf_vbo_num_tris);
gfx_opengl_set_shader_uniforms();
glBufferData(GL_ARRAY_BUFFER, sizeof(float) * buf_vbo_len, buf_vbo, GL_STREAM_DRAW);
glDrawArrays(GL_TRIANGLES, 0, 3 * buf_vbo_num_tris);
}

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

@ -92,6 +92,7 @@ static struct RenderingState {
struct Box viewport, scissor;
struct ShaderProgram *shader_program;
struct TextureHashmapNode *textures[2];
ALIGNED16 Mat4 mp_matrix;
} rendering_state;
struct GfxDimensions gfx_current_dimensions = { 0 };
@ -708,10 +709,6 @@ static void gfx_sp_pop_matrix(uint32_t count) {
}
}
static float gfx_adjust_x_for_aspect_ratio(float x) {
return x * gfx_current_dimensions.x_adjust_ratio;
}
static OPTIMIZE_O3 void gfx_local_to_world_space(VEC_OUT Vec3f pos, VEC_OUT Vec3f normal) {
if (!sHasInverseCameraMatrix) { return; }
@ -791,8 +788,6 @@ static void OPTIMIZE_O3 gfx_sp_vertex(size_t n_vertices, size_t dest_index, cons
float w = v->ob[0] * rsp.MP_matrix[0][3] + v->ob[1] * rsp.MP_matrix[1][3] + v->ob[2] * rsp.MP_matrix[2][3] + rsp.MP_matrix[3][3];
#endif
x = gfx_adjust_x_for_aspect_ratio(x);
short U = v->tc[0] * rsp.texture_scaling_factor.s >> 16;
short V = v->tc[1] * rsp.texture_scaling_factor.t >> 16;
@ -991,10 +986,12 @@ static void OPTIMIZE_O3 gfx_sp_vertex(size_t n_vertices, size_t dest_index, cons
if (z < -w) d->clip_rej |= 16;
if (z > w) d->clip_rej |= 32;
d->x = x;
d->y = y;
d->z = z;
d->w = w;
d->x = v->ob[0];
d->y = v->ob[1];
d->z = v->ob[2];
d->w = 1.0;
mtxf_copy(d->MP_matrix, rsp.MP_matrix);
if (rsp.geometry_mode & G_FOG) {
if (fabsf(w) < 0.001f) {
@ -1031,7 +1028,7 @@ static void OPTIMIZE_O3 gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t
struct GfxVertex *v3 = &rsp.loaded_vertices[vtx3_idx];
struct GfxVertex *v_arr[3] = {v1, v2, v3};
if (v1->clip_rej & v2->clip_rej & v3->clip_rej && gCullingEnabled) {
/*if (v1->clip_rej & v2->clip_rej & v3->clip_rej && gCullingEnabled) {
// The whole triangle lies outside the visible area
return;
}
@ -1067,7 +1064,7 @@ static void OPTIMIZE_O3 gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t
// this is needed because of the mirror room... some custom models will set/clear cull values resulting in cull both
break;
}
}
}*/
bool depth_test = (rsp.geometry_mode & G_ZBUFFER) == G_ZBUFFER;
if (depth_test != rendering_state.depth_test) {
@ -1090,6 +1087,11 @@ static void OPTIMIZE_O3 gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t
rendering_state.decal_mode = zmode_decal;
}
if (memcmp(v1->MP_matrix, rendering_state.mp_matrix, sizeof(rendering_state.mp_matrix)) != 0) {
gfx_flush();
mtxf_copy(rendering_state.mp_matrix, v1->MP_matrix);
}
if (rdp.viewport_or_scissor_changed) {
static uint32_t x_adjust_4by3_prev;
if (memcmp(&rdp.viewport, &rendering_state.viewport, sizeof(rdp.viewport)) != 0
@ -1622,14 +1624,16 @@ static void gfx_draw_rectangle(int32_t ulx, int32_t uly, int32_t lrx, int32_t lr
lrxf = lrxf / (4.0f * HALF_SCREEN_WIDTH) - 1.0f;
lryf = -(lryf / (4.0f * HALF_SCREEN_HEIGHT)) + 1.0f;
ulxf = gfx_adjust_x_for_aspect_ratio(ulxf);
lrxf = gfx_adjust_x_for_aspect_ratio(lrxf);
struct GfxVertex* ul = &rsp.loaded_vertices[MAX_VERTICES + 0];
struct GfxVertex* ll = &rsp.loaded_vertices[MAX_VERTICES + 1];
struct GfxVertex* lr = &rsp.loaded_vertices[MAX_VERTICES + 2];
struct GfxVertex* ur = &rsp.loaded_vertices[MAX_VERTICES + 3];
mtxf_identity(ul->MP_matrix);
mtxf_identity(ll->MP_matrix);
mtxf_identity(lr->MP_matrix);
mtxf_identity(ur->MP_matrix);
ul->x = ulxf;
ul->y = ulyf;
ul->z = -1.0f;
@ -2315,7 +2319,7 @@ void gfx_set_builtin_uniforms(void) {
gfx_rapi->set_uniform(NULL, "uViewMatrix", SHADER_UNIFORM_TYPE_MAT4, (const float *)gInverseCameraMatrix.m, 1);
}
gfx_rapi->set_uniform(NULL, "uModelProjectionMatrix", SHADER_UNIFORM_TYPE_MAT4, rsp.MP_matrix, 1);
gfx_rapi->set_uniform(NULL, "uModelProjectionMatrix", SHADER_UNIFORM_TYPE_MAT4, rendering_state.mp_matrix, 1);
gfx_rapi->set_uniform(NULL, "uProjectionMatrix", SHADER_UNIFORM_TYPE_MAT4, rsp.P_matrix, 1);
Mat4 invProjectionMatrix;

11
src/pc/gfx/gfx_shader.c
View file

@ -188,6 +188,12 @@ char *gfx_generate_default_vertex_shader_from_cc(struct ColorCombiner *cc) {
append_line(vs_buf, &vs_len, "out vec3 vNormal;");
append_line(vs_buf, &vs_len, "in vec3 aBarycentric;");
append_line(vs_buf, &vs_len, "out vec3 vBarycentric;");
append_line(vs_buf, &vs_len, "uniform mat4 uModelProjectionMatrix;");
append_line(vs_buf, &vs_len, "uniform mat4 uModelViewMatrix;");
append_line(vs_buf, &vs_len, "uniform mat4 uModelMatrix;");
append_line(vs_buf, &vs_len, "uniform mat4 uViewMatrix;");
append_line(vs_buf, &vs_len, "uniform mat4 uProjectionMatrix;");
append_line(vs_buf, &vs_len, "uniform float uXAdjustRatio;");
append_line(vs_buf, &vs_len, "void main() {");
for (int t = 0; t < 2; t++) {
vs_len += sprintf(vs_buf + vs_len, "vTexCoord%d = aTexCoord%d;\n", t, t);
@ -199,7 +205,10 @@ char *gfx_generate_default_vertex_shader_from_cc(struct ColorCombiner *cc) {
}
append_line(vs_buf, &vs_len, "vNormal = aNormal;");
append_line(vs_buf, &vs_len, "vBarycentric = aBarycentric;");
append_line(vs_buf, &vs_len, "gl_Position = aVtxPos;");
append_line(vs_buf, &vs_len, "vec4 objectPos = aVtxPos;");
append_line(vs_buf, &vs_len, "vec4 clipPos = uModelProjectionMatrix * objectPos;");
append_line(vs_buf, &vs_len, "clipPos.x *= uXAdjustRatio;");
append_line(vs_buf, &vs_len, "gl_Position = clipPos;");
append_line(vs_buf, &vs_len, "}");
vs_buf[vs_len] = '\0';