You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(30) |
Oct
(60) |
Nov
(17) |
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(33) |
Feb
(18) |
Mar
(3) |
Apr
(5) |
May
(6) |
Jun
(34) |
Jul
(54) |
Aug
(33) |
Sep
(36) |
Oct
(33) |
Nov
(40) |
Dec
(6) |
| 2009 |
Jan
(37) |
Feb
(38) |
Mar
(31) |
Apr
(23) |
May
(24) |
Jun
(2) |
Jul
(6) |
Aug
(5) |
Sep
(1) |
Oct
(14) |
Nov
(12) |
Dec
(26) |
| 2010 |
Jan
(23) |
Feb
(17) |
Mar
(17) |
Apr
(2) |
May
(10) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
| 2011 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
|
From: <and...@us...> - 2008-11-21 04:46:02
|
Revision: 808
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=808&view=rev
Author: andy_miller
Date: 2008-11-21 04:45:57 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
change media file naming to all lowercase
Added Paths:
-----------
trunk/python-ogre/demos/media/PCZAppMedia/room.material
trunk/python-ogre/demos/media/PCZAppMedia/room_nx.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_ny.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_nz.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_px.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_py.mesh
trunk/python-ogre/demos/media/PCZAppMedia/room_pz.mesh
Removed Paths:
-------------
trunk/python-ogre/demos/media/PCZAppMedia/ROOM.material
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NX.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NY.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NZ.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PX.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PY.mesh
trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PZ.mesh
Deleted: trunk/python-ogre/demos/media/PCZAppMedia/ROOM.material
===================================================================
--- trunk/python-ogre/demos/media/PCZAppMedia/ROOM.material 2008-11-21 04:41:27 UTC (rev 807)
+++ trunk/python-ogre/demos/media/PCZAppMedia/ROOM.material 2008-11-21 04:45:57 UTC (rev 808)
@@ -1,132 +0,0 @@
-material SketchupDefault
-{
- technique
- {
- pass
- {
- diffuse 0.882352941176471 0.882352941176471 0.784313725490196
- }
- }
-}
-material Metal_Brass_Ceiling
-{
- technique
- {
- pass
- {
- diffuse 1 1 1 1.0
- texture_unit
- {
- texture Metal_Brass_Ceiling.jpg
- }
- }
- }
-}
-material Metal_Embossed
-{
- technique
- {
- pass
- {
- diffuse 1 1 1 1.0
- texture_unit
- {
- texture Metal_Embossed.jpg
- }
- }
- }
-}
-material Metal_Steel_Textured_White
-{
- technique
- {
- pass
- {
- diffuse 1 1 1 1.0
- texture_unit
- {
- texture Metal_Steel_Textured_White.jpg
- }
- }
- }
-}
-material Metal_Steel_Textured
-{
- technique
- {
- pass
- {
- diffuse 1 1 1 1.0
- texture_unit
- {
- texture Metal_Steel_Textured.jpg
- }
- }
- }
-}
-material Metal_Rusted
-{
- technique
- {
- pass
- {
- diffuse 1 1 1 1.0
- texture_unit
- {
- texture Metal_Rusted.jpg
- }
- }
- }
-}
-material Material1
-{
- technique
- {
- pass
- {
- diffuse 0.250980392156863 0.250980392156863 0.250980392156863 1.0
- }
- }
-}
-material [Metal_Rusted]1
-{
- technique
- {
- pass
- {
- diffuse 1 1 1 1.0
- texture_unit
- {
- texture Metal_Rusted.jpg
- }
- }
- }
-}
-material Carpet_Diamond_Olive
-{
- technique
- {
- pass
- {
- diffuse 1 1 1 1.0
- texture_unit
- {
- texture Carpet_Diamond_Olive.jpg
- }
- }
- }
-}
-material Roofing_Tile_Spanish
-{
- technique
- {
- pass
- {
- diffuse 1 1 1 1.0
- texture_unit
- {
- texture Roofing_Tile_Spanish.jpg
- }
- }
- }
-}
Deleted: trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NX.mesh
===================================================================
(Binary files differ)
Deleted: trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NY.mesh
===================================================================
(Binary files differ)
Deleted: trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NZ.mesh
===================================================================
(Binary files differ)
Deleted: trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PX.mesh
===================================================================
(Binary files differ)
Deleted: trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PY.mesh
===================================================================
(Binary files differ)
Deleted: trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PZ.mesh
===================================================================
(Binary files differ)
Copied: trunk/python-ogre/demos/media/PCZAppMedia/room.material (from rev 801, trunk/python-ogre/demos/media/PCZAppMedia/ROOM.material)
===================================================================
--- trunk/python-ogre/demos/media/PCZAppMedia/room.material (rev 0)
+++ trunk/python-ogre/demos/media/PCZAppMedia/room.material 2008-11-21 04:45:57 UTC (rev 808)
@@ -0,0 +1,132 @@
+material SketchupDefault
+{
+ technique
+ {
+ pass
+ {
+ diffuse 0.882352941176471 0.882352941176471 0.784313725490196
+ }
+ }
+}
+material Metal_Brass_Ceiling
+{
+ technique
+ {
+ pass
+ {
+ diffuse 1 1 1 1.0
+ texture_unit
+ {
+ texture Metal_Brass_Ceiling.jpg
+ }
+ }
+ }
+}
+material Metal_Embossed
+{
+ technique
+ {
+ pass
+ {
+ diffuse 1 1 1 1.0
+ texture_unit
+ {
+ texture Metal_Embossed.jpg
+ }
+ }
+ }
+}
+material Metal_Steel_Textured_White
+{
+ technique
+ {
+ pass
+ {
+ diffuse 1 1 1 1.0
+ texture_unit
+ {
+ texture Metal_Steel_Textured_White.jpg
+ }
+ }
+ }
+}
+material Metal_Steel_Textured
+{
+ technique
+ {
+ pass
+ {
+ diffuse 1 1 1 1.0
+ texture_unit
+ {
+ texture Metal_Steel_Textured.jpg
+ }
+ }
+ }
+}
+material Metal_Rusted
+{
+ technique
+ {
+ pass
+ {
+ diffuse 1 1 1 1.0
+ texture_unit
+ {
+ texture Metal_Rusted.jpg
+ }
+ }
+ }
+}
+material Material1
+{
+ technique
+ {
+ pass
+ {
+ diffuse 0.250980392156863 0.250980392156863 0.250980392156863 1.0
+ }
+ }
+}
+material [Metal_Rusted]1
+{
+ technique
+ {
+ pass
+ {
+ diffuse 1 1 1 1.0
+ texture_unit
+ {
+ texture Metal_Rusted.jpg
+ }
+ }
+ }
+}
+material Carpet_Diamond_Olive
+{
+ technique
+ {
+ pass
+ {
+ diffuse 1 1 1 1.0
+ texture_unit
+ {
+ texture Carpet_Diamond_Olive.jpg
+ }
+ }
+ }
+}
+material Roofing_Tile_Spanish
+{
+ technique
+ {
+ pass
+ {
+ diffuse 1 1 1 1.0
+ texture_unit
+ {
+ texture Roofing_Tile_Spanish.jpg
+ }
+ }
+ }
+}
Property changes on: trunk/python-ogre/demos/media/PCZAppMedia/room.material
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/python-ogre/demos/media/PCZAppMedia/room_nx.mesh (from rev 801, trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NX.mesh)
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/media/PCZAppMedia/room_nx.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:mergeinfo
+
Copied: trunk/python-ogre/demos/media/PCZAppMedia/room_ny.mesh (from rev 801, trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NY.mesh)
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/media/PCZAppMedia/room_ny.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:mergeinfo
+
Copied: trunk/python-ogre/demos/media/PCZAppMedia/room_nz.mesh (from rev 801, trunk/python-ogre/demos/media/PCZAppMedia/ROOM_NZ.mesh)
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/media/PCZAppMedia/room_nz.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:mergeinfo
+
Copied: trunk/python-ogre/demos/media/PCZAppMedia/room_px.mesh (from rev 801, trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PX.mesh)
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/media/PCZAppMedia/room_px.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:mergeinfo
+
Copied: trunk/python-ogre/demos/media/PCZAppMedia/room_py.mesh (from rev 801, trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PY.mesh)
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/media/PCZAppMedia/room_py.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:mergeinfo
+
Copied: trunk/python-ogre/demos/media/PCZAppMedia/room_pz.mesh (from rev 801, trunk/python-ogre/demos/media/PCZAppMedia/ROOM_PZ.mesh)
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/media/PCZAppMedia/room_pz.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:mergeinfo
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-21 04:41:32
|
Revision: 807
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=807&view=rev
Author: andy_miller
Date: 2008-11-21 04:41:27 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
Missing demo file
Added Paths:
-----------
trunk/python-ogre/demos/ogrepcz/resources.cfg
Added: trunk/python-ogre/demos/ogrepcz/resources.cfg
===================================================================
--- trunk/python-ogre/demos/ogrepcz/resources.cfg (rev 0)
+++ trunk/python-ogre/demos/ogrepcz/resources.cfg 2008-11-21 04:41:27 UTC (rev 807)
@@ -0,0 +1,25 @@
+[Bootstrap]
+Zip=../media/packs/OgreCore.zip
+
+# Resource locations to be added to the default path
+[General]
+FileSystem=../media
+FileSystem=../media/fonts
+FileSystem=../media/sounds
+FileSystem=../media/Audio
+FileSystem=../media/materials/programs
+FileSystem=../media/materials/scripts
+FileSystem=../media/materials/textures
+FileSystem=../media/models
+FileSystem=../media/overlays
+FileSystem=../media/particle
+FileSystem=../media/gui
+FileSystem=../media/PCZAppMedia
+Zip=../media/packs/cubemap.zip
+Zip=../media/packs/cubemapsJS.zip
+Zip=../media/packs/dragon.zip
+Zip=../media/packs/fresneldemo.zip
+Zip=../media/packs/ogretestmap.zip
+Zip=../media/packs/skybox.zip
+#Zip=../media/packs/chiropteraDM.pk3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-21 03:53:21
|
Revision: 806
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=806&view=rev
Author: andy_miller
Date: 2008-11-21 03:53:18 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
Fix for OgreOde in Linux -- files missing from make..
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h
trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
trunk/python-ogre/environment.py
trunk/python-ogre/patch/ogreode.patch
Modified: trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h 2008-11-21 02:25:55 UTC (rev 805)
+++ trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h 2008-11-21 03:53:18 UTC (rev 806)
@@ -40,12 +40,12 @@
/** \brief Export Class Macro, replace value with your export macro
*/
-#define BETAJAEN_SL_CLASS __declspec(dllexport)
+#define BETAJAEN_SL_CLASS // __declspec(dllexport)
#define BETAJAEN_SL_CLASS_FUNCTION
#define BETAJAEN_SL_TEMPLATE_CLASS
-#define BETAJAEN_SL_TEMPLATE_CLASS_FUNCTION __forceinline
-#define BETAJAEN_SL_CLASS_EXPORT __declspec(dllexport)
-#define BETAJAEN_SL_TEMPLATE_CLASS_EXPORT __forceinline
+#define BETAJAEN_SL_TEMPLATE_CLASS_FUNCTION // __forceinline
+#define BETAJAEN_SL_CLASS_EXPORT // __declspec(dllexport)
+#define BETAJAEN_SL_TEMPLATE_CLASS_EXPORT // __forceinline
// __declspec(dllexport)
/** \brief Delete macro. Used if you have your own leak checker, etc.
Modified: trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
===================================================================
--- trunk/python-ogre/demos/ogreode/Demo_GranTurism.py 2008-11-21 02:25:55 UTC (rev 805)
+++ trunk/python-ogre/demos/ogreode/Demo_GranTurism.py 2008-11-21 03:53:18 UTC (rev 806)
@@ -25,7 +25,6 @@
#------------------------------------------------------------------------------------------------
class GranTurismOgreFrameListener ( sf.FrameListener ):
def __init__(self, win, cam,time_step,root,world) :
- print "frame init"
sf.FrameListener.__init__(self, win,cam)
self.camera = cam
self.vehicle = None
@@ -129,7 +128,6 @@
#------------------------------------------------------------------------------------------------
def frameStarted( self, evt):
- print "*** frameStarted"
time = evt.timeSinceLastFrame
ret = sf.FrameListener.frameStarted(self,evt)
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-21 02:25:55 UTC (rev 805)
+++ trunk/python-ogre/environment.py 2008-11-21 03:53:18 UTC (rev 806)
@@ -1054,7 +1054,7 @@
[0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir],
[0, "chmod +x autogen.sh", baseDir],
[0, "./autogen.sh", baseDir],
- [0, "./configure --without-samples --prefix=%s" % PREFIX, baseDir],
+ [0, "./configure --without-SAMPLES --prefix=%s" % PREFIX, baseDir],
[0, "make", baseDir],
[0, "make install", baseDir],
]
Modified: trunk/python-ogre/patch/ogreode.patch
===================================================================
--- trunk/python-ogre/patch/ogreode.patch 2008-11-21 02:25:55 UTC (rev 805)
+++ trunk/python-ogre/patch/ogreode.patch 2008-11-21 03:53:18 UTC (rev 806)
@@ -1,6 +1,6 @@
Index: include/OgreOdeEntityInformer.h
===================================================================
---- include/OgreOdeEntityInformer.h (revision 2510)
+--- include/OgreOdeEntityInformer.h (revision 2512)
+++ include/OgreOdeEntityInformer.h (working copy)
@@ -36,12 +36,12 @@
const TriangleIndex* getIndices();
@@ -18,7 +18,7 @@
Ogre::SceneNode* _node;
Index: src/OgreOdeGeometry.cpp
===================================================================
---- src/OgreOdeGeometry.cpp (revision 2510)
+--- src/OgreOdeGeometry.cpp (revision 2512)
+++ src/OgreOdeGeometry.cpp (working copy)
@@ -924,7 +924,7 @@
@@ -31,7 +31,7 @@
registerGeometry();
Index: src/OgreOdeTriangleMeshDataManager.cpp
===================================================================
---- src/OgreOdeTriangleMeshDataManager.cpp (revision 2510)
+--- src/OgreOdeTriangleMeshDataManager.cpp (revision 2512)
+++ src/OgreOdeTriangleMeshDataManager.cpp (working copy)
@@ -6,7 +6,7 @@
using namespace Ogre;
@@ -42,6 +42,19 @@
namespace OgreOde
{
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am (revision 2512)
++++ src/Makefile.am (working copy)
+@@ -22,6 +22,8 @@
+ OgreOdeSpace.cpp \
+ OgreOdeStepper.cpp \
+ OgreOdeUtility.cpp \
++ OgreOdeTriangleMeshData.cpp \
++ OgreOdeTriangleMeshDataManager.cpp \
+ OgreOdeWorld.cpp
+
+ libOgreOde_Core_la_LIBADD = \
Index: prefab/src/OgreOdeRagdoll.cpp
===================================================================
--- prefab/src/OgreOdeRagdoll.cpp (revision 2512)
@@ -63,7 +76,7 @@
+}
Index: loader/include/OgreOdeDotLoader.h
===================================================================
---- loader/include/OgreOdeDotLoader.h (revision 2510)
+--- loader/include/OgreOdeDotLoader.h (revision 2512)
+++ loader/include/OgreOdeDotLoader.h (working copy)
@@ -15,8 +15,8 @@
DotLoader(OgreOde::World * world = 0, OgreOde::Space * space = 0);
@@ -78,7 +91,7 @@
void save(const Ogre::String &filename, const Ogre::StringVector &objects_names, ObjectList *objects);
Index: loader/src/OgreOdeDotLoader.cpp
===================================================================
---- loader/src/OgreOdeDotLoader.cpp (revision 2510)
+--- loader/src/OgreOdeDotLoader.cpp (revision 2512)
+++ loader/src/OgreOdeDotLoader.cpp (working copy)
@@ -62,6 +62,12 @@
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-21 02:26:06
|
Revision: 805
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=805&view=rev
Author: andy_miller
Date: 2008-11-21 02:25:55 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
Linux updates - Bullet 2.72 and OgreBulletC now OK
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h
trunk/python-ogre/code_generators/ogrebulletd/customization_data.py
trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h
trunk/python-ogre/demos/ogrepcz/plugins.cfg
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-11-21 02:25:55 UTC (rev 805)
@@ -70,7 +70,7 @@
PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
PATH_NxOgre_09= os.path.join(PATH_THIRDPARTY, 'nxogre_0.9')
# PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
-PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.70')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.72')
###PATH_PhysX= os.path.join(BASE_DIR, 'Physx/v2.7.3/SDKs')
PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
Modified: trunk/python-ogre/code_generators/bullet/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code.py 2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/bullet/generate_code.py 2008-11-21 02:25:55 UTC (rev 805)
@@ -81,7 +81,7 @@
,'::btCompoundShape::createAabbTreeFromChildren'
,'::btCollisionAlgorithm::getDispatcherId'
,'::btCollisionAlgorithmConstructionInfo::getDispatcherId'
- ,'::btOptimizedBvh::walkRecursiveQuantizedTreeAgainstQuantizedTree'
+ ,'::btQuantizedBvh::walkRecursiveQuantizedTreeAgainstQuantizedTree'
,'::btCapsuleShape::calculateLocalInertia'
,'::btCapsuleShape::localGetSupportingVertexWithoutMargin'
@@ -127,9 +127,9 @@
,'btAlignedAllocator<btMultiSapBroadphase::btBridgeProxy*, 16u>'
,'btAlignedAllocator<btMultiSapBroadphase::btMultiSapProxy*, 16u>'
# ,'btAlignedAllocator<btOdeContactJoint, 16u>'
- ,'btAlignedAllocator<btOdeJoint*, 16u>'
+# ,'btAlignedAllocator<btOdeJoint*, 16u>'
# ,'btAlignedAllocator<btOdeSolverBody, 16u>'
- ,'btAlignedAllocator<btOdeSolverBody*, 16u>'
+# ,'btAlignedAllocator<btOdeSolverBody*, 16u>'
# ,'btAlignedAllocator<btOdeTypedJoint, 16u>'
,'btAlignedAllocator<unsigned int, 16u>'
,'btAlignedAllocator<unsigned short, 16u>'
@@ -150,8 +150,9 @@
# ,'btAlignedObjectArray<btQuantizedBvhNode>'
# ,'btAlignedObjectArray<btOptimizedBvhNode>'
# ,'btAlignedObjectArray<btCollisionObject*>'
- ,'btDbvtBroadphase'
- ,'btSorLcpSolver'
+ ,'btDbvtBroadphase'
+ ,'btContinuousDynamicsWorld'
+# ,'btSorLcpSolver'
]
for e in excludes:
print "excluding class", e
Modified: trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h 2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h 2008-11-21 02:25:55 UTC (rev 805)
@@ -32,11 +32,11 @@
typedef btAlignedAllocator<btDbvt::sStkNPS, 16u> AlignedAllocatorsStkNPS;
// typedef btAlignedAllocator<btMultiSapBroadphase::btBridgeProxy*, 16u> AlignedAllocatorMultiSapBradBridge;
// typedef btAlignedAllocator<btMultiSapBroadphase::btMultiSapProxy*, 16u> AlignedAllocatorMultiSapBroadMulti;
-typedef btAlignedAllocator<btOdeContactJoint, 16u> AlignedAllocatorOdeContactJoint;
-typedef btAlignedAllocator<btOdeJoint*, 16u> AlignedAllocatorOdeJointPtr;
-typedef btAlignedAllocator<btOdeSolverBody, 16u> AlignedAllocatorOdeSolverBody;
-typedef btAlignedAllocator<btOdeSolverBody*, 16u> AlignedAllocatorOdeSolverBodyPtr;
-typedef btAlignedAllocator<btOdeTypedJoint, 16u> AlignedAllocatorOdeTypedJoint;
+//typedef btAlignedAllocator<btOdeContactJoint, 16u> AlignedAllocatorOdeContactJoint;
+//typedef btAlignedAllocator<btOdeJoint*, 16u> AlignedAllocatorOdeJointPtr;
+//typedef btAlignedAllocator<btOdeSolverBody, 16u> AlignedAllocatorOdeSolverBody;
+//typedef btAlignedAllocator<btOdeSolverBody*, 16u> AlignedAllocatorOdeSolverBodyPtr;
+//typedef btAlignedAllocator<btOdeTypedJoint, 16u> AlignedAllocatorOdeTypedJoint;
typedef btAlignedAllocator<short, 16u> AlignedAllocatorShort16;
typedef btAlignedObjectArray<btDbvtNode const*> AlignedObjectArrayDbvtNode;
typedef btAlignedObjectArray<btDbvt::sStkNN> AlignedObjectArrayDbvtsStkNN;
@@ -44,11 +44,11 @@
typedef btAlignedObjectArray<btDbvt::sStkNPS> AlignedObjectArrayDbvtsStkNPS;
// typedef btAlignedObjectArray<btMultiSapBroadphase::btBridgeProxy*> AlignedObjectArrayMultiSapBroadBridge;
// typedef btAlignedObjectArray<btMultiSapBroadphase::btMultiSapProxy*> AlignedObjectArrayMultiSapBroadMulti;
-typedef btAlignedObjectArray<btOdeContactJoint> AlignedObjectArrayOdeContactJoint;
-typedef btAlignedObjectArray<btOdeJoint*> AlignedObjectArrayOdeJointPtr;
-typedef btAlignedObjectArray<btOdeSolverBody> AlignedObjectArrayOdeSolverBody;
-typedef btAlignedObjectArray<btOdeSolverBody*> AlignedObjectArrayOdeSolverBodyPtr;
-typedef btAlignedObjectArray<btOdeTypedJoint> AlignedObjectArrayOdeTypedJoint;
+//typedef btAlignedObjectArray<btOdeContactJoint> AlignedObjectArrayOdeContactJoint;
+//typedef btAlignedObjectArray<btOdeJoint*> AlignedObjectArrayOdeJointPtr;
+//typedef btAlignedObjectArray<btOdeSolverBody> AlignedObjectArrayOdeSolverBody;
+//typedef btAlignedObjectArray<btOdeSolverBody*> AlignedObjectArrayOdeSolverBodyPtr;
+//typedef btAlignedObjectArray<btOdeTypedJoint> AlignedObjectArrayOdeTypedJoint;
Modified: trunk/python-ogre/code_generators/ogrebulletd/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/customization_data.py 2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/ogrebulletd/customization_data.py 2008-11-21 02:25:55 UTC (rev 805)
@@ -1,7 +1,11 @@
def header_files( version ):
- return [ 'OgreBulletDynamics.h']
+ return [ 'OgreBulletDynamics.h'
+ ,"LinearMath/btStackAlloc.h"
+ ,"LinearMath/btPoolAllocator.h"
+ ,"BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
+]
def huge_classes( version ):
return []
-
\ No newline at end of file
+
Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-11-21 02:25:55 UTC (rev 805)
@@ -58,6 +58,15 @@
main_ns = global_ns.namespace( MAIN_NAMESPACE )
else:
main_ns = global_ns
+ excludes=['::btSimulationIslandManager'
+ ]
+ for e in excludes:
+ print "excluding class", e
+ global_ns.class_(e).exclude()
+ for c in global_ns.classes():
+ #if not c.ignore:
+ print c
+ sys.exit(-1)
############################################################
##
Modified: trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h 2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h 2008-11-21 02:25:55 UTC (rev 805)
@@ -1,5 +1,9 @@
-#include "OgreBulletDynamics.h"
+#include "OgreBulletDynamics.h"
+#include "LinearMath/btStackAlloc.h"
+#include "LinearMath/btPoolAllocator.h"
+#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
+
// First we create a magic namespace to hold all our aliases
namespace pyplusplus { namespace aliases {
Modified: trunk/python-ogre/demos/ogrepcz/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogrepcz/plugins.cfg 2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/demos/ogrepcz/plugins.cfg 2008-11-21 02:25:55 UTC (rev 805)
@@ -2,22 +2,24 @@
## Use this for Windows
# Define plugin folder
-PluginFolder=../../plugins
-#home/andy/development/root/usr/lib/OGRE
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
-Plugin=Plugin_PCZSceneManager.dll
-Plugin=Plugin_OctreeZone.dll
-Plugin=Plugin_OctreeSceneManager.dll
+#PluginFolder=../../plugins
+#Plugin=RenderSystem_GL.dll
+#Plugin=RenderSystem_Direct3D9.dll
+#Plugin=Plugin_ParticleFX.dll
+#Plugin=Plugin_BSPSceneManager.dll
+#Plugin=Plugin_CgProgramManager.dll
+#Plugin=Plugin_PCZSceneManager.dll
+#Plugin=Plugin_OctreeZone.dll
+#Plugin=Plugin_OctreeSceneManager.dll
##
## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+Plugin=RenderSystem_GL
+Plugin=Plugin_ParticleFX
+Plugin=Plugin_BSPSceneManager
+Plugin=libPlugin_PCZSceneManager
+#Plugin=Plugin_OctreeZone
+Plugin=Plugin_OctreeSceneManager
+#Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/environment.py 2008-11-21 02:25:55 UTC (rev 805)
@@ -1525,19 +1525,20 @@
class bullet:
active = True
pythonModule = True
- version= "2.70"
+ version= "2.72"
name='bullet'
base = "bullet-" + version
baseDir = os.path.join(os.getcwd(), base)
parent = "ogre/physics"
- libs=[boost.lib, 'libbulletcollision', 'libbulletdynamics']
+ libs=[boost.lib, 'LibBulletCollision', 'LibBulletDynamics','LibLinearMath']
if isWindows():
- libs.append('libbulletmath')
+ pass
+ #libs.append('libbulletMath')
else:
- libs.append('libbulletmath')
- libs.append('libbulletsoftbody')
+ #libs.append('libbulletmath')
+ libs.append('LibBulletSoftBody')
#libs.append('libbulletcolladaconverter')
- libs.append('libbulletmultithreaded')
+ libs.append('LibBulletMultiThreaded')
libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
@@ -1552,14 +1553,15 @@
]
buildCmds = [
[0, "tar zxf " +os.path.join(downloadPath, base)+".tgz", ''],
- [0, "./autogen.sh", baseDir],
- [0, "./configure --prefix=%s " %(PREFIX), baseDir],
-## [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
-## [0, "make", baseDir],
- [0, "jam", baseDir],
- [0, "jam install", baseDir]
+# [0, "./autogen.sh", baseDir],
+# [0, "./configure --prefix=%s " %(PREFIX), baseDir],
+ [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
+ [0, "make", baseDir],
+# [0, "make install", baseDir],
+# [0, "jam", baseDir],
+# [0, "jam install", baseDir]
-## [0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
+ [0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
]
else:
source=[
@@ -1581,7 +1583,7 @@
cflags = ""
parent = "ogre/physics"
libs = [boost.lib, 'OgreMain',
- 'libbulletcollision', 'libbulletdynamics', 'libbulletmath'
+ 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath'
]
# if isWindows():
# libs.append('libbulletmath')
@@ -1614,7 +1616,7 @@
cflags = ""
parent = "ogre/physics"
libs = [boost.lib, 'OgreMain',
- 'libbulletcollision', 'libbulletdynamics', 'libbulletmath'
+ 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath'
]
# if isWindows():
# libs.append('libbulletmath')
@@ -1634,7 +1636,7 @@
if isWindows():
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
- CCFLAGS = ' -D_PRECOMP '
+ CCFLAGS = ' -D_PRECOMP -fno-inline '
libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletD'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-19 10:38:22
|
Revision: 804
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=804&view=rev
Author: andy_miller
Date: 2008-11-19 10:38:17 +0000 (Wed, 19 Nov 2008)
Log Message:
-----------
Fix for OgreBulletc under Linux
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp 2008-11-18 23:15:10 UTC (rev 803)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp 2008-11-19 10:38:17 UTC (rev 804)
@@ -72,6 +72,11 @@
{
return mRay.getPoint(mMaxDistance);
}
+ // basic CollisionRay inline methods
+ const Ogre::Ray & CollisionRayResultCallback ::getRay() const
+ {
+ return mRay;
+ }
// -------------------------------------------------------------------------
bool CollisionRayResultCallback::doesCollide() const
{
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h 2008-11-18 23:15:10 UTC (rev 803)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h 2008-11-19 10:38:17 UTC (rev 804)
@@ -48,7 +48,7 @@
void setWorld(CollisionsWorld *world);
void setMaxDistance(Ogre::Real max_distance);
- inline const Ogre::Ray &getRay() const;
+ const Ogre::Ray & getRay() const;
inline Ogre::Vector3 getRayStartPoint() const;
inline Ogre::Vector3 getRayEndPoint() const;
@@ -61,11 +61,7 @@
};
// -------------------------------------------------------------------------
- // basic CollisionRay inline methods
- inline const Ogre::Ray &CollisionRayResultCallback ::getRay() const
- {
- return mRay;
- }
+
// -------------------------------------------------------------------------
// CollisionClosestRay
class CollisionClosestRayResultCallback : public CollisionRayResultCallback
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-18 23:15:10 UTC (rev 803)
+++ trunk/python-ogre/environment.py 2008-11-19 10:38:17 UTC (rev 804)
@@ -1600,7 +1600,7 @@
if isWindows():
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
- CCFLAGS = ' -D_PRECOMP '
+ CCFLAGS = ' -D_PRECOMP -fno-inline '
libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletC'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-18 23:15:14
|
Revision: 803
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=803&view=rev
Author: andy_miller
Date: 2008-11-18 23:15:10 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
Fix incorrect case in paths
Modified Paths:
--------------
trunk/python-ogre/demos/hydrax/resources.cfg
Modified: trunk/python-ogre/demos/hydrax/resources.cfg
===================================================================
--- trunk/python-ogre/demos/hydrax/resources.cfg 2008-11-18 23:11:33 UTC (rev 802)
+++ trunk/python-ogre/demos/hydrax/resources.cfg 2008-11-18 23:15:10 UTC (rev 803)
@@ -1,17 +1,17 @@
[Bootstrap]
-Zip=./Media/packs/OgreCore.zip
+Zip=./media/packs/OgreCore.zip
# Resource locations to be added to the default path
[General]
-FileSystem=./Media
-FileSystem=./Media/materials/programs
-FileSystem=./Media/materials/scripts
-FileSystem=./Media/materials/textures
-FileSystem=./Media/models
-Zip=./Media/packs/SkyBoxes.zip
+FileSystem=./media
+FileSystem=./media/materials/programs
+FileSystem=./media/materials/scripts
+FileSystem=./media/materials/textures
+FileSystem=./media/models
+Zip=./media/packs/SkyBoxes.zip
[Hydrax]
-FileSystem=./Media/Hydrax
+FileSystem=./media/Hydrax
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-18 23:11:37
|
Revision: 802
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=802&view=rev
Author: andy_miller
Date: 2008-11-18 23:11:33 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
missing file
Added Paths:
-----------
trunk/python-ogre/demos/hydrax/resources.cfg
Added: trunk/python-ogre/demos/hydrax/resources.cfg
===================================================================
--- trunk/python-ogre/demos/hydrax/resources.cfg (rev 0)
+++ trunk/python-ogre/demos/hydrax/resources.cfg 2008-11-18 23:11:33 UTC (rev 802)
@@ -0,0 +1,17 @@
+[Bootstrap]
+Zip=./Media/packs/OgreCore.zip
+
+# Resource locations to be added to the default path
+[General]
+
+FileSystem=./Media
+FileSystem=./Media/materials/programs
+FileSystem=./Media/materials/scripts
+FileSystem=./Media/materials/textures
+FileSystem=./Media/models
+Zip=./Media/packs/SkyBoxes.zip
+
+[Hydrax]
+FileSystem=./Media/Hydrax
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-18 23:09:49
|
Revision: 801
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=801&view=rev
Author: andy_miller
Date: 2008-11-18 23:09:45 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
Add indexing lib to modules for Linux build
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-18 13:33:14 UTC (rev 800)
+++ trunk/python-ogre/environment.py 2008-11-18 23:09:45 UTC (rev 801)
@@ -749,7 +749,8 @@
libs=['OIS_Static',boost.lib]
else:
- libs=['OIS',boost.lib]
+ libs=['OIS',boost.lib]
+ libs.append ( boost_python_index.lib )
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
include_dirs = [ Config.PATH_Boost
@@ -784,7 +785,8 @@
if isWindows():
libs=[boost.lib, 'OgreMain', 'ode_single', 'ReferenceAppLayer']
else:
- libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
+ libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
+ libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_ODE
@@ -809,7 +811,8 @@
if isWindows():
libs = ['Newton', boost.lib, 'OgreNewt_Main', 'OgreMain']
else:
- libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
+ libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
+ libs.append ( boost_python_index.lib )
if _STABLE:
source = [
[cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
@@ -823,7 +826,7 @@
[0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
#[0, "cp SConscript OgreNewt_Main", baseDir],
#[0, "rm SConscript", baseDir],
- [0, rm + " ./OgreNewt_Main/inc/boost", baseDir],
+ [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
[0, "scons prefix=%s boost=%s/include/boost-1_34_1 install" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore)
]
if isWindows():
@@ -864,7 +867,8 @@
pchincludes = ['boost/python.hpp', 'cegui.h']
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ]
else:
- libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
+ libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
+ libs.append ( boost_python_index.lib )
if isLinux():
if _STABLE:
@@ -936,7 +940,8 @@
if isWindows():
odeLibraryName = 'ode_single'
libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function
-
+ else:
+ libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_ODE
]
@@ -977,7 +982,9 @@
version= "1.3"
name = 'opcode'
parent = "ogre/physics"
- libs=[boost.lib]
+ libs=[boost.lib]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
]
include_dirs = [ Config.PATH_Boost
@@ -1054,7 +1061,8 @@
libs=[boost.lib, 'OgreMain', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
if isLinux():
- libs.append('ode')
+ libs.append('ode')
+ libs.append ( boost_python_index.lib )
else:
libs.append('ode_single')
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
@@ -1090,7 +1098,9 @@
##,Config.PATH_LIB_quickgui
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="QuickGUI"
class navi:
@@ -1143,7 +1153,9 @@
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain', 'OIS_Static' ]
if os.name=="nt":
- libs.append ( "User32" ) # needed for static linking
+ libs.append ( "User32" ) # needed for static linking
+ else:
+ libs.append ( boost_python_index.lib )
ModuleName="betagui"
@@ -1163,7 +1175,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="ogreforests"
@@ -1184,7 +1198,9 @@
Config.PATH_LIB_particleuniverse
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
+ libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="particleuniverse"
class nxogre:
@@ -1219,7 +1235,8 @@
if os.name =='nt':
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain','NxOgre' ] #, 'NxOgreStatic'] #'NxExtensions',
else:
- libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ]
+ libs.append ( boost_python_index.lib )
ModuleName="NxOgre"
@@ -1248,7 +1265,9 @@
Config.PATH_LIB_Theora,
]
CheckIncludes=[]
- libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
+ libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="theora"
class plib:
@@ -1269,7 +1288,8 @@
if os.name == "nt":
libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ]
else:
- libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
+ libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
+ libs.append ( boost_python_index.lib )
class physx:
active = True
@@ -1296,7 +1316,8 @@
if isWindows():
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader' ]
elif isLinux():
- libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
+ libs.append ( boost_python_index.lib )
source = [
[wget, "http://developer.download.nvidia.com/PhysX/2.8.1/PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz", downloadPath]
]
@@ -1422,7 +1443,7 @@
#'ogg',
#'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
-
+ libs.append ( boost_python_index.lib )
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
@@ -1516,7 +1537,8 @@
libs.append('libbulletmath')
libs.append('libbulletsoftbody')
#libs.append('libbulletcolladaconverter')
- libs.append('libbulletmultithreaded')
+ libs.append('libbulletmultithreaded')
+ libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Bullet
@@ -1578,7 +1600,8 @@
if isWindows():
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
- CCFLAGS = ' -D_PRECOMP '
+ CCFLAGS = ' -D_PRECOMP '
+ libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletC'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
@@ -1611,7 +1634,8 @@
if isWindows():
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
- CCFLAGS = ' -D_PRECOMP '
+ CCFLAGS = ' -D_PRECOMP '
+ libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletD'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
descText = "Ogre Bullet Dynamics (physics) implementation"
@@ -1629,9 +1653,11 @@
os.path.join(Config.PATH_INCLUDE_noise, 'module')
]
lib_dirs = [Config.PATH_LIB_Boost
- ]
+ ]
CheckIncludes=[]
libs=[ boost.lib]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="noise"
descText = "Generate 'noise'"
@@ -1650,7 +1676,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="watermesh"
descText = "C++ code from Ogre Water demo -- use Hydrax instead"
@@ -1669,7 +1697,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="ofusion"
descText = "Import Ogre 'Scenes' from 3dMax using the ofusion exporter"
@@ -1688,7 +1718,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="cadunetree"
descText = "Generate realistic trees"
@@ -1704,10 +1736,13 @@
Config.PATH_INCLUDE_ogrepcz
]
lib_dirs = [Config.PATH_LIB_Boost,
- Config.PATH_LIB_Ogre_OgreMain
+ Config.PATH_LIB_Ogre_OgreMain,
+ os.path.join(Config.PATH_LIB_Ogre_OgreMain, 'OGRE')
]
CheckIncludes=[]
- libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
+ libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="ogrepcz"
descText = "Portal SceneManager - seamlessly move from interior to exterior scene management"
@@ -1726,7 +1761,9 @@
Config.PATH_LIB_opensteer
]
CheckIncludes=[]
- libs=[ boost.lib, 'opensteer' ]
+ libs=[ boost.lib, 'opensteer' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="opensteer"
class hydrax:
@@ -1744,7 +1781,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="hydrax"
descText = "Fantastic water/ocean effects"
@@ -1764,7 +1803,9 @@
Config.PATH_LIB_hikari
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ]
+ libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="hikari"
descText = "Use Flash controls within Ogre"
descLink = "http://hikari-library.googlecode.com/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-18 13:33:19
|
Revision: 800
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=800&view=rev
Author: andy_miller
Date: 2008-11-18 13:33:14 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
Fixes for Linux bullet and Hydrax
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/Hydrax/Perlin.cpp
trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
trunk/python-ogre/demos/plugins.cfg
trunk/python-ogre/environment.py
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
trunk/python-ogre/scripts/00-PreReqs.sh
Modified: trunk/python-ogre/ThirdParty/Hydrax/Perlin.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/Hydrax/Perlin.cpp 2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/ThirdParty/Hydrax/Perlin.cpp 2008-11-18 13:33:14 UTC (rev 800)
@@ -133,7 +133,7 @@
// Create our perlin textures
- Ogre::TexturePtr& mPerlinTexture0
+ Ogre::TexturePtr mPerlinTexture0
= Ogre::TextureManager::getSingleton().
createManual("_Hydrax_Perlin_Noise0",
HYDRAX_RESOURCE_GROUP,
@@ -142,7 +142,7 @@
Ogre::PF_L16,
Ogre::TU_DYNAMIC_WRITE_ONLY);
- Ogre::TexturePtr& mPerlinTexture1
+ Ogre::TexturePtr mPerlinTexture1
= Ogre::TextureManager::getSingleton().
createManual("_Hydrax_Perlin_Noise1",
HYDRAX_RESOURCE_GROUP,
@@ -590,4 +590,4 @@
return o >> (upsamplepower+upsamplepower);
}
-}}
\ No newline at end of file
+}}
Modified: trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2008-11-18 13:33:14 UTC (rev 800)
@@ -214,7 +214,7 @@
if os.name == 'nt':
defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
else:
- defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'VERSION_' + environment.ogrebulletc.version )
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-11-18 13:33:14 UTC (rev 800)
@@ -202,7 +202,7 @@
if os.name == 'nt':
defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
else:
- defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD', '__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'VERSION_' + environment.ogrebulletd.version )
if environment._USE_THREADS:
Modified: trunk/python-ogre/demos/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/plugins.cfg 2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/demos/plugins.cfg 2008-11-18 13:33:14 UTC (rev 800)
@@ -1,23 +1,13 @@
# Defines plugins to load
## Use this for Windows
-# Define plugin folder
-PluginFolder=../../plugins
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
-Plugin=Plugin_PCZSceneManager.dll
-Plugin=Plugin_OctreeZone.dll
-Plugin=Plugin_OctreeSceneManager.dll
##
## NOTE use this for MacOS or Linux
-#PluginFolder=/home/andy/development/root/usr/lib/OGRE
-#Plugin=RenderSystem_GL
-#Plugin=Plugin_ParticleFX
-#Plugin=Plugin_BSPSceneManager
-#Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+Plugin=RenderSystem_GL
+Plugin=Plugin_ParticleFX
+Plugin=Plugin_BSPSceneManager
+Plugin=Plugin_OctreeSceneManager
+Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/environment.py 2008-11-18 13:33:14 UTC (rev 800)
@@ -815,8 +815,8 @@
[cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
]
else:
- source = [ ##to fix
- [svn, " co :pserver:ano...@cv...:/cvsroot/ogre co -P "+base, os.getcwd()]
+ source = [
+ [svn, " co https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogrenewt " + base, os.getcwd()]
]
baseDir = os.path.join(os.getcwd(), base )
buildCmds = [
@@ -1509,14 +1509,14 @@
base = "bullet-" + version
baseDir = os.path.join(os.getcwd(), base)
parent = "ogre/physics"
- libs=[boost.lib, 'LibBulletCollision', 'LibBulletDynamics']
+ libs=[boost.lib, 'libbulletcollision', 'libbulletdynamics']
if isWindows():
libs.append('libbulletmath')
else:
- libs.append('LibLinearMath')
- libs.append('LibBulletSoftBody')
- libs.append('LibBulletColladaConverter')
- libs.append('LibBulletMultiThreaded')
+ libs.append('libbulletmath')
+ libs.append('libbulletsoftbody')
+ #libs.append('libbulletcolladaconverter')
+ libs.append('libbulletmultithreaded')
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Bullet
@@ -1530,9 +1530,14 @@
]
buildCmds = [
[0, "tar zxf " +os.path.join(downloadPath, base)+".tgz", ''],
- [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
- [0, "make", baseDir],
- [0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
+ [0, "./autogen.sh", baseDir],
+ [0, "./configure --prefix=%s " %(PREFIX), baseDir],
+## [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
+## [0, "make", baseDir],
+ [0, "jam", baseDir],
+ [0, "jam install", baseDir]
+
+## [0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
]
else:
source=[
@@ -1554,12 +1559,12 @@
cflags = ""
parent = "ogre/physics"
libs = [boost.lib, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics'
+ 'libbulletcollision', 'libbulletdynamics', 'libbulletmath'
]
- if isWindows():
- libs.append('libbulletmath')
- else:
- libs.append('LibLinearMath')
+# if isWindows():
+# libs.append('libbulletmath')
+# else:
+# libs.append('liblinearmath')
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
@@ -1575,8 +1580,9 @@
else:
CCFLAGS = ' -D_PRECOMP '
ModuleName = 'OgreBulletC'
- CheckIncludes=['boost/python.hpp', 'Ogre.h']
+ CheckIncludes=['boost/python.hpp', 'Ogre.h']
+
class ogrebulletd: #
active = True
pythonModule = True
@@ -1585,12 +1591,12 @@
cflags = ""
parent = "ogre/physics"
libs = [boost.lib, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics'
+ 'libbulletcollision', 'libbulletdynamics', 'libbulletmath'
]
- if isWindows():
- libs.append('libbulletmath')
- else:
- libs.append('LibLinearMath')
+# if isWindows():
+# libs.append('libbulletmath')
+# else:
+# libs.append('liblinearmath')
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
Modified: trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-11-18 13:33:14 UTC (rev 800)
@@ -118,7 +118,13 @@
def _setUp(self):
"""This sets up the ogre application, and returns false if the user
hits "cancel" in the dialog box."""
- self.root = ogre.Root(getPluginPath())
+ if self.unittest:
+ if os.path.isfile('ogre.cfg'):
+ self.root = ogre.Root(getPluginPath())
+ else:
+ self.root = ogre.Root(getPluginPath(), '../ogre.cfg')
+ else:
+ self.root = ogre.Root(getPluginPath())
self.root.setFrameSmoothingPeriod (5.0)
self._setUpResources()
Modified: trunk/python-ogre/scripts/00-PreReqs.sh
===================================================================
--- trunk/python-ogre/scripts/00-PreReqs.sh 2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/scripts/00-PreReqs.sh 2008-11-18 13:33:14 UTC (rev 800)
@@ -22,5 +22,6 @@
python-dev \
python-celementtree \
libglew-dev \
+ jam \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-18 07:52:57
|
Revision: 799
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=799&view=rev
Author: andy_miller
Date: 2008-11-18 07:52:54 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
OgreOde and Ode updates for Linux
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/code_generators/ode/generate_code.py
trunk/python-ogre/code_generators/ode/return_pointee_value.hpp
trunk/python-ogre/code_generators/ogre/return_pointee_value.hpp
trunk/python-ogre/environment.py
trunk/python-ogre/patch/ogreode.patch
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2008-11-17 12:00:04 UTC (rev 798)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-11-18 07:52:54 UTC (rev 799)
@@ -47,7 +47,7 @@
PATH_OIS = os.path.join(BASE_DIR, 'ogre','Dependencies')
PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK','sdk')
-PATH_ODE = os.path.join(BASE_DIR, 'ode-0.9')
+PATH_ODE = os.path.join(BASE_DIR, 'ode-0.10.1')
PATH_OGG = os.path.join(BASE_DIR, 'libogg-1.1.3')
PATH_VORBIS= os.path.join(BASE_DIR, 'libvorbis-1.2.0')
PATH_OPENAL= os.path.join(BASE_DIR, 'openal-soft-1.5.304')
Modified: trunk/python-ogre/code_generators/ode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ode/generate_code.py 2008-11-17 12:00:04 UTC (rev 798)
+++ trunk/python-ogre/code_generators/ode/generate_code.py 2008-11-18 07:52:54 UTC (rev 799)
@@ -335,8 +335,11 @@
return_pointee_value_source_path \
= os.path.join ( os.path.dirname(code_repository.__file__),
'return_pointee_value.hpp')
+ if not os.path.exists(return_pointee_value_source_path):
+ return_pointee_value_source_path \
+ = os.path.join ( os.getcwd(),
+ 'return_pointee_value.hpp')
- print return_pointee_value_source_path
return_pointee_value_target_path \
= os.path.join( environment.ode.generated_dir, 'return_pointee_value.hpp' )
Modified: trunk/python-ogre/code_generators/ode/return_pointee_value.hpp
===================================================================
--- trunk/python-ogre/code_generators/ode/return_pointee_value.hpp 2008-11-17 12:00:04 UTC (rev 798)
+++ trunk/python-ogre/code_generators/ode/return_pointee_value.hpp 2008-11-18 07:52:54 UTC (rev 799)
@@ -1,3 +1,8 @@
+// Copyright 2004-2008 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#ifndef RETURN_POINTEE_VALUE_9_11_2006
#define RETURN_POINTEE_VALUE_9_11_2006
@@ -25,7 +30,7 @@
};
template <class R>
- struct reference_existing_object_requires_a_pointer_return_type
+ struct return_pointee_value_requires_a_pointer_return_type
# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
{}
# endif
@@ -44,7 +49,7 @@
typedef typename mpl::if_c<
ok
, to_python_indirect<T, detail::make_value_holder>
- , detail::reference_existing_object_requires_a_pointer_return_type<T>
+ , detail::return_pointee_value_requires_a_pointer_return_type<T>
>::type type;
};
};
Modified: trunk/python-ogre/code_generators/ogre/return_pointee_value.hpp
===================================================================
--- trunk/python-ogre/code_generators/ogre/return_pointee_value.hpp 2008-11-17 12:00:04 UTC (rev 798)
+++ trunk/python-ogre/code_generators/ogre/return_pointee_value.hpp 2008-11-18 07:52:54 UTC (rev 799)
@@ -1,4 +1,4 @@
-// Copyright 2004 Roman Yakovenko.
+// Copyright 2004-2008 Roman Yakovenko.
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-17 12:00:04 UTC (rev 798)
+++ trunk/python-ogre/environment.py 2008-11-18 07:52:54 UTC (rev 799)
@@ -1047,7 +1047,7 @@
[0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir],
[0, "chmod +x autogen.sh", baseDir],
[0, "./autogen.sh", baseDir],
- [0, "./configure --prefix=%s" % PREFIX, baseDir],
+ [0, "./configure --without-samples --prefix=%s" % PREFIX, baseDir],
[0, "make", baseDir],
[0, "make install", baseDir],
]
Modified: trunk/python-ogre/patch/ogreode.patch
===================================================================
--- trunk/python-ogre/patch/ogreode.patch 2008-11-17 12:00:04 UTC (rev 798)
+++ trunk/python-ogre/patch/ogreode.patch 2008-11-18 07:52:54 UTC (rev 799)
@@ -1,245 +1,95 @@
-Index: include/OgreOdeEntityInformer.h
-===================================================================
---- include/OgreOdeEntityInformer.h (revision 2510)
-+++ include/OgreOdeEntityInformer.h (working copy)
-@@ -36,12 +36,12 @@
- const TriangleIndex* getIndices();
- unsigned int getIndexCount();
-
-+ bool getBoneVertices(unsigned char bone,unsigned int &vertex_count, Ogre::Vector3* &vertices);
- protected:
- void addVertexData(const Ogre::VertexData *vertex_data,
- const Ogre::VertexData *blended_data = 0,
- const Ogre::Mesh::IndexMap *indexMap = 0);
- void addIndexData(Ogre::IndexData *data, const unsigned int offset = 0);
-- bool getBoneVertices(unsigned char bone,unsigned int &vertex_count, Ogre::Vector3* &vertices);
-
- Ogre::Entity* _entity;
- Ogre::SceneNode* _node;
-Index: src/OgreOdeTriangleMeshDataManager.cpp
-===================================================================
---- src/OgreOdeTriangleMeshDataManager.cpp (revision 2510)
-+++ src/OgreOdeTriangleMeshDataManager.cpp (working copy)
-@@ -1,106 +1,106 @@
--#include "OgreOdePrecompiledHeaders.h"
--
--#include "OgreOdeTriangleMeshDataManager.h"
--
-+#include "OgreOdePrecompiledHeaders.h"
-
-+#include "OgreOdeTriangleMeshDataManager.h"
-+
-+
+Index: include/OgreOdeEntityInformer.h
+===================================================================
+--- include/OgreOdeEntityInformer.h (revision 2510)
++++ include/OgreOdeEntityInformer.h (working copy)
+@@ -36,12 +36,12 @@
+ const TriangleIndex* getIndices();
+ unsigned int getIndexCount();
+
++ bool getBoneVertices(unsigned char bone,unsigned int &vertex_count, Ogre::Vector3* &vertices);
+ protected:
+ void addVertexData(const Ogre::VertexData *vertex_data,
+ const Ogre::VertexData *blended_data = 0,
+ const Ogre::Mesh::IndexMap *indexMap = 0);
+ void addIndexData(Ogre::IndexData *data, const unsigned int offset = 0);
+- bool getBoneVertices(unsigned char bone,unsigned int &vertex_count, Ogre::Vector3* &vertices);
+
+ Ogre::Entity* _entity;
+ Ogre::SceneNode* _node;
+Index: src/OgreOdeGeometry.cpp
+===================================================================
+--- src/OgreOdeGeometry.cpp (revision 2510)
++++ src/OgreOdeGeometry.cpp (working copy)
+@@ -924,7 +924,7 @@
+
+ _data = dGeomTriMeshDataCreate();
+
+- dGeomTriMeshDataBuildSimple(_data,(const dReal*)_vertices, (int)vertex_count, _indices, (int) index_count);
++ dGeomTriMeshDataBuildSimple(_data,(const dReal*)_vertices, (int)vertex_count, /*(const int *)*/_indices, (int) index_count);
+
+ _geom = dCreateTriMesh(getSpaceID(space),_data,0,0,0);
+ registerGeometry();
+Index: src/OgreOdeTriangleMeshDataManager.cpp
+===================================================================
+--- src/OgreOdeTriangleMeshDataManager.cpp (revision 2510)
++++ src/OgreOdeTriangleMeshDataManager.cpp (working copy)
+@@ -6,7 +6,7 @@
using namespace Ogre;
--using namespace OgreOde;
--
--template<> TriangleMeshDataManager *Ogre::Singleton<TriangleMeshDataManager>::ms_Singleton = 0;
--
--namespace OgreOde
--{
-- //-----------------------------------------------------------------------
-- TriangleMeshDataManager::TriangleMeshDataManager()
-- {
-- }
--
-- //-----------------------------------------------------------------------
-- TriangleMeshDataManager::~TriangleMeshDataManager()
-- {
-- //mTriangleMeshDataMap.clear();
-- }
--
-- //-----------------------------------------------------------------------
-- TriangleMeshDataManager *TriangleMeshDataManager::getSingletonPtr ()
-- {
-- return ms_Singleton;
-- }
--
-- //-----------------------------------------------------------------------
-- TriangleMeshDataManager &TriangleMeshDataManager::getSingleton ()
-- {
-- assert (ms_Singleton);
-- return (*ms_Singleton);
-- }
--
--
-- //-----------------------------------------------------------------------
-- void TriangleMeshDataManager::addTriangleMeshData(const String& name, TriangleMeshDataPtr shape, Vector3 scale)
-- {
--
-- mTriangleMeshDataMap[name][scale] = shape;
--
-- // reduce count so when Ode::Geometry changes its dataPtr or is deleted we arn't
-- // left with this one on a referance count of 1
-- unsigned int* count = shape.useCountPointer();
-- (*count)--;
--
-- }
--
--
-- //-----------------------------------------------------------------------
-- void TriangleMeshDataManager::removeTriangleMeshData(const String& name, Vector3 scale)
-- {
--
-- TriangleMeshDataPtrMap::iterator itr = mTriangleMeshDataMap.find(name);
-- if(itr != mTriangleMeshDataMap.end())
-- {
--
-- std::map<Ogre::Vector3, OgreOde::TriangleMeshDataPtr,OgreOde::TriangleMeshDataManager::vectorLess>::iterator itr2;
--
-- itr2 = itr->second.find(scale);
--
-- if ( itr2 != itr->second.end() )
-- {
-- //printf ("no TriangleMeshData for scale so erase it\n");
-- itr->second.erase(itr2);
-- itr2->second.setNull();
-- }
--
-- if (itr->second.size() == 0)
-- {
-- //printf ("have no TriangleMeshData for this mesh so erase it from map\n");
-- mTriangleMeshDataMap.erase(itr);
-- }
-- }
--
-- }
--
--
-- /** looks for mesh name then size or returns a NULL TriangleMeshDataPtr
-- */
-- //-----------------------------------------------------------------------
-- TriangleMeshDataPtr TriangleMeshDataManager::getTriangleMeshData(const String& name, Vector3 scale)
-- {
--
-- TriangleMeshDataPtrMap::iterator itr = mTriangleMeshDataMap.find(name);
-- if(itr != mTriangleMeshDataMap.end())
-- {
-- std::map<Ogre::Vector3, OgreOde::TriangleMeshDataPtr,OgreOde::TriangleMeshDataManager::vectorLess>::iterator itr2;
--
-- itr2 = itr->second.find(scale);
--
-- if ( itr2 != itr->second.end() )
-- {
-- return itr2->second;
-- }
-- }
--
-- //printf ("TriangleMeshDataManager::getTriangleMeshData not found\n");
--
-- return NULL;
--
-- }
--
--}
-+using namespace OgreOde;
-+
-+template<> OgreOde::TriangleMeshDataManager * Ogre::Singleton<OgreOde::TriangleMeshDataManager>::ms_Singleton = 0;
-+
-+namespace OgreOde
-+{
-+ //-----------------------------------------------------------------------
-+ TriangleMeshDataManager::TriangleMeshDataManager()
-+ {
-+ }
-+
-+ //-----------------------------------------------------------------------
-+ TriangleMeshDataManager::~TriangleMeshDataManager()
-+ {
-+ //mTriangleMeshDataMap.clear();
-+ }
-+
-+ //-----------------------------------------------------------------------
-+ TriangleMeshDataManager *TriangleMeshDataManager::getSingletonPtr ()
-+ {
-+ return ms_Singleton;
-+ }
-+
-+ //-----------------------------------------------------------------------
-+ TriangleMeshDataManager &TriangleMeshDataManager::getSingleton ()
-+ {
-+ assert (ms_Singleton);
-+ return (*ms_Singleton);
-+ }
-+
-+
-+ //-----------------------------------------------------------------------
-+ void TriangleMeshDataManager::addTriangleMeshData(const String& name, TriangleMeshDataPtr shape, Vector3 scale)
-+ {
-+
-+ mTriangleMeshDataMap[name][scale] = shape;
-+
-+ // reduce count so when Ode::Geometry changes its dataPtr or is deleted we arn't
-+ // left with this one on a referance count of 1
-+ unsigned int* count = shape.useCountPointer();
-+ (*count)--;
-+
-+ }
-+
-+
-+ //-----------------------------------------------------------------------
-+ void TriangleMeshDataManager::removeTriangleMeshData(const String& name, Vector3 scale)
-+ {
-+
-+ TriangleMeshDataPtrMap::iterator itr = mTriangleMeshDataMap.find(name);
-+ if(itr != mTriangleMeshDataMap.end())
-+ {
-+
-+ std::map<Ogre::Vector3, OgreOde::TriangleMeshDataPtr,OgreOde::TriangleMeshDataManager::vectorLess>::iterator itr2;
-+
-+ itr2 = itr->second.find(scale);
-+
-+ if ( itr2 != itr->second.end() )
-+ {
-+ //printf ("no TriangleMeshData for scale so erase it\n");
-+ itr->second.erase(itr2);
-+ itr2->second.setNull();
-+ }
-+
-+ if (itr->second.size() == 0)
-+ {
-+ //printf ("have no TriangleMeshData for this mesh so erase it from map\n");
-+ mTriangleMeshDataMap.erase(itr);
-+ }
-+ }
-+
-+ }
-+
-+
-+ /** looks for mesh name then size or returns a NULL TriangleMeshDataPtr
-+ */
-+ //-----------------------------------------------------------------------
-+ TriangleMeshDataPtr TriangleMeshDataManager::getTriangleMeshData(const String& name, Vector3 scale)
-+ {
-+
-+ TriangleMeshDataPtrMap::iterator itr = mTriangleMeshDataMap.find(name);
-+ if(itr != mTriangleMeshDataMap.end())
-+ {
-+ std::map<Ogre::Vector3, OgreOde::TriangleMeshDataPtr,OgreOde::TriangleMeshDataManager::vectorLess>::iterator itr2;
-+
-+ itr2 = itr->second.find(scale);
-+
-+ if ( itr2 != itr->second.end() )
-+ {
-+ return itr2->second;
-+ }
-+ }
-+
-+ //printf ("TriangleMeshDataManager::getTriangleMeshData not found\n");
-+
-+ return NULL;
-+
-+ }
-+
-+}
-Index: prefab/src/OgreOdeRagdoll.cpp
-===================================================================
---- prefab/src/OgreOdeRagdoll.cpp (revision 2510)
-+++ prefab/src/OgreOdeRagdoll.cpp (working copy)
-@@ -10,6 +10,7 @@
+ using namespace OgreOde;
+
+-template<> TriangleMeshDataManager *Ogre::Singleton<TriangleMeshDataManager>::ms_Singleton = 0;
++template<> OgreOde::TriangleMeshDataManager * Ogre::Singleton<OgreOde::TriangleMeshDataManager>::ms_Singleton = 0;
+
+ namespace OgreOde
+ {
+Index: prefab/src/OgreOdeRagdoll.cpp
+===================================================================
+--- prefab/src/OgreOdeRagdoll.cpp (revision 2512)
++++ prefab/src/OgreOdeRagdoll.cpp (working copy)
+@@ -10,6 +10,7 @@
#include "OgreOde_Prefab.h"
#include "OgreOdeRagdoll.h"
-+#include "OgreAlignedAllocator.h"
++#include "OgreAlignedAllocator.h"
using namespace Ogre;
using namespace OgreOde;
+@@ -734,4 +735,4 @@
+ void RagdollFactory::destroyInstance( MovableObject* obj)
+ {
+ delete obj;
+-}
+\ No newline at end of file
++}
+Index: loader/include/OgreOdeDotLoader.h
+===================================================================
+--- loader/include/OgreOdeDotLoader.h (revision 2510)
++++ loader/include/OgreOdeDotLoader.h (working copy)
+@@ -15,8 +15,8 @@
+ DotLoader(OgreOde::World * world = 0, OgreOde::Space * space = 0);
+ ~DotLoader(){};
+
+- void setWorld(OgreOde::World * world) {_world = world;};
+- void setSpace(OgreOde::Space * space) {_space = space;};
++ void setWorld(OgreOde::World * world);// {_world = world;};
++ void setSpace(OgreOde::Space * space);// {_space = space;};
+
+ ObjectList *load(const Ogre::String &filename, const Ogre::StringVector &objects_names, const Ogre::StringVector &instance_names);
+ void save(const Ogre::String &filename, const Ogre::StringVector &objects_names, ObjectList *objects);
+Index: loader/src/OgreOdeDotLoader.cpp
+===================================================================
+--- loader/src/OgreOdeDotLoader.cpp (revision 2510)
++++ loader/src/OgreOdeDotLoader.cpp (working copy)
+@@ -62,6 +62,12 @@
+ {
+
+ }
++
++void DotLoader::setWorld(OgreOde::World * world)
++{_world = world;};
++void DotLoader::setSpace(OgreOde::Space * space)
++{_space = space;};
++
+ //------------------------------------------------------------------------------------------------
+ ObjectList *DotLoader::load(const String &filename, const StringVector &objects_names, const StringVector &instance_names)
+ {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-17 12:00:07
|
Revision: 798
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=798&view=rev
Author: andy_miller
Date: 2008-11-17 12:00:04 +0000 (Mon, 17 Nov 2008)
Log Message:
-----------
Patch update
Modified Paths:
--------------
trunk/python-ogre/patch/ogreode.patch
Modified: trunk/python-ogre/patch/ogreode.patch
===================================================================
--- trunk/python-ogre/patch/ogreode.patch 2008-11-17 11:44:30 UTC (rev 797)
+++ trunk/python-ogre/patch/ogreode.patch 2008-11-17 12:00:04 UTC (rev 798)
@@ -1,126 +1,245 @@
-Index: include/OgreOdePreReqs.h
+Index: include/OgreOdeEntityInformer.h
===================================================================
---- include/OgreOdePreReqs.h (revision 2492)
-+++ include/OgreOdePreReqs.h (working copy)
-@@ -2,9 +2,9 @@
- #define _OGREODEPREREQS_H_
+--- include/OgreOdeEntityInformer.h (revision 2510)
++++ include/OgreOdeEntityInformer.h (working copy)
+@@ -36,12 +36,12 @@
+ const TriangleIndex* getIndices();
+ unsigned int getIndexCount();
- #include "Ogre.h"
--#include "OgreNoMemoryMacros.h"
-+//#include "OgreNoMemoryMacros.h"
- #include "ode/ode.h"
--#include "OgreMemoryMacros.h"
-+//#include "OgreMemoryMacros.h"
++ bool getBoneVertices(unsigned char bone,unsigned int &vertex_count, Ogre::Vector3* &vertices);
+ protected:
+ void addVertexData(const Ogre::VertexData *vertex_data,
+ const Ogre::VertexData *blended_data = 0,
+ const Ogre::Mesh::IndexMap *indexMap = 0);
+ void addIndexData(Ogre::IndexData *data, const unsigned int offset = 0);
+- bool getBoneVertices(unsigned char bone,unsigned int &vertex_count, Ogre::Vector3* &vertices);
-
- namespace OgreOde
-Index: src/OgreOdeGeometry.cpp
+ Ogre::Entity* _entity;
+ Ogre::SceneNode* _node;
+Index: src/OgreOdeTriangleMeshDataManager.cpp
===================================================================
---- src/OgreOdeGeometry.cpp (revision 2492)
-+++ src/OgreOdeGeometry.cpp (working copy)
-@@ -900,7 +900,7 @@
+--- src/OgreOdeTriangleMeshDataManager.cpp (revision 2510)
++++ src/OgreOdeTriangleMeshDataManager.cpp (working copy)
+@@ -1,106 +1,106 @@
+-#include "OgreOdePrecompiledHeaders.h"
+-
+-#include "OgreOdeTriangleMeshDataManager.h"
+-
++#include "OgreOdePrecompiledHeaders.h"
- _data = dGeomTriMeshDataCreate();
-
-- dGeomTriMeshDataBuildSimple(_data,(const dReal*)_vertices, (int)vertex_count, _indices, (int) index_count);
-+ dGeomTriMeshDataBuildSimple(_data,(const dReal*)_vertices, (int)vertex_count, /*(const int *)*/_indices, (int) index_count);
-
- _geom = dCreateTriMesh(getSpaceID(space),_data,0,0,0);
- registerGeometry();
-Index: src/OgreOdeEntityInformer.cpp
++#include "OgreOdeTriangleMeshDataManager.h"
++
++
+ using namespace Ogre;
+-using namespace OgreOde;
+-
+-template<> TriangleMeshDataManager *Ogre::Singleton<TriangleMeshDataManager>::ms_Singleton = 0;
+-
+-namespace OgreOde
+-{
+- //-----------------------------------------------------------------------
+- TriangleMeshDataManager::TriangleMeshDataManager()
+- {
+- }
+-
+- //-----------------------------------------------------------------------
+- TriangleMeshDataManager::~TriangleMeshDataManager()
+- {
+- //mTriangleMeshDataMap.clear();
+- }
+-
+- //-----------------------------------------------------------------------
+- TriangleMeshDataManager *TriangleMeshDataManager::getSingletonPtr ()
+- {
+- return ms_Singleton;
+- }
+-
+- //-----------------------------------------------------------------------
+- TriangleMeshDataManager &TriangleMeshDataManager::getSingleton ()
+- {
+- assert (ms_Singleton);
+- return (*ms_Singleton);
+- }
+-
+-
+- //-----------------------------------------------------------------------
+- void TriangleMeshDataManager::addTriangleMeshData(const String& name, TriangleMeshDataPtr shape, Vector3 scale)
+- {
+-
+- mTriangleMeshDataMap[name][scale] = shape;
+-
+- // reduce count so when Ode::Geometry changes its dataPtr or is deleted we arn't
+- // left with this one on a referance count of 1
+- unsigned int* count = shape.useCountPointer();
+- (*count)--;
+-
+- }
+-
+-
+- //-----------------------------------------------------------------------
+- void TriangleMeshDataManager::removeTriangleMeshData(const String& name, Vector3 scale)
+- {
+-
+- TriangleMeshDataPtrMap::iterator itr = mTriangleMeshDataMap.find(name);
+- if(itr != mTriangleMeshDataMap.end())
+- {
+-
+- std::map<Ogre::Vector3, OgreOde::TriangleMeshDataPtr,OgreOde::TriangleMeshDataManager::vectorLess>::iterator itr2;
+-
+- itr2 = itr->second.find(scale);
+-
+- if ( itr2 != itr->second.end() )
+- {
+- //printf ("no TriangleMeshData for scale so erase it\n");
+- itr->second.erase(itr2);
+- itr2->second.setNull();
+- }
+-
+- if (itr->second.size() == 0)
+- {
+- //printf ("have no TriangleMeshData for this mesh so erase it from map\n");
+- mTriangleMeshDataMap.erase(itr);
+- }
+- }
+-
+- }
+-
+-
+- /** looks for mesh name then size or returns a NULL TriangleMeshDataPtr
+- */
+- //-----------------------------------------------------------------------
+- TriangleMeshDataPtr TriangleMeshDataManager::getTriangleMeshData(const String& name, Vector3 scale)
+- {
+-
+- TriangleMeshDataPtrMap::iterator itr = mTriangleMeshDataMap.find(name);
+- if(itr != mTriangleMeshDataMap.end())
+- {
+- std::map<Ogre::Vector3, OgreOde::TriangleMeshDataPtr,OgreOde::TriangleMeshDataManager::vectorLess>::iterator itr2;
+-
+- itr2 = itr->second.find(scale);
+-
+- if ( itr2 != itr->second.end() )
+- {
+- return itr2->second;
+- }
+- }
+-
+- //printf ("TriangleMeshDataManager::getTriangleMeshData not found\n");
+-
+- return NULL;
+-
+- }
+-
+-}
++using namespace OgreOde;
++
++template<> OgreOde::TriangleMeshDataManager * Ogre::Singleton<OgreOde::TriangleMeshDataManager>::ms_Singleton = 0;
++
++namespace OgreOde
++{
++ //-----------------------------------------------------------------------
++ TriangleMeshDataManager::TriangleMeshDataManager()
++ {
++ }
++
++ //-----------------------------------------------------------------------
++ TriangleMeshDataManager::~TriangleMeshDataManager()
++ {
++ //mTriangleMeshDataMap.clear();
++ }
++
++ //-----------------------------------------------------------------------
++ TriangleMeshDataManager *TriangleMeshDataManager::getSingletonPtr ()
++ {
++ return ms_Singleton;
++ }
++
++ //-----------------------------------------------------------------------
++ TriangleMeshDataManager &TriangleMeshDataManager::getSingleton ()
++ {
++ assert (ms_Singleton);
++ return (*ms_Singleton);
++ }
++
++
++ //-----------------------------------------------------------------------
++ void TriangleMeshDataManager::addTriangleMeshData(const String& name, TriangleMeshDataPtr shape, Vector3 scale)
++ {
++
++ mTriangleMeshDataMap[name][scale] = shape;
++
++ // reduce count so when Ode::Geometry changes its dataPtr or is deleted we arn't
++ // left with this one on a referance count of 1
++ unsigned int* count = shape.useCountPointer();
++ (*count)--;
++
++ }
++
++
++ //-----------------------------------------------------------------------
++ void TriangleMeshDataManager::removeTriangleMeshData(const String& name, Vector3 scale)
++ {
++
++ TriangleMeshDataPtrMap::iterator itr = mTriangleMeshDataMap.find(name);
++ if(itr != mTriangleMeshDataMap.end())
++ {
++
++ std::map<Ogre::Vector3, OgreOde::TriangleMeshDataPtr,OgreOde::TriangleMeshDataManager::vectorLess>::iterator itr2;
++
++ itr2 = itr->second.find(scale);
++
++ if ( itr2 != itr->second.end() )
++ {
++ //printf ("no TriangleMeshData for scale so erase it\n");
++ itr->second.erase(itr2);
++ itr2->second.setNull();
++ }
++
++ if (itr->second.size() == 0)
++ {
++ //printf ("have no TriangleMeshData for this mesh so erase it from map\n");
++ mTriangleMeshDataMap.erase(itr);
++ }
++ }
++
++ }
++
++
++ /** looks for mesh name then size or returns a NULL TriangleMeshDataPtr
++ */
++ //-----------------------------------------------------------------------
++ TriangleMeshDataPtr TriangleMeshDataManager::getTriangleMeshData(const String& name, Vector3 scale)
++ {
++
++ TriangleMeshDataPtrMap::iterator itr = mTriangleMeshDataMap.find(name);
++ if(itr != mTriangleMeshDataMap.end())
++ {
++ std::map<Ogre::Vector3, OgreOde::TriangleMeshDataPtr,OgreOde::TriangleMeshDataManager::vectorLess>::iterator itr2;
++
++ itr2 = itr->second.find(scale);
++
++ if ( itr2 != itr->second.end() )
++ {
++ return itr2->second;
++ }
++ }
++
++ //printf ("TriangleMeshDataManager::getTriangleMeshData not found\n");
++
++ return NULL;
++
++ }
++
++}
+Index: prefab/src/OgreOdeRagdoll.cpp
===================================================================
---- src/OgreOdeEntityInformer.cpp (revision 2492)
-+++ src/OgreOdeEntityInformer.cpp (working copy)
-@@ -361,8 +361,8 @@
- SphereGeometry* geom = new SphereGeometry(rad, world, space);
- geom->setBody(body);
+--- prefab/src/OgreOdeRagdoll.cpp (revision 2510)
++++ prefab/src/OgreOdeRagdoll.cpp (working copy)
+@@ -10,6 +10,7 @@
-- body->setPosition(_node->getWorldPosition());
-- body->setOrientation(_node->getWorldOrientation());
-+ body->setPosition(_node->_getDerivedPosition());
-+ body->setOrientation(_node->_getDerivedOrientation());
-
- _node->attachObject(body);
-
-@@ -382,8 +382,8 @@
- BoxGeometry* geom = new BoxGeometry(sz, world, space);
- geom->setBody(body);
-
-- body->setPosition(_node->getWorldPosition());
-- body->setOrientation(_node->getWorldOrientation());
-+ body->setPosition(_node->_getDerivedPosition());
-+ body->setOrientation(_node->_getDerivedOrientation());
-
- _node->attachObject(body);
-
-@@ -402,8 +402,8 @@
- {
- BoxGeometry* geom = new BoxGeometry(getSize(), world, space);
-
-- geom->setPosition(_node->getWorldPosition());
-- geom->setOrientation(_node->getWorldOrientation());
-+ geom->setPosition(_node->_getDerivedPosition());
-+ geom->setOrientation(_node->_getDerivedOrientation());
-
- return geom;
- }
-Index: src/OgreOdeWorld.cpp
-===================================================================
---- src/OgreOdeWorld.cpp (revision 2492)
-+++ src/OgreOdeWorld.cpp (working copy)
-@@ -28,6 +28,7 @@
- _show_debug_contact (false),
- _manager (manager)
- {
-+ dInitODE();
- _world = dWorldCreate();
- _contacts = dJointGroupCreate(0);
-
-Index: loader/include/OgreOde_LoaderPreReqs.h
-===================================================================
---- loader/include/OgreOde_LoaderPreReqs.h (revision 2492)
-+++ loader/include/OgreOde_LoaderPreReqs.h (working copy)
-@@ -3,9 +3,9 @@
-
-
- #include "Ogre.h"
--#include "OgreNoMemoryMacros.h"
-+//#include "OgreNoMemoryMacros.h"
- #include "ode/ode.h"
--#include "OgreMemoryMacros.h"
-+//#include "OgreMemoryMacros.h"
- #include "OgreOde_Core.h"
#include "OgreOde_Prefab.h"
+ #include "OgreOdeRagdoll.h"
++#include "OgreAlignedAllocator.h"
-Index: loader/include/OgreOdeDotLoader.h
-===================================================================
---- loader/include/OgreOdeDotLoader.h (revision 2492)
-+++ loader/include/OgreOdeDotLoader.h (working copy)
-@@ -15,8 +15,8 @@
- DotLoader(OgreOde::World * world = 0, OgreOde::Space * space = 0);
- ~DotLoader(){};
-
-- void setWorld(OgreOde::World * world) {_world = world;};
-- void setSpace(OgreOde::Space * space) {_space = space;};
-+ void setWorld(OgreOde::World * world);// {_world = world;};
-+ void setSpace(OgreOde::Space * space);// {_space = space;};
-
- ObjectList *load(const Ogre::String &filename, const Ogre::StringVector &objects_names, const Ogre::StringVector &instance_names);
- void save(const Ogre::String &filename, const Ogre::StringVector &objects_names, ObjectList *objects);
-Index: loader/src/OgreOdeDotLoader.cpp
-===================================================================
---- loader/src/OgreOdeDotLoader.cpp (revision 2492)
-+++ loader/src/OgreOdeDotLoader.cpp (working copy)
-@@ -62,6 +62,12 @@
- {
-
- }
-+
-+void DotLoader::setWorld(OgreOde::World * world)
-+{_world = world;};
-+void DotLoader::setSpace(OgreOde::Space * space)
-+{_space = space;};
-+
- //------------------------------------------------------------------------------------------------
- ObjectList *DotLoader::load(const String &filename, const StringVector &objects_names, const StringVector &instance_names)
- {
+ using namespace Ogre;
+ using namespace OgreOde;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-17 11:44:32
|
Revision: 797
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=797&view=rev
Author: andy_miller
Date: 2008-11-17 11:44:30 +0000 (Mon, 17 Nov 2008)
Log Message:
-----------
Ode build fix
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-17 00:13:14 UTC (rev 796)
+++ trunk/python-ogre/environment.py 2008-11-17 11:44:30 UTC (rev 797)
@@ -954,7 +954,7 @@
]
buildCmds = [
# FIXME: Should this untar not use the unTarGz method mentioned above?
- [0, 'untar' + os.path.join(downloadPath,"ode-0.10.1.tar.gz"), ''],
+ [0, 'tar zxf ' + os.path.join(downloadPath,"ode-0.10.1.tar.gz"), ''],
[0, "chmod +x autogen.sh", baseDir],
[0, "./autogen.sh", baseDir],
[0, "./configure --prefix=%s --includedir=%s/include" %(PREFIX, PREFIX), baseDir],
@@ -1019,6 +1019,7 @@
name='ogreode'
parent = "ogre/physics"
base = 'ogreaddons/ogreode'
+ baseDir = os.path.join(os.getcwd(), base )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_OgreOde
@@ -1040,9 +1041,8 @@
]
else:
source = [
- [svn, "https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogreode", os.getcwd()]
+ [svn, " co https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogreode " + baseDir, os.getcwd()]
]
- baseDir = os.path.join(os.getcwd(), base )
buildCmds = [
[0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir],
[0, "chmod +x autogen.sh", baseDir],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-17 00:13:19
|
Revision: 796
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=796&view=rev
Author: andy_miller
Date: 2008-11-17 00:13:14 +0000 (Mon, 17 Nov 2008)
Log Message:
-----------
linux patch
Modified Paths:
--------------
trunk/python-ogre/patch/ogre_1.6.0.patch
Modified: trunk/python-ogre/patch/ogre_1.6.0.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.6.0.patch 2008-11-16 22:50:41 UTC (rev 795)
+++ trunk/python-ogre/patch/ogre_1.6.0.patch 2008-11-17 00:13:14 UTC (rev 796)
@@ -195,6 +195,15 @@
===================================================================
--- ogre/OgreMain/include/OgreString.h (revision 8145)
+++ ogre/OgreMain/include/OgreString.h (working copy)
+@@ -35,7 +35,7 @@
+ #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
+
+ // For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
+-# if OGRE_COMP_VER >= 430
++# if OGRE_COMP_VER >= 430 && !defined (__PYTHONOGRE_BUILD_CODE)
+ # include <tr1/unordered_map>
+ # else
+ # include <ext/hash_map>
@@ -158,7 +158,7 @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-16 22:50:45
|
Revision: 795
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=795&view=rev
Author: andy_miller
Date: 2008-11-16 22:50:41 +0000 (Sun, 16 Nov 2008)
Log Message:
-----------
Updated patch for Linxu - force GCC to <4.3.0
Modified Paths:
--------------
trunk/python-ogre/patch/ogre_1.6.0.patch
Modified: trunk/python-ogre/patch/ogre_1.6.0.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.6.0.patch 2008-11-16 22:49:25 UTC (rev 794)
+++ trunk/python-ogre/patch/ogre_1.6.0.patch 2008-11-16 22:50:41 UTC (rev 795)
@@ -165,24 +165,42 @@
#undef NOMINMAX
#define NOMINMAX
-Index: ogre/ReferenceApplication/ReferenceAppLayer/OgreRefAppWorld.cpp
+Index: ogre/OgreMain/include/OgreStdHeaders.h
===================================================================
---- ogre/ReferenceApplication/ReferenceAppLayer/OgreRefAppWorld.cpp (revision 8151)
-+++ ogre/ReferenceApplication/ReferenceAppLayer/OgreRefAppWorld.cpp (working copy)
-@@ -54,6 +54,8 @@
- mSimulationStepSize = 0.01f;
-
- // Create the dynamics world
-+ dInitODE2(0);
-+
- mOdeWorld = new dWorld();
- mOdeContactGroup = new dJointGroup();
-
-@@ -79,6 +81,7 @@
- // Destroy dynamix world
- delete mOdeContactGroup;
- delete mOdeWorld;
-+ dCloseODE();
-
- }
- //-------------------------------------------------------------------------
\ No newline at end of file
+--- ogre/OgreMain/include/OgreStdHeaders.h (revision 8145)
++++ ogre/OgreMain/include/OgreStdHeaders.h (working copy)
+@@ -36,7 +36,7 @@
+ // Note - not in the original STL, but exists in SGI STL and STLport
+ // For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
+ #if (OGRE_COMPILER == OGRE_COMPILER_GNUC) && !defined(STLPORT)
+-# if OGRE_COMP_VER >= 430
++# if OGRE_COMP_VER >= 430 && !(defined __PYTHONOGRE_BUILD_CODE)
+ # include <tr1/unordered_map>
+ # include <tr1/unordered_set>
+ # else
+Index: ogre/OgreMain/include/OgrePrerequisites.h
+===================================================================
+--- ogre/OgreMain/include/OgrePrerequisites.h (revision 8145)
++++ ogre/OgreMain/include/OgrePrerequisites.h (working copy)
+@@ -121,7 +121,7 @@
+ #endif
+
+ #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
+- # if OGRE_COMP_VER >= 430
++ # if OGRE_COMP_VER >= 430 && !defined(__PYTHONOGRE_BUILD_CODE)
+ # define HashMap ::std::tr1::unordered_map
+ # define HashSet ::std::tr1::unordered_set
+ # else
+Index: ogre/OgreMain/include/OgreString.h
+===================================================================
+--- ogre/OgreMain/include/OgreString.h (revision 8145)
++++ ogre/OgreMain/include/OgreString.h (working copy)
+@@ -158,7 +158,7 @@
+
+
+ #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
+-# if OGRE_COMP_VER < 430
++# if OGRE_COMP_VER < 430 || defined (__PYTHONOGRE_BUILD_CODE)
+ typedef ::__gnu_cxx::hash< _StringBase > _StringHash;
+ # else
+ typedef ::std::tr1::hash< _StringBase > _StringHash;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-16 22:49:28
|
Revision: 794
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=794&view=rev
Author: andy_miller
Date: 2008-11-16 22:49:25 +0000 (Sun, 16 Nov 2008)
Log Message:
-----------
Linux build updates
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-11-15 01:16:12 UTC (rev 793)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-11-16 22:49:25 UTC (rev 794)
@@ -831,7 +831,13 @@
## handle a problem hashmap
mb.member_function('::Ogre::Mesh::getSubMeshNameMap').exclude()
stdex_ns = mb.global_ns.namespace("__gnu_cxx")
- stdex_ns.class_('hash_map<std::string, unsigned short, __gnu_cxx::hash<std::string>, std::equal_to<std::string>, std::allocator<unsigned short> >').exclude
+ stdex_ns.class_('hash_map<std::string, unsigned short, __gnu_cxx::hash<std::string>, std::equal_to<std::string>, std::allocator<unsigned short> >').exclude
+ for f in mb.member_functions():
+ if f.name == 'getChildIterator':
+ print "LINUX SPECIAL:", f
+ ###f.exclude()
+ #mb.member_function('::Ogre::Node::getChildIterator').exclude()
+ # mb.member_functions('::Ogre::Bone::getChildIterator').exclude()
def Fix_NT ( mb ):
@@ -1075,7 +1081,9 @@
undefine_symbols=[]
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
- defined_symbols.append('BOOST_HAS_WINTHREADS')
+ if environment.isWindows():
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
defined_symbols.append( 'OGRE_VERSION_' + environment.ogre.version )
print os.getcwd()
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-15 01:16:12 UTC (rev 793)
+++ trunk/python-ogre/environment.py 2008-11-16 22:49:25 UTC (rev 794)
@@ -18,10 +18,6 @@
_LOGGING_ON = False
_PreCompiled = True
-##
-## set this to True if you compiled Ogre with Threads enabled
-##
-_USE_THREADS = True
def log ( instring ):
if _LOGGING_ON:
@@ -45,6 +41,14 @@
return True
return False
+##
+## set this to True if you compiled Ogre with Threads enabled
+##
+if isWindows():
+ _USE_THREADS = True
+else:
+ _USE_THREADS = False
+
PythonOgreMajorVersion = "1"
PythonOgreMinorVersion = "6"
@@ -202,7 +206,7 @@
else:
source_version = "20080901"
source = [
- [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 01Sep2008 "+base, os.getcwd()]
+ [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co "+base, os.getcwd()]
]
if isLinux() or isMac():
buildCmds = [
@@ -373,7 +377,7 @@
if isLinux() or isMac():
base = 'FreeImage'
source = [
- [wget, " http://prdownloads.sourceforge.net/freeimage/FreeImage3110.zip",downloadPath],
+ [wget, " http://downloads.sourceforge.net/freeimage/FreeImage3110.zip",downloadPath],
]
if isLinux():
@@ -498,7 +502,7 @@
[0, sed_ + " 's/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/' "+base+"/configure", '' ],
[0, sed_ + " s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ "+base+"/boost/python/detail/preprocessor.hpp", ''],
[0, sed_ + ' s/"# include <boost\/preprocessor\/cat.hpp>"/"\\n#define BOOST_PYTHON_NO_PY_SIGNATURES\\n# include <boost\/preprocessor\/cat.hpp>"/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
- [0,"./configure --with-libraries=python --prefix=%s --without-icu --with-bjam=../root/usr/bin/bjam" % PREFIX, os.path.join(os.getcwd(), base )],
+ [0,"./configure --with-libraries=python,thread,date_time --prefix=%s --without-icu --with-bjam=../root/usr/bin/bjam" % PREFIX, os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )],
]
@@ -563,7 +567,7 @@
pythonModule = True
name='ogre'
ModuleName='OGRE'
- CCFLAGS = ""
+ CCFLAGS = " "
cflags=''
moduleParentLocation = "renderer"
parent = "ogre/renderer"
@@ -639,7 +643,8 @@
base = "ogre-v1-6-0"
buildCmds = [
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
- [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
+ [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
+ [0, "sed --in-place -s 's|#define OGRE_THREAD_SUPPORT 1|#define OGRE_THREAD_SUPPORT 0|' OgreConfig.h",os.path.join(os.getcwd(),"ogre","OgreMain", "include")],
[0, "aclocal", os.path.join(os.getcwd(), 'ogre')],
[0, "./bootstrap", os.path.join(os.getcwd(), 'ogre')],
[0, "./configure --prefix=%s --with-gui=Xt --disable-devil" % PREFIX, os.path.join(os.getcwd(), 'ogre')],
@@ -650,8 +655,8 @@
libs.append ( boost_python_index.lib )
lib_dirs=[Config.LOCAL_LIB]
include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
-
+ CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D__PYTHONOGRE_BUILD_CODE '
+
source = [
[wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
]
@@ -878,8 +883,9 @@
# [0, "patch -s -N -i ../python-ogre/patch/cegui.patch -p0", os.path.join(os.getcwd(),base)],
[0, "echo 'EMPTY' >>./INSTALL", os.path.join(os.getcwd(),base)],
[0, "echo 'EMPTY' >>./NEWS", os.path.join(os.getcwd(),base)],
- [0, "aclocal", os.path.join(os.getcwd(),base)],
- [0, "automake" ,os.path.join(os.getcwd(), base )],
+# [0, "aclocal", os.path.join(os.getcwd(),base)],
+#cl [0, "automake" ,os.path.join(os.getcwd(), base )],
+ [0, "./bootstrap" ,os.path.join(os.getcwd(), base )],
[0,"./configure --prefix=%s --enable-freeimage=yes --with-default-xml-parser=TinyXMLParser --disable-samples --without-ogre-renderer --includedir=%s/include" %(PREFIX,PREFIX) ,os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-15 01:16:17
|
Revision: 793
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=793&view=rev
Author: andy_miller
Date: 2008-11-15 01:16:12 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
Remove the docs dir from the svn
Fix for Py++ etc now being and https svn access
Fix to CEGUI demo (thanks Dermont)
Tweak to config files
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/PythonOgreInstallCreator.iss
trunk/python-ogre/demos/cegui/Demo_CEGUI_Treev061.py
trunk/python-ogre/environment.py
Removed Paths:
-------------
trunk/python-ogre/docs/
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2008-11-14 07:22:21 UTC (rev 792)
+++ trunk/python-ogre/ChangeLog.txt 2008-11-15 01:16:12 UTC (rev 793)
@@ -1,31 +1,38 @@
-xxxx xx 2008 : Release 1.6.0 xxxx
+November 14 2008 : Release 1.6.0
==================================
-Fixed to smart pointer handling in Ogre -- getting clever about detecting them as arguments as well as return types
-Fixed QuickGui with static consts not having default value and causing a boost load error
-Removed constant 'vars' and replaced them with properties that return a copy of the object. Specifically ZERO, UNIT_X,
- UNIT_Y, UNIT_Z, Black, White, Red, Green, Blue in Classes ColourValue, MatrixX, Quaternion and VectorX.
- this is due to the fact they were actually passing a pointer to a non constant (mutable) variable which
+Run "python ReportVersion.py" to get the module version information
+
+** Various Fixes/Changes **
+Fix: PSSM camera functionality - it was missing from the sizeof.h file
+Fix: Smart pointer handling in Ogre -- getting clever about detecting them as arguments as well as return types
+Fix: QuickGui with static consts not having default value and causing a boost load error
+Fix/Update/Change: Removed constant 'vars' and replaced them with properties that return a copy of the object.
+ Specifically ZERO, UNIT_X, UNIT_Y, UNIT_Z, Black, White, Red, Green, Blue in Classes ColourValue, MatrixX,
+ Quaternion and VectorX.
+ This is due to the fact they were actually passing a pointer to a non constant (mutable) variable which
caused very annoying bugs. So now Ogre.Vector3.ZERO has to be replaced with Ogre.Vector3().ZERO etc...
+Fix: Auto transform funtion to not wrap reference arguments that are const (bug)
+Fix: Auto transform funtion to handle extern free functions
+Fix: to Py++ to handle bool/int references correctly (renderQueueListener functions)
+Fix: a couple of incorrect versions in environment.py
+Fix: code generation for QuickGui, bullet and noise to correctly generate PyDoc documentation strings
-Changed all code generation modules to use the common_code Auto_Functional_Transformation function
-Fix auto transform funtion to not wrap reference arguments that are const (bug)
-Fix auto transform funtion to handle extern free functions
-Removed 'asClassType' functions as they didn't actually do anything (and are not needed)
-Added PSSM camera functionality - it was missing from the sizeof.h file
-Added helper functions to OgreODE as constructors needed hand wrapping (makeTriangleMeshGeometry, makeConvexGeometry)
-Fix to Py++ to handle bool/int references correctly (renderQueueListener functions)
-Simplified Ogre patch file requirements due to fix in Py++ for bool refs
-Fixed a couple of incorrect versions in environment.py
-Added opensteer source code and inital wrapper -- not done yet
-Updates to QuickGUI and Caelum C++ library source
-Implemented Hikari demo (implemented callbacks in the wrapper generation)
-Fixed code generation for QuickGui, bullet and noise to correctly generate PyDoc documentation strings
-Implemented description text and description links in environment.py to help automate module summary
-Changes to SampleFramework - additional function (_inputSystemParameters ) to pass parameters to OIS setup - see Hikari demo
-Changes to SampleFramework - Move code from frameStarted to frameRenderingQueue
+Change: All code generation modules to use the common_code Auto_Functional_Transformation function
+Change: Added helper functions to OgreODE as constructors needed hand wrapping (makeTriangleMeshGeometry, makeConvexGeometry)
+Change: Simplified Ogre patch file requirements due to fix in Py++ for bool refs
+Change: Using OpenAL-soft-1.5.304 as this makes it consistant between platforms
+Change: Including source libs and header files in the release so people can link c++ code with Python-Ogre modules
+Update: NxOgre using 0.22
+Update: Removed 'asClassType' functions as they didn't actually do anything (and are not needed)
+Update: All libraries including to QuickGUI and Caelum
+Update: Implemented Hikari demo (implemented callbacks in the wrapper generation)
+Update: Implemented description text and description links in environment.py to help automate module summary
+Update: SampleFramework - additional function (_inputSystemParameters ) to pass parameters to OIS setup - see Hikari demo
+Update: SampleFramework - Move code from frameStarted to frameRenderingQueue
+
August 29 2008 : Release 1.6.0 RC1
==================================
The Python-Ogre version numbering has changed to match the Ogre release versions along with the SVN release numbering
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2008-11-14 07:22:21 UTC (rev 792)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-11-15 01:16:12 UTC (rev 793)
@@ -70,7 +70,7 @@
PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
PATH_NxOgre_09= os.path.join(PATH_THIRDPARTY, 'nxogre_0.9')
# PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
-PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.69')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.70')
###PATH_PhysX= os.path.join(BASE_DIR, 'Physx/v2.7.3/SDKs')
PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
Modified: trunk/python-ogre/PythonOgreInstallCreator.iss
===================================================================
--- trunk/python-ogre/PythonOgreInstallCreator.iss 2008-11-14 07:22:21 UTC (rev 792)
+++ trunk/python-ogre/PythonOgreInstallCreator.iss 2008-11-15 01:16:12 UTC (rev 793)
@@ -3,13 +3,13 @@
;
[Setup]
AppName=Python-Ogre
-AppVerName=Python-Ogre 1.6RC1
+AppVerName=Python-Ogre 1.6.0
DefaultDirName=C:\PythonOgre
DefaultGroupName=Python-Ogre
OutputBaseFilename=PythonOgreInstaller
OutputDir=C:\temp
SourceDir=C:\Development\PythonOgreRelease
-VersionInfoDescription=Release 1.6RC1 of Python-Ogre
+VersionInfoDescription=Release 1.6.0 of Python-Ogre
AllowNoIcons=true
AppPublisher=OpenSource (Andy and Team)
AppPublisherURL=http://www.python-ogre.org
@@ -37,6 +37,8 @@
Source: plugins\*; DestDir: {app}\plugins
Source: tools\*; DestDir: {app}\tools
Source: docs\*; DestDir: {app}\docs
+Source: SourceLibs\*; DestDir: {app}\SourceLibs; Flags: recursesubdirs
+
Source: ThirdParty\dxwebsetup.exe; DestDir: {app}\ThirdParty
Source: ThirdParty\vcredist_x86.exe; DestDir: {app}\ThirdParty
@@ -62,7 +64,11 @@
Source: demos\plib\*; DestDir: {app}\demos\plib; Flags: recursesubdirs
Source: demos\qgui\*; DestDir: {app}\demos\qgui; Flags: recursesubdirs
Source: demos\theora\*; DestDir: {app}\demos\theora; Flags: recursesubdirs
+Source: demos\hikari\*; DestDir: {app}\demos\hikari; Flags: recursesubdirs
+Source: demos\PSSM\*; DestDir: {app}\demos\PSSM; Flags: recursesubdirs
+
+
; the python modules - in the event we find python
Source: packages_2.5\*; DestDir: {code:GetPythonSiteDir}; Flags: recursesubdirs; Check: SelectedPython('2.5')
; the python modules again - if we don't find python we install both versions in the app directory
Modified: trunk/python-ogre/demos/cegui/Demo_CEGUI_Treev061.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_Treev061.py 2008-11-14 07:22:21 UTC (rev 792)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_Treev061.py 2008-11-15 01:16:12 UTC (rev 793)
@@ -252,7 +252,9 @@
def addListToTree(resourceList, parentItem, iconName):
for r in resourceList:
meshCtrlItem = CEGUI.TreeItem(r)
- meshCtrlItem.setIcon(drives.getImage(iconName))
+# meshCtrlItem.setIcon(drives.getImage(iconName))
+ image = iconArray[ iconImages.index(iconName) ]
+ meshCtrlItem.setIcon( image )
meshCtrlItem.setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME)
meshCtrlItem.AutoDeleted = False
meshCtrlItem.setFont("BlueHighway-12")
@@ -262,7 +264,9 @@
## helper to create TreeCtrl item
def createListItem(text, parentItem, iconName):
meshCtrlItem = CEGUI.TreeItem(text)
- meshCtrlItem.setIcon(drives.getImage(iconName))
+# meshCtrlItem.setIcon(drives.getImage(iconName))
+ image = iconArray[ iconImages.index(iconName) ]
+ meshCtrlItem.setIcon( image )
meshCtrlItem.setSelectionBrushImage(IMAGES_FILE_NAME, BRUSH_NAME)
meshCtrlItem.AutoDeleted = False
meshCtrlItem.setFont("BlueHighway-12")
@@ -346,7 +350,7 @@
def handleEventBranchClosed(self, args):
print "Branch Closed"
return True
-
+
def handleQuit(self, e):
self.frameListener.requestShutdown()
return True
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-14 07:22:21 UTC (rev 792)
+++ trunk/python-ogre/environment.py 2008-11-15 01:16:12 UTC (rev 793)
@@ -282,12 +282,12 @@
if _STABLE:
source_version = "1383"
source = [
- [svn, " co -r 1383 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
+ [svn, " co -r 1383 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
]
else:
source_version = "1446"
source = [
- [svn, " co -r 1446 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
+ [svn, " co -r 1446 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
]
if isLinux() or isMac() :
buildCmds = [
@@ -308,12 +308,12 @@
if _STABLE:
source_version = "1383"
source = [
- [svn, " co -r 1383 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
+ [svn, " co -r 1383 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
]
else:
source_version = "1446"
source = [
- [svn, " co -r 1446 http://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
+ [svn, " co -r 1446 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
]
if isLinux() or isMac() :
buildCmds = [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-14 07:22:28
|
Revision: 792
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=792&view=rev
Author: andy_miller
Date: 2008-11-14 07:22:21 +0000 (Fri, 14 Nov 2008)
Log Message:
-----------
Adding tweaked NxOfre 0.22T5 header files
Added Paths:
-----------
trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.h
trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h
trunk/python-ogre/ThirdParty/nxogre/BetajaenVE.h
trunk/python-ogre/ThirdParty/nxogre/NxOgre.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreActors.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreAllocator.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreAnimatedRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreBodyFactory.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterModel.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterMovementModel.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreClothRaycaster.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCompoundActor.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreConfig.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreContactCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreContactStream.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreContainer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreDebugRenderer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreDeletionCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreDominanceGroup.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreDualIdentifier.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreEffectsSystem.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreEngine.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreError.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreExtendedTypes.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreFileResource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreFileResourceManager.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreFluid.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreForceField.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreGroup.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreHeightfield.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreIntersection.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJoint.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointSet1.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointSet2.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreKinematicCharacter.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreKinematicCharacterSweep.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreLog.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMachine.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreManualHeightfield.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreManualMesh.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreManualMeshUtil.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMaterial.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMaterialAlias.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMemoryResource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMemoryResourceManager.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMesh.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMeshParams.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMeshRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreNodeRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreNxActorController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreMeshRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreNodeRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreSceneRenderer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreTimeController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreParams.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreParticleSystem.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePerformer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePhysXDriver.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePlatform.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePose.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePrerequisites.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePrerequisitesOgre.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePrototype.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRaycaster.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRemoteDebuggerConnection.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRenderableActorFactory.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRenderableSource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreResource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceManager.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceSystem.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreScene.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneParams.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneRenderer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneSource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneTriggerController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShape.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeMeshes.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapePrimitives.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeTerrain.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeWheel.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSheet.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSimpleActor.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSimpleShape.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSkeletalRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSkeleton.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSleepCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSpriteRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreStable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTesting.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTimeController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTimeStep.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTimer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTrigger.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTriggerCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTriggerFunction.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreUserAllocator.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreVoidPointer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreVoxelRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreWheelContactCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreWheelSet.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreWhen.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreWorld.h
Added: trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.h (rev 0)
+++ trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.h 2008-11-14 07:22:21 UTC (rev 792)
@@ -0,0 +1,33 @@
+/*
+
+Betajaen's Container Classes
+
+Copyright (c) 2007 Robin Southern, http://www.nxogre.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+#ifndef BETAJAENS_CC_H
+#define BETAJAENS_CC_H
+
+#include "BetajaenSL.h"
+#include "BetajaenVE.h"
+
+#endif
Added: trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h (rev 0)
+++ trunk/python-ogre/ThirdParty/nxogre/BetajaenSL.h 2008-11-14 07:22:21 UTC (rev 792)
@@ -0,0 +1,1047 @@
+/*
+
+Betajaen's SharedList
+
+Copyright (c) 2007 Robin Southern, http://www.nxogre.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+#ifndef BETAJAENS_SL_H
+#define BETAJAENS_SL_H
+
+#include <cstdlib>
+#include "NxOgrePlatform.h"
+#include "NxOgreAllocator.h"
+
+// Configuration
+
+/** \brief Namespace to place the Containers in. Comment out if you want it in the global namespace.
+*/
+#define BETAJAEN_SL_NAMESPACE Betajaen
+
+
+/** \brief Export Class Macro, replace value with your export macro
+*/
+#define BETAJAEN_SL_CLASS __declspec(dllexport)
+#define BETAJAEN_SL_CLASS_FUNCTION
+#define BETAJAEN_SL_TEMPLATE_CLASS
+#define BETAJAEN_SL_TEMPLATE_CLASS_FUNCTION __forceinline
+#define BETAJAEN_SL_CLASS_EXPORT __declspec(dllexport)
+#define BETAJAEN_SL_TEMPLATE_CLASS_EXPORT __forceinline
+// __declspec(dllexport)
+
+/** \brief Delete macro. Used if you have your own leak checker, etc.
+*/
+// #define BETAJAEN_SL_DELETE(ptr) \
+// {::NxOgre::Allocator::getPtr()->watch_delete(static_cast<void*>(ptr));}; \
+// delete ptr;
+//
+// /** \brief Called just before when a class is destroyed using it's destructor.
+// */
+// #define BETAJAEN_SL_DESTRUCTOR(ptr) \
+// ::NxOgre::Allocator::getPtr()->watch_delete(begin);
+
+//////////////////////////////////////////////////////////////////////////
+
+#ifdef BETAJAEN_SL_NAMESPACE
+# define BETAJAEN_SL_NAMESPACE_START namespace BETAJAEN_SL_NAMESPACE {
+# define BETAJAEN_SL_NAMESPACE_END }
+#else
+# define BETAJAEN_SL_NAMESPACE_START /**/
+# define BETAJAEN_SL_NAMESPACE_END /**/
+#endif
+
+BETAJAEN_SL_NAMESPACE_START
+
+#if (_MSC_VER>=1000)
+# define BETAJAEN_SL_INLINE __forceinline
+#else
+# define BETAJAEN_SL_INLINE inline
+#endif
+
+#ifndef BETAJAEN_SL_CLASS
+# define BETAJAEN_SL_CLASS
+#endif
+
+#ifndef BETAJAEN_SL_TEMPLATE_CLASS
+# define BETAJAEN_SL_TEMPLATE_CLASS
+#endif
+
+#ifndef BETAJAEN_SL_TEMPLATE_CLASS_FUNCTION
+# define BETAJAEN_SL_TEMPLATE_CLASS_FUNCTION
+#endif
+
+#ifndef BETAJAEN_SL_DELETE
+# define BETAJAEN_SL_DELETE(ptr) delete ptr;
+#endif
+
+#ifndef BETAJAEN_SL_DESTRUCTOR
+# define BETAJAEN_SL_DESTRUCTOR(ptr)
+#endif
+
+BETAJAEN_SL_NAMESPACE_END
+
+//////////////////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_NAMESPACE_START
+
+class SharedAllocator;
+template <class TypePtr, class AllocatorType = SharedAllocator> class Flat;
+template <class BaseType, class AllocatorType = SharedAllocator> class Array;
+template <class BaseType, class AllocatorType = SharedAllocator> class SharedList;
+
+BETAJAEN_SL_NAMESPACE_END
+
+
+//////////////////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_NAMESPACE_START
+
+class BETAJAEN_SL_CLASS_EXPORT SharedAllocator {
+
+public:
+
+/////////////////////////////////////////////////////////////
+
+void* Allocate(size_t size)
+{
+ return malloc(size);
+}
+
+/////////////////////////////////////////////////////////////
+
+void Deallocate(void* mem)
+{
+ if (mem)
+ free(mem);
+}
+
+/////////////////////////////////////////////////////////////
+
+void* Reallocate(void* mem, size_t size)
+{
+ return realloc(mem, size);
+}
+
+/////////////////////////////////////////////////////////////
+
+void Copy(void* dest, void* src, size_t length)
+{
+ char* d = (char*) dest;
+ const char* s = (const char*) src;
+
+ while(length-- != 0)
+ *d++ = *s++;
+}
+
+}; // End of the SharedAllocator class.
+
+BETAJAEN_SL_NAMESPACE_END
+
+//////////////////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_NAMESPACE_START
+
+template
+ <
+ class Type,
+ class AllocatorType
+ >
+class BETAJAEN_SL_CLASS_EXPORT Flat
+{
+
+public:
+
+typedef Type * Iterator;
+typedef AllocatorType* AllocatorPtr;
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE Flat(AllocatorPtr allocator, bool deleteAllocator)
+ : First(NULL), Last(NULL), End(NULL), Allocator(allocator), AutoDeleteAllocator(deleteAllocator)
+{
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE ~Flat()
+{
+ _deallocate(First);
+ if (AutoDeleteAllocator)
+ delete Allocator;
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE unsigned int _size() const
+{
+ return (unsigned int) (Last - First);
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE unsigned int _capacity() const
+{
+ return (unsigned int) (First == 0 ? 0 : End - First);
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE Type* _allocate(unsigned int size)
+{
+ return (Type*) Allocator->Allocate(size * sizeof(Type));
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE void _deallocate(Type* p)
+{
+ if (p)
+ Allocator->Deallocate(p);
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE Iterator _reallocate(Iterator p, unsigned int size)
+{
+ return (Iterator) Allocator->Reallocate(p, size * sizeof(Type));
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE void _clip(unsigned int size)
+{
+
+ if (size < _size())
+ return;
+
+ Iterator new_first = _allocate(size);
+ _copy(First, Last, new_first);
+ _destroy(First, Last);
+ _deallocate(First);
+ End = new_first + size;
+ Last = new_first + _size();
+ First = new_first;
+
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE void _reserve(unsigned int new_size)
+{
+ if (_capacity() >= new_size)
+ return;
+
+ Iterator new_first = _allocate(new_size);
+ _copy(First, Last, new_first);
+ _destroy(First, Last);
+ _deallocate(First);
+ End = new_first + new_size;
+ Last = new_first + _size();
+ First = new_first;
+
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE Iterator _copy(Iterator begin, Iterator end, Iterator dest)
+{
+ for (;begin != end; ++dest, ++begin)
+ *dest = *begin;
+ return dest;
+}
+
+/////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_INLINE void _destroy(Iterator begin, Iterator end)
+{
+ for (; begin != end; ++begin) {
+ BETAJAEN_SL_DESTRUCTOR(begin)
+ begin->~Type();
+ }
+}
+
+/////////////////////////////////////////////////////////////
+
+public: BETAJAEN_SL_INLINE void _delete_range(Iterator begin, Iterator end)
+{
+ for (; begin != end; ++begin) {
+ BETAJAEN_SL_DELETE(*begin);
+ }
+}
+
+protected: AllocatorPtr Allocator;
+protected: bool AutoDeleteAllocator;
+public: Iterator First, Last, End;
+
+}; // End of Flat<Type, AllocatorType> class.
+
+BETAJAEN_SL_NAMESPACE_END
+
+//////////////////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_NAMESPACE_START
+
+template
+ <
+ class Type, /* Class to Store; A, myClassName, etc. */
+ class AllocatorType /* Allocator to use, or leave blank for SharedAllocator */
+ >
+class BETAJAEN_SL_CLASS_EXPORT Array {
+
+public:
+
+typedef Type* TypePtr;
+typedef const Type* ConstTypePtr;
+typedef Array<Type, AllocatorType> ArrayType;
+typedef Flat<Type, AllocatorType> FlatType;
+typedef FlatType* FlatPtr;
+
+BETAJAEN_SL_INLINE Array(AllocatorType* _allocator = NULL, bool _auto_delete_allocator = true)
+{
+ if (_allocator == NULL)
+ _allocator = new AllocatorType();
+
+ _Flat = new FlatType(_allocator, _auto_delete_allocator);
+
+}
+
+BETAJAEN_SL_INLINE ~Array()
+{
+ delete _Flat;
+}
+
+BETAJAEN_SL_INLINE TypePtr getPtr()
+{
+ return _Flat->First;
+}
+
+BETAJAEN_SL_INLINE ConstTypePtr getConstPtr() const
+{
+ return _Flat->First;
+}
+
+BETAJAEN_SL_INLINE unsigned int Size()
+{
+ return _Flat->_size();
+}
+
+BETAJAEN_SL_INLINE void Append(Type v) {
+
+ if (_Flat->End <= _Flat->Last)
+ _Flat->_reserve( (1 + _Flat->_size()) * 2);
+
+ *_Flat->Last = v;
+ _Flat->Last++;
+
+}
+
+BETAJAEN_SL_INLINE void Append(Type v, size_t length)
+{
+ if (_Flat->End <= _Flat->Last + length)
+ _Flat->_reserve( length + (_Flat->_size() * 2));
+
+ memcpy(*_Flat->Last, v, length);
+ _Flat->Last += length;
+
+}
+
+BETAJAEN_SL_INLINE void Clip() {
+ _Flat->_clip(0);
+}
+
+private: FlatPtr _Flat;
+
+};
+
+BETAJAEN_SL_NAMESPACE_END
+
+//////////////////////////////////////////////////////////////////////////
+
+BETAJAEN_SL_NAMESPACE_START
+
+/** \brief A list of pointers with garbage collections and the ability to
+ share the same list with similar lists. Like STL's Vector.
+
+ \example
+ <code>
+ class A;
+
+ SharedList<A> aList;
+ a.Insert(new A());
+ a.Remove(a.Last);
+ </code>
+
+*/
+template
+ <
+ class Type, /* Class to Store; A, myClassName, etc. */
+ class AllocatorType /* Allocator to use, or leave blank for SharedAllocator */
+ >
+class BETAJAEN_SL_CLASS_EXPORT SharedList {
+
+public:
+
+typedef Type* TypePtr;
+typedef TypePtr* Iterator;
+typedef SharedList<Type, AllocatorType> SharedListType;
+typedef Flat<TypePtr, AllocatorType> FlatType;
+typedef FlatType* FlatPtr;
+
+/////////////////////////////////////////////////////////////
+
+enum AbsolutePosition
+{
+ First,
+ Last
+};
+
+
+/** \brief Iterator interface
+*/
+class BETAJAEN_SL_CLASS_EXPORT SharedListIterator {
+
+/** \brief Normal constructor
+*/
+public: BETAJAEN_SL_INLINE SharedListIterator(FlatPtr flat)
+: _Flat(flat), _Iterator(flat->First)
+{
+}
+
+/** \brief Copy constructor
+*/
+public: BETAJAEN_SL_INLINE SharedListIterator(const SharedListIterator& other)
+: _Flat(other._Flat), _Iterator(other._Flat->First)
+{
+}
+
+/** \brief Destructor
+*/
+public: BETAJAEN_SL_INLINE ~SharedListIterator()
+{
+}
+
+/** \brief First type in the SharedList without modifying the iterator
+*/
+public: BETAJAEN_SL_INLINE TypePtr FirstType() {
+ return _Flat->First;
+}
+
+/** \brief Last type in the SharedList without modifying the iterator
+*/
+public: BETAJAEN_SL_INLINE TypePtr LastType() {
+ return _Flat->Last;
+}
+
+/** \brief Places the Iterator at the beginning of the List
+*/
+public: BETAJAEN_SL_INLINE TypePtr Begin()
+{
+
+ if (_Flat->_size() == 0)
+ return NULL;
+
+ _Iterator = _Flat->First;
+ return *_Iterator;
+
+}
+
+
+/** \brief Advances the Iterator forward by one, and returns the value of the list or NULL
+ \returns The next item in the list, or NULL if it has reached the end of it.
+*/
+public: BETAJAEN_SL_INLINE TypePtr Next()
+{
+
+ if (_Flat->_size() == 0)
+ return NULL;
+ else if (_Iterator == _Flat->Last)
+ return NULL;
+ else
+ return (*_Iterator++);
+
+}
+
+
+/** \brief Places the iterator at the end of the List
+*/
+public: BETAJAEN_SL_INLINE TypePtr End()
+{
+
+ if (_Flat->_size() == 0)
+ return NULL;
+
+ _Iterator = _Flat->Last - 1;
+ return *_Iterator;
+
+}
+
+
+/** \brief Advances the Iterator backwards by one, and returns the value of the list or NULL
+ \returns The previous item in the list, or NULL if it has reached the beginning of it.
+*/
+public: BETAJAEN_SL_INLINE TypePtr Previous()
+{
+
+ if (_Flat->_size() == 0)
+ return NULL;
+ else if (_Iterator == _Flat->First - 1)
+ return NULL;
+ else
+ return (*_Iterator--);
+
+}
+
+/** \brief Returns the numbers of Type associcated to the flat with this iterator
+*/
+public: BETAJAEN_SL_INLINE unsigned int Size()
+{
+ return _Flat->_size();
+}
+
+protected: FlatPtr _Flat;
+protected: Iterator _Iterator;
+
+};
+
+/////////////////////////////////////////////////////////////////
+
+typedef SharedListIterator SharedListIteratorType;
+
+/** \brief Constructor with optional custom allocator
+*/
+BETAJAEN_SL_INLINE SharedList(AllocatorType* _allocator = NULL, bool _auto_delete_allocator = true)
+{
+ if (_allocator == NULL)
+ _allocator = new AllocatorType();
+
+ _Flat = new FlatType(_allocator, _auto_delete_allocator);
+ _Usage = new unsigned int(1);
+
+}
+
+/** \brief Copy Constructor between SharedList's. The Flat will not be copied but referenced.
+ Any action on this list will effect all lists using the same Flat. Clean up will only
+ happen on the destruction of the last surviving list.
+
+ \example
+ <code>
+ typedef SharedList<A> AList;
+ AList a;
+ AList b(a);
+ </code>
+*/
+BETAJAEN_SL_INLINE SharedList(const SharedListType& other)
+{
+
+ _Flat = other._Flat;
+ _Usage = other._Usage;
+ ++(*_Usage);
+
+}
+
+
+/** \brief Copy Operator. Functions the same as Copy Constructor but deletes the set that this
+ may already have.
+
+ \example
+ <code>
+ typedef SharedList<A> AList;
+ AList a;
+ AList b;
+ b = a;
+ </code>
+*/
+BETAJAEN_SL_INLINE SharedListType& operator=(const SharedListType& other)
+{
+
+ if (_Flat)
+ {
+ _Flat->_delete_range(_Flat->First, _Flat->Last);
+ delete _Flat;
+ }
+
+ if (_Usage)
+ delete _Usage;
+
+ _Flat = other._Flat;
+ _Usage = other._Usage;
+ ++(*_Usage);
+
+ return *this;
+
+}
+
+
+/** \brief Destructor. If this is the last of all SharedLists sharing the same set,
+ the set will be destroyed otherwise the Flat will be ignored and this SharedList
+ dies gracefully.
+*/
+BETAJAEN_SL_INLINE ~SharedList()
+{
+
+ if (--(*_Usage) == 0)
+ {
+ if (_Flat)
+ {
+ _Flat->_delete_range(_Flat->First, _Flat->Last);
+ delete _Flat;
+ delete _Usage;
+ }
+ }
+
+}
+
+
+/** \brief Gets the pointer to the nth Type in the list. Alternate interface to operator[].
+*/
+BETAJAEN_SL_INLINE TypePtr Get(size_t pos)
+{
+ if (pos > Size())
+ return NULL;
+
+ return *(_Flat->First + pos);
+}
+
+
+/** \brief Gets the pointer to the nth TypePtr in the list.
+*/
+BETAJAEN_SL_INLINE TypePtr operator[](size_t pos)
+{
+ if (pos > Size())
+ return NULL;
+
+ return *(_Flat->First + pos);
+}
+
+
+/** \brief Where is something in the list.
+*/
+BETAJAEN_SL_INLINE unsigned int WhereIs(TypePtr ptr)
+{
+
+ if (_Flat->_size() == 0)
+ return 0;
+
+ unsigned int i=0;
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin, ++i)
+ {
+ if (ptr == (*begin))
+ return i;
+ }
+
+ return 0;
+}
+
+BETAJAEN_SL_INLINE bool Has(TypePtr ptr)
+{
+
+ if (_Flat->_size() == 0)
+ return false;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
+ {
+ if (ptr == (*begin))
+ return true;
+ }
+
+ return false;
+
+}
+
+/** \brief The size of the SharedList.
+*/
+BETAJAEN_SL_INLINE unsigned Size() const
+{
+ return _Flat->_size();
+}
+
+
+/** \brief Insert something into the list
+*/
+BETAJAEN_SL_INLINE void Insert(const TypePtr& val)
+{
+
+ if (_Flat->End <= _Flat->Last)
+ _Flat->_reserve( (1 + Size()) * 2);
+
+ *_Flat->Last = val;
+ _Flat->Last++;
+
+}
+
+
+/** \brief Resize the capacity of the list to size + n.
+*/
+BETAJAEN_SL_INLINE void Clean(unsigned int n = 4)
+{
+ _Flat->_clip(_Flat->_size() + n);
+}
+
+
+/** \brief Destroy something nth position into the list.
+*/
+BETAJAEN_SL_INLINE void Destroy(unsigned int n)
+{
+ if (n == 0)
+ return Destroy(First);
+
+ if (n == Size())
+ return Destroy(Last);
+
+ delete *(_Flat->First + n);
+
+ _Flat->_destroy(_Flat->First + n, _Flat->First + n + 1);
+ _Flat->_copy(_Flat->First + n + 1, _Flat->Last, _Flat->First + n);
+ _Flat->Last--;
+
+}
+
+// \brief Destroys everything
+//
+BETAJAEN_SL_INLINE void DestroyAll()
+{
+ if (Size() == 0)
+ return;
+
+ _Flat->_delete_range(_Flat->First, _Flat->Last);
+ // Could be iffy.
+ _Flat->Last = _Flat->First;
+
+}
+
+/** \brief Destroys something in the list based on the pointer in the list.
+*/
+BETAJAEN_SL_INLINE void Destroy(TypePtr val) {
+ unsigned int i = WhereIs(val);
+ Destroy(i);
+}
+
+/** \brief Deletes something from the list based on AbsolutePosition
+*/
+BETAJAEN_SL_INLINE void Destroy(AbsolutePosition position)
+{
+
+ switch(position) {
+
+ case First:
+ {
+ delete *_Flat->First;
+ _Flat->_copy(_Flat->First + 1, _Flat->Last + 1, _Flat->First);
+ _Flat->Last--;
+ }
+ break;
+
+ case Last:
+ {
+ _Flat->Last--;
+ delete *_Flat->Last;
+ }
+ break;
+
+ }
+
+}
+
+
+/** \brief Removes something from the list based on numerical position.
+*/
+BETAJAEN_SL_INLINE TypePtr Remove(unsigned int n)
+{
+
+ if (n == 0)
+ return Remove(First);
+
+ if (n == Size())
+ return Remove(Last);
+
+ TypePtr ptr = Get(n);
+ _Flat->_destroy(_Flat->First + n, _Flat->First + n + 1);
+ _Flat->_copy(_Flat->First + n + 1, _Flat->Last, _Flat->First + n);
+ _Flat->Last--;
+
+ return ptr;
+}
+
+
+/** \brief Removes something from the list based on AbsolutePosition
+*/
+BETAJAEN_SL_INLINE TypePtr Remove(AbsolutePosition position)
+{
+
+ if (_Flat->_size() == 0)
+ return NULL;
+
+ switch(position) {
+
+ case First:
+ {
+ TypePtr t = *(_Flat->First);
+ _Flat->_copy(_Flat->First + 1, _Flat->Last + 1, _Flat->First);
+ _Flat->Last--;
+ return t;
+ }
+
+ break;
+
+ case Last:
+ {
+ _Flat->Last--;
+ return *(_Flat->Last);
+ }
+ break;
+ }
+
+ return NULL;
+
+}
+
+// \brief Destroys everything
+//
+BETAJAEN_SL_INLINE void RemoveAll()
+{
+ if (Size() == 0)
+ return;
+
+ _Flat->_deallocate(_Flat->First);
+
+ // Could be iffy.
+ _Flat->Last = _Flat->First = _Flat->End = NULL;
+
+}
+
+
+/** \brief Places the Iterator at the beginning of the List
+*/
+BETAJAEN_SL_INLINE TypePtr Begin()
+{
+
+ if (_Flat->_size() == 0)
+ return NULL;
+
+ _Iterator = _Flat->First;
+ return *_Iterator;
+
+}
+
+
+/** \brief Advances the Iterator forward by one, and returns the value of the list or NULL
+ \returns The next item in the list, or NULL if it has reached the end of it.
+*/
+BETAJAEN_SL_INLINE TypePtr Next()
+{
+
+ if (_Flat->_size() == 0)
+ return NULL;
+ else if (_Iterator == _Flat->Last)
+ return NULL;
+ else
+ return (*_Iterator++);
+
+}
+
+
+/** \brief Places the iterator at the end of the List
+*/
+BETAJAEN_SL_INLINE TypePtr End()
+{
+
+ if (_Flat->_size() == 0)
+ return NULL;
+
+ _Iterator = _Flat->Last - 1;
+ return *_Iterator;
+
+}
+
+
+/** \brief Advances the Iterator backwards by one, and returns the value of the list or NULL
+ \returns The previous item in the list, or NULL if it has reached the beginning of it.
+*/
+BETAJAEN_SL_INLINE TypePtr Previous()
+{
+
+ if (_Flat->_size() == 0)
+ return NULL;
+ else if (_Iterator == _Flat->First - 1)
+ return NULL;
+ else
+ return (*_Iterator--);
+
+}
+
+/** \brief For each item in the list call it's own method.
+*/
+BETAJAEN_SL_INLINE void Each(void (Type::*MethodPtr)()) {
+
+ if (_Flat->_size() == 0)
+ return;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin) {
+ (*begin->*MethodPtr)();
+ }
+
+}
+
+
+/** \brief For each item in the list call it's own method, with one argument.
+*/
+template <typename _A>
+BETAJAEN_SL_INLINE void Each(void (Type::*MethodPtr)(_A), _A _1) {
+
+ if (_Flat->_size() == 0)
+ return;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin) {
+ (*begin->*MethodPtr)(_1);
+ }
+
+}
+
+
+/** \brief For each item in the list call it's own method, with two arguments.
+*/
+template <typename _A, typename _B>
+BETAJAEN_SL_INLINE void Each(void (Type::*MethodPtr)(_A, _B), _A _1, _B _2) {
+
+ if (_Flat->_size() == 0)
+ return;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
+ (*begin->*MethodPtr)(_1, _2);
+
+}
+
+
+/** \brief For each item in the list call it's own method, with three arguments.
+*/
+template <typename _A, typename _B, typename _C>
+BETAJAEN_SL_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C), _A _1, _B _2, _C _3) {
+
+ if (_Flat->_size() == 0)
+ return;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
+ (*begin->*MethodPtr)(_1, _2, _3);
+
+}
+
+
+/** \brief For each item in the list call it's own method, with four arguments.
+*/
+template <typename _A, typename _B, typename _C, typename _D>
+BETAJAEN_SL_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4) {
+
+ if (_Flat->_size() == 0)
+ return;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
+ (*begin->*MethodPtr)(_1, _2, _3, _4);
+
+}
+
+
+/** \brief For each item in the list call it's own method, with five arguments.
+*/
+template <typename _A, typename _B, typename _C, typename _D, typename _E>
+BETAJAEN_SL_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5) {
+
+ if (_Flat->_size() == 0)
+ return;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
+ (*begin->*MethodPtr)(_1, _2, _3, _4, _5);
+
+}
+
+
+/** \brief For each item in the list call it's own method, with six arguments.
+*/
+template <typename _A, typename _B, typename _C, typename _D, typename _E, typename _F>
+BETAJAEN_SL_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5, _F _6) {
+
+ if (_Flat->_size() == 0)
+ return;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
+ (*begin->*MethodPtr)(_1, _2, _3, _4, _5, _6);
+
+}
+
+
+/** \brief For each item in the list call it's own method, with seven arguments.
+*/
+template <typename _A, typename _B, typename _C, typename _D, typename _E, typename _F, typename _G>
+BETAJAEN_SL_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5, _F _6, _G _7) {
+
+ if (_Flat->_size() == 0)
+ return;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
+ (*begin->*MethodPtr)(_1, _2, _3, _4, _5, _6, _7);
+
+}
+
+
+/** \brief For each item in the list call it's own method, with eight arguments.
+*/
+template <typename _A, typename _B, typename _C, typename _D, typename _E, typename _F, typename _G, typename _H>
+BETAJAEN_SL_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5, _F _6, _G _7, _H _8) {
+
+ if (_Flat->_size() == 0)
+ return;
+
+ for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
+ (*begin->*MethodPtr)(_1, _2, _3, _4, _5, _6, _7, _8);
+
+}
+
+/** \brief Returns the pointer to the working set.
+*/
+BETAJAEN_SL_INLINE FlatPtr getFlat() const {
+ return _Flat;
+}
+
+
+/** \brief Returns the number of SharedLists using this set.
+*/
+BETAJAEN_SL_INLINE unsigned int getUsageCount() const {
+ return *_Usage;
+}
+
+
+/** \brief Get an iterator interface for this (and siblings) SharedList
+*/
+BETAJAEN_SL_INLINE SharedListIteratorType getIterator() {
+ return SharedListIteratorType(_Flat);
+}
+
+private: unsigned int* _Usage;
+private: FlatPtr _Flat;
+private: Iterator _Iterator;
+
+}; // End of SharedList<Type, AllocatorType> Class.
+
+BETAJAEN_SL_NAMESPACE_END
+
+/////////////////////////////////////////////////////////////////
+
+#endif
Added: trunk/python-ogre/ThirdParty/nxogre/BetajaenVE.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/BetajaenVE.h (rev 0)
+++ trunk/python-ogre/ThirdParty/nxogre/BetajaenVE.h 2008-11-14 07:22:21 UTC (rev 792)
@@ -0,0 +1,326 @@
+/*
+
+Betajaen's Vector classes
+
+Copyright (c) 2007 Robin Southern, http://www.nxogre.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+#ifndef BETAJAENS_VE_H
+#define BETAJAENS_VE_H
+
+// Configuration
+
+/** \brief Namespace to place the Containers in. Comment out if you want it in the global namespace.
+*/
+#define BETAJAEN_VE_NAMESPACE Betajaen
+
+
+/** \brief Enable debug comments. Set to zero to disable, 1 to enable
+*/
+#define BETAJAEN_VE_DEBUG_COMMENTS 1
+
+
+/** \brief Export Class Macro, replace value with your export macro
+*/
+#define BETAJAEN_VE_CLASS __declspec(dllexport)
+#define BETAJAEN_VE_CLASS_FUNCTION
+#define BETAJAEN_VE_TEMPLATE_CLASS __declspec(dllexport)
+#define BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION __forceinline
+
+//////////////////////////////////////////////////////////////////////////
+
+#if (BETAJAEN_VE_DEBUG_COMMENTS == 1)
+# include <stdio.h>
+#endif
+
+#ifdef BETAJAEN_VE_NAMESPACE
+# define BETAJAEN_VE_NAMESPACE_START namespace BETAJAEN_VE_NAMESPACE {
+# define BETAJAEN_VE_NAMESPACE_END }
+#else
+# define BETAJAEN_VE_NAMESPACE_START /**/
+# define BETAJAEN_VE_NAMESPACE_END /**/
+#endif
+
+BETAJAEN_VE_NAMESPACE_START
+
+#if (_MSC_VER>=1000)
+# define BETAJAEN_VE_INLINE __forceinline
+#else
+# define BETAJAEN_VE_INLINE inline
+#endif
+
+#ifndef BETAJAEN_VE_CLASS
+# define BETAJAEN_VE_CLASS
+#endif
+
+#ifndef BETAJAEN_VE_TEMPLATE_CLASS
+# define BETAJAEN_VE_TEMPLATE_CLASS
+#endif
+
+#ifndef BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION
+# define BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION
+#endif
+
+#ifndef BETAJAEN_VE_DELETE
+# define BETAJAEN_VE_DELETE(ptr) delete ptr;
+#endif
+
+#ifndef BETAJAEN_VE_DESTRUCTOR
+# define BETAJAEN_VE_DESTRUCTOR(ptr)
+#endif
+
+BETAJAEN_VE_NAMESPACE_END
+
+//////////////////////////////////////////////////////////////////////////
+
+BETAJAEN_VE_NAMESPACE_START
+
+template <typename> class Vector2;
+template <typename> class Vector3;
+template <typename> class Vector4;
+
+BETAJAEN_VE_NAMESPACE_END
+
+//////////////////////////////////////////////////////////////////////////
+
+BETAJAEN_VE_NAMESPACE_START
+
+/** \brief Vector with two rows.
+*/
+template <
+ typename Type
+ >
+class BETAJAEN_VE_TEMPLATE_CLASS Vector2
+{
+
+public: typedef Vector2<Type> ThisType;
+
+/* \brief First */
+public: Type i;
+
+/* \brief Second */
+public: Type j;
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION Vector2()
+{
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION Vector2(Type _i, Type _j)
+: i(_i), j(_j)
+{
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION void swap(ThisType& other)
+{
+ Type First = i, Second = j;
+ i = other.i; other.i = First;
+ j = other.j; other.j = Second;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator = (const ThisType& other)
+{
+ i = other.i; j = other.j;
+ return *this;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator = (const Type& other)
+{
+ i = other; j = other;
+ return *this;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator *= (const Type& other)
+{
+ i *= other; j *= other;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator *= (const ThisType& other)
+{
+ i *= other.i; j *= other.j;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION bool operator == (const ThisType& other) const
+{
+ return (i == other.i && j == other.j);
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION bool operator != (const ThisType& other) const
+{
+ return (i != other.i || j != other.j);
+}
+
+};
+
+BETAJAEN_VE_NAMESPACE_END
+
+//////////////////////////////////////////////////////////////////////////
+
+BETAJAEN_VE_NAMESPACE_START
+
+/** \brief Vector with three rows.
+*/
+template <
+ typename Type
+ >
+class BETAJAEN_VE_TEMPLATE_CLASS Vector3
+{
+
+public: typedef Vector3<Type> ThisType;
+
+/* \brief First */
+public: Type i;
+
+/* \brief Second */
+public: Type j;
+
+/* \brief Third */
+public: Type k;
+
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION Vector3()
+{
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION Vector3(Type _i, Type _j, Type _k)
+: i(_i), j(_j), k(_k)
+{
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION void swap(ThisType& other)
+{
+ Type First = i, Second = j, Third = k;
+ i = other.i; other.i = First;
+ j = other.j; other.j = Second;
+ k = other.k; other.k = Third;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator = (const ThisType& other)
+{
+ i = other.i; j = other.j; k = other.k;
+ return *this;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator = (const Type& other)
+{
+ i = other; j = other; k = other;
+ return *this;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator *= (const Type& other)
+{
+ i *= other; j *= other; k *= other;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator *= (const ThisType& other)
+{
+ i *= other.i; j *= other.j; k *= other.k;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION bool operator == (const ThisType& other) const
+{
+ return (i == other.i && j == other.j && k == other.k);
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION bool operator != (const ThisType& other) const
+{
+ return (i != other.i || j != other.j || k != other.k);
+}
+
+}; // End of Vector3<Type> class.
+
+BETAJAEN_VE_NAMESPACE_END
+
+//////////////////////////////////////////////////////////////////////////
+
+BETAJAEN_VE_NAMESPACE_START
+
+/** \brief Vector with four rows.
+*/
+template <
+ typename Type
+ >
+class BETAJAEN_VE_TEMPLATE_CLASS Vector4 {
+
+public: typedef Vector4<Type> ThisType;
+
+/* \brief First */
+public: Type i;
+
+/* \brief Second */
+public: Type j;
+
+/* \brief Third */
+public: Type k;
+
+/* \brief Fourth */
+public: Type l;
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION Vector4()
+{
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION Vector4(Type _i, Type _j, Type _k, Type _l)
+: i(_i), j(_j), k(_k), l(_l)
+{
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION void swap(ThisType& other)
+{
+ Type First = i, Second = j, Third = k, Fourth = l;
+ i = other.i; other.i = First;
+ j = other.j; other.j = Second;
+ k = other.k; other.k = Third;
+ l = other.l; other.l = Fourth;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator = (const ThisType& other) {
+ i = other.i; j = other.j; k = other.k; l = other.l;
+ return *this;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator *= (const Type& other)
+{
+ i *= other; j *= other; k *= other; l *= other;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION ThisType& operator *= (const ThisType& other)
+{
+ i *= other.i; j *= other.j; k *= other.k; l *= other.l;
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION bool operator == (const ThisType& other) const
+{
+ return (i == other.i && j == other.j && k == other.k && l == other.l);
+}
+
+public: BETAJAEN_VE_TEMPLATE_CLASS_FUNCTION bool operator != (const ThisType& other) const
+{
+ return (i != other.i || j != other.j || k != other.k || l != other.l);
+}
+
+};
+
+BETAJAEN_VE_NAMESPACE_END
+
+//////////////////////////////////////////////////////////////////////////
+
+#endif
\ No newline at end of file
Added: trunk/python-ogre/ThirdParty/nxogre/NxOgre.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgre.h (rev 0)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgre.h 2008-11-14 07:22:21 UTC (rev 792)
@@ -0,0 +1,195 @@
+/** \file NxOgre.h
+ * \brief NxOgre in all it's splendid glory.
+ * \version 1.0-21
+ *
+ * \licence NxOgre a wrapper for the PhysX physics library.
+ * Copyright (C) 2005-8 Robin Southern of NxOgre.org http://www.nxogre.org
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef BLEEDING
+#define BLEEDING
+
+#include "NxOgreActor.h"
+#include "NxOgreActors.h"
+#include "NxOgreAllocator.h"
+#include "NxOgreAnimatedRenderable.h"
+#include "NxOgreBody.h"
+#include "NxOgreCharacter.h"
+#include "NxOgreCharacterController.h"
+#include "NxOgreCharacterModel.h"
+#include "NxOgreCharacterMovementModel.h"
+#include "NxOgreCloth.h"
+#include "NxOgreClothRaycaster.h"
+#include "NxOgreCompoundActor.h"
+#include "NxOgreConfig.h"
+#include "NxOgreContactCallback.h"
+#include "NxOgreContactStream.h"
+#include "NxOgreContainer.h"
+#include "NxOgreDebugRenderer.h"
+#include "NxOgreDeletionCallback.h"
+#include "NxOgreDominanceGroup.h"
+#include "NxOgreDualIdentifier.h"
+#include "NxOgreEffectsSystem.h"
+#include "NxOgreEngine.h"
+#include "NxOgreError.h"
+#include "NxOgreExtendedTypes.h"
+#include "NxOgreFileResource.h"
+#include "NxOgreFileResourceManager.h"
+#include "NxOgreFluid.h"
+#include "NxOgreForceField.h"
+#include "NxOgreGroup.h"
+#include "NxOgreHeightfield.h"
+#include "NxOgreHelpers.h"
+#include "NxOgreIntersection.h"
+#include "NxOgreJoint.h"
+#include "NxOgreJointCallback.h"
+#include "NxOgreJointSet1.h"
+#include "NxOgreJointSet2.h"
+#include "NxOgreKinematicCharacter.h"
+#include "NxOgreKinematicCharacterSweep.h"
+#include "NxOgreLog.h"
+#include "NxOgreMachine.h"
+#include "NxOgreManualHeightfield.h"
+#include "NxOgreManualMesh.h"
+#include "NxOgreManualMeshUtil.h"
+#include "NxOgreMaterial.h"
+#include "NxOgreMaterialAlias.h"
+#include "NxOgreMemoryResource.h"
+#include "NxOgreMemoryResourceManager.h"
+#include "NxOgreMesh.h"
+#include "NxOgreMeshParams.h"
+#include "NxOgreMeshRenderable.h"
+#include "NxOgreNodeRenderable.h"
+#include "NxOgreNxActorController.h"
+#include "NxOgreOgreMeshRenderable.h"
+#include "NxOgreOgreNodeRenderable.h"
+#include "NxOgreOgreSceneRenderer.h"
+#include "NxOgreOgreTimeController.h"
+#include "NxOgreParams.h"
+#include "NxOgreParticleSystem.h"
+#include "NxOgrePerformer.h"
+#include "NxOgrePhysXDriver.h"
+#include "NxOgrePlatform.h"
+#include "NxOgrePose.h"
+#include "NxOgrePrerequisites.h"
+#include "NxOgrePrerequisitesOgre.h"
+#include "NxOgreRaycaster.h"
+#include "NxOgreRemoteDebuggerConnection.h"
+#include "NxOgreRenderable.h"
+#include "NxOgreRenderableSource.h"
+#include "NxOgreResource.h"
+#include "NxOgreResourceCallback.h"
+#include "NxOgreResourceManager.h"
+#include "NxOgreResourceSystem.h"
+#include "NxOgreScene.h"
+#include "NxOgreSceneController.h"
+#include "NxOgreSceneRenderer.h"
+#include "NxOgreSceneSource.h"
+#include "NxOgreSceneTriggerController.h"
+#include "NxOgreShape.h"
+#include "NxOgreShapeMeshes.h"
+#include "NxOgreShapePrimitives.h"
+#include "NxOgreShapeTerrain.h"
+#include "NxOgreShapeWheel.h"
+#include "NxOgreSheet.h"
+#include "NxOgreSimpleActor.h"
+#include "NxOgreSimpleShape.h"
+#include "NxOgreSkeletalRenderable.h"
+#include "NxOgreSkeleton.h"
+#include "NxOgreSleepCallback.h"
+#include "NxOgreSoftBody.h"
+#include "NxOgreSpriteRenderable.h"
+#include "NxOgreStable.h"
+#include "NxOgreTesting.h"
+#include "NxOgreTimeController.h"
+#include "NxOgreTimer.h"
+#include "NxOgreTrigger.h"
+#include "NxOgreTriggerCallback.h"
+#include "NxOgreTriggerFunction.h"
+#include "NxOgreUserAllocator.h"
+#include "NxOgreVoidPointer.h"
+#include "NxOgreVoxelRenderable.h"
+#include "NxOgreWheelSet.h"
+#include "NxOgreWhen.h"
+#include "NxOgreWorld.h"
+
+#include "BetajaenCC.h"
+
+/** \mainpage NxOgre
+ \section licence Licence
+
+ <pre>
+ NxOgre a wrapper for the PhysX (formerly Novodex) physics library and the Ogre 3D rendering engine.
+ Copyright (C) 2005 - 2007 Robin Southern and NxOgre.org http://www.nxogre.org
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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 for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ </pre>
+
+ @section whatisit What is it?
+ NxOgre is a physics connector library between the physics library PhysX and the Ogre 3D rendering system.
+ With a help of some short, fast and neat code you can have a quick physics system within your Ogre game
+ or engine within a matter of minutes.
+
+ @section installing Installing
+ @subsection Ogre
+
+ The SDK or Source versions will both work with NxOgre. You should have some knowledege with working Ogre.
+ If you can make a simple application that can show an Ogre head with a movement camera, you can work with
+ NxOgre.
+ \n\n
+ You will need to create an environmental variable called "OGRE_HOME" pointing to the ogremain directory
+ in your Ogre folder. Normally for SDK users this is automatically created by the installer, but it's work
+ checking, if you installed Ogre from the source you'll need to create one.
+
+ [1] http://www.ogre3d.org/wiki/index.php/Installing_An_SDK \n
+ [2] http://www.ogre3d.org/wiki/index.php/Building_From_Source \n
+
+ @subsection PhysX
+ The PhysX SDK can be downloaded from the Ageia Support Center, a user account is required to download the
+ SDK. Once your account has been registered (Accounts are processed by hand, so a wait of 1-2 business days
+ is common), download the PhysX SDK and the SystemSoftware.
+ \n\n
+ Install the SystemSoftware first, then the PhysX SDK. I recommend you install the PhysX SDK in the same
+ parent directory as Ogre. Once the installation is completed, create a Environmental variable called
+ "<code>PHYSX_DIR</code>" pointing to the PhysX SDK directory.
+ \n\n
+ [3] http://devsupport.ageia.com/ \n
+
+ @subsection NxOgre
+ - Create a "NxOgre" folder, it should be in the parent of your Ogre or nearby
+ - Using Tortoise SVN or another Subversion client checkout the HEAD repositry
+ - Go to the parent directory of Ogre and the PhysX SDK i.e. (c:/dev/)
+ - New Folder, name as NxOgre, and go inside
+ - File, SVN, SVN Checkout
+ - Set the URL to http://svn.nxogre.org/branches/1,0/
+ - Click okay
+ - Open up the project and compile.
+
+*/
+
+#endif
Added: trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.h (rev 0)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.h 2008-11-14 07:22:21 UTC (rev 792)
@@ -0,0 +1,1404 @@
+/** \file NxOgreActor.h
+* \brief Header for the ActorParams and Actor classes.
+* \version 1.0-21
+*
+* \licence NxOgre a wrapper for the PhysX physics library.
+* Copyright (C) 2005-8 Robin Southern of NxOgre.org http://www.nxogre.org
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This library 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 for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef __NXOGRE_ACTOR_H__
+#define __NXOGRE_ACTOR_H__
+
+#include "NxOgrePrerequisites.h"
+#include "NxOgreContainer.h" // For: mCollisionList
+#include "NxOgreParams.h"
+#include "NxOgrePose.h"
+#include "BetajaenCC.h"
+#include "NxOgreShape.h" // For: SharedList<Shape>
+
+namespace NxOgre {
+
+/** \brief ActorParams are a way to give arguments to an Actor's constructor in any order and with arguments
+ omitted. Params can be given in a string format or passed along as a class reference.
+ \example
+ Simple ActorParams are created normally, each member variable is automatically given a default value
+ and at any time can be passed onto an Actor's constructor.
+ <code>
+ ActorParams params;
+ params.mMass = 10;
+ mScene->createActor(..., params);
+ </code>
+ To make your code more readable and understandble, in most cases where the params are considered "light"
+ you can use a string variation instead.
+ <code>
+ mScene->createActor(...., "mass: 10");
+ </code>
+ To know the string param name from the member variable name; it follows a simple rule.
+ "Camel case is broken up by dashes, then lowercase and drop the "m" prefix".
+ - mMass = mass
+ - mAngularVelocity = angular-velocity
+ - mInternalThreadCount = internal-thread-count
+*/
+class NxPublicClass ActorParams : public Params {
+
+public:
+
+ /** \brief Default Actorparams constructor, which makes every "param" it's default value.
+ */
+ ActorParams();
+
+ /** \brief Alternative constructor for strings. Before the string is parsed, each param is given
+ it's default value, so every param doesn't have to be included.
+ */
+ ActorParams(const char* p);
+
+ /** \brief Alternative constructor for strings. Before the string is parsed, each param is given
+ it's default value, so every param doesn't have to be included.
+ */
+ ActorParams(NxString p);
+
+ /** \brief Set's the Params to default based on NxActorDesc, NxBodyDesc defaults and NxOgre policy.
+ \note Not necessary to use after a constructor, as the constructor already calls this.
+ */
+ void setToDefault();
+
+ /** \brief Tell's you if the Params have valid values.
+ */
+ bool isValid() const;
+
+ /** \brief ActorFlags is a simple class wrapper for the NxActorFlags enum.
+ */
+ struct NxPublicClass ActorFlags : Flags {
+
+ friend class ActorParams;
+
+ public:
+
+ /** \brief Normal constructor.
+ */
+ ActorFlags();
+
+ /** \brief Alternate way of adding a flag using the NxBodyFlag enum.
+ \example
+ params.mFlags += NX_BF_KINEMATIC;
+ */
+ void operator+=(NxActorFlag);
+
+ /** \brief Alternate way of removing a flag using the NxBodyFlag enum.
+ \example
+ params.mFlags -= NX_BF_KINEMATIC;
+ */
+ void operator-=(NxActorFlag);
+
+ /** \brief Disable collision detection
+ \default false
+ \see NX_AF_DISABLE_COLLISION
+ \example
+ String variations => +disable-collision, +ghost
+ */
+ bool mDisableCollision;
+
+ /** \brief Disable collision response
+ \default false
+ \see NX_AF_DISABLE_RESPONSE
+ \example
+ String variations => +disable-response, +silent
+ */
+ bool mDisableResponse;
+
+ /** \brief Disables COM update when computing inertial properties at creation time.
+ \default false
+ \see NX_AF_LOCK_COM
+ \example
+ String variations => +lock-com
+ */
+ bool mLockCOM;
+
+ /** \brief Disable collision with fluids.
+ \default false
+ \see NX_AF_FLUID_DISABLE_COLLISION
+ \example
+ String variations => +disable-fluid-collision, +no-fluids
+ */
+ bool mDisableFluidCollision;
+
+ /** \brief Turn on contact modification callback for the actor.
+ \default false
+ \see NX_AF_CONTACT_MODIFICATION, ContactModifier
+ \example
+ String variations => +contact-modification, +con-mod
+ */
+ bool mContactModification;
+
+ /** \brief Force cone friction to be used for this actor.
+ \default false
+ \see NX_AF_FORCE_CONE_FRICTION
+ \example
+ String variations => +force-cone-friction, +fcf
+ */
+ bool mForceConeFriction;
+
+ /** \brief Enable custom contact filtering
+ \default false
+ \see NX_AF_USER_ACTOR_PAIR_FILTERING
+ \example
+ String variations => +actor-pair-filtering, +apf
+ */
+ bool mActorPairFiltering;
+
+ /** \brief Set the flags to their default state, according to the NxBodyDesc::setToDefault method.
+ */
+ void setToDefault();
+
+ /** \internal
+ */
+ void fromNxU32(NxU32);
+
+ /** \internal
+ */
+ NxU32 toNxU32() const;
+
+ protected:
+
+ /** \internal
+ */
+ void parse(const NxString&);
+
+ };
+
+
+ struct NxPublicClass BodyFlags : Flags {
+
+ friend class ActorParams;
+
+ public:
+
+ BodyFlags();
+
+ /** \brief Alternate way of adding a flag using the NxBodyFlag enum.
+ \example
+ params.mFlags += NX_BF_KINEMATIC;
+ */
+ void operator+=(NxBodyFlag);
+
+ /** \brief Alternate way of removing a flag using the NxBodyFlag enum.
+ \example
+ params.mFlags -= NX_BF_KINEMATIC;
+ */
+ void operator-=(NxBodyFlag);
+
+ /** \brief Set if gravity should not be applied on this body
+ \default false
+ \see NX_BF_DISABLE_GRAVITY
+ \example
+ String variations => +disable-gravity, +0g
+ */
+ bool mDisableGravity;
+
+ /** \brief Enables kinematic mode for the actor.
+ \default false
+ \see NX_BF_KINEMATIC
+ \example
+ String variations => +kinematic, +km
+ */
+ bool mIsKinematic;
+
+ /** \brief Enable debug renderer for this body.
+ \default
+ \see NX_BF_VISUALIZATION
+ \example
+ String variations => +debug-visualisation, +dv
+ */
+ bool mHasDebugVisualisation;
+
+ /** \brief Filter velocities used keep body awake. The filter reduces rapid oscillations and transient spikes.
+ \default false
+ \see NX_BF_FILTER_SLEEP_VEL
+ \example
+ String variations => +filter-sleep-velocity, +fsv
+ */
+ bool mFilterSleepVelocity;
+
+ /** \brief Enables energy-based sleeping algorithm.
+ \default true
+ \see NX_BF_ENERGY_SLEEP_TEST
+ \example
+ String variations => +energy-sleep-test, +est
+ */
+ bool mEnergySleepTest;
+
+ /** \brief Set the flags to their default state, according to the NxBodyDesc::setToDefault method.
+ mDisableGravity = false;
+ mIsKinematic = false;
+ mDebugVisualisation = true;
+ mFilterSleepVelocity = false;
+ mEnergySleepTest = true;
+ */
+ void setToDefault();
+
+ /** \internal
+ */
+ void fromNxU32(NxU32);
+
+ /** \internal
+ */
+ NxU32 toNxU32() const;
+
+ protected:
+
+ /** \internal
+ */
+ void parse(const NxString&);
+
+ };
+
+ /** \brief A wrapped class to represent the NX_BF_FROZEN_* flags
+ */
+ struct NxPublicClass FreezeFlags : Flags {
+
+ friend class ActorParams;
+
+ public:
+
+ /**
+ */
+ FreezeFlags();
+
+ /** \brief Shortcut function to freeze the position of the actor in every axis.
+ */
+ void FreezePosition();
+
+ /** \brief Shortcut function to freeze the rotation of the actor in every axis.
+ */
+ void FreezeRotation();
+
+ /** \brief Shortcut function to freeze the position and rotation of the actor in every axis.
+ */
+ void FreezeAll();
+
+ /** \brief Full or partial frozen of the Actor,
+ \default false, false, false
+ \see NX_BF_FROZEN_POS_X, NX_BF_FROZEN_POS_Z, NX_BF_FROZEN_POS_Z
+ \example
+ String variations => +px +py +pz or +position-all or +all
+ */
+ struct
+ {
+ /** \brief X axis to freeze,
+ \default false
+ \see NX_BF_FROZEN_POS_X
+ \example
+ String variations => +px
+ */
+ bool x;
+
+ /** \brief Y axis to freeze,
+ \default false
+ \see NX_BF_FROZEN_POS_Y
+ \example
+ String variations => +py
+ */
+ bool y;
+
+ /** \brief Z axis to freeze,
+ \default false
+ \see NX_BF_FROZEN_POS_Z
+ \example
+ String variations => +pz
+ */
+ bool z;
+ } mPosition;
+
+
+ /** \brief Freeze some or all of the rotation that may happen in the future of the Actor.
+ \default false of x,y,z
+ \see NX_BF_FROZEN_ROT_X, NX_BF_FROZEN_ROT_Y, NX_BF_FROZEN_ROT_Z
+ \example
+ String variations => +rx +ry +rz or +rotation-all
+ */
+ struct
+ {
+ /** \brief X axis to freeze,
+ \default false
+ \see NX_BF_FROZEN_ROT_X
+ \example
+ String variations => +rotation-x, +rx
+ */
+ bool x;
+
+ /** \brief Y axis to freeze,
+ \default false
+ \see NX_BF_FROZEN_POS_Y
+ \example
+ String variations => +rotation-y, +ry
+ */
+ bool y;
+
+ /** \brief Z axis to freeze,
+ \default false
+ \see NX_BF_FROZEN_POS_Z
+ \example
+ String variations => +rotation-z, +pz
+ */
+ bool z;
+ } mRotation;
+
+
+ /** \brief Set's the flags to not frozen.
+ */
+ void setToDefault();
+
+ /** \internal
+ */
+ void fromNxU32(NxU32);
+
+ /** \internal
+ */
+ NxU32 toNxU32() const;
+
+ protected:
+
+ void parse(const NxString&);
+
+ };
+
+ /** \brief ContactFlags is a simple class wrapper for the Nx???? enum.
+ */
+ struct NxPublicClass ContactFlags : Flags {
+
+ friend class ActorParams;
+
+ public:
+
+ /** \brief Normal constructor.
+ */
+ ContactFlags();
+
+ /** \brief Alternate way of adding a flag using the NxBodyFlag enum.
+ \example
+ params.mFlags += NX_BF_KINEMATIC;
+ */
+ void operator+=(NxContactPairFlag);
+
+ /** \brief Alternate way of removing a flag using the NxBodyFlag enum.
+ \example
+ params.mFlags -= NX_BF_KINEMATIC;
+ */
+ void operator-=(NxContactPairFlag);
+
+ /** \brief Notify contacts on everything
+ \default false
+ \see NX_NOTIFY_ALL
+ \example
+ String variations => +all
+ */
+ void All();
+
+ /** \brief Disable contact generation for this pair
+ \default false
+ \see...
[truncated message content] |
|
From: <and...@us...> - 2008-11-14 07:14:41
|
Revision: 791
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=791&view=rev
Author: andy_miller
Date: 2008-11-14 07:14:30 +0000 (Fri, 14 Nov 2008)
Log Message:
-----------
Cleaning up loder NxOgre files
Modified Paths:
--------------
trunk/python-ogre/environment.py
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.cpp
trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.h
trunk/python-ogre/ThirdParty/nxogre/NxOgre.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreActors.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreAllocator.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreAllocator.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreAnimatedRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterModel.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterModel.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterMovementModel.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterMovementModel.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreClothRaycaster.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreClothRaycaster.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCompoundActor.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCompoundActor.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreConfig.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreContactCallback.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreContactCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreContactCallbackController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreContactCallbackController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreContactStream.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreContactStream.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreContainer.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreContainer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreDebugRenderer.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreDebugRenderer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreDeletionCallback.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreDeletionCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreDominanceGroup.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreDominanceGroup.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreDualIdentifier.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreDualIdentifier.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreEffectsSystem.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreEffectsSystem.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreEngine.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreEngine.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreError.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreError.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreExtendedTypes.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreExtendedTypes.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreFileResource.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreFileResource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreFileResourceManager.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreFileResourceManager.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreFluid.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreFluid.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreForceField.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreForceField.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreGroup.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreGroup.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreHash.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreHeightfield.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreHeightfield.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreIntersection.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreIntersection.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJoint.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreJoint.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointCallback.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointSet1.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointSet1.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointSet2.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointSet2.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreKinematicCharacter.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreKinematicCharacter.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreKinematicCharacterSweep.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreLog.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreLog.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMachine.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMachine.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreManualHeightfield.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreManualHeightfield.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreManualMesh.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreManualMesh.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreManualMeshUtil.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreManualMeshUtil.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMaterial.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMaterial.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMaterialAlias.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMaterialAlias.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMemoryResource.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMemoryResource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMemoryResourceManager.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMemoryResourceManager.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMesh.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMesh.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMeshParams.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMeshParams.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreMeshRenderable.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMeshRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreNodeRenderable.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreNodeRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreNxActorController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreNxActorController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreMeshRenderable.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreMeshRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreNodeRenderable.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreNodeRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreSceneRenderer.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreSceneRenderer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreTimeController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreOgreTimeController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreParams.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreParams.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreParticleSystem.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePerformer.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgrePerformer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePhysXDriver.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgrePhysXDriver.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePlatform.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePose.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgrePose.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePrerequisites.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePrerequisitesOgre.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRaycaster.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreRaycaster.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRemoteDebuggerConnection.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreRemoteDebuggerConnection.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRenderable.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRenderableSource.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreRenderableSource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreResource.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreResource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceCallback.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceManager.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceManager.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceSystem.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreResourceSystem.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreScene.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreScene.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneContactController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneContactController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneRenderer.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneRenderer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneSource.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneSource.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneTriggerController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneTriggerController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShape.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShape.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeMeshes.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeMeshes.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapePrimitives.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapePrimitives.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeTerrain.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeTerrain.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeWheel.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeWheel.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSheet.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSheet.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSimpleActor.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSimpleActor.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSimpleShape.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSimpleShape.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSkeletalRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSkeleton.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSkeleton.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSleepCallback.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSleepCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSpriteRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreStable.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreStable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTesting.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreTesting.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreThrow.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreTimeController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreTimeController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTimeStep.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTimer.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreTimer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTrigger.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreTrigger.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTriggerCallback.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreTriggerCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTriggerFunction.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreUserAllocator.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreUserAllocator.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreVoidPointer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreVoxelRenderable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreWheelContactCallback.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreWheelSet.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreWheelSet.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreWhen.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreWorld.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreWorld.h
trunk/python-ogre/ThirdParty/nxogre_0.9/
Deleted: trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.cpp 2008-11-14 07:08:16 UTC (rev 790)
+++ trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.cpp 2008-11-14 07:14:30 UTC (rev 791)
@@ -1,653 +0,0 @@
-/*
-
-Betajaen's Container Classes
-
-Copyright (c) 2007 Robin Southern, http://www.nxogre.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-#include "NxOgreStable.h"
-#include "BetajaenCC.h"
-
-#if 0
-
-BETAJAEN_CC_NAMESPACE_START
-
-/*
- Flat
-
- \note Iterator is known as Type* in this file only.
-*/
-
-template< class Type, class AllocatorType >
-Flat<Type, AllocatorType>::Flat(AllocatorPtr allocator, bool deleteAllocator)
- : First(NULL), Last(NULL), End(NULL), Allocator(allocator), AutoDeleteAllocator(deleteAllocator)
-{
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-Flat<Type, AllocatorType>::~Flat()
-{
- _deallocate(First);
- if (AutoDeleteAllocator)
- delete Allocator;
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-unsigned int Flat<Type, AllocatorType>::_size() const
-{
- return (unsigned int) (Last - First);
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-unsigned int Flat<Type, AllocatorType>::_capacity() const
-{
- return (unsigned int) (First == 0 ? 0 : End - First);
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-Type* Flat<Type, AllocatorType>::_allocate(unsigned int size)
-{
- return (Type*) Allocator->Allocate(size * sizeof(Type));
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-void Flat<Type, AllocatorType>::_deallocate(Type* p)
-{
- if (p)
- Allocator->Deallocate(p);
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-Type* Flat<Type, AllocatorType>::_reallocate(Type* p, unsigned int size)
-{
- return (Iterator) Allocator->Reallocate(p, size * sizeof(Type));
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-void Flat<Type, AllocatorType>::_clip(unsigned int size)
-{
-
- if (size < _size())
- return;
-
- Iterator new_first = _allocate(size);
- _copy(First, Last, new_first);
- _destroy(First, Last);
- _deallocate(First);
- End = new_first + size;
- Last = new_first + _size();
- First = new_first;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-void Flat<Type, AllocatorType>::_reserve(unsigned int new_size)
-{
- if (_capacity() >= new_size)
- return;
-
- Iterator new_first = _allocate(new_size);
- _copy(First, Last, new_first);
- _destroy(First, Last);
- _deallocate(First);
- End = new_first + new_size;
- Last = new_first + _size();
- First = new_first;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-Type* Flat<Type, AllocatorType>::_copy(Type* begin, Type* end, Type* dest)
-{
- for (;begin != end; ++dest, ++begin)
- *dest = *begin;
- return dest;
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-void Flat<Type, AllocatorType>::_delete_range(Type* begin, Type* end)
-{
- for (; begin != end; ++begin) {
- BETAJAEN_CC_DELETE(*begin);
- }
-}
-
-/////////////////////////////////////////////////////////////
-
-template< class Type, class AllocatorType >
-void Flat<Type, AllocatorType>::_destroy(Type* begin, Type* end)
-{
- for (; begin != end; ++begin) {
- BETAJAEN_CC_DESTRUCTOR(begin)
- begin->~Type();
- }
-}
-
-BETAJAEN_CC_NAMESPACE_END
-
-
-/**
- SharedList
-*/
-
-BETAJAEN_CC_NAMESPACE_START
-
-/////////////////////////////////////////////////////////////
-
-#define SharedListType SharedList<Type, AllocatorType>
-#define TypePtr Type*
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-SharedList<Type, AllocatorType>::SharedList(AllocatorType* _allocator, bool _auto_delete_allocator)
-{
- if (_allocator == NULL)
- _allocator = new AllocatorType();
-
- _Flat = new FlatType(_allocator, _auto_delete_allocator);
- _Usage = new unsigned int(1);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-SharedList<Type, AllocatorType>::SharedList(const SharedListType& other)
-{
-
- _Flat = other._Flat;
- _Usage = other._Usage;
- ++(*_Usage);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-SharedListType& SharedList<Type, AllocatorType>::operator=(const SharedListType& other)
-{
-
- if (_Flat)
- {
- _Flat->_delete_range(_Flat->First, _Flat->Last);
- delete _Flat;
- }
-
- if (_Usage)
- delete _Usage;
-
- _Flat = other._Flat;
- _Usage = other._Usage;
- ++(*_Usage);
-
- return *this;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-TypePtr SharedList<Type, AllocatorType>::Get(size_t pos)
-{
- if (pos > Size())
- return NULL;
-
- return *(_Flat->First + pos);
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-TypePtr SharedList<Type, AllocatorType>::operator[](size_t pos)
-{
- if (pos > Size())
- return NULL;
-
- return *(_Flat->First + pos);
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-unsigned int SharedList<Type, AllocatorType>::WhereIs(TypePtr ptr)
-{
-
- if (_Flat->_size() == 0)
- return 0;
-
- unsigned int i=0;
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin, ++i)
- {
- if (ptr == (*begin))
- return i;
- }
-
- return 0;
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-bool SharedList<Type, AllocatorType>::Has(TypePtr ptr)
-{
-
- if (_Flat->_size() == 0)
- return false;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- {
- if (ptr == (*begin))
- return true;
- }
-
- return false;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-unsigned SharedList<Type, AllocatorType>::Size() const
-{
- return _Flat->_size();
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-void SharedList<Type, AllocatorType>::Insert(Type* const & val)
-{
-
- if (_Flat->End <= _Flat->Last)
- _Flat->_reserve( (1 + Size()) * 2);
-
- *_Flat->Last = val;
- _Flat->Last++;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-void SharedList<Type, AllocatorType>::Clean(unsigned int n)
-{
- _Flat->_clip(_Flat->_size() + n);
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-void SharedList<Type, AllocatorType>::Destroy(unsigned int n)
-{
- if (n == 0)
- return Destroy(First);
-
- if (n == Size())
- return Destroy(Last);
-
- delete *(_Flat->First + n);
-
- _Flat->_destroy(_Flat->First + n, _Flat->First + n + 1);
- _Flat->_copy(_Flat->First + n + 1, _Flat->Last, _Flat->First + n);
- _Flat->Last--;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-void SharedList<Type, AllocatorType>::DestroyAll()
-{
- if (Size() == 0)
- return;
-
- _Flat->_delete_range(_Flat->First, _Flat->Last);
- // Could be iffy.
- _Flat->Last = _Flat->First;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-void SharedList<Type, AllocatorType>::Destroy(TypePtr val) {
- unsigned int i = WhereIs(val);
- Destroy(i);
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-void SharedList<Type, AllocatorType>::Destroy(AbsolutePosition position)
-{
-
- switch(position) {
-
- case First:
- {
- delete *_Flat->First;
- _Flat->_copy(_Flat->First + 1, _Flat->Last + 1, _Flat->First);
- _Flat->Last--;
- }
- break;
-
- case Last:
- {
- _Flat->Last--;
- delete *_Flat->Last;
- }
- break;
-
- }
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-TypePtr SharedList<Type, AllocatorType>::Remove(unsigned int n)
-{
-
- if (n == 0)
- return Remove(First);
-
- if (n == Size())
- return Remove(Last);
-
- TypePtr ptr = Get(n);
- _Flat->_destroy(_Flat->First + n, _Flat->First + n + 1);
- _Flat->_copy(_Flat->First + n + 1, _Flat->Last, _Flat->First + n);
- _Flat->Last--;
-
- return ptr;
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-TypePtr SharedList<Type, AllocatorType>::Remove(AbsolutePosition position)
-{
-
- if (_Flat->_size() == 0)
- return NULL;
-
- switch(position) {
-
- case First:
- {
- TypePtr t = *(_Flat->First);
- _Flat->_copy(_Flat->First + 1, _Flat->Last + 1, _Flat->First);
- _Flat->Last--;
- return t;
- }
-
- break;
-
- case Last:
- {
- _Flat->Last--;
- return *(_Flat->Last);
- }
- break;
- }
-
- return NULL;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-TypePtr SharedList<Type, AllocatorType>::Begin()
-{
-
- if (_Flat->_size() == 0)
- return NULL;
-
- _Iterator = _Flat->First;
- return *_Iterator;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-TypePtr SharedList<Type, AllocatorType>::Next()
-{
-
- if (_Flat->_size() == 0)
- return NULL;
- else if (_Iterator == _Flat->Last)
- return NULL;
- else
- return (*_Iterator++);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-TypePtr SharedList<Type, AllocatorType>::End()
-{
-
- if (_Flat->_size() == 0)
- return NULL;
-
- _Iterator = _Flat->Last - 1;
- return *_Iterator;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-TypePtr SharedList<Type, AllocatorType>::Previous()
-{
-
- if (_Flat->_size() == 0)
- return NULL;
- else if (_Iterator == _Flat->First - 1)
- return NULL;
- else
- return (*_Iterator--);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-void SharedList<Type, AllocatorType>::Each(void (Type::*MethodPtr)()) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin) {
- (*begin->*MethodPtr)();
- }
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < typename Type, typename AllocatorType>
-template < typename _A >
-void SharedList<Type, AllocatorType>::Each(void (Type::*MethodPtr)(_A), _A _1) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin) {
- (*begin->*MethodPtr)(_1);
- }
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < typename Type, typename AllocatorType>
-template < typename _A, typename _B>
-void SharedList<Type, AllocatorType>::Each(void (Type::*MethodPtr)(_A, _B), _A _1, _B _2) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < typename Type, typename AllocatorType>
-template <typename _A, typename _B, typename _C>
-void SharedList<Type, AllocatorType>::Each(void (Type::*MethodPtr)(_A, _B, _C), _A _1, _B _2, _C _3)
-{
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < typename Type, typename AllocatorType>
-template <typename _A, typename _B, typename _C, typename _D>
-void SharedList<Type, AllocatorType>::Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4)
-{
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < typename Type, typename AllocatorType>
-template <typename _A, typename _B, typename _C, typename _D, typename _E>
-void SharedList<Type, AllocatorType>::Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4, _5);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < typename Type, typename AllocatorType>
-template <typename _A, typename _B, typename _C, typename _D, typename _E, typename _F>
-void SharedList<Type, AllocatorType>::Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5, _F _6)
-{
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4, _5, _6);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < typename Type, typename AllocatorType>
-template <typename _A, typename _B, typename _C, typename _D, typename _E, typename _F, typename _G>
-void SharedList<Type, AllocatorType>::Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5, _F _6, _G _7)
-{
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4, _5, _6, _7);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < typename Type, typename AllocatorType>
-template <typename _A, typename _B, typename _C, typename _D, typename _E, typename _F, typename _G, typename _H>
-void SharedList<Type, AllocatorType>::Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5, _F _6, _G _7, _H _8)
-{
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4, _5, _6, _7, _8);
-
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-unsigned int SharedList<Type, AllocatorType>::getUsageCount() const
-{
- return *_Usage;
-}
-
-/////////////////////////////////////////////////////////////
-
-template < class Type, class AllocatorType >
-Flat<Type*, AllocatorType>* SharedList<Type, AllocatorType>::getFlat() const {
- return _Flat;
-}
-
-/////////////////////////////////////////////////////////////
-
-#undef SharedListType
-#undef TypePtr
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_END
-
-
-#endif
\ No newline at end of file
Deleted: trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.h 2008-11-14 07:08:16 UTC (rev 790)
+++ trunk/python-ogre/ThirdParty/nxogre/BetajaenCC.h 2008-11-14 07:14:30 UTC (rev 791)
@@ -1,3090 +0,0 @@
-/*
-
-Betajaen's Container Classes
-
-Copyright (c) 2007 Robin Southern, http://www.nxogre.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-#ifndef BETAJAENS_CC_H
-#define BETAJAENS_CC_H
-
-#include "NxOgrePlatform.h"
-#include "NxOgreAllocator.h"
-
-// Configuration
-
-/** \brief Namespace to place the Containers in. Comment out if you want it in the global namespace.
-*/
-#define BETAJAEN_CC_NAMESPACE Betajaen
-
-
-/** \brief Enable debug comments. Set to zero to disable, 1 to enable
-*/
-#define BETAJAEN_CC_DEBUG_COMMENTS 1
-
-
-/** \brief Export Class Macro, replace value with your export macro
-*/
-#define BETAJAEN_CC_CLASS_EXPORT __declspec(dllexport)
-#define BETAJAEN_CC_TEMPLATE_CLASS_EXPORT __forceinline
-// #define BETAJAEN_CC_FUNCTION_EXPORT NxPublicFunction
-
-
-/** \brief Delete macro. Used if you have your own leak checker, etc.
-*/
-// #define BETAJAEN_CC_DELETE(ptr) \
-// {::NxOgre::Allocator::getPtr()->watch_delete(static_cast<void*>(ptr));}; \
-// delete ptr;
-
-// /** \brief Called just before when a class is destroyed using it's destructor.
-// */
-// #define BETAJAEN_CC_DESTRUCTOR(ptr) \
-// ::NxOgre::Allocator::getPtr()->watch_delete(begin);
-
-//////////////////////////////////////////////////////////////////////////
-
-#if (BETAJAEN_CC_DEBUG_COMMENTS == 1)
-# include <stdio.h>
-#endif
-
-#ifdef BETAJAEN_CC_NAMESPACE
-# define BETAJAEN_CC_NAMESPACE_START namespace BETAJAEN_CC_NAMESPACE {
-# define BETAJAEN_CC_NAMESPACE_END }
-#else
-# define BETAJAEN_CC_NAMESPACE_START /**/
-# define BETAJAEN_CC_NAMESPACE_END /**/
-#endif
-
-BETAJAEN_CC_NAMESPACE_START
-
-#if (BETAJAEN_CC_DEBUG_COMMENTS == 1)
-# define BETAJAEN_CC_PRINT(x) printf(x "\n");
-# define BETAJAEN_CC_PRINTF(x, y) printf(x "\n",y);
-#else
-# define BETAJAEN_CC_PRINT(x) /* x */
-# define BETAJAEN_CC_PRINTF(x,y) /* x, y*/
-#endif
-
-#if (_MSC_VER>=1000)
-# define BETAJAEN_CC_INLINE __forceinline
-#else
-# define BETAJAEN_CC_INLINE inline
-#endif
-
-#ifndef BETAJAEN_CC_CLASS_EXPORT
-# define BETAJAEN_CC_CLASS_EXPORT
-#endif
-
-#ifndef BETAJAEN_CC_TEMPLATE_CLASS_EXPORT
-# define BETAJAEN_CC_TEMPLATE_CLASS_EXPORT
-#endif
-
-#ifndef BETAJAEN_CC_FUNCTION_EXPORT
-# define BETAJAEN_CC_FUNCTION_EXPORT
-#endif
-
-#ifndef BETAJAEN_CC_DELETE
-# define BETAJAEN_CC_DELETE(ptr) delete ptr;
-#endif
-
-#ifndef BETAJAEN_CC_DESTRUCTOR
-# define BETAJAEN_CC_DESTRUCTOR(ptr)
-#endif
-
-BETAJAEN_CC_NAMESPACE_END
-
-//////////////////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_START
-
-class SharedAllocator;
-template <class TypePtr, class AllocatorType = SharedAllocator> class Flat;
-
-template <class BaseType, class AllocatorType = SharedAllocator> class Array;
-template <class BaseType, class AllocatorType = SharedAllocator> class SharedList;
-template <typename IdentifierType, class BaseType, class AllocatorType = SharedAllocator> class SharedMap;
-template <typename IdentifierType, class TypePtr> class Tree;
-template <typename> class Vector2;
-template <typename> class Vector3;
-template <typename> class Vector4;
-
-BETAJAEN_CC_NAMESPACE_END
-
-//////////////////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_START
-
-class BETAJAEN_CC_CLASS_EXPORT SharedAllocator {
-
-public:
-
-/////////////////////////////////////////////////////////////
-
-void* Allocate(size_t size)
-{
- return malloc(size);
-}
-
-/////////////////////////////////////////////////////////////
-
-void Deallocate(void* mem)
-{
- if (mem)
- free(mem);
-}
-
-/////////////////////////////////////////////////////////////
-
-void* Reallocate(void* mem, size_t size)
-{
- return realloc(mem, size);
-}
-
-/////////////////////////////////////////////////////////////
-
-}; // End of the SharedAllocator class.
-
-BETAJAEN_CC_NAMESPACE_END
-
-//////////////////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_START
-
-template
- <
- class Type,
- class AllocatorType
- >
-class BETAJAEN_CC_CLASS_EXPORT Flat
-{
-
-public:
-
-typedef Type * Iterator;
-typedef AllocatorType* AllocatorPtr;
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE Flat(AllocatorPtr allocator, bool deleteAllocator)
- : First(NULL), Last(NULL), End(NULL), Allocator(allocator), AutoDeleteAllocator(deleteAllocator)
-{
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE ~Flat()
-{
- _deallocate(First);
- if (AutoDeleteAllocator)
- delete Allocator;
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE unsigned int _size() const
-{
- return (unsigned int) (Last - First);
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE unsigned int _capacity() const
-{
- return (unsigned int) (First == 0 ? 0 : End - First);
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE Type* _allocate(unsigned int size)
-{
- return (Type*) Allocator->Allocate(size * sizeof(Type));
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void _deallocate(Type* p)
-{
- if (p)
- Allocator->Deallocate(p);
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE Iterator _reallocate(Iterator p, unsigned int size)
-{
- return (Iterator) Allocator->Reallocate(p, size * sizeof(Type));
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void _clip(unsigned int size)
-{
-
- if (size < _size())
- return;
-
- Iterator new_first = _allocate(size);
- _copy(First, Last, new_first);
- _destroy(First, Last);
- _deallocate(First);
- End = new_first + size;
- Last = new_first + _size();
- First = new_first;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void _reserve(unsigned int new_size)
-{
- if (_capacity() >= new_size)
- return;
-
- Iterator new_first = _allocate(new_size);
- _copy(First, Last, new_first);
- _destroy(First, Last);
- _deallocate(First);
- End = new_first + new_size;
- Last = new_first + _size();
- First = new_first;
-
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE Iterator _copy(Iterator begin, Iterator end, Iterator dest)
-{
- for (;begin != end; ++dest, ++begin)
- *dest = *begin;
- return dest;
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void _delete_range(Iterator begin, Iterator end)
-{
- for (; begin != end; ++begin) {
- BETAJAEN_CC_DELETE(*begin);
- }
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void _destroy(Iterator begin, Iterator end)
-{
- for (; begin != end; ++begin) {
- BETAJAEN_CC_DESTRUCTOR(begin)
- begin->~Type();
- }
-}
-
-/////////////////////////////////////////////////////////////
-
-protected: AllocatorPtr Allocator;
-protected: bool AutoDeleteAllocator;
-public: Iterator First, Last, End;
-
-}; // End of Flat<Type,AllocatorType> class.
-
-BETAJAEN_CC_NAMESPACE_END
-
-//////////////////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_START
-
-template
- <
- class Type, /* Class to Store; A, myClassName, etc. */
- class AllocatorType /* Allocator to use, or leave blank for SharedAllocator */
- >
-class BETAJAEN_CC_CLASS_EXPORT Array {
-
-public:
-
-typedef Type* TypePtr;
-typedef Array<Type, AllocatorType> ArrayType;
-typedef Flat<Type, AllocatorType> FlatType;
-typedef FlatType* FlatPtr;
-
-BETAJAEN_CC_INLINE Array(AllocatorType* _allocator = NULL, bool _auto_delete_allocator = true)
-{
- if (_allocator == NULL)
- _allocator = new AllocatorType();
-
- _Flat = new FlatType(_allocator, _auto_delete_allocator);
-
-}
-
-BETAJAEN_CC_INLINE ~Array()
-{
- delete _Flat;
-}
-
-BETAJAEN_CC_INLINE TypePtr getPtr()
-{
- return _Flat->First;
-}
-
-BETAJAEN_CC_INLINE unsigned int Size()
-{
- return _Flat->_size();
-}
-
-BETAJAEN_CC_INLINE void Append(Type v) {
-
- if (_Flat->End <= _Flat->Last)
- _Flat->_reserve( (1 + _Flat->_size()) * 2);
-
- *_Flat->Last = v;
- _Flat->Last++;
-
-}
-
-BETAJAEN_CC_INLINE void Clip() {
- _Flat->_clip(0);
-}
-
-private: FlatPtr _Flat;
-
-};
-
-BETAJAEN_CC_NAMESPACE_END
-
-//////////////////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_START
-
-/** \brief A list of pointers with garbage collections and the ability to
- share the same list with similar lists. Like STL's Vector.
-
- \example
- <code>
- class A;
-
- SharedList<A> aList;
- a.Insert(new A());
- a.Remove(a.Last);
- </code>
-
-*/
-template
- <
- class Type, /* Class to Store; A, myClassName, etc. */
- class AllocatorType /* Allocator to use, or leave blank for SharedAllocator */
- >
-class BETAJAEN_CC_CLASS_EXPORT SharedList {
-
-public:
-
-typedef Type* TypePtr;
-typedef TypePtr* Iterator;
-typedef SharedList<Type, AllocatorType> SharedListType;
-typedef Flat<TypePtr, AllocatorType> FlatType;
-typedef FlatType* FlatPtr;
-
-/////////////////////////////////////////////////////////////
-
-enum AbsolutePosition
-{
- First,
- Last
-};
-
-/**
- Constructor with optional custom allocator
-*/
-BETAJAEN_CC_INLINE SharedList(AllocatorType* _allocator = NULL, bool _auto_delete_allocator = true)
-{
- if (_allocator == NULL)
- _allocator = new AllocatorType();
-
- _Flat = new FlatType(_allocator, _auto_delete_allocator);
- _Usage = new unsigned int(1);
-
-}
-
-/** \brief Copy Constructor between SharedList's. The Flat will not be copied but referenced.
- Any action on this list will effect all lists using the same Flat. Clean up will only
- happen on the destruction of the last surviving list.
-
- \example
- <code>
- typedef SharedList<A> AList;
- AList a;
- AList b(a);
- </code>
-*/
-BETAJAEN_CC_INLINE SharedList(const SharedListType& other)
-{
-
- _Flat = other._Flat;
- _Usage = other._Usage;
- ++(*_Usage);
-
-}
-
-
-/** \brief Copy Operator. Functions the same as Copy Constructor but deletes the set that this
- may already have.
-
- \example
- <code>
- typedef SharedList<A> AList;
- AList a;
- AList b;
- b = a;
- </code>
-*/
-BETAJAEN_CC_INLINE SharedListType& operator=(const SharedListType& other)
-{
-
- if (_Flat)
- {
- _Flat->_delete_range(_Flat->First, _Flat->Last);
- delete _Flat;
- }
-
- if (_Usage)
- delete _Usage;
-
- _Flat = other._Flat;
- _Usage = other._Usage;
- ++(*_Usage);
-
- return *this;
-
-}
-
-
-/** \brief Destructor. If this is the last of all SharedLists sharing the same set,
- the set will be destroyed otherwise the Flat will be ignored and this SharedList
- dies gracefully.
-*/
-BETAJAEN_CC_INLINE ~SharedList()
-{
-
- if (--(*_Usage) == 0)
- {
- _Flat->_delete_range(_Flat->First, _Flat->Last);
- delete _Flat;
- delete _Usage;
- }
-
-}
-
-
-/** \brief Gets the pointer to the nth Type in the list. Alternate interface to operator[].
-*/
-BETAJAEN_CC_INLINE TypePtr Get(size_t pos)
-{
- if (pos > Size())
- return NULL;
-
- return *(_Flat->First + pos);
-}
-
-
-/** \brief Gets the pointer to the nth TypePtr in the list.
-*/
-BETAJAEN_CC_INLINE TypePtr operator[](size_t pos)
-{
- if (pos > Size())
- return NULL;
-
- return *(_Flat->First + pos);
-}
-
-
-/** \brief Where is something in the list.
-*/
-BETAJAEN_CC_INLINE unsigned int WhereIs(TypePtr ptr)
-{
-
- if (_Flat->_size() == 0)
- return 0;
-
- unsigned int i=0;
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin, ++i)
- {
- if (ptr == (*begin))
- return i;
- }
-
- return 0;
-}
-
-BETAJAEN_CC_INLINE bool Has(TypePtr ptr)
-{
-
- if (_Flat->_size() == 0)
- return false;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- {
- if (ptr == (*begin))
- return true;
- }
-
- return false;
-
-}
-
-/** \brief The size of the SharedList.
-*/
-BETAJAEN_CC_INLINE unsigned Size() const
-{
- return _Flat->_size();
-}
-
-
-/** \brief Insert something into the list
-*/
-BETAJAEN_CC_INLINE void Insert(const TypePtr& val)
-{
-
- if (_Flat->End <= _Flat->Last)
- _Flat->_reserve( (1 + Size()) * 2);
-
- *_Flat->Last = val;
- _Flat->Last++;
-
-}
-
-
-/** \brief Resize the capacity of the list to size + n.
-*/
-BETAJAEN_CC_INLINE void Clean(unsigned int n = 4)
-{
- _Flat->_clip(_Flat->_size() + n);
-}
-
-
-/** \brief Destroy something nth position into the list.
-*/
-BETAJAEN_CC_INLINE void Destroy(unsigned int n)
-{
- if (n == 0)
- return Destroy(First);
-
- if (n == Size())
- return Destroy(Last);
-
- delete *(_Flat->First + n);
-
- _Flat->_destroy(_Flat->First + n, _Flat->First + n + 1);
- _Flat->_copy(_Flat->First + n + 1, _Flat->Last, _Flat->First + n);
- _Flat->Last--;
-
-}
-
-// \brief Destroys everything
-//
-BETAJAEN_CC_INLINE void DestroyAll()
-{
- if (Size() == 0)
- return;
-
- _Flat->_delete_range(_Flat->First, _Flat->Last);
- // Could be iffy.
- _Flat->Last = _Flat->First;
-
-}
-
-/** \brief Destroys something in the list based on the pointer in the list.
-*/
-BETAJAEN_CC_INLINE void Destroy(TypePtr val) {
- unsigned int i = WhereIs(val);
- Destroy(i);
-}
-
-/** \brief Deletes something from the list based on AbsolutePosition
-*/
-BETAJAEN_CC_INLINE void Destroy(AbsolutePosition position)
-{
-
- switch(position) {
-
- case First:
- {
- delete *_Flat->First;
- _Flat->_copy(_Flat->First + 1, _Flat->Last + 1, _Flat->First);
- _Flat->Last--;
- }
- break;
-
- case Last:
- {
- _Flat->Last--;
- delete *_Flat->Last;
- }
- break;
-
- }
-
-}
-
-
-/** \brief Removes something from the list based on numerical position.
-*/
-BETAJAEN_CC_INLINE TypePtr Remove(unsigned int n)
-{
-
- if (n == 0)
- return Remove(First);
-
- if (n == Size())
- return Remove(Last);
-
- TypePtr ptr = Get(n);
- _Flat->_destroy(_Flat->First + n, _Flat->First + n + 1);
- _Flat->_copy(_Flat->First + n + 1, _Flat->Last, _Flat->First + n);
- _Flat->Last--;
-
- return ptr;
-}
-
-
-/** \brief Removes something from the list based on AbsolutePosition
-*/
-BETAJAEN_CC_INLINE TypePtr Remove(AbsolutePosition position)
-{
-
- if (_Flat->_size() == 0)
- return NULL;
-
- switch(position) {
-
- case First:
- {
- TypePtr t = *(_Flat->First);
- _Flat->_copy(_Flat->First + 1, _Flat->Last + 1, _Flat->First);
- _Flat->Last--;
- return t;
- }
-
- break;
-
- case Last:
- {
- _Flat->Last--;
- return *(_Flat->Last);
- }
- break;
- }
-
- return NULL;
-
-}
-
-// \brief Destroys everything
-//
-BETAJAEN_CC_INLINE void RemoveAll()
-{
- if (Size() == 0)
- return;
-
- _Flat->_deallocate(_Flat->First);
-
- // Could be iffy.
- _Flat->Last = _Flat->First;
-
-}
-
-
-/** \brief Places the Iterator at the beginning of the List
-*/
-BETAJAEN_CC_INLINE TypePtr Begin()
-{
-
- if (_Flat->_size() == 0)
- return NULL;
-
- _Iterator = _Flat->First;
- return *_Iterator;
-
-}
-
-
-/** \brief Advances the Iterator forward by one, and returns the value of the list or NULL
- \returns The next item in the list, or NULL if it has reached the end of it.
-*/
-BETAJAEN_CC_INLINE TypePtr Next()
-{
-
- if (_Flat->_size() == 0)
- return NULL;
- else if (_Iterator == _Flat->Last)
- return NULL;
- else
- return (*_Iterator++);
-
-}
-
-
-/** \brief Places the iterator at the end of the List
-*/
-BETAJAEN_CC_INLINE TypePtr End()
-{
-
- if (_Flat->_size() == 0)
- return NULL;
-
- _Iterator = _Flat->Last - 1;
- return *_Iterator;
-
-}
-
-
-/** \brief Advances the Iterator backwards by one, and returns the value of the list or NULL
- \returns The previous item in the list, or NULL if it has reached the beginning of it.
-*/
-BETAJAEN_CC_INLINE TypePtr Previous()
-{
-
- if (_Flat->_size() == 0)
- return NULL;
- else if (_Iterator == _Flat->First - 1)
- return NULL;
- else
- return (*_Iterator--);
-
-}
-
-/** \brief For each item in the list call it's own method.
-*/
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)()) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin) {
- (*begin->*MethodPtr)();
- }
-
-}
-
-
-/** \brief For each item in the list call it's own method, with one argument.
-*/
-template <typename _A>
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)(_A), _A _1) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin) {
- (*begin->*MethodPtr)(_1);
- }
-
-}
-
-
-/** \brief For each item in the list call it's own method, with two arguments.
-*/
-template <typename _A, typename _B>
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)(_A, _B), _A _1, _B _2) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2);
-
-}
-
-
-/** \brief For each item in the list call it's own method, with three arguments.
-*/
-template <typename _A, typename _B, typename _C>
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C), _A _1, _B _2, _C _3) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3);
-
-}
-
-
-/** \brief For each item in the list call it's own method, with four arguments.
-*/
-template <typename _A, typename _B, typename _C, typename _D>
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4);
-
-}
-
-
-/** \brief For each item in the list call it's own method, with five arguments.
-*/
-template <typename _A, typename _B, typename _C, typename _D, typename _E>
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4, _5);
-
-}
-
-
-/** \brief For each item in the list call it's own method, with six arguments.
-*/
-template <typename _A, typename _B, typename _C, typename _D, typename _E, typename _F>
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5, _F _6) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4, _5, _6);
-
-}
-
-
-/** \brief For each item in the list call it's own method, with seven arguments.
-*/
-template <typename _A, typename _B, typename _C, typename _D, typename _E, typename _F, typename _G>
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5, _F _6, _G _7) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4, _5, _6, _7);
-
-}
-
-
-/** \brief For each item in the list call it's own method, with eight arguments.
-*/
-template <typename _A, typename _B, typename _C, typename _D, typename _E, typename _F, typename _G, typename _H>
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)(_A, _B, _C, _D), _A _1, _B _2, _C _3, _D _4, _E _5, _F _6, _G _7, _H _8) {
-
- if (_Flat->_size() == 0)
- return;
-
- for(Iterator begin = _Flat->First; begin != _Flat->Last; ++begin)
- (*begin->*MethodPtr)(_1, _2, _3, _4, _5, _6, _7, _8);
-
-}
-
-/** \brief Returns the pointer to the working set.
-*/
-BETAJAEN_CC_INLINE FlatPtr getFlat() const {
- return _Flat;
-}
-
-
-/** \brief Returns the number of SharedLists using this set.
-*/
-BETAJAEN_CC_INLINE unsigned int getUsageCount() const {
- return *_Usage;
-}
-
-
-private: unsigned int* _Usage;
-private: FlatPtr _Flat;
-private: Iterator _Iterator;
-
-}; // End of SharedList<Type, AllocatorType> Class.
-
-BETAJAEN_CC_NAMESPACE_END
-
-//////////////////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_START
-
-
-/** \brief Binary Tree with variable identifer and storage type.
-
-*/
-template <typename NodeIdentifier, class Type>
-class BETAJAEN_CC_CLASS_EXPORT Tree
-{
- // Much of this Tree was from the excellent tutorial by Julienne Walker
- // http://eternallyconfuzzled.com/tuts/datastructures/jsw_tut_bst1.aspx
-
-public:
-
-class Node;
-typedef Node* NodePtr;
-typedef Type* TypePtr;
-
-/** \brief A tree is made up of nodes.
-*/
-class BETAJAEN_CC_CLASS_EXPORT Node
-{
-
-public:
-
-Node(NodeIdentifier id, TypePtr val) : _ID(id), _Val(val)
-{
- _Children[0] = NULL;
- _Children[1] = NULL;
-}
-
-void Replace(Node* n)
-{
- _ID = n->_ID;
- _Val = n->_Val;
-}
-
-NodeIdentifier _ID;
-TypePtr _Val;
-NodePtr _Children[2];
-
-};
-
-class BETAJAEN_CC_CLASS_EXPORT NodeIterator
-{
-public:
- NodePtr _Up[50];
- NodePtr _It;
- int _Top;
-};
-
-/** \brief Tree constructor
-*/
-public: BETAJAEN_CC_INLINE Tree() : _Root(NULL)
-{
-}
-
-
-/** \brief Tree destructor.
- \note Does not remove or destroy the contents of the tree.
-*/
-public: BETAJAEN_CC_INLINE ~Tree()
-{
-}
-
-public: BETAJAEN_CC_INLINE bool isEmpty() const {
- return (_Root == 0);
-}
-
-/** \brief Destroys all the nodes in the tree and deletes all of the values referenced in it.
-*/
-public: BETAJAEN_CC_INLINE void DestroyAll()
-{
- if (_Root == NULL)
- return;
-
- NodePtr iterator = _Root;
- NodePtr save = 0;
-
- while (iterator != NULL)
- {
- if (iterator->_Children[0] != NULL)
- {
- save = iterator->_Children[0];
- iterator->_Children[0] = save->_Children[1];
- save->_Children[1] = iterator;
- }
- else
- {
- save = iterator->_Children[1];
- delete iterator->_Val;
- delete iterator;
- }
-
- iterator = save;
- }
-
- _Root = NULL;
-}
-
-
-/** \brief Destroys all the nodes in the tree, but not all of the values referenced in it.
-*/
-public: BETAJAEN_CC_INLINE void RemoveAll()
-{
-
- if (_Root == NULL)
- return;
-
- NodePtr iterator = _Root;
- NodePtr save = 0;
-
- while (iterator != NULL)
- {
- if (iterator->_Children[0] != NULL)
- {
- save = iterator->_Children[0];
- iterator->_Children[0] = save->_Children[1];
- save->_Children[1] = iterator;
- }
- else
- {
- save = iterator->_Children[1];
- delete iterator;
- iterator = NULL;
- }
-
- iterator = save;
- }
-
- _Root = NULL;
-
-}
-
-
-/** \brief Remove a Node based of an identifier
-*/
-public: BETAJAEN_CC_INLINE void Remove(NodeIdentifier id)
-{
-
- if (_Root == NULL)
- return;
-
- Node head = {0};
- NodePtr iterator = &head;
- NodePtr *f = 0, *p = 0;
- int direction = 1;
-
- iterator->_Children[1] = _Root;
-
- //while (iterator =
-
-}
-
-
-
-/** \brief Removes a ranges of nodes based on max. and min. identifiers.
- \note This operates based on the "operator <" of the TypeIdentifier the class,
- which defines if the type is in the range or not. Types such as ints, or reals
- aren't a problem but things like strings or complicated classes may produce
- strange results.
-*/
-public: BETAJAEN_CC_INLINE void RemoveRange(NodeIdentifier id_min, NodeIdentifier id_max)
-{
-
-
-}
-
-
-/**
-*/
-public: BETAJAEN_CC_INLINE void Destroy(NodeIdentifier id)
-{
-
-}
-
-
-/**
-*/
-public: BETAJAEN_CC_INLINE void DestroyRange(NodeIdentifier id_min, NodeIdentifier id_max)
-{
-
-}
-
-
-/**
-*/
-public: BETAJAEN_CC_INLINE TypePtr Find(NodeIdentifier target)
-{
- NodePtr iterator = _Root;
- while (iterator != NULL)
- {
- if (iterator->_ID == target)
- {
- return iterator->_Val;
- }
- else
- {
- iterator = iterator->_Children[int(iterator->_ID < target)];
- }
- }
-
- return 0;
-}
-
-/**
-*/
-public: BETAJAEN_CC_INLINE TypePtr First(NodeIterator* it)
-{
-
- it->_It = _Root;
- it->_Top = 0;
-
- if (it->_It != 0) {
- while (it->_It->_Children[0] != 0) {
- it->_Up[it->_Top++] = it->_It;
- it->_It = it->_It->_Children[0];
- }
- }
-
- if (it->_It != 0)
- return it->_It->_Val;
- else
- return 0;
-
-}
-
-/**
-*/
-public: BETAJAEN_CC_INLINE TypePtr Next(NodeIterator* it)
-{
- if (it->_It->_Children[1] != 0) {
- it->_Up[it->_Top++] = it->_It;
- it->_It = it->_It->_Children[1];
-
- while (it->_It->_Children[0] != 0) {
- it->_Up[it->_Top++] = it->_It;
- it->_It = it->_It->_Children[0];
- }
-
- }
- else {
- NodePtr last;
-
- do {
-
- if (it->_Top == 0) {
- it->_It = 0;
- break;
- }
-
- last = it->_It;
- it->_It = it->_Up[--it->_Top];
-
- } while (last == it->_It->_Children[1]);
-
- }
-
- if (it->_It != 0)
- return it->_It->_Val;
- else
- return 0;
-
-}
-
-/**
-*/
-public: BETAJAEN_CC_INLINE bool Insert(NodeIdentifier target, TypePtr val)
-{
- Node* node = new Node(target, val);
-
-
- if (_Root == NULL)
- {
- _Root = node;
- return true;
- }
- else
- {
- Node* iterator = _Root;
- unsigned int direction;
-
- for ( ; ; )
- {
- direction = iterator->_ID < target;
-
- if (iterator->_ID == target)
- {
- delete node;
- return false;
- }
- else if (iterator->_Children[direction] == NULL)
- break;
-
-
- iterator = iterator->_Children[direction];
- }
-
- iterator->_Children[direction] = node;
- }
-
- return true;
-}
-
-
-private: NodePtr _Root;
-
-};
-
-BETAJAEN_CC_NAMESPACE_END
-
-//////////////////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_START
-
-template <
- typename IdentifierType,
- class Type,
- class AllocatorType
- >
-class BETAJAEN_CC_CLASS_EXPORT SharedMap
-{
-
-public:
-
-typedef Type* TypePtr;
-typedef Tree<IdentifierType, Type> TreeType;
-typedef TreeType* TreePtr;
-
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE SharedMap()
-{
- _Tree = new TreeType();
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE ~SharedMap()
-{
- _Tree->DestroyAll();
- delete _Tree;
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE TypePtr Get(IdentifierType identifier)
-{
- return _Tree->Find(identifier);
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE TypePtr operator[](IdentifierType identifier)
-{
- return _Tree->Find(identifier);
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void Insert(IdentifierType identifier, TypePtr ptr)
-{
- _Tree->Insert(identifier, ptr);
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void DestroyAll()
-{
- _Tree->DestroyAll();
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void RemoveAll() {
- _Tree->RemoveAll();
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void Destroy(IdentifierType);
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE void Remove(IdentifierType);
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE TypePtr Begin();
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE TypePtr Next();
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE TypePtr End();
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE TypePtr Previous();
-
-/////////////////////////////////////////////////////////////
-
-/** \brief For each item in the list call it's own method.
-*/
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)()) {
-
- if (_Tree->isEmpty())
- return;
-
- typename TreeType::NodeIterator iterator;
- TypePtr ptr = _Tree->First(&iterator);
-
- while (ptr != 0) {
- (ptr->*MethodPtr)();
- ptr = _Tree->Next(&iterator);
- }
-}
-
-
-/** \brief For each item in the list call it's own method, with one argument.
-*/
-template <typename _A>
-BETAJAEN_CC_INLINE void Each(void (Type::*MethodPtr)(_A), _A _1) {
-
- if (_Tree->isEmpty())
- return;
-
- typename TreeType::NodeIterator iterator;
- TypePtr ptr = _Tree->First(&iterator);
-
- while (ptr != 0) {
- (ptr->*MethodPtr)(_1);
- ptr = _Tree->Next(&iterator);
- }
-}
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE TreePtr getTree() const
-{
- return _Tree;
-}
-
-/////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_INLINE unsigned int getUsage() const
-{
- return *_Usage;
-}
-
-/////////////////////////////////////////////////////////////
-
-private: TreePtr _Tree;
-private: unsigned int* _Usage;
-
-/////////////////////////////////////////////////////////////
-
-};
-
-BETAJAEN_CC_NAMESPACE_END
-
-//////////////////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_START
-
-/** \brief Vector with two rows.
-*/
-template <
- typename Type
- >
-class BETAJAEN_CC_CLASS_EXPORT Vector2
-{
-
-public:
-
-typedef Vector2<Type> ThisType;
-
-/* \brief First */
-Type i;
-
-/* \brief Second */
-Type j;
-
-BETAJAEN_CC_INLINE Vector2()
-{
-}
-
-BETAJAEN_CC_INLINE Vector2(Type _i, Type _j)
-: i(_i), j(_j)
-{
-}
-
-BETAJAEN_CC_INLINE void swap(ThisType& other)
-{
- Type First = i, Second = j;
- i = other.i; other.i = First;
- j = other.j; other.j = Second;
-}
-
-BETAJAEN_CC_INLINE ThisType& operator = (const ThisType& other)
-{
- i = other.i; j = other.j;
- return *this;
-}
-
-BETAJAEN_CC_INLINE ThisType& operator = (const Type& other)
-{
- i = other; j = other;
- return *this;
-}
-
-BETAJAEN_CC_INLINE ThisType& operator *= (const Type& other)
-{
- i *= other; j *= other;
-}
-
-BETAJAEN_CC_INLINE ThisType& operator *= (const ThisType& other)
-{
- i *= other.i; j *= other.j;
-}
-
-BETAJAEN_CC_INLINE bool operator == (const ThisType& other) const
-{
- return (i == other.i && j == other.j);
-}
-
-BETAJAEN_CC_INLINE bool operator != (const ThisType& other) const
-{
- return (i != other.i || j != other.j);
-}
-
-};
-
-BETAJAEN_CC_NAMESPACE_END
-
-//////////////////////////////////////////////////////////////////////////
-
-BETAJAEN_CC_NAMESPACE_START
-
-/** \brief Vector with three rows.
-*/
-template <
- typename Type
- >
-class BETAJAEN_CC_CLASS_EXPORT Vector3
-{
-
-public:
-
-typedef Vector3<Type> ThisType;
-
-/* \...
[truncated message content] |
|
From: <and...@us...> - 2008-11-14 07:08:27
|
Revision: 790
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=790&view=rev
Author: andy_miller
Date: 2008-11-14 07:08:16 +0000 (Fri, 14 Nov 2008)
Log Message:
-----------
QuickGui updated, NXOgre generator for 0.22, removed info message from doc generation
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialBase.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITab.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITab.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITabPage.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITabPage.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextAlignment.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.h
trunk/python-ogre/code_generators/common_utils/extract_documentation.py
trunk/python-ogre/code_generators/nxogre/generate_code.py
trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h
trunk/python-ogre/code_generators/nxogre/python_nxogre_sizeof.h
trunk/python-ogre/demos/qgui/Demo_QuickGUI01.py
trunk/python-ogre/demos/theora/demo_video.py
trunk/python-ogre/environment.py
trunk/python-ogre/packages_2.5/ogre/gui/CEGUI/__init__.py
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
Removed Paths:
-------------
trunk/python-ogre/generated/
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-11-14 07:08:16 UTC (rev 790)
@@ -62,8 +62,8 @@
PATH_plib = os.path.join(PATH_THIRDPARTY, 'plib')
PATH_et = os.path.join(PATH_THIRDPARTY, 'et')
PATH_caelum = os.path.join(PATH_THIRDPARTY, 'caelum')
-PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre', 'NxOgre')
-PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
+PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre_0.22')
+# # # PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
PATH_NxOgre_09= os.path.join(PATH_THIRDPARTY, 'nxogre_0.9')
PATH_watermesh= os.path.join(PATH_THIRDPARTY, 'watermesh')
PATH_noise= os.path.join(PATH_THIRDPARTY, 'noise')
@@ -162,7 +162,7 @@
PATH_INCLUDE_quickgui = PATH_quickgui
PATH_INCLUDE_NxOgre_09= PATH_NxOgre_09
PATH_INCLUDE_NxOgre= os.path.join(PATH_NxOgre, 'include')
-PATH_INCLUDE_NxOgre= PATH_NxOgre
+# # # PATH_INCLUDE_NxOgre= PATH_NxOgre
PATH_INCLUDE_Bullet= os.path.join(PATH_Bullet, 'src')
PATH_INCLUDE_freetype= os.path.join(PATH_INCLUDE_quickgui,'FreeType2.3.5')
PATH_INCLUDE_betagui = PATH_betagui
Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -42,33 +42,15 @@
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
# include "AL/al.h"
# include "AL/alc.h"
-// # include "xram.h"
-// # if OGRE_COMPILER == OGRE_COMPILER_MSVC
-// # ifdef OGREAL_EXPORT
-// # define OgreAL_Export __declspec(dllexport)
-// # else
-// # define OgreAL_Export __declspec(dllimport)
-// # endif
-// # else
- # define OgreAL_Export
-// # endif
+ # define OgreAL_Export
#elif OGRE_COMPILER == OGRE_COMPILER_GNUC
# include "al.h"
# include "alc.h"
-// # if defined(OGREAL_EXPORT) && OGRE_COMP_VER >= 400
-// # define OgreAL_Export __attribute__ ((visibility("default")))
-// # else
- # define OgreAL_Export
- # endif
- // fake EAX/X-RAM
- typedef ALenum (*EAXGetBufferMode)(ALuint buffer, ALint *pReserved);
- typedef ALboolean (*EAXSetBufferMode)(ALsizei n, ALuint *buffers, ALint value);
-// #else // Other Compilers
-// # include "al.h"
-// # include "alc.h"
-// # include "xram.h"
-// # define OgreAL_Export
-// #endif
+ # define OgreAL_Export
+ #endif
+
+ typedef ALenum (*EAXGetBufferMode)(ALuint buffer, ALint *pReserved);
+ typedef ALboolean (*EAXSetBufferMode)(ALsizei n, ALuint *buffers, ALint value);
#ifndef OGREAL_THREADED
# define OGREAL_THREADED 0
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -21,6 +21,7 @@
ButtonDesc::ButtonDesc() :
LabelDesc()
{
+ textDesc.horizontalTextAlignment = TEXT_ALIGNMENT_HORIZONTAL_CENTER;
}
void ButtonDesc::serialize(SerialBase* b)
@@ -42,6 +43,8 @@
{
Label::_initialize(d);
+ ButtonDesc* bd = dynamic_cast<ButtonDesc*>(d);
+
mDesc = dynamic_cast<LabelDesc*>(mWidgetDesc);
setSkinType(d->skinTypeName);
@@ -68,33 +71,7 @@
void Button::onDraw()
{
- Brush* brush = Brush::getSingletonPtr();
-
- brush->setFilterMode(mDesc->brushFilterMode);
-
- SkinType* st = mSkinType;
- if(!mWidgetDesc->enabled && mWidgetDesc->disabledSkinType != "")
- st = SkinTypeManager::getSingleton().getSkinType(getClass(),mWidgetDesc->disabledSkinType);
-
- brush->drawSkinElement(Rect(mTexturePosition,mWidgetDesc->dimensions.size),st->getSkinElement(mSkinElementName));
-
- Ogre::ColourValue prevColor = brush->getColour();
- Rect prevClipRegion = brush->getClipRegion();
-
- Rect clipRegion;
- clipRegion.size =
- Size(
- mWidgetDesc->dimensions.size.width - mDesc->padding[PADDING_RIGHT] - mDesc->padding[PADDING_LEFT],
- mWidgetDesc->dimensions.size.height - mDesc->padding[PADDING_BOTTOM] - mDesc->padding[PADDING_TOP]);
- clipRegion.position = mTexturePosition;
- clipRegion.translate(Point(mDesc->padding[PADDING_LEFT],mDesc->padding[PADDING_TOP]));
-
- brush->setClipRegion(prevClipRegion.getIntersection(clipRegion));
-
- mText->draw(clipRegion.position);
-
- brush->setClipRegion(prevClipRegion);
- brush->setColor(prevColor);
+ Label::onDraw();
}
void Button::onMouseEnter(const EventArgs& args)
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -3,7 +3,8 @@
namespace QuickGUI
{
- Character::Character() {};
+ Character::Character( void ) {} ;
+
Character::Character(Ogre::UTFString::code_point cp, Ogre::FontPtr fp, Ogre::ColourValue cv) :
codePoint(cp),
fontPtr(fp),
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -56,9 +56,10 @@
/// UV coords of glyph, retreived from Font texture generated by Ogre::Font class.
UVRect uvCoords;
+ Character();
protected:
- Character(void);
+
bool mHighlighted;
bool mWhiteSpace;
};
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -4,19 +4,19 @@
#include "OgrePlatform.h"
#ifndef _QuickGUIExport
- #if defined(OGRE_PLATFORM)
- #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 && !defined ( __MINGW32__ )
- # if defined( QUICKGUI_EXPORTS )
- # define _QuickGUIExport __declspec( dllexport )
- # else
- # define _QuickGUIExport __declspec( dllimport )
- # endif
- #else
- # define _QuickGUIExport
- #endif
- #else
+// #if defined(OGRE_PLATFORM)
+// #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 && !defined ( __MINGW32__ )
+// # if defined( QUICKGUI_EXPORTS )
+// # define _QuickGUIExport __declspec( dllexport )
+// # else
+// # define _QuickGUIExport __declspec( dllimport )
+// # endif
+// #else
+// # define _QuickGUIExport
+// #endif
+// #else
#define _QuickGUIExport
- #endif
+// #endif
#endif
#endif
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -10,21 +10,17 @@
TabPageDesc::TabPageDesc() :
PanelDesc()
{
- for(int i = 0; i < PADDING_COUNT; ++i)
- padding[i] = 5.0;
-
supportScrollBars = false;
tabFrontWidth = -1;
+ verticalTextAlignment = TEXT_ALIGNMENT_VERTICAL_CENTER;
}
void TabPageDesc::serialize(SerialBase* b)
{
PanelDesc::serialize(b);
- for(int i = 0; i < PADDING_COUNT; ++i)
- b->IO(StringConverter::toString(static_cast<Padding>(i)),&padding[i]);
-
b->IO("TabFrontWidth",&tabFrontWidth);
+ b->IO("VerticalTextAlignment",&verticalTextAlignment);
}
TabControlDesc::TabControlDesc() :
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -37,8 +37,8 @@
public:
TabPageDesc();
- /// Describes the Padding around Tab's Text
- float padding[PADDING_COUNT];
+ /// Vertical alignment of text within this widget's client area.
+ VerticalTextAlignment verticalTextAlignment;
/// Describes the Text used in this Label
TextDesc textDesc;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -17,18 +17,14 @@
LabelDesc::LabelDesc() :
WidgetDesc()
{
- for(int i = 0; i < PADDING_COUNT; ++i)
- {
- padding[i] = 5.0;
- }
+ verticalTextAlignment = TEXT_ALIGNMENT_VERTICAL_CENTER;
}
void LabelDesc::serialize(SerialBase* b)
{
WidgetDesc::serialize(b);
- for(int i = 0; i < PADDING_COUNT; ++i)
- b->IO(StringConverter::toString(static_cast<Padding>(i)),&padding[i]);
+ b->IO("VerticalTextAlignment",&verticalTextAlignment);
textDesc.serialize(b);
}
@@ -59,29 +55,34 @@
// modify it directly, which is used for serialization.
mDesc->textDesc = ld->textDesc;
+ // Store pointer to SkinType
+ SkinType* st = mSkinType;
+ if(!mWidgetDesc->enabled && mWidgetDesc->disabledSkinType != "")
+ {
+ st = SkinTypeManager::getSingleton().getSkinType(getClass(),mWidgetDesc->disabledSkinType);
+ }
+
+ SkinElement* se = st->getSkinElement(mSkinElementName);
+
if(mDesc->dimensions.size.width == 0)
{
if(mDesc->textDesc.segments.empty())
mDesc->dimensions.size.width = 50;
else
- mDesc->dimensions.size.width = ld->padding[PADDING_LEFT] + mDesc->textDesc.getTextWidth() + ld->padding[PADDING_RIGHT];
+ mDesc->dimensions.size.width = se->getBorderThickness(BORDER_LEFT) + mDesc->textDesc.getTextWidth() + se->getBorderThickness(BORDER_RIGHT);
}
if(mDesc->dimensions.size.height == 0)
{
if(mDesc->textDesc.segments.empty())
mDesc->dimensions.size.height = 20;
else
- mDesc->dimensions.size.height = ld->padding[PADDING_TOP] + mDesc->textDesc.getTextHeight() + ld->padding[PADDING_BOTTOM];
+ mDesc->dimensions.size.height = se->getBorderThickness(BORDER_TOP) + mDesc->textDesc.getTextHeight() + se->getBorderThickness(BORDER_BOTTOM);
}
- mDesc->textDesc.allottedWidth = ld->dimensions.size.width - (ld->padding[PADDING_LEFT] + ld->padding[PADDING_RIGHT]);
+ mDesc->verticalTextAlignment = ld->verticalTextAlignment;
+ mDesc->textDesc.allottedWidth = ld->dimensions.size.width - (se->getBorderThickness(BORDER_LEFT) + se->getBorderThickness(BORDER_RIGHT));
mText = new Text(mDesc->textDesc);
- setPadding(PADDING_BOTTOM,ld->padding[PADDING_BOTTOM]);
- setPadding(PADDING_LEFT,ld->padding[PADDING_LEFT]);
- setPadding(PADDING_RIGHT,ld->padding[PADDING_RIGHT]);
- setPadding(PADDING_TOP,ld->padding[PADDING_TOP]);
-
mCurrentFontName = Text::getFirstAvailableFont()->getName();
mCurrentColourValue = Ogre::ColourValue::White;
}
@@ -100,12 +101,9 @@
return "Label";
}
- float Label::getPadding(Padding p)
+ HorizontalTextAlignment Label::getHorizontalTextAlignment()
{
- if(p == PADDING_COUNT)
- throw Exception(Exception::ERR_INVALIDPARAMS,"PADDING_COUNT is not a valid parameter!","Label::getPadding");
-
- return mDesc->padding[p];
+ return mText->getHorizontalTextAlignment();
}
Ogre::UTFString Label::getText()
@@ -118,6 +116,11 @@
return mText->getVerticalLineSpacing();
}
+ VerticalTextAlignment Label::getVerticalTextAlignment()
+ {
+ return mDesc->verticalTextAlignment;
+ }
+
void Label::onDraw()
{
Brush* brush = Brush::getSingletonPtr();
@@ -135,16 +138,35 @@
Ogre::ColourValue prevColor = brush->getColour();
Rect prevClipRegion = brush->getClipRegion();
- Rect clipRegion;
- clipRegion.size =
- Size(
- mWidgetDesc->dimensions.size.width - mDesc->padding[PADDING_RIGHT] - mDesc->padding[PADDING_LEFT],
- mWidgetDesc->dimensions.size.height - mDesc->padding[PADDING_BOTTOM] - mDesc->padding[PADDING_TOP]);
- clipRegion.position = mTexturePosition;
- clipRegion.translate(Point(mDesc->padding[PADDING_LEFT],mDesc->padding[PADDING_TOP]));
+ // Center Text Vertically
+ float textHeight = mText->getTextHeight();
+ float yPos = 0;
+
+ switch(mDesc->verticalTextAlignment)
+ {
+ case TEXT_ALIGNMENT_VERTICAL_BOTTOM:
+ yPos = mDesc->dimensions.size.height - st->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_BOTTOM) - textHeight;
+ break;
+ case TEXT_ALIGNMENT_VERTICAL_CENTER:
+ yPos = (mDesc->dimensions.size.height / 2.0) - (textHeight / 2.0);
+ break;
+ case TEXT_ALIGNMENT_VERTICAL_TOP:
+ yPos = st->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_TOP);
+ break;
+ }
+
+ // Clip to client dimensions
+ Rect clipRegion(mClientDimensions);
+ clipRegion.translate(mTexturePosition);
+
brush->setClipRegion(prevClipRegion.getIntersection(clipRegion));
+ // Adjust Rect to Text drawing region
+ clipRegion = mClientDimensions;
+ clipRegion.position.y = yPos;
+ clipRegion.translate(mTexturePosition);
+
mText->draw(clipRegion.position);
brush->setClipRegion(prevClipRegion);
@@ -225,14 +247,17 @@
redraw();
}
- void Label::setPadding(Padding p, float distance)
+ void Label::setHorizontalTextAlignment(HorizontalTextAlignment a)
{
- if(p == PADDING_COUNT)
- throw Exception(Exception::ERR_INVALIDPARAMS,"PADDING_COUNT is not a valid parameter!","Label::setPadding");
+ mText->setHorizontalTextAlignment(a);
- mDesc->padding[p] = distance;
- mText->setAllottedWidth(mWidgetDesc->dimensions.size.width - (mDesc->padding[PADDING_LEFT] + mDesc->padding[PADDING_RIGHT]));
+ redraw();
+ }
+ void Label::setVerticalTextAlignment(VerticalTextAlignment a)
+ {
+ mDesc->verticalTextAlignment = a;
+
redraw();
}
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -1,7 +1,6 @@
#ifndef QUICKGUILABEL_H
#define QUICKGUILABEL_H
-#include "QuickGUIPadding.h"
#include "QuickGUIWidget.h"
#include "QuickGUIText.h"
@@ -13,7 +12,8 @@
public:
LabelDesc();
- float padding[PADDING_COUNT];
+ /// Vertical alignment of text within this widget's client area.
+ VerticalTextAlignment verticalTextAlignment;
/// Describes the Text used in this Label
TextDesc textDesc;
@@ -59,9 +59,9 @@
*/
virtual Ogre::String getClass();
/**
- * Gets the distance between a Label border and the text.
+ * Returns the horizontal alignment of text within this widget's client area.
*/
- float getPadding(Padding p);
+ HorizontalTextAlignment getHorizontalTextAlignment();
/**
* Gets the text in UTFString form.
*/
@@ -71,6 +71,10 @@
* are multiple lines of text.
*/
float getVerticalLineSpacing();
+ /**
+ * Returns the vertical alignment of text within this widget's client area.
+ */
+ VerticalTextAlignment getVerticalTextAlignment();
/**
* Sets all characters of the text to the specified color.
@@ -117,9 +121,9 @@
*/
void setFont(const Ogre::String& fontName, Ogre::UTFString s, bool allOccurrences);
/**
- * Sets the distance between a Label border and the text.
+ * Sets the Horizontal alignment of Text as displayed within the Label area.
*/
- void setPadding(Padding p, float distance);
+ void setHorizontalTextAlignment(HorizontalTextAlignment a);
/**
* Sets the text for this object.
*/
@@ -137,6 +141,10 @@
* are multiple lines of text.
*/
void setVerticalLineSpacing(float distance);
+ /**
+ * Sets the Vertical alignment of Text as displayed within the Label area.
+ */
+ void setVerticalTextAlignment(VerticalTextAlignment a);
protected:
Label(const Ogre::String& name);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -17,20 +17,14 @@
ListTextItemDesc::ListTextItemDesc() :
ListItemDesc()
{
- for(int i = 0; i < PADDING_COUNT; ++i)
- {
- padding[i] = 5.0;
- }
+ verticalTextAlignment = TEXT_ALIGNMENT_VERTICAL_CENTER;
}
void ListTextItemDesc::serialize(SerialBase* b)
{
ListItemDesc::serialize(b);
- for(int i = 0; i < PADDING_COUNT; ++i)
- {
- b->IO(StringConverter::toString(static_cast<Padding>(i)),&padding[i]);
- }
+ b->IO("VerticalTextAlignment",&verticalTextAlignment);
textDesc.serialize(b);
}
@@ -60,14 +54,9 @@
// Make a copy of the Text Desc. The Text object will
// modify it directly, which is used for serialization.
mDesc->textDesc = ltid->textDesc;
-
+ mDesc->verticalTextAlignment = ltid->verticalTextAlignment;
mText = new Text(mDesc->textDesc);
- setPadding(PADDING_BOTTOM,ltid->padding[PADDING_BOTTOM]);
- setPadding(PADDING_LEFT,ltid->padding[PADDING_LEFT]);
- setPadding(PADDING_RIGHT,ltid->padding[PADDING_RIGHT]);
- setPadding(PADDING_TOP,ltid->padding[PADDING_TOP]);
-
mCurrentFontName = Text::getFirstAvailableFont()->getName();
mCurrentColourValue = Ogre::ColourValue::White;
}
@@ -91,14 +80,6 @@
return mText->getText();
}
- float ListTextItem::getPadding(Padding p)
- {
- if(p == PADDING_COUNT)
- throw Exception(Exception::ERR_INVALIDPARAMS,"PADDING_COUNT is not a valid parameter!","Label::getPadding");
-
- return mDesc->padding[p];
- }
-
void ListTextItem::onDraw()
{
Brush* brush = Brush::getSingletonPtr();
@@ -114,21 +95,39 @@
Ogre::ColourValue prevColor = brush->getColour();
Rect prevClipRegion = brush->getClipRegion();
- Rect clipRegion;
- clipRegion.size =
- Size(
- mDesc->dimensions.size.width - mDesc->padding[PADDING_RIGHT],
- mDesc->dimensions.size.height - mDesc->padding[PADDING_BOTTOM]);
- clipRegion.position = mTexturePosition;
- clipRegion.translate(Point(mDesc->padding[PADDING_LEFT],mDesc->padding[PADDING_TOP]));
+ // Center Text Vertically
+ float textHeight = mText->getTextHeight();
+ float yPos = 0;
+
+ switch(mDesc->verticalTextAlignment)
+ {
+ case TEXT_ALIGNMENT_VERTICAL_BOTTOM:
+ yPos = mDesc->dimensions.size.height - st->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_BOTTOM) - textHeight;
+ break;
+ case TEXT_ALIGNMENT_VERTICAL_CENTER:
+ yPos = (mDesc->dimensions.size.height / 2.0) - (textHeight / 2.0);
+ break;
+ case TEXT_ALIGNMENT_VERTICAL_TOP:
+ yPos = st->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_TOP);
+ break;
+ }
+
+ // Clip to client dimensions
+ Rect clipRegion(mClientDimensions);
+ clipRegion.translate(mTexturePosition);
+
brush->setClipRegion(prevClipRegion.getIntersection(clipRegion));
+ // Adjust Rect to Text drawing region
+ clipRegion = mClientDimensions;
+ clipRegion.position.y = yPos;
+ clipRegion.translate(mTexturePosition);
+
mText->draw(clipRegion.position);
brush->setClipRegion(prevClipRegion);
-
- Brush::getSingleton().setColor(prevColor);
+ brush->setColor(prevColor);
}
void ListTextItem::setColor(const Ogre::ColourValue& cv)
@@ -205,17 +204,6 @@
redraw();
}
- void ListTextItem::setPadding(Padding p, float distance)
- {
- if(p == PADDING_COUNT)
- throw Exception(Exception::ERR_INVALIDPARAMS,"PADDING_COUNT is not a valid parameter!","Label::setPadding");
-
- mDesc->padding[p] = distance;
- mText->setAllottedWidth(mWidgetDesc->dimensions.size.width - (mDesc->padding[PADDING_LEFT] + mDesc->padding[PADDING_RIGHT]));
-
- redraw();
- }
-
void ListTextItem::setText(Ogre::UTFString s, Ogre::FontPtr fp, const Ogre::ColourValue& cv)
{
mText->setText(s,fp,cv);
@@ -237,6 +225,6 @@
{
ListItem::setWidth(pixelWidth);
- mText->setAllottedWidth(mDesc->dimensions.size.width - (mDesc->padding[PADDING_LEFT] + mDesc->padding[PADDING_RIGHT]));
+ mText->setAllottedWidth(mDesc->dimensions.size.width);
}
}
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -11,7 +11,8 @@
public:
ListTextItemDesc();
- float padding[PADDING_COUNT];
+ /// Vertical alignment of text within this widget's client area.
+ VerticalTextAlignment verticalTextAlignment;
/// Describes the Text used in this Label
TextDesc textDesc;
@@ -55,10 +56,6 @@
*/
virtual Ogre::String getClass();
/**
- * Gets the distance between a Label border and the text.
- */
- float getPadding(Padding p);
- /**
* Gets the text in UTFString form.
*/
Ogre::UTFString getText();
@@ -108,10 +105,6 @@
*/
void setFont(const Ogre::String& fontName, Ogre::UTFString s, bool allOccurrences);
/**
- * Sets the distance between a Label border and the text.
- */
- void setPadding(Padding p, float distance);
- /**
* Sets the text for this object.
*/
void setText(Ogre::UTFString s, Ogre::FontPtr fp, const Ogre::ColourValue& cv);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -45,7 +45,7 @@
MenuLabel(name),
mMenuPanel(NULL)
{
- mSkinElementName= DEFAULT;
+ mSkinElementName = DEFAULT;
}
Menu::~Menu()
@@ -62,12 +62,6 @@
setSkinType(d->skinTypeName);
MenuDesc* md = dynamic_cast<MenuDesc*>(d);
-
- mText->setAllottedWidth(md->dimensions.size.width - (md->padding[PADDING_LEFT] + md->padding[PADDING_RIGHT]));
- setPadding(PADDING_BOTTOM,md->padding[PADDING_BOTTOM]);
- setPadding(PADDING_LEFT,md->padding[PADDING_LEFT]);
- setPadding(PADDING_RIGHT,md->padding[PADDING_RIGHT]);
- setPadding(PADDING_TOP,md->padding[PADDING_TOP]);
mDesc->menuWidth = md->menuWidth;
@@ -188,7 +182,8 @@
// Determine position of MenuItem
d.dimensions.position.y = mMenuPanel->getNextAvailableYPosition();
d.dimensions.size.width = mMenuPanel->getClientDimensions().size.width;
- d.dimensions.size.height = d.textDesc.getTextHeight() + (d.padding[PADDING_TOP] + d.padding[PADDING_BOTTOM]);
+ SkinElement* se = mSkinType->getSkinElement(mSkinElementName);
+ d.dimensions.size.height = d.textDesc.getTextHeight() + se->getBorderThickness(BORDER_TOP) + se->getBorderThickness(BORDER_BOTTOM);
MenuLabel* newMenuLabel = dynamic_cast<MenuLabel*>(Widget::create("MenuLabel",d));
addChild(newMenuLabel);
@@ -207,7 +202,8 @@
// Determine position of Menu
d.dimensions.position.y = mMenuPanel->getNextAvailableYPosition();
d.dimensions.size.width = mMenuPanel->getClientDimensions().size.width;
- d.dimensions.size.height = d.textDesc.getTextHeight() + (d.padding[PADDING_TOP] + d.padding[PADDING_BOTTOM]);
+ SkinElement* se = mSkinType->getSkinElement(mSkinElementName);
+ d.dimensions.size.height = d.textDesc.getTextHeight() + se->getBorderThickness(BORDER_TOP) + se->getBorderThickness(BORDER_BOTTOM);
Menu* newMenu = dynamic_cast<Menu*>(Widget::create("Menu",d));
@@ -369,7 +365,7 @@
else
p.x = mParentWidget->getScreenPosition().x + mParentWidget->getSize().width - mDesc->subMenuOverlap;
- p.y = getScreenPosition().y;
+ p.y = getScreenPosition().y - mMenuPanel->mSkinType->getSkinElement(mMenuPanel->mSkinElementName)->getBorderThickness(BORDER_TOP);
}
mMenuPanel->setPosition(p);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -23,20 +23,16 @@
MenuLabelDesc::MenuLabelDesc() :
MenuItemDesc()
{
- for(int i = 0; i < PADDING_COUNT; ++i)
- {
- padding[i] = 5.0;
- }
+ verticalTextAlignment = TEXT_ALIGNMENT_VERTICAL_CENTER;
+
+ textDesc.horizontalTextAlignment = TEXT_ALIGNMENT_HORIZONTAL_LEFT;
}
void MenuLabelDesc::serialize(SerialBase* b)
{
MenuItemDesc::serialize(b);
- for(int i = 0; i < PADDING_COUNT; ++i)
- {
- b->IO(StringConverter::toString(static_cast<Padding>(i)),&padding[i]);
- }
+ b->IO("VerticalTextAlignment",&verticalTextAlignment);
textDesc.serialize(b);
}
@@ -65,19 +61,16 @@
// modify it directly, which is used for serialization.
mDesc->textDesc = mld->textDesc;
- mDesc->textDesc.allottedWidth = mld->dimensions.size.width - (mld->padding[PADDING_LEFT] + mld->padding[PADDING_RIGHT]);
+ setSkinType(d->skinTypeName);
+ SkinElement* se = mSkinType->getSkinElement(mSkinElementName);
+ mDesc->textDesc.allottedWidth = mld->dimensions.size.width - (se->getBorderThickness(BORDER_LEFT) + se->getBorderThickness(BORDER_RIGHT));
+
if(mText != NULL)
delete mText;
+ mDesc->verticalTextAlignment = mld->verticalTextAlignment;
mText = new Text(mDesc->textDesc);
-
- setPadding(PADDING_BOTTOM,mld->padding[PADDING_BOTTOM]);
- setPadding(PADDING_LEFT,mld->padding[PADDING_LEFT]);
- setPadding(PADDING_RIGHT,mld->padding[PADDING_RIGHT]);
- setPadding(PADDING_TOP,mld->padding[PADDING_TOP]);
-
- setSkinType(d->skinTypeName);
}
Widget* MenuLabel::factory(const Ogre::String& widgetName)
@@ -94,17 +87,14 @@
return "MenuLabel";
}
- float MenuLabel::getPadding(Padding p)
+ float MenuLabel::getVerticalLineSpacing()
{
- if(p == PADDING_COUNT)
- throw Exception(Exception::ERR_INVALIDPARAMS,"PADDING_COUNT is not a valid parameter!","MenuLabel::getPadding");
-
- return mDesc->padding[p];
+ return mText->getVerticalLineSpacing();
}
- float MenuLabel::getVerticalLineSpacing()
+ VerticalTextAlignment MenuLabel::getVerticalTextAlignment()
{
- return mText->getVerticalLineSpacing();
+ return mDesc->verticalTextAlignment;
}
void MenuLabel::onDraw()
@@ -122,21 +112,39 @@
Ogre::ColourValue prevColor = brush->getColour();
Rect prevClipRegion = brush->getClipRegion();
- Rect clipRegion;
- clipRegion.size =
- Size(
- mWidgetDesc->dimensions.size.width - mDesc->padding[PADDING_RIGHT] - mDesc->padding[PADDING_LEFT],
- mWidgetDesc->dimensions.size.height - mDesc->padding[PADDING_BOTTOM] - mDesc->padding[PADDING_TOP]);
- clipRegion.position = mTexturePosition;
- clipRegion.translate(Point(mDesc->padding[PADDING_LEFT],mDesc->padding[PADDING_TOP]));
+ // Center Text Vertically
+ float textHeight = mText->getTextHeight();
+ float yPos = 0;
+
+ switch(mDesc->verticalTextAlignment)
+ {
+ case TEXT_ALIGNMENT_VERTICAL_BOTTOM:
+ yPos = mDesc->dimensions.size.height - st->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_BOTTOM) - textHeight;
+ break;
+ case TEXT_ALIGNMENT_VERTICAL_CENTER:
+ yPos = (mDesc->dimensions.size.height / 2.0) - (textHeight / 2.0);
+ break;
+ case TEXT_ALIGNMENT_VERTICAL_TOP:
+ yPos = st->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_TOP);
+ break;
+ }
+
+ // Clip to client dimensions
+ Rect clipRegion(mClientDimensions);
+ clipRegion.translate(mTexturePosition);
+
brush->setClipRegion(prevClipRegion.getIntersection(clipRegion));
+ // Adjust Rect to Text drawing region
+ clipRegion = mClientDimensions;
+ clipRegion.position.y = yPos;
+ clipRegion.translate(mTexturePosition);
+
mText->draw(clipRegion.position);
brush->setClipRegion(prevClipRegion);
-
- Brush::getSingleton().setColor(prevColor);
+ brush->setColor(prevColor);
}
void MenuLabel::onMouseButtonUp(const EventArgs& args)
@@ -235,17 +243,6 @@
redraw();
}
- void MenuLabel::setPadding(Padding p, float distance)
- {
- if(p == PADDING_COUNT)
- throw Exception(Exception::ERR_INVALIDPARAMS,"PADDING_COUNT is not a valid parameter!","MenuLabel::setPadding");
-
- mDesc->padding[p] = distance;
- mText->setAllottedWidth(mWidgetDesc->dimensions.size.width - (mDesc->padding[PADDING_LEFT] + mDesc->padding[PADDING_RIGHT]));
-
- redraw();
- }
-
void MenuLabel::setText(Ogre::UTFString s, Ogre::FontPtr fp, const Ogre::ColourValue& cv)
{
mText->setText(s,fp,cv);
@@ -262,4 +259,11 @@
redraw();
}
+
+ void MenuLabel::setVerticalTextAlignment(VerticalTextAlignment a)
+ {
+ mDesc->verticalTextAlignment = a;
+
+ redraw();
+ }
}
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -1,7 +1,6 @@
#ifndef QUICKGUIMENULABEL_H
#define QUICKGUIMENULABEL_H
-#include "QuickGUIPadding.h"
#include "QuickGUIMenuItem.h"
#include "QuickGUIText.h"
@@ -13,7 +12,8 @@
public:
MenuLabelDesc();
- float padding[PADDING_COUNT];
+ /// Vertical alignment of text within this widget's client area.
+ VerticalTextAlignment verticalTextAlignment;
/// Describes the Text used in this Label
TextDesc textDesc;
@@ -61,14 +61,14 @@
*/
virtual Ogre::String getClass();
/**
- * Gets the distance between a Label border and the text.
- */
- float getPadding(Padding p);
- /**
* Returns the number of pixels placed between each line of text, if there
* are multiple lines of text.
*/
float getVerticalLineSpacing();
+ /**
+ * Returns the vertical alignment of text within this widget's client area.
+ */
+ VerticalTextAlignment getVerticalTextAlignment();
/**
* Sets all characters of the text to the specified color.
@@ -115,10 +115,6 @@
*/
void setFont(const Ogre::String& fontName, Ogre::UTFString s, bool allOccurrences);
/**
- * Sets the distance between a Label border and the text.
- */
- void setPadding(Padding p, float distance);
- /**
* Sets the text for this object.
*/
void setText(Ogre::UTFString s, Ogre::FontPtr fp, const Ogre::ColourValue& cv);
@@ -127,6 +123,10 @@
* are multiple lines of text.
*/
void setVerticalLineSpacing(float distance);
+ /**
+ * Sets the Vertical alignment of Text as displayed within the Label area.
+ */
+ void setVerticalTextAlignment(VerticalTextAlignment a);
protected:
MenuLabel(const Ogre::String& name);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -25,21 +25,14 @@
layout = PROGRESSBAR_LAYOUT_HORIZONTAL;
clippingEdge = PROGRESSBAR_CLIP_LEFT_BOTTOM;
progress = 100;
-
- for(int i = 0; i < PADDING_COUNT; ++i)
- {
- padding[i] = 5.0;
- }
+ verticalTextAlignment = TEXT_ALIGNMENT_VERTICAL_CENTER;
}
void ProgressBarDesc::serialize(SerialBase* b)
{
WidgetDesc::serialize(b);
- for(int i = 0; i < PADDING_COUNT; ++i)
- {
- b->IO(StringConverter::toString(static_cast<Padding>(i)),&padding[i]);
- }
+ b->IO("VerticalTextAlignment",&verticalTextAlignment);
textDesc.serialize(b);
@@ -74,14 +67,11 @@
// modify it directly, which is used for serialization.
mDesc->textDesc = pd->textDesc;
- mDesc->textDesc.allottedWidth = pd->dimensions.size.width - (pd->padding[PADDING_LEFT] + pd->padding[PADDING_RIGHT]);
+ SkinElement* se = mSkinType->getSkinElement(mSkinElementName);
+ mDesc->textDesc.allottedWidth = pd->dimensions.size.width - (se->getBorderThickness(BORDER_LEFT) + se->getBorderThickness(BORDER_RIGHT));
+ mDesc->verticalTextAlignment = pd->verticalTextAlignment;
mText = new Text(mDesc->textDesc);
- setPadding(PADDING_BOTTOM,pd->padding[PADDING_BOTTOM]);
- setPadding(PADDING_LEFT,pd->padding[PADDING_LEFT]);
- setPadding(PADDING_RIGHT,pd->padding[PADDING_RIGHT]);
- setPadding(PADDING_TOP,pd->padding[PADDING_TOP]);
-
mCurrentFontName = Text::getFirstAvailableFont()->getName();
mCurrentColourValue = Ogre::ColourValue::White;
@@ -166,17 +156,14 @@
return mDesc->fillDirection;
}
- ProgressBarLayout ProgressBar::setLayout()
+ HorizontalTextAlignment ProgressBar::getHorizontalTextAlignment()
{
- return mDesc->layout;
+ return mText->getHorizontalTextAlignment();
}
- float ProgressBar::getPadding(Padding p)
+ ProgressBarLayout ProgressBar::setLayout()
{
- if(p == PADDING_COUNT)
- throw Exception(Exception::ERR_INVALIDPARAMS,"PADDING_COUNT is not a valid parameter!","ProgressBar::getPadding");
-
- return mDesc->padding[p];
+ return mDesc->layout;
}
float ProgressBar::getProgress()
@@ -194,6 +181,11 @@
return mText->getVerticalLineSpacing();
}
+ VerticalTextAlignment ProgressBar::getVerticalTextAlignment()
+ {
+ return mDesc->verticalTextAlignment;
+ }
+
void ProgressBar::onDraw()
{
Brush* brush = Brush::getSingletonPtr();
@@ -213,26 +205,45 @@
barRect.translate(mTexturePosition);
brush->drawRectangle(barRect,UVRect(0,0,1,1));
- /*
Ogre::ColourValue prevColor = brush->getColour();
Rect prevClipRegion = brush->getClipRegion();
- Rect clipRegion;
- clipRegion.size =
- Size(
- mDesc->dimensions.size.width - mDesc->padding[PADDING_RIGHT],
- mDesc->dimensions.size.height - mDesc->padding[PADDING_BOTTOM]);
- clipRegion.position = mTexturePosition;
- clipRegion.translate(Point(mDesc->padding[PADDING_LEFT],mDesc->padding[PADDING_TOP]));
+ if(mText->empty())
+ return;
+ // Center Text Vertically
+
+ float textHeight = mText->getTextHeight();
+ float yPos = 0;
+
+ switch(mDesc->verticalTextAlignment)
+ {
+ case TEXT_ALIGNMENT_VERTICAL_BOTTOM:
+ yPos = mDesc->dimensions.size.height - st->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_BOTTOM) - textHeight;
+ break;
+ case TEXT_ALIGNMENT_VERTICAL_CENTER:
+ yPos = (mDesc->dimensions.size.height / 2.0) - (textHeight / 2.0);
+ break;
+ case TEXT_ALIGNMENT_VERTICAL_TOP:
+ yPos = st->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_TOP);
+ break;
+ }
+
+ // Clip to client dimensions
+ Rect clipRegion(mClientDimensions);
+ clipRegion.translate(mTexturePosition);
+
brush->setClipRegion(prevClipRegion.getIntersection(clipRegion));
+ // Adjust Rect to Text drawing region
+ clipRegion = mClientDimensions;
+ clipRegion.position.y = yPos;
+ clipRegion.translate(mTexturePosition);
+
mText->draw(clipRegion.position);
brush->setClipRegion(prevClipRegion);
-
- Brush::getSingleton().setColor(prevColor);
- */
+ brush->setColor(prevColor);
}
void ProgressBar::setClippingEdge(ProgressBarClippingEdge e)
@@ -323,22 +334,18 @@
redraw();
}
- void ProgressBar::setLayout(ProgressBarLayout l)
+ void ProgressBar::setHorizontalTextAlignment(HorizontalTextAlignment a)
{
- mDesc->layout = l;
+ mText->setHorizontalTextAlignment(a);
- setProgress(mDesc->progress);
+ redraw();
}
- void ProgressBar::setPadding(Padding p, float distance)
+ void ProgressBar::setLayout(ProgressBarLayout l)
{
- if(p == PADDING_COUNT)
- throw Exception(Exception::ERR_INVALIDPARAMS,"PADDING_COUNT is not a valid parameter!","ProgressBar::setPadding");
+ mDesc->layout = l;
- mDesc->padding[p] = distance;
- mText->setAllottedWidth(mWidgetDesc->dimensions.size.width - (mDesc->padding[PADDING_LEFT] + mDesc->padding[PADDING_RIGHT]));
-
- redraw();
+ setProgress(mDesc->progress);
}
void ProgressBar::setProgress(float percent)
@@ -542,4 +549,11 @@
redraw();
}
+
+ void ProgressBar::setVerticalTextAlignment(VerticalTextAlignment a)
+ {
+ mDesc->verticalTextAlignment = a;
+
+ redraw();
+ }
}
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -23,7 +23,8 @@
/// Percentage of progress of the bar. (0-100)
float progress;
- float padding[PADDING_COUNT];
+ /// Vertical alignment of text within this widget's client area.
+ VerticalTextAlignment verticalTextAlignment;
/// Describes the Text used in this Label
TextDesc textDesc;
@@ -107,14 +108,14 @@
*/
ProgressBarFillDirection getFillDirection();
/**
+ * Returns the horizontal alignment of text within this widget's client area.
+ */
+ HorizontalTextAlignment getHorizontalTextAlignment();
+ /**
* Gets the axis of progress growth, either horizontal or vertical.
*/
ProgressBarLayout setLayout();
/**
- * Gets the distance between a Label border and the text.
- */
- float getPadding(Padding p);
- /**
* Gets the progress of the ProgressBar, that is a visual indicator of percent complete.
*/
float getProgress();
@@ -127,6 +128,10 @@
* are multiple lines of text.
*/
float getVerticalLineSpacing();
+ /**
+ * Returns the vertical alignment of text within this widget's client area.
+ */
+ VerticalTextAlignment getVerticalTextAlignment();
/**
* Sets the side of the bar texture that is clipped to simulate progress.
@@ -181,14 +186,14 @@
*/
void setFont(const Ogre::String& fontName, Ogre::UTFString s, bool allOccurrences);
/**
+ * Sets the Horizontal alignment of Text as displayed within the Label area.
+ */
+ void setHorizontalTextAlignment(HorizontalTextAlignment a);
+ /**
* Sets the axis of progress growth, either horizontal or vertical.
*/
void setLayout(ProgressBarLayout l);
/**
- * Sets the distance between a Label border and the text.
- */
- void setPadding(Padding p, float distance);
- /**
* Sets the progress of the ProgressBar, that is a visual indicator of percent complete.
* NOTE: values above and below 0 will be capped to 0/100%.
*/
@@ -216,6 +221,10 @@
* are multiple lines of text.
*/
void setVerticalLineSpacing(float distance);
+ /**
+ * Sets the Vertical alignment of Text as displayed within the Label area.
+ */
+ void setVerticalTextAlignment(VerticalTextAlignment a);
protected:
ProgressBar(const Ogre::String& name);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialBase.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialBase.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialBase.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -54,9 +54,10 @@
virtual void IO(const Ogre::String& propertyName, VScrollBarButtonLayout* member) = 0;
virtual void IO(const Ogre::String& propertyName, HScrollBarButtonLayout* member) = 0;
virtual void IO(const Ogre::String& propertyName, Size* member) = 0;
- virtual void IO(const Ogre::String& propertyName, TextAlignment* member) = 0;
+ virtual void IO(const Ogre::String& propertyName, HorizontalTextAlignment* member) = 0;
virtual void IO(const Ogre::String& propertyName, HorizontalAnchor* member) = 0;
virtual void IO(const Ogre::String& propertyName, VerticalAnchor* member) = 0;
+ virtual void IO(const Ogre::String& propertyName, VerticalTextAlignment* member) = 0;
protected:
ScriptDefinition* mCurrentDefinition;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -302,7 +302,7 @@
}
}
- void SerialReader::IO(const Ogre::String& propertyName, TextAlignment* member)
+ void SerialReader::IO(const Ogre::String& propertyName, HorizontalTextAlignment* member)
{
if(mCurrentDefinition == NULL)
throw Exception(Exception::ERR_SERIALIZATION,"SerialReader has not been correctly setup to retrieve properties. (Missing call to SerialReader::begin?)","SerialReader::IO");
@@ -310,7 +310,7 @@
DefinitionProperty* prop = mCurrentDefinition->getProperty(propertyName);
Ogre::StringVector sv = prop->getValues();
- *member = StringConverter::parseTextAlignment(sv[0]);
+ *member = StringConverter::parseHorizontalTextAlignment(sv[0]);
}
void SerialReader::IO(const Ogre::String& propertyName, HorizontalAnchor* member)
@@ -335,6 +335,17 @@
*member = StringConverter::parseVerticalAnchor(sv[0]);
}
+ void SerialReader::IO(const Ogre::String& propertyName, VerticalTextAlignment* member)
+ {
+ if(mCurrentDefinition == NULL)
+ throw Exception(Exception::ERR_SERIALIZATION,"SerialReader has not been correctly setup to retrieve properties. (Missing call to SerialReader::begin?)","SerialReader::IO");
+
+ DefinitionProperty* prop = mCurrentDefinition->getProperty(propertyName);
+ Ogre::StringVector sv = prop->getValues();
+
+ *member = StringConverter::parseVerticalTextAlignment(sv[0]);
+ }
+
bool SerialReader::isSerialWriter()
{
return false;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -42,9 +42,10 @@
virtual void IO(const Ogre::String& propertyName, VScrollBarButtonLayout* member);
virtual void IO(const Ogre::String& propertyName, HScrollBarButtonLayout* member);
virtual void IO(const Ogre::String& propertyName, Size* member);
- virtual void IO(const Ogre::String& propertyName, TextAlignment* member);
+ virtual void IO(const Ogre::String& propertyName, HorizontalTextAlignment* member);
virtual void IO(const Ogre::String& propertyName, HorizontalAnchor* member);
virtual void IO(const Ogre::String& propertyName, VerticalAnchor* member);
+ virtual void IO(const Ogre::String& propertyName, VerticalTextAlignment* member);
bool isSerialWriter();
bool isSerialReader();
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -291,7 +291,7 @@
mCurrentDefinition->mProperties[propertyName] = newProp;
}
- void SerialWriter::IO(const Ogre::String& propertyName, TextAlignment* member)
+ void SerialWriter::IO(const Ogre::String& propertyName, HorizontalTextAlignment* member)
{
if(mCurrentDefinition == NULL)
throw Exception(Exception::ERR_SERIALIZATION,"SerialWriter not setup to write! Did you miss a call to SerialWriter::begin()?","SerialWriter::IO");
@@ -333,6 +333,20 @@
mCurrentDefinition->mProperties[propertyName] = newProp;
}
+ void SerialWriter::IO(const Ogre::String& propertyName, VerticalTextAlignment* member)
+ {
+ if(mCurrentDefinition == NULL)
+ throw Exception(Exception::ERR_SERIALIZATION,"SerialWriter not setup to write! Did you miss a call to SerialWriter::begin()?","SerialWriter::IO");
+
+ DefinitionProperty* newProp = new DefinitionProperty(propertyName);
+ newProp->mValues.push_back(StringConverter::toString(*member));
+
+ if(mCurrentDefinition->mProperties.find(propertyName) != mCurrentDefinition->mProperties.end())
+ throw Exception(Exception::ERR_SERIALIZATION,"ScriptDefinition already contains the property \"" + propertyName + "\"!","SerialWriter::IO");
+ else
+ mCurrentDefinition->mProperties[propertyName] = newProp;
+ }
+
bool SerialWriter::isSerialWriter()
{
return true;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -50,9 +50,10 @@
virtual void IO(const Ogre::String& propertyName, VScrollBarButtonLayout* member);
virtual void IO(const Ogre::String& propertyName, HScrollBarButtonLayout* member);
virtual void IO(const Ogre::String& propertyName, Size* member);
- virtual void IO(const Ogre::String& propertyName, TextAlignment* member);
+ virtual void IO(const Ogre::String& propertyName, HorizontalTextAlignment* member);
virtual void IO(const Ogre::String& propertyName, HorizontalAnchor* member);
virtual void IO(const Ogre::String& propertyName, VerticalAnchor* member);
+ virtual void IO(const Ogre::String& propertyName, VerticalTextAlignment* member);
bool isSerialWriter();
bool isSerialReader();
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -29,16 +29,15 @@
}
}
- Ogre::String StringConverter::toString(Padding p)
+ Ogre::String StringConverter::toString(HorizontalTextAlignment a)
{
- switch(p)
+ switch(a)
{
- case PADDING_LEFT: return "PADDING_LEFT";
- case PADDING_RIGHT: return "PADDING_RIGHT";
- case PADDING_TOP: return "PADDING_TOP";
- case PADDING_BOTTOM: return "PADDING_BOTTOM";
+ case TEXT_ALIGNMENT_HORIZONTAL_LEFT: return "TEXT_ALIGNMENT_HORIZONTAL_LEFT";
+ case TEXT_ALIGNMENT_HORIZONTAL_RIGHT: return "TEXT_ALIGNMENT_HORIZONTAL_RIGHT";
+ case TEXT_ALIGNMENT_HORIZONTAL_CENTER: return "TEXT_ALIGNMENT_HORIZONTAL_CENTER";
default:
- throw Exception(Exception::ERR_SERIALIZATION,"Padding type does not have a string equivalent! Check if update is needed!","StringConverter::toString");
+ throw Exception(Exception::ERR_SERIALIZATION,"HorizontalTextAlignment type does not have a string equivalent! Check if update is needed!","StringConverter::toString");
}
}
@@ -107,18 +106,6 @@
}
}
- Ogre::String StringConverter::toString(TextAlignment a)
- {
- switch(a)
- {
- case TEXT_ALIGNMENT_LEFT: return "TEXT_ALIGNMENT_LEFT";
- case TEXT_ALIGNMENT_RIGHT: return "TEXT_ALIGNMENT_RIGHT";
- case TEXT_ALIGNMENT_CENTER: return "TEXT_ALIGNMENT_CENTER";
- default:
- throw Exception(Exception::ERR_SERIALIZATION,"TextAlignment type does not have a string equivalent! Check if update is needed!","StringConverter::toString");
- }
- }
-
Ogre::String StringConverter::toString(ToolBarItemLayout l)
{
switch(l)
@@ -145,6 +132,18 @@
}
}
+ Ogre::String StringConverter::toString(VerticalTextAlignment a)
+ {
+ switch(a)
+ {
+ case TEXT_ALIGNMENT_VERTICAL_BOTTOM: return "TEXT_ALIGNMENT_VERTICAL_BOTTOM";
+ case TEXT_ALIGNMENT_VERTICAL_CENTER: return "TEXT_ALIGNMENT_VERTICAL_CENTER";
+ case TEXT_ALIGNMENT_VERTICAL_TOP: return "TEXT_ALIGNMENT_VERTICAL_TOP";
+ default:
+ throw Exception(Exception::ERR_SERIALIZATION,"VerticalTextAlignment type does not have a string equivalent! Check if update is needed!","StringConverter::toString");
+ }
+ }
+
Ogre::String StringConverter::toString(WidgetEvent e)
{
switch(e)
@@ -209,14 +208,13 @@
throw Exception(Exception::ERR_SERIALIZATION,"\"" + s + "\" is not a recognized HorizontalAnchor type! (Possible need to update?)","StringConverter::parseHorizontalAnchor");
}
- Padding StringConverter::parsePadding(const Ogre::String& s)
+ HorizontalTextAlignment StringConverter::parseHorizontalTextAlignment(const Ogre::String& s)
{
- if(s == "PADDING_LEFT") return PADDING_LEFT;
- else if(s == "PADDING_RIGHT") return PADDING_RIGHT;
- else if(s == "PADDING_TOP") return PADDING_TOP;
- else if(s == "PADDING_BOTTOM") return PADDING_BOTTOM;
+ if(s == "TEXT_ALIGNMENT_HORIZONTAL_LEFT") return TEXT_ALIGNMENT_HORIZONTAL_LEFT;
+ else if(s == "TEXT_ALIGNMENT_HORIZONTAL_RIGHT") return TEXT_ALIGNMENT_HORIZONTAL_RIGHT;
+ else if(s == "TEXT_ALIGNMENT_HORIZONTAL_CENTER") return TEXT_ALIGNMENT_HORIZONTAL_CENTER;
else
- throw Exception(Exception::ERR_SERIALIZATION,"\"" + s + "\" is not a recognized Padding type! (Possible need to update?)","StringConverter::parsePadding");
+ throw Exception(Exception::ERR_SERIALIZATION,"\"" + s + "\" is not a recognized HorizontalTextAlignment type! (Possible need to update?)","StringConverter::parseHorizontalTextAlignment");
}
VScrollBarButtonLayout StringConverter::parseVScrollBarButtonLayout(const Ogre::String& s)
@@ -269,15 +267,6 @@
throw Exception(Exception::ERR_SERIALIZATION,"\"" + s + "\" is not a recognized ProgressBarClippingEdge type! (Possible need to update?)","StringConverter::parseProgressBarClippingEdge");
}
- TextAlignment StringConverter::parseTextAlignment(const Ogre::String& s)
- {
- if(s == "TEXT_ALIGNMENT_LEFT") return TEXT_ALIGNMENT_LEFT;
- else if(s == "TEXT_ALIGNMENT_RIGHT") return TEXT_ALIGNMENT_RIGHT;
- else if(s == "TEXT_ALIGNMENT_CENTER") return TEXT_ALIGNMENT_CENTER;
- else
- throw Exception(Exception::ERR_SERIALIZATION,"\"" + s + "\" is not a recognized TextAlignment type! (Possible need to update?)","StringConverter::parseTextAlignment");
- }
-
ToolBarItemLayout StringConverter::parseToolBarItemLayout(const Ogre::String& s)
{
if(s == "TOOLBAR_ITEM_LAYOUT_NEGATIVE_TO_POSITIVE") return TOOLBAR_ITEM_LAYOUT_NEGATIVE_TO_POSITIVE;
@@ -298,6 +287,15 @@
throw Exception(Exception::ERR_SERIALIZATION,"\"" + s + "\" is not a recognized VerticalAnchor type! (Possible need to update?)","StringConverter::parseVerticalAnchor");
}
+ VerticalTextAlignment StringConverter::parseVerticalTextAlignment(const Ogre::String& s)
+ {
+ if(s == "TEXT_ALIGNMENT_VERTICAL_BOTTOM") return TEXT_ALIGNMENT_VERTICAL_BOTTOM;
+ else if(s == "TEXT_ALIGNMENT_VERTICAL_CENTER") return TEXT_ALIGNMENT_VERTICAL_CENTER;
+ else if(s == "TEXT_ALIGNMENT_VERTICAL_TOP") return TEXT_ALIGNMENT_VERTICAL_TOP;
+ else
+ throw Exception(Exception::ERR_SERIALIZATION,"\"" + s + "\" is not a recognized VerticalTextAlignment type! (Possible need to update?)","StringConverter::parseVerticalTextAlignment");
+ }
+
WidgetEvent StringConverter::parseWidgetEvent(const Ogre::String& s)
{
if(s == "WIDGET_EVENT_ENABLED_CHANGED") return WIDGET_EVENT_ENABLED_CHANGED;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.h 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.h 2008-11-14 07:08:16 UTC (rev 790)
@@ -5,7 +5,6 @@
#include "QuickGUIBrushEnums.h"
#include "QuickGUIException.h"
#include "QuickGUIExportDLL.h"
-#include "QuickGUIPadding.h"
#include "QuickGUIProgressBarEnums.h"
#include "QuickGUIEventTypes.h"
#include "QuickGUIScrollBarButtonLayouts.h"
@@ -22,29 +21,29 @@
public:
static Ogre::String toString(BrushFilterMode m);
static Ogre::String toString(HorizontalAnchor a);
- static Ogre::String toString(Padding p);
- static Ogre::String toString(VScrollBarButtonLayout l);
+ static Ogre::String toString(HorizontalTextAlignment a);
static Ogre::String toString(HScrollBarButtonLayout l);
static Ogre::String toString(ProgressBarFillDirection d);
static Ogre::String toString(ProgressBarLayout l);
static Ogre::String toString(ProgressBarClippingEdge e);
- static Ogre::String toString(TextAlignment a);
static Ogre::String toString(ToolBarItemLayout l);
static Ogre::String toString(VerticalAnchor a);
+ static Ogre::String toString(VerticalTextAlignment a);
+ static Ogre::String toString(VScrollBarButtonLayout l);
static Ogre::String toString(WidgetEvent e);
static Ogre::String toString(WindowEvent e);
static BrushFilterMode parseBrushFilterMode(const Ogre::String& s);
static HorizontalAnchor parseHorizontalAnchor(const Ogre::String& s);
- static Padding parsePadding(const Ogre::String& s);
- static VScrollBarButtonLayout parseVScrollBarButtonLayout(const Ogre::String& s);
+ static HorizontalTextAlignment parseHorizontalTextAlignment(const Ogre::String& s);
static HScrollBarButtonLayout parseHScrollBarButtonLayout(const Ogre::String& s);
static ProgressBarFillDirection parseProgressBarFillDirection(const Ogre::String& s);
static ProgressBarLayout parseProgressBarLayout(const Ogre::String& s);
static ProgressBarClippingEdge parseProgressBarClippingEdge(const Ogre::String& s);
- static TextAlignment parseTextAlignment(const Ogre::String& s);
static ToolBarItemLayout parseToolBarItemLayout(const Ogre::String& s);
static VerticalAnchor parseVerticalAnchor(const Ogre::String& s);
+ static VerticalTextAlignment parseVerticalTextAlignment(const Ogre::String& s);
+ static VScrollBarButtonLayout parseVScrollBarButtonLayout(const Ogre::String& s);
static WidgetEvent parseWidgetEvent(const Ogre::String& s);
static WindowEvent parseWindowEvent(const Ogre::String& s);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUITab.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUITab.cpp 2008-11-10 17:16:49 UTC (rev 789)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUITab.cpp 2008-11-14 07:08:16 UTC (rev 790)
@@ -44,9 +44,9 @@
if(mDesc->textDesc.segments.empty())
mDesc->dimensions.size.width = mDesc->frontWidth + 50;
else
- mDesc->dimensions.size.width = mDesc->frontWidth + mDesc->textDesc.getTextWidth() + mDesc->padding[PADDING_RIGHT];
+ mDesc->dimensions.size.width = mDesc->frontWidth + mDesc->textDesc.getTextWidth() + mSkinType->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_RIGHT);
- mText->setAllottedWidth(mDesc->textDesc.getTextWidth() + mDesc->padding[PADDING_RIGHT]);
+ mText->setAllottedWidth(mDesc->textDesc.getTextWidth() + mSkinType->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_RIGHT));
}
void Tab::_initialize(WidgetDesc* d)
@@ -64,11 +64,6 @@
else
mDesc->frontWidth = td->frontWidth;
- mDesc->padding[PADDING_LEFT] = td->padding[PADDING_LEFT];
- mDesc->padding[PADDING_RIGHT] = td->padding[PADDING_RIGHT];
- mDesc->padding[PADDING_BOTTOM] = td->padding[PADDING_BOTTOM];
- mDesc->padding[PADDING_TOP] = td->padding[PADDING_TOP];
-
// Make a copy of the Text Desc. The Text object will
// modify it directly, which is used for serialization.
mDesc->textDesc = td->textDesc;
@@ -76,14 +71,15 @@
if(mDesc->textDesc.segments.empty())
mDesc->dimensions.size.width = mDesc->frontWidth + 50;
else
- mDesc->dimensions.size.width = mDesc->frontWidth + mDesc->padding[PADDING_LEFT] + mDesc->textDesc.getTextWidth() + mDesc->padding[PADDING_RIGHT];
+ mDesc->dimensions.size.width = mDesc->frontWidth + mSkinType->getSkinElement(MAIN)->getBorderThickness(BORDER_LEFT) + mDesc->textDesc.getTextWidth() + mSkinType->getSkinElement(MAIN)->getBorderThickness(BORDER_RIGHT);
if(mDesc->textDesc.segments.empty())
mDesc->dimensions.size.height = 20;
else
- mDesc->dimensions.size.height = mDesc->padding[PADDING_TOP] + mDesc->textDesc.getTextHeight() + mDesc->padding[PADDING_BOTTOM];
+ mDesc->dimensions.size.height = mSkinType->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_TOP) + mDesc->textDesc.getTextHeight() + mSkinType->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_BOTTOM);
- mDesc->textDesc.allottedWidth = mDesc->textDesc.getTextWidth() + mDesc->padding[PADDING_RIGHT];
+ mDesc->verticalTextAlignment = td->verticalTextAlignment;
+ mDesc->textDesc.allottedWidth = mDesc->textDesc.getTextWidth() + mSkinType->getSkinElement(mSkinElementName)->getBorderThickness(BORDER_RIGHT);
mText = new Text(mDesc->textDesc);
mCurrentFontName = Text::get...
[truncated message content] |
|
From: <and...@us...> - 2008-11-10 17:16:52
|
Revision: 789
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=789&view=rev
Author: andy_miller
Date: 2008-11-10 17:16:49 +0000 (Mon, 10 Nov 2008)
Log Message:
-----------
Updates to Ogrenewt deoms fro the 1.6.0 release
Modified Paths:
--------------
trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py
trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py
trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py
trunk/python-ogre/demos/OgreNewt/MyCustomBallSocket.py
trunk/python-ogre/demos/OgreNewt/SimpleVehicle.py
trunk/python-ogre/demos/OgreNewt/ragdoll.py
Modified: trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py 2008-11-08 01:46:46 UTC (rev 788)
+++ trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py 2008-11-10 17:16:49 UTC (rev 789)
@@ -78,7 +78,6 @@
light.setType( Ogre.Light.LT_POINT )
light.setPosition( Ogre.Vector3(0.0, 100.0, 100.0) )
-
def makeSimpleBox( self, size, pos, orient ):
## base mass on the size of the object.
mass = size.x * size.y * size.z * 2.5
Modified: trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py 2008-11-08 01:46:46 UTC (rev 788)
+++ trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py 2008-11-10 17:16:49 UTC (rev 789)
@@ -81,13 +81,13 @@
del col
body.attachToNode( floornode )
- body.setPositionOrientation( Ogre.Vector3(0.0,-20.0,0.0), Ogre.Quaternion.IDENTITY )
+ body.setPositionOrientation( Ogre.Vector3(0.0,-20.0,0.0), Ogre.Quaternion().IDENTITY )
self.bodies.append(body)
## make a simple rope.
size = Ogre.Vector3(3,1.5,1.5)
pos = Ogre.Vector3(0,3,0)
- orient = Ogre.Quaternion.IDENTITY
+ orient = Ogre.Quaternion().IDENTITY
parent=None
@@ -98,11 +98,11 @@
## make the joint right between the bodies...
if (parent): # OgreNewt.BallAndSocket
joint = MyCustomBallSocket(child, parent,
- pos-Ogre.Vector3(size.x/2,0,0), Ogre.Vector3.UNIT_X )
+ pos-Ogre.Vector3(size.x/2,0,0), Ogre.Vector3().UNIT_X )
else:
## no parent, this is the first joint, so just pass None as the parent, to stick it to the "world"
joint = MyCustomBallSocket(child, None,
- pos-Ogre.Vector3(size.x/2,0,0), Ogre.Vector3.UNIT_X )
+ pos-Ogre.Vector3(size.x/2,0,0), Ogre.Vector3().UNIT_X )
## rememeber to make a copy
self.bodies.append ( joint )
Modified: trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py 2008-11-08 01:46:46 UTC (rev 788)
+++ trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py 2008-11-10 17:16:49 UTC (rev 789)
@@ -58,7 +58,7 @@
self.bodies.append( bod ) ## need to keep him so collision works
bod.attachToNode( floornode )
- bod.setPositionOrientation( Ogre.Vector3(0.0,-4.0,0.0), Ogre.Quaternion.IDENTITY )
+ bod.setPositionOrientation( Ogre.Vector3(0.0,-4.0,0.0), Ogre.Quaternion().IDENTITY )
self.bodies.append( bod )
## position camera
@@ -214,7 +214,7 @@
self.Ragdoll = None
self.RagNode.setPosition( Ogre.Vector3(0.0, -4.0, 0.0) )
- self.RagNode.setOrientation( Ogre.Quaternion.IDENTITY )
+ self.RagNode.setOrientation( Ogre.Quaternion().IDENTITY )
self.RagEntity.getAnimationState( "LOOP" ).setEnabled( True )
self.RagEntity.getAnimationState( "LOOP" ).setTimePosition( 0.0 )
Modified: trunk/python-ogre/demos/OgreNewt/MyCustomBallSocket.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/MyCustomBallSocket.py 2008-11-08 01:46:46 UTC (rev 788)
+++ trunk/python-ogre/demos/OgreNewt/MyCustomBallSocket.py 2008-11-10 17:16:49 UTC (rev 789)
@@ -18,6 +18,6 @@
globalOrient1, globalPos1 = OgreNewt.CustomJoint.localToGlobal( self, self.LocalOrient1, self.LocalPos1, 1 )
## to make the joint, we simply apply a constraint to connect 2 points on the bodies along all 3 major axis
- self.addLinearRow( globalPos0, globalPos1, globalOrient0 * Ogre.Vector3.UNIT_X )
- self.addLinearRow( globalPos0, globalPos1, globalOrient0 * Ogre.Vector3.UNIT_Y )
- self.addLinearRow( globalPos0, globalPos1, globalOrient0 * Ogre.Vector3.UNIT_Z )
+ self.addLinearRow( globalPos0, globalPos1, globalOrient0 * Ogre.Vector3().UNIT_X )
+ self.addLinearRow( globalPos0, globalPos1, globalOrient0 * Ogre.Vector3().UNIT_Y )
+ self.addLinearRow( globalPos0, globalPos1, globalOrient0 * Ogre.Vector3().UNIT_Z )
Modified: trunk/python-ogre/demos/OgreNewt/SimpleVehicle.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/SimpleVehicle.py 2008-11-08 01:46:46 UTC (rev 788)
+++ trunk/python-ogre/demos/OgreNewt/SimpleVehicle.py 2008-11-10 17:16:49 UTC (rev 789)
@@ -21,6 +21,7 @@
## function "setup" to finish building the vehicle.
## you pass this function the body to be used as the main chassis, and the up direction of the world (for suspension purposes).
self.init( self.chassis, Ogre.Vector3(0,1,0) )
+
## the above function calls our "setup" function, which takes care of the rest of the vehicle setup.
@@ -31,13 +32,13 @@
## calculate the inertia based on box formula and mass
inertia = OgreNewt.CalcBoxSolid( mass, size )
-
+
box1 = self.sceneManager.createEntity( "Entity"+str(EntityCount), "box.mesh" )
EntityCount += 1
box1node = self.sceneManager.getRootSceneNode().createChildSceneNode()
box1node.attachObject( box1 )
box1node.setScale( size )
-
+
col = OgreNewt.Box( self.World, size )
bod = OgreNewt.Body( self.World, col )
del col
@@ -47,10 +48,9 @@
bod.setStandardForceCallback()
box1.setMaterialName( "Examples/BumpyMetal" )
- box1.setNormaliseNormals(True)
-
+
bod.setPositionOrientation( pos, orient )
-
+
return bod
@@ -151,6 +151,7 @@
self.SteeringTire = steer;
def __del__ ( self ):
+# print "IN DELETE of Tire"
## destroy entity, and scene node.
m_node= self.getOgreNode()
print m_node
Modified: trunk/python-ogre/demos/OgreNewt/ragdoll.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/ragdoll.py 2008-11-08 01:46:46 UTC (rev 788)
+++ trunk/python-ogre/demos/OgreNewt/ragdoll.py 2008-11-10 17:16:49 UTC (rev 789)
@@ -25,15 +25,15 @@
self.OgreBone = ogreBone
## in the case of the cylindrical primitives, they need to be rotated to align the main axis with the direction vector.
- orient = Ogre.Quaternion.IDENTITY
- pos = Ogre.Vector3.ZERO
+ orient = Ogre.Quaternion().IDENTITY
+ pos = Ogre.Vector3().ZERO
rot = Ogre.Matrix3()
- if (dir1 == Ogre.Vector3.UNIT_Y):
+ if (dir1 == Ogre.Vector3().UNIT_Y):
rot.FromEulerAnglesXYZ(Ogre.Degree(0), Ogre.Degree(0), Ogre.Degree(90))
orient.FromRotationMatrix( rot )
- if (dir1 == Ogre.Vector3.UNIT_Z):
+ if (dir1 == Ogre.Vector3().UNIT_Z):
rot.FromEulerAnglesXYZ(Ogre.Degree(0), Ogre.Degree(90), Ogre.Degree(0))
orient.FromRotationMatrix( rot )
@@ -77,7 +77,7 @@
boneIndex = self.OgreBone.getHandle()
invMatrix = Ogre.Matrix4 ()
invMatrix.makeInverseTransform( -self.OgreBone._getBindingPoseInversePosition(),
- Ogre.Vector3.UNIT_SCALE / self.OgreBone._getBindingPoseInverseScale(),
+ Ogre.Vector3().UNIT_SCALE / self.OgreBone._getBindingPoseInverseScale(),
self.OgreBone._getBindingPoseInverseOrientation().Inverse())
num_sub = mesh.getNumSubMeshes()
@@ -147,7 +147,7 @@
## To Check - might need to keep vertexVector around - ie as a self.vertexVector
## Note the helper function -- the Constructor on ConvexHull needs a pointer to a list of Vector3's
col = OgreNewt.createConvexHull( world, vertexVector, len(vertexVector) )
- #.Ogre.Quaternion.IDENTITY, Ogre.Vector3.ZERO )
+ #.Ogre.Quaternion().IDENTITY, Ogre.Vector3().ZERO )
return col
## newton body.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-08 01:46:56
|
Revision: 788
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=788&view=rev
Author: andy_miller
Date: 2008-11-08 01:46:46 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
Further updated for Ogre 1.6 release
Modified Paths:
--------------
trunk/python-ogre/demos/ogre/Demo_Compositor.py
trunk/python-ogre/demos/ogre/tests/Test_ManualMeshes.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/patch/ogre_1.6.0.patch
Modified: trunk/python-ogre/demos/ogre/Demo_Compositor.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_Compositor.py 2008-11-03 07:41:04 UTC (rev 787)
+++ trunk/python-ogre/demos/ogre/Demo_Compositor.py 2008-11-08 01:46:46 UTC (rev 788)
@@ -1,3 +1,4 @@
+# NO_UNITTEST
# This code is in the Public Domain
# -----------------------------------------------------------------------------
# This source file is part of Python-Ogre
Modified: trunk/python-ogre/demos/ogre/tests/Test_ManualMeshes.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_ManualMeshes.py 2008-11-03 07:41:04 UTC (rev 787)
+++ trunk/python-ogre/demos/ogre/tests/Test_ManualMeshes.py 2008-11-08 01:46:46 UTC (rev 788)
@@ -21,8 +21,8 @@
assert len(Vertices_Pos)==len(Vertices_Colour)
meshMgr = ogre.MeshManager.getSingleton()
- self.mesh = mesh = meshMgr.createManual(Name, ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
- self.subMesh = subMesh = mesh.createSubMesh()
+ self.mesh = meshMgr.createManual(Name, ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
+ self.subMesh = mesh.createSubMesh()
POSITION_ELEMENT = 0
NORMAL_ELEMENT = 1
@@ -40,7 +40,7 @@
#work-around to prevent destruction
self.sharedVertexData = mesh.sharedVertexData
- declaration = mesh.sharedVertexData.vertexDeclaration
+ declaration = self.mesh.sharedVertexData.vertexDeclaration
offset = 0
offset += ogre.VertexElement.getTypeSize(ogre.VET_FLOAT3)
declaration.addElement(0, offset, ogre.VET_FLOAT3, ogre.VES_POSITION)
@@ -56,15 +56,37 @@
# # pVertex = vbuf.lock(declaration, ogre.HardwareBuffer.HBL_DISCARD)
pVertex = vbuf.lock(ogre.HardwareBuffer.HBL_DISCARD)
-
+ print pVertex
+
+ pVert= ( ctypes.c_float * (mesh.sharedVertexData.vertexCount)).from_address ( ogre.CastInt ( pVertex ) )
#loop through the position array
+ index = 0
for i in range(len(Vertices_Pos)):
vx, vy, vz = Vertices_Pos[i]
nx, ny, nz = Vertices_Norm[i]
-
+ pVert[i
pVertex.setFloat(i, POSITION_ELEMENT, vx, vy, vz)
pVertex.setFloat(i, NORMAL_ELEMENT, nx, ny, nz)
+
+ index = 0
+ for i in range ( 3 ):
+ off = i*4
+ pVert[ index ] = 0 + off
+ index +=1
+ pVert[ index ] = 3 + off
+ index +=1
+ pVert[ index ] = 1 + off
+ index +=1
+ pVert[ index ] = 0 + off
+ index +=1
+ pVert[ index ] = 2 + off
+ index +=1
+ pVert[ index ] = 3 + off
+ index +=1
+
+
+
bind = mesh.sharedVertexData.vertexBufferBinding
bind.setBinding(0,vbuf) #Set vertex buffer binding so buffer 0 is bound to positional data
@@ -194,8 +216,12 @@
# colours.append(rs.convertColourValue(ogre.ColourValue(0.0,1.0,1.0))) #6 colour
# colours.append(rs.convertColourValue(ogre.ColourValue(0.0,0.0,1.0))) #7 colour
- ManuallyDefinedMesh("cubeMesh",vert_pos,vert_norm,faces ) #,colours)
+ mm = ManuallyDefinedMesh("cubeMesh",vert_pos,vert_norm,faces ) #,colours)
+ print mm
+ mm.Print()
+
+
self.cubeEntity = sceneManager.createEntity("myCubeEntity", "cubeMesh")
self.cubeEntity.setMaterialName("Test/SimpleVertexColor")
self.nd=sceneManager.rootSceneNode.createChildSceneNode()
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-03 07:41:04 UTC (rev 787)
+++ trunk/python-ogre/environment.py 2008-11-08 01:46:46 UTC (rev 788)
@@ -575,32 +575,32 @@
if isWindows():
if _STABLE or not _STABLE: ## temp force to this version...
- version="1.6.0RC1"
+ version="1.6.0"
source = [
[ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath],
- [ wget, "http://downloads.sourceforge.net/ogre/ogre-v1-6-0RC1.zip", downloadPath],
+ [ wget, "http://downloads.sourceforge.net/ogre/ogre-v1-6-0.zip", downloadPath],
]
buildCmds = [
- [0, unzip + os.path.join(downloadPath,"ogre-v1-6-0RC1.zip"),os.getcwd() ],
+ [0, unzip + os.path.join(downloadPath,"ogre-v1-6-0.zip"),os.getcwd() ],
[0, unzip + os.path.join(downloadPath,"OgreDependencies_VC9_Eihort_20080203.zip"),
os.path.join(os.getcwd(), 'ogre') ],
- [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0RC2.patch -p0 ", os.getcwd()],
+ [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
[0,'echo Please use MSVC Express Edition to build Ogre Release.','']
]
- else:
+# else:
+#
+# version="trunk"
+# source = [
+# [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath],
+# [ svn, "https://svn.ogre3d.org/svnroot/ogre/trunk", os.path.join(os.getcwd(), 'ogre')]
+# ]
+# buildCmds = [
+# [0, unzip + os.path.join(downloadPath,"OgreDependencies_VC9_Eihort_20080203.zip"),
+# os.path.join(os.getcwd(), 'ogre') ],
+# [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.patch -p0 ", os.getcwd()],
+# [0,'echo Please use MSVC Express Edition to build Ogre Release.','']
+# ]
- version="1.7"
- source = [
- [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath],
- [ svn, "https://svn.ogre3d.org/svnroot/ogre/branches/v1-6", os.path.join(os.getcwd(), 'ogre')]
- ]
- buildCmds = [
- [0, unzip + os.path.join(downloadPath,"OgreDependencies_VC9_Eihort_20080203.zip"),
- os.path.join(os.getcwd(), 'ogre') ],
- [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.patch -p0 ", os.getcwd()],
- [0,'echo Please use MSVC Express Edition to build Ogre Release.','']
- ]
-
# requirements to build a precompiled header on the fly
if _PreCompiled:
pchstop = 'python_ogre_precompiled.h'
@@ -635,11 +635,11 @@
[0, "make install", os.path.join(os.getcwd(), 'ogre')],
]
else:
- version = "1.6.0RC1"
- base = "ogre-v1-6-0RC1"
+ version = "1.6.0"
+ base = "ogre-v1-6-0"
buildCmds = [
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
- [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0RC1.patch -p0 ", os.getcwd()],
+ [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
[0, "aclocal", os.path.join(os.getcwd(), 'ogre')],
[0, "./bootstrap", os.path.join(os.getcwd(), 'ogre')],
[0, "./configure --prefix=%s --with-gui=Xt --disable-devil" % PREFIX, os.path.join(os.getcwd(), 'ogre')],
Added: trunk/python-ogre/patch/ogre_1.6.0.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.6.0.patch (rev 0)
+++ trunk/python-ogre/patch/ogre_1.6.0.patch 2008-11-08 01:46:46 UTC (rev 788)
@@ -0,0 +1,188 @@
+Index: ogre/Samples/Common/include/ExampleFrameListener.h
+===================================================================
+--- ogre/Samples/Common/include/ExampleFrameListener.h (revision 8145)
++++ ogre/Samples/Common/include/ExampleFrameListener.h (working copy)
+@@ -41,7 +41,7 @@
+
+ //Use this define to signify OIS will be used as a DLL
+ //(so that dll import/export macros are in effect)
+-#define OIS_DYNAMIC_LIB
++//#define OIS_DYNAMIC_LIB
+ #include <OIS/OIS.h>
+
+ using namespace Ogre;
+Index: ogre/OgreMain/include/OgreMovableObject.h
+===================================================================
+--- ogre/OgreMain/include/OgreMovableObject.h (revision 8145)
++++ ogre/OgreMain/include/OgreMovableObject.h (working copy)
+@@ -482,7 +482,7 @@
+ included too.
+ */
+ virtual void visitRenderables(Renderable::Visitor* visitor,
+- bool debugRenderables = false) = 0;
++ bool debugRenderables = false) { throw std::runtime_error ( std::string ("Virtual function MovableObject::visitRenderables called!") ); }
+
+ /** Sets whether or not the debug display of this object is enabled.
+ @remarks
+Index: ogre/OgreMain/include/OgreRenderQueueListener.h
+===================================================================
+--- ogre/OgreMain/include/OgreRenderQueueListener.h (revision 8145)
++++ ogre/OgreMain/include/OgreRenderQueueListener.h (working copy)
+@@ -31,7 +31,9 @@
+
+ #include "OgrePrerequisites.h"
+ #include "OgreRenderQueue.h"
++#include <stdexcept>
+
++
+ namespace Ogre {
+
+ /** Abstract interface which classes must implement if they wish to receive
+@@ -65,7 +67,7 @@
+ for this queue group.
+ */
+ virtual void renderQueueStarted(uint8 queueGroupId, const String& invocation,
+- bool& skipThisInvocation) = 0;
++ bool& skipThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueStarted called!") ); }
+
+ /** Event raised after a queue group is rendered.
+ @remarks
+@@ -80,7 +82,7 @@
+ events will also be fired for it again.
+ */
+ virtual void renderQueueEnded(uint8 queueGroupId, const String& invocation,
+- bool& repeatThisInvocation) = 0;
++ bool& repeatThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueEnded called!") ); }
+ };
+
+ }
+Index: ogre/OgreMain/include/OgreResourceGroupManager.h
+===================================================================
+--- ogre/OgreMain/include/OgreResourceGroupManager.h (revision 8145)
++++ ogre/OgreMain/include/OgreResourceGroupManager.h (working copy)
+@@ -37,6 +37,7 @@
+ #include "OgreArchive.h"
+ #include "OgreIteratorWrappers.h"
+ #include <ctime>
++#include <stdexcept>
+
+ namespace Ogre {
+
+@@ -92,7 +93,7 @@
+ parsed. Note that in this case the scriptParseEnded event will not be raised
+ for this script.
+ */
+- virtual void scriptParseStarted(const String& scriptName, bool& skipThisScript) = 0;
++ virtual void scriptParseStarted(const String& scriptName, bool& skipThisScript) { throw std::runtime_error ( std::string ("Virtual function ResourceGroupListener::scriptParseStarted called!") ); }
+
+ /** This event is fired when the script has been fully parsed.
+ */
+Index: ogre/OgreMain/include/OgreDataStream.h
+===================================================================
+--- ogre/OgreMain/include/OgreDataStream.h (revision 8145)
++++ ogre/OgreMain/include/OgreDataStream.h (working copy)
+@@ -33,6 +33,7 @@
+ #include "OgreString.h"
+ #include "OgreSharedPtr.h"
+ #include <istream>
++#include <stdexcept>
+
+ namespace Ogre {
+
+@@ -79,7 +80,7 @@
+ @param count Number of bytes to read
+ @returns The number of bytes read
+ */
+- virtual size_t read(void* buf, size_t count) = 0;
++ virtual size_t read(void* buf, size_t count) { throw std::runtime_error ( std::string ("Virtual function DataStream::read called!") ); }
+ /** Get a single line from the stream.
+ @remarks
+ The delimiter character is not included in the data
+Index: ogre/OgreMain/include/OgreConfig.h
+===================================================================
+--- ogre/OgreMain/include/OgreConfig.h (revision 8145)
++++ ogre/OgreMain/include/OgreConfig.h (working copy)
+@@ -87,7 +87,7 @@
+ #define OGRE_MEMORY_ALLOCATOR_NED 2 // you need to have nedmalloc on your path for this
+ #define OGRE_MEMORY_ALLOCATOR_USER 3
+
+-#define OGRE_MEMORY_ALLOCATOR OGRE_MEMORY_ALLOCATOR_STD
++#define OGRE_MEMORY_ALLOCATOR OGRE_MEMORY_ALLOCATOR_NED
+
+ // enable or disable the memory tracker, recording the memory allocations & tracking leaks
+ // default is to disable since it's expensive, but you can enable if needed per build target
+@@ -123,7 +123,7 @@
+ to be done in the background.
+ */
+ #ifndef OGRE_THREAD_SUPPORT
+-#define OGRE_THREAD_SUPPORT 0
++#define OGRE_THREAD_SUPPORT 1
+ #endif
+ #if OGRE_THREAD_SUPPORT != 0 && OGRE_THREAD_SUPPORT != 1 && OGRE_THREAD_SUPPORT != 2
+ #define OGRE_THREAD_SUPPORT 1
+Index: ogre/OgreMain/include/OgreHardwareBuffer.h
+===================================================================
+--- ogre/OgreMain/include/OgreHardwareBuffer.h (revision 8145)
++++ ogre/OgreMain/include/OgreHardwareBuffer.h (working copy)
+@@ -31,7 +31,9 @@
+
+ // Precompiler options
+ #include "OgrePrerequisites.h"
++#include <stdexcept>
+
++
+ namespace Ogre {
+
+ /** Abstract class defining common features of hardware buffers.
+@@ -244,7 +246,7 @@
+ @param pDest The area of memory in which to place the data, must be large enough to
+ accommodate the data!
+ */
+- virtual void readData(size_t offset, size_t length, void* pDest) = 0;
++ virtual void readData(size_t offset, size_t length, void* pDest) { throw std::runtime_error ( std::string ("Virtual function HardwareBuffer::readData called!") ); }
+ /** Writes data to the buffer from an area of system memory; note that you must
+ ensure that your buffer is big enough.
+ @param offset The byte offset from the start of the buffer to start writing
+@@ -254,7 +256,7 @@
+ such that DMA stalls can be avoided; use if you can.
+ */
+ virtual void writeData(size_t offset, size_t length, const void* pSource,
+- bool discardWholeBuffer = false) = 0;
++ bool discardWholeBuffer = false) { throw std::runtime_error ( std::string ("Virtual function HardwareBuffer::writeData called!") ); }
+
+ /** Copy data from another buffer into this one.
+ @remarks
+Index: ogre/OgreMain/include/OgreAtomicWrappers.h
+===================================================================
+--- ogre/OgreMain/include/OgreAtomicWrappers.h (revision 8145)
++++ ogre/OgreMain/include/OgreAtomicWrappers.h (working copy)
+@@ -170,7 +170,7 @@
+
+ }
+
+- #elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_THREAD_SUPPORT
++ #elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_THREAD_SUPPORT && ! defined(__PYTHONOGRE_BUILD_CODE)
+
+ #undef NOMINMAX
+ #define NOMINMAX
+Index: ogre/ReferenceApplication/ReferenceAppLayer/OgreRefAppWorld.cpp
+===================================================================
+--- ogre/ReferenceApplication/ReferenceAppLayer/OgreRefAppWorld.cpp (revision 8151)
++++ ogre/ReferenceApplication/ReferenceAppLayer/OgreRefAppWorld.cpp (working copy)
+@@ -54,6 +54,8 @@
+ mSimulationStepSize = 0.01f;
+
+ // Create the dynamics world
++ dInitODE2(0);
++
+ mOdeWorld = new dWorld();
+ mOdeContactGroup = new dJointGroup();
+
+@@ -79,6 +81,7 @@
+ // Destroy dynamix world
+ delete mOdeContactGroup;
+ delete mOdeWorld;
++ dCloseODE();
+
+ }
+ //-------------------------------------------------------------------------
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-03 07:41:09
|
Revision: 787
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=787&view=rev
Author: andy_miller
Date: 2008-11-03 07:41:04 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
Updated to latest BetaGui
Added Paths:
-----------
trunk/python-ogre/ThirdParty/betagui/BetaGUI2.cpp
trunk/python-ogre/ThirdParty/betagui/BetaGUI2.h
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/betagui/BetaGUI.h
trunk/python-ogre/ThirdParty/betagui/BetaGui.cpp
Deleted: trunk/python-ogre/ThirdParty/betagui/BetaGUI.h
===================================================================
--- trunk/python-ogre/ThirdParty/betagui/BetaGUI.h 2008-11-03 07:40:08 UTC (rev 786)
+++ trunk/python-ogre/ThirdParty/betagui/BetaGUI.h 2008-11-03 07:41:04 UTC (rev 787)
@@ -1,638 +0,0 @@
-#ifndef BETAGUI_H
-#define BETAGUI_H
-
-/// Betajaen's GUI 016 Uncompressed
-/// Written by Robin "Betajaen" Southern 07-Nov-2006, http://www.ogre3d.org/wiki/index.php/BetaGUI
-/// This code is under the Whatevar! licence. Do what you want; but keep the original copyright header.
-
-#include "Ogre.h"
-#include "OgreTextAreaOverlayElement.h"
-
-#include <iostream>
-
-using namespace Ogre;
-using namespace std;
-
-namespace BetaGUI
-{
- //------------------------------------------------------------------------------------------------
- class GUI;
-
- class Widget;
- class Window;
-
- class Button;
- class BoolButton;
- class MenuButton;
- class RealButton;
-
- class StaticText;
- class TextInput;
-
- class Callback;
-
- class Effect;
- class AlphaEffect;
- class MoveEffect;
- class SizeEffect;
-
- //------------------------------------------------------------------------------------------------
- enum WindowFeatureType
- {
- WFT_NONE = 0,
- WFT_MOVE ,
- WFT_RESIZE ,
- WFT_RESIZE_AND_MOVE
- };
- //------------------------------------------------------------------------------------------------
- enum WindowPlacementType
- {
- WPT_NONE = 0,
- WPT_VERTICAL ,
- WPT_HORIZONTAL
- };
- //------------------------------------------------------------------------------------------------
- enum WindowActivity
- {
- WA_NONE = 0,
- WA_MOVE ,
- WA_RESIZE ,
- WA_PRESS
- };
- //------------------------------------------------------------------------------------------------
- class GUI
- {
- public:
-
- friend class Window;
-
- friend class Button;
-
- friend class MenuButton;
- friend class BoolButton;
- friend class RealButton;
-
- friend class StaticText;
- friend class TextInput;
-
- GUI(const Ogre::String &baseOverlay, const Ogre::String &font, int fontSize, Ogre::RenderWindow *win);
-
- ~GUI();
-
- void sortZOrder() ;
-
- void setZRangeOrder(int nearZ, int FarZ);
-
- bool injectMouse(int x, int y, bool LMB);
- bool injectMouse(float x, float y, bool LMB);
-
- bool injectKey(const Ogre::String &key, int x, int y);
-
- void injectBackspace(int x, int y);
-
- Window* createWindow(
- const Ogre::Vector4 &Dimensions,
- const Ogre::String &Material,
- WindowFeatureType type,
- const Ogre::String &caption = "");
-
- void destroyWindow(Window *window) {
- mNextWindowToDestroy=window;
- }
- Ogre::OverlayContainer* createOverlay(const Ogre::String &name,
- const Ogre::Vector2 &position,
- const Ogre::Vector2 &dimensions,
- const Ogre::String &material = "",
- const Ogre::String &caption = "");
-
- Ogre::OverlayContainer* createMousePointer(Ogre::Vector2 dimensions,
- const Ogre::String &material);
-
-
-
- Window *addMenuWindow(const Ogre::Vector2 dimensions);
-
- void update(Ogre::Real timeElapsed);
- void addEffect (Effect* e);
- Ogre::Real getUpTime() const {return mUpTime;}
-
- protected:
- //Ogre::Overlay* mGuiOverlay; // Main sheet overlay
- std::vector<Window*> mWindows; // Windows
- Window * mNextWindowToDestroy; // Window to destroy
- Ogre::OverlayContainer* mMousePointerOverlay; // Mouse Pointer Overlay
-
- Ogre::String mFont;
- int mFontSize;
- int mWindowCount, mButtonCount, mTextCaptionCount, mTextCaptionCountArea, mButtonCountTextArea;
-
-
- Ogre::uint mDragWindowAction;
-
- int mDragX, mDragY;
- int mDragWindowX, mDragWindowY;
-
- Window * mActiveDraggedWindow;
- TextInput * mActiveTextInput;
- Button * mActiveButton;
-
- Ogre::Vector2 mNextMenuWindowPos;
- Window * mMenuWindow;
- Ogre::RenderWindow * mRenderWindow;
-
- std::list<Effect*> mActiveEffects;
-
- Ogre::Real mUpTime;
- Ogre::String mName;
- int mFarZ;
- int mNearZ;
- };
- //------------------------------------------------------------------------------------------------
- class Widget
- {
- public:
-
- friend class GUI;
-
- Widget(const Ogre::Vector4 &Dimension,
- const Ogre::String &materialNameNormal,
- bool hasOverState = true,
- bool hasActiveState = true);
-
- virtual ~Widget();
-
- Ogre::Vector2 getPosition() const{return Ogre::Vector2(mPosX,mPosY);}
- Ogre::Vector2 getSize() const {return Ogre::Vector2(mWidth,mHeight); }
-
- void setPosition(const Ogre::Vector2 &position);
- void setSize(const Ogre::Vector2 &size);
-
- virtual void show(){setAlpha (1.0, true);};
- virtual void hide(){setAlpha (0.0, true);};
-
- virtual bool isVisible() {return mMainOverlay->isVisible ();};
-
- virtual void over(const bool a);
- virtual void activate(const bool a);
-
- virtual void adjustSizeToContent();
-
- virtual void setPosition(float X,float Y);
- virtual void setPosition(int X,int Y);
- virtual void setSize(int X,int Y);
- virtual void setAlpha(const Ogre::Real alpha, const bool isContainer);
- virtual void setMaterialBlendFactor(const Ogre::Real blendFactor, const bool isContainer);
-
- // mUnderEffect getter
- bool getUnderEffect() const { return mUnderEffect; }
- // mUnderEffect setter
- void setUnderEffect(bool val);
-
- // mOver getter
- bool getOver() const { return mOver; }
- // mOver setter
- void setOver(bool val) { mOver = val; }
- // mActive getter
- bool getActive() const { return mActive; }
- // mActive setter
- void setActive(bool val) { mActive = val; }
-
- // mActive setter
- void setMainMaterial(const Ogre::String& mat) {
- mMainOverlay->setMaterialName(mat);
- }
-
- void setCaptionMaterial(const Ogre::String& mat) {
- mCaptionOverlay->setMaterialName(mat);
- }
-
- void setText(const Ogre::String& t) {
- mCaptionOverlay->setCaption(t);
- }
-
- Ogre::String getText() const {
- return mCaptionOverlay->getCaption();
- }
-
- protected:
- //------------------------------------------------------------------------------------------------
- inline bool isOut (const int x, const int y) const
- {
- return (x < mPosX) || (y < mPosY)
- || (x > (mPosX + mWidth)) ||
- (y > (mPosY + mHeight));
- }
- //------------------------------------------------------------------------------------------------
- inline bool isIn (const int x, const int y) const
- {
- return (x >= mPosX) && (y >= mPosY)
- && (x <= (mPosX + mWidth)) &&
- (y <= (mPosY + mHeight));
- }
-
- void instantiateMaterial(Ogre::OverlayContainer * const oc, bool reset) const;
- void setOverlayAlpha(Ogre::OverlayContainer * const oc, const Ogre::Real alpha) const;
- void setOverlayMaterialBlendFactor(Ogre::OverlayContainer * const oc, const Ogre::Real blendFactor) const;
-
- int mPosX, mPosY, mWidth, mHeight;
-
- std::vector<Widget *> mChildren;
- Ogre::OverlayContainer* mMainOverlay;
- Ogre::OverlayContainer* mCaptionOverlay;
- Ogre::String mMaterialName;
-
- bool mHasMaterial;
- bool mHasOverState;
- bool mHasActiveState;
- bool mUnderEffect;
- bool mOver;
- bool mActive;
- };
- //------------------------------------------------------------------------------------------------
- class Window : public Widget
- {
- public:
- friend class Button;
- friend class TextInput;
- friend class StaticText;
- friend class GUI;
-
- Window(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, WindowFeatureType type, const Ogre::String &caption, GUI *gui);
- virtual ~Window();
-
- Button* createButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
- const Ogre::String &Text, Callback callback);
-
- TextInput* createTextInput(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
- const Ogre::String & Value, int length);
-
- StaticText* createStaticText(const Ogre::Vector4 &Dimensions, const Ogre::String &Text);
-
- void setSize(int X,int Y);
-
- MenuButton *addMenuButton(Window *target, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
- BoolButton *addBoolButton(bool value, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
- RealButton *addRealButton(Ogre::Real value, const Ogre::Vector4 &SliderMoves, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
- StaticText* addStaticText(const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
-
- Window *addMenuWindowTab(const Ogre::String &label,
- bool titleBarWin = true,
- WindowPlacementType wpt = WPT_VERTICAL);
-
- MenuButton* createMenuButton(const Ogre::Vector4 &D, const Ogre::String &M, const Ogre::String &T, Callback C, Window *t);
- BoolButton* createBoolButton(const Ogre::Vector4 &D, const Ogre::String &M, const Ogre::String &T, Callback C, bool boolValue);
-
- RealButton *createRealButton(Ogre::Real value,
- const Ogre::Vector4 &SliderMoves,
- const Ogre::String &label,
- const Ogre::Vector2 &pos);
-
- GUI* getGUI() const {return mGUI;}
-
- void setFadeOut(bool f){mFadeOut = f;}
- void setZOrder(int zOrder){mGuiOverlay->setZOrder (zOrder);}
- protected:
-
-
- bool check(int x, int y, bool LMB);
- bool checkKey(const Ogre::String &key, int x, int y);
-
- TextInput* mActiveTextInput; // Active TextInput
-
- Button
- *mCloseButton,
- *mResizerButton,
- *mActiveButton,
- *mTitleBarButton; // Resizer, ActiveButton, Title bar
-
- GUI *mGUI; // mGUI pointer
-
- std::vector<Button*> mButtons; // Buttons
- std::vector<TextInput*> mTextInput; // TextInputs
-
- Ogre::Overlay *mGuiOverlay;
-
- void addWidget(const Widget * const w, WindowPlacementType wpt);
- Ogre::Vector2 mNextWidgetPos;
- WindowActivity mDragType;
-
- bool mFadeOut;
-
- };
- //------------------------------------------------------------------------------------------------
- class BetaGUIListener
- {
- public:
- virtual void onButtonPress(Button*, unsigned char) = 0;
- };
- //------------------------------------------------------------------------------------------------
- class Callback
- {
- public:
- friend class Window;
- friend class Button;
-
- Callback() {
- mCallbackType=0;
- }
-
- Callback( void(*functionPointer)(BetaGUI::Button*, bool) ) {
- mCallbackType=1;
- fp = functionPointer;
- }
-
- Callback(BetaGUIListener *l){
- mCallbackType = 2;
- mListener = l;
- }
- protected:
- unsigned char mCallbackType; // Type of callback: 0 - None, 1 - FunctionPointer 2 - GUIListener, 3 - Move Window, 4 - Resize
- void(*fp)(BetaGUI::Button*, bool); // Function pointer (if 1)
- BetaGUIListener *mListener; // GuiListener (if 2)
- };
- //------------------------------------------------------------------------------------------------
- class Button : public Widget
- {
- public:
- friend class Window;
- friend class GUI;
-
- Button(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
- const Ogre::String &Text, Callback callback, Window *parent);
- virtual ~Button() {}
-
- protected:
- Callback mCallback; // Callback to use
- };
- //------------------------------------------------------------------------------------------------
- class MenuButton : public Button
- {
- public:
- MenuButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
- const Ogre::String &Text, Callback callback, Window *parent,
- Window *target) :
- Button(Dimensions, Material, Text, callback, parent),
- mTarget(target)
- {};
- virtual ~MenuButton(){};
- protected:
- void activate(const bool a) ;
-
- Window *mTarget;
- };
- //------------------------------------------------------------------------------------------------
- class BoolButton : public Button
- {
- public:
- BoolButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
- const Ogre::String &Text, Callback callback, Window *parent, bool boolValue):
- Button(Dimensions, Material, Text, callback, parent),
- mBoolValue(boolValue)
- {}
- virtual ~BoolButton(){};
-
- protected:
- void activate(const bool a) ;
-
- bool mBoolValue;
- };
- //------------------------------------------------------------------------------------------------
- class TextInput : public Widget
- {
- public:
- friend class Window;
- friend class GUI;
-
- TextInput(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
- const Ogre::String &Value, unsigned int length, Window *parent);
- virtual ~TextInput(){}
- const Ogre::String &getValue() const {return mValueText;}
- void setValue(const Ogre::String &v) {mCaptionOverlay->setCaption(mValueText = v);}
-
- protected:
- unsigned int length;
- Ogre::String mValueText;// MaterialName Normal, MaterialName Active
-
- };
- //------------------------------------------------------------------------------------------------
- class StaticText : public Widget
- {
- public:
- friend class Window;
-
- StaticText(const Ogre::Vector4 &Dimensions,
- const Ogre::String &Value,
- Window *parent);
- virtual ~StaticText(){}
-
- const Ogre::String &getValue() const
- {return mValueText;}
-
- void setValue(const Ogre::String &v)
- {
- mCaptionOverlay->setCaption(mValueText = v);
- mWidth = static_cast<int> (mValueText.size () * 7);
- mParent->adjustSizeToContent ();
- }
-
- protected:
-
- int length;
- Ogre::String mValueText;
- Window *mParent;
- };
- //------------------------------------------------------------------------------------------------
- class RealButton : public BetaGUIListener, public Widget
- {
- public:
- friend class Window;
-
- RealButton(BetaGUI::Window *window,
- Ogre::Real value,
- const Ogre::Vector4 &SliderMoves,
- const Ogre::String &label,
- const Ogre::Vector2 &pos);
-
- virtual ~RealButton(){};
-
- Ogre::Real getValue() const {return mValue;}
-
- void setValue(const Ogre::Real v);
-
- void onButtonPress(BetaGUI::Button *ref, Ogre::uchar type);
- protected:
-
- int length;
-
- BetaGUI::TextInput *mtextValueInput;
- BetaGUI::Button *mForward, *mFastForward, *mRewind, *mFastRewind;
-
- Ogre::Real mValue;
- Ogre::String mValueText;
-
- Ogre::Real mLowSlideUnit;
- Ogre::Real mFastSlideUnit;
- Ogre::Real mMinValue;
- Ogre::Real mMaxValue;
-
- };
- //------------------------------------------------------------------------------------------------
- class Effect
- {
- public:
- enum EffectInterpolatorType
- {
- EFFECT_LINEAR = 0,
- EFFECT_LINEARX2,
- EFFECT_LINEARX4,
- EFFECT_SIN
- };
- public:
- Effect(Widget * const widget, const Ogre::Real duration,
- const Ogre::Real startTime, const Ogre::Real currTime = 0, const bool repeat = false,
- EffectInterpolatorType type = EFFECT_LINEARX4) :
- mWidget(widget),
- mStartTime(startTime),
- mDuration(duration),
- mRepeat(repeat),
- mCurrTime(currTime),
- mType(type)
- {
- assert (duration != 0);
- }
- virtual ~Effect(){};
-
- virtual void updateValue(const Ogre::Real factor) = 0;
-
- bool update(Ogre::Real timeElapsed);
- Ogre::Real getTimeFactor() ;
- bool getTimeOrIsFinished();
-// Ogre::Real linearInterpolate(const Ogre::Real start,
-// const Ogre::Real end,
-// const Ogre::Real timeFactor) const;
- Ogre::Real interpolate(const Ogre::Real start,
- const Ogre::Real end,
- const Ogre::Real timeFactor) const;
-
- protected:
- Widget * const mWidget;
- const Ogre::Real mStartTime;
- const Ogre::Real mDuration;
- const bool mRepeat;
-
- Ogre::Real mCurrTime;
- const EffectInterpolatorType mType;
- };
- //------------------------------------------------------------------------------------------------
- class AlphaEffect : public Effect
- {
- public:
-
- AlphaEffect(Widget * const widget,
- const Ogre::Real duration,
- const Ogre::Real startAlpha,
- const Ogre::Real endAlpha,
- const Ogre::Real startTime,
- const Ogre::Real currTime = 0,
- const bool repeat = false,
- EffectInterpolatorType type = EFFECT_LINEARX4) :
- Effect(widget, duration, startTime, currTime, repeat),
- mStartAlpha(startAlpha),
- mEndAlpha(endAlpha)
- {
- assert(mStartAlpha >= 0.0 && mStartAlpha <= 1.0);
- assert(mEndAlpha >= 0.0 && mEndAlpha <= 1.0);
- }
- virtual ~AlphaEffect(){};
-
- void updateValue(const Ogre::Real factor);
- private:
- const Ogre::Real mStartAlpha;
- const Ogre::Real mEndAlpha;
- };
- //------------------------------------------------------------------------------------------------
- class MoveEffect : public Effect
- {
- public:
- MoveEffect(Widget * const widget,
- const Ogre::Real duration,
- const Ogre::Vector2 &startPosition,
- const Ogre::Vector2 &endPosition,
- const Ogre::Real startTime,
- const Ogre::Real currTime = 0,
- const bool repeat = false,
- EffectInterpolatorType type = EFFECT_LINEARX4) :
- Effect(widget, duration, startTime, currTime, repeat),
- mStartPosition(startPosition),
- mEndPosition(endPosition)
- {}
- virtual ~MoveEffect(){};
- void updateValue(const Ogre::Real factor);
-
- private:
- const Ogre::Vector2 mStartPosition;
- const Ogre::Vector2 mEndPosition;
- };
- //------------------------------------------------------------------------------------------------
- class SizeEffect : public Effect
- {
- public:
- SizeEffect(Widget * const widget,
- const Ogre::Real duration,
- const Ogre::Vector2 &startSize,
- const Ogre::Vector2 &endSize,
- const Ogre::Real startTime,
- const Ogre::Real currTime = 0,
- const bool repeat = false,
- EffectInterpolatorType type = EFFECT_LINEARX4) :
- Effect(widget, duration, startTime, currTime, repeat),
- mStartSize(startSize),
- mEndSize(endSize)
- {}
- virtual ~SizeEffect(){};
- void updateValue(const Ogre::Real factor);
-
- private:
- const Ogre::Vector2 mStartSize;
- const Ogre::Vector2 mEndSize;
- };
- //------------------------------------------------------------------------------------------------
- class ActivateEffect : public Effect
- {
- public:
- ActivateEffect(Widget * const widget,
- const Ogre::Real duration,
- const Ogre::Real startTime,
- const Ogre::Real currTime = 0,
- const bool repeat = false,
- EffectInterpolatorType type = EFFECT_LINEARX4):
- Effect(widget, duration, startTime, currTime, repeat)
- {};
- virtual ~ActivateEffect(){};
- void updateValue(const Ogre::Real factor);
-
- };
- //------------------------------------------------------------------------------------------------
- class OverEffect : public Effect
- {
- public:
- OverEffect(Widget * const widget,
- const Ogre::Real duration,
- const Ogre::Real startTime,
- const Ogre::Real currTime = 0,
- const bool repeat = false,
- EffectInterpolatorType type = EFFECT_LINEARX4):
- Effect(widget, duration, startTime, currTime, repeat)
- {};
- virtual ~OverEffect(){};
- void updateValue(const Ogre::Real factor);
-
- };
- //------------------------------------------------------------------------------------------------
-
-
-} // End of Namespace
-
-///////////////////////////////////////////////////////////////////////////////
-#endif
-
Added: trunk/python-ogre/ThirdParty/betagui/BetaGUI2.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/betagui/BetaGUI2.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/betagui/BetaGUI2.cpp 2008-11-03 07:41:04 UTC (rev 787)
@@ -0,0 +1,672 @@
+// Betajaen's GUI "BetaGUI2 2.0", Version 35-uncompressed, http://www.ogre3d.org/wiki/index.php/BetaGUI2
+//
+// Copyright (c) 2007 Robin Southern <bet...@ih...>
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PAreturn trueICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TOreturn true OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+#include "BetaGUI2.h"
+#include "OgreFontManager.h"
+#include "OgreFont.h"
+#include "OgreTextAreaOverlayElement.h"
+
+#define return_this_if(z,x) if(x)return z;
+#define return_if(x) if(x)return;
+#define continue_if(x) if(x){continue;}
+#define do_if(x,y,a) if(x==y){a;return true;}else{return false;}
+
+namespace BetaGUI2 {
+////////////////////////////////////////////////////////////////////////////////////
+WidgetStyle::WidgetStyle(const Ogre::String &style) {
+ mBackground = "bgui.default"; centerText = false; mColour = Ogre::ColourValue::White; mDecalSize = 0;
+ mHeight = 16; mFontSize = 0; mFontFace = ""; if (style.length()>=0) fromStyle(style);}
+////////////////////////////////////////////////////////////////////////////////////
+#if BETAGUI_USES_OIS
+bool GUI::frameEnded(const Ogre::FrameEvent &evt){
+ if(mCapturing){mMouse->capture();mKeyboard->capture();}return true;}
+////////////////////////////////////////////////////////////////////////////////////
+GUI::GUI(Ogre::RenderWindow* w, OIS::InputManager* im) : mInputManager(im), mCapturing(true), mOver(false),
+#else
+GUI::GUI(Ogre::RenderWindow* w) :
+#endif
+ mWindowToDestroy(0), mMousePointer(0), mWindowCount(0), mButtonCount(0),
+ mTextInputCount(0), mRenderWindowWidth(w->getWidth()), mRenderWindowHeight(w->getHeight()),
+ mActiveWindow(0), mWindowRatio(Ogre::Real(mRenderWindowWidth) / Ogre::Real(mRenderWindowHeight)) {
+ mOverlay = Ogre::OverlayManager::getSingleton().create("BetaGUI2"); mOverlay->show();
+#if BETAGUI_USES_OIS
+ mKeyboard = static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard,true));
+ mMouse = static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse,true));
+ mMouse->setEventCallback(this);mKeyboard->setEventCallback(this);
+ Ogre::Root::getSingleton().addFrameListener(this);
+#endif
+}///////////////////////////////////////////////////////////////////////////////////
+GUI::~GUI() {
+#if BETAGUI_USES_OIS
+ Ogre::Root::getSingleton().removeFrameListener(this);
+ mInputManager->destroyInputObject(mMouse);mInputManager->destroyInputObject(mKeyboard);
+#endif
+ for(unsigned int i=0;i < mWindow.size();i++) delete mWindow[i];
+ for (std::map<Ogre::String, Style*>::iterator it = mStyle.begin();it!=mStyle.end();it++) delete (*it).second;
+ mStyle.clear(); mWindow.clear();}
+////////////////////////////////////////////////////////////////////////////////////
+bool GUI::injectRelMouse(int x, int y, bool LMB) {
+ return injectMouse(mMousePointer->getLeft() + x, mMousePointer->getTop() + y, LMB);}
+////////////////////////////////////////////////////////////////////////////////////
+bool GUI::injectMouse(unsigned int x, unsigned int y, bool LMB) {
+ if (x < 0 || x > mRenderWindowWidth) x = lastKnownMouseX = mMousePointer->getLeft();
+ if (y < 0 || y > mRenderWindowHeight) y = lastKnownMouseY = mMousePointer->getTop();
+ if (mMousePointer)mMousePointer->setPosition(x,y);
+ for(std::vector<Window*>::iterator i=mWindow.begin();i!=mWindow.end();i++) {
+ if (mWindowToDestroy==(*i)){ delete (*i);
+ mWindow.erase(i);
+ mWindowToDestroy=0;
+ return false;}
+ if((*i)->check(x,y,LMB))return true;}
+ return false;}
+////////////////////////////////////////////////////////////////////////////////////
+Ogre::OverlayContainer* GUI::__getOverlay(const Ogre::String& name, const Ogre::String& type,int x,int y, int w, int h) {
+ Ogre::OverlayContainer* oc; try { oc = static_cast<Ogre::OverlayContainer*>(Ogre::OverlayManager::getSingleton().getOverlayElement(name));
+ }catch(...) {oc = static_cast<Ogre::OverlayContainer*>(Ogre::OverlayManager::getSingleton().createOverlayElement(type, name));}
+ oc->setMetricsMode(Ogre::GMM_PIXELS);
+ return_this_if(oc, x==0&&y==0&&w==0)
+ oc->setPosition(x,y); oc->setDimensions(w,h); return oc;}
+////////////////////////////////////////////////////////////////////////////////////
+Ogre::OverlayContainer* GUI::createOverlayFromWidgetStyle(const Ogre::String &name, const Ogre::String &styleName, const Ogre::String &widgetType, int x, int y, const Ogre::String &text) {
+ WidgetStyle ws=mStyle[styleName]->mWidgets[widgetType];
+ Ogre::OverlayContainer* oc=__getOverlay(name,"Panel", x,y,32,ws.mHeight);
+ oc->setMaterialName(ws.mBackground);
+ return_this_if(oc,text.length()==0)
+ int fontSize=ws.mFontSize?ws.mFontSize:mStyle[styleName]->mFontSize;
+ Ogre::String fontName=ws.mFontFace.length()?ws.mFontFace:mStyle[styleName]->mFontFace;
+ Ogre::OverlayContainer* caption = __getOverlay(name + "-caption", "TextArea", 0,((ws.mHeight * 0.5f) - ((float) fontSize) * 0.5f) * mWindowRatio, 32, fontSize);
+ oc->addChild(caption);
+ caption->setCaption(text);caption->setParameter("font_name", fontName);caption->setParameter("char_height", Ogre::StringConverter::toString(fontSize));
+ Ogre::Font* f = dynamic_cast<Ogre::Font*>(Ogre::FontManager::getSingletonPtr()->getByName(fontName).get());
+ f->setTrueTypeSize(fontSize); float textWidth = 0; Ogre::Real sp = f->getGlyphAspectRatio(0x0030) * fontSize;
+ for(unsigned int i=0; i < text.length();i++){
+ if (text[i] == 0x0020) textWidth += sp;
+ else textWidth += f->getGlyphAspectRatio(text[i]) * fontSize;}
+ oc->setWidth(Ogre::Math::Ceil(textWidth * 1.25f)); caption->setWidth(textWidth); caption->setHeight(fontSize);
+ if (ws.centerText) caption->setLeft(textWidth * 0.125f);
+ caption->setColour(ws.mColour);
+ return oc;
+}
+////////////////////////////////////////////////////////////////////////////////////
+Ogre::OverlayContainer* GUI::createOverlayFromWindowStyle(const Ogre::String &name, const Ogre::String &styleName, int x, int y, int w, int h) {
+ Ogre::OverlayContainer* oc=__getOverlay(name);oc->setPosition(x,y);oc->setDimensions(w,h);
+ if (mStyle[styleName]->mWindow_Background.length())oc->setMaterialName(mStyle[styleName]->mWindow_Background);
+ return oc;}
+////////////////////////////////////////////////////////////////////////////////////
+void GUI::__updateCenteredOverlay(Ogre::OverlayContainer* overlay) {
+ Ogre::OverlayContainer* caption = static_cast<Ogre::OverlayContainer*>(overlay->getChild(overlay->getName()+"-caption"));
+ caption->setPosition((overlay->getWidth()*0.5f)-(caption->getWidth()*0.5f),2+(overlay->getHeight()*0.5f)-(caption->getHeight()*0.5f));}
+////////////////////////////////////////////////////////////////////////////////////
+Ogre::OverlayContainer* GUI::createMousePointer(const Ogre::String& m, unsigned int w, unsigned int h) {
+ Ogre::Overlay* o=Ogre::OverlayManager::getSingleton().create("BetaGUI2.MP");
+ mMousePointer=__getOverlay("BetaGUI2.MousePointer","Panel",mRenderWindowWidth*0.5f,mRenderWindowHeight*0.5f,w,h);
+ mMousePointer->setMaterialName(m);
+ o->setZOrder(649);o->add2D(mMousePointer);o->show();mMousePointer->show();
+ return mMousePointer;}
+////////////////////////////////////////////////////////////////////////////////////
+Style* GUI::createStyle(const Ogre::String& name){ mStyle[name]=new Style();return mStyle[name];}
+////////////////////////////////////////////////////////////////////////////////////
+Window* GUI::createWindow(int x,int y,unsigned int w, unsigned int h, const Ogre::String& s, WindowFeatureType t, const Ogre::String& c, GUIListener* l) {
+ Window* window=new BetaGUI2::Window(x,y,w,h,s,t,c,l,this);mWindow.push_back(window);return window;}
+////////////////////////////////////////////////////////////////////////////////////
+void GUI::destroyWindow(Window *window) { mWindowToDestroy=window;}
+////////////////////////////////////////////////////////////////////////////////////
+void GUI::hideAll(){
+ for (unsigned int i=0;i < mWindow.size();i++) mWindow[i]->hide();}
+////////////////////////////////////////////////////////////////////////////////////
+void GUI::setActiveWindow(Window* w){w->setToActive();
+ for (unsigned int i=0;i < mWindow.size();i++){if (mWindow[i]!=w)mWindow[i]->setToNormal();}}
+////////////////////////////////////////////////////////////////////////////////////
+Window::Window(int X, int Y, unsigned int width, unsigned int height, const Ogre::String& style, WindowFeatureType type, const Ogre::String& caption, GUIListener* listener, GUI* gui)
+ : x(X), y(Y), w(width), h(height), mGUI(gui), mTitlebarButton(0), mResizeButton(0), mActiveTextInput(0), mActiveButton(0), mStyle(style), mMode(WM_NONE), mListener(listener),
+ mCursorX(x),mCursorY(y), mCursorLineHeight(1), mCursorAutoSize(false), mCursorLeftRight(true), mCursorCenter(false) {
+ mSheet = Ogre::OverlayManager::getSingleton().create("BG" + Ogre::StringConverter::toString(gui->mWindowCount++)); mSheet->show();
+ mSheet->setZOrder(z = 100 + mGUI->mWindowCount);
+ mOverlay = gui->createOverlayFromWindowStyle(mSheet->getName() + "/window",style,x,y,w,h);
+ if (mGUI->getStyle(style)->mWindow_Border == true) {
+ mOverlay->setMaterialName("betagui.transparent");
+ bl = gui->__getOverlay(mSheet->getName() + "/bl", "Panel",0,0,1,height-1);
+ br = gui->__getOverlay(mSheet->getName() + "/br", "Panel",width-1,0,1,height-1);
+ bb = gui->__getOverlay(mSheet->getName() + "/bb", "Panel",0,height-1,width,1);
+ mOverlay->addChild(bl);mOverlay->addChild(br);mOverlay->addChild(bb);
+ bl->setMaterialName(mGUI->getStyle(style)->mWindow_Background + ".border");
+ br->setMaterialName(mGUI->getStyle(style)->mWindow_Background + ".border");
+ bb->setMaterialName(mGUI->getStyle(style)->mWindow_Background + ".border");
+ bl->show();br->show();bb->show();
+ if (type==WFT_MOVE||type==WFT_RESIZE_AND_MOVE)
+ mWidgetContainer = gui->__getOverlay(mSheet->getName() + "/wc", "Panel",1,22,width-2, height - 22 - 2);
+ else
+ mWidgetContainer = gui->__getOverlay(mSheet->getName() + "/wc", "Panel",1,0,width,height-2);
+ mWidgetContainer->setMaterialName(mGUI->getStyle(style)->mWindow_Background);
+ mOverlay->addChild(mWidgetContainer);
+ mWidgetContainer->show();
+ }
+ else {
+ mWidgetContainer = gui->__getOverlay(mSheet->getName() + "/wc", "Panel",1,0,width,height);
+ if (mGUI->getStyle(style)->mWindow_Background.length())
+ mWidgetContainer->setMaterialName(mGUI->getStyle(style)->mWindow_Background);
+ }
+ mSheet->add2D(mOverlay); mOverlay->show();
+
+ if (type == WFT_RESIZE || type == WFT_RESIZE_AND_MOVE) {
+// Callback c;c.t=4;
+// mResizeButton=createButton(Ogre::Vector4(width-16,height-16,16,16),"bgui.button", "",c);
+// mResizeButton = new Button(0,0,mWidth,0, caption, this, WR_RESIZE);
+// mButtons.push_back(mResizeButton);
+ }
+
+ if (type==WFT_MOVE||type==WFT_RESIZE_AND_MOVE){ mTitlebarButton=new Button(0,0,w,22,caption, this, WR_DRAG);
+ mButtons.push_back(mTitlebarButton);}
+
+}
+////////////////////////////////////////////////////////////////////////////////////
+Window::~Window() {
+ for(unsigned int i=0;i<mButtons.size();i++) delete mButtons[i];
+ for(unsigned int i=0;i<mTextInputs.size();i++) delete mTextInputs[i];
+ mGUI->mOverlay->remove2D(mOverlay);}
+////////////////////////////////////////////////////////////////////////////////////
+void Window::setToNormal() {
+ if (mGUI->getStyle(mStyle)->mWindow_Background.length() != 0)
+ mWidgetContainer->setMaterialName(mGUI->getStyle(mStyle)->mWindow_Background);
+ toZ();
+ if (mTitlebarButton)
+ mTitlebarButton->setCaption("Normal");
+}
+////////////////////////////////////////////////////////////////////////////////////
+void Window::setToActive() {
+ if (mGUI->getStyle(mStyle)->mWindow_ActiveBackground.length() != 0)
+ mWidgetContainer->setMaterialName(mGUI->getStyle(mStyle)->mWindow_ActiveBackground);
+ toFront();
+ if (mTitlebarButton)
+ mTitlebarButton->setCaption("Active");
+}
+////////////////////////////////////////////////////////////////////////////////////
+void Window::toFront(){mSheet->setZOrder(z = 100 + mGUI->mWindowCount + 10);}
+void Window::toZ(){mSheet->setZOrder(z);}
+void Window::setZ(int Z){z=Z;toZ();}
+////////////////////////////////////////////////////////////////////////////////////
+void Window::setPosition(unsigned int X,unsigned int Y) { mOverlay->setPosition(x=X,y=Y);}
+////////////////////////////////////////////////////////////////////////////////////
+Ogre::Vector2 Window::getPosition() { return Ogre::Vector2(x,y); }
+Ogre::Vector2 Window::getSize() { return Ogre::Vector2(w,h); }
+////////////////////////////////////////////////////////////////////////////////////
+void Window::setSize(unsigned int X,unsigned int Y) {mOverlay->setDimensions(w=X,h=Y);
+ if (mResizeButton) mResizeButton->mOverlay->setPosition(mResizeButton->x=w-16,mResizeButton->y=h-16);
+ if (mTitlebarButton) mTitlebarButton->mOverlay->setWidth(mTitlebarButton->w=w);}
+////////////////////////////////////////////////////////////////////////////////////
+Window& Window::button(std::string caption, BetaGUI2::ButtonMethodPtr bmptr) {
+ int tx = (mCursorLeftRight ? mCursorX : -int(mCursorX));
+ BetaGUI2::Button*T = createButton(tx,mCursorY,caption, bmptr);
+ if (mCursorCenter) {
+ T->setX((getSize().x * 0.5f) - (T->getWidth() * 0.5f) - mCursorX);mCursorCenter = false;}
+ _AdjustCursor(mCursorX + T->getWidth(),T->getHeight());
+ return *this;
+}
+////////////////////////////////////////////////////////////////////////////////////
+Window& Window::input(std::string value, unsigned int length, NxReal widgetLength) {
+ if (widgetLength=0) widgetLength = length * 15;
+ int tx = (mCursorLeftRight ? mCursorX : -int(mCursorX));
+ BetaGUI2::TextInput* T = createTextInput(tx,mCursorY,widgetLength, value, length);
+ _AdjustCursor(mCursorX + (widgetLength * 3),20);
+ return *this;
+}
+////////////////////////////////////////////////////////////////////////////////////
+Window& Window::text(std::string caption){
+ Ogre::OverlayContainer* T = createStaticText((mCursorLeftRight?mCursorX:-int(mCursorX)),mCursorY,caption);
+ _AdjustCursor(mCursorX+T->getWidth(),T->getHeight());return *this;
+}
+////////////////////////////////////////////////////////////////////////////////////
+void Window::_AdjustCursor(unsigned int nx, unsigned int nh) {
+ if (nh > (unsigned) mCursorLineHeight) mCursorLineHeight = nh + 1;
+ if (nx > (unsigned int)(getSize().x)){
+ if (mCursorAutoSize){setSize(nx, getSize().y);}
+ lineBreak();return;}
+ mCursorX = nx + 1;
+}
+////////////////////////////////////////////////////////////////////////////////////
+Button* Window::createButton(int x, int y, const Ogre::String& caption, ButtonMethodPtr method) {
+ Button *button = new Button(x,y, caption, method, this);mButtons.push_back(button);return button;}
+////////////////////////////////////////////////////////////////////////////////////
+Button::Button(int X, int Y, const Ogre::String& caption, ButtonMethodPtr method, Window *parent)
+ :x(X),y(Y),mMethod(method),mParent(parent),mOverlay(0),mCaptionOverlay(0),mDecalLeft(0),mDecalRight(0),mRole(WR_NONE){
+
+ std::string buttonStyle = "button";
+ std::string buttonCaption = caption;
+ if (caption.substr(0,1)=="+"){ buttonCaption = caption.substr(1, caption.length() - 1);
+ parent->mOkayButton = this;buttonStyle = "okay-button";}
+
+ if (caption.substr(0,1)=="-"){ buttonCaption = caption.substr(1, caption.length() - 1);
+ parent->mCancelButton = this;buttonStyle="cancel-button";}
+
+ int decalWidth = parent->mGUI->mStyle[parent->mStyle]->mWidgets["button"].mDecalSize;
+ Ogre::String overlayID = parent->mOverlay->getName() + "/button;" + Ogre::StringConverter::toString(parent->mGUI->mButtonCount++);
+ mOverlay = mParent->mGUI->createOverlayFromWidgetStyle(overlayID, parent->mStyle, buttonStyle, x + decalWidth, y, buttonCaption);
+ if (caption.length()) mCaptionOverlay = static_cast<Ogre::OverlayContainer*>(mOverlay->getChild(mOverlay->getName() + "-caption"));
+ //mCaptionOverlay->setMaterialName("betagui.transparent");
+ h = mOverlay->getHeight();
+ parent->mOverlay->addChild(mOverlay);mOverlay->show();
+
+ mBackground_Normal = mOverlay->getMaterialName();
+ mBackground_Active = mBackground_Normal + "-active";
+
+ if (decalWidth != 0){ mOverlay->addChild(mDecalLeft = parent->mGUI->__getOverlay(mOverlay->getName() + ",L", "Panel", -decalWidth,0, decalWidth, mOverlay->getHeight()));
+ mDecalLeft->setMaterialName(mOverlay->getMaterialName() + "L");
+ mOverlay->addChild(mDecalRight = parent->mGUI->__getOverlay(mOverlay->getName() + ",R", "Panel", mOverlay->getWidth(),0, decalWidth, mOverlay->getHeight()));
+ mDecalRight->setMaterialName(mOverlay->getMaterialName() + "R");
+ w = mOverlay->getWidth() + mDecalLeft->getWidth();}
+
+ else{ w = mOverlay->getWidth();}
+
+ return_if(!caption.length())
+
+ if(x<0){ x = parent->getSize().x - w - Ogre::Math::Abs(x);
+ mOverlay->setLeft(x);}
+
+ if(y<0){ y = parent->getSize().y - h - Ogre::Math::Abs(y);
+ mOverlay->setTop(y);}
+
+}
+////////////////////////////////////////////////////////////////////////////////////
+Button::Button(int X, int Y, int W, int H, const Ogre::String& caption, Window *parent, WindowRole role)
+ :x(X),y(Y),w(W),h(H),mParent(parent),mOverlay(0),mCaptionOverlay(0),mDecalLeft(0),mDecalRight(0),mRole(role){
+
+ Ogre::String overlayID = parent->mOverlay->getName() + "/titlebar";
+ parent->mGUI->mButtonCount++;
+
+ if(mRole==WR_DRAG){ mOverlay = mParent->mGUI->createOverlayFromWidgetStyle(overlayID,parent->mStyle,"titlebar",x,y,caption);
+ parent->mOverlay->addChild(mOverlay);
+ mOverlay->setWidth(w=W);
+ h=mOverlay->getHeight();
+ parent->mGUI->__updateCenteredOverlay(mOverlay);
+ mOverlay->show();
+ mBackground_Normal = mOverlay->getMaterialName();
+ mBackground_Active = mBackground_Normal;
+ return;}
+
+}
+////////////////////////////////////////////////////////////////////////////////////
+void Button::setX(int X) { mOverlay->setLeft(x = X);}
+////////////////////////////////////////////////////////////////////////////////////
+void Button::setY(int Y) { mOverlay->setTop(y = Y);}
+////////////////////////////////////////////////////////////////////////////////////
+unsigned int Button::getWidth() {
+ unsigned int w = (unsigned int)(mOverlay->getWidth());
+ return_this_if(w, mDecalLeft == 0);
+ w+= mDecalLeft->getWidth() + mDecalRight->getWidth();
+ return w;
+}
+////////////////////////////////////////////////////////////////////////////////////
+unsigned int Button::getHeight(){return (unsigned int)(mOverlay->getHeight());}
+////////////////////////////////////////////////////////////////////////////////////
+void Button::setToActive() {
+ mOverlay->setMaterialName(mBackground_Active);
+ return_if(mDecalLeft == 0);
+ mDecalLeft->setMaterialName(mBackground_Active + "L");
+ mDecalRight->setMaterialName(mBackground_Active + "R");
+}
+////////////////////////////////////////////////////////////////////////////////////
+void Button::setToNormal() {
+ mOverlay->setMaterialName(mBackground_Normal);
+ return_if(mDecalLeft == 0)
+ mDecalLeft->setMaterialName(mBackground_Normal + "L");
+ mDecalRight->setMaterialName(mBackground_Normal + "R");
+}
+////////////////////////////////////////////////////////////////////////////////////
+TextInput* Window::createTextInput(int x, int y, int w, const Ogre::String& initialValue, unsigned maxLength) {
+ TextInput *textinput = new TextInput(x,y,w, initialValue, maxLength, this);
+ mTextInputs.push_back(textinput);
+ return textinput;
+}
+////////////////////////////////////////////////////////////////////////////////////
+Ogre::OverlayContainer* Window::createStaticText(int x, int y, const Ogre::String& caption) {
+ Ogre::OverlayContainer* text = mGUI->__getOverlay(mOverlay->getName() + "/text;" + Ogre::StringConverter::toString(mGUI->mButtonCount++), "TextArea", x,y,64,30);
+ text->setCaption(caption);
+ text->setParameter("font_name", mGUI->mStyle[mStyle]->mFontFace);
+ text->setParameter("char_height", Ogre::StringConverter::toString(mGUI->mStyle[mStyle]->mFontSize));
+ Ogre::Font* f = dynamic_cast<Ogre::Font*>(Ogre::FontManager::getSingletonPtr()->getByName(mGUI->mStyle[mStyle]->mFontFace).get());
+ int fontSize = mGUI->mStyle[mStyle]->mFontSize;f->setTrueTypeSize(fontSize);
+ float textWidth = 0; Ogre::Real sp = f->getGlyphAspectRatio(0x0030) * fontSize;
+ for(unsigned int i=0; i < caption.length();i++){
+ if (caption[i] == 0x0020) textWidth += sp;
+ else textWidth += f->getGlyphAspectRatio(caption[i]) * fontSize;}
+ text->setWidth(Ogre::Math::Ceil(textWidth));text->setHeight(fontSize);
+ if(x<0){ x = getSize().x - text->getWidth() - Ogre::Math::Abs(x);
+ text->setLeft(x);}
+ if(y<0){ y = getSize().y - text->getHeight() - Ogre::Math::Abs(y);
+ text->setTop(y);}
+ text->show();mWidgetContainer->addChild(text);
+ return text;
+}
+////////////////////////////////////////////////////////////////////////////////////
+TextInput::TextInput(int X, int Y, int W, const Ogre::String& initialValue, unsigned maxLength, Window *parent)
+ : x(X), y(Y), mValue(initialValue), mLength(maxLength), mParent(parent)
+// : x(D.x),y(D.y),w(D.z),h(D.w),value(V),mBackground_Normal(M), mBackground_Active(M), length(L)
+{
+ int decalWidth = parent->mGUI->mStyle[parent->mStyle]->mWidgets["textinput"].mDecalSize;
+
+ Ogre::String overlayID = parent->mOverlay->getName() + "/textinput;" + Ogre::StringConverter::toString(parent->mGUI->mTextInputCount++);
+ mOverlay = mParent->mGUI->createOverlayFromWidgetStyle(overlayID, parent->mStyle, "textinput", x + 0, y, initialValue);
+ parent->mOverlay->addChild(mOverlay);
+ mOverlay->show();
+
+ if (mOverlay->getWidth() < W) {
+ mOverlay->setWidth(W);
+ }
+
+ if (decalWidth != 0) {
+ mDecalLeft = static_cast<Ogre::OverlayContainer*>(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", mOverlay->getName() + ",L"));
+ mOverlay->addChild(mDecalLeft);
+ mDecalLeft->setMetricsMode(Ogre::GMM_PIXELS);
+ mDecalLeft->setPosition(-decalWidth,0);
+ mDecalLeft->setDimensions(decalWidth,mOverlay->getHeight());
+ mDecalLeft->setMaterialName(mOverlay->getMaterialName() + "L");
+
+ mDecalRight = static_cast<Ogre::OverlayContainer*>(mDecalLeft->clone(mOverlay->getName() + ",R"));
+ mOverlay->addChild(mDecalRight);
+ mDecalRight->setLeft(mOverlay->getWidth());
+ mDecalRight->setMaterialName(mOverlay->getMaterialName() + "R");
+
+ w = mOverlay->getWidth() + mDecalLeft->getWidth();
+ }
+ else {
+ w = mOverlay->getWidth();
+ }
+ h = mOverlay->getHeight();
+
+
+ mBackground_Normal = mOverlay->getMaterialName();
+ mBackground_Active = mBackground_Normal + "-active";
+}
+////////////////////////////////////////////////////////////////////////////////////
+void TextInput::setToActive() {
+ mOverlay->setMaterialName(mBackground_Active);
+ return_if(mDecalLeft == 0)
+ mDecalLeft->setMaterialName(mBackground_Active + "L");
+ mDecalRight->setMaterialName(mBackground_Active + "R");
+}
+////////////////////////////////////////////////////////////////////////////////////
+void TextInput::setToNormal() {
+ mOverlay->setMaterialName(mBackground_Normal);
+ return_if(mDecalLeft == 0)
+ mDecalLeft->setMaterialName(mBackground_Normal + "L");
+ mDecalRight->setMaterialName(mBackground_Normal + "R");
+}
+////////////////////////////////////////////////////////////////////////////////////
+bool Window::checkKey(const Ogre::String& k, unsigned int px, unsigned int py) {
+ return_this_if(false, !mOverlay->isVisible());
+ return_this_if(false, !(px>=x&&py>=y)||!(px<=x+w&&py<=y+h));
+ return_this_if(false, mActiveTextInput == 0);
+
+ mActiveTextInput->mCaptionOverlay->setCaption(mActiveTextInput->mValue+=k);
+ return true;
+}
+////////////////////////////////////////////////////////////////////////////////////
+bool Window::checkSpecialKey(SpecialKey key,unsigned int px,unsigned int py) {
+ return_this_if(false, !mOverlay->isVisible());
+ return_this_if(false, !(px>=x&&py>=y)||!(px<=x+w&&py<=y+h));
+ if (key == SK_ENTER && mOkayButton && mActiveTextInput == 0)
+ (mListener->*mOkayButton->mMethod)(mOkayButton, FS_SELECT_OFF);
+ if (key == SK_ENTER && mActiveTextInput) {
+ mActiveTextInput->setToNormal();mActiveTextInput=0;
+ }
+ if (key == SK_ESCAPE && mCancelButton && mActiveTextInput == 0) {
+ (mListener->*mCancelButton->mMethod)(mCancelButton, FS_SELECT_OFF);
+ }
+ return true;
+}
+////////////////////////////////////////////////////////////////////////////////////
+bool Window::check(unsigned int px, unsigned int py, bool LMB) {
+
+ if (!mOverlay->isVisible()) return false;
+
+ // Check if we aren't the active window
+ if (mGUI->mActiveWindow != this && LMB) {
+ if ((px >= x && py >= y) && (px <= x + w && py <= y + h)){
+ if (mGUI->mActiveWindow)
+ mGUI->mActiveWindow->setToNormal();
+ mGUI->mActiveWindow = this;
+ mGUI->mActiveWindow->setToActive();
+ }
+ }
+
+
+ // Mode is dragging.
+ if (mMode == WM_DRAG) {
+ if (LMB){ setPosition(px + dx, py + dy);
+ }else mMode = WM_NONE;
+ return true;}
+
+ // LMB_DOWN
+ // If LMB is off, and we have an activebutton. execute method and WM_NONE
+ if (mMode == WM_LMB_DOWN){
+ if (!LMB && mActiveButton){
+ (mListener->*mActiveButton->mMethod)(mActiveButton, FS_SELECT_OFF);
+ mActiveButton->setToNormal();
+ mActiveButton = 0;
+ mMode = WM_NONE;
+ return true;
+ }
+ }
+
+
+ // Is the mouse pointer inside the area of the window.
+ // No? Clear active button, set to normal and return false.
+ if (!(px >= x && py >= y) || !(px <= x + w && py <= y + h)){
+ if (mActiveButton){ mActiveButton->setToNormal();
+ mActiveButton = 0;mMode = WM_NONE;}
+ return false;}
+
+ // Is there an active button.
+ if (mActiveButton) {
+ if (mActiveButton->out(px,py,x,y)) {
+ mActiveButton->setToNormal();
+ mActiveButton = 0;
+ mMode = WM_NONE;
+ }
+ }
+
+ // For each button. Check if mouse pointer is in it.
+ // Yes:
+ // - Check if there is an active button
+ // Yes: Set to Normal and Clear
+ // - Assign button to active button and set to active.
+ for (unsigned int i=0;i < mButtons.size();i++) {
+
+ if (!mButtons[i]->out(px,py,x,y)) {
+ if (LMB) {
+ if (mActiveButton) {
+ mActiveButton->setToNormal();
+ mActiveButton = 0;
+ }
+
+ if(mButtons[i]->mRole==WR_NONE) {
+ mMode = WM_LMB_DOWN;
+ mActiveButton = mButtons[i];
+ mActiveButton->setToActive();
+ }
+ else if(mButtons[i]->mRole==WR_DRAG) {
+ mMode = WM_DRAG;
+ dx = (int) x - px; dy = (int) y - py;
+ }
+ return true;
+ }
+ }
+ }
+
+ return true;
+#if 0
+ if (!mOverlay->isVisible()) return false;
+ if (mMode == WM_DRAG) {
+ if (LMB){ setPosition(px + dx, py + dy);
+ }else mMode = WM_NONE;
+ return true;}
+ if (mMode == WM_LMB_DOWN){
+ if (!LMB && mActiveButton){
+ (mListener->*mActiveButton->mMethod)(mActiveButton, FS_SELECT_OFF);
+ mMode = WM_NONE;}
+ else{return false;}}
+ if (!(px >= x && py >= y) || !(px <= x + w && py <= y + h)){
+ if (mActiveButton){ mActiveButton->setToNormal();
+ mActiveButton = 0;}
+ return false;}
+
+ for (unsigned int i=0;i < mButtons.size();i++) {
+
+ if (mButtons[i]->out(px,py,x,y)) {
+ if (mActiveButton) {
+ mActiveButton->setToNormal();
+ mActiveButton = 0;
+ }
+ continue;
+ }
+
+ mActiveButton=mButtons[i];
+
+ if (LMB) {
+ mActiveButton->setToActive();
+
+ if (mActiveButton->mRole == WR_NONE) {
+ mMode = WM_LMB_DOWN;
+ (mListener->*mActiveButton->mMethod)(mActiveButton, FS_SELECT);
+ }
+ else if(mActiveButton->mRole==WR_DRAG) {
+ mMode = WM_DRAG;
+ dx = (int) x - px; dy = (int) y - py;
+ return true;
+ }
+
+ }
+ else {
+ mActiveButton->setToNormal();
+ }
+
+ if(mActiveTextInput && LMB) {
+ mActiveTextInput->setToNormal();
+ mActiveTextInput=0;
+ }
+
+ }
+
+ if (mActiveTextInput) {
+ if (LMB && !mActiveTextInput->in(px,py,x,y)) {
+ mActiveTextInput->setToNormal();
+ mActiveTextInput=0;
+ std::cout << "Text Input cleared: " << mActiveTextInput << std::endl;
+ return true;
+ }
+ return true;
+ }
+
+
+ for (unsigned int i=0;i<mTextInputs.size();i++) {
+ continue_if(mTextInputs[i]->in(px,py,x,y));
+ std::cout << "New Text Input: " << mActiveTextInput << std::endl;
+ mActiveTextInput=mTextInputs[i];
+ mActiveTextInput->setToActive();
+ return true;
+ }
+
+ return true;
+#endif
+}
+////////////////////////////////////////////////////////////////////////////////////
+void Style::addStyle(Ogre::String widgetName, const Ogre::String& style) {
+ std::transform(widgetName.begin(),widgetName.end(),widgetName.begin(),tolower);
+ mWidgets[widgetName]=WidgetStyle(style);}
+////////////////////////////////////////////////////////////////////////////////////
+void WidgetStyle::fromStyle(const Ogre::String& p) {
+ std::string delims=" \t\r";
+ std::vector<std::string>ds=Ogre::StringUtil::split(p,";");std::pair<std::string,std::string> d; size_t dp;
+ for(std::vector<std::string>::iterator it = ds.begin();it != ds.end();++it) {
+ dp = (*it).find_first_of(":");
+ d.first = (*it).substr(0,dp);d.second = (*it).substr(dp+1, (*it).length() - dp - 1);
+ d.first.erase(d.first.find_last_not_of(delims)+1);d.first.erase(0,d.first.find_first_not_of(delims));
+ d.second.erase(d.second.find_last_not_of(delims)+1);d.second.erase(0,d.second.find_first_not_of(delims));
+ std::transform(d.first.begin(),d.first.end(),d.first.begin(),tolower);
+ continue_if(Style::_set("background", d, mBackground))
+ continue_if(Style::_set("background", d, mBackground))
+ continue_if(Style::_set("font-face", d, mFontFace))
+ continue_if(Style::_set("font-size", d, mFontSize))
+ continue_if(Style::_set("decal-size", d, mDecalSize))
+ continue_if(Style::_set("height", d, mHeight))
+ continue_if(Style::_set("colour", d, mColour))
+ continue_if(Style::_set("color", d, mColour))
+ if (d.first == "text-align"){
+ std::transform(d.second.begin(),d.second.end(),d.second.begin(),tolower);
+ if(d.second=="centre"||d.second=="center"){centerText=true;}
+ }
+ }
+}
+////////////////////////////////////////////////////////////////////////////////////
+bool Style::_set(const Ogre::String& i, std::pair<Ogre::String,Ogre::String>& d , unsigned int& t) {
+ do_if(d.first,i,t=Ogre::StringConverter::parseUnsignedInt(d.second))}
+bool Style::_set(const Ogre::String& i, std::pair<Ogre::String,Ogre::String>& d , int& t) {
+ do_if(d.first,i,t=Ogre::StringConverter::parseInt(d.second))}
+bool Style::_set(const Ogre::String& i, std::pair<Ogre::String,Ogre::String>& d, bool& t) {
+ do_if(d.first,i,t=Ogre::StringConverter::parseBool(d.second))}
+bool Style::_set(const Ogre::String& i , std::pair<Ogre::String,Ogre::String>& d, Ogre::Real& t) {
+ do_if(d.first,i,t=Ogre::StringConverter::parseReal(d.second))}
+bool Style::_set(const Ogre::String& i, std::pair<Ogre::String,Ogre::String>& d, Ogre::String& t) {
+ do_if(d.first,i,t=d.second)}
+bool Style::_set(const Ogre::String& i, std::pair<Ogre::String,Ogre::String>& d, Ogre::ColourValue& t) {
+ do_if(d.first,i,t=Ogre::StringConverter::parseColourValue(d.second))}
+////////////////////////////////////////////////////////////////////////////////////
+bool GUI::injectKey(const Ogre::String& key) {
+ for(std::vector<Window*>::iterator i=mWindow.begin();i!=mWindow.end();i++) {
+ if((*i)->checkKey(key,lastKnownMouseX,lastKnownMouseY))return true;}
+ return false;
+}
+////////////////////////////////////////////////////////////////////////////////////
+void GUI::injectSpecialKey(SpecialKey key) {
+ for(unsigned int i=0;i<mWindow.size();i++) {
+ if(mWindow[i]->checkSpecialKey(key,lastKnownMouseX,lastKnownMouseY)){return;}
+ }
+}
+////////////////////////////////////////////////////////////////////////////////////
+#if BETAGUI_USES_OIS
+bool GUI::mouseMoved(const OIS::MouseEvent &e){mOver = injectRelMouse(e.state.X.rel,e.state.Y.rel, e.state.buttonDown(OIS::MB_Left));return false;}
+bool GUI::mousePressed(const OIS::MouseEvent &e,OIS::MouseButtonID i){mOver = injectRelMouse(e.state.X.rel,e.state.Y.rel, e.state.buttonDown(OIS::MB_Left));return false;}
+bool GUI::mouseReleased(const OIS::MouseEvent &e,OIS::MouseButtonID i){mOver = injectRelMouse(e.state.X.rel,e.state.Y.rel, e.state.buttonDown(OIS::MB_Left));return false;}
+////////////////////////////////////////////////////////////////////////////////////
+bool GUI::keyPressed(const OIS::KeyEvent &e) {
+ if (e.key == SK_BACKSPACE || e.key == SK_ENTER || e.key == SK_ESCAPE || e.key == SK_TAB) {
+ injectSpecialKey((SpecialKey) e.key); return false;
+ }
+ std::string k;
+ char c;
+ c = static_cast<char>(e.text);
+ k.append(k);
+ injectKey(k);
+ return false;
+}
+
+bool GUI::keyReleased(const OIS::KeyEvent &e) {return false;}
+#endif
+////////////////////////////////////////////////////////////////////////////////////
+#undef return_this_if
+#undef return_if
+#undef continue_if
+#undef do_if
+} // End of Betajaen's GUI. Normal programming can resume now.
\ No newline at end of file
Added: trunk/python-ogre/ThirdParty/betagui/BetaGUI2.h
===================================================================
--- trunk/python-ogre/ThirdParty/betagui/BetaGUI2.h (rev 0)
+++ trunk/python-ogre/ThirdParty/betagui/BetaGUI2.h 2008-11-03 07:41:04 UTC (rev 787)
@@ -0,0 +1,319 @@
+// BetaGUI 2.0", Version 36 http://www.ogre3d.org/wiki/index.php/BetaGUI2
+//
+// Copyright (c) 2008 Robin Southern <bet...@ih...>
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef BETAGUI_H
+#define BETAGUI_H
+typedef float NxReal;
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Options.
+// Use OIS, automatically sets up, mouse and key listener for you. Self injects input events (unless told not too.)
+#define BETAGUI_USES_OIS 1
+// Fix the bug with Visual Studio compiler, related to the class member pointer size being incorrect.
+// Windows/Visual Studio only, Not required in Linux, OSX,etc.
+#pragma pointers_to_members(full_generality, virtual_inheritance)
+//
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#include "Ogre.h"
+#if BETAGUI_USES_OIS
+#include <ois.h>
+#endif
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#define ButtonPtr (BetaGUI2::ButtonMethodPtr)
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+namespace BetaGUI2 {
+
+ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ class GUI;
+ class Style;
+ struct WindowStyle;
+ struct WidgetStyle;
+ class Window;
+ class Widget;
+ class Button;
+ class TextInput;
+ class Slider;
+ class NumericSlider;
+ class StringSlider;
+ class Meter;
+ class Select;
+ class GUIListener{};
+ class Binding;
+ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ enum WindowFeatureType { WFT_NONE = 0, WFT_MOVE, WFT_RESIZE, WFT_RESIZE_AND_MOVE, WFT_ON_TOP };
+ enum FocusState { FS_NONE = 0, FS_SELECT, FS_SELECT_OFF, FS_DRAG };
+#if BETAGUI_USES_OIS ...
[truncated message content] |
|
From: <and...@us...> - 2008-11-03 07:40:12
|
Revision: 786
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=786&view=rev
Author: andy_miller
Date: 2008-11-03 07:40:08 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
Updated to latest ET SceneManager - Changed to BetaGui to latest version
Modified Paths:
--------------
trunk/python-ogre/SConstruct
trunk/python-ogre/ThirdParty/et/ETBrush.cpp
trunk/python-ogre/ThirdParty/et/ETLightmap.cpp
trunk/python-ogre/ThirdParty/et/ETLoadSaveHeightmap.cpp
trunk/python-ogre/ThirdParty/et/ETPrerequisites.h
trunk/python-ogre/ThirdParty/et/ETSplattingManager.cpp
trunk/python-ogre/ThirdParty/et/ETTerrainInfo.cpp
trunk/python-ogre/ThirdParty/et/ETTerrainInfo.h
trunk/python-ogre/ThirdParty/et/ETTerrainManager.cpp
trunk/python-ogre/ThirdParty/et/ETTerrainManager.h
trunk/python-ogre/ThirdParty/et/ETTile.cpp
trunk/python-ogre/ThirdParty/et/Impl/ETOptions.h
trunk/python-ogre/ThirdParty/et/Impl/ETTerrainImpl.h
trunk/python-ogre/ThirdParty/et/Impl/ETTile.h
trunk/python-ogre/code_generators/betagui/customization_data.py
trunk/python-ogre/code_generators/betagui/generate_code.py
trunk/python-ogre/code_generators/betagui/python_betagui.h
trunk/python-ogre/demos/ogre/Demo_Bezier.py
trunk/python-ogre/demos/ogre/Demo_Smoke.py
trunk/python-ogre/demos/plugins.cfg
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/SConstruct 2008-11-03 07:40:08 UTC (rev 786)
@@ -146,8 +146,13 @@
cls._source = cls.generated_dir
cls._build_dir = os.path.join ( builddir, cls.dir_name)
cls._name = name
- _env = Environment(ENV=os.environ)
+ ## Note the change -- bug in scons means you have to set env seperately
+ _env = Environment(ENV = os.environ)
+
+ print os.environ['PATH']
+ print _env['ENV']
+
if environment.rpath:
_env.Append(RPATH=environment.rpath)
@@ -209,7 +214,7 @@
if environment.isWindows():
## and lets have it install the output into the 'package_dir_name/ModuleName' dir and rename to the PydName
_env.AddPostAction(package,\
- 'mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % { 'name':package[index] } )
+ Action ('mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % { 'name':package[index] } ) )
if environment.isLinux() and "-g" not in _env["CCFLAGS"]:
_env.AddPostAction(package,\
'-strip -g -S -d --strip-debug -s %(name)s' % { 'name':package[index] } )
Modified: trunk/python-ogre/ThirdParty/et/ETBrush.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETBrush.cpp 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETBrush.cpp 2008-11-03 07:40:08 UTC (rev 786)
@@ -120,7 +120,11 @@
void saveBrushToImage(const Brush& brush, Image& image)
{
// save brush as a 16bit grayscale image
- ushort* data = new ushort[brush.getWidth()*brush.getHeight()];
+#if OGRE_VERSION_MINOR > 4
+ ushort* data = (ushort*)OGRE_ALLOC_T(uchar, brush.getWidth()*brush.getHeight()*sizeof(ushort), MEMCATEGORY_GENERAL);
+#else
+ ushort* data = (ushort*)new uchar[brush.getWidth()*brush.getHeight()*sizeof(ushort)];
+#endif
for (size_t x = 0; x < brush.getWidth(); ++x)
for (size_t y = 0; y < brush.getHeight(); ++y)
data[y*brush.getWidth() + x] = ushort(brush.at(x, y) * 0xffff);
Modified: trunk/python-ogre/ThirdParty/et/ETLightmap.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETLightmap.cpp 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETLightmap.cpp 2008-11-03 07:40:08 UTC (rev 786)
@@ -285,7 +285,13 @@
step.z /= height;
Vector3 pos = startPos;
+#if OGRE_VERSION_MINOR > 4
+ // Ogre::Image uses the memory allocation macros internally in Shoggoth,
+ // so we must use them as well.
+ uchar* lightMap = OGRE_ALLOC_T(uchar, width*height*3, MEMCATEGORY_GENERAL);
+#else
uchar* lightMap = new uchar[width*height * 3];
+#endif
memset(lightMap, 255, width*height*3);
for (size_t z = 0; z < height; ++z)
@@ -322,6 +328,6 @@
// save lightmap to image
image.loadDynamicImage(lightMap, width, height, 1, PF_BYTE_RGB, true);
- // ownership of lightMap was transfered to image, don't need to delete
+ // ownership of lightMap was transfered to image, don't need to delete
}
}
Modified: trunk/python-ogre/ThirdParty/et/ETLoadSaveHeightmap.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETLoadSaveHeightmap.cpp 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETLoadSaveHeightmap.cpp 2008-11-03 07:40:08 UTC (rev 786)
@@ -105,7 +105,11 @@
uint maxVal = (1 << (bpp*8)) - 1;
+#if OGRE_VERSION_MINOR > 4
+ uchar* data = OGRE_ALLOC_T(uchar, info.getWidth()*info.getHeight()*bpp, MEMCATEGORY_GENERAL);
+#else
uchar* data = new uchar[info.getWidth()*info.getHeight()*bpp];
+#endif
uchar* pos = data;
// fill data array
Modified: trunk/python-ogre/ThirdParty/et/ETPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETPrerequisites.h 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETPrerequisites.h 2008-11-03 07:40:08 UTC (rev 786)
@@ -3,26 +3,20 @@
#include <OgrePlatform.h>
-#define _ETManagerExport
+// #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32 )
+// # ifdef ET_MANAGER_EXPORTS
+// # define _ETManagerExport __declspec(dllexport)
+// # else
+// # if defined( __MINGW32__ )
+# define _ETManagerExport
+// # else
+// # define _ETManagerExport __declspec(dllimport)
+// # endif
+// # endif
+// #elif defined ( OGRE_GCC_VISIBILITY )
+// # define _ETManagerExport __attribute__ ((visibility("default")))
+// #else
+// # define _ETManagerExport
+// #endif
-// // #ifndef _ETManagerExport
-
-// // #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32 )
-// // # ifdef ET_MANAGER_EXPORTS
-// // # define _ETManagerExport __declspec(dllexport)
-// // # else
-// // # if defined( __MINGW32__ )
-// // # define _ETManagerExport
-// // # else
-// // # define _ETManagerExport __declspec(dllimport)
-// // # endif
-// // # endif
-// // #elif defined ( OGRE_GCC_VISIBILITY )
-// // # define _ETManagerExport __attribute__ ((visibility("default")))
-// // #else
-// // # define _ETManagerExport
-// // #endif
-
-// // #endif
-
#endif
Modified: trunk/python-ogre/ThirdParty/et/ETSplattingManager.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETSplattingManager.cpp 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETSplattingManager.cpp 2008-11-03 07:40:08 UTC (rev 786)
@@ -422,7 +422,11 @@
if (colours.size() > mImpl->numTextures)
OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Given more colours than texture channels available.", __FUNCTION__);
+#if OGRE_VERSION_MINOR > 4
+ uchar* data = OGRE_ALLOC_T(uchar, mImpl->width*mImpl->height*3, MEMCATEGORY_GENERAL);
+#else
uchar* data = new uchar[mImpl->width*mImpl->height*3];
+#endif
for (size_t y = 0; y < mImpl->height; ++y)
{
@@ -461,7 +465,11 @@
it->resize(scaleWidth, scaleHeight);
// create the buffer to hold our generated base texture
+#if OGRE_VERSION_MINOR > 4
+ uchar* data = OGRE_ALLOC_T(uchar, width*height*3, MEMCATEGORY_GENERAL);
+#else
uchar* data = new uchar[width*height*3];
+#endif
size_t pos = 0;
for (size_t y = 0; y < height; ++y)
{
@@ -497,7 +505,11 @@
if (colourMap.getWidth() != lightMap.getWidth() || colourMap.getHeight() != lightMap.getHeight())
OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Images must have the same dimensions.", __FUNCTION__);
+#if OGRE_VERSION_MINOR > 4
+ uchar* data = OGRE_ALLOC_T(uchar, colourMap.getWidth()*colourMap.getHeight()*3, MEMCATEGORY_GENERAL);
+#else
uchar* data = new uchar[colourMap.getWidth()*colourMap.getHeight()*3];
+#endif
for (size_t y = 0; y < colourMap.getWidth(); ++y)
{
Modified: trunk/python-ogre/ThirdParty/et/ETTerrainInfo.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETTerrainInfo.cpp 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETTerrainInfo.cpp 2008-11-03 07:40:08 UTC (rev 786)
@@ -190,6 +190,25 @@
}
+ /** Addition from SongOfTheWeave */
+ Vector3 TerrainInfo::getTangentAt(float x, float z) const
+ {
+ Ogre::Vector3 v3Return;
+ int flip = 1;
+ Vector3 here (x, getHeightAt(x, z), z);
+ Vector3 left (x - 1, getHeightAt(x - 1, z), z);
+ if (left.x < 0.0)
+ {
+ flip *= -1;
+ left = Vector3(x + 1, getHeightAt(x + 1, z), z);
+ }
+ left -= here;
+ v3Return = flip * left;
+ v3Return.normalise();
+ return v3Return;
+ }
+
+
std::pair<bool, Vector3> TerrainInfo::rayIntersects(const Ray& ray) const
{
AxisAlignedBox box = getExtents();
Modified: trunk/python-ogre/ThirdParty/et/ETTerrainInfo.h
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETTerrainInfo.h 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETTerrainInfo.h 2008-11-03 07:40:08 UTC (rev 786)
@@ -107,6 +107,9 @@
/** Calculates the terrain normal at the given coordinates. */
Ogre::Vector3 getNormalAt(float x, float z) const;
+ /** Calculates the terrain tangent at the given coordinates. */
+ Ogre::Vector3 getTangentAt(float x, float z) const;
+
/**
* Checks if a ray intersects with the terrain.
* @param ray The ray to check for intersection with the terrain.
Modified: trunk/python-ogre/ThirdParty/et/ETTerrainManager.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETTerrainManager.cpp 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETTerrainManager.cpp 2008-11-03 07:40:08 UTC (rev 786)
@@ -84,7 +84,7 @@
}
- void TerrainImpl::createTerrain(const TerrainInfo& info, size_t tileSize, uint maxLOD, bool vertexNormals)
+ void TerrainImpl::createTerrain(const TerrainInfo& info, size_t tileSize, uint maxLOD, bool vertexNormals, bool vertexTangents)
{
// ensure we have a viewport height set
if (mOpt.factorC <= 0)
@@ -99,8 +99,11 @@
// load new terrain
mInfo = info;
mOpt.tileSize = tileSize;
+ if (maxLOD < 1)
+ maxLOD = 1;
mOpt.maxMipMapLevel = min(maxLOD, maxPossibleLOD);
mOpt.vertexNormals = vertexNormals;
+ mOpt.vertexTangents = vertexTangents;
mIndexHandler = new IndexHandler(mOpt.tileSize, mOpt.maxMipMapLevel);
createTiles();
@@ -332,9 +335,9 @@
delete mImpl;
}
- void TerrainManager::createTerrain(const TerrainInfo& info, size_t tileSize, uint maxLOD, bool vertexNormals)
+ void TerrainManager::createTerrain(const TerrainInfo& info, size_t tileSize, uint maxLOD, bool vertexNormals, bool vertexTangents)
{
- mImpl->createTerrain(info, tileSize, maxLOD, vertexNormals);
+ mImpl->createTerrain(info, tileSize, maxLOD, vertexNormals, vertexTangents);
}
void TerrainManager::destroyTerrain()
Modified: trunk/python-ogre/ThirdParty/et/ETTerrainManager.h
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETTerrainManager.h 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETTerrainManager.h 2008-11-03 07:40:08 UTC (rev 786)
@@ -77,8 +77,10 @@
* @param tileSize the tile size to use, must be (2^n+1)
* @param maxLOD the maximal level of detail to be used
* @param vertexNormals generate vertex normals? (necessary for dynamic lighting)
+ * @param vertexTangents generate vertex tangents? (necessary for adv. dynamic lighting)
*/
- void createTerrain(const TerrainInfo& info, size_t tileSize = 33, unsigned int maxLOD = 255, bool vertexNormals = false);
+ void createTerrain(const TerrainInfo& info, size_t tileSize = 33, unsigned int maxLOD = 255,
+ bool vertexNormals = false, bool vertexTangents = false);
/** Destroys the currently loaded terrain (if any). */
void destroyTerrain();
Modified: trunk/python-ogre/ThirdParty/et/ETTile.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/et/ETTile.cpp 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/ETTile.cpp 2008-11-03 07:40:08 UTC (rev 786)
@@ -55,8 +55,10 @@
mTerrain(0),
mLastNextLevel(0)
{
+ if (mOpt.maxMipMapLevel < 1)
+ mOpt.maxMipMapLevel = 1;
// disable LOD morphing if max LOD is 1
- if (mOpt.maxMipMapLevel <= 1)
+ if (mOpt.maxMipMapLevel == 1)
mOpt.useLODMorph = false;
mCastShadows = false;
@@ -70,6 +72,7 @@
Tile::~Tile()
{
+ delete mTerrain;
}
const String& Tile::getMovableType() const
@@ -160,6 +163,11 @@
decl->addElement(MAIN_BINDING, offset, VET_FLOAT3, VES_NORMAL);
offset += VertexElement::getTypeSize(VET_FLOAT3);
}
+ if (mOpt.vertexTangents)
+ {
+ decl->addElement(MAIN_BINDING, offset, VET_FLOAT3, VES_TANGENT);
+ offset += VertexElement::getTypeSize(VET_FLOAT3);
+ }
decl->addElement(MAIN_BINDING, offset, VET_FLOAT2, VES_TEXTURE_COORDINATES, 0);
offset += VertexElement::getTypeSize(VET_FLOAT2);
@@ -239,6 +247,9 @@
// calc vertex normals, if necessary
if (mOpt.vertexNormals)
calculateVertexNormals();
+ // calc vertex tangents, if necessary
+ if (mOpt.vertexTangents)
+ calculateVertexTangents();
}
@@ -275,6 +286,38 @@
}
+ /** Addition by SongOfTheWeave */
+ void Tile::calculateVertexTangents()
+ {
+ // set the vertex tangents of the tile
+ size_t startx = mStartX;
+ size_t startz = mStartZ;
+ size_t endx = startx + mOpt.tileSize;
+ size_t endz = startz + mOpt.tileSize;
+ //Real minHeight = mInfo.getOffset().y + mInfo.getScaling().y, maxHeight = mInfo.getOffset().y;
+
+ const VertexElement* normElem = mTerrain->vertexDeclaration->findElementBySemantic(VES_TANGENT);
+ unsigned char* pBase = static_cast<unsigned char*>(mMainBuffer->lock(HardwareBuffer::HBL_NORMAL));
+
+ for (size_t j = startz; j < endz; ++j)
+ {
+ for (size_t i = startx; i < endx; ++i)
+ {
+ float* pTan;
+ normElem->baseVertexPointerToElement(pBase, &pTan);
+
+ Vector3 tangent = mInfo.getTangentAt(mInfo.vertexToPosX((int)i), mInfo.vertexToPosZ((int)j));
+ *pTan++ = tangent.x;
+ *pTan++ = tangent.y;
+ *pTan++ = tangent.z;
+
+ pBase += mMainBuffer->getVertexSize();
+ }
+ }
+ mMainBuffer->unlock();
+ }
+
+
IndexData* Tile::getIndexData()
{
IndexData* data = mIndexHandler->requestIndexData(mLOD,
@@ -472,7 +515,7 @@
Real range = mLODChangeMinDistSqr[nextLevel] - mLODChangeMinDistSqr[mLOD];
Real percent = (L - mLODChangeMinDistSqr[mLOD]) / range;
Real rescale = 1.0f / (1.0f - mOpt.lodMorphStart);
- mLODMorphFactor = std::max((percent - mOpt.lodMorphStart), Real(0));
+ mLODMorphFactor = std::max((percent - mOpt.lodMorphStart) * rescale, Real(0));
}
if (mLastNextLevel != nextLevel)
@@ -559,5 +602,14 @@
}
+#if OGRE_VERSION_MINOR > 4
+ /** Shoggoth compatibility function */
+ void Tile::visitRenderables(Renderable::Visitor* visitor, bool debugRenderables)
+ {
+ visitor->visit(this, 0, false, 0);
+ }
+#endif
+
+
}
}
Modified: trunk/python-ogre/ThirdParty/et/Impl/ETOptions.h
===================================================================
--- trunk/python-ogre/ThirdParty/et/Impl/ETOptions.h 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/Impl/ETOptions.h 2008-11-03 07:40:08 UTC (rev 786)
@@ -44,6 +44,7 @@
float factorC;
bool vertexNormals;
+ bool vertexTangents;
bool useLODMorph;
float lodMorphStart;
Modified: trunk/python-ogre/ThirdParty/et/Impl/ETTerrainImpl.h
===================================================================
--- trunk/python-ogre/ThirdParty/et/Impl/ETTerrainImpl.h 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/Impl/ETTerrainImpl.h 2008-11-03 07:40:08 UTC (rev 786)
@@ -53,7 +53,7 @@
TerrainImpl(Ogre::SceneManager* sceneMgr, const std::string& name);
~TerrainImpl();
- void createTerrain(const TerrainInfo& info, size_t tileSize, unsigned int maxLOD, bool vertexNormals);
+ void createTerrain(const TerrainInfo& info, size_t tileSize, unsigned int maxLOD, bool vertexNormals, bool vertexTangents);
void destroyTerrain();
bool isTerrainLoaded() const { return mTerrainLoaded; }
Modified: trunk/python-ogre/ThirdParty/et/Impl/ETTile.h
===================================================================
--- trunk/python-ogre/ThirdParty/et/Impl/ETTile.h 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/ThirdParty/et/Impl/ETTile.h 2008-11-03 07:40:08 UTC (rev 786)
@@ -105,6 +105,12 @@
*/
void updateTerrain(size_t startx, size_t startz, size_t endx, size_t endz);
+
+#if OGRE_VERSION_MINOR > 4
+ /** Shoggoth compatibility function */
+ void visitRenderables(Ogre::Renderable::Visitor* visitor, bool debugRenderables);
+#endif
+
private:
/** Initialises the vertices */
void createVertexData(size_t startx, size_t startz);
@@ -116,6 +122,9 @@
/** Calculates vertex normals */
void calculateVertexNormals();
+ /** Calculates vertex tangents */
+ void calculateVertexTangents();
+
/** Retrieves the position vector for the given vertex */
Ogre::Vector3 getVector(size_t x, size_t z) const;
Modified: trunk/python-ogre/code_generators/betagui/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/betagui/customization_data.py 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/code_generators/betagui/customization_data.py 2008-11-03 07:40:08 UTC (rev 786)
@@ -1,6 +1,6 @@
def header_files( version ):
- return [ 'BetaGUI.h']
+ return [ 'BetaGUI2.h']
def huge_classes( version ):
return []
Modified: trunk/python-ogre/code_generators/betagui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/betagui/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/code_generators/betagui/generate_code.py 2008-11-03 07:40:08 UTC (rev 786)
@@ -42,7 +42,7 @@
import common_utils.var_checker as varchecker
import common_utils.ogre_properties as ogre_properties
-MAIN_NAMESPACE = 'BetaGUI'
+MAIN_NAMESPACE = 'BetaGUI2'
## small helper function
def docit ( general, i, o ):
@@ -99,26 +99,26 @@
global_ns = mb.global_ns
main_ns = global_ns.namespace( MAIN_NAMESPACE )
- ## now expose but don't create class that exist in other modules
- global_ns.namespace( 'Ogre' ).class_('OverlayContainer').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Vector2').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('Vector3').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('Vector4').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('RenderWindow').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('RenderTexture').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('RenderOperation').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('UTFString').include(already_exposed=True)
-# global_ns.class_('::Ogre::FontPtr').include(already_exposed=True)
-# global_ns.class_('::Ogre::RenderQueueListener').include(already_exposed=True)
-# global_ns.class_('::Ogre::SceneManager').include(already_exposed=True)
+# ## now expose but don't create class that exist in other modules
+# global_ns.namespace( 'Ogre' ).class_('OverlayContainer').include(already_exposed=True)
+# global_ns.namespace( 'Ogre' ).class_('Vector2').include(already_exposed=True)
+# # global_ns.namespace( 'Ogre' ).class_('Vector3').include(already_exposed=True)
+# global_ns.namespace( 'Ogre' ).class_('Vector4').include(already_exposed=True)
+# global_ns.namespace( 'Ogre' ).class_('RenderWindow').include(already_exposed=True)
+# # global_ns.namespace( 'Ogre' ).class_('RenderTexture').include(already_exposed=True)
+# global_ns.namespace( 'Ogre' ).class_('RenderOperation').include(already_exposed=True)
+# # global_ns.namespace( 'Ogre' ).class_('UTFString').include(already_exposed=True)
+# # global_ns.class_('::Ogre::FontPtr').include(already_exposed=True)
+# # global_ns.class_('::Ogre::RenderQueueListener').include(already_exposed=True)
+# # global_ns.class_('::Ogre::SceneManager').include(already_exposed=True)
+# #
+# #
+# # global_ns.namespace( 'Ogre' ).class_('Singleton<QuickGUI::GUIManager>').include() #already_exposed=True)
+# # global_ns.namespace( 'Ogre' ).class_('Singleton<QuickGUI::MouseCursor>').include() #already_exposed=True)
+# # global_ns.namespace( 'Ogre' ).class_('Singleton<QuickGUI::FontManager>').include() #already_exposed=True)
#
-#
-# global_ns.namespace( 'Ogre' ).class_('Singleton<QuickGUI::GUIManager>').include() #already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('Singleton<QuickGUI::MouseCursor>').include() #already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('Singleton<QuickGUI::FontManager>').include() #already_exposed=True)
-
-# global_ns.namespace( 'Ogre' ).class_('PanelOverlayElement').include(already_exposed=True)
-# global_ns.namespace( 'Ogre' ).class_('TextAreaOverlayElement').include(already_exposed=True)
+# # global_ns.namespace( 'Ogre' ).class_('PanelOverlayElement').include(already_exposed=True)
+# # global_ns.namespace( 'Ogre' ).class_('TextAreaOverlayElement').include(already_exposed=True)
Modified: trunk/python-ogre/code_generators/betagui/python_betagui.h
===================================================================
--- trunk/python-ogre/code_generators/betagui/python_betagui.h 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/code_generators/betagui/python_betagui.h 2008-11-03 07:40:08 UTC (rev 786)
@@ -1,4 +1,5 @@
-#include "BetaGUI.h"
+typedef float NxReal;
+#include "BetaGUI2.h"
// First we create a magic namespace to hold all our aliases
namespace pyplusplus { namespace aliases {
@@ -8,9 +9,9 @@
// then we exposed everything needed (and more) to ensure GCCXML makes them visible to Py++
//
-namespace python_BetaGUI{ namespace details{
+namespace python_BetaGUI2{ namespace details{
inline void instantiate(){
- using namespace BetaGUI;
+ using namespace BetaGUI2;
#include "python_betagui_sizeof.h"
} } }
Modified: trunk/python-ogre/demos/ogre/Demo_Bezier.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_Bezier.py 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/demos/ogre/Demo_Bezier.py 2008-11-03 07:40:08 UTC (rev 786)
@@ -241,11 +241,11 @@
sf.Application.debugText = "STARTED"
- def _destroyScene(self):
+# # # def __del__(self):
+# # #
+# # # ## free up the pointer before we shut down OGRE
+# # # patch.setNull()
- ## free up the pointer before we shut down OGRE
- patch.setNull()
-
def _createFrameListener(self):
self.frameListener = BezierListener(self.renderWindow, self.camera)
self.root.addFrameListener(self.frameListener)
Modified: trunk/python-ogre/demos/ogre/Demo_Smoke.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_Smoke.py 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/demos/ogre/Demo_Smoke.py 2008-11-03 07:40:08 UTC (rev 786)
@@ -27,11 +27,13 @@
self.fountainNode = sceneManager.getRootSceneNode().createChildSceneNode()
psm = ogre.ParticleSystemManager.getSingleton()
- particleSystem2 = sceneManager.createParticleSystem('fountain1', 'Examples/Smoke')
+ self.particleSystem2 = sceneManager.createParticleSystem('fountain1', 'Examples/Smoke')
node = self.fountainNode.createChildSceneNode()
- node.attachObject(particleSystem2)
+ node.attachObject(self.particleSystem2)
-
+ def __del__(self):
+ del self.particleSystem2
+ sf.Application.__del__(self)
if __name__ == '__main__':
try:
Modified: trunk/python-ogre/demos/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/plugins.cfg 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/demos/plugins.cfg 2008-11-03 07:40:08 UTC (rev 786)
@@ -2,23 +2,22 @@
## Use this for Windows
# Define plugin folder
-#PluginFolder=../../plugins
-#Plugin=RenderSystem_GL.dll
-#Plugin=RenderSystem_Direct3D9.dll
-#Plugin=Plugin_ParticleFX.dll
-#Plugin=Plugin_BSPSceneManager.dll
-#Plugin=Plugin_OctreeSceneManager.dll
-#Plugin=Plugin_CgProgramManager.dll
-#Plugin=Plugin_PCZSceneManager.dll
-#Plugin=Plugin_OctreeZone.dll
-#Plugin=Plugin_OctreeSceneManager.dll
+PluginFolder=../../plugins
+Plugin=RenderSystem_GL.dll
+Plugin=RenderSystem_Direct3D9.dll
+Plugin=Plugin_ParticleFX.dll
+Plugin=Plugin_BSPSceneManager.dll
+Plugin=Plugin_CgProgramManager.dll
+Plugin=Plugin_PCZSceneManager.dll
+Plugin=Plugin_OctreeZone.dll
+Plugin=Plugin_OctreeSceneManager.dll
##
## NOTE use this for MacOS or Linux
-PluginFolder=/home/andy/development/root/usr/lib/OGRE
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-Plugin=Plugin_CgProgramManager
+#PluginFolder=/home/andy/development/root/usr/lib/OGRE
+#Plugin=RenderSystem_GL
+#Plugin=Plugin_ParticleFX
+#Plugin=Plugin_BSPSceneManager
+#Plugin=Plugin_OctreeSceneManager
+#Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-10-31 08:18:17 UTC (rev 785)
+++ trunk/python-ogre/environment.py 2008-11-03 07:40:08 UTC (rev 786)
@@ -1119,21 +1119,26 @@
class betagui:
active = True
pythonModule = True
- version="1.7"
+ version="2"
name='betagui'
parent="ogre/gui"
CCFLAGS = ' ' # -D"FT2_BUILD_LIBRARY"
cflags=""
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
+ Config.PATH_INCLUDE_OIS,
Config.PATH_INCLUDE_betagui
]
lib_dirs = [Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain,
- Config.PATH_LIB_betagui
+ Config.PATH_LIB_betagui,
+ Config.PATH_LIB_OIS
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain', 'OIS_Static' ]
+ if os.name=="nt":
+ libs.append ( "User32" ) # needed for static linking
+
ModuleName="betagui"
class ogreforests:
@@ -1389,20 +1394,20 @@
["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",downloadPath],
]
buildCmds = [
-# [0, "tar zxf " + os.path.join(downloadPath, "openal-0.0.8.tar.gz"), ''],
+# [0, "tar zxf " + os.path.join(downloadPath, "openal-0.0.8.tar.gz"), ''],
[0, "tar jxf " + os.path.join(downloadPath, "openal-soft-1.5.304.tar.bz2"), ''],
[0, "tar zxf " + os.path.join(downloadPath, "libogg-1.1.3.tar.gz"), ''],
[0, "tar zxf " + os.path.join(downloadPath, "libvorbis-1.2.0.tar.gz"), ''],
[0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libogg-1.1.3")],
-
- [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
-
- [0,"cmake -DCMAKE_INSTALL_PREFIX:PATH="+ PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')],
- [0,"make ", os.path.join(os.getcwd(),'openal-soft-1.5.304')],
- [0,"cp -p libopenal* %s/lib " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')],
- [0,"cp -p * %s/include " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304', 'include','AL')]
-
+
+ [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
+
+ [0,"cmake -DCMAKE_INSTALL_PREFIX:PATH="+ PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')],
+ [0,"make ", os.path.join(os.getcwd(),'openal-soft-1.5.304')],
+ [0,"cp -p libopenal* %s/lib " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')],
+ [0,"cp -p * %s/include " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304', 'include','AL')]
+
# [0, "sed --in-place -s 's|( ALCvoid )|()|' alc.h",os.path.join(os.getcwd(),"openal-0.0.8","common", "include", "AL")],
# [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")],
# [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
@@ -1470,7 +1475,7 @@
class et: ## editable terrain
active = True
pythonModule = True
- version= "2.2"
+ version= "2.3.1"
name='et'
parent = "ogre/addons"
if isLinux():
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-10-31 08:18:21
|
Revision: 785
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=785&view=rev
Author: andy_miller
Date: 2008-10-31 08:18:17 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
Updates to enable threading in Ogre
Modified Paths:
--------------
trunk/python-ogre/code_generators/betagui/generate_code.py
trunk/python-ogre/code_generators/cadunetree/generate_code.py
trunk/python-ogre/code_generators/caelum/generate_code.py
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/et/generate_code.py
trunk/python-ogre/code_generators/hikari/generate_code.py
trunk/python-ogre/code_generators/hydrax/generate_code.py
trunk/python-ogre/code_generators/noise/generate_code.py
trunk/python-ogre/code_generators/nxogre/generate_code.py
trunk/python-ogre/code_generators/ofusion/generate_code.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogreal/generate_code.py
trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
trunk/python-ogre/code_generators/ogreforests/generate_code.py
trunk/python-ogre/code_generators/ogrenewt/generate_code.py
trunk/python-ogre/code_generators/ogreode/generate_code.py
trunk/python-ogre/code_generators/ogrepcz/generate_code.py
trunk/python-ogre/code_generators/ogrerefapp/generate_code.py
trunk/python-ogre/code_generators/particleuniverse/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/theora/generate_code.py
trunk/python-ogre/demos/particleuniverse/Demo_Particle.py
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/compilesource.bat
trunk/python-ogre/scripts/vsvars32.bat
Modified: trunk/python-ogre/code_generators/betagui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/betagui/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/betagui/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -371,7 +371,7 @@
os.path.join( environment.betagui.root_dir, "python_betagui.h" )
, environment.betagui.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
Modified: trunk/python-ogre/code_generators/cadunetree/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/cadunetree/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -199,9 +199,13 @@
os.path.join( environment.cadunetree.root_dir, "python_cadunetree.h" )
, environment.cadunetree.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY' ]
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY','__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'VERSION_' + environment.cadunetree.version )
-
+
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
#
# build the core Py++ system from the GCCXML created source
#
Modified: trunk/python-ogre/code_generators/caelum/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/caelum/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -254,8 +254,11 @@
os.path.join( environment.caelum.root_dir, "python_caelum.h" )
, environment.caelum.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'VERSION_' + environment.caelum.version )
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
#
# build the core Py++ system from the GCCXML created source
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -258,12 +258,19 @@
xml_cached_fc = parser.create_cached_source_fc(
os.path.join( environment.cegui.root_dir, "python_CEGUI.h" )
, environment.cegui.cache_file )
+
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'CEGUI_NONCLIENT_BUILD','OGRE_GCC_VISIBILITY','__PYTHONOGRE_BUILD_CODE' ]
+ defined_symbols.append( 'VERSION_' + environment.cegui.version )
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
mb = module_builder.module_builder_t( [ xml_cached_fc ]
, gccxml_path=environment.gccxml_bin
, working_directory=environment.root_dir
, include_paths=environment.cegui.include_dirs
- , define_symbols=['CEGUI_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD']
+ , define_symbols=defined_symbols
, indexing_suite_version=2 )
filter_declarations (mb)
Modified: trunk/python-ogre/code_generators/et/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/et/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/et/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -224,9 +224,12 @@
os.path.join( environment.et.root_dir, "python_et.h" )
, environment.et.cache_file )
- defined_symbols = ['OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = ['OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'VERSION_' + environment.et.version )
-
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
#
# build the core Py++ system from the GCCXML created source
#
Modified: trunk/python-ogre/code_generators/hikari/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/hikari/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/hikari/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -233,8 +233,11 @@
, environment.hikari.cache_file )
# Vector_c define to allow GCC to process delegates.h
- defined_symbols = ['OGRE_NONCLIENT_BUILD', 'HIKARI_NONCLIENT_BUILD', '__VECTOR_C' ]
+ defined_symbols = ['OGRE_NONCLIENT_BUILD', 'HIKARI_NONCLIENT_BUILD', '__VECTOR_C', '__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'VERSION_' + environment.hikari.version )
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
#
# build the core Py++ system from the GCCXML created source
Modified: trunk/python-ogre/code_generators/hydrax/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/hydrax/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/hydrax/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -200,9 +200,12 @@
os.path.join( environment.hydrax.root_dir, "python_hydrax.h" )
, environment.hydrax.cache_file )
- defined_symbols = ['OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = ['OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'VERSION_' + environment.hydrax.version )
-
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
#
# build the core Py++ system from the GCCXML created source
#
Modified: trunk/python-ogre/code_generators/noise/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/noise/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/noise/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -248,7 +248,10 @@
, environment.noise.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
defined_symbols.append( 'VERSION_' + environment.noise.version )
Modified: trunk/python-ogre/code_generators/nxogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/nxogre/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -612,9 +612,9 @@
os.path.join( environment.nxogre.root_dir, "python_nxogre.h" )
, environment.nxogre.cache_file )
if os.name == 'nt':
- defined_symbols = [ 'NxExport','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 'WIN32', 'GCC_XML']#NXOGRE_EXPORTS'
+ defined_symbols = [ '__PYTHONOGRE_BUILD_CODE','NxExport','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 'WIN32', 'GCC_XML']#NXOGRE_EXPORTS'
else:
- defined_symbols = [ 'LINUX','NX_LINUX', 'NX_DISABLE_FLUIDS', 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 'GCC_XML']
+ defined_symbols = [ '__PYTHONOGRE_BUILD_CODE','LINUX','NX_LINUX', 'NX_DISABLE_FLUIDS', 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', 'GCC_XML']
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
Modified: trunk/python-ogre/code_generators/ofusion/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ofusion/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ofusion/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -201,9 +201,12 @@
os.path.join( environment.ofusion.root_dir, "python_ofusion.h" )
, environment.ofusion.cache_file )
- defined_symbols = ['OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = ['OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'VERSION_' + environment.ofusion.version )
-
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
#
# build the core Py++ system from the GCCXML created source
#
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -281,7 +281,14 @@
print '{*} function "%s" is marked as internal' % declarations.full_name( func )
# this change was for 1.7 but also needed for 1.4
- noncopy=['Camera','Frustum', 'Log']
+ noncopy=['Camera','Frustum', 'Log' ]
+
+ # these showed up during threading -- possible needs to be done all the time (needs to be looked at)
+ if environment._USE_THREADS:
+ noncopy = noncopy + ['Compositor', 'DefaultHardwareBufferManager', 'DefaultSceneManager', 'Font', 'FontManager',
+ 'HighLevelGpuProgramManager','Material', 'Mesh', 'MeshManager',
+ 'ParticleSystemManager', 'Pass', 'PatchMesh', 'ResourceGroupManager',
+ 'Skeleton', 'SkeletonInstance', 'SkeletonManager', 'UnifiedHighLevelGpuProgram']
for c in noncopy:
main_ns.class_(c).noncopyable = True
@@ -1064,7 +1071,7 @@
xml_cached_fc = parser.create_cached_source_fc(
os.path.join( environment.ogre.root_dir, "python_ogre.h" )
, environment.ogre.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY']
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', '__PYTHONOGRE_BUILD_CODE']
undefine_symbols=[]
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -235,8 +235,11 @@
os.path.join( environment.ogreal.root_dir, "python_ogreal.h" )
, environment.ogreal.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'VERSION_' + environment.ogreal.version )
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
#
# build the core Py++ system from the GCCXML created source
Modified: trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -212,10 +212,14 @@
, environment.ogrebulletc.cache_file )
if os.name == 'nt':
- defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
else:
defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
- defined_symbols.append( 'VERSION_' + environment.ogrebulletc.version )
+ defined_symbols.append( 'VERSION_' + environment.ogrebulletc.version )
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
#
# build the core Py++ system from the GCCXML created source
Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -200,11 +200,15 @@
, environment.ogrebulletd.cache_file )
if os.name == 'nt':
- defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
else:
defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
- defined_symbols.append( 'VERSION_' + environment.ogrebulletd.version )
-
+ defined_symbols.append( 'VERSION_' + environment.ogrebulletd.version )
+
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
#
# build the core Py++ system from the GCCXML created source
#
Modified: trunk/python-ogre/code_generators/ogreforests/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ogreforests/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -255,7 +255,12 @@
os.path.join( environment.ogreforests.root_dir, "python_forests.h" )
, environment.ogreforests.cache_file )
- defined_symbols = ['OGRE_NONCLIENT_BUILD', 'WIN32', "GCCXML_BUG" ]
+ defined_symbols = ['OGRE_NONCLIENT_BUILD', 'WIN32', "GCCXML_BUG", '__PYTHONOGRE_BUILD_CODE' ]
+ undefine_symbols=[]
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
defined_symbols.append( 'VERSION_' + environment.ogreforests.version )
#
Modified: trunk/python-ogre/code_generators/ogrenewt/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -207,13 +207,20 @@
xml_cached_fc = parser.create_cached_source_fc(
os.path.join( environment.ogrenewt.root_dir, "python_ogrenewt.h" )
, environment.ogrenewt.cache_file )
-
+
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE',
+ 'ogrenewt_NONCLIENT_BUILD','OIS_NONCLIENT_BUILD', 'OIS_STATIC_BUILD' ]
+ defined_symbols.append( 'VERSION_' + environment.ogrenewt.version )
+
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
mb = module_builder.module_builder_t( [ xml_cached_fc ]
, gccxml_path=environment.gccxml_bin
, working_directory=environment.root_dir
, include_paths=environment.ogrenewt.include_dirs
- , define_symbols=['ogrenewt_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD',
- 'OIS_NONCLIENT_BUILD', 'OIS_STATIC_BUILD']
+ , define_symbols=defined_symbols
, indexing_suite_version=2 )
## This module depends on Ogre
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -265,9 +265,13 @@
os.path.join( environment.ogreode.root_dir, "python_ogreode.h" )
, environment.ogreode.cache_file )
- defined_symbols = ['OGRE_NONCLIENT_BUILD', 'ODE_LIB' ]
- defined_symbols.append( 'OGREODE_VERSION_' + environment.ogreode.version )
-
+ defined_symbols = ['OGRE_NONCLIENT_BUILD', 'ODE_LIB','__PYTHONOGRE_BUILD_CODE' ]
+ defined_symbols.append( 'OGREODE_VERSION_' + environment.ogreode.version )
+
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
#
# build the core Py++ system from the GCCXML created source
#
Modified: trunk/python-ogre/code_generators/ogrepcz/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -158,7 +158,13 @@
print "Including Special:", c
c.include()
-
+ noncopy=[]
+ # these showed up during threading -- possible needs to be done all the time (needs to be looked at)
+ if environment._USE_THREADS:
+ noncopy = noncopy + ['PCZSceneManager' ]
+ for c in noncopy:
+ main_ns.class_(c).noncopyable = True
+
############################################################
##
## And things that need to have their argument and call values fixed.
@@ -282,9 +288,12 @@
os.path.join( environment.ogrepcz.root_dir, "python_ogrepcz.h" )
, environment.ogrepcz.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY']
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY','__PYTHONOGRE_BUILD_CODE']
defined_symbols.append( 'VERSION_' + environment.ogrepcz.version )
-
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
#
# build the core Py++ system from the GCCXML created source
#
Modified: trunk/python-ogre/code_generators/ogrerefapp/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrerefapp/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/ogrerefapp/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -75,8 +75,12 @@
os.path.join( environment.ogrerefapp.root_dir, "python_ogre.h" )
, environment.ogrerefapp.cache_file )
- defined_symbols = [ 'OGREREFAPP_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD' ]
+ defined_symbols = [ 'OGREREFAPP_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
defined_symbols.append( 'OGREREFAPP_VERSION_' + environment.ogrerefapp.version )
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
mb = module_builder.module_builder_t( [ xml_cached_fc ]
, gccxml_path=environment.gccxml_bin
, working_directory=environment.root_dir
Modified: trunk/python-ogre/code_generators/particleuniverse/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -227,8 +227,11 @@
, environment.particleuniverse.cache_file )
defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY' ,'PARTICLE_UNIVERSE_EXPORTS', '__PYTHONOGRE_BUILD_CODE' ]
- defined_symbols.append( 'VERSION_' + environment.particleuniverse.version )
-
+ defined_symbols.append( 'VERSION_' + environment.particleuniverse.version )
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
#
# build the core Py++ system from the GCCXML created source
#
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -422,7 +422,7 @@
os.path.join( environment.quickgui.root_dir, "python_quickgui.h" )
, environment.quickgui.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD',
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE',
'WIN32', 'NDEBUG', 'WINDOWS' , '_PRECOMP'] ## , 'QUICKGUI_EXPORTS'
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
Modified: trunk/python-ogre/code_generators/theora/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/theora/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/code_generators/theora/generate_code.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -460,7 +460,7 @@
os.path.join( environment.theora.root_dir, "python_theora.h" )
, environment.theora.cache_file )
- defined_symbols = [ 'THEORAVIDEO_PLUGIN_EXPORTS','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY']
+ defined_symbols = [ 'THEORAVIDEO_PLUGIN_EXPORTS','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY','__PYTHONOGRE_BUILD_CODE']
if os.name == 'nt':
defined_symbols.append ( 'WIN32' )
if environment._USE_THREADS:
Modified: trunk/python-ogre/demos/particleuniverse/Demo_Particle.py
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Demo_Particle.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/demos/particleuniverse/Demo_Particle.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -60,6 +60,9 @@
# and don't forget to start it
self.particleSystem2.start()
+ name= self.particleSystem2.name
+ self.ps = self.sceneManager.getMovableObject(name, PU.ParticleSystemFactory.PU_FACTORY_TYPE_NAME)
+ print "\n\n", self.ps
if __name__ == '__main__':
try:
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/environment.py 2008-10-31 08:18:17 UTC (rev 785)
@@ -563,7 +563,8 @@
pythonModule = True
name='ogre'
ModuleName='OGRE'
- cflags = ""
+ CCFLAGS = ""
+ cflags=''
moduleParentLocation = "renderer"
parent = "ogre/renderer"
dependsOn = ['boost']
@@ -1421,7 +1422,7 @@
version="0.2.1"
name='ogrevideoffmpeg'
parent="ogre/addons"
- cflags = ""
+ CCFLAGS = ""
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
Config.PATH_INCLUDE_ogrevideoffmpeg,
@@ -1486,7 +1487,8 @@
]
ModuleName = 'et'
CheckIncludes = ['boost/python.hpp']
- cflags = ""
+ CCFLAGS = " "
+ cflags=''
class bullet:
active = True
Modified: trunk/python-ogre/scripts/compilesource.bat
===================================================================
--- trunk/python-ogre/scripts/compilesource.bat 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/scripts/compilesource.bat 2008-10-31 08:18:17 UTC (rev 785)
@@ -4,13 +4,13 @@
set _ROOT=c:\\development
call vcvars32
cd %_ROOT%\\ogre
-%_VCBUILD% /useenv Ogre_vc8.sln "Release|Win32"
+%_VCBUILD% /useenv Ogre_vc9.sln "Release|Win32"
rem cd %_ROOT%\\NxOgre\\NxOgre
rem %_VCBUILD% /useenv NxOgre.VC8.Windows.sln "Release|Win32"
cd %_ROOT%\\ogreaddons\\ogreode\\scripts\\vc8
-%_VCBUILD% /useenv OgreOde_Source.sln "Release|Win32"
+%_VCBUILD% /useenv OgreOde_SDK.sln "Release|Win32"
cd %_ROOT%\\ogreaddons\\ogrenewt
%_VCBUILD% /useenv OgreNewt_vc71.sln "Release|Win32"
Modified: trunk/python-ogre/scripts/vsvars32.bat
===================================================================
--- trunk/python-ogre/scripts/vsvars32.bat 2008-10-30 06:12:20 UTC (rev 784)
+++ trunk/python-ogre/scripts/vsvars32.bat 2008-10-31 08:18:17 UTC (rev 785)
@@ -22,9 +22,9 @@
@rem
@set DevEnvDir=C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE
-@set PATH=C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE;C:\Program Files\Microsoft Visual Studio 9.0\VC\BIN;C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files\Microsoft Visual Studio 9.0\VC\VCPackages;%PATH%
-@set INCLUDE=C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\include;c:\program files\Microsoft DirectX SDK (June 2008)\include;%INCLUDE%
-@set LIB=C:\Program Files\Microsoft Visual Studio 9.0\VC\LIB;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\lib;c:\program files\Microsoft DirectX SDK (June 2008)\lib\x86;%LIB%
+@set PATH=%PATH%;C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE;C:\Program Files\Microsoft Visual Studio 9.0\VC\BIN;C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files\Microsoft Visual Studio 9.0\VC\VCPackages
+@set INCLUDE=%INCLUDE%;C:\Program Files\Microsoft Visual Studio 9.0\VC\INCLUDE;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\include;c:\program files\Microsoft DirectX SDK (August 2008)\include
+@set LIB=%LIB%;C:\Program Files\Microsoft Visual Studio 9.0\VC\LIB;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\lib;c:\program files\Microsoft DirectX SDK (August 2008)\lib\x86
@set LIBPATH=C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Program Files\Microsoft Visual Studio 9.0\VC\LIB;%LIBPATH%
@goto end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-10-30 06:12:24
|
Revision: 784
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=784&view=rev
Author: andy_miller
Date: 2008-10-30 06:12:20 +0000 (Thu, 30 Oct 2008)
Log Message:
-----------
Updates for OgreAL on Linux
Attempts to resolve Physx Issue on Linux (not yet successful)
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/code_generators/physx/python_physx_aliases.h
trunk/python-ogre/code_generators/physx/python_physx_sizeof.h
trunk/python-ogre/demos/physx/physx_01.py
trunk/python-ogre/demos/plugins.cfg
trunk/python-ogre/environment.py
Removed Paths:
-------------
trunk/python-ogre/demos/ogreal/plugins.cfg
Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h 2008-10-30 06:12:20 UTC (rev 784)
@@ -53,8 +53,8 @@
# define OgreAL_Export
// # endif
#elif OGRE_COMPILER == OGRE_COMPILER_GNUC
- # include "AL/al.h"
- # include "AL/alc.h"
+ # include "al.h"
+ # include "alc.h"
// # if defined(OGREAL_EXPORT) && OGRE_COMP_VER >= 400
// # define OgreAL_Export __attribute__ ((visibility("default")))
// # else
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
@@ -62,7 +62,6 @@
excludes=[ '::NxArray<NxShapeDesc*, NxAllocatorDefault>::begin'
,'::NxArray< NxForceFieldShapeDesc*, NxAllocatorDefault >::resize'
,'::NxArray< NxForceFieldShapeGroup*, NxAllocatorDefault >::resize'
- ,'::NxArray<NxFluidEmitterDesc, NxAllocatorDefault>::deleteEntry'
,'::NxArray<NxShapeDesc*, NxAllocatorDefault>::end'
# ,'::NxCloth::overlapAABBTriangles' # ugly argument that boost doesn't like.. To Fix in hand wrappers
# these have const refs to classes with protected desctuctors - a bad combination for boost
@@ -79,6 +78,9 @@
,'::NxVec3::isNotUsed'
]
+ if os.name =='nt':
+ excludes.append('::NxArray<NxFluidEmitterDesc, NxAllocatorDefault>::deleteEntry')
+
for e in excludes:
print "excluding function", e
global_ns.member_functions(e).exclude()
@@ -92,7 +94,6 @@
global_ns.free_functions(e).exclude()
excludes = ['NxArray<NxShapeDesc*, NxAllocatorDefault>', ## doesn't have a defult constructor for ElemType
- 'NxArray<NxFluidEmitterDesc, NxAllocatorDefault>', ## needs ElemType changed to NxFluidEmitterDesc
'NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault>', ## Elemtype issue
'NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault>', ## Elemtype issue
'NxForceFieldShapeGroup' ## seems to have access issues..
@@ -100,6 +101,10 @@
]
# for c in global_ns.classes():
# print c
+ if os.name =='nt':
+ excludes.append('NxArray<NxFluidEmitterDesc, NxAllocatorDefault>') ## needs ElemType changed to NxFluidEmitterDesc
+ else:
+ excludes.append ( '::NxFluidUserNotify')
for e in excludes:
print "Excluding Class:", e
global_ns.class_(e).exclude()
@@ -136,7 +141,13 @@
############################################################
def ManualFixes ( mb ):
- global_ns = mb.global_ns
+ global_ns = mb.global_ns
+ # this change was for 1.7 but also needed for 1.4
+
+ noncopy=[] ###'NxPhysicsSDK']
+ for c in noncopy:
+ global_ns.class_(c).noncopyable = True
+
# known = ['points', 'triangles']
# for c in global_ns.classes():
# if c.name.startswith ('Nx'):
@@ -358,7 +369,7 @@
if os.name == 'nt':
defined_symbols = ['NXPHYSICS_EXPORTS', 'WIN32', 'PHYSX_EXPORTS'] #'WIN32',
else:
- defined_symbols = ['LINUX']
+ defined_symbols = ['LINUX','NX_DISABLE_FLUIDS']
defined_symbols.append( 'VERSION_' + environment.physx.version )
#
Modified: trunk/python-ogre/code_generators/physx/python_physx_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/physx/python_physx_aliases.h 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/code_generators/physx/python_physx_aliases.h 2008-10-30 06:12:20 UTC (rev 784)
@@ -3,10 +3,11 @@
typedef NxUserEntityReport<unsigned> EntitiReportUnsigned;
typedef NxUserEntityReport<NxSweepQueryHit> EntityReportSweepQuery;
typedef NxArray<NxShapeDesc*, NxAllocatorDefault> NxArrayShapeDesc;
-typedef NxArray<NxFluidEmitterDesc, NxAllocatorDefault> NxArrayFluidEmitterDesc;
typedef NxArray< NxForceFieldShapeDesc*, NxAllocatorDefault > NxArrayNxForceFieldShapeDescPtr;
typedef NxArray< NxForceFieldShapeGroup*, NxAllocatorDefault > NxArrayNxForceFieldShapeGroupPtr;
+
+//typedef NxArray<NxFluidEmitterDesc, NxAllocatorDefault> NxArrayFluidEmitterDesc;
+
-
Modified: trunk/python-ogre/code_generators/physx/python_physx_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/physx/python_physx_sizeof.h 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/code_generators/physx/python_physx_sizeof.h 2008-10-30 06:12:20 UTC (rev 784)
@@ -7,7 +7,8 @@
sizeof ( NxForceFieldShapeGroup );
sizeof ( NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault> );
sizeof ( NxArray<NxShapeDesc*, NxAllocatorDefault> );
-sizeof ( NxArray<NxFluidEmitterDesc, NxAllocatorDefault> );
sizeof ( NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault> );
sizeof ( _Nx3F32 );
+
+//sizeof ( NxArray<NxFluidEmitterDesc, NxAllocatorDefault> );
Deleted: trunk/python-ogre/demos/ogreal/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogreal/plugins.cfg 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/demos/ogreal/plugins.cfg 2008-10-30 06:12:20 UTC (rev 784)
@@ -1,13 +0,0 @@
-# Defines plugins to load
-
-# Define plugin folder
-PluginFolder=../../plugins
-
-# Define D3D rendering implementation plugin
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
-
Modified: trunk/python-ogre/demos/physx/physx_01.py
===================================================================
--- trunk/python-ogre/demos/physx/physx_01.py 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/demos/physx/physx_01.py 2008-10-30 06:12:20 UTC (rev 784)
@@ -34,9 +34,19 @@
gCookingInitialized = False
# Initialize PhysicsSDK
- desc = physics.NxPhysicsSDKDesc()
-
- gPhysicsSDK, errorCode = physics.NxCreatePhysicsSDK(physics.NX_PHYSICS_SDK_VERSION(),desc=desc)
+# desc = physics.NxPhysicsSDKDesc()
+# print "DESC", desc
+ gPhysicsSDK = physics.NxCreatePhysicsSDK(physics.NX_PHYSICS_SDK_VERSION())
+ print gPhysicsSDK
+ print "Getting master"
+ g = physics.getMasterPhysicsSDK()
+ print "Got Master"
+ print g
+ print dir(g)
+ print dir (gPhysicsSDK)
+ d = physics.NxPhysicsSDK ( )
+ print d
+ print dir(d)
if gPhysicsSDK == None :
print "\nSDK create error (%d - %s).\nUnable to initialize the PhysX SDK, exiting the sample.\n\n" % (errorCode,"test")
return False
@@ -104,4 +114,4 @@
return True
if __name__ == "__main__":
- print InitNx()
\ No newline at end of file
+ print InitNx()
Modified: trunk/python-ogre/demos/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/plugins.cfg 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/demos/plugins.cfg 2008-10-30 06:12:20 UTC (rev 784)
@@ -2,14 +2,13 @@
## Use this for Windows
# Define plugin folder
-PluginFolder=../../plugins
-#home/andy/development/root/usr/lib/OGRE
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
+#PluginFolder=../../plugins
+#Plugin=RenderSystem_GL.dll
+#Plugin=RenderSystem_Direct3D9.dll
+#Plugin=Plugin_ParticleFX.dll
+#Plugin=Plugin_BSPSceneManager.dll
+#Plugin=Plugin_OctreeSceneManager.dll
+#Plugin=Plugin_CgProgramManager.dll
#Plugin=Plugin_PCZSceneManager.dll
#Plugin=Plugin_OctreeZone.dll
#Plugin=Plugin_OctreeSceneManager.dll
@@ -17,8 +16,9 @@
##
## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+Plugin=RenderSystem_GL
+Plugin=Plugin_ParticleFX
+Plugin=Plugin_BSPSceneManager
+Plugin=Plugin_OctreeSceneManager
+Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/environment.py 2008-10-30 06:12:20 UTC (rev 784)
@@ -1275,7 +1275,7 @@
CCFLAGS = ' -D"WIN32" '
## CCFLAGS = ' ' ## try to not define WIN 32 to remove inline assembly code that GCCxml doesn't like
else:
- CCFLAGS = ' -D"LINUX" '
+ CCFLAGS = ' -D"LINUX" -D"NX_USE_SDK_DLLS" -D"_USRDLL" -D"NX_DISABLE_FLUIDS" '
lib_dirs = [Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain,
Config.PATH_LIB_PhysX
@@ -1388,15 +1388,23 @@
["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",downloadPath],
]
buildCmds = [
-# [0, "tar zxf " + os.path.join(downloadPath, "openal-0.0.8.tar.gz"), ''],
+# [0, "tar zxf " + os.path.join(downloadPath, "openal-0.0.8.tar.gz"), ''],
+
[0, "tar jxf " + os.path.join(downloadPath, "openal-soft-1.5.304.tar.bz2"), ''],
[0, "tar zxf " + os.path.join(downloadPath, "libogg-1.1.3.tar.gz"), ''],
[0, "tar zxf " + os.path.join(downloadPath, "libvorbis-1.2.0.tar.gz"), ''],
[0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libogg-1.1.3")],
- [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
-# [0, "sed --in-place -s 's|( ALCvoid )|()|' alc.h",os.path.join(os.getcwd(),"openal-0.0.8","common", "include", "AL")],
-# [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")],
-# [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
+
+ [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
+
+ [0,"cmake -DCMAKE_INSTALL_PREFIX:PATH="+ PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')],
+ [0,"make ", os.path.join(os.getcwd(),'openal-soft-1.5.304')],
+ [0,"cp -p libopenal* %s/lib " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')],
+ [0,"cp -p * %s/include " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304', 'include','AL')]
+
+# [0, "sed --in-place -s 's|( ALCvoid )|()|' alc.h",os.path.join(os.getcwd(),"openal-0.0.8","common", "include", "AL")],
+# [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")],
+# [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
]
libs=[boost.lib, boost_python_index.lib, 'OgreMain', 'vorbisfile',
#'ogg',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
