[Libreoffice-commits] core.git: 27 commits - bin/lo-all-static-libs configure.ac dbaccess/source desktop/source external/mysqlcppconn external/nss framework/source .gitignore i18npool/source oox/source qadevOOo/tests sc/inc sc/source sd/source slideshow/source solenv/gbuild svx/sdi sw/qa sw/source unotools/source vcl/source writerfilter/inc writerfilter/source
Adam Co
rattles2013 at gmail.com
Mon Aug 11 23:48:02 PDT 2014
.gitignore | 1
bin/lo-all-static-libs | 2
configure.ac | 2
dbaccess/source/core/api/CRowSetDataColumn.cxx | 14
dbaccess/source/core/api/RowSetBase.cxx | 16
desktop/source/app/dispatchwatcher.cxx | 77
external/mysqlcppconn/Library_mysqlcppconn.mk | 8
external/nss/ExternalPackage_nss.mk | 8
external/nss/ExternalProject_nss.mk | 7
external/nss/Module_nss.mk | 2
external/nss/UnpackedTarball_nss.mk | 2
external/nss/nss-ios.patch | 101
framework/source/uielement/langselectionstatusbarcontroller.cxx | 2
i18npool/source/localedata/localedata.cxx | 2
oox/source/token/tokens.txt | 2
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java | 146 -
qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java | 6
sc/inc/compiler.hxx | 7
sc/source/core/tool/compiler.cxx | 90
sc/source/core/tool/token.cxx | 7
sc/source/filter/excel/excdoc.cxx | 3
sc/source/filter/excel/ooxml-export-TODO.txt | 2
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/excel/xelink.cxx | 293 +-
sc/source/filter/inc/xecontent.hxx | 7
sc/source/filter/inc/xelink.hxx | 3
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 5
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 10
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx | 1315 ---------
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx | 508 ---
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 1448 ----------
slideshow/source/engine/OGLTrans/win/UNUSED | 4
solenv/gbuild/platform/macosx.mk | 4
svx/sdi/svx.sdi | 2
sw/qa/extras/ooxmlexport/data/wrap-tight-through.docx |binary
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 12
sw/source/filter/ww8/docxsdrexport.cxx | 49
sw/source/uibase/shells/textsh1.cxx | 7
unotools/source/config/configvaluecontainer.cxx | 59
vcl/source/opengl/OpenGLContext.cxx | 6
writerfilter/inc/dmapper/DomainMapper.hxx | 1
writerfilter/source/dmapper/DomainMapper.cxx | 5
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 18
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 5
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2
writerfilter/source/dmapper/GraphicImport.cxx | 17
writerfilter/source/dmapper/StyleSheetTable.cxx | 5
writerfilter/source/dmapper/StyleSheetTable.hxx | 1
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 6
writerfilter/source/dmapper/TablePropertiesHandler.hxx | 4
writerfilter/source/dmapper/TblStylePrHandler.cxx | 2
writerfilter/source/ooxml/factoryimpl_ns.py | 5
writerfilter/source/ooxml/model.xml | 39
writerfilter/source/ooxml/modelpreprocess.py | 2
54 files changed, 895 insertions(+), 3458 deletions(-)
New commits:
commit f91b81c24e21fffbee0d02d325171e684ca880eb
Author: Adam Co <rattles2013 at gmail.com>
Date: Mon Aug 11 18:31:45 2014 +0300
Add reference to 'DomainMapper' to some DOCX import classes
The reason for adding 'DomainMapper' is to be able to check
during import in these classes whether or not the import is
in a 'styles.xml' file or not.
Also added blank handling for new XML nodes.
Reviewed on:
https://gerrit.libreoffice.org/10870
Change-Id: Ib2acde736d96f30eda40ee327991dc6ae0ed7f25
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index ae7d2de..8a2dd9b 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -5102,8 +5102,10 @@ tbRlV
tbl
tblBg
tblBorders
+tblCaption
tblCellMar
tblCellSpacing
+tblDescription
tblGrid
tblGridChange
tblHeader
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx
index dd4dc3f..054f69b 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -115,6 +115,7 @@ public:
com::sun::star::uno::Reference<com::sun::star::drawing::XShape> PopPendingShape();
bool IsInHeaderFooter() const;
+ bool IsStyleSheetImport() const;
/**
@see DomainMapper_Impl::processDeferredCharacterProperties()
*/
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 78d7ba0..f001d99 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3450,6 +3450,11 @@ bool DomainMapper::IsInHeaderFooter() const
return m_pImpl->IsInHeaderFooter();
}
+bool DomainMapper::IsStyleSheetImport() const
+{
+ return m_pImpl->IsStyleSheetImport();
+}
+
void DomainMapper::enableInteropGrabBag(const OUString& aName)
{
m_pImpl->m_aInteropGrabBagName = aName;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index efbecfe..75eeb61 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/text/WritingMode2.hpp>
#include <ooxml/resourceids.hxx>
#include <dmapperLoggers.hxx>
+#include <dmapper/DomainMapper.hxx>
namespace writerfilter {
namespace dmapper {
@@ -40,7 +41,7 @@ using namespace ::com::sun::star;
using namespace ::std;
-DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
+DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, DomainMapper& rDMapper) :
m_nRow(0),
m_nCell(),
m_nGridSpan(1),
@@ -50,6 +51,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
m_nHeaderRepeat(0),
m_nTableWidth(0),
m_bOOXML( bOOXML ),
+ m_rDMapper( rDMapper ),
m_aTmpPosition(),
m_aTmpTableProperties(),
m_bPushCurrentWidth(false),
@@ -58,7 +60,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
m_bTableSizeTypeInserted(false),
m_nLayoutType(0),
m_nMaxFixedWidth(0),
- m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
+ m_pTablePropsHandler( new TablePropertiesHandler( bOOXML, rDMapper ) )
{
m_pTablePropsHandler->SetTableManager( this );
@@ -457,6 +459,18 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
case NS_ooxml::LN_CT_TrPrBase_gridAfter:
m_nGridAfter = nIntValue;
break;
+ case NS_ooxml::LN_CT_TblPrBase_tblCaption:
+ // To-Do: Not yet preserved
+ break;
+ case NS_ooxml::LN_CT_TblPrBase_tblDescription:
+ // To-Do: Not yet preserved
+ break;
+ case NS_ooxml::LN_CT_TrPrBase_tblCellSpacing:
+ // To-Do: Not yet preserved
+ break;
+ case NS_ooxml::LN_CT_TblPrBase_tblCellSpacing:
+ // To-Do: Not yet preserved
+ break;
default:
bRet = false;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 3f53e93..dfb8944 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -32,6 +32,8 @@
namespace writerfilter {
namespace dmapper {
+class DomainMapper;
+
class DomainMapperTableManager : public DomainMapperTableManager_Base_t
{
typedef boost::shared_ptr< std::vector<sal_Int32> > IntVectorPtr;
@@ -45,6 +47,7 @@ class DomainMapperTableManager : public DomainMapperTableManager_Base_t
sal_Int32 m_nHeaderRepeat; //counter of repeated headers - if == -1 then the repeating stops
sal_Int32 m_nTableWidth; //might be set directly or has to be calculated from the column positions
bool m_bOOXML;
+ DomainMapper& m_rDMapper;
OUString m_sTableStyleName;
/// Grab-bag of table look attributes for preserving.
comphelper::SequenceAsHashMap m_aTableLook;
@@ -76,7 +79,7 @@ class DomainMapperTableManager : public DomainMapperTableManager_Base_t
public:
- DomainMapperTableManager(bool bOOXML);
+ DomainMapperTableManager(bool bOOXML, DomainMapper& rDMapper);
virtual ~DomainMapperTableManager();
// use this method to avoid adding the properties for the table
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index e2f9c4b..8ec93fe 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -676,7 +676,7 @@ public:
void appendTableManager( )
{
boost::shared_ptr< DomainMapperTableManager > pMngr(
- new DomainMapperTableManager( m_eDocumentType == DOCUMENT_OOXML || m_eDocumentType == DOCUMENT_RTF ) );
+ new DomainMapperTableManager( m_eDocumentType == DOCUMENT_OOXML || m_eDocumentType == DOCUMENT_RTF, m_rDMapper ));
m_aTableManagers.push( pMngr );
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 50e9b7e..3d71739 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -382,7 +382,8 @@ StyleSheetTable::StyleSheetTable(DomainMapper& rDMapper,
bool const bIsNewDoc)
: LoggedProperties(dmapper_logger, "StyleSheetTable")
, LoggedTable(dmapper_logger, "StyleSheetTable")
-, m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument, bIsNewDoc) )
+, m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument, bIsNewDoc) ),
+m_rDMapper( rDMapper )
{
}
@@ -747,7 +748,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
if (!m_pImpl->m_pCurrentEntry)
break;
- TablePropertiesHandlerPtr pTblHandler( new TablePropertiesHandler( true ) );
+ TablePropertiesHandlerPtr pTblHandler( new TablePropertiesHandler( true, m_rDMapper ) );
pTblHandler->SetProperties( m_pImpl->m_pCurrentEntry->pProperties );
if ( !pTblHandler->sprm( rSprm ) )
{
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 43b3b43..7bc40a3 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -86,6 +86,7 @@ class StyleSheetTable :
public LoggedTable
{
StyleSheetTable_Impl *m_pImpl;
+ DomainMapper & m_rDMapper;
public:
StyleSheetTable( DomainMapper& rDMapper,
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index de66b33..e2d3031 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/text/VertOrientation.hpp>
#include <dmapperLoggers.hxx>
#include <oox/token/tokens.hxx>
+#include <dmapper/DomainMapper.hxx>
using namespace com::sun::star;
using namespace oox;
@@ -40,10 +41,11 @@ using namespace oox;
namespace writerfilter {
namespace dmapper {
- TablePropertiesHandler::TablePropertiesHandler( bool bOOXML ) :
+ TablePropertiesHandler::TablePropertiesHandler( bool bOOXML, DomainMapper& rDMapper ) :
m_pCurrentInteropGrabBag(0),
m_pTableManager( NULL ),
- m_bOOXML( bOOXML )
+ m_bOOXML( bOOXML ),
+ m_rDMapper( rDMapper )
{
}
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index 6f4b3c7..a4588e0 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -32,6 +32,7 @@
namespace writerfilter {
namespace dmapper {
+class DomainMapper;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > Handle_t;
typedef TableManager<Handle_t , TablePropertyMapPtr > DomainMapperTableManager_Base_t;
@@ -44,9 +45,10 @@ private:
std::vector<css::beans::PropertyValue>* m_pCurrentInteropGrabBag;
DomainMapperTableManager_Base_t *m_pTableManager;
bool m_bOOXML;
+ DomainMapper& m_rDMapper;
public:
- TablePropertiesHandler( bool bOOXML );
+ TablePropertiesHandler( bool bOOXML, DomainMapper& rDMapper );
virtual ~TablePropertiesHandler( );
bool sprm(Sprm & sprm);
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 24fee7d..0acccd6 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -33,7 +33,7 @@ namespace dmapper {
TblStylePrHandler::TblStylePrHandler( DomainMapper & rDMapper ) :
LoggedProperties(dmapper_logger, "TblStylePrHandler"),
m_rDMapper( rDMapper ),
-m_pTablePropsHandler( new TablePropertiesHandler( true ) ),
+m_pTablePropsHandler( new TablePropertiesHandler( true, rDMapper ) ),
m_nType( TBL_STYLE_UNKNOWN ),
m_pProperties( new PropertyMap )
{
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 42e7eb1..f2b8aeb 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -14636,6 +14636,12 @@
<element name="tblLook">
<ref name="CT_TblLook"/>
</element>
+ <element name="tblCaption">
+ <ref name="CT_String"/>
+ </element>
+ <element name="tblDescription">
+ <ref name="CT_String"/>
+ </element>
</define>
<define name="CT_TblPr">
<ref name="CT_TblPrBase"/>
@@ -14671,6 +14677,12 @@
<element name="tblLook">
<ref name="CT_TblLook"/>
</element>
+ <element name="tblCaption">
+ <ref name="CT_String"/>
+ </element>
+ <element name="tblDescription">
+ <ref name="CT_String"/>
+ </element>
</define>
<define name="CT_TblPrEx">
<ref name="CT_TblPrExBase"/>
@@ -18347,6 +18359,8 @@
<element name="tblLayout" tokenid="ooxml:CT_TblPrBase_tblLayout"/>
<element name="tblCellMar" tokenid="ooxml:CT_TblPrBase_tblCellMar"/>
<element name="tblLook" tokenid="ooxml:CT_TblPrBase_tblLook"/>
+ <element name="tblCaption" tokenid="ooxml:CT_TblPrBase_tblCaption"/>
+ <element name="tblDescription" tokenid="ooxml:CT_TblPrBase_tblDescription"/>
</resource>
<resource name="CT_TblPr" resource="Properties">
<element name="tblPrChange" tokenid="ooxml:CT_TblPr_tblPrChange"/>
commit 886e4edf59d212d88d50024e1bfe3664d3fc03c3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Aug 12 06:44:03 2014 +0200
let us use OpenGL types for OpenGL resources
Change-Id: I53dbbfb2f1d721bdbb076fa7cb45801659694a14
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 7b97215..f90ddc8 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -198,7 +198,7 @@ protected:
return (rBHelper.bDisposed || rBHelper.bInDispose);
}
- void createTexture( unsigned int* texID,
+ void createTexture( GLuint* texID,
#if defined( GLX_EXT_texture_from_pixmap )
GLXPixmap pixmap,
bool usePixmap,
@@ -232,10 +232,10 @@ private:
/** OpenGL handle to the leaving slide's texture
*/
- unsigned int maLeavingSlideGL;
+ GLuint maLeavingSlideGL;
/** OpenGL handle to the entering slide's texture
*/
- unsigned int maEnteringSlideGL;
+ GLuint maEnteringSlideGL;
Reference< presentation::XSlideShowView > mxView;
Reference< rendering::XIntegerBitmap > mxLeavingBitmap;
@@ -561,7 +561,7 @@ void OGLTransitionerImpl::setTransition( boost::shared_ptr<OGLTransitionImpl> co
impl_prepareTransition();
}
-void OGLTransitionerImpl::createTexture( unsigned int* texID,
+void OGLTransitionerImpl::createTexture( GLuint* texID,
#if defined( GLX_EXT_texture_from_pixmap )
GLXPixmap pixmap,
bool usePixmap,
commit d280b13b88abe71ed8f06b08d0b1179ddfcf9c63
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Aug 12 06:42:34 2014 +0200
fix indentation
Change-Id: If4d3f4babf8539b5e411d0549e1c1b51c5659930
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 378de36..7b97215 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -976,7 +976,7 @@ void OGLTransitionerImpl::impl_createTexture(
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); //TRILINEAR FILTERING
- //anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
+ //anistropic filtering (to make texturing not suck when looking at polygons from oblique angles)
GLfloat largest_supported_anisotropy;
glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);
commit 7914112f3054dc09f713dec8531d254ac87cfa52
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Aug 12 06:19:29 2014 +0200
nobody is using the win implementation anymore
Change-Id: I0cd39941353aab9bb5bad274aecc1550f583e9e5
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
deleted file mode 100644
index 08dc6db..0000000
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
+++ /dev/null
@@ -1,1315 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "OGLTrans_TransitionImpl.hxx"
-#include "OGLTrans_Shaders.hxx"
-#ifdef MACOSX
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#include <math.h>
-#endif
-
-void OGLTransitionImpl::clear()
-{
- for(unsigned int i( 0 ); i < OverallOperations.size(); ++i)
- delete OverallOperations[i];
- OverallOperations.clear();
- maLeavingSlidePrimitives.clear();
- maEnteringSlidePrimitives.clear();
- for(unsigned int i(0); i < maSceneObjects.size(); ++i)
- delete maSceneObjects[i];
- maSceneObjects.clear();
-
- mbReflectSlides = false;
-
-#ifdef GL_VERSION_2_0
- if( mProgramObject ) {
- OGLShaders::glDeleteProgram( mProgramObject );
- mProgramObject = 0;
- }
-
- if( mVertexObject ) {
- OGLShaders::glDeleteShader( mVertexObject );
- mVertexObject = 0;
- }
-
- if( mFragmentObject ) {
- OGLShaders::glDeleteShader( mFragmentObject );
- mFragmentObject = 0;
- }
-#endif
-
- if( maHelperTexture ) {
- glDeleteTextures( 1, &maHelperTexture );
- maHelperTexture = 0;
- }
-
- if( mmClearTransition )
- (this->*mmClearTransition)();
-}
-
-OGLTransitionImpl::~OGLTransitionImpl()
-{
- clear();
-}
-
-void OGLTransitionImpl::prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex )
-{
- for(unsigned int i(0); i < maSceneObjects.size(); ++i) {
- maSceneObjects[i]->prepare();
- }
-
- if( mmPrepareTransition )
- (this->*mmPrepareTransition)( glLeavingSlideTex, glEnteringSlideTex );
-}
-
-void OGLTransitionImpl::finish()
-{
- for(unsigned int i(0); i < maSceneObjects.size(); ++i) {
- maSceneObjects[i]->finish();
- }
-}
-
-static void blendSlide( double depth )
-{
- double showHeight = -1 + depth*2;
- GLfloat reflectionColor[] = {0, 0, 0, 0.25};
-
- glDisable( GL_DEPTH_TEST );
- glBegin( GL_QUADS );
- glColor4fv( reflectionColor );
- glVertex3f( -1, -1, 0 );
- glColor4f( 0, 0, 0, 1 );
- glVertex3f(-1, showHeight, 0 );
- glVertex3f( 1, showHeight, 0 );
- glColor4fv( reflectionColor );
- glVertex3f( 1, -1, 0 );
- glEnd();
-
- glBegin( GL_QUADS );
- glColor4f( 0, 0, 0, 1 );
- glVertex3f( -1, showHeight, 0 );
- glVertex3f( -1, 1, 0 );
- glVertex3f( 1, 1, 0 );
- glVertex3f( 1, showHeight, 0 );
- glEnd();
- glEnable( GL_DEPTH_TEST );
-}
-
-static void slideShadow( double nTime, Primitive& primitive, double sw, double sh )
-{
- double reflectionDepth = 0.3;
-
- glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glDisable(GL_LIGHTING);
-
- glPushMatrix();
- primitive.applyOperations( nTime, sw, sh );
- blendSlide( reflectionDepth );
- glPopMatrix();
-
- glDisable(GL_BLEND);
- glEnable(GL_LIGHTING);
-}
-
-void OGLTransitionImpl::display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex,
- double SlideWidth, double SlideHeight, double DispWidth, double DispHeight )
-{
- double SlideWidthScale, SlideHeightScale;
-
- SlideWidthScale = SlideWidth/DispWidth;
- SlideHeightScale = SlideHeight/DispHeight;
-
- if( mmPrepare ) {
- clear();
- (this->*mmPrepare)( nTime, SlideWidth, SlideHeight, DispWidth, DispHeight );
- }
-
- glPushMatrix();
- displaySlides( nTime, glLeavingSlideTex, glEnteringSlideTex, SlideWidthScale, SlideHeightScale );
- displayScene( nTime, SlideWidth, SlideHeight, DispWidth, DispHeight );
- glPopMatrix();
-}
-
-void OGLTransitionImpl::applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale )
-{
- for(unsigned int i(0); i < OverallOperations.size(); ++i)
- OverallOperations[i]->interpolate(nTime,SlideWidthScale,SlideHeightScale);
-}
-
-void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex, std::vector<Primitive>& primitives,
- double SlideWidthScale, double SlideHeightScale )
-{
- //TODO change to foreach
- glBindTexture(GL_TEXTURE_2D, glSlideTex);
-
- // display slide reflection
- // note that depth test is turned off while blending the shadow
- // so the slides has to be rendered in right order, see rochade as example
- if( mbReflectSlides ) {
- double surfaceLevel = -0.04;
-
- /* reflected slides */
- glPushMatrix();
-
- glScaled( 1, -1, 1 );
- glTranslated( 0, 2 - surfaceLevel, 0 );
-
- glCullFace(GL_FRONT);
- for(unsigned int i(0); i < primitives.size(); ++i)
- primitives[i].display(nTime, SlideWidthScale, SlideHeightScale);
- glCullFace(GL_BACK);
-
- slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale );
-
- glPopMatrix();
- }
-
- for(unsigned int i(0); i < primitives.size(); ++i)
- primitives[i].display(nTime, SlideWidthScale, SlideHeightScale);
-}
-
-void OGLTransitionImpl::displaySlides( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex,
- double SlideWidthScale, double SlideHeightScale )
-{
- if( mmDisplaySlides )
- (this->*mmDisplaySlides)( nTime, glLeavingSlideTex, glEnteringSlideTex, SlideWidthScale, SlideHeightScale );
- else {
- applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
-
- glEnable(GL_TEXTURE_2D);
- displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );
- displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale );
- }
-}
-
-void OGLTransitionImpl::displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight )
-{
- glEnable(GL_TEXTURE_2D);
- for(unsigned int i(0); i < maSceneObjects.size(); ++i)
- maSceneObjects[i]->display(nTime, SlideWidth, SlideHeight, DispWidth, DispHeight);
-}
-
-void Primitive::display(double nTime, double WidthScale, double HeightScale)
-{
- glPushMatrix();
-
- applyOperations( nTime, WidthScale, HeightScale );
-
- glEnableClientState( GL_VERTEX_ARRAY );
- if(!Normals.empty())
- {
- glNormalPointer( GL_DOUBLE , 0 , &Normals[0] );
- glEnableClientState( GL_NORMAL_ARRAY );
- }
- glEnableClientState( GL_TEXTURE_COORD_ARRAY );
- glTexCoordPointer( 2, GL_DOUBLE, 0, &TexCoords[0] );
- glVertexPointer( 3, GL_DOUBLE, 0, &Vertices[0] );
- glDrawArrays( GL_TRIANGLES, 0, Vertices.size() );
- glPopMatrix();
-}
-
-void Primitive::applyOperations(double nTime, double WidthScale, double HeightScale)
-{
- for(unsigned int i(0); i < Operations.size(); ++i)
- Operations[i]->interpolate( nTime ,WidthScale,HeightScale);
- glScaled(WidthScale,HeightScale,1);
-}
-
-Primitive::~Primitive()
-{
- for(unsigned int i( 0 ); i < Operations.size(); ++i)
- delete Operations[i];
-}
-
-
-void SceneObject::display(double nTime, double /* SlideWidth */, double /* SlideHeight */, double DispWidth, double DispHeight )
-{
- for(unsigned int 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
- glPushMatrix();
- if (DispHeight > DispWidth)
- glScaled(DispHeight/DispWidth, 1, 1);
- else
- glScaled(1, DispWidth/DispHeight, 1);
- maPrimitives[i].display(nTime, 1, 1);
- glPopMatrix();
- }
-}
-
-void SceneObject::pushPrimitive(const Primitive &p)
-{
- maPrimitives.push_back(p);
-}
-
-SceneObject::SceneObject()
- : maPrimitives()
-{
-}
-
-Iris::Iris()
- : SceneObject ()
-{
-}
-
-void Iris::display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight )
-{
- glBindTexture(GL_TEXTURE_2D, maTexture);
- SceneObject::display(nTime, SlideWidth, SlideHeight, DispWidth, DispHeight);
-}
-
-void Iris::prepare()
-{
- static const GLubyte img[3] = { 80, 80, 80 };
-
- glGenTextures(1, &maTexture);
- glBindTexture(GL_TEXTURE_2D, maTexture);
- glTexImage2D(GL_TEXTURE_2D, 0, 3, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, img);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
-}
-
-void Iris::finish()
-{
- glDeleteTextures(1, &maTexture);
-}
-
-void OGLTransitionImpl::makeOutsideCubeFaceToLeft()
-{
- clear();
- Primitive Slide;
-
- Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
- Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
-
- maLeavingSlidePrimitives.push_back(Slide);
-
- Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,-1),90,false,0.0,1.0));
-
- maEnteringSlidePrimitives.push_back(Slide);
-
- OverallOperations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,-1),-90,true,0.0,1.0));
-}
-
-void OGLTransitionImpl::makeInsideCubeFaceToLeft()
-{
- clear();
- Primitive Slide;
-
- Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
- Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
-
- maLeavingSlidePrimitives.push_back(Slide);
-
- Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,1),-90,false,0.0,1.0));
-
- maEnteringSlidePrimitives.push_back(Slide);
-
- OverallOperations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,1),90,true,0.0,1.0));
-}
-
-void OGLTransitionImpl::makeFallLeaving()
-{
- clear();
- Primitive Slide;
-
- Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
- Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
- maEnteringSlidePrimitives.push_back(Slide);
-
- Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(1,0,0),basegfx::B3DVector(0,-1,0), 90,true,0.0,1.0));
- maLeavingSlidePrimitives.push_back(Slide);
-
- mbUseMipMapEntering = false;
-}
-
-void OGLTransitionImpl::makeTurnAround()
-{
- clear();
- Primitive Slide;
-
- mbReflectSlides = true;
-
- Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
- Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
- maLeavingSlidePrimitives.push_back(Slide);
-
- Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,0),-180,false,0.0,1.0));
- maEnteringSlidePrimitives.push_back(Slide);
-
- OverallOperations.push_back(new STranslate(basegfx::B3DVector(0, 0, -1.5),true, 0, 0.5));
- OverallOperations.push_back(new STranslate(basegfx::B3DVector(0, 0, 1.5), true, 0.5, 1));
- OverallOperations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0, 1, 0),basegfx::B3DVector(0, 0, 0), -180, true, 0.0, 1.0));
-}
-
-void OGLTransitionImpl::makeTurnDown()
-{
- clear();
- Primitive Slide;
-
- Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
- Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
- maLeavingSlidePrimitives.push_back(Slide);
-
- Slide.Operations.push_back(new STranslate(basegfx::B3DVector(0, 0, 0.0001), false, -1.0, 0.0));
- Slide.Operations.push_back(new SRotate (basegfx::B3DVector(0, 0, 1), basegfx::B3DVector(-1, 1, 0), -90, true, 0.0, 1.0));
- Slide.Operations.push_back(new SRotate (basegfx::B3DVector(0, 0, 1), basegfx::B3DVector(-1, 1, 0), 90, false, -1.0, 0.0));
- maEnteringSlidePrimitives.push_back(Slide);
-
- mbUseMipMapLeaving = false;
-}
-
-void OGLTransitionImpl::makeIris()
-{
- clear();
- Primitive Slide;
-
- Slide.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0,1));
- Slide.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (0,1), basegfx::B2DVector (1,1));
- maEnteringSlidePrimitives.push_back (Slide);
-
- Slide.Operations.push_back (new STranslate (basegfx::B3DVector (0, 0, 0.000001), false, -1, 0));
- Slide.Operations.push_back (new STranslate (basegfx::B3DVector (0, 0, -0.000002), false, 0.5, 1));
- maLeavingSlidePrimitives.push_back (Slide);
-
-
- Primitive irisPart, part;
- int i, nSteps = 24, nParts = 7;
- double t = 1.0/nSteps, cx, cy, lcx, lcy, lx = 1, ly = 0, x, y, cxo, cyo, lcxo, lcyo, of=2.2, f=1.42;
-
- for (i=1; i<=nSteps; i++) {
- x = cos ((3*2*M_PI*t)/nParts);
- y = -sin ((3*2*M_PI*t)/nParts);
- cx = (f*x + 1)/2;
- cy = (f*y + 1)/2;
- lcx = (f*lx + 1)/2;
- lcy = (f*ly + 1)/2;
- cxo = (of*x + 1)/2;
- cyo = (of*y + 1)/2;
- lcxo = (of*lx + 1)/2;
- lcyo = (of*ly + 1)/2;
- irisPart.pushTriangle (basegfx::B2DVector (lcx, lcy),
- basegfx::B2DVector (lcxo, lcyo),
- basegfx::B2DVector (cx, cy));
- irisPart.pushTriangle (basegfx::B2DVector (cx, cy),
- basegfx::B2DVector (lcxo, lcyo),
- basegfx::B2DVector (cxo, cyo));
- lx = x;
- ly = y;
- t += 1.0/nSteps;
- }
-
- Iris* pIris = new Iris();
- double angle = 87;
-
- for (i = 0; i < nParts; i++) {
- irisPart.Operations.clear ();
- double rx, ry;
-
- rx = cos ((2*M_PI*i)/nParts);
- ry = sin ((2*M_PI*i)/nParts);
- irisPart.Operations.push_back (new SRotate (basegfx::B3DVector(0, 0, 1), basegfx::B3DVector(rx, ry, 0), angle, true, 0.0, 0.5));
- irisPart.Operations.push_back (new SRotate (basegfx::B3DVector(0, 0, 1), basegfx::B3DVector(rx, ry, 0), -angle, true, 0.5, 1));
- if (i > 0) {
- irisPart.Operations.push_back (new STranslate (basegfx::B3DVector(rx, ry, 0), false, -1, 0));
- irisPart.Operations.push_back (new SRotate (basegfx::B3DVector(0, 0, 1), basegfx::B3DVector(0, 0, 0), i*360.0/nParts, false, -1, 0));
- irisPart.Operations.push_back (new STranslate (basegfx::B3DVector(-1, 0, 0), false, -1, 0));
- }
- irisPart.Operations.push_back(new STranslate(basegfx::B3DVector(0, 0, 1), false, -2, 0.0));
- irisPart.Operations.push_back (new SRotate (basegfx::B3DVector(1, .5, 0), basegfx::B3DVector(1, 0, 0), -30, false, -1, 0));
- pIris->pushPrimitive (irisPart);
- }
-
- maSceneObjects.push_back (pIris);
-
- mbUseMipMapLeaving = mbUseMipMapEntering = false;
-}
-
-void OGLTransitionImpl::displaySlidesRochade( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex,
- double SlideWidthScale, double SlideHeightScale )
-{
- applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
-
- glEnable(GL_TEXTURE_2D);
-
- if( nTime > .5) {
- displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );
- displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale );
- } else {
- displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale );
- displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );
- }
-}
-
-void OGLTransitionImpl::makeRochade()
-{
- clear();
- Primitive Slide;
-
- mbReflectSlides = true;
- mmDisplaySlides = &OGLTransitionImpl::displaySlidesRochade;
-
- double w, h;
-
- w = 2.2;
- h = 10;
-
- Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
- Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
-
- Slide.Operations.push_back(new SEllipseTranslate(w, h, 0.25, -0.25, true, 0, 1));
- Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,0), -45, true, 0, 1));
- maLeavingSlidePrimitives.push_back(Slide);
-
- Slide.Operations.clear();
- Slide.Operations.push_back(new SEllipseTranslate(w, h, 0.75, 0.25, true, 0, 1));
- Slide.Operations.push_back(new STranslate(basegfx::B3DVector(0, 0, -h), false, -1, 0));
- Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,0), -45, true, 0, 1));
- Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0,1,0),basegfx::B3DVector(0,0,0), 45, false, -1, 0));
- maEnteringSlidePrimitives.push_back(Slide);
-
-}
-
-// TODO(Q3): extract to basegfx
-inline basegfx::B2DVector clamp(const basegfx::B2DVector& v)
-{
- return basegfx::B2DVector(min(max(v.getX(),-1.0),1.0),
- min(max(v.getY(),-1.0),1.0));
-}
-
-// TODO(Q3): extract to basegfx
-inline basegfx::B3DVector clamp(const basegfx::B3DVector& v)
-{
- return basegfx::B3DVector(min(max(v.getX(),-1.0),1.0),
- min(max(v.getY(),-1.0),1.0),
- min(max(v.getZ(),-1.0),1.0));
-}
-
-inline double randFromNeg1to1()
-{
- return ( ( static_cast<double>( rand() ) / static_cast<double>( RAND_MAX ) ) * 2.0 ) - 1.0;
-}
-
-// TODO(Q3): extract to basegfx
-inline basegfx::B3DVector randNormVectorInXYPlane()
-{
- basegfx::B3DVector toReturn(randFromNeg1to1(),randFromNeg1to1(),0.0);
- return toReturn/toReturn.getLength();
-}
-
-void OGLTransitionImpl::makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt16 nPointsOnCircles )
-{
- clear();
- double dAngle(2*3.1415926/static_cast<double>( nPointsOnCircles ));
- if(nCircles < 2 || nPointsOnCircles < 4)
- {
- makeNByMTileFlip(1,1);
- return;
- }
- double Radius(1.0/static_cast<double>( nCircles ));
- double dRadius(Radius);
- double LastRadius(0.0);
- double NextRadius(2*Radius);
-
- /// now we know there is at least two circles
- /// the first will always be a full circle
- /// the last will always be the outer shell of the slide with a circle hole
-
- //add the full circle
- vector<basegfx::B2DVector> unScaledTexCoords;
- double TempAngle(0.0);
- for(unsigned int Point(0); Point < nPointsOnCircles; ++Point)
- {
- unScaledTexCoords.push_back( basegfx::B2DVector( cos(TempAngle - 3.1415926/2.0) , sin(TempAngle- 3.1415926/2.0) ) );
-
- TempAngle += dAngle;
- }
-
- {
- Primitive EnteringSlide;
- Primitive LeavingSlide;
- for(int Point(0); Point + 1 < nPointsOnCircles; ++Point)
- {
- EnteringSlide.pushTriangle( basegfx::B2DVector( 0.5 , 0.5 ) , Radius * unScaledTexCoords[ Point + 1 ] / 2.0 + basegfx::B2DVector( 0.5 , 0.5 ) , Radius * unScaledTexCoords[ Point ] / 2.0 + basegfx::B2DVector( 0.5 , 0.5 ) );
- LeavingSlide.pushTriangle( basegfx::B2DVector( 0.5 , 0.5 ) , Radius * unScaledTexCoords[ Point + 1 ] / 2.0 + basegfx::B2DVector( 0.5 , 0.5 ) , Radius * unScaledTexCoords[ Point ] / 2.0 + basegfx::B2DVector( 0.5, 0.5) );
- }
- EnteringSlide.pushTriangle( basegfx::B2DVector(0.5,0.5) , Radius * unScaledTexCoords[ 0 ] / 2.0 + basegfx::B2DVector( 0.5 , 0.5 ) , Radius * unScaledTexCoords[ nPointsOnCircles - 1 ] / 2.0 + basegfx::B2DVector( 0.5 , 0.5 ) );
- LeavingSlide.pushTriangle( basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) );
-
- basegfx::B3DVector axis(randNormVectorInXYPlane());
- EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, Radius/2.0 , (NextRadius + 1)/2.0 ) );
- LeavingSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, Radius/2.0 , (NextRadius + 1)/2.0 ) );
- EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , -180, false,0.0,1.0) );
-
- maEnteringSlidePrimitives.push_back(EnteringSlide);
- maLeavingSlidePrimitives.push_back(LeavingSlide);
- LastRadius = Radius;
- Radius = NextRadius;
- NextRadius += dRadius;
- }
-
- for(int i(1); i < nCircles - 1; ++i)
- {
- Primitive LeavingSlide;
- Primitive EnteringSlide;
- for(int Side(0); Side < nPointsOnCircles - 1; ++Side)
- {
- EnteringSlide.pushTriangle(Radius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) );
- EnteringSlide.pushTriangle(Radius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) );
-
- LeavingSlide.pushTriangle(Radius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) );
- LeavingSlide.pushTriangle(Radius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) );
- }
-
- EnteringSlide.pushTriangle(Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) );
- EnteringSlide.pushTriangle(Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) );
-
- LeavingSlide.pushTriangle(Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) );
- LeavingSlide.pushTriangle(Radius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , Radius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) );
-
- basegfx::B3DVector axis(randNormVectorInXYPlane());
- EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, Radius/2.0 , (NextRadius + 1)/2.0 ) );
- LeavingSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, Radius/2.0 , (NextRadius + 1)/2.0 ) );
- EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , -180, false,0.0,1.0) );
-
- maEnteringSlidePrimitives.push_back(EnteringSlide);
- maLeavingSlidePrimitives.push_back(LeavingSlide);
-
- LastRadius = Radius;
- Radius = NextRadius;
- NextRadius += dRadius;
- }
- {
- Radius = sqrt(2.0);
- Primitive LeavingSlide;
- Primitive EnteringSlide;
- for(int Side(0); Side < nPointsOnCircles - 1; ++Side)
- {
-
- EnteringSlide.pushTriangle(clamp(Radius*unScaledTexCoords[Side])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) );
- EnteringSlide.pushTriangle(clamp(Radius*unScaledTexCoords[Side])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) , clamp(Radius*unScaledTexCoords[Side + 1])/2.0 + basegfx::B2DVector(0.5,0.5) );
-
- LeavingSlide.pushTriangle(clamp(Radius*unScaledTexCoords[Side])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) );
- LeavingSlide.pushTriangle(clamp(Radius*unScaledTexCoords[Side])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[Side + 1]/2.0 + basegfx::B2DVector(0.5,0.5) , clamp(Radius*unScaledTexCoords[Side + 1])/2.0 + basegfx::B2DVector(0.5,0.5) );
- }
-
- EnteringSlide.pushTriangle(clamp(Radius*unScaledTexCoords[nPointsOnCircles - 1])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) );
- EnteringSlide.pushTriangle(clamp(Radius*unScaledTexCoords[nPointsOnCircles - 1])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , clamp(Radius*unScaledTexCoords[0])/2.0 + basegfx::B2DVector(0.5,0.5) );
-
- LeavingSlide.pushTriangle(clamp(Radius*unScaledTexCoords[nPointsOnCircles - 1])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[nPointsOnCircles - 1]/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) );
- LeavingSlide.pushTriangle(clamp(Radius*unScaledTexCoords[nPointsOnCircles - 1])/2.0 + basegfx::B2DVector(0.5,0.5) , LastRadius*unScaledTexCoords[0]/2.0 + basegfx::B2DVector(0.5,0.5) , clamp(Radius*unScaledTexCoords[0])/2.0 + basegfx::B2DVector(0.5,0.5) );
-
- basegfx::B3DVector axis(randNormVectorInXYPlane());
- EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, (LastRadius + dRadius)/2.0 , 1.0 ) );
- LeavingSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , 180, true, (LastRadius + dRadius)/2.0 , 1.0 ) );
- EnteringSlide.Operations.push_back( new SRotate( axis , basegfx::B3DVector(0,0,0) , -180, false,0.0,1.0) );
-
- maEnteringSlidePrimitives.push_back(EnteringSlide);
- maLeavingSlidePrimitives.push_back(LeavingSlide);
- }
-}
-
-void OGLTransitionImpl::makeHelix( ::sal_uInt16 nRows )
-{
- clear();
- double invN(1.0/static_cast<double>(nRows));
- double iDn = 0.0;
- double iPDn = invN;
- for(unsigned int i(0); i < nRows; ++i)
- {
- Primitive Tile;
-
- Tile.pushTriangle(basegfx::B2DVector( 1.0 , iDn ) , basegfx::B2DVector( 0.0 , iDn ) , basegfx::B2DVector( 0.0 , iPDn ));
-
- Tile.pushTriangle(basegfx::B2DVector( 1.0 , iPDn ) , basegfx::B2DVector( 1.0 , iDn ) , basegfx::B2DVector( 0.0 , iPDn ));
-
- Tile.Operations.push_back( new SRotate( basegfx::B3DVector( 0 , 1 , 0 ) , ( Tile.getVertices()[1] + Tile.getVertices()[3] )/2.0 , 180 ,
- true,min(max(static_cast<double>(i - nRows/2.0)*invN/2.0,0.0),1.0),
- min(max(static_cast<double>(i + nRows/2.0)*invN/2.0,0.0),1.0) ) );
-
- maLeavingSlidePrimitives.push_back(Tile);
-
- Tile.Operations.push_back( new SRotate( basegfx::B3DVector( 0 , 1 , 0 ) , ( Tile.getVertices()[1] + Tile.getVertices()[3] )/2.0 , -180 , false,0.0,1.0) );
-
- maEnteringSlidePrimitives.push_back(Tile);
-
- iDn += invN;
- iPDn += invN;
- }
-}
-
-void OGLTransitionImpl::makeNByMTileFlip( ::sal_uInt16 n, ::sal_uInt16 m )
-{
- clear();
- double invN(1.0/static_cast<double>(n));
- double invM(1.0/static_cast<double>(m));
- double iDn = 0.0;
- double iPDn = invN;
- for(unsigned int i(0); i < n; ++i)
- {
- double jDm = 0.0;
- double jPDm = invM;
- for(unsigned int j(0); j < m; ++j)
- {
- Primitive Tile;
-
- Tile.pushTriangle(basegfx::B2DVector( iPDn , jDm ) , basegfx::B2DVector( iDn , jDm ) , basegfx::B2DVector( iDn , jPDm ));
-
- Tile.pushTriangle(basegfx::B2DVector( iPDn , jPDm ) , basegfx::B2DVector( iPDn , jDm ) , basegfx::B2DVector( iDn , jPDm ));//bottom left corner of tile
-
- Tile.Operations.push_back( new SRotate( basegfx::B3DVector( 1 , 1 , 0 ) , ( Tile.getVertices()[1] + Tile.getVertices()[3] )/2.0 , 180 , true, iDn*jDm/2.0 , ((iPDn*jPDm)+1.0)/2.0 ) );
- maLeavingSlidePrimitives.push_back(Tile);
- Tile.Operations.push_back( new SRotate( basegfx::B3DVector( 1 , 1 , 0 ) , ( Tile.getVertices()[1] + Tile.getVertices()[3] )/2.0 , -180, false, iDn*jDm/2.0 , ((iPDn*jPDm)+1.0)/2.0 ) );
-
- maEnteringSlidePrimitives.push_back(Tile);
-
- jDm += invM;
- jPDm += invM;
- }
- iDn += invN;
- iPDn += invN;
- }
-}
-
-SRotate::SRotate(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle, bool bInter, double T0, double T1):axis(Axis),origin(Origin),angle(Angle)
-{
- nT0 = T0;
- nT1 = T1;
- bInterpolate = bInter;
-}
-
-SScale::SScale(const basegfx::B3DVector& Scale,const basegfx::B3DVector& Origin, bool bInter, double T0, double T1):scale(Scale),origin(Origin)
-{
- nT0 = T0;
- nT1 = T1;
- bInterpolate = bInter;
-}
-
-RotateAndScaleDepthByWidth::RotateAndScaleDepthByWidth(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle, bool bInter, double T0, double T1):axis(Axis),origin(Origin),angle(Angle)
-{
- nT0 = T0;
- nT1 = T1;
- bInterpolate = bInter;
-}
-
-RotateAndScaleDepthByHeight::RotateAndScaleDepthByHeight(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle, bool bInter, double T0, double T1):axis(Axis),origin(Origin),angle(Angle)
-{
- nT0 = T0;
- nT1 = T1;
- bInterpolate = bInter;
-}
-
-
-STranslate::STranslate(const basegfx::B3DVector& Vector, bool bInter, double T0, double T1):vector(Vector)
-{
- nT0 = T0;
- nT1 = T1;
- bInterpolate = bInter;
-}
-
-inline double intervalInter(double t, double T0, double T1)
-{
- return ( t - T0 ) / ( T1 - T0 );
-}
-
-void STranslate::interpolate(double t,double SlideWidthScale,double SlideHeightScale)
-{
- if(t <= nT0)
- return;
- if(!bInterpolate || t > nT1)
- t = nT1;
- t = intervalInter(t,nT0,nT1);
- glTranslated(SlideWidthScale*t*vector.getX(),SlideHeightScale*t*vector.getY(),t*vector.getZ());
-}
-
-void SRotate::interpolate(double t,double SlideWidthScale,double SlideHeightScale)
-{
- if(t <= nT0)
- return;
- if(!bInterpolate || t > nT1)
- t = nT1;
- t = intervalInter(t,nT0,nT1);
- glTranslated(SlideWidthScale*origin.getX(),SlideHeightScale*origin.getY(),origin.getZ());
- glScaled(SlideWidthScale,SlideHeightScale,1);
- glRotated(t*angle,axis.getX(),axis.getY(),axis.getZ());
- glScaled(1/SlideWidthScale,1/SlideHeightScale,1);
- glTranslated(-SlideWidthScale*origin.getX(),-SlideHeightScale*origin.getY(),-origin.getZ());
-}
-
-void SScale::interpolate(double t,double SlideWidthScale,double SlideHeightScale)
-{
- if(t <= nT0)
- return;
- if(!bInterpolate || t > nT1)
- t = nT1;
- t = intervalInter(t,nT0,nT1);
- glTranslated(SlideWidthScale*origin.getX(),SlideHeightScale*origin.getY(),origin.getZ());
- glScaled((1-t) + t*scale.getX(),(1-t) + t*scale.getY(),(1-t) + t*scale.getZ());
- glTranslated(-SlideWidthScale*origin.getX(),-SlideHeightScale*origin.getY(),-origin.getZ());
-}
-
-void RotateAndScaleDepthByWidth::interpolate(double t,double SlideWidthScale,double SlideHeightScale)
-{
- if(t <= nT0)
- return;
- if(!bInterpolate || t > nT1)
- t = nT1;
- t = intervalInter(t,nT0,nT1);
- glTranslated(SlideWidthScale*origin.getX(),SlideHeightScale*origin.getY(),SlideWidthScale*origin.getZ());
- glRotated(t*angle,axis.getX(),axis.getY(),axis.getZ());
- glTranslated(-SlideWidthScale*origin.getX(),-SlideHeightScale*origin.getY(),-SlideWidthScale*origin.getZ());
-}
-
-void RotateAndScaleDepthByHeight::interpolate(double t,double SlideWidthScale,double SlideHeightScale)
-{
- if(t <= nT0)
- return;
- if(!bInterpolate || t > nT1)
- t = nT1;
- t = intervalInter(t,nT0,nT1);
- glTranslated(SlideWidthScale*origin.getX(),SlideHeightScale*origin.getY(),SlideHeightScale*origin.getZ());
- glRotated(t*angle,axis.getX(),axis.getY(),axis.getZ());
- glTranslated(-SlideWidthScale*origin.getX(),-SlideHeightScale*origin.getY(),-SlideHeightScale*origin.getZ());
-}
-
-SEllipseTranslate::SEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1)
-{
- nT0 = T0;
- nT1 = T1;
- bInterpolate = bInter;
- width = dWidth;
- height = dHeight;
- startPosition = dStartPosition;
- endPosition = dEndPosition;
-}
-
-void SEllipseTranslate::interpolate(double t,double /* SlideWidthScale */,double /* SlideHeightScale */)
-{
- if(t <= nT0)
- return;
- if(!bInterpolate || t > nT1)
- t = nT1;
- t = intervalInter(t,nT0,nT1);
-
- double a1, a2, x, y;
- a1 = startPosition*2*M_PI;
- a2 = (startPosition + t*(endPosition - startPosition))*2*M_PI;
- x = width*(cos (a2) - cos (a1))/2;
- y = height*(sin (a2) - sin (a1))/2;
-
- glTranslated(x, 0, y);
-}
-
-STranslate* STranslate::clone()
-{
- return new STranslate(*this);
-}
-SRotate* SRotate::clone()
-{
- return new SRotate(*this);
-}
-
-SScale* SScale::clone()
-{
- return new SScale(*this);
-}
-
-SEllipseTranslate* SEllipseTranslate::clone()
-{
- return new SEllipseTranslate(*this);
-}
-
-RotateAndScaleDepthByWidth* RotateAndScaleDepthByWidth::clone()
-{
- return new RotateAndScaleDepthByWidth(*this);
-}
-
-RotateAndScaleDepthByHeight* RotateAndScaleDepthByHeight::clone()
-{
- return new RotateAndScaleDepthByHeight(*this);
-}
-
-Primitive& Primitive::operator=(const Primitive& rvalue)
-{
- for(unsigned int i( 0 ); i < rvalue.Operations.size(); ++i)
- Operations.push_back(rvalue.Operations[i]->clone());
- for(unsigned int i( 0 ); i < rvalue.Vertices.size(); ++i)//SPEED! use copy or something. this is slow.
- Vertices.push_back(rvalue.Vertices[i]);
- for(unsigned int i( 0 ); i < rvalue.TexCoords.size(); ++i)//SPEED! use copy or something. this is slow.
- TexCoords.push_back(rvalue.TexCoords[i]);
- for(unsigned int i( 0 ); i < rvalue.Normals.size(); ++i)//SPEED! use copy or something. this is slow.
- Normals.push_back(rvalue.Normals[i]);
- return *this;
-}
-
-Primitive::Primitive(const Primitive& rvalue)
-{
- for(unsigned int i( 0 ); i < rvalue.Operations.size(); ++i)
- Operations.push_back(rvalue.Operations[i]->clone());
- for(unsigned int i( 0 ); i < rvalue.Vertices.size(); ++i)//SPEED! use copy or something. this is slow.
- Vertices.push_back(rvalue.Vertices[i]);
- for(unsigned int i( 0 ); i < rvalue.TexCoords.size(); ++i)//SPEED! use copy or something. this is slow.
- TexCoords.push_back(rvalue.TexCoords[i]);
- for(unsigned int i( 0 ); i < rvalue.Normals.size(); ++i)//SPEED! use copy or something. this is slow.
- Normals.push_back(rvalue.Normals[i]);
-}
-
-void Primitive::pushTriangle(const basegfx::B2DVector& SlideLocation0,const basegfx::B2DVector& SlideLocation1,const basegfx::B2DVector& SlideLocation2)
-{
- vector<basegfx::B3DVector> Verts;
- vector<basegfx::B2DVector> Texs;
- Verts.reserve(3);
- Texs.reserve(3);
-
- Verts.push_back(basegfx::B3DVector( 2*SlideLocation0.getX() - 1, -2*SlideLocation0.getY() + 1 , 0.0 ));
- Verts.push_back(basegfx::B3DVector( 2*SlideLocation1.getX() - 1, -2*SlideLocation1.getY() + 1 , 0.0 ));
- Verts.push_back(basegfx::B3DVector( 2*SlideLocation2.getX() - 1, -2*SlideLocation2.getY() + 1 , 0.0 ));
-
- //figure out if they're facing the correct way, and make them face the correct way.
- basegfx::B3DVector Normal( basegfx::cross( Verts[0] - Verts[1] , Verts[1] - Verts[2] ) );
- if(Normal.getZ() >= 0.0)//if the normal is facing us
- {
- Texs.push_back(SlideLocation0);
- Texs.push_back(SlideLocation1);
- Texs.push_back(SlideLocation2);
- }
- else // if the normal is facing away from us, make it face us
- {
- Texs.push_back(SlideLocation0);
- Texs.push_back(SlideLocation2);
- Texs.push_back(SlideLocation1);
- Verts.clear();
- Verts.push_back(basegfx::B3DVector( 2*SlideLocation0.getX() - 1, -2*SlideLocation0.getY() + 1 , 0.0 ));
- Verts.push_back(basegfx::B3DVector( 2*SlideLocation2.getX() - 1, -2*SlideLocation2.getY() + 1 , 0.0 ));
- Verts.push_back(basegfx::B3DVector( 2*SlideLocation1.getX() - 1, -2*SlideLocation1.getY() + 1 , 0.0 ));
- }
-
- Vertices.push_back(Verts[0]);
- Vertices.push_back(Verts[1]);
- Vertices.push_back(Verts[2]);
-
- TexCoords.push_back(Texs[0]);
- TexCoords.push_back(Texs[1]);
- TexCoords.push_back(Texs[2]);
-
- Normals.push_back(basegfx::B3DVector(0,0,1));//all normals always face the screen when untransformed.
- Normals.push_back(basegfx::B3DVector(0,0,1));//all normals always face the screen when untransformed.
- Normals.push_back(basegfx::B3DVector(0,0,1));//all normals always face the screen when untransformed.
-}
-
-void OGLTransitionImpl::makeDiamond()
-{
- mmPrepare = &OGLTransitionImpl::prepareDiamond;
- mbUseMipMapLeaving = mbUseMipMapEntering = false;
-}
-
-void OGLTransitionImpl::prepareDiamond( double nTime, double /* SlideWidth */, double /* SlideHeight */, double /* DispWidth */, double /* DispHeight */ )
-{
- Primitive Slide1, Slide2;
-
- Slide1.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0,1));
- Slide1.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (0,1), basegfx::B2DVector (1,1));
- maEnteringSlidePrimitives.push_back (Slide1);
-
-
- if( nTime >= 0.5 ) {
- double m = 1 - nTime;
-
- Slide2.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (m,0), basegfx::B2DVector (0,m));
- Slide2.pushTriangle (basegfx::B2DVector (nTime,0), basegfx::B2DVector (1,0), basegfx::B2DVector (1,m));
- Slide2.pushTriangle (basegfx::B2DVector (1,nTime), basegfx::B2DVector (1,1), basegfx::B2DVector (nTime,1));
- Slide2.pushTriangle (basegfx::B2DVector (0,nTime), basegfx::B2DVector (m,1), basegfx::B2DVector (0,1));
- } else {
- double l = 0.5 - nTime;
- double h = 0.5 + nTime;
-
- Slide2.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0.5,l));
- Slide2.pushTriangle (basegfx::B2DVector (0.5,l), basegfx::B2DVector (1,0), basegfx::B2DVector (h,0.5));
- Slide2.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (1,1), basegfx::B2DVector (h,0.5));
- Slide2.pushTriangle (basegfx::B2DVector (h,0.5), basegfx::B2DVector (1,1), basegfx::B2DVector (0.5,h));
- Slide2.pushTriangle (basegfx::B2DVector (0.5,h), basegfx::B2DVector (1,1), basegfx::B2DVector (0,1));
- Slide2.pushTriangle (basegfx::B2DVector (l,0.5), basegfx::B2DVector (0.5,h), basegfx::B2DVector (0,1));
- Slide2.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (l,0.5), basegfx::B2DVector (0,1));
- Slide2.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (0.5,l), basegfx::B2DVector (l,0.5));
- }
- Slide2.Operations.push_back (new STranslate (basegfx::B3DVector (0, 0, 0.00000001), false, -1, 0));
- maLeavingSlidePrimitives.push_back (Slide2);
-}
-
-void OGLTransitionImpl::makeVenetianBlinds( bool vertical, int parts )
-{
- static double t30 = tan( M_PI/6.0 );
- double n, ln = 0;
- double p = 1.0/parts;
-
- for( int i=0; i<parts; i++ ) {
- Primitive Slide;
- n = (i + 1)/(double)parts;
- if( vertical ) {
- Slide.pushTriangle (basegfx::B2DVector (ln,0), basegfx::B2DVector (n,0), basegfx::B2DVector (ln,1));
- Slide.pushTriangle (basegfx::B2DVector (n,0), basegfx::B2DVector (ln,1), basegfx::B2DVector (n,1));
- Slide.Operations.push_back(new RotateAndScaleDepthByWidth(basegfx::B3DVector(0, 1, 0), basegfx::B3DVector(n + ln - 1, 0, -t30*p), -120, true, 0.0, 1.0));
- } else {
- Slide.pushTriangle (basegfx::B2DVector (0,ln), basegfx::B2DVector (1,ln), basegfx::B2DVector (0,n));
- Slide.pushTriangle (basegfx::B2DVector (1,ln), basegfx::B2DVector (0,n), basegfx::B2DVector (1,n));
- Slide.Operations.push_back(new RotateAndScaleDepthByHeight(basegfx::B3DVector(1, 0, 0), basegfx::B3DVector(0, 1 - n - ln, -t30*p), -120, true, 0.0, 1.0));
- }
- maLeavingSlidePrimitives.push_back (Slide);
-
- if( vertical ) {
- Slide.Operations.push_back(new SRotate(basegfx::B3DVector(0, 1, 0), basegfx::B3DVector(2*n - 1, 0, 0), -60, false, -1, 0));
- Slide.Operations.push_back(new SRotate(basegfx::B3DVector(0, 1, 0), basegfx::B3DVector(n + ln - 1, 0, 0), 180, false, -1, 0));
- } else {
- Slide.Operations.push_back(new SRotate(basegfx::B3DVector(1, 0, 0), basegfx::B3DVector(0, 1 - 2*n, 0), -60, false, -1, 0));
- Slide.Operations.push_back(new SRotate(basegfx::B3DVector(1, 0, 0), basegfx::B3DVector(0, 1 - n - ln, 0), 180, false, -1, 0));
- }
- maEnteringSlidePrimitives.push_back (Slide);
- ln = n;
- }
-}
-
-void OGLTransitionImpl::displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale )
-{
- applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
-
- glDisable(GL_DEPTH_TEST);
-
- displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );
-
- glDisable(GL_LIGHTING);
- glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
- glColor4f( 1, 1, 1, nTime );
- displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale );
- glDisable(GL_BLEND);
- glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- glEnable(GL_LIGHTING);
-
- glEnable(GL_DEPTH_TEST);
-}
-
-void OGLTransitionImpl::makeFadeSmoothly()
-{
- Primitive Slide;
-
- Slide.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0,1));
- Slide.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (0,1), basegfx::B2DVector (1,1));
- maLeavingSlidePrimitives.push_back (Slide);
- maEnteringSlidePrimitives.push_back (Slide);
-
- mmDisplaySlides = &OGLTransitionImpl::displaySlidesFadeSmoothly;
- mbUseMipMapLeaving = mbUseMipMapEntering = false;
-}
-
-void OGLTransitionImpl::displaySlidesFadeThroughBlack( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale )
-{
- applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
-
- glDisable(GL_DEPTH_TEST);
-
- glDisable(GL_LIGHTING);
- glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
- if( nTime < 0.5 ) {
- glColor4f( 1, 1, 1, 1 - nTime*2 );
- displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );
- } else {
- glColor4f( 1, 1, 1, (nTime - 0.5)*2 );
- displaySlide( nTime, glEnteringSlideTex, maEnteringSlidePrimitives, SlideWidthScale, SlideHeightScale );
- }
- glDisable(GL_BLEND);
- glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- glEnable(GL_LIGHTING);
-
- glEnable(GL_DEPTH_TEST);
-}
-
-void OGLTransitionImpl::makeFadeThroughBlack()
-{
- Primitive Slide;
-
- Slide.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0,1));
- Slide.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (0,1), basegfx::B2DVector (1,1));
- maLeavingSlidePrimitives.push_back (Slide);
- maEnteringSlidePrimitives.push_back (Slide);
-
- mmDisplaySlides = &OGLTransitionImpl::displaySlidesFadeThroughBlack;
- mbUseMipMapLeaving = mbUseMipMapEntering = false;
-}
-
-static const char* basicVertexShader = "\n\
-varying vec2 v_texturePosition;\n\
-\n\
-void main( void )\n\
-{\n\
- gl_Position = ftransform();\n\
- v_texturePosition = gl_MultiTexCoord0.xy;\n\
-}\n\
-";
-
-static const char* staticFragmentShader = "\n\
-uniform sampler2D leavingSlideTexture;\n\
-uniform sampler2D enteringSlideTexture;\n\
-uniform sampler2D permTexture;\n\
-uniform float time;\n\
-varying vec2 v_texturePosition;\n\
-\n\
-float snoise(vec2 P) {\n\
-\n\
- return texture2D(permTexture, P).r;\n\
-}\n\
-\n\
-\n\
-#define PART 0.5\n\
-#define START 0.4\n\
-#define END 0.9\n\
-\n\
-void main() {\n\
- float sn = snoise(10.0*v_texturePosition+time*0.07);\n\
- if( time < PART ) {\n\
- float sn1 = snoise(vec2(time*15.0, 20.0*v_texturePosition.y));\n\
- float sn2 = snoise(v_texturePosition);\n\
- if (sn1 > 1.0 - time*time && sn2 < 2.0*time+0.1)\n\
- gl_FragColor = vec4(sn, sn, sn, 1.0);\n\
- else if (time > START )\n\
- gl_FragColor = ((time-START)/(PART - START))*vec4(sn, sn, sn, 1.0) + (1.0 - (time - START)/(PART - START))*texture2D(leavingSlideTexture, v_texturePosition);\n\
- else\n\
- gl_FragColor = texture2D(leavingSlideTexture, v_texturePosition);\n\
- } else if ( time < PART ) {\n\
- gl_FragColor = texture2D(leavingSlideTexture, v_texturePosition);\n\
- } else if ( time > END ) {\n\
- gl_FragColor = ((1.0 - time)/(1.0 - END))*vec4(sn, sn, sn, 1.0) + ((time - END)/(1.0 - END))*texture2D(enteringSlideTexture, v_texturePosition);\n\
- } else \n\
- gl_FragColor = vec4(sn, sn, sn, 1.0);\n\
-}\n\
-";
-
-static const char* dissolveFragmentShader = "\n\
-uniform sampler2D leavingSlideTexture;\n\
-uniform sampler2D enteringSlideTexture;\n\
-uniform sampler2D permTexture;\n\
-uniform float time;\n\
-varying vec2 v_texturePosition;\n\
-\n\
-float snoise(vec2 P) {\n\
-\n\
- return texture2D(permTexture, P).r;\n\
-}\n\
-\n\
-void main() {\n\
- float sn = snoise(10.0*v_texturePosition);\n\
- if( sn < time)\n\
- gl_FragColor = texture2D(enteringSlideTexture, v_texturePosition);\n\
- else\n\
- gl_FragColor = texture2D(leavingSlideTexture, v_texturePosition);\n\
-}\n\
-";
-
-int permutation256 [256]= {
-215, 100, 200, 204, 233, 50, 85, 196,
- 71, 141, 122, 160, 93, 131, 243, 234,
-162, 183, 36, 155, 4, 62, 35, 205,
- 40, 102, 33, 27, 255, 55, 214, 156,
- 75, 163, 134, 126, 249, 74, 197, 228,
- 72, 90, 206, 235, 17, 22, 49, 169,
-227, 89, 16, 5, 117, 60, 248, 230,
-217, 68, 138, 96, 194, 170, 136, 10,
-112, 238, 184, 189, 176, 42, 225, 212,
- 84, 58, 175, 244, 150, 168, 219, 236,
-101, 208, 123, 37, 164, 110, 158, 201,
- 78, 114, 57, 48, 70, 142, 106, 43,
-232, 26, 32, 252, 239, 98, 191, 94,
- 59, 149, 39, 187, 203, 190, 19, 13,
-133, 45, 61, 247, 23, 34, 20, 52,
-118, 209, 146, 193, 222, 18, 1, 152,
- 46, 41, 91, 148, 115, 25, 135, 77,
-254, 147, 224, 161, 9, 213, 223, 250,
-231, 251, 127, 166, 63, 179, 81, 130,
-139, 28, 120, 151, 241, 86, 111, 0,
- 88, 153, 172, 182, 159, 105, 178, 47,
- 51, 167, 65, 66, 92, 73, 198, 211,
-245, 195, 31, 220, 140, 76, 221, 186,
-154, 185, 56, 83, 38, 165, 109, 67,
-124, 226, 132, 53, 229, 29, 12, 181,
-121, 24, 207, 199, 177, 113, 30, 80,
- 3, 97, 188, 79, 216, 173, 8, 145,
- 87, 128, 180, 237, 240, 137, 125, 104,
- 15, 242, 119, 246, 103, 143, 95, 144,
- 2, 44, 69, 157, 192, 174, 14, 54,
-218, 82, 64, 210, 11, 6, 129, 21,
-116, 171, 99, 202, 7, 107, 253, 108
-};
-
-void initPermTexture(GLuint *texID)
-{
- glGenTextures(1, texID);
- glBindTexture(GL_TEXTURE_2D, *texID);
-
- static bool initialized = false;
- static unsigned char permutation2D[256*256*4];
- if( !initialized ) {
- int x, y;
-
- for( y=0; y < 256; y++ )
- for( x=0; x < 256; x++ )
- permutation2D[x*4 + y*1024] = permutation256[(y + permutation256[x]) & 0xff];
-
- initialized = true;
- }
-
- glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, permutation2D );
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
-}
-
-void OGLTransitionImpl::preparePermShader()
-{
-#ifdef GL_VERSION_2_0
- if( mProgramObject ) {
- OGLShaders::glUseProgram( mProgramObject );
-
- GLint location = OGLShaders::glGetUniformLocation( mProgramObject, "leavingSlideTexture" );
- if( location != -1 ) {
- OGLShaders::glUniform1i( location, 0 ); // texture unit 0
- }
-
- glActiveTexture(GL_TEXTURE1);
- if( !maHelperTexture )
- initPermTexture( &maHelperTexture );
- glActiveTexture(GL_TEXTURE0);
-
- location = OGLShaders::glGetUniformLocation( mProgramObject, "permTexture" );
- if( location != -1 ) {
- OGLShaders::glUniform1i( location, 1 ); // texture unit 1
- }
-
- location = OGLShaders::glGetUniformLocation( mProgramObject, "enteringSlideTexture" );
- if( location != -1 ) {
- OGLShaders::glUniform1i( location, 2 ); // texture unit 2
- }
- }
-#endif
-}
-
-void OGLTransitionImpl::prepareStatic( ::sal_Int32 /* glLeavingSlideTex */, ::sal_Int32 /* glEnteringSlideTex */ )
-{
- mProgramObject = OGLShaders::LinkProgram( basicVertexShader, staticFragmentShader );
-
- preparePermShader();
-}
-
-void OGLTransitionImpl::displaySlidesShaders( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex,
- double SlideWidthScale, double SlideHeightScale )
-{
- applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
-
-#ifdef GL_VERSION_2_0
- if( mProgramObject ) {
- GLint location = OGLShaders::glGetUniformLocation( mProgramObject, "time" );
- if( location != -1 ) {
- OGLShaders::glUniform1f( location, nTime );
- }
- }
-
- glActiveTexture( GL_TEXTURE2 );
- glBindTexture( GL_TEXTURE_2D, glEnteringSlideTex );
- glActiveTexture( GL_TEXTURE0 );
-#endif
-
- displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );
-}
-
-void OGLTransitionImpl::makeStatic()
-{
- Primitive Slide;
-
- Slide.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0,1));
- Slide.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (0,1), basegfx::B2DVector (1,1));
- maLeavingSlidePrimitives.push_back (Slide);
- maEnteringSlidePrimitives.push_back (Slide);
-
- mmDisplaySlides = &OGLTransitionImpl::displaySlidesShaders;
- mmPrepareTransition = &OGLTransitionImpl::prepareStatic;
- mbUseMipMapLeaving = mbUseMipMapEntering = false;
-
- mnRequiredGLVersion = 2.0;
-}
-
-void OGLTransitionImpl::prepareDissolve( ::sal_Int32 /* glLeavingSlideTex */, ::sal_Int32 /* glEnteringSlideTex */ )
-{
- mProgramObject = OGLShaders::LinkProgram( basicVertexShader, dissolveFragmentShader );
-
- preparePermShader();
-}
-
-void OGLTransitionImpl::makeDissolve()
-{
- Primitive Slide;
-
- Slide.pushTriangle (basegfx::B2DVector (0,0), basegfx::B2DVector (1,0), basegfx::B2DVector (0,1));
- Slide.pushTriangle (basegfx::B2DVector (1,0), basegfx::B2DVector (0,1), basegfx::B2DVector (1,1));
- maLeavingSlidePrimitives.push_back (Slide);
- maEnteringSlidePrimitives.push_back (Slide);
-
- mmDisplaySlides = &OGLTransitionImpl::displaySlidesShaders;
- mmPrepareTransition = &OGLTransitionImpl::prepareDissolve;
- mbUseMipMapLeaving = mbUseMipMapEntering = false;
-
- mnRequiredGLVersion = 2.0;
-}
-
-void OGLTransitionImpl::makeNewsflash()
-{
- Primitive Slide;
-
- Slide.pushTriangle(basegfx::B2DVector(0,0),basegfx::B2DVector(1,0),basegfx::B2DVector(0,1));
- Slide.pushTriangle(basegfx::B2DVector(1,0),basegfx::B2DVector(0,1),basegfx::B2DVector(1,1));
- Slide.Operations.push_back(new SRotate(basegfx::B3DVector(0,0,1),basegfx::B3DVector(0,0,0),3000,true,0,0.5));
- Slide.Operations.push_back(new SScale(basegfx::B3DVector(0.01,0.01,0.01),basegfx::B3DVector(0,0,0),true,0,0.5));
- Slide.Operations.push_back(new STranslate(basegfx::B3DVector(-10000, 0, 0),false, 0.5, 2));
- maLeavingSlidePrimitives.push_back(Slide);
-
- Slide.Operations.clear();
- Slide.Operations.push_back(new SRotate(basegfx::B3DVector(0,0,1),basegfx::B3DVector(0,0,0),-3000,true,0.5,1));
- Slide.Operations.push_back(new STranslate(basegfx::B3DVector(-100, 0, 0),false, -1, 1));
- Slide.Operations.push_back(new STranslate(basegfx::B3DVector(100, 0, 0),false, 0.5, 1));
- Slide.Operations.push_back(new SScale(basegfx::B3DVector(0.01,0.01,0.01),basegfx::B3DVector(0,0,0),false,-1,1));
- Slide.Operations.push_back(new SScale(basegfx::B3DVector(100,100,100),basegfx::B3DVector(0,0,0),true,0.5,1));
- maEnteringSlidePrimitives.push_back(Slide);
-
- OverallOperations.push_back(new SRotate(basegfx::B3DVector(0,0,1),basegfx::B3DVector(0.2,0.2,0),1080,true,0,1));
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
deleted file mode 100644
index b9c777a..0000000
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
+++ /dev/null
@@ -1,508 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
-#define INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
-
-#include <config_lgpl.h>
-
-#include <basegfx/vector/b2dvector.hxx>
-#include <basegfx/vector/b3dvector.hxx>
-
-#if defined( WNT )
-#elif defined( MACOSX )
-#include <OpenGL/gl.h>
-#elif defined( UNX ) && !defined( MACOSX )
-#endif
-
-#include <vector>
-
-#if !defined( MACOSX )
-#include <GL/gl.h>
-#endif
-
-using namespace std;
-
-class Primitive;
-class Operation;
-class SceneObject;
-
-
-/** OpenGL 3D Transition class. It implicitly is constructed from XOGLTransition
-
- This class is capable of making itself into many difference transitions. It holds Primitives and Operations on those primitives.
-*/
-class OGLTransitionImpl
-{
-public:
- OGLTransitionImpl() :
- mbUseMipMapLeaving( true ),
- mbUseMipMapEntering( true ),
- mnRequiredGLVersion( 1.0 ),
- maLeavingSlidePrimitives(),
- maEnteringSlidePrimitives(),
- maSceneObjects(),
- mbReflectSlides( false ),
- mVertexObject( 0 ),
- mFragmentObject( 0 ),
- mProgramObject( 0 ),
- maHelperTexture( 0 ),
- mmPrepare( NULL ),
- mmPrepareTransition( NULL ),
- mmClearTransition( NULL ),
- mmDisplaySlides( NULL )
- {}
-
- ~OGLTransitionImpl();
-
- void prepare( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
- void display( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
- void finish();
-
- void makeOutsideCubeFaceToLeft();
- void makeInsideCubeFaceToLeft();
- void makeNByMTileFlip( ::sal_uInt16 n, ::sal_uInt16 m );
- void makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt16 nPointsOnCircles );
- void makeHelix( ::sal_uInt16 nRows );
- void makeFallLeaving();
- void makeTurnAround();
- void makeTurnDown();
- void makeIris();
- void makeRochade();
- void makeVenetianBlinds( bool vertical, int parts );
- void makeStatic();
- void makeDissolve();
- void makeNewsflash();
-
- /** 2D replacements
- */
- void makeDiamond();
- void makeFadeSmoothly();
- void makeFadeThroughBlack();
-
- /** Whether to use mipmaping for slides textures
- */
- bool mbUseMipMapLeaving;
- bool mbUseMipMapEntering;
-
- /** which GL version does the transition require
- */
- float mnRequiredGLVersion;
-
-private:
- /** clears all the primitives and operations
- */
- void clear();
-
- /** All the primitives that use the leaving slide texture
- */
- vector<Primitive> maLeavingSlidePrimitives;
-
- /** All the primitives that use the leaving slide texture
- */
- vector<Primitive> maEnteringSlidePrimitives;
-
- /** All the surrounding scene objects
- */
- vector<SceneObject*> maSceneObjects;
-
- /** All the operations that should be applied to both leaving and entering slide primitives. 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.
- */
- vector<Operation*> OverallOperations;
-
- /** Whether to reflect slides, the reflection happens on flat surface beneath the slides.
- ** Now it only works with slides which keep their rectangular shape together.
- */
- bool mbReflectSlides;
-
- /** GLSL objects, shaders and program
- */
- GLuint mVertexObject, mFragmentObject, mProgramObject;
-
- /** various data */
- GLuint maHelperTexture;
-
- /** When this method is not NULL, it is called in display method to prepare the slides, scene, etc.
- ** We might later replace this by cleaner derived class.
- */
- void (OGLTransitionImpl::*mmPrepare)( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight );
-
- /** When this method is not NULL, it is called after glx context is ready to let the transition prepare GL related things, like GLSL program.
- ** We might later replace this by cleaner derived class.
- */
- void (OGLTransitionImpl::*mmPrepareTransition)( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
-
- /** When this method is not NULL, it is called when the transition needs to clear after itself, like delete own textures etc.
- ** We might later replace this by cleaner derived class.
- */
- void (OGLTransitionImpl::*mmClearTransition)();
-
- /** When this method is not NULL, it is called in display method to display the slides.
- ** We might later replace this by cleaner derived class.
- */
- void (OGLTransitionImpl::*mmDisplaySlides)( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
-
- void displaySlides( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
- void displaySlide( double nTime, ::sal_Int32 glSlideTex, std::vector<Primitive>& primitives, double SlideWidthScale, double SlideHeightScale );
- void displayScene( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
- void applyOverallOperations( double nTime, double SlideWidthScale, double SlideHeightScale );
-
- /** various transitions helper methods
- */
- void prepareDiamond( double nTime, double SlideWidth, double SlideHeight,double DispWidth, double DispHeight );
- void displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
- void displaySlidesFadeThroughBlack( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
- void displaySlidesRochade( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
- void displaySlidesShaders( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale );
- void prepareStatic( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
- void prepareDissolve( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex );
- void preparePermShader();
-};
-
-class SceneObject
-{
-public:
- SceneObject();
-
- virtual void prepare() {};
- virtual void display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
- virtual void finish() {};
-
- void pushPrimitive (const Primitive &p);
-
-protected:
- /** All the surrounding scene primitives
- */
- vector<Primitive> maPrimitives;
-};
-
-class Iris : public SceneObject
-{
-public:
- Iris ();
-
- virtual void prepare();
- virtual void display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
- virtual void finish();
-
-private:
-
- GLuint maTexture;
-};
-
-/** This class is a list of Triangles that will share Operations, and could possibly share
-*/
-class Primitive
-{
-public:
- Primitive() {}
- // making copy constructor explicit makes the class un-suitable for use with stl containers
- Primitive(const Primitive& rvalue);
- ~Primitive();
-
- void applyOperations(double nTime, double SlideWidthScale, double SlideHeightScale);
- void display(double nTime, double SlideWidthScale, double SlideHeightScale);
- Primitive& operator=(const Primitive& rvalue);
-
- /** PushBack a vertex,normal, and tex coord. Each SlideLocation is where on the slide is mapped to this location ( from (0,0) to (1,1) ). This will make sure the correct aspect ratio is used, and helps to make slides begin and end at the correct position. (0,0) is the top left of the slide, and (1,1) is the bottom right.
-
- @param SlideLocation0
- Location of first Vertex on slide
-
- @param SlideLocation1
- Location of second Vertex on slide
-
- @param SlideLocation2
- Location of third Vertex on slide
-
- */
- void pushTriangle(const basegfx::B2DVector& SlideLocation0,const basegfx::B2DVector& SlideLocation1,const basegfx::B2DVector& SlideLocation2);
-
- /** clear all the vertices, normals, tex coordinates, and normals
- */
- void clearTriangles();
-
- /** guards against directly changing the vertices
-
- @return
- the list of vertices
- */
- const vector<basegfx::B3DVector>& getVertices() const {return Vertices;}
-
- /** guards against directly changing the vertices
- */
- const vector<basegfx::B3DVector>& getNormals() const {return Normals;}
-
- /** guards against directly changing the vertices
-
- @return
- the list of Texture Coordinates
-
- */
- const vector<basegfx::B2DVector>& getTexCoords() const {return TexCoords;}
-
- /** 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.
-
- @return
- the list of Operations
-
- */
- vector<Operation*> Operations;
-
-private:
- /** list of vertices
- */
- vector<basegfx::B3DVector> Vertices;
-
- /** list of Normals
- */
- vector<basegfx::B3DVector> Normals;
-
- /** list of Texture Coordinates
- */
- vector<basegfx::B2DVector> TexCoords;
-};
-
-/** This class is to be derived to make any operation (transform) you may need in order to construct your transitions
-*/
-class Operation
-{
-public:
- Operation():bInterpolate(false), nT0(0.0), nT1(0.0){}
- virtual ~Operation(){}
-
- /** Should this operation be interpolated . If TRUE, the transform will smoothly move from making no difference from t = 0.0 to nT0 to being completely transformed from t = nT1 to 1. If FALSE, the transform will be inneffectual from t = 0 to nT0, and completely transformed from t = nT0 to 1.
- */
- bool bInterpolate;
-
- /** time to begin the transformation
- */
- double nT0;
-
- /** time to finish the transformation
- */
- double nT1;
-public:
- /** this is the function that is called to give the Operation to OpenGL.
-
- @param t
- time from t = 0 to t = 1
-
- @param SlideWidthScale
- width of slide divided by width of window
-
- @param SlideHeightScale
- height of slide divided by height of window
-
- */
- virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) = 0;
-
- /** return a copy of this operation
- */
- virtual Operation* clone() = 0;
-};
-
-/** this class is a generic CounterClockWise(CCW) rotation with an axis angle
-*/
-class SRotate: public Operation
-{
-public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- virtual SRotate* clone();
-
- /** Constructor
-
- @param Axis
- axis to rotate about
-
- @param Origin
- position that rotation axis runs through
-
- @param Angle
- angle in radians of CCW rotation
-
- @param bInter
- see Operation
-
- @param T0
- transformation starting time
-
- @param T1
- transformation ending time
-
- */
- SRotate(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1);
- ~SRotate(){}
-private:
- /** axis to rotate CCW about
- */
- basegfx::B3DVector axis;
-
- /** position that rotation axis runs through
- */
- basegfx::B3DVector origin;
-
- /** angle in radians of CCW rotation
- */
- double angle;
-};
-
-/** scaling transformation
-*/
-class SScale: public Operation
-{
-public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- SScale* clone();
-
- /** Constructor
-
- @param Scale
- amount to scale by
-
- @param Origin
- position that rotation axis runs through
-
- @param bInter
- see Operation
-
- @param T0
- transformation starting time
-
- @param T1
- transformation ending time
-
- */
- SScale(const basegfx::B3DVector& Scale, const basegfx::B3DVector& Origin,bool bInter, double T0, double T1);
- ~SScale(){}
-private:
- basegfx::B3DVector scale;
- basegfx::B3DVector origin;
-};
-
-/** translation transformation
-*/
-class STranslate: public Operation
-{
-public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- STranslate* clone();
-
- /** Constructor
-
- @param Vector
- vector to translate
-
- @param bInter
- see Operation
-
- @param T0
- transformation starting time
-
- @param T1
- transformation ending time
-
- */
- STranslate(const basegfx::B3DVector& Vector,bool bInter, double T0, double T1);
- ~STranslate(){}
-private:
- /** vector to translate by
- */
- basegfx::B3DVector vector;
-};
-
-/** translation transformation
-*/
-class SEllipseTranslate: public Operation
-{
-public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- SEllipseTranslate* clone();
-
- /** Constructor
-
- @param Vector
- vector to translate
-
- @param bInter
- see Operation
-
- @param T0
- transformation starting time
-
- @param T1
- transformation ending time
-
- */
- SEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1);
- ~SEllipseTranslate(){}
-private:
- /** width and length of the ellipse
- */
- double width, height;
-
- /** start and end position on the ellipse <0,1>
- */
- double startPosition;
- double endPosition;
-};
-
-/** Same as SRotate, except the depth is scaled by the width of the slide divided by the width of the window.
-*/
-class RotateAndScaleDepthByWidth: public Operation
-{
-public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- RotateAndScaleDepthByWidth* clone();
-
- RotateAndScaleDepthByWidth(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1);
- ~RotateAndScaleDepthByWidth(){}
-private:
- basegfx::B3DVector axis;
- basegfx::B3DVector origin;
- double angle;
-};
-
-/** Same as SRotate, except the depth is scaled by the width of the slide divided by the height of the window.
-*/
-class RotateAndScaleDepthByHeight: public Operation
-{
-public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- RotateAndScaleDepthByHeight* clone();
-
- RotateAndScaleDepthByHeight(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1);
- ~RotateAndScaleDepthByHeight(){}
-private:
- basegfx::B3DVector axis;
- basegfx::B3DVector origin;
- double angle;
-};
-
-#endif // INCLUDED_SLIDESHOW_TRANSITION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
deleted file mode 100644
index 19f22fd..0000000
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ /dev/null
@@ -1,1448 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define GLX_GLXEXT_PROTOTYPES 1
-#include "OGLTrans_TransitionImpl.hxx"
-
-#include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
-#include <com/sun/star/rendering/ColorComponentTag.hpp>
-#include <com/sun/star/rendering/ColorSpaceType.hpp>
-#include <com/sun/star/animations/TransitionType.hpp>
-#include <com/sun/star/animations/TransitionSubType.hpp>
-#include <com/sun/star/presentation/XTransitionFactory.hpp>
-#include <com/sun/star/presentation/XTransition.hpp>
-#include <com/sun/star/presentation/XSlideShowView.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <com/sun/star/geometry/IntegerSize2D.hpp>
-
-#include <sal/types.h>
-
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/factory.hxx>
-#include <rtl/ref.hxx>
-
-#include <comphelper/servicedecl.hxx>
-
-#include <canvas/canvastools.hxx>
-#include <vcl/window.hxx>
-#include <vcl/syschild.hxx>
-#include <vcl/sysdata.hxx>
-
-#include <boost/noncopyable.hpp>
-
-#include <GL/gl.h>
-#include <GL/glu.h>
-
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-
-#ifdef DEBUG
-#include <boost/date_time/posix_time/posix_time.hpp>
-using namespace ::boost::posix_time;
-
-static ptime t1;
-static ptime t2;
-
-#define DBG(x) x
-#else
-#define DBG(x)
-#endif
-
-using namespace ::com::sun::star;
-using ::com::sun::star::beans::XFastPropertySet;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-
-namespace
-{
-
-typedef cppu::WeakComponentImplHelper1<presentation::XTransition> OGLTransitionerImplBase;
-
-namespace
-{
- struct OGLFormat
- {
- GLint nInternalFormat;
- GLenum eFormat;
- GLenum eType;
- };
-
- /* channel ordering: (0:rgba, 1:bgra, 2:argb, 3:abgr)
- */
- int calcComponentOrderIndex(const uno::Sequence<sal_Int8>& rTags)
- {
- using namespace rendering::ColorComponentTag;
-
- static const sal_Int8 aOrderTable[] =
- {
- RGB_RED, RGB_GREEN, RGB_BLUE, ALPHA,
- RGB_BLUE, RGB_GREEN, RGB_RED, ALPHA,
- ALPHA, RGB_RED, RGB_GREEN, RGB_BLUE,
- ALPHA, RGB_BLUE, RGB_GREEN, RGB_RED,
- };
-
- const sal_Int32 nNumComps(rTags.getLength());
- const sal_Int8* pLine=aOrderTable;
- for(int i=0; i<4; ++i)
- {
- int j=0;
- while( j<4 && j<nNumComps && pLine[j] == rTags[j] )
- ++j;
-
- // all of the line passed, this is a match!
- if( j==nNumComps )
- return i;
-
- pLine+=4;
- }
-
- return -1;
- }
-}
-
-// not thread safe
-static bool errorTriggered;
-int oglErrorHandler( unx::Display* /*dpy*/, unx::XErrorEvent* /*evnt*/ )
-{
- errorTriggered = true;
-
- return 0;
-}
-
-/** This is the Transitioner class for OpenGL 3D transitions in
- * slideshow. At the moment, it's Linux only. This class is implicitly
- * constructed from XTransitionFactory.
-*/
-class OGLTransitionerImpl : private cppu::BaseMutex, private boost::noncopyable, public OGLTransitionerImplBase
-{
-public:
- explicit OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition);
- bool initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView );
- void setSlides( const Reference< rendering::XBitmap >& xLeavingSlide , const uno::Reference< rendering::XBitmap >& xEnteringSlide );
- static bool initialize( const Reference< presentation::XSlideShowView >& xView );
-
- // XTransition
- virtual void SAL_CALL update( double nTime )
- throw (uno::RuntimeException);
- virtual void SAL_CALL viewChanged( const Reference< presentation::XSlideShowView >& rView,
- const Reference< rendering::XBitmap >& rLeavingBitmap,
- const Reference< rendering::XBitmap >& rEnteringBitmap )
- throw (uno::RuntimeException);
-
-protected:
- void disposeContextAndWindow();
- void disposeTextures();
-
- // WeakComponentImplHelperBase
- virtual void SAL_CALL disposing();
-
- bool isDisposed() const
- {
- return (rBHelper.bDisposed || rBHelper.bInDispose);
- }
-
- bool createWindow( Window* pPWindow );
- void createTexture( unsigned int* texID,
-#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
- unx::GLXPixmap pixmap,
- bool usePixmap,
-#endif
- bool useMipmap,
- uno::Sequence<sal_Int8>& data,
- const OGLFormat* pFormat );
- void prepareEnvironment ();
- const OGLFormat* chooseFormats();
-
-private:
- /** After the window has been created, and the slides have been set, we'll initialize the slides with OpenGL.
- */
- void GLInitSlides();
-
-
- /// Holds the information of our new child window
- struct GLWindow
- {
- HWND hWnd;
- HDC hDC;
- HGLRC hRC;
- unsigned int bpp;
- unsigned int Width;
- unsigned int Height;
- const char* GLXExtensions;
- const GLubyte* GLExtensions;
-
- bool HasGLXExtension( const char* name ) { return gluCheckExtension( (const GLubyte*) name, (const GLubyte*) GLXExtensions ); }
- bool HasGLExtension( const char* name ) { return gluCheckExtension( (const GLubyte*) name, GLExtensions ); }
- } GLWin;
-
- /** OpenGL handle to the leaving slide's texture
- */
- unsigned int GLleavingSlide;
- /** OpenGL handle to the entering slide's texture
- */
- unsigned int GLenteringSlide;
-
- /** pointer to our window which we MIGHT create.
- */
- class SystemChildWindow* pWindow;
-
- Reference< presentation::XSlideShowView > mxView;
- Reference< rendering::XIntegerBitmap > mxLeavingBitmap;
- Reference< rendering::XIntegerBitmap > mxEnteringBitmap;
-
- /** raw bytes of the entering bitmap
- */
- uno::Sequence<sal_Int8> EnteringBytes;
-
- /** raw bytes of the leaving bitmap
- */
- uno::Sequence<sal_Int8> LeavingBytes;
-
-#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
- unx::GLXPixmap LeavingPixmap;
- unx::GLXPixmap EnteringPixmap;
-#endif
- bool mbRestoreSync;
- bool mbUseLeavingPixmap;
- bool mbUseEnteringPixmap;
- bool mbFreeLeavingPixmap;
- bool mbFreeEnteringPixmap;
- unx::Pixmap maLeavingPixmap;
- unx::Pixmap maEnteringPixmap;
-
- /** the form the raw bytes are in for the bitmaps
- */
- rendering::IntegerBitmapLayout SlideBitmapLayout;
-
- /** the size of the slides
- */
- geometry::IntegerSize2D SlideSize;
-
- /** Our Transition to be used.
- */
- OGLTransitionImpl* pTransition;
-
-public:
- /** whether we are running on ATI fglrx with bug related to textures
- */
- static bool cbBrokenTexturesATI;
-
- /** GL version
- */
- static float cnGLVersion;
- float mnGLXVersion;
-
- /** Whether Mesa is the OpenGL vendor
- */
- static bool cbMesa;
-
- /**
- whether the display has GLX extension
- */
- static bool cbGLXPresent;
-
- /**
- whether texture from pixmap extension is available
- */
- bool mbTextureFromPixmap;
-
- /**
- whether to generate mipmaped textures
- */
- bool mbGenerateMipmap;
-
- /**
- whether we have visual which can be used for texture_from_pixmap extension
- */
- bool mbHasTFPVisual;
-
-#ifdef DEBUG
- ptime t3;
- ptime t4;
- ptime t5;
- ptime t6;
- time_duration total_update;
- int frame_count;
-#endif
-};
-
-// declare the static variables as some gcc versions have problems declaring them automatically
-bool OGLTransitionerImpl::cbBrokenTexturesATI;
-float OGLTransitionerImpl::cnGLVersion;
-bool OGLTransitionerImpl::cbMesa;
-bool OGLTransitionerImpl::cbGLXPresent;
-
-bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowView >& xView )
-{
- // not thread safe
- static bool initialized = false;
-
- if( !initialized ) {
- OGLTransitionerImpl *instance;
-
- instance = new OGLTransitionerImpl( NULL );
- if( instance->initWindowFromSlideShowView( xView ) ) {
-
- const GLubyte* version = glGetString( GL_VERSION );
- if( version && version[0] ) {
- cnGLVersion = version[0] - '0';
- if( version[1] == '.' && version[2] )
- cnGLVersion += (version[2] - '0')/10.0;
- } else
- cnGLVersion = 1.0;
- OSL_TRACE("GL version: %s parsed: %f", version, cnGLVersion );
-
- const GLubyte* vendor = glGetString( GL_VENDOR );
- cbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) );
- OSL_TRACE("GL vendor: %s identified as Mesa: %d", vendor, cbMesa );
-
- /* TODO: check for version once the bug in fglrx driver is fixed */
- cbBrokenTexturesATI = (vendor && strcmp( (const char *) vendor, "ATI Technologies Inc." ) == 0 );
-
- instance->disposing();
- cbGLXPresent = true;
- } else
- cbGLXPresent = false;
-
- delete instance;
- initialized = true;
- }
-
- return cbGLXPresent;
-}
-
-bool OGLTransitionerImpl::createWindow( Window* pPWindow )
-{
- const SystemEnvData* sysData(pPWindow->GetSystemData());
-#if defined( WNT )
- GLWin.hWnd = sysData->hWnd;
-#elif defined( UNX )
- GLWin.dpy = reinterpret_cast<unx::Display*>(sysData->pDisplay);
-
- if( unx::glXQueryExtension( GLWin.dpy, NULL, NULL ) == false )
- return false;
-
- GLWin.win = sysData->aWindow;
-
- OSL_TRACE("parent window: %d", GLWin.win);
-
- unx::XWindowAttributes xattr;
- unx::XGetWindowAttributes( GLWin.dpy, GLWin.win, &xattr );
-
- GLWin.screen = XScreenNumberOfScreen( xattr.screen );
-
- unx::XVisualInfo* vi( NULL );
-#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
- unx::XVisualInfo* visinfo;
- unx::XVisualInfo* firstVisual( NULL );
-#endif
- static int attrList3[] =
- {
- GLX_RGBA,//only TrueColor or DirectColor
- //single buffered
- GLX_RED_SIZE,4,//use the maximum red bits, with a minimum of 4 bits
- GLX_GREEN_SIZE,4,//use the maximum green bits, with a minimum of 4 bits
- GLX_BLUE_SIZE,4,//use the maximum blue bits, with a minimum of 4 bits
- GLX_DEPTH_SIZE,0,//no depth buffer
- None
- };
- static int attrList2[] =
- {
- GLX_RGBA,//only TrueColor or DirectColor
- /// single buffered
- GLX_RED_SIZE,4,/// use the maximum red bits, with a minimum of 4 bits
- GLX_GREEN_SIZE,4,/// use the maximum green bits, with a minimum of 4 bits
- GLX_BLUE_SIZE,4,/// use the maximum blue bits, with a minimum of 4 bits
- GLX_DEPTH_SIZE,1,/// use the maximum depth bits, making sure there is a depth buffer
- None
- };
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list