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
eccaf91e
Kaydet (Commit)
eccaf91e
authored
May 19, 2014
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
use VCL's OpenGLContext for 3D transitions
Change-Id: I510518461eb8bc9669d0de2679c34c473f66b175
üst
92621df9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
7 deletions
+41
-7
OpenGLContext.hxx
include/vcl/opengl/OpenGLContext.hxx
+3
-0
Library_OGLTrans.mk
slideshow/Library_OGLTrans.mk
+2
-0
OGLTrans_TransitionImpl.hxx
...ource/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+5
-7
OGLTrans_TransitionerImpl.cxx
...rce/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+0
-0
OpenGLContext.cxx
vcl/source/opengl/OpenGLContext.cxx
+31
-0
No files found.
include/vcl/opengl/OpenGLContext.hxx
Dosyayı görüntüle @
eccaf91e
...
...
@@ -150,7 +150,10 @@ public:
void
makeCurrent
();
void
swapBuffers
();
void
sync
();
void
show
();
void
setWinPosAndSize
(
const
Point
&
rPos
,
const
Size
&
rSize
);
void
setWinSize
(
const
Size
&
rSize
);
GLWindow
&
getOpenGLWindow
();
...
...
slideshow/Library_OGLTrans.mk
Dosyayı görüntüle @
eccaf91e
...
...
@@ -31,11 +31,13 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\
cppuhelper \
sal \
vcl \
vclopengl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_use_externals,OGLTrans,\
boost_headers \
glew \
mesa_headers \
))
...
...
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
Dosyayı görüntüle @
eccaf91e
...
...
@@ -33,20 +33,18 @@
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b3dvector.hxx>
#include <vector>
#ifdef _WIN32
// <GL/gl.h> includes <windows.h>, so include that early through
// <prewin.h> to avoid name clashes from at least GDI's Rectangle().
#include <prewin.h>
#include <postwin.h>
#endif
#include <GL/gl.h>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b3dvector.hxx>
#include <vector>
class
Primitive
;
class
Operation
;
class
SceneObject
;
...
...
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
Dosyayı görüntüle @
eccaf91e
This diff is collapsed.
Click to expand it.
vcl/source/opengl/OpenGLContext.cxx
Dosyayı görüntüle @
eccaf91e
...
...
@@ -551,6 +551,17 @@ bool OpenGLContext::ImplInit()
return
true
;
}
void
OpenGLContext
::
setWinPosAndSize
(
const
Point
&
rPos
,
const
Size
&
rSize
)
{
if
(
m_pWindow
)
m_pWindow
->
SetPosSizePixel
(
rPos
,
rSize
);
if
(
m_pChildWindow
)
m_pChildWindow
->
SetPosSizePixel
(
rPos
,
rSize
);
m_aGLWin
.
Width
=
rSize
.
Width
();
m_aGLWin
.
Height
=
rSize
.
Height
();
}
void
OpenGLContext
::
setWinSize
(
const
Size
&
rSize
)
{
if
(
m_pWindow
)
...
...
@@ -795,4 +806,24 @@ void OpenGLContext::swapBuffers()
#endif
}
void
OpenGLContext
::
sync
()
{
#if defined( WNT )
// nothing
#elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
// nothing
#elif defined( UNX )
glXWaitGL
();
XSync
(
m_aGLWin
.
dpy
,
false
);
#endif
}
void
OpenGLContext
::
show
()
{
if
(
m_pChildWindow
)
m_pChildWindow
->
Show
();
else
if
(
m_pWindow
)
m_pWindow
->
Show
();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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