Kaydet (Commit) 3fbaec05 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

let us not implement this large constructor in the header file

Change-Id: I271882d8cba0201b6aa63308e502509b3c2ac170
üst 36943e98
...@@ -247,42 +247,8 @@ private: ...@@ -247,42 +247,8 @@ private:
GLint m_RenderVertexID; GLint m_RenderVertexID;
GLint m_RenderTexCoordID; GLint m_RenderTexCoordID;
ShaderResources() ShaderResources();
: m_3DProID(0) ~ShaderResources();
, m_3DProjectionID(0)
, m_3DViewID(0)
, m_3DModelID(0)
, m_3DNormalMatrixID(0)
, m_3DVertexID(0)
, m_3DNormalID(0)
, m_TextProID(0)
, m_TextMatrixID(0)
, m_TextVertexID(0)
, m_TextTexCoordID(0)
, m_TextTexID(0)
, m_ScreenTextProID(0)
, m_ScreenTextVertexID(0)
, m_ScreenTextTexCoordID(0)
, m_ScreenTextTexID(0)
, m_CommonProID(0)
, m_2DVertexID(0)
, m_2DColorID(0)
, m_MatrixID(0)
, m_RenderProID(0)
, m_RenderTexID(0)
, m_RenderVertexID(0)
, m_RenderTexCoordID(0)
{
}
~ShaderResources()
{
glDeleteProgram(m_CommonProID);
glDeleteProgram(m_RenderProID);
glDeleteProgram(m_TextProID);
glDeleteProgram(m_ScreenTextProID);
glDeleteProgram(m_3DProID);
}
void LoadShaders(); void LoadShaders();
}; };
...@@ -295,18 +261,8 @@ private: ...@@ -295,18 +261,8 @@ private:
GLint m_2DColorID; GLint m_2DColorID;
GLint m_MatrixID; GLint m_MatrixID;
PickingShaderResources() PickingShaderResources();
: m_CommonProID(0) ~PickingShaderResources();
, m_2DVertexID(0)
, m_2DColorID(0)
, m_MatrixID(0)
{
}
~PickingShaderResources()
{
glDeleteProgram(m_CommonProID);
}
void LoadShaders(); void LoadShaders();
}; };
......
...@@ -107,6 +107,43 @@ OpenGL3DRenderer::~OpenGL3DRenderer() ...@@ -107,6 +107,43 @@ OpenGL3DRenderer::~OpenGL3DRenderer()
glDeleteRenderbuffers(1, &mnPickingRboColor); glDeleteRenderbuffers(1, &mnPickingRboColor);
} }
OpenGL3DRenderer::ShaderResources::ShaderResources()
: m_3DProID(0)
, m_3DProjectionID(0)
, m_3DViewID(0)
, m_3DModelID(0)
, m_3DNormalMatrixID(0)
, m_3DVertexID(0)
, m_3DNormalID(0)
, m_TextProID(0)
, m_TextMatrixID(0)
, m_TextVertexID(0)
, m_TextTexCoordID(0)
, m_TextTexID(0)
, m_ScreenTextProID(0)
, m_ScreenTextVertexID(0)
, m_ScreenTextTexCoordID(0)
, m_ScreenTextTexID(0)
, m_CommonProID(0)
, m_2DVertexID(0)
, m_2DColorID(0)
, m_MatrixID(0)
, m_RenderProID(0)
, m_RenderTexID(0)
, m_RenderVertexID(0)
, m_RenderTexCoordID(0)
{
}
OpenGL3DRenderer::ShaderResources::~ShaderResources()
{
glDeleteProgram(m_CommonProID);
glDeleteProgram(m_RenderProID);
glDeleteProgram(m_TextProID);
glDeleteProgram(m_ScreenTextProID);
glDeleteProgram(m_3DProID);
}
void OpenGL3DRenderer::ShaderResources::LoadShaders() void OpenGL3DRenderer::ShaderResources::LoadShaders()
{ {
m_3DProID = OpenGLHelper::LoadShaders("shape3DVertexShader", "shape3DFragmentShader"); m_3DProID = OpenGLHelper::LoadShaders("shape3DVertexShader", "shape3DFragmentShader");
...@@ -140,6 +177,19 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders() ...@@ -140,6 +177,19 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()
CHECK_GL_ERROR(); CHECK_GL_ERROR();
} }
OpenGL3DRenderer::PickingShaderResources::PickingShaderResources()
: m_CommonProID(0)
, m_2DVertexID(0)
, m_2DColorID(0)
, m_MatrixID(0)
{
}
OpenGL3DRenderer::PickingShaderResources::~PickingShaderResources()
{
glDeleteProgram(m_CommonProID);
}
void OpenGL3DRenderer::PickingShaderResources::LoadShaders() void OpenGL3DRenderer::PickingShaderResources::LoadShaders()
{ {
m_CommonProID = OpenGLHelper::LoadShaders("pickingVertexShader", "pickingFragmentShader"); m_CommonProID = OpenGLHelper::LoadShaders("pickingVertexShader", "pickingFragmentShader");
......
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