Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
3fbaec05
Kaydet (Commit)
3fbaec05
authored
May 25, 2014
tarafından
Markus Mohrhard
Kaydeden (comit)
Markus Mohrhard
May 26, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
let us not implement this large constructor in the header file
Change-Id: I271882d8cba0201b6aa63308e502509b3c2ac170
üst
36943e98
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
48 deletions
+54
-48
GL3DRenderer.hxx
chart2/source/view/inc/GL3DRenderer.hxx
+4
-48
GL3DRenderer.cxx
chart2/source/view/main/GL3DRenderer.cxx
+50
-0
No files found.
chart2/source/view/inc/GL3DRenderer.hxx
Dosyayı görüntüle @
3fbaec05
...
@@ -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
();
};
};
...
...
chart2/source/view/main/GL3DRenderer.cxx
Dosyayı görüntüle @
3fbaec05
...
@@ -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"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment