[Python-ogre-commit] SF.net SVN: python-ogre: [390] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [390] trunk/python-ogre
|
From: <and...@us...> - 2007-09-23 03:40:12
|
Revision: 390
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=390&view=rev
Author: andy_miller
Date: 2007-09-22 20:40:15 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
more Linux updates
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/SConstruct
trunk/python-ogre/ThirdParty/opcode/IceAABB.cpp
trunk/python-ogre/ThirdParty/opcode/IceAABB.h
trunk/python-ogre/ThirdParty/opcode/IceAxes.h
trunk/python-ogre/ThirdParty/opcode/IceBoundingSphere.h
trunk/python-ogre/ThirdParty/opcode/IceContainer.cpp
trunk/python-ogre/ThirdParty/opcode/IceContainer.h
trunk/python-ogre/ThirdParty/opcode/IceFPU.h
trunk/python-ogre/ThirdParty/opcode/IceHPoint.cpp
trunk/python-ogre/ThirdParty/opcode/IceHPoint.h
trunk/python-ogre/ThirdParty/opcode/IceIndexedTriangle.cpp
trunk/python-ogre/ThirdParty/opcode/IceIndexedTriangle.h
trunk/python-ogre/ThirdParty/opcode/IceLSS.h
trunk/python-ogre/ThirdParty/opcode/IceMatrix3x3.cpp
trunk/python-ogre/ThirdParty/opcode/IceMatrix3x3.h
trunk/python-ogre/ThirdParty/opcode/IceMatrix4x4.cpp
trunk/python-ogre/ThirdParty/opcode/IceMatrix4x4.h
trunk/python-ogre/ThirdParty/opcode/IceMemoryMacros.h
trunk/python-ogre/ThirdParty/opcode/IceOBB.cpp
trunk/python-ogre/ThirdParty/opcode/IceOBB.h
trunk/python-ogre/ThirdParty/opcode/IcePairs.h
trunk/python-ogre/ThirdParty/opcode/IcePlane.cpp
trunk/python-ogre/ThirdParty/opcode/IcePlane.h
trunk/python-ogre/ThirdParty/opcode/IcePoint.cpp
trunk/python-ogre/ThirdParty/opcode/IcePoint.h
trunk/python-ogre/ThirdParty/opcode/IcePreprocessor.h
trunk/python-ogre/ThirdParty/opcode/IceRandom.cpp
trunk/python-ogre/ThirdParty/opcode/IceRandom.h
trunk/python-ogre/ThirdParty/opcode/IceRay.cpp
trunk/python-ogre/ThirdParty/opcode/IceRay.h
trunk/python-ogre/ThirdParty/opcode/IceRevisitedRadix.cpp
trunk/python-ogre/ThirdParty/opcode/IceRevisitedRadix.h
trunk/python-ogre/ThirdParty/opcode/IceSegment.cpp
trunk/python-ogre/ThirdParty/opcode/IceSegment.h
trunk/python-ogre/ThirdParty/opcode/IceTriangle.cpp
trunk/python-ogre/ThirdParty/opcode/IceTriangle.h
trunk/python-ogre/ThirdParty/opcode/IceTrilist.h
trunk/python-ogre/ThirdParty/opcode/IceTypes.h
trunk/python-ogre/ThirdParty/opcode/IceUtils.cpp
trunk/python-ogre/ThirdParty/opcode/IceUtils.h
trunk/python-ogre/ThirdParty/opcode/OPC_BoxPruning.cpp
trunk/python-ogre/ThirdParty/opcode/OPC_BoxPruning.h
trunk/python-ogre/ThirdParty/opcode/OPC_IceHook.h
trunk/python-ogre/ThirdParty/opcode/OPC_MeshInterface.cpp
trunk/python-ogre/ThirdParty/opcode/OPC_Model.cpp
trunk/python-ogre/ThirdParty/opcode/Opcode.h
trunk/python-ogre/ThirdParty/opcode/Opcode.ncb
trunk/python-ogre/ThirdParty/opcode/Opcode.opt
trunk/python-ogre/ThirdParty/opcode/Opcode.plg
trunk/python-ogre/ThirdParty/opcode/Opcode.vcproj
trunk/python-ogre/code_generators/cegui/customization_data.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h
trunk/python-ogre/code_generators/opcode/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-09-23 03:40:15 UTC (rev 390)
@@ -29,7 +29,7 @@
# # ## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR,'ogrenew')
-PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
+PATH_OgreAddons = os.path.join(BASE_DIR, 'ogreaddons')
PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK','sdk')
@@ -104,10 +104,12 @@
PATH_INCLUDE_NxOgre= os.path.join(PATH_NxOgre, 'include')
PATH_INCLUDE_betagui = PATH_betagui
PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/include')
-PATH_INCLUDE_OPCODE = os.path.join( LOCAL_INCLUDE )
+PATH_INCLUDE_OPCODE = os.path.join( PATH_OPCODE )
PATH_INCLUDE_Bullet = os.path.join( LOCAL_INCLUDE )
PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
-PATH_INCLUDE_plib = PATH_plib
+PATH_INCLUDE_plib = PATH_plib
+PATH_INCLUDE_ogredshow = PATH_ogredshow
+
PATH_INCLUDE_Theora = os.path.join (PATH_Theora,'include')
PATH_INCLUDE_ogrevideoffmpeg = PATH_ogrevideoffmpeg
PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/SConstruct 2007-09-23 03:40:15 UTC (rev 390)
@@ -60,15 +60,15 @@
if os.sys.platform <> 'darwin':
CCFLAGS = ' `pkg-config --cflags OGRE` '
CCFLAGS += ' -I'
- CCFLAGS += ' -O3 -I./ -fvisibility=hidden -finline-limit=20 '
- CCFLAGS += ' -DOGRE_GCC_VISIBILITY ' # -fvisibility-inlines-hidden
+ CCFLAGS += ' -O3 -I./ ' # -fvisibility=hidden -finline-limit=20 '
+ #CCFLAGS += ' -DOGRE_GCC_VISIBILITY ' # -fvisibility-inlines-hidden
else:
CCFLAGS = ' -I -pipe -Os -I./'
return CCFLAGS
def get_source_files(_dir):
try:
- source_files = filter( lambda s: s.endswith( '.cpp' ), os.listdir(_dir) )
+ source_files = filter( lambda s: (s.endswith( '.cpp' ) or s.endswith( '.cxx' ) or s.endswith( '.c' )), os.listdir(_dir) )
except OSError,e:
print 'WARNING: Generate the sources this directory: "%s"' % _dir
raise e
@@ -90,10 +90,10 @@
# Let us select the projects to build
possible_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
- 'ogrevideoffmpeg', 'ogredshow' ] # , 'raknet'
+ 'ogrevideoffmpeg', 'ogredshow', 'plib' ] # , 'raknet'
default_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
- 'ogrevideoffmpeg', 'ogredshow' ]
+ 'ogrevideoffmpeg', 'ogredshow', 'plib' ]
# This lets you call scons like: 'scons PROJECTS=ogre,cegui'
opts = Options('custom.py')
@@ -155,11 +155,10 @@
## ugly hack - scons returns a list of targets from SharedLibrary - we have to choose the one we want
index = 0 # this is the index into a list of targets - '0' should be the platform default
-
+ if os.name=='nt':
+ _env.AddPostAction(package,\
+ 'mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % { 'name':package[index] } )
## 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] } )
-
_env.InstallAs(os.path.join(environment.package_dir_name, cls.parent,
cls.ModuleName, cls.PydName),
package[index] )
Modified: trunk/python-ogre/ThirdParty/opcode/IceAABB.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceAABB.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceAABB.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains AABB-related code.
- * \file IceAABB.cpp
+ * \file .Ice/AABB.cpp
* \author Pierre Terdiman
* \date January, 29, 2000
*/
@@ -20,7 +20,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
Modified: trunk/python-ogre/ThirdParty/opcode/IceAABB.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceAABB.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceAABB.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains AABB-related code. (axis-aligned bounding box)
- * \file IceAABB.h
+ * \file .Ice/AABB.h
* \author Pierre Terdiman
* \date January, 13, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceAxes.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceAxes.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceAxes.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains axes definition.
- * \file IceAxes.h
+ * \file .Ice/Axes.h
* \author Pierre Terdiman
* \date January, 29, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceBoundingSphere.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceBoundingSphere.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceBoundingSphere.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code to compute the minimal bounding sphere.
- * \file IceBoundingSphere.h
+ * \file .Ice/BoundingSphere.h
* \author Pierre Terdiman
* \date January, 29, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceContainer.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceContainer.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceContainer.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains a simple container class.
- * \file IceContainer.cpp
+ * \file .Ice/Container.cpp
* \author Pierre Terdiman
* \date February, 5, 2000
*/
@@ -24,7 +24,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceCore;
+using namespace.Ice/Core;
// Static members
#ifdef CONTAINER_STATS
Modified: trunk/python-ogre/ThirdParty/opcode/IceContainer.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceContainer.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceContainer.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains a simple container class.
- * \file IceContainer.h
+ * \file .Ice/Container.h
* \author Pierre Terdiman
* \date February, 5, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceFPU.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceFPU.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceFPU.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains FPU related code.
- * \file IceFPU.h
+ * \file .Ice/FPU.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceHPoint.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceHPoint.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceHPoint.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for homogeneous points.
- * \file IceHPoint.cpp
+ * \file .Ice/HPoint.cpp
* \author Pierre Terdiman
* \date April, 4, 2000
*/
@@ -28,7 +28,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Point Mul = HPoint * Matrix3x3;
Modified: trunk/python-ogre/ThirdParty/opcode/IceHPoint.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceHPoint.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceHPoint.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for homogeneous points.
- * \file IceHPoint.h
+ * \file .Ice/HPoint.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceIndexedTriangle.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceIndexedTriangle.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceIndexedTriangle.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains a handy indexed triangle class.
- * \file IceIndexedTriangle.cpp
+ * \file .Ice/IndexedTriangle.cpp
* \author Pierre Terdiman
* \date January, 17, 2000
*/
@@ -11,7 +11,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
Modified: trunk/python-ogre/ThirdParty/opcode/IceIndexedTriangle.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceIndexedTriangle.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceIndexedTriangle.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains a handy indexed triangle class.
- * \file IceIndexedTriangle.h
+ * \file .Ice/IndexedTriangle.h
* \author Pierre Terdiman
* \date January, 17, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceLSS.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceLSS.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceLSS.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for line-swept spheres.
- * \file IceLSS.h
+ * \file .Ice/LSS.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceMatrix3x3.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceMatrix3x3.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceMatrix3x3.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for 3x3 matrices.
- * \file IceMatrix3x3.cpp
+ * \file .Ice/Matrix3x3.cpp
* \author Pierre Terdiman
* \date April, 4, 2000
*/
@@ -35,7 +35,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
// Cast operator
Matrix3x3::operator Matrix4x4() const
Modified: trunk/python-ogre/ThirdParty/opcode/IceMatrix3x3.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceMatrix3x3.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceMatrix3x3.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for 3x3 matrices.
- * \file IceMatrix3x3.h
+ * \file .Ice/Matrix3x3.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceMatrix4x4.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceMatrix4x4.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceMatrix4x4.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for 4x4 matrices.
- * \file IceMatrix4x4.cpp
+ * \file .Ice/Matrix4x4.cpp
* \author Pierre Terdiman
* \date April, 4, 2000
*/
@@ -38,7 +38,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
@@ -51,7 +51,7 @@
* \param src [in] source matrix
*/
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-ICEMATHS_API void IceMaths::InvertPRMatrix(Matrix4x4& dest, const Matrix4x4& src)
+ICEMATHS_API void.Ice/Maths::InvertPRMatrix(Matrix4x4& dest, const Matrix4x4& src)
{
dest.m[0][0] = src.m[0][0];
dest.m[1][0] = src.m[0][1];
Modified: trunk/python-ogre/ThirdParty/opcode/IceMatrix4x4.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceMatrix4x4.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceMatrix4x4.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for 4x4 matrices.
- * \file IceMatrix4x4.h
+ * \file .Ice/Matrix4x4.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceMemoryMacros.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceMemoryMacros.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceMemoryMacros.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains all memory macros.
- * \file IceMemoryMacros.h
+ * \file .Ice/MemoryMacros.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
@@ -98,7 +98,7 @@
#define SAFE_DESTRUCT(x) if (x) { (x)->SelfDestruct(); (x) = null; } //!< Safe ICE-style release
#ifdef __ICEERROR_H__
- #define CHECKALLOC(x) if(!x) return SetIceError("Out of memory.", EC_OUT_OF_MEMORY); //!< Standard alloc checking. HANDLE WITH CARE.
+ #define CHECKALLOC(x) if(!x) return Se.Ice/Error("Out of memory.", EC_OUT_OF_MEMORY); //!< Standard alloc checking. HANDLE WITH CARE.
#else
#define CHECKALLOC(x) if(!x) return false;
#endif
Modified: trunk/python-ogre/ThirdParty/opcode/IceOBB.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceOBB.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceOBB.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains OBB-related code.
- * \file IceOBB.cpp
+ * \file .Ice/OBB.cpp
* \author Pierre Terdiman
* \date January, 29, 2000
*/
@@ -20,7 +20,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
Modified: trunk/python-ogre/ThirdParty/opcode/IceOBB.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceOBB.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceOBB.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains OBB-related code. (oriented bounding box)
- * \file IceOBB.h
+ * \file .Ice/OBB.h
* \author Pierre Terdiman
* \date January, 13, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IcePairs.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IcePairs.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IcePairs.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains a simple pair class.
- * \file IcePairs.h
+ * \file .Ice/Pairs.h
* \author Pierre Terdiman
* \date January, 13, 2003
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IcePlane.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IcePlane.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IcePlane.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for planes.
- * \file IcePlane.cpp
+ * \file .Ice/Plane.cpp
* \author Pierre Terdiman
* \date April, 4, 2000
*/
@@ -20,7 +20,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
Modified: trunk/python-ogre/ThirdParty/opcode/IcePlane.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IcePlane.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IcePlane.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for planes.
- * \file IcePlane.h
+ * \file .Ice/Plane.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IcePoint.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IcePoint.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IcePoint.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for 3D vectors.
- * \file IcePoint.cpp
+ * \file .Ice/Point.cpp
* \author Pierre Terdiman
* \date April, 4, 2000
*/
@@ -48,7 +48,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
Modified: trunk/python-ogre/ThirdParty/opcode/IcePoint.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IcePoint.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IcePoint.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for 3D vectors.
- * \file IcePoint.h
+ * \file .Ice/Point.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IcePreprocessor.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IcePreprocessor.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IcePreprocessor.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains preprocessor stuff. This should be the first included header.
- * \file IcePreprocessor.h
+ * \file .Ice/Preprocessor.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceRandom.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceRandom.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceRandom.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for random generators.
- * \file IceRandom.cpp
+ * \file .Ice/Random.cpp
* \author Pierre Terdiman
* \date August, 9, 2001
*/
@@ -11,14 +11,14 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceCore;
+using namespace.Ice/Core;
-void IceCore:: SRand(udword seed)
+void.Ice/Core:: SRand(udword seed)
{
srand(seed);
}
-udword IceCore::Rand()
+udword.Ice/Core::Rand()
{
return rand();
}
@@ -26,7 +26,7 @@
static BasicRandom gRandomGenerator(42);
-udword IceCore::GetRandomIndex(udword max_index)
+udword.Ice/Core::GetRandomIndex(udword max_index)
{
// We don't use rand() since it's limited to RAND_MAX
udword Index = gRandomGenerator.Randomize();
Modified: trunk/python-ogre/ThirdParty/opcode/IceRandom.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceRandom.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceRandom.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for random generators.
- * \file IceRandom.h
+ * \file .Ice/Random.h
* \author Pierre Terdiman
* \date August, 9, 2001
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceRay.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceRay.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceRay.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for rays.
- * \file IceRay.cpp
+ * \file .Ice/Ray.cpp
* \author Pierre Terdiman
* \date April, 4, 2000
*/
@@ -61,7 +61,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
float Ray::SquareDistance(const Point& point, float* t) const
{
Modified: trunk/python-ogre/ThirdParty/opcode/IceRay.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceRay.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceRay.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for rays.
- * \file IceRay.h
+ * \file .Ice/Ray.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceRevisitedRadix.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceRevisitedRadix.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceRevisitedRadix.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains source code from the article "Radix Sort Revisited".
- * \file IceRevisitedRadix.cpp
+ * \file .Ice/RevisitedRadix.cpp
* \author Pierre Terdiman
* \date April, 4, 2000
*/
@@ -51,7 +51,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceCore;
+using namespace.Ice/Core;
#define INVALIDATE_RANKS mCurrentSize|=0x80000000
#define VALIDATE_RANKS mCurrentSize&=0x7fffffff
Modified: trunk/python-ogre/ThirdParty/opcode/IceRevisitedRadix.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceRevisitedRadix.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceRevisitedRadix.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains source code from the article "Radix Sort Revisited".
- * \file IceRevisitedRadix.h
+ * \file .Ice/RevisitedRadix.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceSegment.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceSegment.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceSegment.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for segments.
- * \file IceSegment.cpp
+ * \file .Ice/Segment.cpp
* \author Pierre Terdiman
* \date April, 4, 2000
*/
@@ -24,7 +24,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
float Segment::SquareDistance(const Point& point, float* t) const
{
Modified: trunk/python-ogre/ThirdParty/opcode/IceSegment.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceSegment.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceSegment.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for segments.
- * \file IceSegment.h
+ * \file .Ice/Segment.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceTriangle.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceTriangle.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceTriangle.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains a handy triangle class.
- * \file IceTriangle.cpp
+ * \file .Ice/Triangle.cpp
* \author Pierre Terdiman
* \date January, 17, 2000
*/
@@ -11,7 +11,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceMaths;
+using namespace.Ice/Maths;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
Modified: trunk/python-ogre/ThirdParty/opcode/IceTriangle.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceTriangle.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceTriangle.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains a handy triangle class.
- * \file IceTriangle.h
+ * \file .Ice/Triangle.h
* \author Pierre Terdiman
* \date January, 17, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceTrilist.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceTrilist.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceTrilist.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for a triangle container.
- * \file IceTrilist.h
+ * \file .Ice/Trilist.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceTypes.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceTypes.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceTypes.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains custom types.
- * \file IceTypes.h
+ * \file .Ice/Types.h
* \author Pierre Terdiman
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/IceUtils.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceUtils.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceUtils.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains misc. useful macros & defines.
- * \file IceUtils.cpp
+ * \file .Ice/Utils.cpp
* \author Pierre Terdiman (collected from various sources)
* \date April, 4, 2000
*/
@@ -11,7 +11,7 @@
// Precompiled Header
#include "Stdafx.h"
-using namespace IceCore;
+using namespace.Ice/Core;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
@@ -21,7 +21,7 @@
* \return the best alignment (e.g. 1 for odd addresses, etc)
*/
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-udword IceCore::Alignment(udword address)
+udword.Ice/Core::Alignment(udword address)
{
// Returns 0 for null addresses
if(!address) return 0;
Modified: trunk/python-ogre/ThirdParty/opcode/IceUtils.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/IceUtils.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/IceUtils.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains misc. useful macros & defines.
- * \file IceUtils.h
+ * \file .Ice/Utils.h
* \author Pierre Terdiman (collected from various sources)
* \date April, 4, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/OPC_BoxPruning.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/OPC_BoxPruning.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/OPC_BoxPruning.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for box pruning.
- * \file IceBoxPruning.cpp
+ * \file .Ice/BoxPruning.cpp
* \author Pierre Terdiman
* \date January, 29, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/OPC_BoxPruning.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/OPC_BoxPruning.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/OPC_BoxPruning.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Contains code for box pruning.
- * \file IceBoxPruning.h
+ * \file .Ice/BoxPruning.h
* \author Pierre Terdiman
* \date January, 29, 2000
*/
Modified: trunk/python-ogre/ThirdParty/opcode/OPC_IceHook.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/OPC_IceHook.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/OPC_IceHook.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -26,45 +26,45 @@
#define ICE_COMPILE_TIME_ASSERT(exp) extern char ICE_Dummy[ (exp) ? 1 : -1 ]
#define Log {}
- #define SetIceError false
+ #define Se.Ice/Error false
#define EC_OUTOFMEMORY "Out of memory"
- #include ".\Ice\IcePreprocessor.h"
+ #include "..Ice/\IcePreprocessor.h"
#undef ICECORE_API
#define ICECORE_API OPCODE_API
- #include ".\Ice\IceTypes.h"
- #include ".\Ice\IceFPU.h"
- #include ".\Ice\IceMemoryMacros.h"
+ #include "..Ice/\IceTypes.h"
+ #include "..Ice/\IceFPU.h"
+ #include "..Ice/\IceMemoryMacros.h"
- namespace IceCore
+ namespace.Ice/Core
{
- #include ".\Ice\IceUtils.h"
- #include ".\Ice\IceContainer.h"
- #include ".\Ice\IcePairs.h"
- #include ".\Ice\IceRevisitedRadix.h"
- #include ".\Ice\IceRandom.h"
+ #include "..Ice/\IceUtils.h"
+ #include "..Ice/\IceContainer.h"
+ #include "..Ice/\IcePairs.h"
+ #include "..Ice/\IceRevisitedRadix.h"
+ #include "..Ice/\IceRandom.h"
}
- using namespace IceCore;
+ using namespace.Ice/Core;
#define ICEMATHS_API OPCODE_API
- namespace IceMaths
+ namespace.Ice/Maths
{
- #include ".\Ice\IceAxes.h"
- #include ".\Ice\IcePoint.h"
- #include ".\Ice\IceHPoint.h"
- #include ".\Ice\IceMatrix3x3.h"
- #include ".\Ice\IceMatrix4x4.h"
- #include ".\Ice\IcePlane.h"
- #include ".\Ice\IceRay.h"
- #include ".\Ice\IceIndexedTriangle.h"
- #include ".\Ice\IceTriangle.h"
- #include ".\Ice\IceTriList.h"
- #include ".\Ice\IceAABB.h"
- #include ".\Ice\IceOBB.h"
- #include ".\Ice\IceBoundingSphere.h"
- #include ".\Ice\IceSegment.h"
- #include ".\Ice\IceLSS.h"
+ #include "..Ice/\IceAxes.h"
+ #include "..Ice/\IcePoint.h"
+ #include "..Ice/\IceHPoint.h"
+ #include "..Ice/\IceMatrix3x3.h"
+ #include "..Ice/\IceMatrix4x4.h"
+ #include "..Ice/\IcePlane.h"
+ #include "..Ice/\IceRay.h"
+ #include "..Ice/\IceIndexedTriangle.h"
+ #include "..Ice/\IceTriangle.h"
+ #include "..Ice/\IceTriList.h"
+ #include "..Ice/\IceAABB.h"
+ #include "..Ice/\IceOBB.h"
+ #include "..Ice/\IceBoundingSphere.h"
+ #include "..Ice/\IceSegment.h"
+ #include "..Ice/\IceLSS.h"
}
- using namespace IceMaths;
+ using namespace.Ice/Maths;
Modified: trunk/python-ogre/ThirdParty/opcode/OPC_MeshInterface.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/OPC_MeshInterface.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/OPC_MeshInterface.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -210,7 +210,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool MeshInterface::SetCallback(RequestCallback callback, void* user_data)
{
- if(!callback) return SetIceError("MeshInterface::SetCallback: callback pointer is null");
+ if(!callback) return Se.Ice/Error("MeshInterface::SetCallback: callback pointer is null");
mObjCallback = callback;
mUserData = user_data;
@@ -227,7 +227,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool MeshInterface::SetPointers(const IndexedTriangle* tris, const Point* verts)
{
- if(!tris || !verts) return SetIceError("MeshInterface::SetPointers: pointer is null", null);
+ if(!tris || !verts) return Se.Ice/Error("MeshInterface::SetPointers: pointer is null", null);
mTris = tris;
mVerts = verts;
@@ -244,8 +244,8 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool MeshInterface::SetStrides(udword tri_stride, udword vertex_stride)
{
- if(tri_stride<sizeof(IndexedTriangle)) return SetIceError("MeshInterface::SetStrides: invalid triangle stride", null);
- if(vertex_stride<sizeof(Point)) return SetIceError("MeshInterface::SetStrides: invalid vertex stride", null);
+ if(tri_stride<sizeof(IndexedTriangle)) return Se.Ice/Error("MeshInterface::SetStrides: invalid triangle stride", null);
+ if(vertex_stride<sizeof(Point)) return Se.Ice/Error("MeshInterface::SetStrides: invalid vertex stride", null);
mTriStride = tri_stride;
mVertexStride = vertex_stride;
Modified: trunk/python-ogre/ThirdParty/opcode/OPC_Model.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/OPC_Model.cpp 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/OPC_Model.cpp 2007-09-23 03:40:15 UTC (rev 390)
@@ -142,7 +142,7 @@
if(!create.mIMesh || !create.mIMesh->IsValid()) return false;
// For this model, we only support complete trees
- if(create.mSettings.mLimit!=1) return SetIceError("OPCODE WARNING: supports complete trees only! Use mLimit = 1.\n", null);
+ if(create.mSettings.mLimit!=1) return Se.Ice/Error("OPCODE WARNING: supports complete trees only! Use mLimit = 1.\n", null);
// Look for degenerate faces.
udword NbDegenerate = create.mIMesh->CheckTopology();
Modified: trunk/python-ogre/ThirdParty/opcode/Opcode.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/Opcode.h 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/Opcode.h 2007-09-23 03:40:15 UTC (rev 390)
@@ -22,21 +22,8 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Compilation messages
-#if defined(OPCODE_EXPORTS)
- #pragma message("Compiling OPCODE")
-#elif !defined(OPCODE_EXPORTS)
- #pragma message("Using OPCODE")
- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // Automatic linking
- #ifndef BAN_OPCODE_AUTOLINK
- #ifdef _DEBUG
- #pragma comment(lib, "Opcode_D.lib")
- #else
- #pragma comment(lib, "Opcode.lib")
- #endif
- #endif
-#endif
+
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Preprocessor
#ifndef ICE_NO_DLL
@@ -49,7 +36,7 @@
#define OPCODE_API
#endif
- #include "OPC_IceHook.h"
+ #include "OPC.Ice/Hook.h"
namespace Opcode
{
Modified: trunk/python-ogre/ThirdParty/opcode/Opcode.ncb
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/ThirdParty/opcode/Opcode.opt
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/ThirdParty/opcode/Opcode.plg
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/Opcode.plg 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/Opcode.plg 2007-09-23 03:40:15 UTC (rev 390)
@@ -9,48 +9,48 @@
Creating temporary file "F:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP245.tmp" with contents
[
/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OPCODE_EXPORTS" /Fp"Release/Opcode.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /QIfist /c
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_BaseModel.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_HybridModel.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_Model.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Opcode.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_Collider.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_VolumeCollider.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_AABBCollider.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_LSSCollider.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_OBBCollider.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_PlanesCollider.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_RayCollider.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_SphereCollider.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_TreeCollider.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_AABBTree.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_Common.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_MeshInterface.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_OptimizedTree.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_TreeBuilders.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_BoxPruning.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_SweepAndPrune.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\OPC_Picking.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceAABB.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceContainer.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceHPoint.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceIndexedTriangle.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceMatrix3x3.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceMatrix4x4.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceOBB.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IcePlane.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IcePoint.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceRandom.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceRay.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceRevisitedRadix.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceSegment.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceTriangle.cpp"
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\Ice\IceUtils.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_BaseModel.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_HybridModel.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_Model.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Opcode.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_Collider.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_VolumeCollider.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_AABBCollider.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_LSSCollider.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_OBBCollider.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_PlanesCollider.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_RayCollider.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_SphereCollider.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_TreeCollider.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_AABBTree.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_Common.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_MeshInterface.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_OptimizedTree.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_TreeBuilders.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_BoxPruning.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_SweepAndPrune.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\OPC_Picking.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceAABB.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceContainer.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceHPoint.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceIndexedTriangle.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceMatrix3x3.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceMatrix4x4.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceOBB.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IcePlane.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IcePoint.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceRandom.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceRay.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceRevisitedRadix.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceSegment.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceTriangle.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\Ice\IceUtils.cpp"
]
Creating command line "cl.exe @F:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP245.tmp"
Creating temporary file "F:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP246.tmp" with contents
[
/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OPCODE_EXPORTS" /Fp"Release/Opcode.pch" /Yc"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /QIfist /c
-"Y:\APIs\Ice\OpcodeDistrib\Opcode\StdAfx.cpp"
+"Y:\APIs.Ice/\OpcodeDistrib\Opcode\StdAfx.cpp"
]
Creating command line "cl.exe @F:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP246.tmp"
Creating temporary file "F:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP247.tmp" with contents
@@ -78,21 +78,21 @@
.\Release\OPC_BoxPruning.obj
.\Release\OPC_SweepAndPrune.obj
.\Release\OPC_Picking.obj
-.\Release\IceAABB.obj
-.\Release\IceContainer.obj
-.\Release\IceHPoint.obj
-.\Release\IceIndexedTriangle.obj
-.\Release\IceMatrix3x3.obj
-.\Release\IceMatrix4x4.obj
-.\Release\IceOBB.obj
-.\Release\IcePlane.obj
-.\Release\IcePoint.obj
-.\Release\IceRandom.obj
-.\Release\IceRay.obj
-.\Release\IceRevisitedRadix.obj
-.\Release\IceSegment.obj
-.\Release\IceTriangle.obj
-.\Release\IceUtils.obj
+.\Release.Ice/AABB.obj
+.\Release.Ice/Container.obj
+.\Release.Ice/HPoint.obj
+.\Release.Ice/IndexedTriangle.obj
+.\Release.Ice/Matrix3x3.obj
+.\Release.Ice/Matrix4x4.obj
+.\Release.Ice/OBB.obj
+.\Release.Ice/Plane.obj
+.\Release.Ice/Point.obj
+.\Release.Ice/Random.obj
+.\Release.Ice/Ray.obj
+.\Release.Ice/RevisitedRadix.obj
+.\Release.Ice/Segment.obj
+.\Release.Ice/Triangle.obj
+.\Release.Ice/Utils.obj
]
Creating command line "link.exe @F:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP247.tmp"
<h3>Output Window</h3>
Modified: trunk/python-ogre/ThirdParty/opcode/Opcode.vcproj
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/Opcode.vcproj 2007-09-22 13:44:26 UTC (rev 389)
+++ trunk/python-ogre/ThirdParty/opcode/Opcode.vcproj 2007-09-23 03:40:15 UTC (rev 390)
@@ -263,7 +263,7 @@
>
</File>
<File
- RelativePath="OPC_IceHook.h"
+ RelativePath="OPC.Ice/Hook.h"
>
</File>
<File
@@ -826,10 +826,10 @@
</File>
</Filter>
<Filter
- Name="Ice"
+ Name=.Ice/"
>
<File
- RelativePath="Ice\IceAABB.cpp"
+ RelativePath=.Ice/\IceAABB.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -849,19 +849,19 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceAABB.h"
+ RelativePath=.Ice/\IceAABB.h"
>
</File>
<File
- RelativePath="Ice\IceAxes.h"
+ RelativePath=.Ice/\IceAxes.h"
>
</File>
<File
- RelativePath="Ice\IceBoundingSphere.h"
+ RelativePath=.Ice/\IceBoundingSphere.h"
>
</File>
<File
- RelativePath="Ice\IceContainer.cpp"
+ RelativePath=.Ice/\IceContainer.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -881,15 +881,15 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceContainer.h"
+ RelativePath=.Ice/\IceContainer.h"
>
</File>
<File
- RelativePath="Ice\IceFPU.h"
+ RelativePath=.Ice/\IceFPU.h"
>
</File>
<File
- RelativePath="Ice\IceHPoint.cpp"
+ RelativePath=.Ice/\IceHPoint.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -909,11 +909,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceHPoint.h"
+ RelativePath=.Ice/\IceHPoint.h"
>
</File>
<File
- RelativePath="Ice\IceIndexedTriangle.cpp"
+ RelativePath=.Ice/\IceIndexedTriangle.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -933,15 +933,15 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceIndexedTriangle.h"
+ RelativePath=.Ice/\IceIndexedTriangle.h"
>
</File>
<File
- RelativePath="Ice\IceLSS.h"
+ RelativePath=.Ice/\IceLSS.h"
>
</File>
<File
- RelativePath="Ice\IceMatrix3x3.cpp"
+ RelativePath=.Ice/\IceMatrix3x3.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -961,11 +961,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceMatrix3x3.h"
+ RelativePath=.Ice/\IceMatrix3x3.h"
>
</File>
<File
- RelativePath="Ice\IceMatrix4x4.cpp"
+ RelativePath=.Ice/\IceMatrix4x4.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -985,15 +985,15 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceMatrix4x4.h"
+ RelativePath=.Ice/\IceMatrix4x4.h"
>
</File>
<File
- RelativePath="Ice\IceMemoryMacros.h"
+ RelativePath=.Ice/\IceMemoryMacros.h"
>
</File>
<File
- RelativePath="Ice\IceOBB.cpp"
+ RelativePath=.Ice/\IceOBB.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -1013,15 +1013,15 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceOBB.h"
+ RelativePath=.Ice/\IceOBB.h"
>
</File>
<File
- RelativePath="Ice\IcePairs.h"
+ RelativePath=.Ice/\IcePairs.h"
>
</File>
<File
- RelativePath="Ice\IcePlane.cpp"
+ RelativePath=.Ice/\IcePlane.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -1041,11 +1041,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IcePlane.h"
+ RelativePath=.Ice/\IcePlane.h"
>
</File>
<File
- RelativePath="Ice\IcePoint.cpp"
+ RelativePath=.Ice/\IcePoint.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -1065,15 +1065,15 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IcePoint.h"
+ RelativePath=.Ice/\IcePoint.h"
>
</File>
<File
- RelativePath="Ice\IcePreprocessor.h"
+ RelativePath=.Ice/\IcePreprocessor.h"
>
</File>
<File
- RelativePath="Ice\IceRandom.cpp"
+ RelativePath=.Ice/\IceRandom.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -1093,11 +1093,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceRandom.h"
+ RelativePath=.Ice/\IceRandom.h"
>
</File>
<File
- RelativePath="Ice\IceRay.cpp"
+ RelativePath=.Ice/\IceRay.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -1117,11 +1117,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceRay.h"
+ RelativePath=.Ice/\IceRay.h"
>
</File>
<File
- RelativePath="Ice\IceRevisitedRadix.cpp"
+ RelativePath=.Ice/\IceRevisitedRadix.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -1141,11 +1141,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceRevisitedRadix.h"
+ RelativePath=.Ice/\IceRevisitedRadix.h"
>
</File>
<File
- RelativePath="Ice\IceSegment.cpp"
+ RelativePath=.Ice/\IceSegment.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -1165,11 +1165,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceSegment.h"
+ RelativePath=.Ice/\IceSegment.h"
>
</File>
<File
- RelativePath="Ice\IceTriangle.cpp"
+ RelativePath=.Ice/\IceTriangle.cpp"
>
<FileConfiguration
Name="Release|Win32"
@@ -1189,19 +1189,19 @@
</FileConfiguration>
</File>
<File
- RelativePath="Ice\IceTriangle.h"
+ RelativePath=.Ice/\IceTriangle.h"
>
</File>
<File
- RelativePath="Ice\IceTrilist.h"
+ RelativePath=.Ice/\IceTrilist.h"
>
</File>
<File
- RelativePath="Ice\IceTypes.h"
+ RelativePat...
[truncated message content] |
