RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 03:07:36 +00:00
Code Issues Activity Actions

LibGL: Keep track of active matrix and stack

Browse source 
This simplifies a lot of code in `GLContext` and prevents potential
errors when testing against the current matrix mode.
This commit is contained in:
Jelle Raaijmakers 2022-03-10 10:38:22 +01:00 • committed by Andreas Kling
parent 5d0a64bfde
commit 2ac415f728
2 changed files with 47 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibGL/GLContext.h
View file

@ -196,15 +196,17 @@ private:
[[nodiscard]] bool should_execute_after_appending_to_listing() const { return m_current_listing_index.has_value() && m_current_listing_index->mode == GL_COMPILE_AND_EXECUTE; }
GLenum m_current_draw_mode;
GLenum m_current_matrix_mode;
FloatMatrix4x4 m_projection_matrix = FloatMatrix4x4::identity();
FloatMatrix4x4 m_model_view_matrix = FloatMatrix4x4::identity();
FloatMatrix4x4 m_texture_matrix = FloatMatrix4x4::identity();
GLenum m_current_matrix_mode { GL_MODELVIEW };
FloatMatrix4x4 m_projection_matrix { FloatMatrix4x4::identity() };
FloatMatrix4x4 m_model_view_matrix { FloatMatrix4x4::identity() };
FloatMatrix4x4 m_texture_matrix { FloatMatrix4x4::identity() };
FloatMatrix4x4* m_current_matrix { &m_model_view_matrix };
Vector<FloatMatrix4x4> m_projection_matrix_stack;
Vector<FloatMatrix4x4> m_model_view_matrix_stack;
// FIXME: implement multi-texturing: the texture matrix stack should live inside a texture unit
Vector<FloatMatrix4x4> m_texture_matrix_stack;
Vector<FloatMatrix4x4>* m_current_matrix_stack { &m_model_view_matrix_stack };
Gfx::IntRect m_viewport;