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
7dec6e6e
Kaydet (Commit)
7dec6e6e
authored
Kas 13, 2015
tarafından
Tomaž Vajngerl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
slideshow: simplify NByMTileFlip transition
Change-Id: I0ec07eb25d538d82d740a33f05b0a4f002adf36a
üst
dc3959ce
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
23 deletions
+15
-23
OGLTrans_TransitionImpl.cxx
...ource/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+15
-23
No files found.
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
Dosyayı görüntüle @
7dec6e6e
...
...
@@ -384,8 +384,7 @@ makeSimpleTransition(
{
return
std
::
make_shared
<
SimpleTransition
>
(
TransitionScene
(
rLeavingSlidePrimitives
,
rEnteringSlidePrimitives
,
rOverallOperations
,
rSceneObjects
),
rSettings
)
;
rSettings
);
}
std
::
shared_ptr
<
OGLTransitionImpl
>
...
...
@@ -852,35 +851,28 @@ glm::vec2 vec(float x, float y, float nx, float ny)
std
::
shared_ptr
<
OGLTransitionImpl
>
makeNByMTileFlip
(
sal_uInt16
n
,
sal_uInt16
m
)
{
double
invN
(
1.0
/
static_cast
<
double
>
(
n
));
double
invM
(
1.0
/
static_cast
<
double
>
(
m
));
double
iDn
=
0.0
;
double
iPDn
=
invN
;
Primitives_t
aLeavingSlide
;
Primitives_t
aEnteringSlide
;
for
(
unsigned
int
i
(
0
);
i
<
n
;
++
i
)
for
(
int
x
=
0
;
x
<
n
;
x
++
)
{
double
jDm
=
0.0
;
double
jPDm
=
invM
;
for
(
unsigned
int
j
(
0
);
j
<
m
;
++
j
)
for
(
int
y
=
0
;
y
<
n
;
y
++
)
{
Primitive
Tile
;
Primitive
aTile
;
glm
::
vec2
x11
=
vec
(
x
,
y
,
n
,
m
);
glm
::
vec2
x12
=
vec
(
x
,
y
+
1
,
n
,
m
);
glm
::
vec2
x21
=
vec
(
x
+
1
,
y
,
n
,
m
);
glm
::
vec2
x22
=
vec
(
x
+
1
,
y
+
1
,
n
,
m
);
Tile
.
pushTriangle
(
glm
::
vec2
(
iPDn
,
jDm
)
,
glm
::
vec2
(
iDn
,
jDm
)
,
glm
::
vec2
(
iDn
,
jPDm
));
aTile
.
pushTriangle
(
x21
,
x11
,
x12
);
aTile
.
pushTriangle
(
x22
,
x21
,
x12
);
Tile
.
pushTriangle
(
glm
::
vec2
(
iPDn
,
jPDm
)
,
glm
::
vec2
(
iPDn
,
jDm
)
,
glm
::
vec2
(
iDn
,
jPDm
));
//bottom left corner of tile
aTile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
),
(
aTile
.
getVertices
()[
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
));
aLeavingSlide
.
push_back
(
aTile
);
Tile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
1
,
1
,
0
)
,
(
Tile
.
getVertices
()[
1
]
+
Tile
.
getVertices
()[
3
]
)
/
2.0
f
,
180
,
true
,
iDn
*
jDm
/
2.0
,
((
iPDn
*
jPDm
)
+
1.0
)
/
2.0
)
);
aLeavingSlide
.
push_back
(
Tile
);
Tile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
1
,
1
,
0
)
,
(
Tile
.
getVertices
()[
1
]
+
Tile
.
getVertices
()[
3
]
)
/
2.0
f
,
-
180
,
false
,
iDn
*
jDm
/
2.0
,
((
iPDn
*
jPDm
)
+
1.0
)
/
2.0
)
);
aEnteringSlide
.
push_back
(
Tile
);
jDm
+=
invM
;
jPDm
+=
invM
;
aTile
.
Operations
.
push_back
(
makeSRotate
(
glm
::
vec3
(
0
,
1
,
0
),
(
aTile
.
getVertices
()[
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
));
aEnteringSlide
.
push_back
(
aTile
);
}
iDn
+=
invN
;
iPDn
+=
invN
;
}
return
makeSimpleTransition
(
aLeavingSlide
,
aEnteringSlide
);
...
...
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