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
b819026e
Kaydet (Commit)
b819026e
authored
Agu 03, 2014
tarafından
weigao
Kaydeden (comit)
Markus Mohrhard
Agu 06, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
add scroll matrix and bars can scroll
Change-Id: Ic821faaa9dc02fd965f46a77136edaf7a87cf6fe
üst
f7fef1c3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
0 deletions
+25
-0
GL3DRenderer.hxx
chart2/source/view/inc/GL3DRenderer.hxx
+4
-0
GL3DRenderer.cxx
chart2/source/view/main/GL3DRenderer.cxx
+21
-0
No files found.
chart2/source/view/inc/GL3DRenderer.hxx
Dosyayı görüntüle @
b819026e
...
...
@@ -274,6 +274,7 @@ private:
sal_uInt32
nUniqueId
);
void
SetHighLightBar
(
BatchBarInfo
&
barInfo
);
void
DisableHighLightBar
(
BatchBarInfo
&
barInfo
);
void
CalcScrollMoveMatrix
(
bool
bNewScene
);
private
:
struct
ShaderResources
...
...
@@ -458,8 +459,11 @@ private:
sal_uInt32
m_uiSelectID
;
float
m_fScrollSpeed
;
float
m_fScrollDistance
;
float
m_fCurDistance
;
float
m_fMinCoordX
;
float
m_fMaxCoordX
;
glm
::
mat4
m_ScrollMoveMatrix
;
bool
m_bUndrawFlag
;
};
}
...
...
chart2/source/view/main/GL3DRenderer.cxx
Dosyayı görüntüle @
b819026e
...
...
@@ -113,6 +113,8 @@ OpenGL3DRenderer::OpenGL3DRenderer():
,
m_fScrollDistance
(
0.0
f
)
,
m_fMinCoordX
(
0.0
f
)
,
m_fMaxCoordX
(
0.0
f
)
,
m_fCurDistance
(
0.0
f
)
,
m_bUndrawFlag
(
false
)
{
m_Polygon3DInfo
.
lineOnly
=
false
;
m_Polygon3DInfo
.
twoSidesLighting
=
false
;
...
...
@@ -2049,6 +2051,7 @@ void OpenGL3DRenderer::ProcessUnrenderedShape(bool bNewScene)
glViewport
(
0
,
0
,
m_iWidth
,
m_iHeight
);
ClearBuffer
();
CreateSceneBoxView
();
CalcScrollMoveMatrix
(
bNewScene
);
//Polygon
RenderPolygon3DObject
();
//Shape3DExtrudeObject
...
...
@@ -2300,6 +2303,17 @@ void OpenGL3DRenderer::SetSceneEdge(float minCoordX, float maxCoordX)
m_fMaxCoordX
=
maxCoordX
*
0.01
;
}
void
OpenGL3DRenderer
::
CalcScrollMoveMatrix
(
bool
bNewScene
)
{
if
(
!
maResources
.
m_bScrollFlag
)
return
;
if
(
bNewScene
)
m_fCurDistance
=
-
m_fScrollSpeed
;
m_fCurDistance
+=
m_fCurDistance
>=
m_fScrollDistance
?
0.0
f
:
m_fScrollSpeed
;
m_ScrollMoveMatrix
=
glm
::
translate
(
glm
::
vec3
(
-
m_fCurDistance
*
0.01
,
0.0
f
,
0.0
f
));
m_bUndrawFlag
=
m_fCurDistance
>=
m_fScrollDistance
?
true
:
false
;
}
void
OpenGL3DRenderer
::
RenderBatchBars
(
bool
bNewScene
)
{
if
(
bNewScene
)
...
...
@@ -2323,6 +2337,13 @@ void OpenGL3DRenderer::RenderBatchBars(bool bNewScene)
glBufferSubData
(
GL_UNIFORM_BUFFER
,
m_Batch3DActualSizeLight
,
sizeof
(
MaterialParameters
),
&
m_Batchmaterial
);
CHECK_GL_ERROR
();
glBindBuffer
(
GL_UNIFORM_BUFFER
,
0
);
if
(
maResources
.
m_bScrollFlag
)
{
glUniform1fv
(
maResources
.
m_3DBatchMinCoordXID
,
1
,
&
m_fMinCoordX
);
glUniform1fv
(
maResources
.
m_3DBatchMaxCoordXID
,
1
,
&
m_fMaxCoordX
);
glUniform1i
(
maResources
.
m_3DBatchUndrawID
,
m_bUndrawFlag
);
glUniformMatrix4fv
(
maResources
.
m_3DBatchTransMatrixID
,
1
,
GL_FALSE
,
&
m_ScrollMoveMatrix
[
0
][
0
]);
}
glUniformMatrix4fv
(
maResources
.
m_3DBatchViewID
,
1
,
GL_FALSE
,
&
m_3DView
[
0
][
0
]);
glUniformMatrix4fv
(
maResources
.
m_3DBatchProjectionID
,
1
,
GL_FALSE
,
&
m_3DProjection
[
0
][
0
]);
CHECK_GL_ERROR
();
...
...
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