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
4ccdfb50
Kaydet (Commit)
4ccdfb50
authored
Ock 12, 2014
tarafından
Markus Mohrhard
Kaydeden (comit)
Markus Mohrhard
Ock 29, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
make a few variables local, no need for member variables
Change-Id: I2559756acf655f73c782db023b7502f969346171
üst
aead8978
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
13 deletions
+4
-13
OpenGLRender.cxx
chart2/source/view/main/OpenGLRender.cxx
+4
-7
OpenGLRender.hxx
chart2/source/view/main/OpenGLRender.hxx
+0
-6
No files found.
chart2/source/view/main/OpenGLRender.cxx
Dosyayı görüntüle @
4ccdfb50
...
...
@@ -865,10 +865,10 @@ int OpenGLRender::CreateRenderObj(int width, int height)
int
OpenGLRender
::
MoveModelf
(
PosVecf3
trans
,
PosVecf3
angle
,
PosVecf3
scale
)
{
m_
TranslationMatrix
=
glm
::
translate
(
glm
::
vec3
(
trans
.
x
,
trans
.
y
,
trans
.
z
));
m_
ScaleMatrix
=
glm
::
scale
(
glm
::
vec3
(
scale
.
x
,
scale
.
y
,
scale
.
z
));
m_
RotationMatrix
=
glm
::
eulerAngleYXZ
(
angle
.
y
,
angle
.
x
,
angle
.
z
);
m_Model
=
m_TranslationMatrix
*
m_RotationMatrix
*
m_
ScaleMatrix
;
glm
::
mat4
a
TranslationMatrix
=
glm
::
translate
(
glm
::
vec3
(
trans
.
x
,
trans
.
y
,
trans
.
z
));
glm
::
mat4
a
ScaleMatrix
=
glm
::
scale
(
glm
::
vec3
(
scale
.
x
,
scale
.
y
,
scale
.
z
));
glm
::
mat4
a
RotationMatrix
=
glm
::
eulerAngleYXZ
(
angle
.
y
,
angle
.
x
,
angle
.
z
);
m_Model
=
aTranslationMatrix
*
aRotationMatrix
*
a
ScaleMatrix
;
return
0
;
}
...
...
@@ -928,9 +928,6 @@ void OpenGLRender::Release()
OpenGLRender
::
OpenGLRender
(
uno
::
Reference
<
drawing
::
XShape
>
xTarget
)
:
m_Model
(
glm
::
mat4
(
1.0
f
)),
m_TranslationMatrix
(
glm
::
translate
(
m_Model
,
glm
::
vec3
(
0.0
f
,
0.0
f
,
0.0
f
))),
m_RotationMatrix
(
glm
::
eulerAngleYXZ
(
0.0
f
,
0.0
f
,
0.0
f
)),
m_ScaleMatrix
(
glm
::
scale
(
m_Model
,
glm
::
vec3
(
1.0
f
,
1.0
f
,
1.0
f
))),
m_Line2DColor
(
glm
::
vec4
(
1.0
,
0.0
,
0.0
,
1.0
)),
m_TextureObj
(
0
),
m_FboID
(
0
),
...
...
chart2/source/view/main/OpenGLRender.hxx
Dosyayı görüntüle @
4ccdfb50
...
...
@@ -208,12 +208,6 @@ private:
// Our ModelViewProjection : multiplication of our 3 matrices
glm
::
mat4
m_MVP
;
glm
::
mat4
m_TranslationMatrix
;
glm
::
mat4
m_RotationMatrix
;
glm
::
mat4
m_ScaleMatrix
;
GLint
m_RenderProID
;
glm
::
vec4
m_Line2DColor
;
...
...
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