[Python-ogre-commit] SF.net SVN: python-ogre: [459] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [459] trunk/python-ogre
|
From: <and...@us...> - 2007-10-24 06:16:02
|
Revision: 459
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=459&view=rev
Author: andy_miller
Date: 2007-10-23 23:16:06 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Fixes for OgreForests under Linux (and Ogre 1.5) thanks to Dermont
Changes to environment.py to only link BulletMath library under NT -- fix for Linxu build
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/forests/BatchPage.cpp
trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h
trunk/python-ogre/ThirdParty/forests/PagedGeometry.h
trunk/python-ogre/ThirdParty/forests/PropertyMaps.h
trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
trunk/python-ogre/ThirdParty/forests/orig/PagedGeometry.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
trunk/python-ogre/demos/ogreforests/plugins.cfg
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/ThirdParty/forests/BatchPage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchPage.cpp 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/BatchPage.cpp 2007-10-24 06:16:06 UTC (rev 459)
@@ -263,3 +263,4 @@
}
}
+
Modified: trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2007-10-24 06:16:06 UTC (rev 459)
@@ -15,7 +15,7 @@
#include "BatchedGeometry.h"
-#include "OgreRoot.h"
+/*#include "OgreRoot.h"
#include "OgreRenderSystem.h"
#include "OgreCamera.h"
#include "OgreVector3.h"
@@ -30,7 +30,8 @@
#include "OgreHardwareBufferManager.h"
#include "OgreHardwareBuffer.h"
#include "OgreMaterialManager.h"
-#include "OgreMaterial.h"
+#include "OgreMaterial.h"*/
+
using namespace Ogre;
@@ -51,7 +52,13 @@
BatchedGeometry::~BatchedGeometry()
{
clear();
+}
+
+#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
+void BatchedGeometry::visitRenderables(Ogre::Renderable::Visitor*, bool)
+{
}
+#endif
void BatchedGeometry::addEntity(Entity *ent, const Vector3 &position, const Quaternion &orientation, const Vector3 &scale, const Ogre::ColourValue &color)
{
@@ -336,7 +343,7 @@
//If no vertex colors are used, make sure the final batch includes them (so the shade values work)
if (!vertexData->vertexDeclaration->findElementBySemantic(VES_DIFFUSE)) {
- Ogre::ushort i = (ushort)vertBinding->getBufferCount();
+ Ogre::ushort i = (Ogre::ushort)vertBinding->getBufferCount();
vertDecl->addElement(i, 0, VET_COLOUR, VES_DIFFUSE);
Modified: trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -20,13 +20,32 @@
#include "OgreMovableObject.h"
#include "OgreSceneNode.h"
#include "OgreMaterialManager.h"
+#include "OgreRoot.h"
+#include "OgreRenderSystem.h"
+#include "OgreCamera.h"
+#include "OgreVector3.h"
+#include "OgreQuaternion.h"
+#include "OgreSceneNode.h"
+#include "OgreString.h"
+#include "OgreStringConverter.h"
+#include "OgreEntity.h"
+#include "OgreSubMesh.h"
+#include "OgreMesh.h"
+#include "OgreMeshManager.h"
+#include "OgreHardwareBufferManager.h"
+#include "OgreHardwareBuffer.h"
+#include "OgreMaterialManager.h"
+#include "OgreMaterial.h"
-
class BatchedGeometry: public Ogre::MovableObject
{
public:
BatchedGeometry(Ogre::SceneManager *mgr);
~BatchedGeometry();
+
+#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
+ void visitRenderables(Ogre::Renderable::Visitor* visitor, bool debugRenderables);
+#endif
void addEntity(Ogre::Entity *ent, const Ogre::Vector3 &position, const Ogre::Quaternion &orientation = Ogre::Quaternion::IDENTITY, const Ogre::Vector3 &scale = Ogre::Vector3::UNIT_SCALE, const Ogre::ColourValue &color = Ogre::ColourValue::White);
void build();
@@ -119,4 +138,5 @@
-#endif
\ No newline at end of file
+#endif
+
Modified: trunk/python-ogre/ThirdParty/forests/PagedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PagedGeometry.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/PagedGeometry.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -97,8 +97,8 @@
#include "OgreCamera.h"
#include "OgreVector3.h"
#include "OgreTimer.h"
+#include "OgreRoot.h"
-
class GeometryPageManager;
class PageLoader;
Modified: trunk/python-ogre/ThirdParty/forests/PropertyMaps.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PropertyMaps.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/PropertyMaps.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -240,4 +240,5 @@
-#endif
\ No newline at end of file
+#endif
+
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -278,4 +278,5 @@
-#endif
\ No newline at end of file
+#endif
+
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -240,4 +240,5 @@
-#endif
\ No newline at end of file
+#endif
+
Modified: trunk/python-ogre/ThirdParty/forests/orig/PagedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/orig/PagedGeometry.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/orig/PagedGeometry.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -96,7 +96,8 @@
#include "OgreCommon.h"
#include "OgreCamera.h"
#include "OgreVector3.h"
-#include "OgreTimer.h"
+#include "OgreTimer.h"
+#include "OgreRoot.h"
class GeometryPageManager;
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -68,4 +68,5 @@
};
};
}
-#endif //_OGREBULLETCOLLISIONS_OgreBtConverter_H
\ No newline at end of file
+#endif //_OGREBULLETCOLLISIONS_OgreBtConverter_H
+
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -53,4 +53,5 @@
class WheelInfo;
}
-#endif //_OGREBULLETDYNAMICS_PREREQUISITES_H
\ No newline at end of file
+#endif //_OGREBULLETDYNAMICS_PREREQUISITES_H
+
Modified: trunk/python-ogre/demos/ogreforests/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogreforests/plugins.cfg 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/demos/ogreforests/plugins.cfg 2007-10-24 06:16:06 UTC (rev 459)
@@ -2,18 +2,18 @@
## 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
+PluginFolder=/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
##
## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
+ 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 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/environment.py 2007-10-24 06:16:06 UTC (rev 459)
@@ -684,10 +684,13 @@
active=True
version = "1.0"
cflags = ""
- parent = "ogre/physics"
+ parent = "ogre/physics"
libs = [Config.LIB_Boost, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics', 'LibBulletMath'
+ 'LibBulletCollision', 'LibBulletDynamics'
]
+ if os.name=='nt':
+ libs.append ('LibBulletMath')
+
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
@@ -711,8 +714,10 @@
cflags = ""
parent = "ogre/physics"
libs = [Config.LIB_Boost, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics', 'LibBulletMath'
- ]
+ 'LibBulletCollision', 'LibBulletDynamics'
+ ]
+ if os.name=='nt':
+ libs.append ('LibBulletMath')
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
