Skip to content

Commit

Permalink
ofMatrixStack.h - fix [-Wreorder-ctor] warning (#6877)
Browse files Browse the repository at this point in the history
#changelog #math
  • Loading branch information
dimitre authored May 24, 2022
1 parent a07ad81 commit 9e8d3f5
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions libs/openFrameworks/utils/ofMatrixStack.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ class ofMatrixStack {

ofMatrixMode currentMatrixMode;

glm::mat4 * currentMatrix;
bool flipRenderSurfaceMatrix;
glm::mat4 modelMatrix;
glm::mat4 viewMatrix;
glm::mat4 viewInverse;
Expand All @@ -96,15 +98,12 @@ class ofMatrixStack {
glm::mat4 orientationMatrix;
glm::mat4 orientationMatrixInverse;

glm::mat4 * currentMatrix;

std::stack <ofRectangle> viewportHistory;
std::stack <glm::mat4> viewMatrixStack;
std::stack <glm::mat4> modelViewMatrixStack;
std::stack <glm::mat4> projectionMatrixStack;
std::stack <glm::mat4> textureMatrixStack;
std::stack <std::pair<ofOrientation,bool> > orientationStack;
bool flipRenderSurfaceMatrix;

int getRenderSurfaceWidth() const;
int getRenderSurfaceHeight() const;
Expand Down

0 comments on commit 9e8d3f5

Please sign in to comment.