mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-05 10:57:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

meltdown

Browse Source
This commit is contained in:
ManDude
2022-01-10 19:58:04 +00:00
parent bc8e6b871e
commit f2f52b0986
4 changed files with 45 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/graphics/opengl_renderer/SpriteRenderer.cpp
+40 -44
View File
@@ -30,7 +30,7 @@ u32 process_sprite_chunk_header(DmaFollower& dma) {
}
} // namespace
constexpr int SPRITE_RENDERER_MAX_SPRITES = 48;
constexpr int SPRITE_RENDERER_MAX_SPRITES = 1;
SpriteRenderer::SpriteRenderer(const std::string& name, BucketId my_id)
: BucketRenderer(name, my_id) {
@@ -42,10 +42,11 @@ SpriteRenderer::SpriteRenderer(const std::string& name, BucketId my_id)
m_ogl.vertex_buffer_bytes = m_ogl.vertex_buffer_max_verts * sizeof(SpriteVertex3D);
glBufferData(GL_ARRAY_BUFFER, m_ogl.vertex_buffer_bytes, nullptr, GL_STREAM_DRAW);
glEnableVertexAttribArray(0);
glVertexAttribPointer(0, // location 0 in the shader
4, // 4 floats per vert (w unused)
GL_FLOAT, // floats
GL_TRUE, // normalized, ignored,
glVertexAttribPointer(
0, // location 0 in the shader
4, // 4 floats per vert (w unused)
GL_FLOAT, // floats
GL_TRUE, // normalized, ignored,
sizeof(SpriteVertex3D), //
(void*)offsetof(SpriteVertex3D, xyz_sx) // offset in array (why is this a pointer...)
);
@@ -62,38 +63,30 @@ SpriteRenderer::SpriteRenderer(const std::string& name, BucketId my_id)
glEnableVertexAttribArray(2);
glVertexAttribPointer(
2, // location 0 in the shader
4, // 4 color components
GL_FLOAT, // floats
GL_TRUE, // normalized, ignored,
sizeof(SpriteVertex3D), //
2, // location 0 in the shader
4, // 4 color components
GL_FLOAT, // floats
GL_TRUE, // normalized, ignored,
sizeof(SpriteVertex3D), //
(void*)offsetof(SpriteVertex3D, rgba) // offset in array (why is this a pointer...)
);
glEnableVertexAttribArray(3);
glVertexAttribIPointer(
3, // location 0 in the shader
2, // 4 color components
GL_UNSIGNED_SHORT, // floats
sizeof(SpriteVertex3D), //
3, // location 0 in the shader
2, // 4 color components
GL_UNSIGNED_SHORT, // floats
sizeof(SpriteVertex3D), //
(void*)offsetof(SpriteVertex3D, flags_matrix) // offset in array (why is this a pointer...)
);
glEnableVertexAttribArray(4);
glVertexAttribIPointer(4, // location 0 in the shader
4, // 3 floats per vert
GL_UNSIGNED_BYTE, // floats
sizeof(SpriteVertex3D), //
(void*)offsetof(SpriteVertex3D, vert_id) // offset in array (why is this a pointer...)
);
glEnableVertexAttribArray(5);
glVertexAttribIPointer(
5, // location 0 in the shader
4, // 3 floats per vert
GL_UNSIGNED_BYTE, // floats
sizeof(SpriteVertex3D), //
(void*)offsetof(SpriteVertex3D, tex_info) // offset in array (why is this a pointer...)
4, // location 0 in the shader
4, // 3 floats per vert
GL_UNSIGNED_SHORT, // floats
sizeof(SpriteVertex3D), //
(void*)offsetof(SpriteVertex3D, info) // offset in array (why is this a pointer...)
);
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindVertexArray(0);
@@ -1043,7 +1036,7 @@ void SpriteRenderer::update_gl_texture(SharedRenderState* render_state, int unit
void SpriteRenderer::do_3d_block_cpu(u32 count,
SharedRenderState* render_state,
ScopedProfilerNode& prof) {
fmt::print("3d sprite begin\n");
// fmt::print("3d sprite begin\n");
Matrix4f camera_matrix = m_3d_matrix_data.camera; // vf25, vf26, vf27, vf28
Vector4f hvdf_offset = m_3d_matrix_data.hvdf_offset;
@@ -1095,20 +1088,23 @@ void SpriteRenderer::do_3d_block_cpu(u32 count,
// handle_mip(adgif.mip_data, render_state, prof);
handle_clamp(adgif.clamp_data & 0b111, render_state, prof);
handle_alpha(adgif.alpha_data, render_state, prof);
if (!current_adgif_state()->used) {
*current_adgif_state() = m_adgif_state;
current_adgif_state()->used = true;
} else if (m_adgif_state != *current_adgif_state()) {
/*
if (!m_adgif_state_stack[m_adgif_index].used) {
m_adgif_state_stack[m_adgif_index] = m_adgif_state;
m_adgif_state_stack[m_adgif_index].used = true;
} else if (m_adgif_state != m_adgif_state_stack[m_adgif_index]) {
if (m_adgif_index + 1 == ADGIF_STATE_COUNT ||
!m_adgif_state.nontexture_equal(*current_adgif_state())) {
!m_adgif_state.nontexture_equal(m_adgif_state_stack[m_adgif_index])) {
render_verts(render_state, prof);
} else {
m_adgif_index++;
}
*current_adgif_state() = m_adgif_state;
current_adgif_state()->used = true;
m_adgif_state_stack[m_adgif_index] = m_adgif_state;
m_adgif_state_stack[m_adgif_index].used = true;
}
*/
m_adgif_state_stack[m_adgif_index] = m_adgif_state;
m_adgif_state_stack[m_adgif_index].used = true;
int vert_idx = 6 * m_sprite_offset;
@@ -1117,9 +1113,9 @@ void SpriteRenderer::do_3d_block_cpu(u32 count,
vert1.xyz_sx = m_vec_data_2d[sprite_idx].xyz_sx;
vert1.quat_sy = m_vec_data_2d[sprite_idx].flag_rot_sy;
vert1.rgba = m_vec_data_2d[sprite_idx].rgba / 255;
vert1.tex_info[0] = m_adgif_index;
vert1.tex_info[1] = current_adgif_state()->tcc;
vert1.vert_id = 0;
vert1.info[0] = m_adgif_index;
vert1.info[1] = m_adgif_state_stack[m_adgif_index].tcc;
vert1.info[2] = 0;
m_vertices_3d.at(vert_idx + 1) = vert1;
m_vertices_3d.at(vert_idx + 2) = vert1;
@@ -1127,11 +1123,11 @@ void SpriteRenderer::do_3d_block_cpu(u32 count,
m_vertices_3d.at(vert_idx + 4) = vert1;
m_vertices_3d.at(vert_idx + 5) = vert1;
m_vertices_3d.at(vert_idx + 1).vert_id = 1;
m_vertices_3d.at(vert_idx + 2).vert_id = 2;
m_vertices_3d.at(vert_idx + 3).vert_id = 2;
m_vertices_3d.at(vert_idx + 4).vert_id = 3;
m_vertices_3d.at(vert_idx + 5).vert_id = 0;
m_vertices_3d.at(vert_idx + 1).info[2] = 1;
m_vertices_3d.at(vert_idx + 2).info[2] = 2;
m_vertices_3d.at(vert_idx + 3).info[2] = 2;
m_vertices_3d.at(vert_idx + 4).info[2] = 3;
m_vertices_3d.at(vert_idx + 5).info[2] = 0;
++m_sprite_offset;
game/graphics/opengl_renderer/SpriteRenderer.h
+1 -4
View File
@@ -205,8 +205,7 @@ class SpriteRenderer : public BucketRenderer {
math::Vector4f quat_sy; // quaternion + y scale
math::Vector4f rgba; // color
math::Vector<u16, 4> flags_matrix; // flags + matrix... split
u32 vert_id;
math::Vector<u8, 4> tex_info;
math::Vector<u16, 4> info;
};
static_assert(sizeof(SpriteVertex3D) == 64);
@@ -292,8 +291,6 @@ class SpriteRenderer : public BucketRenderer {
AdGifState m_adgif_state; // temp state
AdGifState* current_adgif_state() { return &m_adgif_state_stack[m_adgif_index]; }
int m_adgif_index = 0;
void update_gl_blend(AdGifState& state);
game/graphics/opengl_renderer/shaders/sprite_3d.frag
+1 -10
View File
@@ -20,15 +20,6 @@ layout (binding = 29) uniform sampler2D tex_T9;
vec4 sample_tex(vec2 coord, uint unit) {
switch (unit) {
case 0: return texture(tex_T0, coord);
case 1: return texture(tex_T1, coord);
case 2: return texture(tex_T2, coord);
case 3: return texture(tex_T3, coord);
case 4: return texture(tex_T4, coord);
case 5: return texture(tex_T5, coord);
case 6: return texture(tex_T6, coord);
case 7: return texture(tex_T7, coord);
case 8: return texture(tex_T8, coord);
case 9: return texture(tex_T9, coord);
default: return vec4(1.0, 0, 1.0, 1.0);
}
}
@@ -36,7 +27,7 @@ vec4 sample_tex(vec2 coord, uint unit) {
void main() {
vec4 T0 = sample_tex(tex_coord.xy / tex_coord.z, tex_info.x);
if (tex_info.y == 0) {
T0.w = 1.0;
// T0.w = 1.0;
}
vec4 tex_color = fragment_color * T0 * 2.0;
if (tex_color.a < 0.016) {
game/graphics/opengl_renderer/shaders/sprite_3d.vert
+3 -3
View File
@@ -4,8 +4,7 @@ layout (location = 0) in vec4 xyz_sx;
layout (location = 1) in vec4 quat_sy;
layout (location = 2) in vec4 rgba;
layout (location = 3) in uvec2 flags_matrix;
layout (location = 4) in uint vert_id;
layout (location = 5) in uvec2 tex_info_in;
layout (location = 4) in uvec4 tex_info_in;
uniform vec4 hvdf_offset;
uniform mat4 camera;
@@ -73,6 +72,7 @@ void main() {
float sy = quat_sy.w;
vec4 quat = vec4(quat_sy.xyz, 1.0);
fragment_color = rgba;
uint vert_id = tex_info_in.z;
// STEP 2
@@ -118,5 +118,5 @@ void main() {
// scissoring area adjust
gl_Position.y *= 512.0/448.0;
tex_info = tex_info_in;
tex_info = tex_info_in.xy;
}