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
38f8f1b7
Kaydet (Commit)
38f8f1b7
authored
Şub 15, 2014
tarafından
Markus Mohrhard
Kaydeden (comit)
Markus Mohrhard
Şub 15, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
remove more unused code
Change-Id: I36ec2e2960072120a064805f171e20703f0508c0
üst
a3dfd7f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
33 deletions
+1
-33
OpenGLRender.cxx
chart2/source/view/main/OpenGLRender.cxx
+1
-20
OpenGLRender.hxx
chart2/source/view/main/OpenGLRender.hxx
+0
-13
No files found.
chart2/source/view/main/OpenGLRender.cxx
Dosyayı görüntüle @
38f8f1b7
...
@@ -281,13 +281,6 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
...
@@ -281,13 +281,6 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
CHECK_GL_ERROR
();
CHECK_GL_ERROR
();
m_RenderProID
=
LoadShaders
(
"renderVertexShader"
,
"renderFragmentShader"
);
m_RenderVertexID
=
glGetAttribLocation
(
m_RenderProID
,
"vPosition"
);
m_RenderTexCoordID
=
glGetAttribLocation
(
m_RenderProID
,
"texCoord"
);
m_RenderTexID
=
glGetUniformLocation
(
m_RenderProID
,
"RenderTex"
);
CHECK_GL_ERROR
();
m_CommonProID
=
LoadShaders
(
"commonVertexShader"
,
"commonFragmentShader"
);
m_CommonProID
=
LoadShaders
(
"commonVertexShader"
,
"commonFragmentShader"
);
m_MatrixID
=
glGetUniformLocation
(
m_CommonProID
,
"MVP"
);
m_MatrixID
=
glGetUniformLocation
(
m_CommonProID
,
"MVP"
);
m_2DVertexID
=
glGetAttribLocation
(
m_CommonProID
,
"vPosition"
);
m_2DVertexID
=
glGetAttribLocation
(
m_CommonProID
,
"vPosition"
);
...
@@ -323,15 +316,6 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
...
@@ -323,15 +316,6 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
CHECK_GL_ERROR
();
CHECK_GL_ERROR
();
glGenBuffers
(
1
,
&
m_RenderVertexBuf
);
glBindBuffer
(
GL_ARRAY_BUFFER
,
m_RenderVertexBuf
);
glBindBuffer
(
GL_ARRAY_BUFFER
,
0
);
glGenBuffers
(
1
,
&
m_RenderTexCoordBuf
);
glBindBuffer
(
GL_ARRAY_BUFFER
,
m_RenderTexCoordBuf
);
glBufferData
(
GL_ARRAY_BUFFER
,
sizeof
(
texCoords
),
texCoords
,
GL_STATIC_DRAW
);
glBindBuffer
(
GL_ARRAY_BUFFER
,
0
);
glGenBuffers
(
1
,
&
m_TextTexCoordBuf
);
glGenBuffers
(
1
,
&
m_TextTexCoordBuf
);
glBindBuffer
(
GL_ARRAY_BUFFER
,
m_TextTexCoordBuf
);
glBindBuffer
(
GL_ARRAY_BUFFER
,
m_TextTexCoordBuf
);
glBufferData
(
GL_ARRAY_BUFFER
,
sizeof
(
texCoords
),
texCoords
,
GL_STATIC_DRAW
);
glBufferData
(
GL_ARRAY_BUFFER
,
sizeof
(
texCoords
),
texCoords
,
GL_STATIC_DRAW
);
...
@@ -650,9 +634,6 @@ void OpenGLRender::Release()
...
@@ -650,9 +634,6 @@ void OpenGLRender::Release()
{
{
glDeleteBuffers
(
1
,
&
m_VertexBuffer
);
glDeleteBuffers
(
1
,
&
m_VertexBuffer
);
glDeleteBuffers
(
1
,
&
m_ColorBuffer
);
glDeleteBuffers
(
1
,
&
m_ColorBuffer
);
glDeleteBuffers
(
1
,
&
m_RenderVertexBuf
);
glDeleteBuffers
(
1
,
&
m_RenderTexCoordBuf
);
glDeleteProgram
(
m_RenderProID
);
glDeleteProgram
(
m_CommonProID
);
glDeleteProgram
(
m_CommonProID
);
glDeleteProgram
(
m_TextProID
);
glDeleteProgram
(
m_TextProID
);
glDeleteProgram
(
m_BackgroundProID
);
glDeleteProgram
(
m_BackgroundProID
);
...
@@ -704,7 +685,7 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget)
...
@@ -704,7 +685,7 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget)
,
m_TextProID
(
0
)
,
m_TextProID
(
0
)
,
m_TextMatrixID
(
0
)
,
m_TextMatrixID
(
0
)
,
m_TextVertexID
(
0
)
,
m_TextVertexID
(
0
)
,
m_TextTexCoordID
(
1
)
,
m_TextTexCoordID
(
0
)
,
m_TextTexCoordBuf
(
0
)
,
m_TextTexCoordBuf
(
0
)
,
m_TextTexID
(
0
)
,
m_TextTexID
(
0
)
,
m_BackgroundProID
(
0
)
,
m_BackgroundProID
(
0
)
...
...
chart2/source/view/main/OpenGLRender.hxx
Dosyayı görüntüle @
38f8f1b7
...
@@ -205,25 +205,12 @@ private:
...
@@ -205,25 +205,12 @@ private:
// Our ModelViewProjection : multiplication of our 3 matrices
// Our ModelViewProjection : multiplication of our 3 matrices
glm
::
mat4
m_MVP
;
glm
::
mat4
m_MVP
;
GLint
m_RenderProID
;
GLuint
m_VertexBuffer
;
GLuint
m_VertexBuffer
;
GLuint
m_ColorBuffer
;
GLuint
m_ColorBuffer
;
GLint
m_MatrixID
;
GLint
m_MatrixID
;
GLint
m_RenderVertexID
;
GLint
m_RenderTexCoordID
;
GLint
m_RenderTexID
;
GLuint
m_RenderVertexBuf
;
GLuint
m_RenderTexCoordBuf
;
GLuint
m_TextureObj
;
GLuint
m_TextureObj
;
GLuint
m_FboID
;
GLuint
m_FboID
;
...
...
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