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
ddcd1507
Kaydet (Commit)
ddcd1507
authored
Şub 25, 2014
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:bodynotinblock, loplugin:literaltoboolconversion
Change-Id: I6773a4947900a6b58b556c3bac61cac784562d81
üst
9d6c36de
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
OGLTrans_TransitionImpl.mm
...how/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
+4
-4
OGLTrans_TransitionerImpl.mm
...w/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+8
-8
No files found.
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
Dosyayı görüntüle @
ddcd1507
...
...
@@ -163,7 +163,7 @@ void OGLTransitionImpl::applyOverallOperations( double nTime, double SlideWidthS
void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex, std::vector<Primitive>& primitives,
double SlideWidthScale, double SlideHeightScale )
{
//TODO change to foreach
//TODO change to foreach
glBindTexture(GL_TEXTURE_2D, glSlideTex);
// display slide reflection
...
...
@@ -179,11 +179,11 @@ void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex, std:
glTranslated( 0, 2 - surfaceLevel, 0 );
glCullFace(GL_FRONT);
for(unsigned int i(0); i < primitives.size(); ++i)
primitives[i].display(nTime, SlideWidthScale, SlideHeightScale);
for(unsigned int i(0); i < primitives.size(); ++i)
primitives[i].display(nTime, SlideWidthScale, SlideHeightScale);
glCullFace(GL_BACK);
slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale );
slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale );
glPopMatrix();
}
...
...
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
Dosyayı görüntüle @
ddcd1507
...
...
@@ -405,12 +405,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
if( pWindow )
{
pWindow->SetMouseTransparent(
sal_T
rue );
pWindow->SetMouseTransparent(
t
rue );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
pWindow->EnableEraseBackground(
sal_F
alse );
pWindow->EnableEraseBackground(
f
alse );
pWindow->SetControlForeground();
pWindow->SetControlBackground();
pWindow->EnablePaint(
sal_F
alse);
pWindow->EnablePaint(
f
alse);
pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel());
}
...
...
@@ -478,9 +478,9 @@ void OGLTransitionerImpl::setSlides( const uno::Reference< rendering::XBitmap >&
mbUseEnteringPixmap = false;
if( !mbUseLeavingPixmap )
LeavingBytes = mxLeavingBitmap->getData(SlideBitmapLayout,SlideRect);
LeavingBytes = mxLeavingBitmap->getData(SlideBitmapLayout,SlideRect);
if( !mbUseEnteringPixmap )
EnteringBytes = mxEnteringBitmap->getData(SlideBitmapLayout,SlideRect);
EnteringBytes = mxEnteringBitmap->getData(SlideBitmapLayout,SlideRect);
if(GLWin.pOpenGLContext)//if we have a rendering context, let's init the slides
GLInitSlides();
...
...
@@ -724,7 +724,7 @@ void OGLTransitionerImpl::GLInitSlides()
const OGLFormat* pFormat = NULL;
if( !mbUseLeavingPixmap || !mbUseEnteringPixmap )
pFormat = chooseFormats();
pFormat = chooseFormats();
createTexture( &GLleavingSlide,
pTransition->mbUseMipMapLeaving,
...
...
@@ -778,7 +778,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
[context makeCurrentContext];
if(pTransition)
pTransition->display( nTime, GLleavingSlide, GLenteringSlide,
pTransition->display( nTime, GLleavingSlide, GLenteringSlide,
SlideSize.Width, SlideSize.Height,
static_cast<double>(GLWin.Width),
static_cast<double>(GLWin.Height) );
...
...
@@ -892,7 +892,7 @@ void OGLTransitionerImpl::disposing()
}
if (pTransition)
delete pTransition;
delete pTransition;
mxLeavingBitmap.clear();
mxEnteringBitmap.clear();
...
...
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