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
45f9f5f4
Kaydet (Commit)
45f9f5f4
authored
Agu 27, 2014
tarafından
Markus Mohrhard
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
use size_t instead of unsigned int for container indices
Change-Id: Iff2f797915f1558ea23336e273bd26e0c0edc63e
üst
27fce934
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
OGLTrans_TransitionImpl.cxx
...ource/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+8
-8
No files found.
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
Dosyayı görüntüle @
45f9f5f4
...
...
@@ -80,7 +80,7 @@ void OGLTransitionImpl::setScene(TransitionScene const& rScene)
void
OGLTransitionImpl
::
prepare
(
::
sal_Int32
glLeavingSlideTex
,
::
sal_Int32
glEnteringSlideTex
)
{
const
SceneObjects_t
&
rSceneObjects
(
maScene
.
getSceneObjects
());
for
(
unsigned
in
t
i
(
0
);
i
!=
rSceneObjects
.
size
();
++
i
)
{
for
(
size_
t
i
(
0
);
i
!=
rSceneObjects
.
size
();
++
i
)
{
rSceneObjects
[
i
]
->
prepare
();
}
...
...
@@ -90,7 +90,7 @@ void OGLTransitionImpl::prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEn
void
OGLTransitionImpl
::
finish
()
{
const
SceneObjects_t
&
rSceneObjects
(
maScene
.
getSceneObjects
());
for
(
unsigned
in
t
i
(
0
);
i
!=
rSceneObjects
.
size
();
++
i
)
{
for
(
size_
t
i
(
0
);
i
!=
rSceneObjects
.
size
();
++
i
)
{
rSceneObjects
[
i
]
->
finish
();
}
...
...
@@ -189,7 +189,7 @@ void OGLTransitionImpl::display( double nTime, ::sal_Int32 glLeavingSlideTex, ::
void
OGLTransitionImpl
::
applyOverallOperations
(
double
nTime
,
double
SlideWidthScale
,
double
SlideHeightScale
)
{
const
Operations_t
&
rOverallOperations
(
maScene
.
getOperations
());
for
(
unsigned
in
t
i
(
0
);
i
!=
rOverallOperations
.
size
();
++
i
)
for
(
size_
t
i
(
0
);
i
!=
rOverallOperations
.
size
();
++
i
)
rOverallOperations
[
i
]
->
interpolate
(
nTime
,
SlideWidthScale
,
SlideHeightScale
);
}
...
...
@@ -217,7 +217,7 @@ OGLTransitionImpl::displaySlide(
glTranslated
(
0
,
2
-
surfaceLevel
,
0
);
glCullFace
(
GL_FRONT
);
for
(
unsigned
in
t
i
(
0
);
i
<
primitives
.
size
();
++
i
)
for
(
size_
t
i
(
0
);
i
<
primitives
.
size
();
++
i
)
primitives
[
i
].
display
(
nTime
,
SlideWidthScale
,
SlideHeightScale
);
glCullFace
(
GL_BACK
);
...
...
@@ -226,7 +226,7 @@ OGLTransitionImpl::displaySlide(
glPopMatrix
();
}
for
(
unsigned
in
t
i
(
0
);
i
<
primitives
.
size
();
++
i
)
for
(
size_
t
i
(
0
);
i
<
primitives
.
size
();
++
i
)
primitives
[
i
].
display
(
nTime
,
SlideWidthScale
,
SlideHeightScale
);
CHECK_GL_ERROR
();
}
...
...
@@ -236,7 +236,7 @@ void OGLTransitionImpl::displayScene( double nTime, double SlideWidth, double Sl
CHECK_GL_ERROR
();
const
SceneObjects_t
&
rSceneObjects
(
maScene
.
getSceneObjects
());
glEnable
(
GL_TEXTURE_2D
);
for
(
unsigned
in
t
i
(
0
);
i
!=
rSceneObjects
.
size
();
++
i
)
for
(
size_
t
i
(
0
);
i
!=
rSceneObjects
.
size
();
++
i
)
rSceneObjects
[
i
]
->
display
(
nTime
,
SlideWidth
,
SlideHeight
,
DispWidth
,
DispHeight
);
CHECK_GL_ERROR
();
}
...
...
@@ -276,7 +276,7 @@ void Primitive::display(double nTime, double WidthScale, double HeightScale) con
void
Primitive
::
applyOperations
(
double
nTime
,
double
WidthScale
,
double
HeightScale
)
const
{
CHECK_GL_ERROR
();
for
(
unsigned
in
t
i
(
0
);
i
<
Operations
.
size
();
++
i
)
for
(
size_
t
i
(
0
);
i
<
Operations
.
size
();
++
i
)
Operations
[
i
]
->
interpolate
(
nTime
,
WidthScale
,
HeightScale
);
glScaled
(
WidthScale
,
HeightScale
,
1
);
CHECK_GL_ERROR
();
...
...
@@ -285,7 +285,7 @@ void Primitive::applyOperations(double nTime, double WidthScale, double HeightSc
void
SceneObject
::
display
(
double
nTime
,
double
/* SlideWidth */
,
double
/* SlideHeight */
,
double
DispWidth
,
double
DispHeight
)
const
{
CHECK_GL_ERROR
();
for
(
unsigned
in
t
i
(
0
);
i
<
maPrimitives
.
size
();
++
i
)
{
for
(
size_
t
i
(
0
);
i
<
maPrimitives
.
size
();
++
i
)
{
// fixme: allow various model spaces, now we make it so that
// it is regular -1,-1 to 1,1, where the whole display fits in
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