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
b2b57d51
Kaydet (Commit)
b2b57d51
authored
Agu 05, 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 click fly back code
Change-Id: Ib4d5ce06f50ab7413fe8ecb5b61397b41e4fedd2
üst
e3d4a488
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
6 deletions
+33
-6
GL3DBarChart.cxx
chart2/source/view/charttypes/GL3DBarChart.cxx
+33
-6
No files found.
chart2/source/view/charttypes/GL3DBarChart.cxx
Dosyayı görüntüle @
b2b57d51
...
...
@@ -180,12 +180,15 @@ public:
RenderBenchMarkThread
(
GL3DBarChart
*
pChart
)
:
RenderThread
(
pChart
),
mbExecuting
(
false
),
miFrameCount
(
0
)
miFrameCount
(
0
),
mbNeedFlyBack
(
false
)
{
osl_getSystemTime
(
&
mafpsRenderStartTime
);
osl_getSystemTime
(
&
mafpsRenderEndTime
);
osl_getSystemTime
(
&
maScreenTextUpdateStartTime
);
osl_getSystemTime
(
&
maScreenTextUpdateEndTime
);
osl_getSystemTime
(
&
maClickFlyBackStartTime
);
osl_getSystemTime
(
&
maClickFlyBackEndTime
);
}
protected
:
virtual
void
execute
()
SAL_OVERRIDE
;
...
...
@@ -198,12 +201,14 @@ private:
void
ProcessScroll
();
void
UpdateScreenText
();
void
UpdateFPS
();
int
calcTimeInterval
(
TimeValue
&
startTime
,
TimeValue
&
endTime
);
int
CalcTimeInterval
(
TimeValue
&
startTime
,
TimeValue
&
endTime
);
void
ProcessClickFlyBack
();
private
:
glm
::
vec3
maStartPos
;
glm
::
vec3
maEndPos
;
sal_Int32
mnSteps
;
bool
mbExecuting
;
bool
mbNeedFlyBack
;
glm
::
vec3
maStep
;
glm
::
vec3
maStepDirection
;
size_t
mnStep
;
...
...
@@ -212,6 +217,8 @@ private:
TimeValue
mafpsRenderEndTime
;
TimeValue
maScreenTextUpdateStartTime
;
TimeValue
maScreenTextUpdateEndTime
;
TimeValue
maClickFlyBackStartTime
;
TimeValue
maClickFlyBackEndTime
;
int
miFrameCount
;
OUString
maFPS
;
};
...
...
@@ -231,7 +238,14 @@ void RenderBenchMarkThread::MoveCamera()
mnStep
=
0
;
mbExecuting
=
false
;
if
(
mpChart
->
maRenderEvent
==
EVENT_CLICK
)
{
mpChart
->
mpRenderer
->
EndClick
();
mbNeedFlyBack
=
true
;
osl_getSystemTime
(
&
maClickFlyBackStartTime
);
osl_getSystemTime
(
&
maClickFlyBackEndTime
);
}
else
mbNeedFlyBack
=
false
;
mpChart
->
maRenderEvent
=
EVENT_NONE
;
}
}
...
...
@@ -307,8 +321,21 @@ void RenderBenchMarkThread::ProcessScroll()
mpChart
->
maRenderEvent
=
EVENT_NONE
;
}
void
RenderBenchMarkThread
::
ProcessClickFlyBack
()
{
if
(
!
mbNeedFlyBack
)
return
;
osl_getSystemTime
(
&
maClickFlyBackEndTime
);
int
aDeltaMs
=
CalcTimeInterval
(
maClickFlyBackStartTime
,
maClickFlyBackEndTime
);
if
(
aDeltaMs
>=
10000
)
{
mpChart
->
maRenderEvent
=
EVENT_MOVE_TO_DEFAULT
;
}
}
void
RenderBenchMarkThread
::
ProcessMouseEvent
()
{
ProcessClickFlyBack
();
if
(
mpChart
->
maRenderEvent
==
EVENT_CLICK
)
{
MoveToBar
();
...
...
@@ -327,7 +354,7 @@ void RenderBenchMarkThread::ProcessMouseEvent()
}
}
int
RenderBenchMarkThread
::
c
alcTimeInterval
(
TimeValue
&
startTime
,
TimeValue
&
endTime
)
int
RenderBenchMarkThread
::
C
alcTimeInterval
(
TimeValue
&
startTime
,
TimeValue
&
endTime
)
{
TimeValue
aTime
;
aTime
.
Seconds
=
endTime
.
Seconds
-
startTime
.
Seconds
-
1
;
...
...
@@ -339,11 +366,11 @@ int RenderBenchMarkThread::calcTimeInterval(TimeValue &startTime, TimeValue &end
void
RenderBenchMarkThread
::
UpdateFPS
()
{
int
aDeltaMs
=
c
alcTimeInterval
(
mafpsRenderStartTime
,
mafpsRenderEndTime
);
int
aDeltaMs
=
C
alcTimeInterval
(
mafpsRenderStartTime
,
mafpsRenderEndTime
);
if
(
aDeltaMs
>=
500
)
{
osl_getSystemTime
(
&
mafpsRenderEndTime
);
aDeltaMs
=
c
alcTimeInterval
(
mafpsRenderStartTime
,
mafpsRenderEndTime
);
aDeltaMs
=
C
alcTimeInterval
(
mafpsRenderStartTime
,
mafpsRenderEndTime
);
int
iFPS
=
miFrameCount
*
1000
/
aDeltaMs
;
maFPS
=
OUString
(
"Render FPS: "
)
+
OUString
::
number
(
iFPS
);
miFrameCount
=
0
;
...
...
@@ -364,7 +391,7 @@ void RenderBenchMarkThread::UpdateFPS()
void
RenderBenchMarkThread
::
UpdateScreenText
()
{
int
aDeltaMs
=
c
alcTimeInterval
(
maScreenTextUpdateStartTime
,
maScreenTextUpdateEndTime
);
int
aDeltaMs
=
C
alcTimeInterval
(
maScreenTextUpdateStartTime
,
maScreenTextUpdateEndTime
);
if
(
aDeltaMs
>=
20
)
{
mpChart
->
mpRenderer
->
ReleaseScreenTextShapes
();
...
...
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