[Python-ogre-commit] SF.net SVN: python-ogre: [423] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [423] trunk/python-ogre
|
From: <and...@us...> - 2007-10-15 16:14:23
|
Revision: 423
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=423&view=rev
Author: andy_miller
Date: 2007-10-15 09:14:24 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
Linux fixes
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
trunk/python-ogre/scripts/01-RetrieveSource.sh
trunk/python-ogre/scripts/02-ExtractAndPatch.sh
trunk/python-ogre/scripts/04-BuildBaseLibs.sh
trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh
trunk/python-ogre/scripts/master.sh
Added Paths:
-----------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h~
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-10-15 16:14:24 UTC (rev 423)
@@ -53,7 +53,7 @@
PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
# PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
-PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.62')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.63final')
PATH_PhysX= os.path.join(BASE_DIR, 'AGEIA Technologies/SDK/v2.7.2/SDKs')
PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
@@ -120,7 +120,7 @@
PATH_INCLUDE_quickgui = PATH_quickgui
PATH_INCLUDE_NxOgre= PATH_NxOgre
# PATH_INCLUDE_NxOgre= os.path.join(PATH_NxOgre, 'include')
-PATH_INCLUDE_Bullet = os.path.join( LOCAL_INCLUDE )
+PATH_INCLUDE_Bullet = os.path.join( PATH_Bullet, 'src')
PATH_INCLUDE_betagui = PATH_betagui
PATH_INCLUDE_Theora = os.path.join (PATH_Theora,'include')
PATH_INCLUDE_ogrevideoffmpeg = PATH_ogrevideoffmpeg
Added: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h 2007-10-15 16:14:24 UTC (rev 423)
@@ -0,0 +1,89 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program 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 of the License, or (at your option) any later
+version.
+
+This program 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 program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef _OGREBULLETCOLLISIONS_PREREQUISITES_H
+#define _OGREBULLETCOLLISIONS_PREREQUISITES_H
+
+#include "btBulletCollisionCommon.h"
+
+#include "Ogre.h"
+
+/* Some <math.h> files do not define M_PI... */
+#ifndef M_PI
+#define M_PI 3.14159265
+#endif
+
+namespace OgreBulletCollisions
+{
+ class BtOgreConverter;
+ class OgreBtConverter;
+
+ class CollisionsWorld;
+
+ class CollisionRayResultCallback;
+ class CollisionClosestRayResultCallback;
+
+ class DebugLines;
+
+ class DebugDrawer;
+
+ class DebugContact;
+ class DebugNormal;
+ class DebugContactText;
+
+ class DebugCollisionShape;
+ class BoxDebugShape;
+ class SphereDebugShape;
+ class ConeDebugShape;
+ class TriangleMeshDebugShape;
+ class RayDebugShape;
+
+ class CollisionShape;
+ class BoxCollisionShape;
+ class SphereCollisionShape;
+ class CylinderCollisionShape;
+ class ConeCollisionShape;
+
+ class CompoundCollisionShape;
+
+ class MultiSphereCollisionShape;
+ class MinkowskiSumCollisionShape;
+
+ class ConvexHullCollisionShape;
+ class TriangleMeshCollisionShape;
+
+ class Object;
+
+ class ObjectState;
+
+ typedef std::vector<Ogre::Vector3> Vector3Vector;
+ typedef std::map<unsigned char, Vector3Vector* > BoneIndex;
+ typedef std::pair<unsigned short, Vector3Vector* > BoneKeyIndex;
+
+}
+
+#endif //_OGREBULLETCOLLISIONS_PREREQUISITES_H
+
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h 2007-10-15 16:14:24 UTC (rev 423)
@@ -27,7 +27,7 @@
#ifndef _OGREBULLETCOLLISIONS_Shape_H
#define _OGREBULLETCOLLISIONS_Shape_H
-#include "OgreBulletCollisionsPrerequisites.h"
+#include "OgreBulletCollisionsPreRequisites.h"
namespace OgreBulletCollisions
Added: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h~
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h~ (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h~ 2007-10-15 16:14:24 UTC (rev 423)
@@ -0,0 +1,57 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program 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 of the License, or (at your option) any later
+version.
+
+This program 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 program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef _OGREBULLETCOLLISIONS_Shape_H
+#define _OGREBULLETCOLLISIONS_Shape_H
+
+#include "OgreBulletCollisionsPrerequisites.h"
+
+
+namespace OgreBulletCollisions
+{
+ // -------------------------------------------------------------------------
+ // basic Shape
+ class CollisionShape
+ {
+
+ public:
+ CollisionShape();
+ virtual ~CollisionShape();
+
+ inline btCollisionShape* getBulletShape () {return mShape;};
+
+ virtual bool drawWireFrame(DebugLines *wire,
+ const Ogre::Vector3 &pos = Ogre::Vector3::ZERO,
+ const Ogre::Quaternion &quat= Ogre::Quaternion::IDENTITY) const;
+
+ protected:
+ btCollisionShape* mShape;
+ bool drawConvexWireFrame(DebugLines *wire, const Ogre::Vector3 &pos, const Ogre::Quaternion &quat) const;
+
+ };
+}
+#endif //_OGREBULLETCOLLISIONS_Shape_H
+
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h 2007-10-15 16:14:24 UTC (rev 423)
@@ -26,7 +26,7 @@
#ifndef _OGREBULLETCOLLISIONS_OgreBtConverter_H
#define _OGREBULLETCOLLISIONS_OgreBtConverter_H
-#include "OgreBulletCollisionsPrerequisites.h"
+#include "OgreBulletCollisionsPreRequisites.h"
#include "OgreVector3.h"
#include "OgreQuaternion.h"
@@ -68,4 +68,4 @@
};
};
}
-#endif //_OGREBULLETCOLLISIONS_OgreBtConverter_H
\ No newline at end of file
+#endif //_OGREBULLETCOLLISIONS_OgreBtConverter_H
Added: trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h 2007-10-15 16:14:24 UTC (rev 423)
@@ -0,0 +1,56 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program 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 of the License, or (at your option) any later
+version.
+
+This program 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 program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef _OGREBULLETDYNAMICS_PREREQUISITES_H
+#define _OGREBULLETDYNAMICS_PREREQUISITES_H
+
+#include "btBulletCollisionCommon.h"
+#include "btBulletDynamicsCommon.h"
+
+#include "Ogre.h"
+#include "OgreBulletCollisions.h"
+
+
+namespace OgreBulletDynamics
+{
+ class RigidBody;
+ class PhysicState;
+ class DynamicsWorld;
+
+ class TypedConstraint;
+ class HingeConstraint;
+ class SixDofConstraint;
+ class PointToPointConstraint;
+ class ConeTwistConstraint;
+
+ class WheeledRigidBody;
+ class VehicleRayCaster;
+ class VehicleTuning;
+ class RaycastVehicle;
+ class WheelInfo;
+}
+
+#endif //_OGREBULLETDYNAMICS_PREREQUISITES_H
\ 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 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2007-10-15 16:14:24 UTC (rev 423)
@@ -198,8 +198,10 @@
xml_cached_fc = parser.create_cached_source_fc(
os.path.join( environment.ogrebulletc.root_dir, "python_ogrebullet.h" )
, environment.ogrebulletc.cache_file )
-
- defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+ if os.name == 'nt':
+ defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+ else:
+ defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
defined_symbols.append( 'VERSION_' + environment.ogrebulletc.version )
#
Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2007-10-15 16:14:24 UTC (rev 423)
@@ -194,7 +194,10 @@
os.path.join( environment.ogrebulletd.root_dir, "python_ogrebullet.h" )
, environment.ogrebulletd.cache_file )
- defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+ if os.name == 'nt':
+ defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+ else:
+ defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
defined_symbols.append( 'VERSION_' + environment.ogrebulletd.version )
#
Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-10-15 16:14:24 UTC (rev 423)
@@ -27,6 +27,7 @@
$WGET http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz
$WGET http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz
$WGET http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2
+$WGET http://downloads.sourceforge.net/bullet/bullet-2.63final.tgz
popd
cd $INSTALL_DIR
echo " -- getting pygccxml"
Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh
===================================================================
--- trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-15 16:14:24 UTC (rev 423)
@@ -83,7 +83,8 @@
echo "EMPTY" >>./INSTALL
echo "EMPTY" >>./NEWS
popd
-
+echo " -- Unpacking Bullet"
+tar zxf $DOWNLOADS/bullet-2.63final.tgz
echo
echo "== Finished Extraction and Patching =="
echo
Modified: trunk/python-ogre/scripts/04-BuildBaseLibs.sh
===================================================================
--- trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-15 16:14:24 UTC (rev 423)
@@ -64,13 +64,13 @@
./configure --prefix=$PREFIX
make
make install
-cd ReferenceApplication
-aclocal
-./bootstrap
-./configure --prefix=$PREFIX
-make
-make install
-cd ..
+#cd ReferenceApplication
+#aclocal
+#./bootstrap
+#./configure --prefix=$PREFIX
+#make
+#make install
+#cd ..
popd
echo
Modified: trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh
===================================================================
--- trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh 2007-10-15 16:14:24 UTC (rev 423)
@@ -63,5 +63,10 @@
#
# Bullet
#
-##pushd bullet-2.62a
+echo " -- Building Bullet --"
+pushd bullet-2.63final
+cmake . -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX
+make
+find . -name *.a -execdir cp {} $PREFIX/lib \;
+popd
Modified: trunk/python-ogre/scripts/master.sh
===================================================================
--- trunk/python-ogre/scripts/master.sh 2007-10-14 07:54:01 UTC (rev 422)
+++ trunk/python-ogre/scripts/master.sh 2007-10-15 16:14:24 UTC (rev 423)
@@ -3,12 +3,12 @@
# Run them all -- or at least the ones you need
# Notes that 00-PreReqs is probably Ubuntu dependent..
-source ./00-PreReqs.sh
-source ./01-RetrieveSource.sh
-source ./02-ExtractAndPatch.sh
-source ./03-BuildTools.sh
-source ./04-BuildBaseLibs.sh
-source ./05-BuildAdditionalLibs.sh
+#source ./00-PreReqs.sh
+#source ./01-RetrieveSource.sh
+#source ./02-ExtractAndPatch.sh
+#source ./03-BuildTools.sh
+#source ./04-BuildBaseLibs.sh
+#source ./05-BuildAdditionalLibs.sh
source ./06-GenerateCode.sh
source ./07-BuildModules.sh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
