Kaydet (Commit) 720f3878 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

initialize variables in initializer list

Change-Id: I1526d40c28a33cd29074adcc8c8d182f92996914
üst 93268d37
...@@ -117,6 +117,10 @@ struct CameraInfo ...@@ -117,6 +117,10 @@ struct CameraInfo
glm::vec3 cameraPos; glm::vec3 cameraPos;
glm::vec3 cameraOrg; glm::vec3 cameraOrg;
glm::vec3 cameraUp; glm::vec3 cameraUp;
CameraInfo():
useDefault(true),
cameraUp(glm::vec3(0, 1, 0)) {}
}; };
struct CoordinateAxisInfo struct CoordinateAxisInfo
...@@ -161,6 +165,14 @@ struct SceneBox ...@@ -161,6 +165,14 @@ struct SceneBox
float minYCoord; float minYCoord;
float maxZCoord; float maxZCoord;
float minZCoord; float minZCoord;
SceneBox():
maxXCoord(-1*FLT_MAX),
minXCoord(FLT_MAX),
maxYCoord(-1*FLT_MAX),
minYCoord(FLT_MAX),
maxZCoord(-1*FLT_MAX),
minZCoord(FLT_MAX) {}
}; };
......
...@@ -66,12 +66,16 @@ GLfloat texCoords[] = { ...@@ -66,12 +66,16 @@ GLfloat texCoords[] = {
OpenGL3DRenderer::OpenGL3DRenderer(): OpenGL3DRenderer::OpenGL3DRenderer():
m_TranslationMatrix(glm::translate(m_Model, glm::vec3(0.0f, 0.0f, 0.0f))) m_TranslationMatrix(glm::translate(m_Model, glm::vec3(0.0f, 0.0f, 0.0f)))
, m_bCameraUpdated(false)
, m_TextProID(0) , m_TextProID(0)
, m_TextMatrixID(0) , m_TextMatrixID(0)
, m_TextVertexID(0) , m_TextVertexID(0)
, m_TextTexCoordID(0) , m_TextTexCoordID(0)
, m_TextTexCoordBuf(0) , m_TextTexCoordBuf(0)
, m_TextTexID(0) , m_TextTexID(0)
, m_uiSelectFrameCounter(0)
, m_fViewAngle(30.0f)
, m_fHeightWeight(1.0f)
{ {
m_Polygon3DInfo.lineOnly = false; m_Polygon3DInfo.lineOnly = false;
m_Polygon3DInfo.twoSidesLighting = false; m_Polygon3DInfo.twoSidesLighting = false;
...@@ -84,19 +88,7 @@ OpenGL3DRenderer::OpenGL3DRenderer(): ...@@ -84,19 +88,7 @@ OpenGL3DRenderer::OpenGL3DRenderer():
m_Extrude3DInfo.twoSidesLighting = false; m_Extrude3DInfo.twoSidesLighting = false;
m_Extrude3DInfo.lineWidth = 0.001f; m_Extrude3DInfo.lineWidth = 0.001f;
m_bCameraUpdated = false;
GetFreq(); GetFreq();
m_fViewAngle = 30.0f;
m_SenceBox.maxXCoord = -1.0 * FLT_MAX;
m_SenceBox.minXCoord = FLT_MAX;
m_SenceBox.maxYCoord = -1.0 * FLT_MAX;
m_SenceBox.minYCoord = FLT_MAX;
m_SenceBox.maxZCoord = -1.0 * FLT_MAX;
m_SenceBox.minZCoord = FLT_MAX;
m_uiSelectFrameCounter = 0;
m_fHeightWeight = 1.0f;
m_CameraInfo.useDefault = true;
m_CameraInfo.cameraUp = glm::vec3(0, 1, 0);
m_RoundBarMesh.iMeshSizes = 0; m_RoundBarMesh.iMeshSizes = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment