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
f41358a7
Kaydet (Commit)
f41358a7
authored
Kas 19, 2015
tarafından
Emmanuel Gil Peyrot
Kaydeden (comit)
Tor Lillqvist
Kas 19, 2015
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
slideshow: Rename getVertices into getVertex, to match its only usage
üst
42a95017
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
OGLTrans_TransitionImpl.cxx
...ource/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+5
-5
OGLTrans_TransitionImpl.hxx
...ource/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+1
-1
No files found.
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
Dosyayı görüntüle @
f41358a7
...
...
@@ -818,13 +818,13 @@ std::shared_ptr<OGLTransitionImpl> makeHelix( sal_uInt16 nRows )
Tile
.
pushTriangle
(
glm
::
vec2
(
1.0
,
iPDn
)
,
glm
::
vec2
(
1.0
,
iDn
)
,
glm
::
vec2
(
0.0
,
iPDn
));
Tile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
)
,
(
Tile
.
getVert
ices
()[
1
]
+
Tile
.
getVertices
()[
3
]
)
/
2.0
f
,
180
,
Tile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
)
,
(
Tile
.
getVert
ex
(
1
)
+
Tile
.
getVertex
(
3
)
)
/
2.0
f
,
180
,
true
,
std
::
min
(
std
::
max
(
static_cast
<
double
>
(
i
-
nRows
/
2.0
)
*
invN
/
2.0
,
0.0
),
1.0
),
std
::
min
(
std
::
max
(
static_cast
<
double
>
(
i
+
nRows
/
2.0
)
*
invN
/
2.0
,
0.0
),
1.0
)
)
);
aLeavingSlide
.
push_back
(
Tile
);
Tile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
)
,
(
Tile
.
getVert
ices
()[
1
]
+
Tile
.
getVertices
()[
3
]
)
/
2.0
f
,
-
180
,
false
,
0.0
,
1.0
)
);
Tile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
)
,
(
Tile
.
getVert
ex
(
1
)
+
Tile
.
getVertex
(
3
)
)
/
2.0
f
,
-
180
,
false
,
0.0
,
1.0
)
);
aEnteringSlide
.
push_back
(
Tile
);
...
...
@@ -867,10 +867,10 @@ std::shared_ptr<OGLTransitionImpl> makeNByMTileFlip( sal_uInt16 n, sal_uInt16 m
aTile
.
pushTriangle
(
x21
,
x11
,
x12
);
aTile
.
pushTriangle
(
x22
,
x21
,
x12
);
aTile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
),
(
aTile
.
getVert
ices
()[
1
]
+
aTile
.
getVertices
()[
3
]
)
/
2.0
f
,
180
,
true
,
x11
.
x
*
x11
.
y
/
2.0
f
,
((
x22
.
x
*
x22
.
y
)
+
1.0
f
)
/
2.0
f
));
aTile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
),
(
aTile
.
getVert
ex
(
1
)
+
aTile
.
getVertex
(
3
)
)
/
2.0
f
,
180
,
true
,
x11
.
x
*
x11
.
y
/
2.0
f
,
((
x22
.
x
*
x22
.
y
)
+
1.0
f
)
/
2.0
f
));
aLeavingSlide
.
push_back
(
aTile
);
aTile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
),
(
aTile
.
getVert
ices
()[
1
]
+
aTile
.
getVertices
()[
3
]
)
/
2.0
f
,
-
180
,
false
,
x11
.
x
*
x11
.
y
/
2.0
f
,
((
x22
.
x
*
x22
.
y
)
+
1.0
f
)
/
2.0
f
));
aTile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
),
(
aTile
.
getVert
ex
(
1
)
+
aTile
.
getVertex
(
3
)
)
/
2.0
f
,
-
180
,
false
,
x11
.
x
*
x11
.
y
/
2.0
f
,
((
x22
.
x
*
x22
.
y
)
+
1.0
f
)
/
2.0
f
));
aEnteringSlide
.
push_back
(
aTile
);
}
}
...
...
@@ -1901,7 +1901,7 @@ std::shared_ptr<OGLTransitionImpl> makeGlitter()
Primitive
aHexagon
;
createHexagon
(
aHexagon
,
x
,
y
,
NX
,
NY
);
glm
::
vec3
aCenter
=
aHexagon
.
getVert
ices
()[
2
]
;
glm
::
vec3
aCenter
=
aHexagon
.
getVert
ex
(
2
)
;
float
fRandom
=
comphelper
::
rng
::
uniform_real_distribution
(
-
0.25
,
std
::
nextafter
(
0.2
,
DBL_MAX
));
...
...
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
Dosyayı görüntüle @
f41358a7
...
...
@@ -311,7 +311,7 @@ public:
@return
the list of vertices
*/
const
std
::
vector
<
glm
::
vec3
>&
getVertices
()
const
{
return
Vertices
;}
const
glm
::
vec3
&
getVertex
(
int
n
)
const
{
return
Vertices
[
n
]
;}
/** list of Operations to be performed on this primitive.These operations will be called in the order they were pushed back in. In OpenGL this effectively uses the operations in the opposite order they were pushed back.
...
...
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