|
From: <and...@us...> - 2008-12-18 12:23:04
|
Revision: 831
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=831&view=rev
Author: andy_miller
Date: 2008-12-18 12:21:14 +0000 (Thu, 18 Dec 2008)
Log Message:
-----------
Updates to OgreForests code base
Set windows build back to a shared lib (dll) build for Boost
Significant changes in common code to support Pure Virtual functions needing transformation (requires the latest Py++)
Reasonable set of updates to PhysX (Dermont's wrapper code + more)
Small update to Bullet due to new common wrapping code
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ReportVersion.py
trunk/python-ogre/SConstruct
trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp
trunk/python-ogre/ThirdParty/forests/GrassLoader.h
trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp
trunk/python-ogre/ThirdParty/forests/PropertyMaps.cpp
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/common_utils/__init__.py
trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
trunk/python-ogre/demos/ogre/Demo_Basic.py
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/UpdateDLLs.bat
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -13,17 +13,13 @@
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
-PATH_Boost = os.path.join(BASE_DIR, 'boost_1_36_0' ) #-trunk')
+PATH_Boost = os.path.join(BASE_DIR, 'boost_1_37_0' ) #-trunk')
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/threading-multi')
-
-## and the name of the boost python library
-## now part of class boos tin environtment.py
-# LIB_Boost = r'boost_python-vc90-mt-1_37'
-# # LIB_Boost = r'boost_python-vc80-mt-1_34_1'
-# LIB_Boost = r'boost_python-vc-mt-1_35'
-
+PATH_LIB_Boost_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/link-static/threading-multi')
+PATH_LIB_Thread_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/thread/build/msvc-9.0/release/link-static/threading-multi')
+PATH_LIB_date_time_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/date_time/build/msvc-9.0/release/link-static/threading-multi')
# in Linux we need to code in the Relative path for the library
RPATH=""
@@ -36,7 +32,7 @@
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR, 'ogre')
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
-PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.1')
+PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.2')
PATH_OIS = os.path.join(BASE_DIR, 'ois' ) ##'ois-1.0RC1')
PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk','sdk')
Modified: trunk/python-ogre/ReportVersion.py
===================================================================
--- trunk/python-ogre/ReportVersion.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ReportVersion.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -4,6 +4,7 @@
import os, sys, time, shutil
import logging
#import BuildModule as bm
+import ogre.renderer.OGRE as o
#add environment to the path
sys.path.append( '.' )
@@ -17,7 +18,7 @@
moduleList = ( 'ogre.renderer.OGRE',
'ogre.io.OIS',
- 'ogre.gui.CEGUI','ogre.gui.QuickGUI', 'ogre.gui.betagui',
+ 'ogre.gui.betagui', # 'ogre.gui.CEGUI', 'ogre.gui.QuickGUI',
'ogre.sound.OgreAL',
'ogre.physics.ODE', 'ogre.physics.OgreRefApp',
'ogre.physics.OgreOde', 'ogre.physics.OgreNewt', 'ogre.physics.Opcode',
@@ -51,3 +52,5 @@
except ImportError:
print "Import failed:", basename
# logger.error ( "Import failed:" + basename )
+ except TypeError:
+ print "Type Error:"
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/SConstruct 2008-12-18 12:21:14 UTC (rev 831)
@@ -50,7 +50,7 @@
def get_ccflags(cls):
if os.name=='nt':
CCFLAGS=''
- #CCFLAGS += '-DBOOST_PYTHON_MAX_ARITY=19'
+ CCFLAGS += ' /DBOOST_PYTHON_MAX_ARITY=19 '
CCFLAGS += ' /nologo -Zm200 '
CCFLAGS += ' /W3 /wd4675' # warning level -Zc:wchar_t
CCFLAGS += ' /TP /MD /Zc:forScope /EHs /c /Ox /Ob2 /Oi /Ot /Oy /GS- /GR '
Modified: trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp 2008-12-18 12:21:14 UTC (rev 831)
@@ -260,6 +260,13 @@
if (heightFunction){
y1 = heightFunction(x1, z1, heightFunctionUserData);
y2 = heightFunction(x2, z2, heightFunctionUserData);
+
+ if (layer->getMaxSlope() < (Math::Abs(y1 - y2) / (halfScaleX * 2))) {
+ //Degenerate the face
+ x2 = x1;
+ y2 = y1;
+ z2 = z1;
+ }
} else {
y1 = 0;
y2 = 0;
@@ -398,6 +405,13 @@
if (heightFunction){
y1 = heightFunction(x1, z1, heightFunctionUserData);
y2 = heightFunction(x2, z2, heightFunctionUserData);
+
+ if (layer->getMaxSlope() < (Math::Abs(y1 - y2) / (halfScaleX * 2))) {
+ //Degenerate the face
+ x2 = x1;
+ y2 = y1;
+ z2 = z1;
+ }
} else {
y1 = 0;
y2 = 0;
@@ -432,6 +446,13 @@
float y3, y4;
if (heightFunction){
+ if (layer->getMaxSlope() < (Math::Abs(y1 - y2) / (halfScaleX * 2))) {
+ //Degenerate the face
+ x2 = x1;
+ y2 = y1;
+ z2 = z1;
+ }
+
y3 = heightFunction(x3, z3, heightFunctionUserData);
y4 = heightFunction(x4, z4, heightFunctionUserData);
} else {
@@ -659,6 +680,7 @@
minWidth = 1.0f; maxWidth = 1.0f;
minHeight = 1.0f; maxHeight = 1.0f;
minY = 0; maxY = 0;
+ maxSlope = 1000;
renderTechnique = GRASSTECH_QUAD;
fadeTechnique = FADETECH_ALPHA;
animMag = 1.0f;
Modified: trunk/python-ogre/ThirdParty/forests/GrassLoader.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/GrassLoader.h 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/GrassLoader.h 2008-12-18 12:21:14 UTC (rev 831)
@@ -169,7 +169,6 @@
heightFunctionUserData = userData;
}
-
/** INTERNAL FUNCTION - DO NOT USE */
void loadPage(PageInfo &page);
/** INTERNAL FUNCTION - DO NOT USE */
@@ -276,6 +275,34 @@
as necessary. */
void setHeightRange(float minHeight, float maxHeight = 0) { minY = minHeight; maxY = maxHeight; }
+ /** \brief Set the maximum slope a grass of blade can be placed on.
+ \param maxSlopeRatio The maximum slope (h/w ratio) a grass blade is allowed to be placed on.
+
+ This function can be used to set the maximum slope you want your grass to be placed on
+ (although it doesn't work for sprite grass). By default grass is allowed on any slope.
+
+ This version of setMaxSlope() accepts a slope ratio value, where ATan(maxSlopeRatio) =
+ maxSlopeAngle. If you wish to provide a maximum slope as an angle, either use the other
+ overload of this function, or convert your angle to a slope ratio first with Tan().*/
+ void setMaxSlope(const float maxSlopeRatio) { maxSlope = maxSlopeRatio; }
+
+ void setMaxSlope(Ogre::Radian maxSlopeAngle) {
+ if (maxSlopeAngle > Ogre::Degree(89.99f))
+ maxSlopeAngle = Ogre::Degree(89.99f);
+ if (maxSlopeAngle < Ogre::Degree(0))
+ maxSlopeAngle = Ogre::Degree(0);
+
+ maxSlope = Ogre::Math::Tan(maxSlopeAngle);
+ }
+
+ /** \brief Get the maximum slope a grass blade can be placed on (as set by setMaxSlope()).
+ \returns The currently set maximum slope ratio value (not an angle).
+
+ This returns the currently set maximum slope which is used to determine what ground is too steep
+ for grass to be placed on. Note that this returns the slope as a slope ratio, not an angle. If you
+ need an angle value, convert with ATan() (maxSlopeAngle = ATan(maxSlopeRatio)).*/
+ float getMaxSlope() const { return maxSlope; }
+
/** \brief Sets the density map used for this grass layer
\param mapFile The density map image
\param channel The color channel(s) to from the image to interpret as density
@@ -487,6 +514,7 @@
float minHeight, maxHeight;
float minY, maxY;
+ float maxSlope;
FadeTechnique fadeTechnique;
GrassTechnique renderTechnique;
Modified: trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2008-12-18 12:21:14 UTC (rev 831)
@@ -49,6 +49,7 @@
if (++selfInstances == 1){
//Set up a single instance of a scene node which will be used when rendering impostor textures
geom->getSceneNode()->createChildSceneNode("ImpostorPage::renderNode");
+ geom->getSceneNode()->createChildSceneNode("ImpostorPage::cameraNode");
}
}
@@ -63,6 +64,7 @@
if (--selfInstances == 0){
sceneMgr->destroySceneNode("ImpostorPage::renderNode");
+ sceneMgr->destroySceneNode("ImpostorPage::cameraNode");
}
}
@@ -445,6 +447,7 @@
RenderTexture *renderTarget;
Camera *renderCamera;
Viewport *renderViewport;
+ SceneNode *camNode;
//Set up RTT texture
uint32 textureSize = ImpostorPage::impostorResolution;
@@ -459,7 +462,9 @@
renderTarget->setAutoUpdated(false);
//Set up camera
+ camNode = sceneMgr->getSceneNode("ImpostorPage::cameraNode");
renderCamera = sceneMgr->createCamera(getUniqueID("ImpostorCam"));
+ camNode->attachObject(renderCamera);
renderCamera->setLodBias(1000.0f);
renderViewport = renderTarget->addViewport(renderCamera);
renderViewport->setOverlaysEnabled(false);
Modified: trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp 2008-12-18 12:21:14 UTC (rev 831)
@@ -166,7 +166,7 @@
{
if (!managerList.empty())
OGRE_EXCEPT(0, "PagedGeometry::setBounds() cannot be called after detail levels have been added. Call removeDetailLevels() first.", "PagedGeometry::setBounds()");
- if (bounds.width() != bounds.height())
+ if (!Math::RealEqual(bounds.width(), bounds.height(), 0.01f))
OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Bounds must be square", "PagedGeometry::setBounds()");
if (bounds.width() <= 0 || bounds.height() <=0)
OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Bounds must have positive width and height", "PagedGeometry::setBounds()");
Modified: trunk/python-ogre/ThirdParty/forests/PropertyMaps.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PropertyMaps.cpp 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/PropertyMaps.cpp 2008-12-18 12:21:14 UTC (rev 831)
@@ -131,6 +131,10 @@
float boundsWidth = mapBounds.width();
float boundsHeight = mapBounds.height();
+ //Patch incorrect PixelBox::getWidth() in OpenGL mode
+ if (Root::getSingleton().getRenderSystem()->getName() == "OpenGL Rendering Subsystem")
+ --mapWidth;
+
uint32 xindex = mapWidth * (x - mapBounds.left) / boundsWidth;
uint32 zindex = mapHeight * (z - mapBounds.top) / boundsHeight;
if (xindex < 0 || zindex < 0 || xindex >= mapWidth || zindex >= mapHeight)
@@ -153,6 +157,10 @@
float boundsWidth = mapBounds.width();
float boundsHeight = mapBounds.height();
+ //Patch incorrect PixelBox::getWidth() in OpenGL mode
+ if (Root::getSingleton().getRenderSystem()->getName() == "OpenGL Rendering Subsystem")
+ --mapWidth;
+
float xIndexFloat = (mapWidth * (x - mapBounds.left) / boundsWidth) - 0.5f;
float zIndexFloat = (mapHeight * (z - mapBounds.top) / boundsHeight) - 0.5f;
Modified: trunk/python-ogre/code_generators/bullet/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/bullet/generate_code.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -212,7 +212,14 @@
f=main_ns.class_('btCollisionWorld').mem_fun('addCollisionObject')
f.arguments[1].default_value = 'btBroadphaseProxy::DefaultFilter' # (short int)(btBroadphaseProxy::DefaultFilter)
f.arguments[2].default_value = 'btBroadphaseProxy::AllFilter' # (short int)(btBroadphaseProxy::AllFilter)
-
+
+ f = ['::btBroadphaseInterface::createProxy',
+ '::btDispatcher::getNewManifold'
+ ]
+ for fun in f:
+ print "setting call policy", fun
+ main_ns.member_function(fun).call_policies = call_policies.default_call_policies()
+
############################################################
##
## And things that need to have their argument and call values fixed.
Modified: trunk/python-ogre/code_generators/common_utils/__init__.py
===================================================================
--- trunk/python-ogre/code_generators/common_utils/__init__.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/common_utils/__init__.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -282,6 +282,7 @@
arg_position = 0
trans=[]
desc=""
+ ft_type = None
ctypes_conversion = False
for arg in fun.arguments:
rawarg = declarations.remove_declarated(
@@ -301,10 +302,12 @@
arg.type.decl_string + " ) takes a CTypes.addressof(xx). \\n"
ctypes_conversion = True
ctypes_arg = arg.type.decl_string.split()[0]
+ ft_type = 'CTYPES'
elif declarations.is_reference(arg.type)and not declarations.is_const(declarations.remove_reference( arg.type)): # seen functions passing const ref's
trans.append( ft.inout(arg_position ) )
desc = desc + "Argument: "+arg.name+ "( pos:" + str(arg_position) + " - " +\
arg.type.decl_string + " ) converted to an input/output (change to return types).\\n"
+ ft_type = 'INOUT'
elif declarations.is_reference(arg.type):
print "Warning: - possible code change.", fun,arg," not wrapped as const reference to base type invalid"
else:
@@ -313,10 +316,23 @@
pass # it's not a var we need to handle
arg_position += 1
if trans:
+ const_return = False # declarations.is_const(fun)
+ if fun.decl_string.endswith('const'):
+ const_return=True
+ simple_return = declarations.is_arithmetic(fun.return_type) or declarations.is_void(fun.return_type)
+ nonpublic_destructor = declarations.is_class(fun.parent) and declarations.has_destructor(fun.parent) and\
+ not declarations.has_public_destructor(fun.parent)
+
if fun.documentation or fun.transformations: # it's already be tweaked:
print "AUTOFT ERROR: Duplicate Tranforms.", fun, fun.documentation
- elif hasattr(fun, "virtuality") and fun.virtuality == "pure virtual": # free functions don't have virtuality arrtibute
- print "AUTOFT WARNING: PURE VIRTUAL function requires tranform.", fun
+
+ # if the class has a protected destruction AND the return value is const or a non arithmatic value then exclude it.
+ elif nonpublic_destructor and const_return:
+ print "AUTOFT ERROR Const: Parent has non public destructor and const return.", fun.parent.name, fun.return_type.decl_string, fun
+ fun.documentation="Python-Ogre Warning: function required transformation - not possible due to non public destructor and const return value.."
+ elif nonpublic_destructor and not simple_return:
+ print "AUTOFT ERROR Const: Parent has non public destructor and complex return value.", fun.parent.name, fun.return_type.decl_string, fun
+ fun.documentation="Python-Ogre Warning: function required transformation - not possible due to non public destructor and complex return value.."
else:
new_alias = fun.name
if ctypes_conversion: # only manage name changes if ctypes changing
@@ -338,7 +354,7 @@
desc = desc + "\\\nWARNING FUNCTION NAME CHANGE - from "+fun.name + " -- " + fun.decl_string +" to " + new_alias + " \\n"
print "INFO: Adjusting Alias as multiple overlapping functions:", new_alias
- print "AUTOFT OK: Tranformed ", fun, "(",new_alias,")"
+ print "AUTOFT OK: Tranformed ", fun.return_type.decl_string, fun, "(",new_alias,")"
fun.add_transformation ( * trans , **{"alias":new_alias} )
fun.documentation = docit ("Auto Modified Arguments:",
desc, "...")
@@ -362,13 +378,13 @@
desc = desc +"Argument: "+arg.name+ "( pos:" + str(arg_position) +") takes a CTypes.addressof(xx). "
arg_position +=1
if trans:
- if fun.virtuality == "pure virtual":
- print "*** WARNING: Unable to apply transformation to PURE VIRTUAL function", fun, desc
- else:
- print "Tranformation applied to ", fun, desc, fun.virtuality
- fun.add_transformation ( * trans , **{"alias":fun.name} )
- fun.documentation = docit ("Modified Input Argument to work with CTypes",
- desc, "...")
+# if fun.virtuality == "pure virtual":
+# print "*** WARNING: Unable to apply transformation to PURE VIRTUAL function", fun, desc
+# else:
+ print "Tranformation applied to ", fun, desc, fun.virtuality
+ fun.add_transformation ( * trans , **{"alias":fun.name} )
+ fun.documentation = docit ("Modified Input Argument to work with CTypes",
+ desc, "...")
for fun in mb.member_functions():
fixVoids ( fun )
@@ -511,6 +527,7 @@
""" There are some cases where function transformations don't get applied as Py++ doesn't
support all cases -- the only current one is pure virtual functions don't get managed correctly
"""
+ return
ACCESS_TYPES = declarations.ACCESS_TYPES
VIRTUALITY_TYPES = declarations.VIRTUALITY_TYPES
for f in mb.member_functions():
Modified: trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -78,61 +78,7 @@
]
-WRAPPER_DEFINITION_RenderQueueListener =\
-"""
-struct RenderQueueListener_wrapper : Ogre::RenderQueueListener, bp::wrapper< Ogre::RenderQueueListener > {
- void RenderQueueListener_renderQueueEnded( ::Ogre::uint8 queueGroupId, ::Ogre::String const & invocation, bool & repeatThisInvocation ){
- bool holder;
- if ( bp::override func_renderQueueEnded = this->get_override( "renderQueueEnded" ) ) {
- holder = func_renderQueueEnded( queueGroupId, invocation, repeatThisInvocation );
- repeatThisInvocation = holder;
- }
- else {
- Ogre::RenderQueueListener::renderQueueEnded ( queueGroupId, invocation, repeatThisInvocation );
- }
- }
-
-
- void RenderQueueListener_renderQueueStarted( ::Ogre::uint8 queueGroupId, ::Ogre::String const & invocation, bool & skipThisInvocation ){
- bool holder;
- if ( bp::override func_renderQueueStarted = this->get_override( "renderQueueStarted" ) ) {
- holder = func_renderQueueStarted( queueGroupId, invocation, skipThisInvocation );
- skipThisInvocation = holder;
- }
- else {
- Ogre::RenderQueueListener::renderQueueStarted ( queueGroupId, invocation, skipThisInvocation );
- }
-
- }
-};
-"""
-
-WRAPPER_REGISTRATION_RenderQueueListener = [
- """def( "renderQueueStarted", &::RenderQueueListener_renderQueueStarted,\\
- "Python-Ogre Helper Function: This method is called by the SceneManager\\n\\
- before each queue group is rendered.
- @param queueGroupId The id of the queue group which has just been rendered
- @param invocation Name of the invocation which is causing this to be
- called (@see RenderQueueInvocation)
- @param .\\n\\
- Input: queueGroupId The id of the queue group which has just been rendered\\n\\
- Input: invocation Name of the invocation which is causing this to be called\\n\\
- Input: skipThisInvocation A boolean which is by default set to false.\\n\\
- Output: "skipThisInvocation" If the event sets this to true, the queue will be skipped\\n\\
- and not rendered. Note that in this case the renderQueueEnded event will not be raised\\n\\
- for this queue group");""",
- """def( "renderQueueEnded", &::RenderQueueListener_renderQueueEnded,\\
- "Python-Ogre Helper Function: This method is called by the SceneManager\\n\\
- after each queue group is rendered.\\n\\
- Input: queueGroupId The id of the queue group which has just been rendered\\n\\
- Input: invocation Name of the invocation which is causing this to be called\\n\\
- Input: repeatThisInvocation A boolean which is by default set to false.\\n\\
- Output: "repeatThisInvocation" If return true, the queue which has just been\\n\\
- rendered will be repeated, and the renderQueueStarted and renderQueueEnded\\n\\
- events will also be fired for it again");"""
- ]
-
WRAPPER_DEFINITION_OverlayElement = \
"""
Ogre::OverlayElement * OverlayElement_castElementAsOverlayContainer(Ogre::OverlayElement * e){
@@ -185,26 +131,6 @@
bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());',
]
-# WRAPPER_DEFINITION_OverlayManager = \
-# """
-# Ogre::OverlayElement* OverlayManager_createOverlayElement(Ogre::OverlayManager &me, const Ogre::String& typeName,
-# const Ogre::String& instanceName, bool isTemplate = false){
-# Ogre::OverlayElement* e = me.createOverlayElement(typeName, instanceName, isTemplate );
-# if( dynamic_cast< Ogre::TextAreaOverlayElement * >( e ) ){
-# return (Ogre::TextAreaOverlayElement*) e;
-# }
-# if( dynamic_cast< Ogre::OverlayContainer * >( e ) ){
-# return (Ogre::OverlayContainer*) e;
-# }
-# return ( e );
-# }
-# """
-#
-# WRAPPER_REGISTRATION_OverlayManager = [
-# 'def( "createOverlayElement", &::OverlayManager_createOverlayElement,\
-# "Python-Ogre Hand Wrapped\\nShould Return the correct Type (TextAreOverlayElement or OverlayContainer)",\
-# bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());',
-# ]
WRAPPER_DEFINITION_Bone = \
"""
@@ -566,12 +492,6 @@
return boost::python::object( r ); //unknown type
}
-// void
-// Utility_setFloat(void * ptrin, float datain)
-// {
-// float * newptr = reinterpret_cast<float *>(ptrin);
-// newptr[0]= datain;
-// }
"""
WRAPPER_REGISTRATION_General = [
@@ -943,18 +863,6 @@
Ouput: List containing particles" );"""
]
-# #################################################################################################
-# WRAPPER_DEFINITION_Vector3 =\
-# """
-# int Vector3_len( Ogre::Vector3 & me ) {
-# return 3;
-# }
-# """
-# WRAPPER_REGISTRATION_Vector3 = [
-# """def( "__len__", &Vector3_len,
-# "Python-Ogre Helper Function: return length of Vector3");""",
-# ]
-#
#################################################################################################
def iter_as_generator_vector( cls ):
@@ -995,10 +903,6 @@
rt.add_declaration_code( WRAPPER_DEFINITION_RenderTarget )
apply_reg (rt, WRAPPER_REGISTRATION_RenderTarget )
-# rt = mb.class_( 'Vector3' )
-# rt.add_declaration_code( WRAPPER_DEFINITION_Vector3 )
-# apply_reg (rt, WRAPPER_REGISTRATION_Vector3 )
-
rt = mb.class_( 'ResourceManager' )
rt.add_declaration_code( WRAPPER_DEFINITION_ResourceManager )
apply_reg (rt, WRAPPER_REGISTRATION_ResourceManager )
@@ -1019,18 +923,10 @@
rt.add_declaration_code( WRAPPER_DEFINITION_PixelBox )
apply_reg (rt, WRAPPER_REGISTRATION_PixelBox )
-# rt = mb.class_( 'ShadowRenderable' )
-# rt.add_declaration_code( WRAPPER_DEFINITION_ShadowRenderable )
-# apply_reg (rt, WRAPPER_REGISTRATION_ShadowRenderable )
-
rt = mb.class_( 'OverlayElement' )
rt.add_declaration_code( WRAPPER_DEFINITION_OverlayElement )
apply_reg (rt, WRAPPER_REGISTRATION_OverlayElement )
-# rt = mb.class_( 'OverlayManager' )
-# rt.add_declaration_code( WRAPPER_DEFINITION_OverlayManager )
-# apply_reg (rt, WRAPPER_REGISTRATION_OverlayManager )
-
rt = mb.class_( 'Frustum' )
rt.add_declaration_code( WRAPPER_DEFINITION_Frustum )
apply_reg (rt, WRAPPER_REGISTRATION_Frustum )
@@ -1066,30 +962,4 @@
for cls in map_iterators:
iter_as_generator_map( cls )
- rt = mb.class_( 'RenderQueueListener' )
-# # # # # rt.add_declaration_code( WRAPPER_DEFINITION_RenderQueueListener )
-# # # # # apply_reg (rt, WRAPPER_REGISTRATION_RenderQueueListener )
-# print "WRAPPER CODE\n\n"
-# print rt.wrapper_code
-# print rt
-# print dir(rt)
-# # rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
-# print "NOW\n\n"
-# print rt.wrapper_code
-
-# cls = mb.class_('Animation').class_('NodeTrackIterator')
-# iter_as_generator_map( cls )
-# global_ns = mb.global_ns
-# ogre_ns = global_ns.namespace( 'Ogre' )
-# i = ogre_ns.typedef( name="NodeTrackIterator" )
-# iter_as_generator_map( i )
-
-# typedef std::map<unsigned short, NodeAnimationTrack*> NodeTrackList;
-# typedef ConstMapIterator<NodeTrackList> NodeTrackIterator;
-# typedef std::map<unsigned short, NumericAnimationTrack*> NumericTrackList;
-# typedef ConstMapIterator<NumericTrackList> NumericTrackIterator;
-
-# typedef std::map<unsigned short, VertexAnimationTrack*> VertexTrackList;
-# typedef ConstMapIterator<VertexTrackList> VertexTrackIterator;
-
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -63,20 +63,34 @@
,'::NxArray< NxForceFieldShapeDesc*, NxAllocatorDefault >::resize'
,'::NxArray< NxForceFieldShapeGroup*, NxAllocatorDefault >::resize'
,'::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
+
+ # These have const refs to classes with protected desctuctors - a bad combination for boost
,'::NxCookingInterface::NxCreatePMap'
-# # ,'::NxForceField::releaseShape'
,'::NxUtilLib::NxGetBoxEdgesAxes'
-# ,'::NxHeightFieldShape::overlapAABBTrianglesDeprecated'
-# # ,'::NxImplicitScreenMesh::getProjectionMatrix' # returns a const int pointer
,'::NxVec3::get'
- # not in source
+
+ # Not in source
,'::NxBitField::rangeToDenseMask'
,'::NxBitField::maskToShift'
,'::NxVec3::setNotUsed'
,'::NxVec3::isNotUsed'
-
+
+ # These show up as now handling FT on pure virtual - however need a public class destructor
+ # so these are hand wrapped
+ ,'::NxCompartment::getTiming' # requires a functional transform however destructor is protected so compile fails
+ ,'::NxScene::getTiming' # requires a functional transform however destructor is protected so compile fails
+ ,'::NxConvexMesh::getMassInformation'
+ ,'::NxTriangleMesh::getMassInformation'
+ ,'::NxPhysicsSDK::getInternalVersion'
+
+ ,'::NxHeightField::saveCells' # excluded
+
+ ,'::NxForceFieldShapeGroup::releaseShape' # has a const forecfieldshape as arg and there isn't a public desctuctor
+ #
+
+
+# ,'::NxStream::storeBuffer'
+
]
if os.name =='nt':
excludes.append('::NxArray<NxFluidEmitterDesc, NxAllocatorDefault>::deleteEntry')
@@ -94,17 +108,11 @@
global_ns.free_functions(e).exclude()
excludes = [
- #'NxArray<NxShapeDesc*, NxAllocatorDefault>', ## doesn't have a defult constructor for ElemType
- #'NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault>', ## Elemtype issue
- #'NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault>', ## Elemtype issue
- 'NxForceFieldShapeGroup' ## seems to have access issues..
+# 'NxForceFieldShapeGroup' ## seems to have access issues..
]
-# for c in global_ns.classes():
-# print c
if os.name =='nt':
pass
-# excludes.append('NxArray<NxFluidEmitterDesc, NxAllocatorDefault>') ## needs ElemType changed to NxFluidEmitterDesc
else:
excludes.append ( '::NxFluidUserNotify')
for e in excludes:
@@ -125,7 +133,15 @@
if not "const" in o.decl_string:
o.exclude()
print "Excluding Operator:", o
-
+
+ # this is really a fix however needs to happen for the automatic stuff as we set the doc string to
+ # stop any further functional transformation happening
+ s = ['::NxStream::storeBuffer'
+ ,'::NxUserAllocator::realloc'
+ ]
+ for f in s:
+ global_ns.mem_fun(f).documentation="broken function as auto wrapping fails"
+
############################################################
##
## And there are things that manually need to be INCLUDED
@@ -160,16 +176,14 @@
if c.arguments[x].default_value:
if "ElemType" in c.arguments[x].default_value:
c.arguments[x].default_value=''
-
-# known = ['points', 'triangles']
-# for c in global_ns.classes():
-# if c.name.startswith ('Nx'):
-# print "Checking", c
-# for v in c.variables(allow_empty = True ):
-# if v.name in known:
-# v.expose_address = True
-# print "Exposing Address: ", v.name, " of class: ", c.name
-
+
+
+ for f in global_ns.member_functions():
+ for arg in f.arguments:
+ if arg.default_value == '-1u':
+ arg.default_value = '0xffffffff'
+
+
############################################################
##
## And things that need to have their argument and call values fixed.
@@ -186,12 +200,6 @@
def create_output( size ):
return [ ft.output( i ) for i in range( size ) ]
-# f=main_ns.free_function( "NxCreatePhysicsSDK")
-# f.add_transformation(ft.output('errorCode'))
-# f.documentation = docit ("","", "tuple - SDK, ErrorCode")
-# f=main_ns.free_function( "NxCreatePhysicsSDKWithID")
-# f.add_transformation(ft.output('errorCode'))
-# f.documentation = docit ("","", "tuple - SDK, ErrorCode")
###############################################################################
##
@@ -206,17 +214,6 @@
global_ns = mb.global_ns
main_ns = global_ns # No namespaces in NxPhysics
- # vars that are static consts but have their values set in the header file are bad
-# # Remove_Static_Consts ( main_ns )
-
-# ## Exclude protected and private that are not pure virtual
-# query = ~declarations.access_type_matcher_t( 'public' ) \
-# & ~declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.PURE_VIRTUAL )
-# try:
-# non_public_non_pure_virtual = main_ns.calldefs( query )
-# non_public_non_pure_virtual.exclude()
-# except:
-# pass
#Virtual functions that return reference could not be overriden from Python
query = declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.VIRTUAL ) \
@@ -264,15 +261,6 @@
main_ns = global_ns # .namespace( ns )
- # arguments passed as refs but not const are not liked by boost
-# Fix_Ref_Not_Const ( main_ns )
-
-# # Functions that have void pointers in their argument list need to change to unsigned int's
-# 3_Args ( main_ns )
-#
-# # and change functions that return a variety of pointers to instead return unsigned int's
-# Fix_Pointer_Returns ( main_ns )
-#
# and change functions that return a variety of pointers to instead return unsigned int's
pointee_types=['unsigned int','int', 'float', 'unsigned char', 'char','::NxI32']
ignore_names=['getName'] # these are function names we know it's cool to exclude
Modified: trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/physx/hand_made_wrappers.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/physx/hand_made_wrappers.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -1,6 +1,127 @@
import os
import environment
+WRAPPER_WRAPPER_DEF_NxForceFieldShapeGroup = \
+"""
+ virtual void releaseShape( ::NxForceFieldShape const & arg0 ){
+ bp::override func_releaseShape = this->get_override( "releaseShape" );
+ func_releaseShape( boost::ref(arg0) );
+ }
+"""
+
+WRAPPER_DEFINITION_NxScene = \
+"""bp::tuple NxScene_getTiming( ::NxScene & me) {
+ NxReal maxTimestep;
+ NxTimeStepMethod method;
+ NxU32 maxIter;
+ NxU32 numSubSteps;
+ me.getTiming(maxTimestep, maxIter, method, &numSubSteps);
+ return ( boost::python::make_tuple( maxTimestep, maxIter, method, numSubSteps ) );
+ }
+"""
+WRAPPER_WRAPPER_DEF_NxScene = \
+"""
+ virtual void getTiming(NxReal& maxTimestep, NxU32& maxIter, NxTimeStepMethod& method, NxU32* numSubSteps=NULL) const {
+ // placeholder so wrapper will compile
+ }
+"""
+
+WRAPPER_REGISTRATION_NxScene = [
+ 'def( "getTiming", &::NxScene_getTiming,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with maxTimestep, maxIter, method, numSubSteps");'
+# ,\
+# bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());',
+ ]
+
+WRAPPER_DEFINITION_NxStream = \
+""" NxStream& NxStream_storeBuffer(NxStream & me, const void* buffer, NxU32 size) {
+// NOT YET IMPLEMENTED
+ NxStream result;
+ return result;
+}
+"""
+
+WRAPPER_WRAPPER_DEF_NxStream = \
+"""
+ virtual NxStream& storeBuffer(const void* buffer, NxU32 size) {
+ // placeholder so wrapper will compile
+ }
+"""
+
+WRAPPER_REGISTRATION_NxStream = [
+ 'def( "storeBuffer", &::NxStream_storeBuffer,\
+ "Python-Ogre Hand Wrapped NOT IMPLEMENTED\\nReturns a NxStream -- takes a python list",\
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());',
+ ]
+
+
+WRAPPER_DEFINITION_NxCompartment = \
+"""bp::tuple NxCompartment_getTiming( ::NxCompartment & me) {
+ NxReal maxTimestep;
+ NxTimeStepMethod method;
+ NxU32 maxIter;
+ NxU32 numSubSteps;
+ me.getTiming(maxTimestep, maxIter, method, &numSubSteps);
+ return ( boost::python::make_tuple( maxTimestep, maxIter, method, numSubSteps ) );
+ }
+"""
+
+WRAPPER_REGISTRATION_NxCompartment = [
+ 'def( "getTiming", &::NxCompartment_getTiming,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with maxTimestep, maxIter, method, numSubSteps");',
+ ]
+
+WRAPPER_DEFINITION_NxConvexMesh= \
+"""bp::tuple NxConvexMesh_getMassInformation( ::NxConvexMesh & me) {
+ NxReal mass;
+ NxMat33 localInertia;
+ NxVec3 localCenterOfMass;
+ me.getMassInformation( mass, localInertia, localCenterOfMass );
+ return ( boost::python::make_tuple( mass, localInertia, localCenterOfMass ) );
+ }
+"""
+WRAPPER_REGISTRATION_NxConvexMesh = [
+ 'def( "getMassInformation", &::NxConvexMesh_getMassInformation,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with mass, localInertia, localCenterOfMass");',
+ ]
+
+WRAPPER_DEFINITION_NxTriangleMesh= \
+"""bp::tuple NxTriangleMesh_getMassInformation( ::NxTriangleMesh & me) {
+ NxReal mass;
+ NxMat33 localInertia;
+ NxVec3 localCenterOfMass;
+ me.getMassInformation( mass, localInertia, localCenterOfMass );
+ return ( boost::python::make_tuple( mass, localInertia, localCenterOfMass ) );
+ }
+"""
+WRAPPER_REGISTRATION_NxTriangleMesh = [
+ 'def( "getMassInformation", &::NxTriangleMesh_getMassInformation,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with mass, localInertia, localCenterOfMass");',
+ ]
+
+WRAPPER_WRAPPER_DEF_NxPhysicsSDK= \
+"""
+ virtual ::NxU32 getInternalVersion( ::NxU32 & apiRev, ::NxU32 & descRev, ::NxU32 & branchId ) const {
+ // dummy function as place holder
+ return 0;
+ };
+"""
+
+WRAPPER_DEFINITION_NxPhysicsSDK= \
+"""bp::tuple NxPhysicsSDK_getInternalVersion(::NxPhysicsSDK & me ) {
+ NxU32 apiRev;
+ NxU32 descRev;
+ NxU32 branchId;
+ NxU32 sdkRev;
+ sdkRev = me.getInternalVersion( apiRev, descRev, branchId );
+ return ( boost::python::make_tuple( sdkRev, apiRev, descRev, branchId ) );
+ }
+"""
+WRAPPER_REGISTRATION_NxPhysicsSDK = [
+ 'def( "getInternalVersion", &::NxPhysicsSDK_getInternalVersion,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with sdkRev, apiRev, descRev, branchId");',
+ ]
+
WRAPPER_DEFINITION_NxActor_Wrapper = \
"""
virtual ::NxShape * const * getShapes( ) const {
@@ -118,7 +239,44 @@
// bp::override func_getProjectionMatrix = this->get_override( "getProjectionMatrix" );
// return func_getProjectionMatrix( );
}
-"""
+"""
+
+WRAPPER_DEFINITION_NxSimpleTriangleMesh=\
+"""
+void NxSimpleTriangleMesh_setPoints(::NxSimpleTriangleMesh& me,boost::python::list vertices, unsigned int vertex_count ){
+
+ unsigned int index;
+ ::NxVec3* verts = new NxVec3[vertex_count];
+ for (index =0 ; index < vertex_count ; index ++) {
+ verts[index] = bp::extract<::NxVec3> (vertices[index]);
+ }
+ me.points = verts;
+}
+void NxSimpleTriangleMesh_setFaces(::NxSimpleTriangleMesh& me,boost::python::list faces, unsigned int face_count ) {
+ unsigned int index;
+ ::NxU32* triangles = new NxU32[face_count];
+ for (index =0 ; index < face_count ; index ++) {
+ triangles[index] = (::NxU32)(bp::extract<float> (faces[index]));
+ }
+ me.triangles = triangles;
+}
+"""
+
+WRAPPER_REGISTRATION_NxSimpleTriangleMesh = [
+ """def( "setPoints", &::NxSimpleTriangleMesh_setPoints,
+ ( bp::arg("vertices"), bp::arg("vertex_count")),
+ "Python-Ogre Hand Wrapped\\nSet's the points for a SimpleTriangleMesh",
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());""",
+ """def( "setFaces", &::NxSimpleTriangleMesh_setFaces,
+ ( bp::arg("faces"), bp::arg("face_count")),
+ "Python-Ogre Hand Wrapped\\nSet's the faces for a SimpleTriangleMesh",
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());""",
+
+ ]
+
+
+
+
ConstPointerReference=\
"""
virtual %(FuncDecl)s {
@@ -127,8 +285,7 @@
"""
PointerReg=\
"""
-def( "%(function_name)s", &::%(classname)s_%(function_name)s,\
- "Python-Ogre Hand Wrapped\\n");
+def( "%(function_name)s", &::%(classname)s_%(function_name)s,"Python-Ogre Hand Wrapped\\n");
"""
PointerDec=\
"""
@@ -146,7 +303,7 @@
return outlist;
}
"""
-PointerWrapper = \
+PointerWrapper=\
"""
virtual %(returnType)s %(function_name)s( ) %(const)s {
bp::override func_%(function_name)s = this->get_override( "%(function_name)s" );
@@ -154,6 +311,33 @@
}
"""
+
+UserDataDec=\
+"""
+void %(classname)s_setUserData ( ::%(classname)s& me, PyObject * data) {
+ me.userData = data;
+ }
+
+PyObject * %(classname)s_getUserData ( ::%(classname)s& me) {
+ void * data = me.userData;
+ if ( data == NULL) {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+ else {
+ Py_INCREF( (PyObject *) data ); // I'm passing a reference to this object so better inc the ref :)
+ return (PyObject *) data;
+ }
+ }
+"""
+
+UserDataReg=[
+ """def( "setUserData", &::%(classname)s_setUserData,"Python-Ogre Hand Wrapped\\n");""",
+ """def( "getUserData", &::%(classname)s_getUserData,"Python-Ogre Hand Wrapped\\n");"""
+ ]
+
+
+
#################################################################################################
#################################################################################################
@@ -180,8 +364,6 @@
for f in global_ns.member_functions():
if f.parent.name in ignoreClasses:
continue
- else:
- print "Class OK:", f.parent.name
for a in f.arguments:
if "unsigned int const * &" in a.type.decl_string:
f.exclude()
@@ -227,14 +409,61 @@
print "Wrapped:", f, values
else:
print "Excluded:",f
+
+ # Patch from Dermont to make userData more useful and simple to use
+ vars = ["userData"]
+ for var in global_ns.variables ():
+ class_ = var.parent
+ classname = class_.name
+ if var.name in vars:
+ if var.type.decl_string.startswith('void'):
+ values = { 'classname':classname }
+ for i in range(len(UserDataReg)):
+ regcode = UserDataReg[i] % values
+ class_.add_registration_code( regcode )
+ deccode = UserDataDec % values
+ class_.add_declaration_code( deccode )
+ print "Hand Wrapped:", var.name, values
+
-
rt = mb.class_( 'NxUtilLib' )
rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxUtilLib)
rt = mb.class_( 'NxCookingInterface' )
rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxCookingInterface)
rt = mb.class_( 'NxForceField' )
rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxForceField)
+
+ rt = mb.class_( 'NxForceFieldShapeGroup' )
+ rt.add_wrapper_code( WRAPPER_WRAPPER_DEF_NxForceFieldShapeGroup )
+
+
+ rt = mb.class_( 'NxScene' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxScene )
+ rt.add_wrapper_code( WRAPPER_WRAPPER_DEF_NxScene )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxScene )
+
+# rt = mb.class_( 'NxStream' )
+# rt.add_declaration_code( WRAPPER_DEFINITION_NxStream )
+# rt.add_wrapper_code( WRAPPER_WRAPPER_DEF_NxStream )
+# apply_reg (rt, WRAPPER_REGISTRATION_NxStream )
+
+ rt = mb.class_( 'NxCompartment' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxCompartment )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxCompartment )
+
+ rt = mb.class_( 'NxConvexMesh' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxConvexMesh )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxConvexMesh )
+
+ rt = mb.class_( 'NxTriangleMesh' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxTriangleMesh )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxTriangleMesh )
+
+ rt = mb.class_( 'NxPhysicsSDK' )
+ rt.add_wrapper_code( WRAPPER_WRAPPER_DEF_NxPhysicsSDK )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxPhysicsSDK )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxPhysicsSDK )
+
# rt = mb.class_( 'NxHeightFieldShape' )
# rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxHeightFieldShape)
# rt = mb.class_( 'NxImplicitScreenMesh' )
Modified: trunk/python-ogre/demos/ogre/Demo_Basic.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_Basic.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/demos/ogre/Demo_Basic.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -17,10 +17,9 @@
import time
import ogre.renderer.OGRE as ogre
-import ogre.io.OIS as OIS
class OGREMain(ogre.Root):
- def __init__(self, plugins_path='plugins.cfg',resource_path='../resources.cfg'):
+ def __init__(self, plugins_path='../plugins.cfg',resource_path='../resources.cfg'):
ogre.Root.__init__(self, plugins_path)
self.plugins_path = plugins_path
self.resource_path = resource_path
@@ -97,7 +96,11 @@
def main():
- root = OGREMain(plugins_path='../plugins.cfg')
+ import os
+ if os.name == 'nt':
+ root = OGREMain(plugins_path='../plugins.cfg.nt')
+ else:
+ root = OGREMain(plugins_path='../plugins.cfg.linux')
weu = ogre.WindowEventUtilities()
while not root.window.isClosed():
weu.messagePump()
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/environment.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -18,7 +18,6 @@
_LOGGING_ON = False
_PreCompiled = True
-
def log ( instring ):
if _LOGGING_ON:
print __file__, "LOG::", instring
@@ -49,12 +48,14 @@
##
-## set this to True if you compiled Ogre with Threads enabled
+## set this to True if you compiled Ogre with Threads enabled and setting a static boost link
##
if isWindows():
- _USE_THREADS = True
+ _USE_THREADS = False
+ BOOST_STATIC = False
else:
_USE_THREADS = False
+ BOOST_STATIC = False
PythonOgreMajorVersion = "1"
@@ -212,7 +213,7 @@
else:
source_version = "20080901"
source = [
- [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co "+base, os.getcwd()]
+ [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 01Aug2008 "+base, os.getcwd()]
]
if isLinux() or isMac():
buildCmds = [
@@ -464,29 +465,40 @@
class boost: ## also included bjam
active = True
- version = "3.5"
+ version = "1.37"
pythonModule = False
ModuleName = ""
+ # move lib path here (lib name is already here) so we can easily do a static link for windows
+ PATH_LIB = Config.PATH_LIB_Boost
if isWindows():
+ PATH_LIB_THREAD=Config.PATH_LIB_Thread_STATIC
+ PATH_LIB_DATETIME=Config.PATH_LIB_date_time_STATIC
if _STABLE:
base = 'boost_1_36_0'
lib = 'boost_python-vc90-mt-1_36'
versionBase = '1_36' ## the version used on the library name
else:
- base = 'boost_1_36_0'
- lib = 'boost_python-vc90-mt-1_36'
- versionBase = '1_36' ## the version used on the library name
+ base = 'boost_1_37_0'
+ lib = 'boost_python-vc90-mt-1_37'
+ PATH_LIB = Config.PATH_LIB_Boost
+
+ # change to handle static boost linking...
+ if BOOST_STATIC:
+ lib = 'libboost_python-vc90-mt-1_37'
+ PATH_LIB = Config.PATH_LIB_Boost_STATIC
+
+ versionBase = '1_37' ## the version used on the library name
else:
if _STABLE:
base = 'boost_1_34_1'
versionBase = '1_34' ## the version used on the library name
else:
- base = 'boost_1_36_0'
- versionBase = '1_36' ## the version used on the library name
+ base = 'boost_1_37_0'
+ versionBase = '1_37' ## the version used on the library name
if isLinux() or isMac():
- bjambase = 'boost-jam-3.1.16'
+ bjambase = 'boost-jam-3.1.17'
if isMac():
bjambuilddir = 'bin.macosxx86'
bjambuildset = 'darwin'
@@ -498,7 +510,7 @@
bjambuildset = 'gcc'
source = [
- [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.16.tgz', downloadPath],
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1.tgz', downloadPath],
[wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
]
buildCmds = [
@@ -520,7 +532,7 @@
]
if isWindows():
- bjambase = 'boost-jam-3.1.16-1-ntx86'
+ bjambase = 'boost-jam-3.1.17-1-ntx86'
source = [
[wget,'http://downloads.sourceforge.net/boost/'+bjambase+'.zip',downloadPath] ,
[wget,'http://downloads.sourceforge.net/boost/'+base+'.zip',downloadPath]
@@ -529,12 +541,12 @@
buildCmds = [
[0,unzip + os.path.join(downloadPath, bjambase+".zip"), ''],
[0,unzip + os.path.join(downloadPath, base + ".zip"), ''],
- [0,'xcopy /s /i /y '+os.path.join('python-ogre','boost') + ' ' + base , ''], # need to overwrite the boost with our files
- [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/configure', '' ],
- [0,'sed -i s/"BOOST_PYTHON_MAX_ARITY 15"/"BOOST_PYTHON_MAX_ARITY 19"/ '+base+'/boost/python/detail/preprocessor.hpp', ''],
- [0,'sed -i 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,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
- [0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
+# # [0,'xcopy /s /i /y '+os.path.join('python-ogre','boost') + ' ' + base , ''], # need to overwrite the boost with our files
+# [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/configure', '' ],
+# [0,'sed -i s/"BOOST_PYTHON_MAX_ARITY 15"/"BOOST_PYTHON_MAX_ARITY 19"/ '+base+'/boost/python/detail/preprocessor.hpp', ''],
+# [0,'sed -i 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,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
+# [0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
]
if not isWindows():
@@ -579,7 +591,6 @@
pythonModule = True
name='ogre'
ModuleName='OGRE'
- CCFLAGS = " "
cflags=''
moduleParentLocation = "renderer"
parent = "ogre/renderer"
@@ -624,7 +635,7 @@
pchincludes = ['python_ogre_precompiled.h']
libs=[boost.lib, 'OgreMain']
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_Ogre_CEGUIRenderer
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_Ogre_Dependencies #needed for ceguibase.lib etc
@@ -634,7 +645,6 @@
, Config.PATH_INCLUDE_Ogre
, Config.PATH_INCLUDE_NEDMALLOC
]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 '
LINKFLAGS = ''
externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', boost.lib+'.dll']
elif isLinux():
@@ -667,7 +677,7 @@
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 -D__PYTHONOGRE_BUILD_CODE '
+ CCFLAGS = ' -D__PYTHONOGRE_BUILD_CODE '
source = [
[wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
@@ -699,13 +709,12 @@
]
libs=[boost.lib]
- lib_dirs = [ Config.PATH_LIB_Boost ]
+ lib_dirs = [ boost.PATH_LIB ]
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
, python_include_dirs
]
- CCFLAGS = ''
LINKFLAGS = ''
cflags += ''
@@ -768,7 +777,7 @@
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_OIS
]
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_OIS
]
ModuleName = 'OIS'
@@ -799,7 +808,7 @@
else:
libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
libs.append ( boost_python_index.lib )
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_ODE
, Config.PATH_LIB_OgreRefApp
@@ -809,7 +818,6 @@
,Config.PATH_INCLUDE_OgreRefApp
,Config.PATH_INCLUDE_ODE
]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'OgreRefApp'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'OgreReferenceAppLayer.h', 'ode/ode.h']
@@ -853,13 +861,12 @@
, Config.PATH_INCLUDE_OgreNewt
, Config.PATH_INCLUDE_Ogre_Dependencies #needed for OIS/OIS.h
]
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Newton
,Config.PATH_LIB_OgreNewt
, Config.PATH_LIB_Ogre_OgreMain
]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'OgreNewt'
CheckIncludes=['boost/python.hpp', 'Ogre.h', 'OgreNewt.h', 'Newton.h']
@@ -871,7 +878,7 @@
if _STABLE:
version = "0.5.0b"
else:
- version = "0.6.1"
+ version = "0.6.2b"
if isWindows():
if _PreCompiled:
pchstop = 'cegui.h'
@@ -891,7 +898,7 @@
else:
base = "CEGUI-0.6.1"
source=[
- [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.1.tar.gz?download", downloadPath]
+ [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.2b.tar.gz?download", downloadPath]
]
buildCmds = [
@@ -907,13 +914,16 @@
[0,'make install', os.path.join(os.getcwd(), base )]
]
if isWindows():
- version = "0.6.1"
- base = "CEGUI-0.6.1"
+ version = "0.6.2b"
+ base = "CEGUI-0.6.2"
source=[
- [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.1.zip?download", downloadPath]
+ [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.2b.zip", downloadPath],
+ [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-DEPS-0.6.0-vc9.zip", downloadPath]
]
buildCmds = [
- [0, unzip + " " + os.path.join(downloadPath,base)+".zip", os.getcwd()],
+ [0, unzip + " " + os.path.join(downloadPath,"CEGUI-0.6.2b.zip"), os.getcwd()],
+ [0, unzip + " " + os.path.join(downloadPath,"CEGUI-DEPS-0.6.0-vc9.zip"), os.path.join(os.getcwd(),base) ],
+ [0, 'move CEGUI-0.6.0\dependencies .', os.path.join(os.getcwd(),base) ],
[0, 'echo Now run build_vs2008.bat from the CEGUI makefiles\premake directory',''],
[0, 'echo then use MSVC to build the CEGUI Release project',''],
[0, 'echo WARNING - Check that RTTI is enabled in the compiler options',''],
@@ -927,13 +937,12 @@
, Config.PATH_INCLUDE_Ogre_Dependencies ## needed as OgreCEGUI uses CEGUI/.. in #includes
]
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
##, Config.PATH_LIB_Ogre_CEGUIRenderer
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_CEGUI
, Config.PATH_LIB_Ogre_Dependencies
]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'CEGUI'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
if isLinux():
@@ -954,7 +963,7 @@
libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function
else:
libs.append ( boost_python_index.lib )
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_ODE
]
include_dirs = [ Config.PATH_Boost
@@ -997,7 +1006,7 @@
libs=[boost.lib]
if isLinux():
libs.append ( boost_python_index.lib )
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
]
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_OPCODE
@@ -1019,7 +1028,7 @@
Config.PATH_INCLUDE_Ogre,
Config.PATH_caelum
]
- lib_dirs = [Config.PATH_LIB_Boost,
+ lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
@@ -1040,7 +1049,7 @@
base = 'ogreaddons/ogreode'
baseDir = os.path.join(os.getcwd(), base )
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_OgreOde
, Config.PATH_LIB_OgreOdePrefab
, Config.PATH_LIB_OgreOdeLoader
@@ -1077,7 +1086,6 @@
libs.append ( boost_python_index.lib )
else:
libs.append('ode_single')
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h',
'Ogreode_Prefab.h']
@@ -1105,7 +1113,7 @@
Config.PATH_INCLUDE_quickgui
#,Config.PATH_INCLUDE_freetype
]
- lib_dirs = [Config.PATH_LIB_Boost,
+ lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain
##,Config.PATH_LIB_quickgui
]
@@ -1129,7 +1137,7 @@
...
[truncated message content] |
|
From: <and...@us...> - 2009-01-24 05:00:48
|
Revision: 844
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=844&view=rev
Author: andy_miller
Date: 2009-01-24 05:00:41 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
Updates to support Oger 1.6.1 SDK
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/SConstruct
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/cegui/python_CEGUI.h
trunk/python-ogre/code_generators/cegui/python_CEGUI_aliases.h
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ois/generate_code.py
trunk/python-ogre/environment.py
trunk/python-ogre/patch/ParticleUniverse_0.8.patch
Added Paths:
-----------
trunk/python-ogre/demos/ogre/tofix/Demo_BspCollision.py
Removed Paths:
-------------
trunk/python-ogre/demos/ogre/Demo_BspCollision.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -1,6 +1,6 @@
import os
-SDK=False # True ## set to true if buiding from 1.4 release source...
+SDK=True # Changes Ogre include path settings
## The root directory is where this module is located
module_dir = os.path.abspath(os.path.dirname(__file__) )
@@ -17,7 +17,7 @@
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/threading-multi')
-PATH_LIB_Boost_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/link-static/threading-multi')
+#PATH_LIB_Boost_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/link-static/threading-multi')
PATH_LIB_Thread_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/thread/build/msvc-9.0/release/link-static/threading-multi')
PATH_LIB_date_time_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/date_time/build/msvc-9.0/release/link-static/threading-multi')
# in Linux we need to code in the Relative path for the library
@@ -31,6 +31,7 @@
## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR, 'ogre')
+PATH_Ogre = "C:\\OgreSDK"
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.2')
@@ -84,16 +85,18 @@
# it's time for the SDK version
if SDK:
- PATH_CEGUI = os.path.join(BASE_DIR, 'ogre')
- PATH_OIS = os.path.join(BASE_DIR, 'ogre')
+ PATH_CEGUI = PATH_Ogre
+ PATH_OIS = PATH_Ogre
+
+
###
### these paths assume you've left all the directory structure as standard
### Override anything that is different
###
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/lib')
PATH_LIB_Ogre_OgreMain= os.path.join( PATH_Ogre, 'lib' )
-PATH_LIB_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
+PATH_LIB_Ogre_Dependencies = ""# os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
PATH_LIB_OgreRefApp = os.path.join( PATH_Ogre, 'lib')
PATH_LIB_OgreNewt = os.path.join( PATH_OgreAddons, 'ogrenewt/OgreNewt_Main/lib/Release')
PATH_LIB_Newton = os.path.join( PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
@@ -114,26 +117,30 @@
PATH_LIB_Bullet = os.path.join(PATH_Bullet, 'out/release8/libs' )
PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
-# PATH_LIB_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg', 'lib')
PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
-
PATH_LIB_plib = PATH_plib
PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
PATH_LIB_ogredshow = PATH_ogredshow
PATH_LIB_particleuniverse = os.path.join(PATH_particleuniverse, 'bin', 'release')
+PATH_LIB_opensteer = os.path.join(PATH_opensteer, 'win32','release')
+PATH_LIB_hikari = os.path.join(PATH_hikari ) # , 'lib')
+PATH_LIB_mygui = os.path.join(PATH_mygui, 'MyGUIEngine','lib','Release')
+PATH_LIB_canvas = os.path.join(PATH_canvas )
+PATH_LIB_pcz = os.path.join(PATH_LIB_Ogre_OgreMain, 'OGRE')
+
if SDK:
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'lib')
- PATH_LIB_OIS = os.path.join( PATH_Ogre, 'Dependencies/lib/Release') ## NOTE Posix platforms this lives in'lib' not 'dll'
+ PATH_LIB_OIS = os.path.join( PATH_Ogre, 'lib')
PATH_LIB_CEGUI = os.path.join( PATH_Ogre, 'lib' )
+ PATH_LIB_pcz = os.path.join( PATH_Ogre, 'lib','opt' )
-PATH_LIB_opensteer = os.path.join(PATH_opensteer, 'win32','release')
-PATH_LIB_hikari = os.path.join(PATH_hikari ) # , 'lib')
-PATH_LIB_mygui = os.path.join(PATH_mygui, 'MyGUIEngine','lib','Release')
-PATH_LIB_canvas = os.path.join(PATH_canvas )
+
+
+
PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
-PATH_INCLUDE_NEDMALLOC= os.path.join(PATH_Ogre,'OgreMain', 'src', 'nedmalloc')
-PATH_INCLUDE_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/include')
+PATH_INCLUDE_NEDMALLOC= "" #os.path.join(PATH_Ogre,'OgreMain', 'src', 'nedmalloc')
+PATH_INCLUDE_Ogre_Dependencies = "" #os.path.join( PATH_Ogre, 'Dependencies/include')
PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
PATH_INCLUDE_OgreNewt = os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
@@ -202,7 +209,10 @@
PATH_INCLUDE_opensteer_opensteer = os.path.join(PATH_opensteer, 'include', 'OpenSteer')
if SDK:
- PATH_INCLUDE_OIS = os.path.join(PATH_Ogre,'Dependencies/include/OIS') ## Note the plural include's
- PATH_INCLUDE_CEGUI = os.path.join(PATH_Ogre, 'Dependencies/include/CEGUI')
+ PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'include')
+ PATH_INCLUDE_OIS = os.path.join(PATH_Ogre,'include/OIS')
+ PATH_INCLUDE_CEGUI = os.path.join(PATH_Ogre, 'include/CEGUI')
+ PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'samples','include')
+ PATH_INCLUDE_ogrepcz = os.path.join(PATH_Ogre,'include', 'opt')
\ No newline at end of file
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/SConstruct 2009-01-24 05:00:41 UTC (rev 844)
@@ -50,7 +50,7 @@
def get_ccflags(cls):
if os.name=='nt':
CCFLAGS=''
- CCFLAGS += ' /DBOOST_PYTHON_MAX_ARITY=19 '
+ CCFLAGS += ' /DBOOST_PYTHON_MAX_ARITY=19 /DBOOST_PYTHON_NO_PY_SIGNATURES '
CCFLAGS += ' /nologo -Zm200 '
CCFLAGS += ' /W3 /wd4675' # warning level -Zc:wchar_t
CCFLAGS += ' /TP /MD /Zc:forScope /EHs /c /Ox /Ob2 /Oi /Ot /Oy /GS- /GR '
@@ -59,6 +59,7 @@
CCFLAGS = ' `pkg-config --cflags OGRE` ' ## needs to change I think :)
CCFLAGS += ' -I'
CCFLAGS += ' -O3 -I./ '
+ CCFLAGS += ' -DBOOST_PYTHON_MAX_ARITY=19 -DBOOST_PYTHON_NO_PY_SIGNATURES '
if cls.ModuleName == 'OGRE':
##### -fvisibility=hidden -finline-limit=20 '
#CCFLAGS += ' -fvisibility=hidden -fvisibility-inlines-hidden -DOGRE_GCC_VISIBILITY '
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -131,8 +131,11 @@
if 'iterator' in cls.name.lower() :
cls.exclude()
print "Excluding Iterator", cls.name
- CEGUI_ns.class_('OgreCEGUIResourceProvider').exclude() # it's _ogrePrivate..
-
+
+ try: # this is in the newer version of cegui so I'm OK if it fails
+ CEGUI_ns.class_('OgreCEGUIResourceProvider').exclude() # it's _ogrePrivate..
+ except:
+ pass
## Replaced these with 'useful' functions in the handwrappers - take and return python objects
CEGUI_ns.class_( "Window" ).member_functions("setUserData").exclude()
CEGUI_ns.class_( "Window" ).member_functions("getUserData").exclude()
Modified: trunk/python-ogre/code_generators/cegui/python_CEGUI.h
===================================================================
--- trunk/python-ogre/code_generators/cegui/python_CEGUI.h 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/cegui/python_CEGUI.h 2009-01-24 05:00:41 UTC (rev 844)
@@ -10,8 +10,11 @@
#include "CEGUIXMLAttributes.h" // needed for FontManager
#include "CEGUIXMLSerializer.h"
#include "OgreCEGUIRenderer.h"
-#include "OgreCEGUIResourceProvider.h"
+#if ( CEGUI_VERSION_MINOR > 5 )
+ #include "OgreCEGUIResourceProvider.h"
+#endif
+
#include "Ogre.h" // we need this to fix unexposed stuff..
// First we create a magic namespace to hold all our aliases
Modified: trunk/python-ogre/code_generators/cegui/python_CEGUI_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/cegui/python_CEGUI_aliases.h 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/cegui/python_CEGUI_aliases.h 2009-01-24 05:00:41 UTC (rev 844)
@@ -6,15 +6,16 @@
// typedef std::vector<CEGUI::Scheme::UIElementFactory> UIElementFactoryVector;
// typedef std::vector<CEGUI::Scheme::UIModule> UIModuleVector;
+#if ( CEGUI_VERSION_MINOR > 5 )
+ typedef std::list<CEGUI::OgreCEGUITexture*> OgreCEGUITextureList;
+#endif
-
-
typedef ::CEGUI::Event::Connection Connection;
typedef ::CEGUI::Event::Subscriber Subscriber;
typedef ::CEGUI::EventSet::Iterator EventIterator;
-typedef std::list<CEGUI::OgreCEGUITexture*> OgreCEGUITextureList;
+
typedef ::CEGUI::FontManager::FontIterator FontIterator ;
typedef ::CEGUI::Imageset::ImageIterator ImageIterator;
typedef ::CEGUI::ImagesetManager::ImagesetIterator ImagesetIterator;
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -271,14 +271,14 @@
# print "MC:", cls
if private_decls.is_private( cls ):
cls.exclude()
- print '{*} class "%s" is marked as private' % cls.decl_string
+ print '{*} Excluding class "%s" as marked as private' % cls.decl_string
for func in main_ns.calldefs():
if private_decls.is_private( func ):
if func.virtuality == declarations.VIRTUALITY_TYPES.PURE_VIRTUAL:
continue
func.exclude()
- print '{*} function "%s" is marked as internal' % declarations.full_name( func )
+ print '{*} Excluding function "%s" as marked as internal' % declarations.full_name( func )
# this change was for 1.7 but also needed for 1.4
noncopy=['Camera','Frustum', 'Log' ]
Modified: trunk/python-ogre/code_generators/ois/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -40,7 +40,8 @@
from pyplusplus.module_creator import sort_algorithms
from pyplusplus.code_creators import include
-import common_utils.extract_documentation as exdoc
+# import common_utils.extract_documentation as exdoc
+import testExtract as exdoc
import common_utils.var_checker as varchecker
import common_utils.ogre_properties as ogre_properties
from common_utils import docit
Deleted: trunk/python-ogre/demos/ogre/Demo_BspCollision.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_BspCollision.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/demos/ogre/Demo_BspCollision.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -1,212 +0,0 @@
-# This code is in the Public Domain
-# -----------------------------------------------------------------------------
-# This source file is part of Python-Ogre
-# For the latest info, see http://python-ogre.org/
-#
-# It is likely based on original code from OGRE and/or PyOgre
-# For the latest info, see http://www.ogre3d.org/
-#
-# You may use this sample code for anything you like, it is not covered by the
-# LGPL.
-# -----------------------------------------------------------------------------
-
-## -----------------------------------------------------------------------------
-## Filename: BspCollision.py
-## Description: Test the OgreRefApp module
-## -----------------------------------------------------------------------------
-import sys
-sys.path.insert(0,'..')
-import PythonOgreConfig
-
-
-import ogre.renderer.OGRE as ogre
-import SampleFramework as sf ## note that we are forcing the OIS sample framework
-import ogre.physics.OgreRefApp as OgreRefApp
-
-## As this demo does it's own key input, AND we want to support Ogre 1.2.x we need to cope with the
-## change to OIS in ogre 1.3.x (current CVS version)
-
-if ogre.OgreVersionString[:2]=="12":
- KC_SPACE = ogre.KC_SPACE
-else:
- import ogre.io.OIS as OIS
- KC_SPACE = OIS.KC_SPACE
-
-
-## Hacky globals
-gBall = None
-gTargetNode = None
-gRsq = 0
-
-
-class BspCollisionListener (sf.FrameListener):
-
- def __init__(self, renderWindow, camera):
- """ Initialise the frame listener"""
- sf.FrameListener.__init__(self, renderWindow, camera)
- self.camera = camera
- self.timeUntilNextToggle = 0
- self.MAX_TIME_INCREMENT = 0.5
-
- def _UpdateSimulation ( self, Event ):
- OgreRefApp.World.getSingleton().simulationStep(Event.timeSinceLastFrame)
-
- def frameEnded(self, evt):
- global gBall, gTargetNode, gRsq
- ## Deal with time delays that are too large
- ## If we exceed this limit, we ignore
- if evt.timeSinceLastEvent > self.MAX_TIME_INCREMENT:
- return True
-
- if self.timeUntilNextToggle >= 0:
- self.timeUntilNextToggle -= evt.timeSinceLastFrame
-
- ## Call superclass
- ret = sf.FrameListener.frameEnded(self, evt)
-
- if self._isToggleKeyDown(KC_SPACE):
- self.timeUntilNextToggle = 2
- gBall.setPosition(self.camera.getPosition() +
- self.camera.getDirection() * self.camera.getNearClipDistance() * 2)
- gBall.setLinearVelocity(self.camera.getDirection() * 200)
- gBall.setAngularVelocity(ogre.Vector3().ZERO)
-
- ## Move the targeter
- gRsq.setRay(self.camera.getRealCamera().getCameraToViewportRay(0.5, 0.5))
- for queryResult in gRsq.execute():
- gTargetNode.setPosition(gRsq.getRay().getPoint(queryResult.distance))
- return ret
-
- def _moveCamera(self):
- self.camera.yaw(self.rotationX)
- self.camera.pitch(self.rotationY)
- self.camera.translate(self.translateVector) # for using OgreRefApp
-
-class BspCollisionApplication (sf.Application):
- def __init__(self):
- "Init Render Application"
- sf.Application.__init__(self)
- self.BOX_SIZE = 15.0
- self.num_rows = 3
-
- def __del__(self):
- global gBall, gTargetNode, gRsq
- "Close Render Application"
- del ( gRsq )
-
- # Override scene manager (use indoor instead of generic)
- def _chooseSceneManager(self):
- self.sceneManager = self.root.createSceneManager("BspSceneManager")
-
- def _createWorld(self):
- ## Create BSP-specific world
- self.world = OgreRefApp.World(self.sceneManager, OgreRefApp.World.WT_REFAPP_BSP)
-
-
- def _createCamera(self):
- """ when doing collisions with OgreRefApp Framework the camera is linked to the 'WORLD'
- not to the scene manager"""
- self.camera = self.world.createCamera('PlayerCam')
- self.camera.setPosition( (0, 0, 500) )
- self.camera.lookAt( (0, 0, -300) )
- self.camera.NearClipDistance = 5
-
-
- def _createScene(self):
- global gBall, gTargetNode, gRsq
- self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_STENCIL_MODULATIVE)
- ## Set ambient light
- self.sceneManager.setAmbientLight( (0.2, 0.2, 0.2) )
-
- ## Create a point light
- l = self.sceneManager.createLight("MainLight")
- l.setPosition(-100,50,100)
- l.setAttenuation(8000,1,0,0)
-
- ## Setup World
- self.world.setGravity( (0, 0, -60) )
- self.world.getSceneManager().setWorldGeometry("ogretestmap.bsp")
-
- ## modify camera for close work
- self.camera.setNearClipDistance(10)
- self.camera.setFarClipDistance(20000)
-
- ## Also change position, and set Quake-type orientation
- ## Get random player start point
- vp = self.sceneManager.getSuggestedViewpoint(True)
- self.camera.setPosition(vp.position)
- self.camera.pitch(ogre.Degree(d=90)) ## Quake uses X/Y horizon, Z up
- self.camera.rotate(vp.orientation)
- ## Don't yaw along variable axis, causes leaning
- self.camera.setFixedYawAxis(True, ogre.Vector3().UNIT_Z)
- ## Look at the boxes
- self.camera.lookAt(-150,40,30)
-
- gBall = self.world.createBall("Ball", 7, vp.position + ogre.Vector3(0,0,80))
- gBall.setDynamicsEnabled(True)
- gBall.getEntity().setMaterialName("Ogre/Eyes")
-
- box = self.world.createBox("shelf", 75, 125, 5, ogre.Vector3(-150, 40, 30))
- box.getEntity().setMaterialName("Examples/Rocky")
-
-
-
- for row in range (self.num_rows):
- for i in range (self.num_rows-row):
- row_size = (self.num_rows - row) * self.BOX_SIZE * 1.25
- name = "box"
- name += str((row*self.num_rows) + i)
- box = self.world.createBox(name, self.BOX_SIZE,self.BOX_SIZE,self.BOX_SIZE ,
- ogre.Vector3(-150,
- 40 - (row_size * 0.5) + (i * self.BOX_SIZE * 1.25) ,
- 32.5 + (self.BOX_SIZE / 2) + (row * self.BOX_SIZE)))
- box.setDynamicsEnabled(False, True)
- box.getEntity().setMaterialName("Examples/10PointBlock")
-
- self.camera.setCollisionEnabled(False)
- self.camera.getRealCamera().setQueryFlags(0)
-
- ## Create the targeting sphere
- targetEnt = self.sceneManager.createEntity("testray", "sphere.mesh")
- mat = ogre.MaterialManager.getSingleton().create("targeter",
- ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
- Pass = mat.getTechnique(0).getPass(0)
- tex = Pass.createTextureUnitState()
- tex.setColourOperationEx(ogre.LBX_SOURCE1, ogre.LBS_MANUAL, ogre.LBS_CURRENT,
- ogre.ColourValue().Red)
- Pass.setLightingEnabled(False)
- Pass.setSceneBlending(ogre.SBT_ADD)
- Pass.setDepthWriteEnabled(False)
-
-
- targetEnt.setMaterialName("targeter")
- targetEnt.setCastShadows(False)
- targetEnt.setQueryFlags(0)
- gTargetNode = self.sceneManager.getRootSceneNode().createChildSceneNode()
- gTargetNode.setScale(0.025, 0.025, 0.025)
- gTargetNode.attachObject(targetEnt)
-
- gRsq = self.sceneManager.createRayQuery(ogre.Ray())
- gRsq.setSortByDistance(True, 1)
- gRsq.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
-
- ## Create new frame listener
- def _createFrameListener(self):
- self.frameListener = BspCollisionListener(self.renderWindow, self.camera)
- self.root.addFrameListener(self.frameListener)
-
-
-if __name__ == '__main__':
- try:
- application = BspCollisionApplication()
- application.go()
- except ogre.OgreException, e:
- print e
-
-
-
-
-
-
-
-
Copied: trunk/python-ogre/demos/ogre/tofix/Demo_BspCollision.py (from rev 840, trunk/python-ogre/demos/ogre/Demo_BspCollision.py)
===================================================================
--- trunk/python-ogre/demos/ogre/tofix/Demo_BspCollision.py (rev 0)
+++ trunk/python-ogre/demos/ogre/tofix/Demo_BspCollision.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -0,0 +1,212 @@
+# This code is in the Public Domain
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre
+# For the latest info, see http://python-ogre.org/
+#
+# It is likely based on original code from OGRE and/or PyOgre
+# For the latest info, see http://www.ogre3d.org/
+#
+# You may use this sample code for anything you like, it is not covered by the
+# LGPL.
+# -----------------------------------------------------------------------------
+
+## -----------------------------------------------------------------------------
+## Filename: BspCollision.py
+## Description: Test the OgreRefApp module
+## -----------------------------------------------------------------------------
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+
+import ogre.renderer.OGRE as ogre
+import SampleFramework as sf ## note that we are forcing the OIS sample framework
+import ogre.physics.OgreRefApp as OgreRefApp
+
+## As this demo does it's own key input, AND we want to support Ogre 1.2.x we need to cope with the
+## change to OIS in ogre 1.3.x (current CVS version)
+
+if ogre.OgreVersionString[:2]=="12":
+ KC_SPACE = ogre.KC_SPACE
+else:
+ import ogre.io.OIS as OIS
+ KC_SPACE = OIS.KC_SPACE
+
+
+## Hacky globals
+gBall = None
+gTargetNode = None
+gRsq = 0
+
+
+class BspCollisionListener (sf.FrameListener):
+
+ def __init__(self, renderWindow, camera):
+ """ Initialise the frame listener"""
+ sf.FrameListener.__init__(self, renderWindow, camera)
+ self.camera = camera
+ self.timeUntilNextToggle = 0
+ self.MAX_TIME_INCREMENT = 0.5
+
+ def _UpdateSimulation ( self, Event ):
+ OgreRefApp.World.getSingleton().simulationStep(Event.timeSinceLastFrame)
+
+ def frameEnded(self, evt):
+ global gBall, gTargetNode, gRsq
+ ## Deal with time delays that are too large
+ ## If we exceed this limit, we ignore
+ if evt.timeSinceLastEvent > self.MAX_TIME_INCREMENT:
+ return True
+
+ if self.timeUntilNextToggle >= 0:
+ self.timeUntilNextToggle -= evt.timeSinceLastFrame
+
+ ## Call superclass
+ ret = sf.FrameListener.frameEnded(self, evt)
+
+ if self._isToggleKeyDown(KC_SPACE):
+ self.timeUntilNextToggle = 2
+ gBall.setPosition(self.camera.getPosition() +
+ self.camera.getDirection() * self.camera.getNearClipDistance() * 2)
+ gBall.setLinearVelocity(self.camera.getDirection() * 200)
+ gBall.setAngularVelocity(ogre.Vector3().ZERO)
+
+ ## Move the targeter
+ gRsq.setRay(self.camera.getRealCamera().getCameraToViewportRay(0.5, 0.5))
+ for queryResult in gRsq.execute():
+ gTargetNode.setPosition(gRsq.getRay().getPoint(queryResult.distance))
+ return ret
+
+ def _moveCamera(self):
+ self.camera.yaw(self.rotationX)
+ self.camera.pitch(self.rotationY)
+ self.camera.translate(self.translateVector) # for using OgreRefApp
+
+class BspCollisionApplication (sf.Application):
+ def __init__(self):
+ "Init Render Application"
+ sf.Application.__init__(self)
+ self.BOX_SIZE = 15.0
+ self.num_rows = 3
+
+ def __del__(self):
+ global gBall, gTargetNode, gRsq
+ "Close Render Application"
+ del ( gRsq )
+
+ # Override scene manager (use indoor instead of generic)
+ def _chooseSceneManager(self):
+ self.sceneManager = self.root.createSceneManager("BspSceneManager")
+
+ def _createWorld(self):
+ ## Create BSP-specific world
+ self.world = OgreRefApp.World(self.sceneManager, OgreRefApp.World.WT_REFAPP_BSP)
+
+
+ def _createCamera(self):
+ """ when doing collisions with OgreRefApp Framework the camera is linked to the 'WORLD'
+ not to the scene manager"""
+ self.camera = self.world.createCamera('PlayerCam')
+ self.camera.setPosition( (0, 0, 500) )
+ self.camera.lookAt( (0, 0, -300) )
+ self.camera.NearClipDistance = 5
+
+
+ def _createScene(self):
+ global gBall, gTargetNode, gRsq
+ self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_STENCIL_MODULATIVE)
+ ## Set ambient light
+ self.sceneManager.setAmbientLight( (0.2, 0.2, 0.2) )
+
+ ## Create a point light
+ l = self.sceneManager.createLight("MainLight")
+ l.setPosition(-100,50,100)
+ l.setAttenuation(8000,1,0,0)
+
+ ## Setup World
+ self.world.setGravity( (0, 0, -60) )
+ self.world.getSceneManager().setWorldGeometry("ogretestmap.bsp")
+
+ ## modify camera for close work
+ self.camera.setNearClipDistance(10)
+ self.camera.setFarClipDistance(20000)
+
+ ## Also change position, and set Quake-type orientation
+ ## Get random player start point
+ vp = self.sceneManager.getSuggestedViewpoint(True)
+ self.camera.setPosition(vp.position)
+ self.camera.pitch(ogre.Degree(d=90)) ## Quake uses X/Y horizon, Z up
+ self.camera.rotate(vp.orientation)
+ ## Don't yaw along variable axis, causes leaning
+ self.camera.setFixedYawAxis(True, ogre.Vector3().UNIT_Z)
+ ## Look at the boxes
+ self.camera.lookAt(-150,40,30)
+
+ gBall = self.world.createBall("Ball", 7, vp.position + ogre.Vector3(0,0,80))
+ gBall.setDynamicsEnabled(True)
+ gBall.getEntity().setMaterialName("Ogre/Eyes")
+
+ box = self.world.createBox("shelf", 75, 125, 5, ogre.Vector3(-150, 40, 30))
+ box.getEntity().setMaterialName("Examples/Rocky")
+
+
+
+ for row in range (self.num_rows):
+ for i in range (self.num_rows-row):
+ row_size = (self.num_rows - row) * self.BOX_SIZE * 1.25
+ name = "box"
+ name += str((row*self.num_rows) + i)
+ box = self.world.createBox(name, self.BOX_SIZE,self.BOX_SIZE,self.BOX_SIZE ,
+ ogre.Vector3(-150,
+ 40 - (row_size * 0.5) + (i * self.BOX_SIZE * 1.25) ,
+ 32.5 + (self.BOX_SIZE / 2) + (row * self.BOX_SIZE)))
+ box.setDynamicsEnabled(False, True)
+ box.getEntity().setMaterialName("Examples/10PointBlock")
+
+ self.camera.setCollisionEnabled(False)
+ self.camera.getRealCamera().setQueryFlags(0)
+
+ ## Create the targeting sphere
+ targetEnt = self.sceneManager.createEntity("testray", "sphere.mesh")
+ mat = ogre.MaterialManager.getSingleton().create("targeter",
+ ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
+ Pass = mat.getTechnique(0).getPass(0)
+ tex = Pass.createTextureUnitState()
+ tex.setColourOperationEx(ogre.LBX_SOURCE1, ogre.LBS_MANUAL, ogre.LBS_CURRENT,
+ ogre.ColourValue().Red)
+ Pass.setLightingEnabled(False)
+ Pass.setSceneBlending(ogre.SBT_ADD)
+ Pass.setDepthWriteEnabled(False)
+
+
+ targetEnt.setMaterialName("targeter")
+ targetEnt.setCastShadows(False)
+ targetEnt.setQueryFlags(0)
+ gTargetNode = self.sceneManager.getRootSceneNode().createChildSceneNode()
+ gTargetNode.setScale(0.025, 0.025, 0.025)
+ gTargetNode.attachObject(targetEnt)
+
+ gRsq = self.sceneManager.createRayQuery(ogre.Ray())
+ gRsq.setSortByDistance(True, 1)
+ gRsq.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
+
+ ## Create new frame listener
+ def _createFrameListener(self):
+ self.frameListener = BspCollisionListener(self.renderWindow, self.camera)
+ self.root.addFrameListener(self.frameListener)
+
+
+if __name__ == '__main__':
+ try:
+ application = BspCollisionApplication()
+ application.go()
+ except ogre.OgreException, e:
+ print e
+
+
+
+
+
+
+
+
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/environment.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -474,28 +474,13 @@
if isWindows():
PATH_LIB_THREAD=Config.PATH_LIB_Thread_STATIC
PATH_LIB_DATETIME=Config.PATH_LIB_date_time_STATIC
- if _STABLE:
- base = 'boost_1_36_0'
- lib = 'boost_python-vc90-mt-1_36'
- versionBase = '1_36' ## the version used on the library name
- else:
- base = 'boost_1_37_0'
- lib = 'boost_python-vc90-mt-1_37'
- PATH_LIB = Config.PATH_LIB_Boost
-
- # change to handle static boost linking...
- if BOOST_STATIC:
- lib = 'libboost_python-vc90-mt-1_37'
- PATH_LIB = Config.PATH_LIB_Boost_STATIC
-
- versionBase = '1_37' ## the version used on the library name
+ base = 'boost_1_37_0'
+ lib = 'boost_python-vc90-mt-1_37'
+ PATH_LIB = Config.PATH_LIB_Boost
+ versionBase = '1_37' ## the version used on the library name
else:
- if _STABLE:
- base = 'boost_1_34_1'
- versionBase = '1_34' ## the version used on the library name
- else:
- base = 'boost_1_37_0'
- versionBase = '1_37' ## the version used on the library name
+ base = 'boost_1_37_0'
+ versionBase = '1_37' ## the version used on the library name
if isLinux() or isMac():
bjambase = 'boost-jam-3.1.17'
@@ -523,9 +508,9 @@
## and now boost
[0, tar + ' zxf ' + os.path.join(downloadPath, base) + '.tar.gz', ''],
[0,'chmod -R +rw *', os.path.join(os.getcwd(), base ) ],
- [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, 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,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 )],
@@ -546,7 +531,7 @@
# [0,'sed -i s/"BOOST_PYTHON_MAX_ARITY 15"/"BOOST_PYTHON_MAX_ARITY 19"/ '+base+'/boost/python/detail/preprocessor.hpp', ''],
# [0,'sed -i 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,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
-# [0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
+ [0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python --with-thread --with-date_time ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
]
if not isWindows():
@@ -600,34 +585,19 @@
libraries = myLibraries
if isWindows():
+ version="1.6.1"
+ source = [
+ [ wget, "http://downloads.sourceforge.net/ogre/OgreSDKSetup1.6.1_VC90.exe", downloadPath],
+ #[ wget, "http://downloads.sourceforge.net/ogre/ogre-v1-6-0.zip", downloadPath],
+ ]
+ buildCmds = [
+ [0, os.path.join(downloadPath, "OgreSDKSetup1.6.1_VC90.exe"), '' ]
+ #[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.0.patch -p0 ", os.getcwd()],
+ #[0,'echo Please use MSVC Express Edition to build Ogre Release.','']
+ ]
- if _STABLE or not _STABLE: ## temp force to this version...
- 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-0.zip", downloadPath],
- ]
- buildCmds = [
- [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.0.patch -p0 ", os.getcwd()],
- [0,'echo Please use MSVC Express Edition to build Ogre Release.','']
- ]
-# 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.','']
-# ]
-
# requirements to build a precompiled header on the fly
if _PreCompiled:
pchstop = 'python_ogre_precompiled.h'
@@ -636,17 +606,17 @@
libs=[boost.lib, 'OgreMain']
lib_dirs = [ boost.PATH_LIB
- , Config.PATH_LIB_Ogre_CEGUIRenderer
+# , Config.PATH_LIB_Ogre_CEGUIRenderer
, Config.PATH_LIB_Ogre_OgreMain
- , Config.PATH_LIB_Ogre_Dependencies #needed for ceguibase.lib etc
- , Config.PATH_LIB_CEGUI
+# , Config.PATH_LIB_Ogre_Dependencies #needed for ceguibase.lib etc
+# , Config.PATH_LIB_CEGUI
]
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_NEDMALLOC
+ #, Config.PATH_INCLUDE_NEDMALLOC
]
LINKFLAGS = ''
- externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', boost.lib+'.dll']
+
elif isLinux():
if _STABLE:
version = "1.4"
@@ -718,13 +688,13 @@
LINKFLAGS = ''
cflags += ''
- CheckIncludes=['boost/python.hpp', 'Ogre.h']
+ #CheckIncludes=['boost/python.hpp', 'Ogre.h']
class ois:
active = True
pythonModule = True
- version= "1.2"
+ version= "1.0"
name = 'ois'
cflags=''
parent = "ogre/io"
@@ -768,7 +738,8 @@
pchbuild = 'buildpch.cpp'
pchincludes = ['boost/python.hpp', 'OIS.h']
- libs=['OIS_Static',boost.lib]
+ libs=['OIS',boost.lib]
+
else:
libs=['OIS',boost.lib]
libs.append ( boost_python_index.lib )
@@ -789,7 +760,7 @@
LINKFLAGS = "-l%s" % boost_python_index.lib
class ogrerefapp:
- active = True
+ active = False ## making this false as replaced by OgreODE etc..
pythonModule = True
version = ogre.version # same as the Ogre version
name = 'ogrerefapp'
@@ -859,7 +830,7 @@
, Config.PATH_Newton # only one path for Newton
, Config.PATH_INCLUDE_Ogre
, Config.PATH_INCLUDE_OgreNewt
- , Config.PATH_INCLUDE_Ogre_Dependencies #needed for OIS/OIS.h
+ # , Config.PATH_INCLUDE_Ogre_Dependencies #needed for OIS/OIS.h
]
lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Newton
@@ -880,6 +851,7 @@
else:
version = "0.6.2b"
if isWindows():
+ version = "0.5.0b" ### I'm forceing this as using the Ogre SDK
if _PreCompiled:
pchstop = 'cegui.h'
pchbuild = 'buildpch.cpp'
@@ -934,7 +906,7 @@
,Config.PATH_CEGUI
, Config.PATH_INCLUDE_Ogre_CEGUIRenderer
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies ## needed as OgreCEGUI uses CEGUI/.. in #includes
+ #, Config.PATH_INCLUDE_Ogre_Dependencies ## needed as OgreCEGUI uses CEGUI/.. in #includes
]
lib_dirs = [ boost.PATH_LIB
@@ -976,7 +948,7 @@
baseDir = os.path.join(os.getcwd(),"ode-0.10.1")
if not isWindows():
source = [
- ["wget", "http://downloads.sourceforge.net/opende/ode-0.10.1.tar.gz",downloadPath]
+ [wget, "http://downloads.sourceforge.net/opende/ode-0.10.1.tar.gz",downloadPath]
]
buildCmds = [
# FIXME: Should this untar not use the unTarGz method mentioned above?
@@ -990,7 +962,7 @@
]
else:
source = [
- ["wget", "http://downloads.sourceforge.net/opende/ode-0.10.1.zip",downloadPath]
+ [wget, "http://downloads.sourceforge.net/opende/ode-0.10.1.zip",downloadPath]
]
buildCmds = [
[0, unzip + os.path.join(downloadPath,"ode-src-0.10.1.zip"), ''],
@@ -1170,7 +1142,7 @@
Config.PATH_LIB_OIS
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain', 'OIS_Static' ]
+ libs=[ boost.lib, 'OgreMain', 'OIS' ]
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
else:
@@ -1206,6 +1178,16 @@
name='particleuniverse'
parent="ogre/addons"
cflags=""
+ source = [
+ [wget, "http://www.fxpression.com/files/download/ParticleUniverseV0.81.zip", downloadPath]
+ ]
+
+ buildCmds = [
+# [0, unzip + os.path.join(downloadPath, "ParticleUniverseV0.81.zip"), Config.PATH_Ogre],
+ [0, "patch -s -N -i " + os.path.join(os.getcwd(),"python-ogre","patch","ParticleUniverse_0.8.patch") + " -p0 ", os.path.join(Config.PATH_Ogre, 'Plugins','ParticleUniverse') ],
+
+ [0, "echo *** NOW build ParticleUniverse with MSVC from " + Config.PATH_Ogre, '']
+ ]
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
Config.PATH_INCLUDE_particleuniverse
@@ -1221,7 +1203,7 @@
ModuleName="particleuniverse"
class nxogre:
- active = True
+ active = False
pythonModule = True
version="0.22T5"
name='nxogre'
@@ -1549,7 +1531,7 @@
class bullet:
active = True
pythonModule = True
- version= "2.72"
+ version= "2.73"
name='bullet'
base = "bullet-" + version
baseDir = os.path.join(os.getcwd(), base)
@@ -1572,10 +1554,10 @@
]
if not isWindows():
source=[
- [wget, "http://bullet.googlecode.com/files/"+base+".tgz", downloadPath]
+ [wget, "http://bullet.googlecode.com/files/"+base+"-sp1.tgz", downloadPath]
]
buildCmds = [
- [0, "tar zxf " +os.path.join(downloadPath, base)+".tgz", ''],
+ [0, "tar zxf " +os.path.join(downloadPath, base)+"-sp1.tgz", ''],
# [0, "./autogen.sh", baseDir],
# [0, "./configure --prefix=%s " %(PREFIX), baseDir],
[0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
@@ -1588,10 +1570,10 @@
]
else:
source=[
- [wget, "http://bullet.googlecode.com/files/"+base+".zip", downloadPath]
+ [wget, "http://bullet.googlecode.com/files/"+base+"-sp1.zip", downloadPath]
]
buildCmds = [
- [0, unzip +os.path.join(downloadPath, base)+".zip", ''],
+ [0, unzip +os.path.join(downloadPath, base)+"-sp1.zip", ''],
]
ModuleName = 'bullet'
@@ -1616,7 +1598,7 @@
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
+# , Config.PATH_INCLUDE_Ogre_Dependencies
]
lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Bullet
@@ -1654,7 +1636,7 @@
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
, os.path.join(Config.PATH_OgreBullet, 'Dynamics' )
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
+# , Config.PATH_INCLUDE_Ogre_Dependencies
]
lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Bullet
@@ -1766,7 +1748,7 @@
]
lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain,
- os.path.join(Config.PATH_LIB_Ogre_OgreMain, 'OGRE')
+ Config.PATH_LIB_pcz
]
CheckIncludes=[]
libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
Modified: trunk/python-ogre/patch/ParticleUniverse_0.8.patch
===================================================================
--- trunk/python-ogre/patch/ParticleUniverse_0.8.patch 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/patch/ParticleUniverse_0.8.patch 2009-01-24 05:00:41 UTC (rev 844)
@@ -9,10 +9,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_prepare(technique);
@@ -20,10 +20,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_notifyStart();
@@ -31,10 +31,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_notifyStop();
@@ -42,10 +42,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_preProcessParticles(technique, timeElapsed);
@@ -53,10 +53,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_processParticle(particleTechnique, particle, timeElapsed, firstParticle);
@@ -64,10 +64,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_postProcessParticles(technique, timeElapsed);
@@ -78,8 +78,8 @@
SpatialHashTable(void) :
mTableSize(50),
mCellDimension(15),
-- mCellOverlap(5)
-+ mCellOverlap(5),
+- mCellOverlap(5),
++ mCellOverlap(5)
{
_initialise();
};
@@ -93,8 +93,8 @@
if (isAttached())
{
// Use the position of the parent node in this case.
-- position = getParentNode()->getPosition();
-+ position = getParentNode()->getWorldPosition();
+- position = getParentNode()->getWorldPosition();
++ position = getParentNode()->getPosition();
mDerivedPosition = position;
populateAlignedBox(mBox, mDerivedPosition, mWidth, mHeight, mDepth);
_calculateBounds();
@@ -105,8 +105,8 @@
// Use the position of the parent node in this case.
if (isAttached())
{
-- position = getParentNode()->getPosition();
-+ position = getParentNode()->getWorldPosition();
+- position = getParentNode()->getWorldPosition();
++ position = getParentNode()->getPosition();
mDerivedPosition = position;
}
}
@@ -117,8 +117,8 @@
if (isAttached())
{
// Use the position of the parent node in this case.
-- position = getParentNode()->getPosition();
-+ position = getParentNode()->getWorldPosition();
+- position = getParentNode()->getWorldPosition();
++ position = getParentNode()->getPosition();
mDerivedPosition = position;
mSphere.setCenter(mDerivedPosition);
}
@@ -129,8 +129,8 @@
{
if (isAttached())
{
-- position = getParentNode()->getPosition();
-+ position = getParentNode()->getWorldPosition();
+- position = getParentNode()->getWorldPosition();
++ position = getParentNode()->getPosition();
mDerivedPosition = position;
}
}
@@ -141,8 +141,8 @@
if (!mTimeController)
{
mTimeSinceLastVisible = 0;
-- mLastVisibleFrame = Ogre::Root::getSingleton().getNextFrameNumber();
-+ mLastVisibleFrame = Ogre::Root::getSingleton().getCurrentFrameNumber();
+- mLastVisibleFrame = Ogre::Root::getSingleton().getCurrentFrameNumber();
++ mLastVisibleFrame = Ogre::Root::getSingleton().getNextFrameNumber();
Ogre::ControllerManager& controllerManager = Ogre::ControllerManager::getSingleton();
Ogre::ControllerValueRealPtr particleSystemUpdateValue(new ParticleSystemUpdateValue(this));
mTimeController = controllerManager.createFrameTimePassthroughController(particleSystemUpdateValue);
@@ -150,8 +150,8 @@
void ParticleSystem::_notifyCurrentCamera(Ogre::Camera* cam)
{
Ogre::MovableObject::_notifyCurrentCamera(cam);
-- mLastVisibleFrame = Ogre::Root::getSingleton().getNextFrameNumber();
-+ mLastVisibleFrame = Ogre::Root::getSingleton().getCurrentFrameNumber();
+- mLastVisibleFrame = Ogre::Root::getSingleton().getCurrentFrameNumber();
++ mLastVisibleFrame = Ogre::Root::getSingleton().getNextFrameNumber();
mTimeSinceLastVisible = 0.0f;
// Notify all techniques
@@ -159,8 +159,8 @@
{
if (mNonvisibleUpdateTimeoutSet)
{
-- long frameDiff = Ogre::Root::getSingleton().getNextFrameNumber() - mLastVisibleFrame;
-+ long frameDiff = Ogre::Root::getSingleton().getCurrentFrameNumber() - mLastVisibleFrame;
+- long frameDiff = Ogre::Root::getSingleton().getCurrentFrameNumber() - mLastVisibleFrame;
++ long frameDiff = Ogre::Root::getSingleton().getNextFrameNumber() - mLastVisibleFrame;
if (frameDiff > 1 || frameDiff < 0)
{
mTimeSinceLastVisible += timeElapsed;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-25 03:51:18
|
Revision: 845
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=845&view=rev
Author: andy_miller
Date: 2009-01-25 03:51:12 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Updated to Caelum 0.4
Small fixes for Ogre 1.6.1 (exposed a missing class)
Added Mac changes to environment.py
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ThirdParty/caelum/Caelum.h
trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
trunk/python-ogre/ThirdParty/caelum/CaelumSystem.cpp
trunk/python-ogre/ThirdParty/caelum/CaelumSystem.h
trunk/python-ogre/ThirdParty/caelum/CloudSystem.cpp
trunk/python-ogre/ThirdParty/caelum/CloudSystem.h
trunk/python-ogre/ThirdParty/caelum/DepthComposer.cpp
trunk/python-ogre/ThirdParty/caelum/DepthComposer.h
trunk/python-ogre/ThirdParty/caelum/FlatCloudLayer.cpp
trunk/python-ogre/ThirdParty/caelum/FlatCloudLayer.h
trunk/python-ogre/ThirdParty/caelum/GeometryFactory.cpp
trunk/python-ogre/ThirdParty/caelum/GeometryFactory.h
trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp
trunk/python-ogre/ThirdParty/caelum/GroundFog.h
trunk/python-ogre/ThirdParty/caelum/Moon.h
trunk/python-ogre/ThirdParty/caelum/OwnedPtr.h
trunk/python-ogre/ThirdParty/caelum/PointStarfield.cpp
trunk/python-ogre/ThirdParty/caelum/PointStarfield.h
trunk/python-ogre/ThirdParty/caelum/PrecipitationController.cpp
trunk/python-ogre/ThirdParty/caelum/PrecipitationController.h
trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp
trunk/python-ogre/ThirdParty/caelum/SkyDome.h
trunk/python-ogre/ThirdParty/caelum/SkyLight.cpp
trunk/python-ogre/ThirdParty/caelum/SkyLight.h
trunk/python-ogre/ThirdParty/caelum/Sun.cpp
trunk/python-ogre/ThirdParty/caelum/UniversalClock.h
trunk/python-ogre/code_generators/caelum/generate_code.py
trunk/python-ogre/code_generators/caelum/python_caelum_aliases.h
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h
trunk/python-ogre/code_generators/ogre/python_ogre_masterlist.h
trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/UpdateDLLs.bat
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/caelum/CaelumDefaultTypeDescriptorData.cpp
trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.cpp
trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.h
trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.cpp
trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.h
trunk/python-ogre/ThirdParty/caelum/TypeDescriptor.cpp
trunk/python-ogre/ThirdParty/caelum/TypeDescriptor.h
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2009-01-24 05:00:41 UTC (rev 844)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2009-01-25 03:51:12 UTC (rev 845)
@@ -1,6 +1,6 @@
import os
-SDK=True # Changes Ogre include path settings
+SDK=False # Changes Ogre include path settings
## The root directory is where this module is located
module_dir = os.path.abspath(os.path.dirname(__file__) )
@@ -31,7 +31,8 @@
## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR, 'ogre')
-PATH_Ogre = "C:\\OgreSDK"
+if SDK:
+ PATH_Ogre = "C:\\OgreSDK"
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.2')
@@ -96,7 +97,7 @@
###
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/lib')
PATH_LIB_Ogre_OgreMain= os.path.join( PATH_Ogre, 'lib' )
-PATH_LIB_Ogre_Dependencies = ""# os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
+PATH_LIB_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
PATH_LIB_OgreRefApp = os.path.join( PATH_Ogre, 'lib')
PATH_LIB_OgreNewt = os.path.join( PATH_OgreAddons, 'ogrenewt/OgreNewt_Main/lib/Release')
PATH_LIB_Newton = os.path.join( PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
@@ -140,7 +141,7 @@
PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_NEDMALLOC= "" #os.path.join(PATH_Ogre,'OgreMain', 'src', 'nedmalloc')
-PATH_INCLUDE_Ogre_Dependencies = "" #os.path.join( PATH_Ogre, 'Dependencies/include')
+PATH_INCLUDE_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/include')
PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
PATH_INCLUDE_OgreNewt = os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
Modified: trunk/python-ogre/ThirdParty/caelum/Caelum.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/Caelum.h 2009-01-24 05:00:41 UTC (rev 844)
+++ trunk/python-ogre/ThirdParty/caelum/Caelum.h 2009-01-25 03:51:12 UTC (rev 845)
@@ -22,6 +22,9 @@
#define CAELUM_H
#include "CaelumPrerequisites.h"
+#include "CaelumScriptTranslator.h"
+#include "TypeDescriptor.h"
+#include "CaelumPlugin.h"
#include "CaelumExceptions.h"
#include "CaelumSystem.h"
#include "CameraBoundElement.h"
Added: trunk/python-ogre/ThirdParty/caelum/CaelumDefaultTypeDescriptorData.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumDefaultTypeDescriptorData.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumDefaultTypeDescriptorData.cpp 2009-01-25 03:51:12 UTC (rev 845)
@@ -0,0 +1,419 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2008 Caelum team. See Contributors.txt for details.
+
+Caelum 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 3 of the License, or
+(at your option) any later version.
+
+Caelum 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 Caelum. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "CaelumPrecompiled.h"
+#include "CaelumPrerequisites.h"
+
+#if CAELUM_TYPE_DESCRIPTORS
+
+#include "TypeDescriptor.h"
+#include "CaelumSystem.h"
+#include "FlatCloudLayer.h"
+
+using namespace Ogre;
+
+namespace Caelum
+{
+ CaelumDefaultTypeDescriptorData::CaelumDefaultTypeDescriptorData ():
+ CaelumSystemTypeDescriptor(0),
+ PointStarfieldTypeDescriptor(0),
+ BaseSkyLightTypeDescriptor(0),
+ GroundFogTypeDescriptor(0),
+ PrecipitationTypeDescriptor(0),
+ DepthComposerTypeDescriptor(0),
+ FlatCloudLayerTypeDescriptor(0),
+ SkyDomeTypeDescriptor(0)
+ {
+ try {
+ load ();
+ } catch (...) {
+ unload ();
+ throw;
+ }
+ }
+
+ CaelumDefaultTypeDescriptorData::~CaelumDefaultTypeDescriptorData ()
+ {
+ unload ();
+ }
+
+ template<class T>
+ inline void delete_zero(T*& member) {
+ // Remember: delete 0 is a legal no-op.
+ delete member;
+ member = 0;
+ }
+
+ void CaelumDefaultTypeDescriptorData::unload ()
+ {
+ delete_zero(CaelumSystemTypeDescriptor);
+ delete_zero(PointStarfieldTypeDescriptor);
+ delete_zero(BaseSkyLightTypeDescriptor);
+ delete_zero(GroundFogTypeDescriptor);
+ delete_zero(PrecipitationTypeDescriptor);
+ delete_zero(DepthComposerTypeDescriptor);
+ delete_zero(FlatCloudLayerTypeDescriptor);
+ delete_zero(SkyDomeTypeDescriptor);
+ }
+
+ void CaelumDefaultTypeDescriptorData::load ()
+ {
+ if (!CaelumSystemTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+
+ // Timing settings.
+ td->add("time_scale",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Real, Real, Real>(
+ &Caelum::CaelumSystem::getTimeScale,
+ &Caelum::CaelumSystem::setTimeScale));
+ td->add("julian_day",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, LongReal, LongReal, LongReal>(
+ &Caelum::CaelumSystem::getJulianDay,
+ &Caelum::CaelumSystem::setJulianDay));
+
+ // Latitude/longitude
+ td->add("latitude",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Degree, Degree, const Degree>(
+ &Caelum::CaelumSystem::getObserverLatitude,
+ &Caelum::CaelumSystem::setObserverLatitude));
+ td->add("longitude",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Degree, Degree, const Degree>(
+ &Caelum::CaelumSystem::getObserverLongitude,
+ &Caelum::CaelumSystem::setObserverLongitude));
+
+ // Fog settings.
+ td->add("global_fog_density_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Real, Real, Real>(
+ &Caelum::CaelumSystem::getGlobalFogDensityMultiplier,
+ &Caelum::CaelumSystem::setGlobalFogDensityMultiplier));
+ td->add("global_fog_colour_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, ColourValue>(
+ &Caelum::CaelumSystem::getGlobalFogColourMultiplier,
+ &Caelum::CaelumSystem::setGlobalFogColourMultiplier));
+ td->add("manage_scene_fog",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, bool, bool, bool>(
+ &Caelum::CaelumSystem::getManageSceneFog,
+ &Caelum::CaelumSystem::setManageSceneFog));
+ td->add("scene_fog_density_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Real, Real, Real>(
+ &Caelum::CaelumSystem::getSceneFogDensityMultiplier,
+ &Caelum::CaelumSystem::setSceneFogDensityMultiplier));
+ td->add("scene_fog_colour_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, ColourValue>(
+ &Caelum::CaelumSystem::getSceneFogColourMultiplier,
+ &Caelum::CaelumSystem::setSceneFogColourMultiplier));
+ td->add("ground_fog_density_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Real, Real, Real>(
+ &Caelum::CaelumSystem::getGroundFogDensityMultiplier,
+ &Caelum::CaelumSystem::setGroundFogDensityMultiplier));
+ td->add("ground_fog_colour_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, ColourValue>(
+ &Caelum::CaelumSystem::getGroundFogColourMultiplier,
+ &Caelum::CaelumSystem::setGroundFogColourMultiplier));
+
+ // Lighting settings.
+ td->add("manage_ambient_light",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, bool, bool, bool>(
+ &Caelum::CaelumSystem::getManageAmbientLight,
+ &Caelum::CaelumSystem::setManageAmbientLight));
+ td->add("minimum_ambient_light",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, ColourValue>(
+ &Caelum::CaelumSystem::getMinimumAmbientLight,
+ &Caelum::CaelumSystem::setMinimumAmbientLight));
+ td->add("ensure_single_light_source",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, bool, bool, bool>(
+ &Caelum::CaelumSystem::getEnsureSingleLightSource,
+ &Caelum::CaelumSystem::setEnsureSingleLightSource));
+ td->add("ensure_single_shadow_source",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, bool, bool, bool>(
+ &Caelum::CaelumSystem::getEnsureSingleShadowSource,
+ &Caelum::CaelumSystem::setEnsureSingleShadowSource));
+
+ CaelumSystemTypeDescriptor = td.release ();
+ }
+
+ if (!PointStarfieldTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+ td->add("magnitude_scale",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Real, Real, Real>(
+ &Caelum::PointStarfield::getMagnitudeScale,
+ &Caelum::PointStarfield::setMagnitudeScale));
+ td->add("mag0_pixel_size",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Real, Real, Real>(
+ &Caelum::PointStarfield::getMag0PixelSize,
+ &Caelum::PointStarfield::setMag0PixelSize));
+ td->add("min_pixel_size",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Real, Real, Real>(
+ &Caelum::PointStarfield::getMinPixelSize,
+ &Caelum::PointStarfield::setMinPixelSize));
+ td->add("max_pixel_size",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Real, Real, Real>(
+ &Caelum::PointStarfield::getMaxPixelSize,
+ &Caelum::PointStarfield::setMaxPixelSize));
+ td->add("latitude",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Degree, Degree, Degree>(
+ &Caelum::PointStarfield::getObserverLatitude,
+ &Caelum::PointStarfield::setObserverLatitude));
+ td->add("longitude",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Degree, Degree, Degree>(
+ &Caelum::PointStarfield::getObserverLongitude,
+ &Caelum::PointStarfield::setObserverLongitude));
+ td->add("observer_position_rebuild_delta",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Degree, Degree, Degree>(
+ &Caelum::PointStarfield::getObserverPositionRebuildDelta,
+ &Caelum::PointStarfield::setObserverPositionRebuildDelta));
+ PointStarfieldTypeDescriptor = td.release ();
+ }
+
+ if (!BaseSkyLightTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+ td->add("ambient_multiplier",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getAmbientMultiplier,
+ &Caelum::BaseSkyLight::setAmbientMultiplier));
+ td->add("specular_multiplier",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getSpecularMultiplier,
+ &Caelum::BaseSkyLight::setSpecularMultiplier));
+ td->add("diffuse_multiplier",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getDiffuseMultiplier,
+ &Caelum::BaseSkyLight::setDiffuseMultiplier));
+ td->add("light_colour",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getLightColour,
+ &Caelum::BaseSkyLight::setLightColour));
+ td->add("body_colour",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getBodyColour,
+ &Caelum::BaseSkyLight::setBodyColour));
+ td->add("auto_disable_threshold",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, Real, Real, Real>(
+ &Caelum::BaseSkyLight::getAutoDisableThreshold,
+ &Caelum::BaseSkyLight::setAutoDisableThreshold));
+ td->add("auto_disable",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, bool, bool, bool>(
+ &Caelum::BaseSkyLight::getAutoDisable,
+ &Caelum::BaseSkyLight::setAutoDisable));
+ BaseSkyLightTypeDescriptor = td.release ();
+ }
+
+ if (!GroundFogTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+ td->add("density",
+ new AccesorPropertyDescriptor<Caelum::GroundFog, Real, Real, Real>(
+ &Caelum::GroundFog::getDensity,
+ &Caelum::GroundFog::setDensity));
+ td->add("vertical_decay",
+ new AccesorPropertyDescriptor<Caelum::GroundFog, Real, Real, Real>(
+ &Caelum::GroundFog::getVerticalDecay,
+ &Caelum::GroundFog::setVerticalDecay));
+ td->add("ground_level",
+ new AccesorPropertyDescriptor<Caelum::GroundFog, Real, Real, Real>(
+ &Caelum::GroundFog::getGroundLevel,
+ &Caelum::GroundFog::setGroundLevel));
+ td->add("colour",
+ new AccesorPropertyDescriptor<Caelum::GroundFog, ColourValue>(
+ &Caelum::GroundFog::getColour,
+ &Caelum::GroundFog::setColour));
+ GroundFogTypeDescriptor = td.release ();
+ }
+
+ if (!DepthComposerTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+ td->add("debug_depth_render",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, bool, bool, bool>(
+ &Caelum::DepthComposer::getDebugDepthRender,
+ &Caelum::DepthComposer::setDebugDepthRender));
+
+ // Legacy haze
+ td->add("haze_enabled",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, bool, bool, bool>(
+ &Caelum::DepthComposer::getSkyDomeHazeEnabled,
+ &Caelum::DepthComposer::setSkyDomeHazeEnabled));
+ td->add("haze_colour",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, ColourValue>(
+ &Caelum::DepthComposer::getHazeColour,
+ &Caelum::DepthComposer::setHazeColour));
+ td->add("haze_sun_direction",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, Vector3>(
+ &Caelum::DepthComposer::getSunDirection,
+ &Caelum::DepthComposer::setSunDirection));
+
+ // Ground fog
+ td->add("ground_fog_enabled",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, bool, bool, bool>(
+ &Caelum::DepthComposer::getGroundFogEnabled,
+ &Caelum::DepthComposer::setGroundFogEnabled));
+ td->add("ground_fog_density",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, Real, Real, Real>(
+ &Caelum::DepthComposer::getGroundFogDensity,
+ &Caelum::DepthComposer::setGroundFogDensity));
+ td->add("ground_fog_vertical_decay",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, Real, Real, Real>(
+ &Caelum::DepthComposer::getGroundFogVerticalDecay,
+ &Caelum::DepthComposer::setGroundFogVerticalDecay));
+ td->add("ground_fog_base_level",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, Real, Real, Real>(
+ &Caelum::DepthComposer::getGroundFogBaseLevel,
+ &Caelum::DepthComposer::setGroundFogBaseLevel));
+ td->add("ground_fog_colour",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, ColourValue>(
+ &Caelum::DepthComposer::getGroundFogColour,
+ &Caelum::DepthComposer::setGroundFogColour));
+
+ DepthComposerTypeDescriptor = td.release ();
+ }
+
+ if (!PrecipitationTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+
+ td->add("texture",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, String>(
+ &Caelum::PrecipitationController::getTextureName,
+ &Caelum::PrecipitationController::setTextureName));
+ td->add("precipitation_colour",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, ColourValue>(
+ &Caelum::PrecipitationController::getColour,
+ &Caelum::PrecipitationController::setColour));
+ td->add("falling_speed",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Real, Real, Real>(
+ &Caelum::PrecipitationController::getSpeed,
+ &Caelum::PrecipitationController::setSpeed));
+ td->add("wind_speed",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Vector3>(
+ &Caelum::PrecipitationController::getWindSpeed,
+ &Caelum::PrecipitationController::setWindSpeed));
+ td->add("camera_speed_scale",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Vector3>(
+ &Caelum::PrecipitationController::getCameraSpeedScale,
+ &Caelum::PrecipitationController::setCameraSpeedScale));
+ td->add("intensity",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Real, Real, Real>(
+ &Caelum::PrecipitationController::getIntensity,
+ &Caelum::PrecipitationController::setIntensity));
+ td->add("auto_disable_intensity",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Real, Real, Real>(
+ &Caelum::PrecipitationController::getAutoDisableThreshold,
+ &Caelum::PrecipitationController::setAutoDisableThreshold));
+ td->add("falling_direction",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Vector3>(
+ &Caelum::PrecipitationController::getFallingDirection,
+ &Caelum::PrecipitationController::setFallingDirection));
+
+ PrecipitationTypeDescriptor = td.release ();
+ }
+
+ if (!FlatCloudLayerTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+
+ td->add("height",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getHeight,
+ &Caelum::FlatCloudLayer::setHeight));
+ td->add("coverage",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getCloudCover,
+ &Caelum::FlatCloudLayer::setCloudCover));
+ td->add("cloud_speed",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Vector2>(
+ &Caelum::FlatCloudLayer::getCloudSpeed,
+ &Caelum::FlatCloudLayer::setCloudSpeed));
+ td->add("blend_time",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getCloudBlendTime,
+ &Caelum::FlatCloudLayer::setCloudBlendTime));
+ td->add("mesh_width",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getMeshWidth,
+ &Caelum::FlatCloudLayer::setMeshWidth));
+ td->add("mesh_height",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getMeshHeight,
+ &Caelum::FlatCloudLayer::setMeshHeight));
+ td->add("mesh_width_segments",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, int, int, int>(
+ &Caelum::FlatCloudLayer::getMeshWidthSegments,
+ &Caelum::FlatCloudLayer::setMeshWidthSegments));
+ td->add("mesh_height_segments",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, int, int, int>(
+ &Caelum::FlatCloudLayer::getMeshHeightSegments,
+ &Caelum::FlatCloudLayer::setMeshHeightSegments));
+ td->add("cloud_uv_factor",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getCloudUVFactor,
+ &Caelum::FlatCloudLayer::setCloudUVFactor));
+ td->add("height_red_factor",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getHeightRedFactor,
+ &Caelum::FlatCloudLayer::setHeightRedFactor));
+ td->add("near_fade_dist",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getNearFadeDist,
+ &Caelum::FlatCloudLayer::setNearFadeDist));
+ td->add("far_fade_dist",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getFarFadeDist,
+ &Caelum::FlatCloudLayer::setFarFadeDist));
+
+ FlatCloudLayerTypeDescriptor = td.release ();
+ }
+
+ if (!SkyDomeTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+
+ // SkyDome is slightly special because most properties are write-only.
+
+ // Reset by CaelumSystem every frame anyway
+ td->add("sun_direction",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, Ogre::Vector3>(
+ 0, &Caelum::SkyDome::setSunDirection));
+ td->add("haze_colour",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, Ogre::ColourValue>(
+ 0, &Caelum::SkyDome::setHazeColour));
+
+ // Different files not supported anyway
+ td->add("sky_gradients_image",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, Ogre::String>(
+ 0, &Caelum::SkyDome::setSkyGradientsImage));
+ td->add("atmosphere_depth_image",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, Ogre::String>(
+ 0, &Caelum::SkyDome::setAtmosphereDepthImage));
+
+ // This does actually make sense.
+ td->add("haze_enabled",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, bool, bool, bool>(
+ &Caelum::SkyDome::getHazeEnabled,
+ &Caelum::SkyDome::setHazeEnabled));
+
+ SkyDomeTypeDescriptor = td.release ();
+ }
+ }
+}
+
+#endif // CAELUM_TYPE_DESCRIPTORS
Added: trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.cpp 2009-01-25 03:51:12 UTC (rev 845)
@@ -0,0 +1,162 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2008 Caelum team. See Contributors.txt for details.
+
+Caelum 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 3 of the License, or
+(at your option) any later version.
+
+Caelum 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 Caelum. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "CaelumPrecompiled.h"
+#include "CaelumPlugin.h"
+
+template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;
+
+namespace Caelum
+{
+ CaelumPlugin* CaelumPlugin::getSingletonPtr () {
+ return ms_Singleton;
+ }
+
+ CaelumPlugin& CaelumPlugin::getSingleton () {
+ assert (ms_Singleton);
+ return *ms_Singleton;
+ }
+
+ extern "C" void CAELUM_EXPORT dllStartPlugin () {
+ assert (CaelumPlugin::getSingletonPtr () == 0);
+ CaelumPlugin* plugin = new CaelumPlugin();
+ assert (CaelumPlugin::getSingletonPtr () == plugin);
+ Ogre::Root::getSingleton ().installPlugin (CaelumPlugin::getSingletonPtr ());
+ }
+
+ extern "C" void CAELUM_EXPORT dllStopPlugin () {
+ assert (CaelumPlugin::getSingletonPtr () != 0);
+ Ogre::Root::getSingleton ().uninstallPlugin (CaelumPlugin::getSingletonPtr ());
+ delete CaelumPlugin::getSingletonPtr ();
+ assert (CaelumPlugin::getSingletonPtr () == 0);
+ }
+
+#if CAELUM_SCRIPT_SUPPORT
+ CaelumPlugin::CaelumPlugin(): mScriptTranslatorManager(&mTypeDescriptorData)
+#else
+ CaelumPlugin::CaelumPlugin()
+#endif
+ {
+ mIsInstalled = false;
+ }
+
+ CaelumPlugin::~CaelumPlugin() {
+ }
+
+ const Ogre::String CaelumPlugin::CAELUM_PLUGIN_NAME = "Caelum";
+
+ const Ogre::String& CaelumPlugin::getName () const {
+ return CAELUM_PLUGIN_NAME;
+ }
+
+ void CaelumPlugin::install ()
+ {
+ assert(!mIsInstalled && "Already installed");
+
+ Ogre::LogManager::getSingleton ().logMessage("Caelum plugin version " +
+ Ogre::StringConverter::toString (CAELUM_VERSION_MAIN) + "." +
+ Ogre::StringConverter::toString (CAELUM_VERSION_SEC) + "." +
+ Ogre::StringConverter::toString (CAELUM_VERSION_TER) + " "
+ "installed");
+
+#if CAELUM_SCRIPT_SUPPORT
+ Ogre::ScriptCompilerManager::getSingleton ().addTranslatorManager (
+ getScriptTranslatorManager ());
+ Ogre::ResourceGroupManager::getSingleton()._registerResourceManager (
+ getPropScriptResourceManager ()->getResourceType (),
+ getPropScriptResourceManager ());
+
+ getScriptTranslatorManager()->_setPropScriptResourceManager (
+ &mPropScriptResourceManager);
+#endif // CAELUM_SCRIPT_SUPPORT
+
+ mIsInstalled = true;
+ }
+
+ void CaelumPlugin::initialise () {
+ }
+
+ void CaelumPlugin::shutdown () {
+ }
+
+ void CaelumPlugin::uninstall ()
+ {
+ assert(mIsInstalled && "Not installed");
+
+#if CAELUM_SCRIPT_SUPPORT
+ getScriptTranslatorManager()->_setPropScriptResourceManager (0);
+
+ Ogre::ResourceGroupManager::getSingleton ()._unregisterResourceManager (
+ getPropScriptResourceManager ()->getResourceType ());
+ Ogre::ScriptCompilerManager::getSingleton ().removeTranslatorManager (
+ getScriptTranslatorManager ());
+#endif // CAELUM_SCRIPT_SUPPORT
+
+ Ogre::LogManager::getSingleton ().logMessage("Caelum plugin uninstalled");
+
+ mIsInstalled = false;
+ }
+
+#if CAELUM_SCRIPT_SUPPORT
+ void CaelumPlugin::loadCaelumSystemFromScript (
+ CaelumSystem* sys,
+ const Ogre::String& objectName,
+ const Ogre::String& groupName)
+ {
+ assert (sys);
+ assert (this->isInstalled () && "Must install CaelumPlugin before loading scripts");
+
+ // Fetch raw resource ptr. Attempt to support explicit resource groups currently in Ogre trunk.
+#if OGRE_VERSION >= 0x00010700
+ Ogre::ResourcePtr res = getPropScriptResourceManager ()->getByName (objectName, groupName);
+#else
+ Ogre::ResourcePtr res = getPropScriptResourceManager ()->getByName (objectName);
+#endif
+
+ // Check a PropScriptResource was found.
+ PropScriptResource* propRes = static_cast<PropScriptResource*> (res.get ());
+ if (!propRes) {
+ OGRE_EXCEPT (Ogre::Exception::ERR_ITEM_NOT_FOUND,
+ "Could not find caelum_sky_system " + objectName,
+ "CaelumPlugin::loadCaelumSystemFromScript");
+ }
+
+ // Fetch the resource stream. Look in the actual group of the resource!
+ const Ogre::String& scriptFileName = propRes->getOrigin();
+ const Ogre::String& scriptFileGroup = propRes->getGroup();
+ Ogre::DataStreamPtr streamPtr = Ogre::ResourceGroupManager::getSingleton ().openResource (
+ scriptFileName, scriptFileGroup, false);
+
+ // Feed it into the compiler.
+ this->getScriptTranslatorManager()->getCaelumSystemTranslator()->setTranslationTarget (sys, objectName);
+ Ogre::ScriptCompilerManager::getSingleton ().parseScript (streamPtr, Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+ bool found = this->getScriptTranslatorManager()->getCaelumSystemTranslator()->foundTranslationTarget ();
+
+ // This shouldn't normally happen.
+ if (!found) {
+ OGRE_EXCEPT (Ogre::Exception::ERR_ITEM_NOT_FOUND,
+ "Could not find caelum_sky_system " + objectName + " in file " + scriptFileName + " on reparsing. "
+ "Perhaps information in PropScriptResourceManager is out of date?",
+ "CaelumPlugin::loadCaelumSystemFromScript");
+ }
+ this->getScriptTranslatorManager()->getCaelumSystemTranslator()->clearTranslationTarget ();
+ }
+#endif // CAELUM_SCRIPT_SUPPORT
+}
Added: trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.h (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.h 2009-01-25 03:51:12 UTC (rev 845)
@@ -0,0 +1,97 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2008 Caelum team. See Contributors.txt for details.
+
+Caelum 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 3 of the License, or
+(at your option) any later version.
+
+Caelum 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 Caelum. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CAELUM__CAELUM_PLUGIN_H
+#define CAELUM__CAELUM_PLUGIN_H
+
+#include "CaelumPrerequisites.h"
+#include "CaelumScriptTranslator.h"
+#include "TypeDescriptor.h"
+#include "OgrePlugin.h"
+
+namespace Caelum
+{
+ /** Implement an Ogre::Plugin for Caelum.
+ *
+ * Ogre plugins are usually loaded from config files and they register
+ * various stuff in ogre managers. But you can also just link to the
+ * library normally and call install functions manually.
+ */
+ class CAELUM_EXPORT CaelumPlugin: public Ogre::Singleton<CaelumPlugin>, public Ogre::Plugin
+ {
+ public:
+ /// Get reference to singleton instance; or crash if N/A.
+ static CaelumPlugin& getSingleton(void);
+ /// Get pointer to singleton instance; or pointer if N/A.
+ static CaelumPlugin* getSingletonPtr(void);
+
+ CaelumPlugin();
+ ~CaelumPlugin();
+
+ virtual void install ();
+ virtual void initialise ();
+ virtual void shutdown ();
+ virtual void uninstall ();
+
+ static const Ogre::String CAELUM_PLUGIN_NAME;
+ virtual const String& getName () const;
+
+ // Determine if the plugin was installed (if install was called).
+ inline bool isInstalled () const { return mIsInstalled; }
+
+ private:
+ bool mIsInstalled;
+
+#if CAELUM_TYPE_DESCRIPTORS
+ public:
+ /// Get default type descriptor data for caelum components.
+ CaelumDefaultTypeDescriptorData* getTypeDescriptorData () { return &mTypeDescriptorData; }
+
+ private:
+ CaelumDefaultTypeDescriptorData mTypeDescriptorData;
+#endif
+
+#if CAELUM_SCRIPT_SUPPORT
+ public:
+ /** Load CaelumSystem and it's components from a script file.
+ * @param sys Target CaelumSystem.
+ * This is cleared using CaelumSystem::clear before loading.
+ * If scripting data is not found then this is not modified.
+ * @param objectName Name of caelum_sky_system from *.os file.
+ * @param scriptFileGroup The group to search in (unused in Ogre 1.6)
+ */
+ void loadCaelumSystemFromScript (
+ CaelumSystem* sys,
+ const Ogre::String& objectName,
+ const Ogre::String& scriptFileGroup = Ogre::ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME
+ );
+
+ /// @see PropScriptResourceManager
+ PropScriptResourceManager* getPropScriptResourceManager () { return &mPropScriptResourceManager; }
+ CaelumScriptTranslatorManager* getScriptTranslatorManager () { return &mScriptTranslatorManager; }
+
+ private:
+ PropScriptResourceManager mPropScriptResourceManager;
+ CaelumScriptTranslatorManager mScriptTranslatorManager;
+#endif
+ };
+}
+
+#endif // CAELUM__CAELUM_PLUGIN_H
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2009-01-24 05:00:41 UTC (rev 844)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2009-01-25 03:51:12 UTC (rev 845)
@@ -31,21 +31,21 @@
#include <memory>
// Define the dll export qualifier if compiling for Windows
-// #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-// #ifdef CAELUM_LIB
-// #define CAELUM_EXPORT __declspec (dllexport)
-// #else
-// #ifdef __MINGW32__
-// #define CAELUM_EXPORT
-// #else
-// #define CAELUM_EXPORT __declspec (dllimport)
-// #endif
-// #endif
-// #elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-// #define CAELUM_EXPORT __attribute__ ((visibility("default")))
-// #else
+/*#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+ #ifdef CAELUM_LIB
+ #define CAELUM_EXPORT __declspec (dllexport)
+ #else
+ #ifdef __MINGW32__
+ #define CAELUM_EXPORT
+ #else
+ #define CAELUM_EXPORT __declspec (dllimport)
+ #endif
+ #endif
+#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+ #define CAELUM_EXPORT __attribute__ ((visibility("default")))
+#else */
#define CAELUM_EXPORT
-// #endif
+//#endif
// Define the version code
#define CAELUM_VERSION_MAIN 0
@@ -53,6 +53,35 @@
#define CAELUM_VERSION_TER 0
#define CAELUM_VERSION = (CAELUM_VERSION_MAIN << 16) | (CAELUM_VERSION_SEC << 8) | CAELUM_VERSION_TER
+// By default only compile type descriptors for scripting.
+#ifndef CAELUM_TYPE_DESCRIPTORS
+ #if (OGRE_VERSION >= 0x00010600) && OGRE_USE_NEW_COMPILERS
+ #define CAELUM_TYPE_DESCRIPTORS 1
+ #else
+ #define CAELUM_TYPE_DESCRIPTORS 0
+ #endif
+#endif
+
+// Scripting support requires Ogre 1.6
+// Can be also configured on compiler command line
+#ifndef CAELUM_SCRIPT_SUPPORT
+ #if (OGRE_VERSION >= 0x00010600) && OGRE_USE_NEW_COMPILERS
+ #define CAELUM_SCRIPT_SUPPORT 1
+ #else
+ #define CAELUM_SCRIPT_SUPPORT 0
+ #endif
+#else
+ #if !(OGRE_VERSION > 0x00010600)
+ #error "Caelum script support requires Ogre 1.6."
+ #endif
+ #if !(OGRE_USE_NEW_COMPILERS)
+ #error "Caelum script support requires Ogre 1.6 with OGRE_USE_NEW_COMPILERS."
+ #endif
+ #if !(CAELUM_TYPE_DESCRIPTORS)
+ #error "Caelum script support also requires type descriptors."
+ #endif
+#endif
+
/// @file
/** @mainpage
@@ -62,8 +91,11 @@
* Caelum::CaelumSystem class which ties them all together in an easy-to-use
* way.
*
- * For more information see the great %Caelum thread in the ogre forum:
- * http://www.ogre3d.org/phpBB2/viewtopic.php?t=24961&postorder=desc
+ * More information is available on the wiki page:
+ * http://www.ogre3d.org/wiki/index.php/Caelum
+ *
+ * You can discuss and report issues in the forum:
+ * http://www.ogre3d.org/addonforums/viewforum.php?f=21
*/
/** Caelum namespace
@@ -114,6 +146,7 @@
class ImageStarfield;
class PointStarfield;
class CloudSystem;
+ class CaelumSystem;
class FlatCloudLayer;
class PrecipitationController;
class PrecipitationInstance;
@@ -123,4 +156,17 @@
class DepthRenderer;
}
+namespace Ogre {
+ // Write an Ogre::Degree to a stream.
+ //
+ // Ogre::Any requires that the wrapped type can be written to a stream;
+ // otherwise it will fail on instantation. This function was placed here
+ // so it's available everywhere.
+ //
+ // This can't be placed in namespace Caelum.
+ inline std::ostream& operator << (std::ostream& out, Ogre::Degree deg) {
+ return out << deg.valueDegrees();
+ }
+}
+
#endif // CAELUM__CAELUM_PREREQUISITES_H
Added: trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.cpp 2009-01-25 03:51:12 UTC (rev 845)
@@ -0,0 +1,635 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2008 Caelum team. See Contributors.txt for details.
+
+Caelum 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 3 of the License, or
+(at your option) any later version.
+
+Caelum 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 Caelum. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "CaelumPrecompiled.h"
+#include "CaelumPrerequisites.h"
+
+#if CAELUM_SCRIPT_SUPPORT
+
+#include "CaelumScriptTranslator.h"
+#include "CaelumSystem.h"
+#include "CaelumExceptions.h"
+
+using namespace Ogre;
+
+namespace Caelum
+{
+ PropScriptResource::PropScriptResource
+ (
+ Ogre::ResourceManager* creator, const Ogre::String& name, Ogre::ResourceHandle handle,
+ const Ogre::String& group, bool isManual, Ogre::ManualResourceLoader* loader
+ ):
+ Ogre::Resource (creator, name, handle, group, isManual, loader)
+ {
+ //Ogre::LogManager::getSingleton().logMessage(
+ // "PropScriptResource::PropScriptResource");
+ }
+
+ PropScriptResource::~PropScriptResource() {
+ //Ogre::LogManager::getSingleton().logMessage(
+ // "PropScriptResource::~PropScriptResource");
+ }
+
+ PropScriptResourceManager::PropScriptResourceManager() {
+ mLoadOrder = 1000;
+ mResourceType = "PropertyScript";
+ }
+
+ PropScriptResource* PropScriptResourceManager::createImpl(
+ const String& name, ResourceHandle handle, const String& group,
+ bool isManual, ManualResourceLoader* loader, const NameValuePairList* createParams)
+ {
+ //Ogre::LogManager::getSingleton().logMessage(
+ // "PropScriptResourceManager::createImpl");
+ return new PropScriptResource (this, name, handle, group, isManual, loader);
+ }
+
+ TypeDescriptorScriptTranslator::TypeDescriptorScriptTranslator (TypeDescriptor* typeDescriptor):
+ mTypeDescriptor(typeDescriptor)
+ {
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ bool& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 argument");
+ return false;
+ }
+ if (!Ogre::ScriptTranslator::getBoolean(prop->values.front(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid number");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ ColourValue& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 4) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 4 arguments");
+ return false;
+ }
+ if (prop->values.size () < 3) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at least 3 arguments");
+ }
+ if (!getColour(prop->values.begin(), prop->values.end(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->name + " requires a colour argument");
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ float& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 argument");
+ return false;
+ }
+ if (!Ogre::ScriptTranslator::getFloat(prop->values.front(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid number");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ int& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 argument");
+ return false;
+ }
+ if (!Ogre::ScriptTranslator::getInt(prop->values.front(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid integer");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ double& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 argument");
+ return false;
+ }
+ // We do need a string stream here for the extra precision.
+ std::stringstream strStream (std::string(prop->values.front()->getValue()));
+ strStream >> value;
+ if (strStream.fail()) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid number");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ Ogre::Degree& value)
+ {
+ if (prop->values.size () == 0) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 3) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 3 arguments");
+ return false;
+ }
+ // Allow 3 components.
+ float degMinSec[3] = { 0, 0, 0 };
+ int k = 0;
+ for (AbstractNodeList::const_iterator it = prop->values.begin(), endIt = prop->values.end(); it != endIt; ++it, ++k) {
+ if (!Ogre::ScriptTranslator::getFloat(*it, °MinSec[k])) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ (*it)->getValue () + " is not a valid number");
+ return false;
+ }
+ }
+ value = Ogre::Degree(degMinSec[0] + degMinSec[1] / 60.0 + degMinSec[2] / 3600);
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ Ogre::String& value)
+ {
+ if (prop->values.size () == 0) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 arguments");
+ return false;
+ }
+ if (!Ogre::ScriptTranslator::getString(prop->values.front(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid string");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ Ogre::Vector3& value)
+ {
+ if (prop->values.size () == 0) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 3) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 3 arguments");
+ return false;
+ }
+ float floats[3];
+ if (!Ogre::ScriptTranslator::getFloats(prop->values.begin(), prop->values.end(), floats, 3)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ "incorrect vector parameters.");
+ return false;
+ }
+ value.x = floats[0];
+ value.y = floats[1];
+ value.z = floats[2];
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ Ogre::Vector2& value)
+ {
+ if (prop->values.size () == 0) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 2) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 3 arguments");
+ return false;
+ }
+ float floats[2];
+ if (!Ogre::ScriptTranslator::getFloats(prop->values.begin(), prop->values.end(), floats, 2)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ "incorrect vector parameters.");
+ return false;
+ }
+ value.x = floats[0];
+ value.y = floats[1];
+ return true;
+ }
+
+ template<class T>
+ static bool tryHandlePropertyType (
+ ScriptCompiler* compiler, PropertyAbstractNode* propNode,
+ void* targetObject, const ValuePropertyDescriptor* propDesc)
+ {
+ if (propDesc->getValueTypeId () == typeid(T)) {
+ T val;
+ if (TypeDescriptorScriptTranslator::getPropValueOrAddError (compiler, propNode, val)) {
+ propDesc->setValue (targetObject, Ogre::Any(val));
+ }
+ return true;
+ }
+ return false;
+ }
+
+ void TypeDescriptorScriptTranslator::translateProperty (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ void* targetObject,
+ const TypeDescriptor* typeDescriptor)
+ {
+ const ValuePropertyDescriptor* propDesc = typeDescriptor->getPropertyDescriptor (prop->name);
+ if (!propDesc) {
+ compiler->addError (ScriptCompiler::CE_UNEXPECTEDTOKEN, prop->file, prop->line,
+ "property \"" + prop->name + "\" not recognized; missing from type descriptor.");
+ return;
+ }
+ if (!propDesc->canSetValue ()) {
+ compiler->addError (ScriptCompiler::CE_UNEXPECTEDTOKEN, prop->file, prop->line,
+ "property \"" + prop->name + "\" is read-only and can't be set from a script.");
+ return;
+ }
+
+ //LogManager::getSingleton ().logMessage ("TypeDescriptorScriptTranslator::translateProperty"
+ // " name '" + prop->name + "'");
+
+ bool handled = false
+ || tryHandlePropertyType<int> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<float> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<double> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<bool> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::Degree> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::String> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::Vector3> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::Vector2> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::ColourValue> (compiler, prop, targetObject, propDesc);
+
+ if (!handled) {
+ compiler->addError (ScriptCompiler::CE_UNEXPECTEDTOKEN, prop->file, prop->line,
+ "property \"" + prop->name + "\" is found in type descriptor but has "
+ "unsupported type. Mangled typeid is '" + propDesc->getValueTypeId().name() + "'");
+ }
+ }
+
+ void TypeDescriptorScriptTranslator::translate (ScriptCompiler* compiler, const AbstractNodePtr& node)
+ {
+ //LogManager::getSingleton ().logMessage ("TypeDescriptorScriptTranslator::translate begin");
+
+ // Check type descriptor was set.
+ assert (getTypeDescriptor () && "Type descriptor must be set before we can translate.");
+
+ // Fetch target object.
+ ObjectAbstractNode *objNode = reinterpret_cast<ObjectAbstractNode*>(node.get());
+ assert (!objNode->context.isEmpty ());
+ void* targetObject = any_cast<void*> (objNode->context);
+ assert (targetObject);
+
+ for (AbstractNodeList::iterator i = objNode->children.begin(); i != objNode->children.end(); ++i)
+ {
+ if ((*i)->type == ANT_PROPERTY)
+ {
+ PropertyAbstractNode *prop = reinterpret_cast<PropertyAbstractNode*>((*i).get());
+
+ translateProperty (compiler, prop, targetObject, getTypeDescriptor());
+ }
+ else if((*i)->type == ANT_OBJECT)
+ {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, (*i)->file, (*i)->line);
+ }
+ }
+
+ //LogManager::getSingleton ().logMessage ("TypeDescriptorScriptTranslator::translate end");
+ }
+
+ CaelumSystemScriptTranslator::CaelumSystemScriptTranslator ():
+ mResourceManager(false),
+ mTranslationTarget(0),
+ mTranslationTargetFound(false),
+ mTypeDescriptor(0)
+ {
+ }
+
+ void CaelumSystemScriptTranslator::setTranslationTarget (CaelumSystem* target, const Ogre::String& name)
+ {
+ assert (target != 0);
+ this->mTranslationTarget = target;
+ this->mTranslationTargetName = name;
+ this->mTranslationTargetFound = false;
+ }
+
+ void CaelumSystemScriptTranslator::clearTranslationTarget () {
+ this->mTranslationTarget = 0;
+ this->mTranslationTargetName.clear();
+ this->mTranslationTargetFound = false;
+ }
+
+ void CaelumSystemScriptTranslator::translate (ScriptCompiler* compiler, const AbstractNodePtr& node)
+ {
+ //LogManager::getSingleton ().logMessage ("CaelumSystemScriptTranslator::translate begin");
+
+ ObjectAbstractNode *objNode = reinterpret_cast<ObjectAbstractNode*>(node.get());
+
+ CaelumSystem* sys = 0;
+
+ // Check for a translation target.
+ if (this->getTran...
[truncated message content] |
|
From: <and...@us...> - 2009-01-25 10:08:17
|
Revision: 846
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=846&view=rev
Author: andy_miller
Date: 2009-01-25 10:08:11 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Updated to latest QuickGui
Needed to add GIMPACT library to OgreBullet build
Update to latest OgreBullet
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
trunk/python-ogre/ThirdParty/forests/ImpostorPage.h
trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp
trunk/python-ogre/ThirdParty/forests/PagedGeometry.h
trunk/python-ogre/ThirdParty/forests/TreeLoader2D.cpp
trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
trunk/python-ogre/ThirdParty/forests/TreeLoader3D.cpp
trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisions.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObject.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObject.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrecompiled.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamics.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsObjectState.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrecompiled.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRigidBody.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRigidBody.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBaseDesc.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBrush.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBrush.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComponentWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComponentWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIContainerWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIContainerWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEventTypes.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIException.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/QuickGUIHScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuPanel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIModalWindow.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIModalWindow.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPoint.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPoint.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRoot.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRoot.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptDefinition.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptDefinition.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptReader.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptReader.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptWriter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptWriter.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/QuickGUISheet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISize.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISize.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinDefinitionManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinDefinitionManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinElement.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinType.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinTypeManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinTypeManager.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/QuickGUITabControl.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITabControl.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/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/QuickGUITextCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextCursor.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextLine.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextLine.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimer.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimer.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimerManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimerManager.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/QuickGUIToolBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBarItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBarItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.h
trunk/python-ogre/code_generators/ogreforests/python_forests_sizeof.h
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
trunk/python-ogre/code_generators/quickgui/python_quickgui_sizeof.h
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsoleEnums.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsoleInputHandler.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIFactory.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIFactoryManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIFactoryManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheetManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheetManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeView.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeView.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetFactory.h
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetDescFactoryManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetDescFactoryManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetFactoryManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetFactoryManager.h
Modified: trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -32,8 +32,14 @@
#include <OgreHardwareBuffer.h>
#include <OgreMaterialManager.h>
#include <OgreMaterial.h>
+#include <string>
using namespace Ogre;
+#ifndef max
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
+
namespace Forests {
//-------------------------------------------------------------------------------------
@@ -350,7 +356,7 @@
//Calculate camera distance
Vector3 camVec = _convertToLocal(cam->getDerivedPosition()) - center;
Real centerDistanceSquared = camVec.squaredLength();
- minDistanceSquared = std::max(0.0f, centerDistanceSquared - (radius * radius));
+ minDistanceSquared = max(0.0f, centerDistanceSquared - (radius * radius));
//Note: centerDistanceSquared measures the distance between the camera and the center of the GeomBatch,
//while minDistanceSquared measures the closest distance between the camera and the closest edge of the
//geometry's bounding sphere.
@@ -380,7 +386,7 @@
// Material must always exist
Material *origMat = ((MaterialPtr)MaterialManager::getSingleton().getByName(ent->getMaterialName())).getPointer();
if (origMat) {
- material = MaterialManager::getSingleton().getByName(getMaterialClone(*origMat)->getName());
+ material = MaterialManager::getSingleton().getByName(getMaterialClone(*origMat)->getName());
} else {
MaterialManager::ResourceCreateOrRetrieveResult result = MaterialManager::getSingleton().createOrRetrieve("PagedGeometry_Batched_Material", "General");
if (result.first.isNull()) {
@@ -762,7 +768,7 @@
if (built){
//Update material technique based on camera distance
assert(!material.isNull());
- bestTechnique = material->getBestTechnique(material->getLodIndexSquaredDepth(parent->minDistanceSquared));
+ bestTechnique = material->getBestTechnique(material->getLodIndex(parent->minDistanceSquared * parent->minDistanceSquared));
//Add to render queue
queue->addRenderable(this, group);
Modified: trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -50,6 +50,7 @@
//Set up a single instance of a scene node which will be used when rendering impostor textures
geom->getSceneNode()->createChildSceneNode("ImpostorPage::renderNode");
geom->getSceneNode()->createChildSceneNode("ImpostorPage::cameraNode");
+ ResourceGroupManager::getSingleton().createResourceGroup("Impostors");
}
}
@@ -65,6 +66,7 @@
if (--selfInstances == 0){
sceneMgr->destroySceneNode("ImpostorPage::renderNode");
sceneMgr->destroySceneNode("ImpostorPage::cameraNode");
+ ResourceGroupManager::getSingleton().destroyResourceGroup("Impostors");
}
}
@@ -251,20 +253,29 @@
void ImpostorBatch::setAngle(float pitchDeg, float yawDeg)
{
//Calculate pitch material index
- Ogre::uint16 newPitchIndex;
- if (pitchDeg > 0){
- newPitchIndex = static_cast<Ogre::uint16>(IMPOSTOR_PITCH_ANGLES * (pitchDeg / 67.5f));
+ int newPitchIndex;
+#ifdef IMPOSTOR_RENDER_ABOVE_ONLY
+ if (pitchDeg > 0) {
+ float maxPitchIndexDeg = (90.0f * (IMPOSTOR_PITCH_ANGLES-1)) / IMPOSTOR_PITCH_ANGLES;
+ newPitchIndex = (int)(IMPOSTOR_PITCH_ANGLES * (pitchDeg / maxPitchIndexDeg));
if (newPitchIndex > IMPOSTOR_PITCH_ANGLES-1) newPitchIndex = IMPOSTOR_PITCH_ANGLES-1;
} else {
newPitchIndex = 0;
}
+#else
+ float minPitchIndexDeg = -90.0f;
+ float maxPitchIndexDeg = ((180.0f * (IMPOSTOR_PITCH_ANGLES-1)) / IMPOSTOR_PITCH_ANGLES) - 90.0f;
+ newPitchIndex = (int)(IMPOSTOR_PITCH_ANGLES * ((pitchDeg - minPitchIndexDeg) / (maxPitchIndexDeg - minPitchIndexDeg)));
+ if (newPitchIndex > IMPOSTOR_PITCH_ANGLES-1) newPitchIndex = IMPOSTOR_PITCH_ANGLES-1;
+ if (newPitchIndex < 0) newPitchIndex = 0;
+#endif
//Calculate yaw material index
- Ogre::uint16 newYawIndex;
- if (yawDeg > 0){
- newYawIndex = static_cast<Ogre::uint16>(IMPOSTOR_YAW_ANGLES * (yawDeg / 360.0f) + 0.5f) % IMPOSTOR_YAW_ANGLES;
+ int newYawIndex;
+ if (yawDeg > 0) {
+ newYawIndex = (int)(IMPOSTOR_YAW_ANGLES * (yawDeg / 360.0f) + 0.5f) % IMPOSTOR_YAW_ANGLES;
} else {
- newYawIndex = static_cast<Ogre::uint16>(IMPOSTOR_YAW_ANGLES + IMPOSTOR_YAW_ANGLES * (yawDeg / 360.0f) + 0.5f) % IMPOSTOR_YAW_ANGLES;
+ newYawIndex = (int)(IMPOSTOR_YAW_ANGLES + IMPOSTOR_YAW_ANGLES * (yawDeg / 360.0f) + 0.5f) % IMPOSTOR_YAW_ANGLES;
}
//Change materials if necessary
@@ -292,6 +303,10 @@
for (uint32 i = 0; i < entity->getNumSubEntities(); ++i){
entityKey << "-" << entity->getSubEntity(i)->getMaterialName();
}
+ entityKey << "-" << IMPOSTOR_YAW_ANGLES << "_" << IMPOSTOR_PITCH_ANGLES;
+#ifdef IMPOSTOR_RENDER_ABOVE_ONLY
+ entityKey << "_RAO";
+#endif
return entityKey.str();
}
@@ -381,7 +396,6 @@
Material *m = material[i][o].getPointer();
Pass *p = m->getTechnique(0)->getPass(0);
-// int x = p->getNumTextureUnitStates();
TextureUnitState *t = p->getTextureUnitState(0);
t->setTextureName(texture->getName());
@@ -437,7 +451,7 @@
void ImpostorTexture::renderTextures(bool force)
{
-#if IMPOSTOR_FILE_SAVE
+#ifdef IMPOSTOR_FILE_SAVE
TexturePtr renderTexture;
#else
TexturePtr renderTexture(texture);
@@ -521,8 +535,8 @@
entity->setRenderingDistance(0);
bool needsRegen = true;
-#if IMPOSTOR_FILE_SAVE
- //Calculate the filename used to uniquely identity this render
+#ifdef IMPOSTOR_FILE_SAVE
+ //Calculate the filename hash used to uniquely identity this render
String strKey = entityKey;
char key[32] = {0};
uint32 i = 0;
@@ -560,17 +574,19 @@
const float xDivFactor = 1.0f / IMPOSTOR_YAW_ANGLES;
const float yDivFactor = 1.0f / IMPOSTOR_PITCH_ANGLES;
for (int o = 0; o < IMPOSTOR_PITCH_ANGLES; ++o){ //4 pitch angle renders
+#ifdef IMPOSTOR_RENDER_ABOVE_ONLY
Radian pitch = Degree((90.0f * o) * yDivFactor); //0, 22.5, 45, 67.5
+#else
+ Radian pitch = Degree((180.0f * o) * yDivFactor - 90.0f);
+#endif
for (int i = 0; i < IMPOSTOR_YAW_ANGLES; ++i){ //8 yaw angle renders
Radian yaw = Degree((360.0f * i) * xDivFactor); //0, 45, 90, 135, 180, 225, 270, 315
//Position camera
- renderCamera->setPosition(0, 0, 0);
- renderCamera->setOrientation(Quaternion::IDENTITY);
- renderCamera->pitch(-pitch);
- renderCamera->yaw(yaw);
- renderCamera->moveRelative(Vector3(0, 0, objDist));
+ camNode->setPosition(0, 0, 0);
+ camNode->setOrientation(Quaternion(yaw, Vector3::UNIT_Y) * Quaternion(-pitch, Vector3::UNIT_X));
+ camNode->translate(Vector3(0, 0, objDist), Node::TS_LOCAL);
//Render the impostor
renderViewport->setDimensions((float)(i) * xDivFactor, (float)(o) * yDivFactor, xDivFactor, yDivFactor);
@@ -578,7 +594,7 @@
}
}
-#if IMPOSTOR_FILE_SAVE
+#ifdef IMPOSTOR_FILE_SAVE
//Save RTT to file
renderTarget->writeContentsToFile(fileNamePNG);
@@ -612,7 +628,7 @@
if (oldSceneNode) {
oldSceneNode->attachObject(entity);
}
-#if IMPOSTOR_FILE_SAVE
+#ifdef IMPOSTOR_FILE_SAVE
//Delete RTT texture
assert(!renderTexture.isNull());
String texName2(renderTexture->getName());
Modified: trunk/python-ogre/ThirdParty/forests/ImpostorPage.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/ImpostorPage.h 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/ImpostorPage.h 2009-01-25 10:08:11 UTC (rev 846)
@@ -23,11 +23,24 @@
#include <OgreTextureManager.h>
#include <OgreRenderTexture.h>
+//The number of angle increments around the yaw axis to render impostor "snapshots" of trees
+#define IMPOSTOR_YAW_ANGLES 8
-#define IMPOSTOR_YAW_ANGLES 8
+//The number of angle increments around the pitch axis to render impostor "snapshots" of trees
#define IMPOSTOR_PITCH_ANGLES 4
-//If set to 1, imposter textures will be read and saved to disc; if set to 0 they will stay in memory and need to be regenerated each time the application is run.
-#define IMPOSTOR_FILE_SAVE 1
+
+//When IMPOSTOR_RENDER_ABOVE_ONLY is defined, impostor images will only be rendered from angles around and
+//above entities. If this is disabled, bottom views of the entities will be rendered to the impostor atlas
+//and therefore allow those angles to be viewed from a distance. However, this requires the IMPOSTOR_PITCH_ANGLES
+//to be doubled to maintain an equal level of impostor angle correctness compared to when impostors are rendered
+//from above only.
+#define IMPOSTOR_RENDER_ABOVE_ONLY
+
+//When IMPOSTOR_FILE_SAVE is defined, impostor textures will be read and saved to disc; if not, they will stay
+//in memory and need to be regenerated each time the application is run (remove or comment out the line below if this
+//is desired)
+#define IMPOSTOR_FILE_SAVE
+
namespace Forests {
class ImpostorBatch;
Modified: trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -62,6 +62,7 @@
//Misc.
pageLoader = NULL;
+ geometryAllowedVisible = true;
}
PagedGeometry::~PagedGeometry()
@@ -349,27 +350,26 @@
managerList.push_back(mgr);
}
-void PagedGeometry::setCustomParam( string entity, string paramName, float paramValue )
+void PagedGeometry::setCustomParam(string entity, string paramName, float paramValue)
{
- setCustomParam( entity + "." + paramName, paramValue );
+ setCustomParam(entity + "." + paramName, paramValue);
}
-void PagedGeometry::setCustomParam( string paramName, float paramValue )
+void PagedGeometry::setCustomParam(string paramName, float paramValue)
{
- customParam[ paramName ] = paramValue;
+ customParam[paramName] = paramValue;
}
-float PagedGeometry::getCustomParam( string entity, string paramName, float defaultParamValue ) const
+float PagedGeometry::getCustomParam(string entity, string paramName, float defaultParamValue) const
{
- return getCustomParam( entity + "." + paramName, defaultParamValue );;
+ return getCustomParam(entity + "." + paramName, defaultParamValue);
}
-float PagedGeometry::getCustomParam( string paramName, float defaultParamValue ) const
+float PagedGeometry::getCustomParam(string paramName, float defaultParamValue) const
{
map<string, float>::const_iterator it;
- it = customParam.find( paramName );
- if ( it != customParam.end() )
- {
+ it = customParam.find(paramName);
+ if (it != customParam.end()) {
float x = it->second;
return x;
}
@@ -631,6 +631,9 @@
//Non-fade visibility
if (distSq >= nearDistSq && distSq < farDistSq)
visible = true;
+ //Hide all?
+ if (!mainGeom->getVisible())
+ visible = false;
//Update visibility
if (visible){
Modified: trunk/python-ogre/ThirdParty/forests/PagedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PagedGeometry.h 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/PagedGeometry.h 2009-01-25 10:08:11 UTC (rev 846)
@@ -633,6 +633,23 @@
*/
void resetPreloadedGeometry();
+ /**
+ \brief Hides or unhides all geometry managed by this PagedGeometry instance
+ \params visible Whether or not you want this PagedGeometry to be visible
+
+ By default everything is visible. This can be used to hide an entire PagedGeometry
+ "group" of geometry if desired.
+ */
+ void setVisible(bool visible) { geometryAllowedVisible = visible; }
+
+ /**
+ \brief Returns whether or not geometry managed by this PagedGeometry instance is visible
+
+ By default, everything will be visible of course. This function simply returns the
+ visible/invisible state as set by the setVisible() command.
+ */
+ bool getVisible() { return geometryAllowedVisible; }
+
/*
\brief Immediately loads visible geometry.
\param maxTime The maximum amount of time (in milliseconds) which cacheGeometry()
@@ -719,34 +736,36 @@
//Internal function - do not use
void _addDetailLevel(GeometryPageManager *mgr, Ogre::Real maxRange, Ogre::Real transitionLength);
- Ogre::SceneManager* sceneMgr;
- Ogre::SceneNode* rootNode; //PagedGeometry's own "root" node
+ Ogre::SceneManager *sceneMgr;
+ Ogre::SceneNode *rootNode; //PagedGeometry's own "root" node
+ bool geometryAllowedVisible; //If set to false, all geometry managed by this PagedGeometry is hidden
+
#ifdef PAGEDGEOMETRY_ALTERNATE_COORDSYSTEM
- Ogre::Quaternion coordinateSystemQuat; //The orientation of rootNode
+ Ogre::Quaternion coordinateSystemQuat; //The orientation of rootNode
#endif
//Camera data
- Ogre::Camera* sceneCam;
- Ogre::Vector3 oldCamPos;
+ Ogre::Camera *sceneCam;
+ Ogre::Vector3 oldCamPos;
- Ogre::Camera* lastSceneCam;
- Ogre::Vector3 lastOldCamPos;
+ Ogre::Camera *lastSceneCam;
+ Ogre::Vector3 lastOldCamPos;
//This list keeps track of all the GeometryPageManager's added with addPageManager()
- std::list<GeometryPageManager *> managerList;
+ std::list<GeometryPageManager*> managerList;
//The assigned PageLoader used to load entities
- PageLoader* pageLoader;
+ PageLoader *pageLoader;
//The bounds and page size
- TBounds m_bounds;
+ TBounds m_bounds;
//The page size
- Ogre::Real pageSize;
+ Ogre::Real pageSize;
//Time-related data
- Ogre::Timer timer;
- unsigned long lastTime;
+ Ogre::Timer timer;
+ unsigned long lastTime;
private:
std::map<std::string, float> customParam;
@@ -897,7 +916,7 @@
Do not leave any remains of the entities in memory after this function is called.
One of the advantages of using paged geometry is that you can have near-infinite
game worlds, which would normally exceed a computer's RAM capacity. This advantage
- would completely dissappear if you did not clean up properly when the page manager
+ would completely disappear if you did not clean up properly when the page manager
calls this function.
*/
virtual void removeEntities() = 0;
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader2D.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader2D.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader2D.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -143,7 +143,7 @@
#else
void
#endif
-TreeLoader2D::deleteTrees(const Ogre::Vector3 &position, Real radius, Entity *type)
+TreeLoader2D::deleteTrees(const Ogre::Vector3 &position, Ogre::Real radius, Entity *type)
{
//First convert the coordinate to PagedGeometry's local system
#ifdef PAGEDGEOMETRY_ALTERNATE_COORDSYSTEM
@@ -504,6 +504,13 @@
{
TreeIterator2D::trees = trees;
+ //Test if the GridList has anything in it
+ if (trees->pageGridList.empty()) {
+ // If not, set hasMore to false and return.
+ hasMore = false;
+ return;
+ }
+
//Setup iterators
currentGrid = trees->pageGridList.begin();
currentX = 0; currentZ = 0;
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h 2009-01-25 10:08:11 UTC (rev 846)
@@ -92,7 +92,7 @@
#else
void
#endif
- deleteTrees(const Ogre::Vector3 &position, float radius = 0.001f, Ogre::Entity *type = NULL);
+ deleteTrees(const Ogre::Vector3 &position, Ogre::Real radius = 0.001f, Ogre::Entity *type = NULL);
/** \brief Deletes trees within a certain rectangular area.
\param area The area where trees are to be deleted
@@ -162,6 +162,8 @@
to this TreeLoader fairly efficiently.
\see The TreeIterator class documentation for more info.
+ \warning Be sure to test TreeIterator3D::hasMoreElements() before calling other members of the
+ TreeIterator3D class.
*/
TreeIterator2D getTrees();
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader3D.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader3D.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader3D.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -135,7 +135,7 @@
#else
void
#endif
-TreeLoader3D::deleteTrees(const Ogre::Vector3 &position, Real radius, Entity *type)
+TreeLoader3D::deleteTrees(const Vector3 &position, Real radius, Entity *type)
{
//First convert the coordinate to PagedGeometry's local system
#ifdef PAGEDGEOMETRY_ALTERNATE_COORDSYSTEM
@@ -488,6 +488,13 @@
{
TreeIterator3D::trees = trees;
+ //Test if the GridList has anything in it
+ if (trees->pageGridList.empty()) {
+ // If not, set hasMore to false and return.
+ hasMore = false;
+ return;
+ }
+
//Setup iterators
currentGrid = trees->pageGridList.begin();
currentX = 0; currentZ = 0;
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h 2009-01-25 10:08:11 UTC (rev 846)
@@ -72,7 +72,7 @@
#else
void
#endif
- deleteTrees(const Ogre::Vector3 &position, float radius, Ogre::Entity *type = NULL);
+ deleteTrees(const Ogre::Vector3 &position, Ogre::Real radius, Ogre::Entity *type = NULL);
#ifdef PAGEDGEOMETRY_USER_DATA
/** \brief Find trees within a certain radius of the given coordinates.
@@ -105,7 +105,8 @@
to this TreeLoader3D fairly efficiently.
\see The TreeIterator class documentation for more info.
- */
+ \warning Be sure to test TreeIterator3D::hasMoreElements() before calling other members of the
+ TreeIterator3D class. */
TreeIterator3D getTrees();
/** \brief Sets the color map used to color trees
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -1,650 +1,650 @@
-/***************************************************************************
-
-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.
------------------------------------------------------------------------------
-*/
-
-
-#include "OgreBulletCollisions.h"
-
-#include "Ogre.h"
-#include "OgreFontManager.h"
-
-#include "Debug/OgreBulletCollisionsDebugContact.h"
-#include "OgreBulletCollisionsShape.h"
-#include "OgreBulletCollisionsObject.h"
-#include "OgreBulletCollisionsWorld.h"
-
-using namespace Ogre;
-
-#define POS_TEX_BINDING 0
-#define COLOUR_BINDING 1
-
-namespace OgreBulletCollisions
-{
- //------------------------------------------------------------------------------------------------
- DebugContact::DebugContact(const String &name, CollisionsWorld *world) :
- _name(name),
- _world(world),
- _enabled(false)
- {
- // scene node
- _node = _world->getSceneManager()->getRootSceneNode ()->createChildSceneNode ();
-
- // sphere attach to contact point
- _point = _world->getSceneManager()->createEntity(name + String("_debug_point"), "sphere.mesh");
- _point_node = _node->createChildSceneNode ();
- _point_node->attachObject (_point);
- _point_node->setScale(0.001, 0.001, 0.001);
-
- // normal direction debug
- _normal = new DebugNormal();
- _node->attachObject (_normal);
-
- // text info on contact
- _text = new DebugContactText(name + String("_debug_text"), _node->createChildSceneNode ());
- _text->setPosition (Vector3(0,5,0));
- _text->setCaption ("-");
- _text->setVisible (false);
-
- _node->setVisible (false);
- }
- //------------------------------------------------------------------------------------------------
- DebugContact::~DebugContact()
- {
- delete _text;
-
- _point_node->detachObject (_point->getName ());
- _node->detachObject (_normal->getName ());
-
- _world->getSceneManager()->destroyEntity (_point->getName ());
-
- _node->detachAllObjects ();
- _node->removeAndDestroyAllChildren ();
-
- delete _normal;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContact::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
- {
- _node->setPosition (pt);
-
- _point_node->setPosition (depth * normal);
-
- //String contactLabel("p: ");
- //contactLabel = contactLabel + StringConverter::toString(contact->getPosition());
- //contactLabel = contactLabel + ", n: ";
- //contactLabel = contactLabel + StringConverter::toString(contact->getNormal());
- //_text->setCaption (contactLabel);
- //_text->setVisible (false);
-
- //_text->setPosition (contact->getPosition () + Vector3(0,5,0));
-
- _normal->update (normal, pt, depth);
- }
- //------------------------------------------------------------------------------------------------
- bool DebugContact::isEnabled () const
- {
- return _enabled;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContact::setEnabled (bool enable)
- {
- _enabled = enable;
- _node->setVisible (_enabled);
- };
- //------------------------------------------------------------------------------------------------
- void DebugNormal::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
- {
- DebugLines::clear ();
- // set normal following contact normal
- //contact->_normal
- //contact->_position
- DebugLines::addLine (Vector3::ZERO,
- 5*normal);
- DebugLines::draw ();
- }
- //------------------------------------------------------------------------------------------------
- DebugContactText::DebugContactText(const String &name,
- SceneNode *node,
- const String &caption,
- const String &fontName,
- int charHeight,
- const ColourValue &color)
- : mpCam(NULL)
- , mpWin(NULL)
- , mpFont(NULL)
- , mName(name)
- , mCaption(caption)
- , mFontName(fontName)
- , mCharHeight(charHeight)
- , mColor(color)
- , mType("DebugContact")
- , mTimeUntilNextToggle(0)
- , mSpaceWidth(0)
- , mUpdateColors(true)
- , mOnTop(false)
- , mHorizontalAlignment(H_LEFT)
- , mVerticalAlignment(V_BELOW)
- , mAdditionalHeight(0.0)
- , mNode(node)
-
- {
- if (name.empty())
- Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without name", "DebugContact::DebugContact");
-//
-// if (caption.empty())
-// Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without caption", "DebugContact::DebugContact");
-
- mRenderOp.vertexData = NULL;
- this->setFontName(mFontName);
- //this->_setupGeometry();
- mNode->attachObject(this);
- }
- //------------------------------------------------------------------------------------------------
- DebugContactText::~DebugContactText()
- {
- mNode->detachObject(this->getName());
- if (mRenderOp.vertexData)
- delete mRenderOp.vertexData;
- }
-#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
- void DebugContactText::visitRenderables(Renderable::Visitor* visitor,
- bool debugRenderables)
- {
- visitor->visit(this, 0, false);
- }
-#endif
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setPosition(const Vector3 &pos)
- {
- mNode->setPosition (pos);
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setFontName(const String &fontName)
- {
- if((Ogre::MaterialManager::getSingletonPtr()->resourceExists(mName + "Material")))
- {
- Ogre::MaterialManager::getSingleton().remove(mName + "Material");
- }
-
- if (mFontName != fontName || mpMaterial.isNull() || !mpFont)
- {
- mFontName = fontName;
- mpFont = (Font *)FontManager::getSingleton().getByName(mFontName).getPointer();
- if (!mpFont)
- Exception(Exception::ERR_ITEM_NOT_FOUND, "Could not find font " + fontName, "DebugContact::setFontName");
-
- mpFont->load();
- if (!mpMaterial.isNull())
- {
- MaterialManager::getSingletonPtr()->remove(mpMaterial->getName());
- mpMaterial.setNull();
- }
-
- mpMaterial = mpFont->getMaterial()->clone(mName + "Material");
- if (!mpMaterial->isLoaded())
- mpMaterial->load();
-
- mpMaterial->setDepthCheckEnabled(!mOnTop);
- //mpMaterial->setDepthBias(!mOnTop);
- mpMaterial->setDepthBias(0,!mOnTop);
- mpMaterial->setDepthWriteEnabled(mOnTop);
- mpMaterial->setLightingEnabled(false);
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setCaption(const String &caption)
- {
- if (caption != mCaption)
- {
- mCaption = caption;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setColor(const ColourValue &color)
- {
- if (color != mColor)
- {
- mColor = color;
- mUpdateColors = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setCharacterHeight(unsigned int height)
- {
- if (height != mCharHeight)
- {
- mCharHeight = height;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setSpaceWidth(unsigned int width)
- {
- if (width != mSpaceWidth)
- {
- mSpaceWidth = width;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setTextAlignment(const HorizontalAlignment& horizontalAlignment, const VerticalAlignment& verticalAlignment)
- {
- if(mHorizontalAlignment != horizontalAlignment)
- {
- mHorizontalAlignment = horizontalAlignment;
- mNeedUpdate = true;
- }
- if(mVerticalAlignment != verticalAlignment)
- {
- mVerticalAlignment = verticalAlignment;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setAdditionalHeight( Real height )
- {
- if( mAdditionalHeight != height )
- {
- mAdditionalHeight = height;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::showOnTop(bool show)
- {
- if( mOnTop != show && !mpMaterial.isNull() )
- {
- mOnTop = show;
- mpMaterial->setDepthBias(0,!mOnTop);
- mpMaterial->setDepthCheckEnabled(!mOnTop);
- mpMaterial->setDepthWriteEnabled(mOnTop);
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_setupGeometry()
- {
- assert(mpFont);
- assert(!mpMaterial.isNull());
-
- unsigned int vertexCount = static_cast<unsigned int>(mCaption.size() * 6);
-
- if (mRenderOp.vertexData)
- {
- // Removed this test as it causes problems when replacing a caption
- // of the same size: replacing "Hello" with "hello"
- // as well as when changing the text alignment
- //if (mRenderOp.vertexData->vertexCount != vertexCount)
- {
- delete mRenderOp.vertexData;
- mRenderOp.vertexData = NULL;
- mUpdateColors = true;
- }
- }
-
- if (!mRenderOp.vertexData)
- mRenderOp.vertexData = new VertexData();
-
- mRenderOp.indexData = 0;
- mRenderOp.vertexData->vertexStart = 0;
- mRenderOp.vertexData->vertexCount = vertexCount;
- mRenderOp.operationType = RenderOperation::OT_TRIANGLE_LIST;
- mRenderOp.useIndexes = false;
-
- VertexDeclaration *decl = mRenderOp.vertexData->vertexDeclaration;
- VertexBufferBinding *bind = mRenderOp.vertexData->vertexBufferBinding;
- size_t offset = 0;
-
- // create/bind positions/tex.ccord. buffer
- if (!decl->findElementBySemantic(VES_POSITION))
- decl->addElement(POS_TEX_BINDING, offset, VET_FLOAT3, VES_POSITION);
-
- offset += VertexElement::getTypeSize(VET_FLOAT3);
-
- if (!decl->findElementBySemantic(VES_TEXTURE_COORDINATES))
- decl->addElement(POS_TEX_BINDING, offset, Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES, 0);
-
- HardwareVertexBufferSharedPtr ptbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(POS_TEX_BINDING),
- mRenderOp.vertexData->vertexCount,
- HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
- bind->setBinding(POS_TEX_BINDING, ptbuf);
-
- // Colours - store these in a separate buffer because they change less often
- if (!decl->findElementBySemantic(VES_DIFFUSE))
- decl->addElement(COLOUR_BINDING, 0, VET_COLOUR, VES_DIFFUSE);
-
- HardwareVertexBufferSharedPtr cbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(COLOUR_BINDING),
- mRenderOp.vertexData->vertexCount,
- HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
- bind->setBinding(COLOUR_BINDING, cbuf);
-
- size_t charlen = mCaption.size();
- Real *pPCBuff = static_cast<Real*>(ptbuf->lock(HardwareBuffer::HBL_DISCARD));
-
- float largestWidth = 0;
- float left = 0 * 2.0 - 1.0;
- float top = -((0 * 2.0) - 1.0);
-
- // Derive space width from a capital A
- if (mSpaceWidth == 0)
- mSpaceWidth = mpFont->getGlyphAspectRatio('A') * mCharHeight * 2.0;
-
- // for calculation of AABB
- Ogre::Vector3 min, max, currPos;
- Ogre::Real maxSquaredRadius;
- bool first = true;
-
- // Use iterator
- String::iterator i, iend;
- iend = mCaption.end();
- bool newLine = true;
- Real len = 0.0f;
-
- if(mVerticalAlignment == DebugContactText::V_ABOVE)
- {
- // Raise the first line of the caption
- top += mCharHeight;
- for (i = mCaption.begin(); i != iend; ++i)
- {
- if (*i == '\n')
- top += mCharHeight * 2.0;
- }
- }
-
- for (i = mCaption.begin(); i != iend; ++i)
- {
- if (newLine)
- {
- len = 0.0f;
- for (String::iterator j = i; j != iend && *j != '\n'; j++)
- {
- if (*j == ' ')
- len += mSpaceWidth;
- else
- len += mpFont->getGlyphAspectRatio(*j) * mCharHeight * 2.0;
- }
- newLine = false;
- }
-
- if (*i == '\n')
- {
- left = 0 * 2.0 - 1.0;
- top -= mCharHeight * 2.0;
- newLine = true;
- continue;
- }
-
- if (*i == ' ')
- {
- // Just leave a gap, no tris
- left += mSpaceWidth;
- // Also reduce tri count
- mRenderOp.vertexData->vertexCount -= 6;
- continue;
- }
-
- Real horiz_height = mpFont->getGlyphAspectRatio(*i);
-
- //mpFont->getGlyphTexCoords(*i, u1, v1, u2, v2);
- const Font::UVRect &uvRect = mpFont->getGlyphTexCoords(*i);
- const Real u1 = uvRect.left;
- const Real u2 = uvRect.right;
- const Real v1 = uvRect.top;
- const Real v2 = uvRect.bottom;
-
- // each vert is (x, y, z, u, v)
- //-------------------------------------------------------------------------------------
- // First tri
- //
- // Upper left
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u1;
- *pPCBuff++ = v1;
-
- // Deal with bounds
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- currPos = Ogre::Vector3(left, top, -1.0);
- else
- currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
- if (first)
- {
- min = max = currPos;
- maxSquaredRadius = currPos.squaredLength();
- first = false;
- }
- else
- {
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
- }
-
- top -= mCharHeight * 2.0;
-
- // Bottom left
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u1;
- *pPCBuff++ = v2;
-
- // Deal with bounds
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- currPos = Ogre::Vector3(left, top, -1.0);
- else
- currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- top += mCharHeight * 2.0;
- left += horiz_height * mCharHeight * 2.0;
-
- // Top right
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u2;
- *pPCBuff++ = v1;
- //-------------------------------------------------------------------------------------
-
- // Deal with bounds
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- currPos = Ogre::Vector3(left, top, -1.0);
- else
- currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- //-------------------------------------------------------------------------------------
- // Second tri
- //
- // Top right (again)
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u2;
- *pPCBuff++ = v1;
-
- currPos = Ogre::Vector3(left, top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- top -= mCharHeight * 2.0;
- left -= horiz_height * mCharHeight * 2.0;
-
- // Bottom left (again)
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u1;
- *pPCBuff++ = v2;
-
- currPos = Ogre::Vector3(left, top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- left += horiz_height * mCharHeight * 2.0;
-
- // Bottom right
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u2;
- *pPCBuff++ = v2;
- //-------------------------------------------------------------------------------------
-
- currPos = Ogre::Vector3(left, top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- // Go back up with top
- top += mCharHeight * 2.0;
-
- float currentWidth = (left + 1)/2 - 0;
- if (currentWidth > largestWidth)
- largestWidth = currentWidth;
- }
-
- // Unlock vertex buffer
- ptbuf->unlock();
-
- // update AABB/Sphere radius
- mAABB = Ogre::AxisAlignedBox(min, max);
- mRadius = Ogre::Math::Sqrt(maxSquaredRadius);
-
- if (mUpdateColors)
- this->_updateColors();
-
- mNeedUpdate = false;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_updateColors(void)
- {
- assert(mpFont);
- assert(!mpMaterial.isNull());
-
- // Convert to system-specific
- RGBA color;
- Root::getSingleton().convertColourValue(mColor, &color);
- HardwareVertexBufferSharedPtr vbuf = mRenderOp.vertexData->vertexBufferBinding->getBuffer(COLOUR_BINDING);
- RGBA *pDest = static_cast<RGBA*>(vbuf->lock(HardwareBuffer::HBL_DISCARD));
- for (unsigned int i = 0; i < mRenderOp.vertexData->vertexCount; ++i)
- *pDest++ = color;
- vbuf->unlock();
- mUpdateColors = false;
- }
- //------------------------------------------------------------------------------------------------
- const Quaternion& DebugContactText::getWorldOrientation(void) const
- {
- assert(mpCam);
- return const_cast<Quaternion&>(mpCam->getDerivedOrientation());
- }
- //------------------------------------------------------------------------------------------------
- const Vector3& DebugContactText::getWorldPosition(void) const
- {
- assert(mParentNode);
- return mParentNode->_getDerivedPosition();
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::getWorldTransforms(Matrix4 *xform) const
- {
- if (this->isVisible() && mpCam)
- {
- Matrix3 rot3x3, scale3x3 = Matrix3::IDENTITY;
-
- // store rotation in a matrix
- mpCam->getDerivedOrientation().ToRotationMatrix(rot3x3);
-
- // parent node position
- Vector3 ppos = mParentNode->_getDerivedPosition() + Vector3::UNIT_Y*mAdditionalHeight;
-
- // apply scale
- scale3x3[0][0] = mParentNode->_getDerivedScale().x / 2;
- scale3x3[1][1] = mParentNode->_getDerivedScale().y / 2;
- scale3x3[2][2] = mParentNode->_getDerivedScale().z / 2;
-
- // apply all transforms to xform
- *xform = (rot3x3 * scale3x3);
- xform->setTrans(ppos);
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::getRenderOperation(RenderOperation &op)
- {
- if (this->isVisible())
- {
- if (mNeedUpdate)
- this->_setupGeometry();
- if (mUpdateColors)
- this->_updateColors();
- op = mRenderOp;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_notifyCurrentCamera(Camera *cam)
- {
- mpCam = cam;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_updateRenderQueue(RenderQueue* queue)
- {
- if (this->isVisible())
- {
- if (mNeedUpdate)
- this->_setupGeometry();
- if (mUpdateColors)
- this->_updateColors();
-
- queue->addRenderable(this, mRenderQueueID, OGRE_RENDERABLE_DEFAULT_PRIORITY);
- // queue->addRenderable(this, mRenderQueueID, RENDER_QUEUE_SKIES_LATE);
- }
- }
-}
+/***************************************************************************
+
+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... (Use it Freely, even Statically, but have to contribute any changes)
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GPL General Public License with runtime exception 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 GPL General Public License with runtime exception for more details.
+
+You should have received a copy of the GPL General Public License with runtime exception 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/licenses/old-licenses/gpl-2.0.html
+-----------------------------------------------------------------------------
+*/
+
+
+#include "OgreBulletCollisions.h"
+
+#include "Ogre.h"
+#include "OgreFontManager.h"
+
+#include "Debug/OgreBulletCollisionsDebugContact.h"
+#include "OgreBulletCollisionsShape.h"
+#include "OgreBulletCollisionsObject.h"
+#include "OgreBulletCollisionsWorld.h"
+
+using namespace Ogre;
+
+#define POS_TEX_BINDING 0
+#define COLOUR_BINDING 1
+
+namespace OgreBulletCollisions
+{
+ //--------------------------------------------------...
[truncated message content] |
|
From: <and...@us...> - 2009-01-25 12:22:24
|
Revision: 847
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=847&view=rev
Author: andy_miller
Date: 2009-01-25 11:35:21 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Further QuickGui updates
Fixes to OgreBulletD generation due to newer C++ source
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
trunk/python-ogre/code_generators/navi/generate_code.py
trunk/python-ogre/code_generators/navi/python_navi_aliases.h
trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/UpdateDLLs.bat
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -5,22 +5,22 @@
## lets assume that the base development directory is one level higher
BASE_DIR,ignore = os.path.split(module_dir) ## r'/home/andy/development'
-FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac
-MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon'
-MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
-MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
+
+SDK = False
+
+
# the base of the /usr/... dircetory structure that we are using
ROOT_DIR = os.path.join(BASE_DIR,'root')
LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')
LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
-PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_36')
+PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_37')
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = LOCAL_LIB
## and the name of the boost python library
-LIB_Boost = 'libboost_python-gcc42-mt-1_36'
+LIB_Boost = 'libboost_python-gcc42-mt-1_37'
# in Linux we need to code in the Relative path for the library
RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\''
@@ -31,16 +31,22 @@
# and the Py++ directory as sometimes we need access to the code repository there
pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
-SDK = False
+
if os.sys.platform == 'darwin': # we use the pre built sdk for OSX
- SDK = True
+ SDK = True
+ FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac
+ MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon'
+ MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
+ MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
+
+
# # ## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR,'ogre')
PATH_OgreAddons = os.path.join(BASE_DIR, 'ogreaddons')
-PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.1' )
-PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
+PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.2' )
+PATH_OIS = os.path.join(BASE_DIR, 'ois')
if SDK:
PATH_CEGUI = os.path.join(BASE_DIR, 'ogre','Dependencies')
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp 2009-01-25 11:35:21 UTC (rev 847)
@@ -2,7 +2,9 @@
#include "QuickGUIText.h"
namespace QuickGUI
-{
+{
+ Character::Character( ) {} ;
+
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 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h 2009-01-25 11:35:21 UTC (rev 847)
@@ -56,7 +56,7 @@
/// UV coords of glyph, retreived from Font texture generated by Ogre::Font class.
UVRect uvCoords;
- protected:
+// protected:
Character();
bool mHighlighted;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h 2009-01-25 11:35:21 UTC (rev 847)
@@ -31,7 +31,7 @@
public:
template<typename BaseClassType>
friend class Factory;
- protected:
+// protected:
WidgetDesc(const Ogre::String& id);
virtual ~WidgetDesc() {}
public:
@@ -494,7 +494,7 @@
*/
virtual void updateTexturePosition();
- protected:
+// protected:
Widget(const Ogre::String& widget_name);
virtual ~Widget();
Modified: trunk/python-ogre/code_generators/navi/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -121,8 +121,8 @@
# cls.variable("StaticFunction").exclude()
#
- excludes = ['::NaviLibrary::Singleton<NaviLibrary::NaviMouse>::instance'
- ,'::NaviLibrary::Singleton<NaviLibrary::NaviManager>::instance'
+ excludes = [ # '::NaviLibrary::Singleton<NaviLibrary::NaviMouse>::instance',
+ '::NaviLibrary::Singleton<NaviLibrary::NaviManager>::instance'
]
for e in excludes:
print "Excluding Var", e
Modified: trunk/python-ogre/code_generators/navi/python_navi_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/navi/python_navi_aliases.h 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/navi/python_navi_aliases.h 2009-01-25 11:35:21 UTC (rev 847)
@@ -7,5 +7,5 @@
// typedef NaviLibrary::NaviUtilities::InlineVector<std::string> InlineVectorStrings;
typedef NaviLibrary::NaviUtilities::InlineVector<NaviLibrary::NaviUtilities::MultiValue> InlineVectorArgs;
typedef NaviLibrary::Singleton< NaviLibrary::NaviManager > SingletonManager;
-typedef NaviLibrary::Singleton< NaviLibrary::NaviMouse > SingletonMouse;
-typedef NaviLibrary::FastDelegate1< NaviLibrary::NaviData const&, void > FastDelegateNaviData;
\ No newline at end of file
+// typedef NaviLibrary::Singleton< NaviLibrary::NaviMouse > SingletonMouse;
+// typedef NaviLibrary::FastDelegate1< NaviLibrary::NaviData const&, void > FastDelegateNaviData;
\ 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 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -64,6 +64,20 @@
for e in excludes:
print "excluding class", e
global_ns.class_(e).exclude()
+
+ ## these are not yet implemented...
+ excludes = ['::OgreBulletDynamics::RagDoll::rigidityEnable',
+ '::OgreBulletDynamics::RagDoll::ragdollEnable',
+ '::OgreBulletDynamics::RagDoll::isRigidityEnable',
+ '::OgreBulletDynamics::RagDoll::isRagdollEnabled',
+ '::OgreBulletDynamics::RagDoll::isConstraintEnabled',
+ '::OgreBulletDynamics::RagDoll::isCollisionEnabled',
+ '::OgreBulletDynamics::RagDoll::constraintEnable',
+ '::OgreBulletDynamics::RagDoll::collisionEnable'
+ ]
+ for e in excludes:
+ global_ns.member_functions(e).exclude()
+
# for c in global_ns.classes():
# #if not c.ignore:
# print c
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -120,7 +120,9 @@
,'::QuickGUI::Widget::getChildWidget'
,'::QuickGUI::Quad::_update'
,'::QuickGUI::Window::getTitleBarText'
- ,'::QuickGUI::Tab::getPadding'
+ ,'::QuickGUI::Tab::getPadding'
+ ,'::QuickGUI::ComboBox::_clearSelection' ## not implemented
+ ,'::QuickGUI::ComboBox::addComboBoxEventHandler' ## TODO: needs to be wrapped
]
for e in excludes:
print "excluding function", e
Modified: trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h 2009-01-25 11:35:21 UTC (rev 847)
@@ -6,13 +6,12 @@
typedef QuickGUI::Factory<QuickGUI::WidgetDesc> FactoryWidgetDesc;
typedef QuickGUI::WidgetFactory<QuickGUI::Widget> WidgetFactoryWidget;
-// typedef std::list<QuickGUI::DefinitionProperty*> ListDefinitionProperty;
-// typedef std::list<QuickGUI::ListItem*> ListListItem;
-// typedef std::list<QuickGUI::ScriptDefinition*> ListScriptDefinition;
-// typedef std::vector<QuickGUI::TextSegment> VectorTextSegment;
+typedef std::list<QuickGUI::DefinitionProperty*> ListDefinitionProperty;
+typedef std::list<QuickGUI::ListItem*> ListListItem;
+typedef std::list<QuickGUI::ScriptDefinition*> ListScriptDefinition;
+typedef std::vector<QuickGUI::TextSegment> VectorTextSegment;
-
//typedef std::vector<Ogre::Image> VectorImage;
//typedef std::list<QuickGUI::RenderObject*, std::allocator<QuickGUI::RenderObject*> > ListRenderObject;
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/environment.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -1111,15 +1111,15 @@
include_dirs = [ Config.PATH_Boost
,Config.PATH_INCLUDE_Ogre
,Config.PATH_INCLUDE_navi
- ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','astral','include')
+ ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','include')
]
lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain
,Config.PATH_LIB_navi
- ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','astral','lib')
+ ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','lib')
]
CheckIncludes=[]
- libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Astral', 'user32',
+ libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Awesomium', 'user32',
'kernel32.lib', 'gdi32.lib', 'winspool.lib', 'comdlg32.lib', 'advapi32.lib',
'shell32.lib','ole32.lib','oleaut32.lib','uuid.lib' ]
ModuleName="navi"
Modified: trunk/python-ogre/scripts/UpdateDLLs.bat
===================================================================
--- trunk/python-ogre/scripts/UpdateDLLs.bat 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/scripts/UpdateDLLs.bat 2009-01-25 11:35:21 UTC (rev 847)
@@ -22,8 +22,8 @@
set physx="c:\program files\NVIDIA Corporation\NVIDIA PhysX SDK\v2.8.1\bin\win32"
set theora=%root%\ogreaddons\videoplugin\TheoraVideo\bin\Release
set ffmpeg=%root%\ffmpeg
-set naviextra=%root%\navi\Dependencies\win32\astral\runtime\Release
-set navi=%root%\navi\lib
+set naviextra=%root%\navi\Dependencies\win32\awesomium\bin\release
+set navi=%root%\navi\navi\lib
set boost=%root%\boost_1_37_0\bin.v2\libs\python\build\msvc-9.0\release\threading-multi
set boostlib=%boost%\boost_python-vc90-mt-1_37.dll
set particleuniverse=%root%\ogre\lib
@@ -99,6 +99,8 @@
rem navi
copy /y %navi%\*.dll %package%\gui\navi
+copy /y %naviextra%\*.dll %package%\gui\navi
+
rem plib
copy /y %boostlib% %package%\addons\plib
\ 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...> - 2009-01-25 12:44:45
|
Revision: 850
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=850&view=rev
Author: andy_miller
Date: 2009-01-25 12:44:39 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Updates for the 1.6.1 release
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/PythonOgreInstallCreator.iss
trunk/python-ogre/demos/ogrepcz/plugins.cfg
trunk/python-ogre/environment.py
trunk/python-ogre/patch/navi.patch
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/ChangeLog.txt 2009-01-25 12:44:39 UTC (rev 850)
@@ -1,18 +1,25 @@
-xxx : Release SVN
-=================
+Janurary 25 2009 : Release 1.6.1
+================================
+Latest build using Ogre 1.6.1 -- Note that the underlying Ogre C++ is NOT Patched!!
+
Fix: Improved extract_document functions to improve pydoc stings - remove excess leading whitespace and wraps at 100 chars
Fix: PhysX library exposes various NxArray objects that previously were excluded due to compile issues
Fix: Ogre library excludes xxxMutex variables from a few classes (Pass etc) as these are not correctly exposed
Update: PhysX can now be 'retrieved' and 'built' from windows (BuildModule.py -r -b physx)
Update: Extend the PhysX demo a little
-Update: Update Bullet libraries to bullet 2.72
+Update: Update Bullet libraries to bullet 2.73
Update: SampleFramework now uses a 'PythonOgre' overlay
Update: SampleFramework will now look for plugins.cfg or plugins.cfg.<platform name> ('nt' or 'linux') in the current and
parent directories -- this will allow a single demo tree to automatically work on any platform unstead of the
current suitation of having to manually edit the plugins file..
-Update: Plib ssgLoaderOptions (ssgLoad) can now be subclassed and createBranch/createState used as callback functions
+Update: Plib ssgLoaderOptions (ssgLoad) can now be subclassed and createBranch/createState used as callback functions
+Update: Latest QuickGUI, OgreForest (Paging), OgreBullet
+Update/Fix: Using OIS CVS version as it fixes issues with joystick/slider 'drivers'...
+Change: Using latest Py++ which has boost indexing implemented as header files (BOOST is NOT Patched!)
+Change: Added Canvas module
+Change: Removed OgreRefApp and Watermesh modules
November 14 2008 : Release 1.6.0
==================================
Modified: trunk/python-ogre/PythonOgreInstallCreator.iss
===================================================================
--- trunk/python-ogre/PythonOgreInstallCreator.iss 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/PythonOgreInstallCreator.iss 2009-01-25 12:44:39 UTC (rev 850)
@@ -3,19 +3,19 @@
;
[Setup]
AppName=Python-Ogre
-AppVerName=Python-Ogre 1.6.0
+AppVerName=Python-Ogre 1.6.1
DefaultDirName=C:\PythonOgre
DefaultGroupName=Python-Ogre
OutputBaseFilename=PythonOgreInstaller
OutputDir=C:\temp
SourceDir=C:\Development\PythonOgreRelease
-VersionInfoDescription=Release 1.6.0 of Python-Ogre
+VersionInfoDescription=Release 1.6.1 of Python-Ogre
AllowNoIcons=true
AppPublisher=OpenSource (Andy and Team)
AppPublisherURL=http://www.python-ogre.org
AppSupportURL=http://www.python-ogre.org
AppUpdatesURL=http://www.python-ogre.org
-AppVersion=1.6.0
+AppVersion=1.6.1
LicenseFile=LICENSE.GPL
Compression=lzma
InfoBeforeFile=InstallWarning.rtf
@@ -23,13 +23,13 @@
SolidCompression=yes
AppCopyright=LPGL
VersionInfoCompany=OpenSource (Andy and Team)
-VersionInfoTextVersion=1.6.0
+VersionInfoTextVersion=1.6.1
VersionInfoCopyright=PythonOgre Development Team
RestartIfNeededByRun=false
UninstallDisplayName=PythonOgre
WizardImageFile=compiler:WizModernImage-IS.bmp
WizardSmallImageFile=compiler:WizModernSmallImage-IS.bmp
-VersionInfoVersion=1.6.0
+VersionInfoVersion=1.6.1
[Files]
; base files, demos and tools
Modified: trunk/python-ogre/demos/ogrepcz/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogrepcz/plugins.cfg 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/demos/ogrepcz/plugins.cfg 2009-01-25 12:44:39 UTC (rev 850)
@@ -2,24 +2,24 @@
## Use this for Windows
# Define plugin folder
-#PluginFolder=../../plugins
-#Plugin=RenderSystem_GL.dll
-#Plugin=RenderSystem_Direct3D9.dll
-#Plugin=Plugin_ParticleFX.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
+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=libPlugin_PCZSceneManager
+#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
+#Plugin=Plugin_OctreeSceneManager
+#Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/environment.py 2009-01-25 12:44:39 UTC (rev 850)
@@ -1116,7 +1116,7 @@
lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain
,Config.PATH_LIB_navi
- ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','lib')
+ ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','lib', 'release')
]
CheckIncludes=[]
libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Awesomium', 'user32',
Modified: trunk/python-ogre/patch/navi.patch
===================================================================
--- trunk/python-ogre/patch/navi.patch 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/patch/navi.patch 2009-01-25 12:44:39 UTC (rev 850)
@@ -1,45 +1,72 @@
---- Navi/Include/Navi.h (revision 25)
-+++ Navi/Include/Navi.h (working copy)
-@@ -34,7 +34,7 @@
- {
- class _NaviExport Navi : public LLEmbeddedBrowserWindowObserver, public Ogre::WindowEventListener, public Ogre::ManualResourceLoader
- {
-- friend NaviManager;
-+ friend class NaviManager;
+Index: NaviDemo/Source/InputManager.cpp
+===================================================================
+--- NaviDemo/Source/InputManager.cpp (revision 43)
++++ NaviDemo/Source/InputManager.cpp (working copy)
+@@ -64,13 +64,13 @@
+ mInputSystem = OIS::InputManager::createInputSystem( paramList );
- std::string naviName;
- unsigned short naviWidth;
-@@ -69,8 +69,8 @@
- std::multimap<std::string, NaviDelegate> delegateMap;
- std::multimap<std::string, NaviDelegate>::iterator delegateIter;
- std::pair<std::multimap<std::string, NaviDelegate>::iterator, std::multimap<std::string, NaviDelegate>::iterator> dmBounds;
-- std::map<std::string, std::vector<std::string>> ensureKeysMap;
-- std::map<std::string, std::vector<std::string>>::iterator ensureKeysMapIter;
-+ std::map<std::string, std::vector<std::string> > ensureKeysMap;
-+ std::map<std::string, std::vector<std::string> >::iterator ensureKeysMapIter;
- bool okayToDelete;
- bool isVisible;
- bool fadingOut;
-
---- Navi/Include/NaviMouse.h (revision 25)
-+++ Navi/Include/NaviMouse.h (working copy)
-@@ -41,7 +41,7 @@
- class _NaviExport NaviMouse : public Singleton<NaviMouse>, public Ogre::ManualResourceLoader
- {
- friend class NaviManager;
-- friend NaviCursor;
-+ friend class NaviCursor;
- int mouseX, mouseY;
- unsigned short width, height;
- unsigned short texWidth, texHeight;
-
---- Navi/Include/NaviManager.h (revision 25)
+ // If possible create a buffered keyboard
+- if( mInputSystem->numKeyboards() > 0 ) {
++// if( mInputSystem->numKeyboards() > 0 ) {
+ mKeyboard = static_cast<OIS::Keyboard*>( mInputSystem->createInputObject( OIS::OISKeyboard, true ) );
+ mKeyboard->setEventCallback( this );
+- }
++// }
+
+ // If possible create a buffered mouse
+- if( mInputSystem->numMice() > 0 ) {
++// if( mInputSystem->numMice() > 0 ) {
+ mMouse = static_cast<OIS::Mouse*>( mInputSystem->createInputObject( OIS::OISMouse, true ) );
+ mMouse->setEventCallback( this );
+
+@@ -81,10 +81,10 @@
+
+ // Set mouse region
+ this->setWindowExtents( width, height );
+- }
++// }
+
+ // If possible create all joysticks in buffered mode
+- if( mInputSystem->numJoySticks() > 0 ) {
++/* if( 0 ) { //mInputSystem->numJoySticks() > 0 ) {
+ mJoysticks.resize( mInputSystem->numJoySticks() );
+
+ itJoystick = mJoysticks.begin();
+@@ -93,7 +93,7 @@
+ (*itJoystick) = static_cast<OIS::JoyStick*>( mInputSystem->createInputObject( OIS::OISJoyStick, true ) );
+ (*itJoystick)->setEventCallback( this );
+ }
+- }
++ } */
+ }
+ }
+
+Index: Navi/Include/NaviManager.h
+===================================================================
+--- Navi/Include/NaviManager.h (revision 43)
+++ Navi/Include/NaviManager.h (working copy)
-@@ -37,6 +37,7 @@
-
+@@ -30,6 +30,16 @@
+ #include "NaviUtilities.h"
+ #include "NaviSingleton.h"
+ #include "WebCore.h"
++
++#ifdef min
++#undef min
++#endif
++
++#ifdef max
++#undef max
++#endif
++
++
+ #include "Ogre.h"
+ #include "OgrePanelOverlayElement.h"
+ #include "KeyboardHook.h"
+@@ -39,6 +49,7 @@
+ */
namespace NaviLibrary
{
-+ class Navi; // needed for Python-Ogre gccxml processing
++ class Navi; // need to delcare to make gccxml happy
/**
* Enumerates relative positions. Used by NaviManager::NaviPosition
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-26 02:56:26
|
Revision: 852
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=852&view=rev
Author: andy_miller
Date: 2009-01-26 02:56:21 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
Linux fixes -- changes due to module rename in py++
Modified Paths:
--------------
trunk/python-ogre/code_generators/betagui/generate_code.py
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/bullet/generate_code_1.py
trunk/python-ogre/code_generators/cadunetree/generate_code.py
trunk/python-ogre/code_generators/caelum/generate_code.py
trunk/python-ogre/code_generators/canvas/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/mygui/generate_code.py
trunk/python-ogre/code_generators/navi/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/nxogre_09/generate_code.py
trunk/python-ogre/code_generators/ode/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/ogre/print_classes.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/ogredshow/generate_code.py
trunk/python-ogre/code_generators/ogreforests/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/ogrevideoffmpeg/generate_code.py
trunk/python-ogre/code_generators/ois/generate_code.py
trunk/python-ogre/code_generators/opcode/generate_code.py
trunk/python-ogre/code_generators/opensteer/generate_code.py
trunk/python-ogre/code_generators/particleuniverse/generate_code.py
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/code_generators/plib/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/template/generate_code.py
trunk/python-ogre/code_generators/theora/generate_code.py
trunk/python-ogre/code_generators/theora_v2/generate_code.py
trunk/python-ogre/code_generators/watermesh/generate_code.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/patch/ogre_1.6.1.patch
Modified: trunk/python-ogre/code_generators/betagui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/betagui/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/betagui/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -36,7 +36,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/bullet/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/bullet/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -36,7 +36,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/bullet/generate_code_1.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code_1.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/bullet/generate_code_1.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/cadunetree/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/cadunetree/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/caelum/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/caelum/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/canvas/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/canvas/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/canvas/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -22,7 +22,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
from pyplusplus.code_creators import include
import common_utils.extract_documentation as exdoc
Modified: trunk/python-ogre/code_generators/et/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/et/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/et/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/hikari/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/hikari/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/hikari/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/hydrax/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/hydrax/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/hydrax/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/mygui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/mygui/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/mygui/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/navi/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/noise/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/noise/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/noise/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/nxogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/nxogre/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -33,7 +33,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/nxogre_09/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre_09/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/nxogre_09/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ode/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ode/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -50,8 +50,8 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import call_policies_resolver
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import call_policies_resolver
+from pyplusplus.creators_factory import sort_algorithms
from pyplusplus import code_repository
Modified: trunk/python-ogre/code_generators/ofusion/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ofusion/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ofusion/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -43,7 +43,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogre/print_classes.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/print_classes.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogre/print_classes.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -20,7 +20,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogredshow/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogredshow/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogredshow/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogreforests/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogreforests/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogrepcz/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ois/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
from pyplusplus.code_creators import include
# import common_utils.extract_documentation as exdoc
Modified: trunk/python-ogre/code_generators/opcode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/opcode/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/opcode/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/opensteer/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/opensteer/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/opensteer/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -33,7 +33,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/particleuniverse/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/plib/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/plib/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/plib/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -33,7 +33,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -40,7 +40,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
from pyplusplus.code_creators import include
import common_utils.extract_documentation as exdoc
Modified: trunk/python-ogre/code_generators/template/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/template/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/template/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -33,7 +33,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/theora/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/theora/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/theora/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/theora_v2/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/theora_v2/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/theora_v2/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/watermesh/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/watermesh/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/watermesh/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -36,7 +36,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/environment.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -483,7 +483,7 @@
versionBase = '1_37' ## the version used on the library name
if isLinux() or isMac():
- bjambase = 'boost-jam-3.1.17'
+ bjambase = 'boost-jam-3.1.17-1-linuxx86'
if isMac():
bjambuilddir = 'bin.macosxx86'
bjambuildset = 'darwin'
@@ -491,13 +491,14 @@
if is64():
bjambuilddir = 'bin.linuxx86_64'
else:
- bjambuilddir = 'bin.linuxx86'
+ bjambuilddir = ''
bjambuildset = 'gcc'
- source = [
- [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1.tgz', downloadPath],
- [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
- ]
+ if isLinux():
+ source = [
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1-linuxx86.tgz', downloadPath],
+ [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
+ ]
buildCmds = [
## first handle bjam
[0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''],
@@ -635,7 +636,7 @@
base = "ogre-v1-6-1"
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.1.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')],
@@ -718,7 +719,7 @@
# ]
buildCmds = [
- [0, tar + " zxf " + os.path.join(downloadPath,'ois_1.2.0')+".tar.gz --overwrite",os.getcwd() ],
+# [0, tar + " zxf " + os.path.join(downloadPath,'ois_1.2.0')+".tar.gz --overwrite",os.getcwd() ],
[0, "./bootstrap" ,os.path.join(os.getcwd(), base )],
[0,"./configure --prefix=%s --includedir=%s/include" %(PREFIX,PREFIX) ,os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
@@ -872,13 +873,13 @@
[wget, "http://downloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz", downloadPath]
]
else:
- base = "CEGUI-0.6.1"
+ base = "CEGUI-0.6.2"
source=[
[wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.2b.tar.gz?download", downloadPath]
]
buildCmds = [
- [0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",os.getcwd() ],
+ [0, tar + " zxf " + os.path.join(downloadPath,base)+"b.tar.gz --overwrite",os.getcwd() ],
# [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)],
Added: trunk/python-ogre/patch/ogre_1.6.1.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.6.1.patch (rev 0)
+++ trunk/python-ogre/patch/ogre_1.6.1.patch 2009-01-26 02:56:21 UTC (rev 852)
@@ -0,0 +1,74 @@
+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/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/OgreMain/include/OgreStdHeaders.h
+===================================================================
+--- 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)
+@@ -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 @@
+
+
+ #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...> - 2009-01-26 09:34:38
|
Revision: 854
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=854&view=rev
Author: andy_miller
Date: 2009-01-26 09:34:29 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
Linux updates for the 1.6.1 build
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ois/generate_code.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-26 03:21:28 UTC (rev 853)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-26 09:34:29 UTC (rev 854)
@@ -76,7 +76,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.72')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.73')
###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/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 03:21:28 UTC (rev 853)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 09:34:29 UTC (rev 854)
@@ -849,9 +849,8 @@
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()
+ #f.exclude()
+ #mb.member_functions('::Ogre::Node::getChildIterator').exclude()
def Fix_NT ( mb ):
Modified: trunk/python-ogre/code_generators/ois/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-26 03:21:28 UTC (rev 853)
+++ trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-26 09:34:29 UTC (rev 854)
@@ -40,8 +40,8 @@
from pyplusplus.creators_factory import sort_algorithms
from pyplusplus.code_creators import include
-# import common_utils.extract_documentation as exdoc
-import testExtract as exdoc
+import common_utils.extract_documentation as exdoc
+#import testExtract as exdoc
import common_utils.var_checker as varchecker
import common_utils.ogre_properties as ogre_properties
from common_utils import docit
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-26 03:21:28 UTC (rev 853)
+++ trunk/python-ogre/environment.py 2009-01-26 09:34:29 UTC (rev 854)
@@ -645,7 +645,7 @@
[0, "make install", os.path.join(os.getcwd(), 'ogre')],
]
libs=[boost.lib, 'OgreMain']
- libs.append ( boost_python_index.lib )
+ #libs.append ( boost_python_index.lib )
lib_dirs=[Config.LOCAL_LIB]
include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre]
CCFLAGS = ' -D__PYTHONOGRE_BUILD_CODE '
@@ -748,7 +748,7 @@
else:
libs=['OIS_static',boost.lib]
- libs.append ( boost_python_index.lib )
+ #libs.append ( boost_python_index.lib )
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
include_dirs = [ Config.PATH_Boost
@@ -762,8 +762,8 @@
#externalFiles = ['OIS.dll']
if os.sys.platform == 'darwin':
LINKFLAGS = '-framework Python -framework Carbon'
- else:
- LINKFLAGS = "-l%s" % boost_python_index.lib
+# else:
+# LINKFLAGS = "-l%s" % boost_python_index.lib
class ogrerefapp:
active = False ## making this false as replaced by OgreODE etc..
@@ -784,7 +784,7 @@
libs=[boost.lib, 'OgreMain', 'ode_single', 'ReferenceAppLayer']
else:
libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_ODE
@@ -809,7 +809,7 @@
libs = ['Newton', boost.lib, 'OgreNewt_Main', 'OgreMain']
else:
libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
if _STABLE:
source = [
[cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
@@ -864,7 +864,7 @@
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ]
else:
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
if isLinux():
if _STABLE:
@@ -922,8 +922,8 @@
]
ModuleName = 'CEGUI'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
- if isLinux():
- LINKFLAGS = "-l%s" % boost_python_index.lib
+# if isLinux():
+# LINKFLAGS = "-l%s" % boost_python_index.lib
class ode:
@@ -938,8 +938,8 @@
if isWindows():
odeLibraryName = 'ode_single'
libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function
- else:
- libs.append ( boost_python_index.lib )
+# else:
+# libs.append ( boost_python_index.lib )
lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_ODE
]
@@ -981,8 +981,8 @@
name = 'opcode'
parent = "ogre/physics"
libs=[boost.lib]
- if isLinux():
- libs.append ( boost_python_index.lib )
+ # if isLinux():
+ # libs.append ( boost_python_index.lib )
lib_dirs = [ boost.PATH_LIB
]
include_dirs = [ Config.PATH_Boost
@@ -1010,7 +1010,7 @@
]
CheckIncludes=[]
if isLinux():
- libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
else:
libs=[ boost.lib, 'OgreMain' ]
@@ -1060,7 +1060,7 @@
libs=[boost.lib, 'OgreMain', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
if isLinux():
libs.append('ode')
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
else:
libs.append('ode_single')
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h',
@@ -1096,8 +1096,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="QuickGUI"
class navi:
@@ -1150,8 +1150,8 @@
libs=[ boost.lib, 'OgreMain', 'OIS_static' ]
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
- else:
- libs.append ( boost_python_index.lib )
+ # else:
+ # libs.append ( boost_python_index.lib )
ModuleName="betagui"
@@ -1171,8 +1171,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="ogreforests"
@@ -1203,8 +1203,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="particleuniverse"
class nxogre:
@@ -1240,7 +1240,7 @@
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain','NxOgre' ] #, 'NxOgreStatic'] #'NxExtensions',
else:
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ]
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
ModuleName="NxOgre"
@@ -1270,8 +1270,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="theora"
class plib:
@@ -1293,7 +1293,7 @@
libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ]
else:
libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
class physx:
active = True
@@ -1329,7 +1329,7 @@
]
elif isLinux():
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
- libs.append ( boost_python_index.lib )
+# 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]
]
@@ -1451,11 +1451,11 @@
# [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',
+ libs=[boost.lib, 'OgreMain', 'vorbisfile',
#'ogg',
#'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
@@ -1518,7 +1518,7 @@
name='et'
parent = "ogre/addons"
if isLinux():
- libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
else:
libs=[ boost.lib, 'OgreMain' ]
@@ -1549,7 +1549,7 @@
# libs.append('LibBulletSoftBody')
#libs.append('libbulletcolladaconverter')
# libs.append('LibBulletMultiThreaded')
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_Bullet
@@ -1593,7 +1593,7 @@
cflags = ""
parent = "ogre/physics"
libs = [boost.lib, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibGIMPACT'
+ 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody'
]
if isLinux():
libs.append('LibLinearMath')
@@ -1603,9 +1603,11 @@
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
- ,os.path.join(Config.PATH_Bullet, 'Extras','GIMPACT','include')
- ]
+ , Config.PATH_INCLUDE_Ogre_Dependencies
+ ]
+ if isWindows():
+ include_dirs.append(os.path.join(Config.PATH_Bullet, 'Extras','GIMPACT','include'))
+
lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Bullet
, Config.PATH_LIB_Ogre_OgreMain
@@ -1614,7 +1616,7 @@
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
CCFLAGS = ' -D_PRECOMP -fno-inline '
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletC'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
@@ -1654,7 +1656,7 @@
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
CCFLAGS = ' -D_PRECOMP -fno-inline '
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletD'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
descText = "Ogre Bullet Dynamics (physics) implementation"
@@ -1675,8 +1677,8 @@
]
CheckIncludes=[]
libs=[ boost.lib]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="noise"
descText = "Generate 'noise'"
@@ -1696,8 +1698,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="watermesh"
descText = "C++ code from Ogre Water demo -- use Hydrax instead"
@@ -1717,8 +1719,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="ofusion"
descText = "Import Ogre 'Scenes' from 3dMax using the ofusion exporter"
@@ -1738,8 +1740,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="cadunetree"
descText = "Generate realistic trees"
@@ -1760,8 +1762,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="ogrepcz"
descText = "Portal SceneManager - seamlessly move from interior to exterior scene management"
@@ -1781,8 +1783,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'opensteer' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="opensteer"
class hydrax:
@@ -1801,8 +1803,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="hydrax"
descText = "Fantastic water/ocean effects"
@@ -1823,8 +1825,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# 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...> - 2009-01-26 13:15:09
|
Revision: 855
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=855&view=rev
Author: andy_miller
Date: 2009-01-26 12:03:56 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
Final set of Linux updates before moving to branch (1.6.1)
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogrenewt/generate_code.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/ReportVersion.out.linux
trunk/python-ogre/demos/plugins.cfg.posix
Removed Paths:
-------------
trunk/python-ogre/demos/plugins.cfg.linux
Added: trunk/python-ogre/ReportVersion.out.linux
===================================================================
--- trunk/python-ogre/ReportVersion.out.linux (rev 0)
+++ trunk/python-ogre/ReportVersion.out.linux 2009-01-26 12:03:56 UTC (rev 855)
@@ -0,0 +1,94 @@
+Module OGRE ( ogre.renderer.OGRE )
+ PythonOgre Ver: 1.6.1
+ Module Version: 1.6.1
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 16:48:28 Jan 26 2009
+ Raw Detail : 1.6.1_853M_ogre_1.6.1_1
+Module OIS ( ogre.io.OIS )
+ PythonOgre Ver: 1.6.1
+ Module Version: 1.0
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:50:58 Jan 26 2009
+ Raw Detail : 1.6.1_853:854_ois_1.0_1
+Import failed: betagui
+Module OgreAL ( ogre.sound.OgreAL )
+ PythonOgre Ver: 1.6.1
+ Module Version: r115
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 17:48:43 Jan 26 2009
+ Raw Detail : 1.6.1_853_ogreal_r115_1
+Import failed: ODE
+Import failed: OgreRefApp
+Module OgreOde ( ogre.physics.OgreOde )
+ PythonOgre Ver: 1.6.1
+ Module Version: r2497
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:37:20 Jan 26 2009
+ Raw Detail : 1.6.1_853_ogreode_r2497_1
+Import failed: OgreNewt
+Import failed: Opcode
+Import failed: bullet
+Import failed: PhysX
+Import failed: NxOgre
+Import failed: OgreBulletC
+Import failed: OgreBulletD
+Import failed: theora
+Module plib ( ogre.addons.plib )
+ PythonOgre Ver: 1.6.1
+ Module Version: 1.6.1
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 18:53:22 Jan 26 2009
+ Raw Detail : 1.6.1_853_ogre_1.6.1_1
+Module ogreforests ( ogre.addons.ogreforests )
+ PythonOgre Ver: 1.6.1
+ Module Version: r2615
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 18:39:01 Jan 26 2009
+ Raw Detail : 1.6.1_853_ogreforests_r2615_1
+Module et ( ogre.addons.et )
+ PythonOgre Ver: 1.6.1
+ Module Version: 2.3.1
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 18:28:25 Jan 26 2009
+ Raw Detail : 1.6.1_853_et_2.3.1_1
+Module caelum ( ogre.addons.caelum )
+ PythonOgre Ver: 1.6.1
+ Module Version: 0.4
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 17:44:38 Jan 26 2009
+ Raw Detail : 1.6.1_853_caelum_0.4_1
+Module noise ( ogre.addons.noise )
+ PythonOgre Ver: 1.6.1
+ Module Version: r2486
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:41:07 Jan 26 2009
+ Raw Detail : 1.6.1_853_noise_r2486_1
+Import failed: watermesh
+Import failed: particleuniverse
+Module cadunetree ( ogre.addons.cadunetree )
+ PythonOgre Ver: 1.6.1
+ Module Version: 0.6
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:48:28 Jan 26 2009
+ Raw Detail : 1.6.1_853_cadunetree_0.6_1
+Import failed: ogrepcz
+Module hydrax ( ogre.addons.hydrax )
+ PythonOgre Ver: 1.6.1
+ Module Version: 0.4
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:57:00 Jan 26 2009
+ Raw Detail : 1.6.1_853_hydrax_0.4_1
+Import failed: hikari
+Import failed: canvas
+Import failed: mygui
Modified: trunk/python-ogre/code_generators/ogrenewt/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2009-01-26 09:34:29 UTC (rev 854)
+++ trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2009-01-26 12:03:56 UTC (rev 855)
@@ -220,7 +220,9 @@
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
defined_symbols.append('BOOST_HAS_WINTHREADS')
-
+ if environment.isLinux():
+ defined_symbols.append('BOOST_IS_ENUM')
+
mb = module_builder.module_builder_t( [ xml_cached_fc ]
, gccxml_path=environment.gccxml_bin
, working_directory=environment.root_dir
Deleted: trunk/python-ogre/demos/plugins.cfg.linux
===================================================================
--- trunk/python-ogre/demos/plugins.cfg.linux 2009-01-26 09:34:29 UTC (rev 854)
+++ trunk/python-ogre/demos/plugins.cfg.linux 2009-01-26 12:03:56 UTC (rev 855)
@@ -1,13 +0,0 @@
-# Defines plugins to load
-
-## Use this for Windows
-
-
-##
-## 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
Copied: trunk/python-ogre/demos/plugins.cfg.posix (from rev 853, trunk/python-ogre/demos/plugins.cfg.linux)
===================================================================
--- trunk/python-ogre/demos/plugins.cfg.posix (rev 0)
+++ trunk/python-ogre/demos/plugins.cfg.posix 2009-01-26 12:03:56 UTC (rev 855)
@@ -0,0 +1,13 @@
+# Defines plugins to load
+
+## Use this for Windows
+
+
+##
+## 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
Property changes on: trunk/python-ogre/demos/plugins.cfg.posix
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-26 09:34:29 UTC (rev 854)
+++ trunk/python-ogre/environment.py 2009-01-26 12:03:56 UTC (rev 855)
@@ -747,7 +747,7 @@
libs=['OIS_static',boost.lib]
else:
- libs=['OIS_static',boost.lib]
+ libs=['OIS',boost.lib]
#libs.append ( boost_python_index.lib )
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
@@ -823,8 +823,10 @@
[0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
#[0, "cp SConscript OgreNewt_Main", baseDir],
#[0, "rm SConscript", 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)
+ [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
+ [0, 'cp SConscript OgreNewt_Main', baseDir],
+ [0, "scons prefix=%s boost=%s/include/boost-1_37 build" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore)
+ [0, "scons prefix=%s boost=%s/include/boost-1_37 install" % (PREFIX, PREFIX), baseDir],
]
if isWindows():
buildCmds = [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-27 13:40:58
|
Revision: 856
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=856&view=rev
Author: andy_miller
Date: 2009-01-27 13:40:49 +0000 (Tue, 27 Jan 2009)
Log Message:
-----------
MAC specific updates for the 1.6.1 release -- Ogre, OIS and CEGUI working OK!
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/SConstruct
trunk/python-ogre/code_generators/cegui/customization_data.py
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/cegui/python_CEGUI.h
trunk/python-ogre/code_generators/ogre/custom_rvalue.cpp
trunk/python-ogre/code_generators/ogre/customization_data.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/python_ogre.h
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/patch/ogre_1.6.1_mac.patch
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -5,11 +5,8 @@
## lets assume that the base development directory is one level higher
BASE_DIR,ignore = os.path.split(module_dir) ## r'/home/andy/development'
-
-
SDK = False
-
# the base of the /usr/... dircetory structure that we are using
ROOT_DIR = os.path.join(BASE_DIR,'root')
LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')
@@ -31,14 +28,27 @@
# and the Py++ directory as sometimes we need access to the code repository there
pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
+isMAC = False
+if os.sys.platform == 'darwin': # for the Mac
+ isMAC = True
+ MAC_SDK_INCLUDE= '' #/Developer/SDKs/MacOSX10.5.sdk/Developer/Headers/FlatCarbon'
+ MAC_CCFLAGS = ' -D__ASSERTMACROS__ '
+ MAC_cflags = ' -D__APPLE_CC__ -DCF_OPEN_SOURCE \
+ -I. \
+ -F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks \
+ -DBOOST_PYTHON_NO_PY_SIGNATURES -DBOOST_PYTHON_MAX_ARITY=19 \
+ -I' + os.path.join(module_dir,'code_generators','ogre') + ' '
+ MAC_AdditionalFrameWorks=[ os.path.abspath(os.path.join(BASE_DIR,'ogre/Mac/build/Release')), # this one can be removed as Ogr eis now copied to the user frameworks area
+ os.path.abspath(os.path.join(os.path.expanduser('~'), 'Library','Frameworks'))]
+ LIB_Boost = 'libboost_python-xgcc42-mt'
+
+
+# SDK = True
+# FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac
+# MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon'
+# MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
+# MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
-if os.sys.platform == 'darwin': # we use the pre built sdk for OSX
- SDK = True
- FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac
- MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon'
- MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
- MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
-
# # ## Parent directories of the libraries
@@ -51,6 +61,9 @@
if SDK:
PATH_CEGUI = os.path.join(BASE_DIR, 'ogre','Dependencies')
PATH_OIS = os.path.join(BASE_DIR, 'ogre','Dependencies')
+if isMAC:
+ PATH_CEGUI = 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.10.1')
@@ -108,6 +121,10 @@
PATH_LIB_CEGUI = os.path.join( PATH_CEGUI,'lib', 'Release' ) #PATH_Ogre, r'Dependencies/lib/Release' )
PATH_LIB_Ogre_OgreMain= os.path.join( PATH_Ogre, 'OgreMain/lib/Release' )
+if isMAC:
+ PATH_LIB_OIS = os.path.join( PATH_OIS,'Mac', 'XCode-2.2', 'build', 'Release' ) #PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
+ PATH_LIB_CEGUI = os.path.join( PATH_CEGUI,'lib', 'Release' ) #PATH_Ogre, r'Dependencies/lib/Release' )
+
PATH_LIB_ODE = os.path.join( LOCAL_LIB ) #PATH_ODE, 'lib/releasedll')## probable releaselib for posix
PATH_LIB_OPCODE = os.path.join( PATH_OPCODE )
PATH_LIB_OgreOde = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'lib/Release')
@@ -138,12 +155,20 @@
PATH_INCLUDE_OIS = os.path.join(LOCAL_INCLUDE,'OIS') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_CEGUI = os.path.join(LOCAL_INCLUDE,'CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
-if SDK:
+
+if SDK :
PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'include','OIS') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_CEGUI = os.path.join(PATH_CEGUI,'include','CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/include')
+
+if isMAC:
+ PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
+ PATH_INCLUDE_CEGUI = os.path.join(PATH_Ogre, 'Dependencies','include', 'CEGUI' ) #PATH_CEGUI,'include','CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
+ PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain','include')
+ PATH_INCLUDE_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies','include')
+
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
PATH_INCLUDE_OgreNewt = os.path.join(LOCAL_INCLUDE,'OgreNewt') #os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
PATH_INCLUDE_ODE = os.path.join(LOCAL_INCLUDE,'ode') #os.path.join( PATH_ODE, 'include')
@@ -206,3 +231,5 @@
PATH_INCLUDE_mygui = os.path.join(PATH_mygui,'MyGUIEngine','include')
PATH_INCLUDE_canvas= PATH_canvas
+if os.sys.platform=='darwin':
+ pass
\ No newline at end of file
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/SConstruct 2009-01-27 13:40:49 UTC (rev 856)
@@ -66,7 +66,11 @@
CCFLAGS += ' '
else:
- CCFLAGS = ' -I -pipe -O3 -I./'
+ CCFLAGS = ' -I./ -O3 -dynamic -fPIC -DBOOST_PYTHON_NO_PY_SIGNATURES -DBOOST_PYTHON_MAX_ARITY=19 '
+ CCFLAGS += ' -ftemplate-depth-128 -finline-functions -Wno-inline -Wall -no-cpp-precomp -gdwarf-2 -DNDEBUG '
+ # -ftemplate-depth-128 -D_POSIX_C_SOURCE -no-cpp-precomp -gdwarf-2 -finline-functions -Wno-inline -Wall -DBOOST_ALL_NO_LIB=1 -DBOOST_PYTHON_SOURCE
+ # -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/
+ # -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/ CCFLAGS = ' -I -pipe -O3 -I./'
## change to ensure the source file is also in the include path due to indexing suite changes
CCFLAGS += ' -I' +cls._source + ' '
@@ -102,7 +106,8 @@
if os.sys.platform <> 'darwin':
LINKFLAGS = ' `pkg-config --libs OGRE` -lstdc++ '
if environment.isMac():
- LINKFLAGS = ' -Wl,-x -framework Python -framework Ogre -framework Carbon -F' + environment.Config.FRAMEWORK_DIR + ' '
+# LINKFLAGS = ' -Wl,-x -framework Python -framework Ogre -framework Carbon -F' + environment.Config.FRAMEWORK_DIR + ' '
+ LINKFLAGS = ' -dynamiclib -dynamic -framework Ogre -framework Carbon -framework Python '
return LINKFLAGS
def build_pch( cls, pchfile ):
@@ -223,9 +228,10 @@
if environment.isLinux() and "-g" not in _env["CCFLAGS"]:
_env.AddPostAction(package,\
'-strip -g -S -d --strip-debug -s %(name)s' % { 'name':package[index] } )
- if environment.isMac():
- _env.AddPostAction(package,\
- '-strip -s %(name)s' % { 'name':package[index] } )
+ if environment.isMac():
+ pass
+ #_env.AddPostAction(package,\
+ # '-strip -s %(name)s' % { 'name':package[index] } )
_env.InstallAs(os.path.join(environment.package_dir_name, cls.parent,
cls.ModuleName, cls.PydName),
Modified: trunk/python-ogre/code_generators/cegui/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/customization_data.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/cegui/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -1,6 +1,6 @@
-
+import os
def header_files( Version ):
- return [ "CEGUI.h"
+ ret= [ "CEGUI.h"
, "CEGUIXMLParser.h"
, "Ogre.h"
, "CEGUIXMLHandler.h"
@@ -8,8 +8,10 @@
, "CEGUIXMLSerializer.h"
, "OgreCEGUIRenderer.h"
,"OgreCEGUIResourceProvider.h"
- ]
+ ]
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
-
def huge_classes( Version ):
return []
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -274,7 +274,9 @@
, working_directory=environment.root_dir
, include_paths=environment.cegui.include_dirs
, define_symbols=defined_symbols
- , indexing_suite_version=2 )
+ , indexing_suite_version=2
+ , cflags=environment.ogre.cflags
+ )
filter_declarations (mb)
Modified: trunk/python-ogre/code_generators/cegui/python_CEGUI.h
===================================================================
--- trunk/python-ogre/code_generators/cegui/python_CEGUI.h 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/cegui/python_CEGUI.h 2009-01-27 13:40:49 UTC (rev 856)
@@ -3,7 +3,10 @@
#include <string>
#include <map>
#include <iostream>
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "CEGUI.h"
#include "CEGUIXMLParser.h" // needed for System
#include "CEGUIXMLHandler.h"
Modified: trunk/python-ogre/code_generators/ogre/custom_rvalue.cpp
===================================================================
--- trunk/python-ogre/code_generators/ogre/custom_rvalue.cpp 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/ogre/custom_rvalue.cpp 2009-01-27 13:40:49 UTC (rev 856)
@@ -1,3 +1,6 @@
+#if defined __APPLE_CC__
+ #include "Carbon/Carbon.h"
+#endif
#include "python_ogre_precompiled.h"
#include "boost/python/object.hpp" //len function
#include "boost/python/ssize_t.hpp" //ssize_t type definition
Modified: trunk/python-ogre/code_generators/ogre/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/customization_data.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/ogre/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -1,14 +1,12 @@
-
+import os
def header_files( version ):
if not version.startswith("1.2"):
## 21Nov07; Change to precompiled header support
- return [ 'python_ogre_precompiled.h'
-# # ,'boost/python.hpp'
-# # ,'python_ogre_masterlist.h'
-# # ,'boost/python/ssize_t.hpp' ## needed for python2.4 as it doesn't define ssize_t
-
- ]
-
+ ret = [ 'python_ogre_precompiled.h'
+ ]
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
else: #1.2
return [ 'Ogre.h'
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -822,7 +822,7 @@
"""
## we could do more here if need be...
if sys.platform == 'darwin':
- pass
+ mb.global_ns.member_function('::Ogre::WindowEventUtilities::_CarbonWindowHandler').exclude()
elif sys.platform.startswith ('linux'):
pass
mb.global_ns.class_('vector<int, std::allocator<int> >').alias='VectorInt'
Modified: trunk/python-ogre/code_generators/ogre/python_ogre.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre.h 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/ogre/python_ogre.h 2009-01-27 13:40:49 UTC (rev 856)
@@ -7,7 +7,10 @@
#include <vector>
#include <set>
#include <map>
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "python_ogre_masterlist.h"
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/environment.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -166,10 +166,10 @@
else:
sed_ = "sed --in-place "
-if isMac():
- Config.PATH_Boost = os.path.join(Config.LOCAL_INCLUDE, 'boost-1_34_1')
- Config.LIB_Boost = 'libboost_python-1_34_1'
- Config.RPATH=""
+#if isMac():
+# Config.PATH_Boost = os.path.join(Config.LOCAL_INCLUDE, 'boost-1_34_1')
+# Config.LIB_Boost = 'libboost_python-1_34_1'
+# Config.RPATH=""
## BIG assumption about where you want things put
if UseSystem:
@@ -454,6 +454,9 @@
if isLinux() or isMac():
buildCmds = [
[0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",'' ],
+ # note fix here as scons defaults to adding bundle to command line which stops us building dynamiclibs!!
+ [0, 'sed -i "" s/-bundle// applelink.py',
+ os.path.join (os.getcwd(), base, 'engine','SCons','Tool') ],
[0,"python setup.py install --prefix=%s" % PREFIX , os.path.join (os.getcwd(), base) ]
]
@@ -482,23 +485,19 @@
base = 'boost_1_37_0'
versionBase = '1_37' ## the version used on the library name
- if isLinux() or isMac():
+ if isLinux():
bjambase = 'boost-jam-3.1.17-1-linuxx86'
- if isMac():
- bjambuilddir = 'bin.macosxx86'
- bjambuildset = 'darwin'
+ if is64():
+ bjambuilddir = 'bin.linuxx86_64'
else:
- if is64():
- bjambuilddir = 'bin.linuxx86_64'
- else:
- bjambuilddir = ''
- bjambuildset = 'gcc'
+ bjambuilddir = ''
+ bjambuildset = 'gcc'
- if isLinux():
- source = [
- [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1-linuxx86.tgz', downloadPath],
- [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
- ]
+ source = [
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1-linuxx86.tgz', downloadPath],
+ [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
+ ]
+
buildCmds = [
## first handle bjam
[0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''],
@@ -516,7 +515,34 @@
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )],
]
+ if isMac():
+ bjambase = 'boost-jam-3.1.17-1-macosxx86'
+ bjambuilddir = 'bin.macosxx86'
+ bjambuildset = 'darwin'
+
+ source = [
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1-macosxx86.tgz', downloadPath],
+ [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
+ ]
+
+ buildCmds = [
+ ## first handle bjam
+ [0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''],
+ #[0,"./build.sh " + bjambuildset, os.path.join(os.getcwd(), bjambase )],
+ #[0,"mkdir -p %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase )],
+ [0,cp + " bjam %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase )], ## may need to change on 64 bit systems
+ ## and now boost
+# [0, tar + ' zxf ' + os.path.join(downloadPath, base) + '.tar.gz', ''],
+ [0,'chmod -R +rw *', os.path.join(os.getcwd(), base ) ],
+# [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-toolset=darwin --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 )],
+ ]
+
if isWindows():
bjambase = 'boost-jam-3.1.17-1-ntx86'
source = [
@@ -544,7 +570,9 @@
gcc_version = re.search(r'([0-9]+?\.[0-9]+?\.[0-9]+?)', gccp.communicate()[0]).groups()[0].split('.')
# FIXME: Should this be the multithreaded version!?
lib = "boost_python-gcc%s%s-mt-%s" % (gcc_version[0], gcc_version[1], versionBase)
-
+ if isMac():
+ lib=Config.LIB_Boost
+
class boost_python_index:
""" only used for Linx
"""
@@ -667,8 +695,9 @@
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
[0, unzip + os.path.join(downloadPath,basedep)+".zip ",os.path.join(os.getcwd(), 'ogre') ],
[0, "mkdir ~/Library/Frameworks", ''], ## Note that this will fail if the directory exists !!!
- [0,cp + " -R "+os.path.join(os.getcwd(), 'ogre', '__MACOSX','Dependencies')+'/*.framework ' + Config.FRAMEWORK_DIR,''],
- #[0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()],
+ [0, 'mv OgreDependencies_OSX_Eihort_20080115/Dependencies .',os.path.join(os.getcwd(), 'ogre')],
+ #[0,cp + " -R "+os.path.join(os.getcwd(), 'ogre', '__MACOSX','Dependencies')+'/*.framework ',''],
+ [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.1.patch -p0 ", os.getcwd()],
[0, "mkdir Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
# need copies of these in an 'Ogre/..' directory due to includes in the OSX directory -- or get the framework right
[0, "cp OgreRoot.h Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
@@ -676,7 +705,7 @@
[0, "cp OgrePrerequisites.h Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
[0, "xcodebuild -project ogre/Mac/Ogre/Ogre.xcodeproj -configuration Release", ''],
[0, "xcodebuild -project ogre/Mac/Samples/Samples.xcodeproj -configuration Release", ''],
- [0, "cp -R *.framework " + Config.FRAMEWORK_DIR, os.path.join(os.getcwd() ,'ogre',"Mac", "build", "Release") ]
+ [0, "cp -R *.framework ~/Library/Frameworks", os.path.join(os.getcwd() ,'ogre',"Mac", "build", "Release") ]
]
libs=[boost.lib]
@@ -700,7 +729,15 @@
cflags=''
parent = "ogre/io"
if isMac():
- source=[]
+ base = "ois"
+ source=[
+# [wget, "http://downloads.sourceforge.net/wgois/ois_1.2.0.tar.gz", downloadPath]
+ [cvs, "-z3 -d:pserver:ano...@wg...:/cvsroot/wgois co -D 01Jan2009 -P ois", os.getcwd()]
+ ]
+ buildCmds = [
+ [0, "xcodebuild -project ois/Mac/XCode-2.2/OIS.xcodeproj -configuration Release", ''],
+ [0,'cp -R ois/Mac/XCode-2.2/build/Release/OIS.Framework ~/Library/Frameworks ', '']
+ ]
if isLinux():
base = "ois"
source=[
@@ -761,7 +798,7 @@
CheckIncludes=['boost/python.hpp', 'OIS.h']
#externalFiles = ['OIS.dll']
if os.sys.platform == 'darwin':
- LINKFLAGS = '-framework Python -framework Carbon'
+ LINKFLAGS = '-framework OIS '
# else:
# LINKFLAGS = "-l%s" % boost_python_index.lib
@@ -823,10 +860,10 @@
[0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
#[0, "cp SConscript OgreNewt_Main", baseDir],
#[0, "rm SConscript", baseDir],
- [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
+ [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
[0, 'cp SConscript OgreNewt_Main', baseDir],
[0, "scons prefix=%s boost=%s/include/boost-1_37 build" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore)
- [0, "scons prefix=%s boost=%s/include/boost-1_37 install" % (PREFIX, PREFIX), baseDir],
+ [0, "scons prefix=%s boost=%s/include/boost-1_37 install" % (PREFIX, PREFIX), baseDir],
]
if isWindows():
buildCmds = [
@@ -868,7 +905,7 @@
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
# libs.append ( boost_python_index.lib )
- if isLinux():
+ if isLinux() or isMac():
if _STABLE:
base = "CEGUI-0.5.0"
source=[
@@ -1605,9 +1642,9 @@
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
- ]
- if isWindows():
+ , Config.PATH_INCLUDE_Ogre_Dependencies
+ ]
+ if isWindows():
include_dirs.append(os.path.join(Config.PATH_Bullet, 'Extras','GIMPACT','include'))
lib_dirs = [ boost.PATH_LIB
Added: trunk/python-ogre/patch/ogre_1.6.1_mac.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.6.1_mac.patch (rev 0)
+++ trunk/python-ogre/patch/ogre_1.6.1_mac.patch 2009-01-27 13:40:49 UTC (rev 856)
@@ -0,0 +1,627 @@
+--- /Users/andy/development/ogre/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm 2008-06-12 22:10:57.000000000 +0800
++++ ./src/OSX/OgreOSXCocoaWindow.mm 2009-01-10 10:02:43.000000000 +0800
+@@ -1,27 +1,27 @@
+ /*
+------------------------------------------------------------------------------
+-This source file is part of OGRE
+- (Object-oriented Graphics Rendering Engine)
+-For the latest info, see http://www.ogre3d.org/
+-
+-Copyright (c) 2000-2005 The OGRE Team
+-Also see acknowledgements in Readme.html
+-
+-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.
+------------------------------------------------------------------------------
+-*/
++ -----------------------------------------------------------------------------
++ This source file is part of OGRE
++ (Object-oriented Graphics Rendering Engine)
++ For the latest info, see http://www.ogre3d.org/
++
++ Copyright (c) 2000-2005 The OGRE Team
++ Also see acknowledgements in Readme.html
++
++ 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.
++ -----------------------------------------------------------------------------
++ */
+
+ #include "OgreOSXCocoaWindow.h"
+ #include "OgreRoot.h"
+@@ -39,16 +39,19 @@
+ #define GL_EXT_texture_env_combine 1
+ #include <OpenGL/glext.h>
+ #include <OpenGL/glu.h>
++#import <OpenGL/CGLMacro.h>
+
+ namespace Ogre {
+-
++
+ OSXCocoaWindow::OSXCocoaWindow()
+ {
+ mActive = false;
+ mContext = 0;
+ mWindow = 0;
++ mIsExternalGLControl = false;
++ mIsExternalGLContext = false;
+ }
+-
++
+ OSXCocoaWindow::~OSXCocoaWindow()
+ {
+ [glContext clearDrawable];
+@@ -58,32 +61,32 @@
+ }
+
+ void OSXCocoaWindow::create(const String& name, unsigned int width, unsigned int height,
+- bool fullScreen, const NameValuePairList *miscParams)
++ bool fullScreen, const NameValuePairList *miscParams)
+ {
+ NSAutoreleasePool *arp = [[NSAutoreleasePool alloc] init];
+ NSApplicationLoad();
+ //OgreWindowDelegate *delegate = [[OgreWindowDelegate alloc] initWithGLOSXCocoaWindow:this];
+ //[window setDelegate:delegate];
+ /*
+-***Key: "title" Description: The title of the window that will appear in the title bar Values: string Default: RenderTarget name
+-
+-Key: "colourDepth" Description: Colour depth of the resulting rendering window; only applies if fullScreen is set. Values: 16 or 32 Default: desktop depth Notes: [W32 specific]
+-
+-***Key: "left" Description: screen x coordinate from left Values: positive integers Default: 'center window on screen' Notes: Ignored in case of full screen
+-
+-***Key: "top" Description: screen y coordinate from top Values: positive integers Default: 'center window on screen' Notes: Ignored in case of full screen
+-
+-***Key: "depthBuffer" [DX9 specific] Description: Use depth buffer Values: false or true Default: true
+-
+-***Key: "externalWindowHandle" [API specific] Description: External window handle, for embedding the OGRE context Values: positive integer for W32 (HWND handle) poslong:posint:poslong (display*:screen:windowHandle) or poslong:posint:poslong:poslong (display*:screen:windowHandle:XVisualInfo*) for GLX Default: 0 (None)
+-
+-***Key: "FSAA" Description: Full screen antialiasing factor Values: 0,2,4,6,... Default: 0
+-
+-Key: "displayFrequency" Description: Display frequency rate, for fullscreen mode Values: 60...? Default: Desktop vsync rate
+-
+-Key: "vsync" Description: Synchronize buffer swaps to vsync Values: true, false Default: 0
+-*/
+-
++ ***Key: "title" Description: The title of the window that will appear in the title bar Values: string Default: RenderTarget name
++
++ Key: "colourDepth" Description: Colour depth of the resulting rendering window; only applies if fullScreen is set. Values: 16 or 32 Default: desktop depth Notes: [W32 specific]
++
++ ***Key: "left" Description: screen x coordinate from left Values: positive integers Default: 'center window on screen' Notes: Ignored in case of full screen
++
++ ***Key: "top" Description: screen y coordinate from top Values: positive integers Default: 'center window on screen' Notes: Ignored in case of full screen
++
++ ***Key: "depthBuffer" [DX9 specific] Description: Use depth buffer Values: false or true Default: true
++
++ ***Key: "externalWindowHandle" [API specific] Description: External window handle, for embedding the OGRE context Values: positive integer for W32 (HWND handle) poslong:posint:poslong (display*:screen:windowHandle) or poslong:posint:poslong:poslong (display*:screen:windowHandle:XVisualInfo*) for GLX Default: 0 (None)
++
++ ***Key: "FSAA" Description: Full screen antialiasing factor Values: 0,2,4,6,... Default: 0
++
++ Key: "displayFrequency" Description: Display frequency rate, for fullscreen mode Values: 60...? Default: Desktop vsync rate
++
++ Key: "vsync" Description: Synchronize buffer swaps to vsync Values: true, false Default: 0
++ */
++
+ BOOL hasDepthBuffer = YES;
+ int fsaa_samples = 0;
+ NSString *windowTitle = [NSString stringWithCString:name.c_str()];
+@@ -97,20 +100,20 @@
+ opt = miscParams->find("title");
+ if(opt != miscParams->end())
+ windowTitle = [NSString stringWithCString:opt->second.c_str()];
+-
++
+ opt = miscParams->find("left");
+ if(opt != miscParams->end())
+ winx = StringConverter::parseUnsignedInt(opt->second);
+-
++
+ opt = miscParams->find("top");
+ if(opt != miscParams->end())
+ winy = NSHeight([[NSScreen mainScreen] frame]) - StringConverter::parseUnsignedInt(opt->second) - height;
+-
+-
++
++
+ opt = miscParams->find("depthBuffer");
+ if(opt != miscParams->end())
+ hasDepthBuffer = StringConverter::parseBool(opt->second);
+-
++
+ opt = miscParams->find("FSAA");
+ if(opt != miscParams->end())
+ fsaa_samples = StringConverter::parseUnsignedInt(opt->second);
+@@ -118,228 +121,284 @@
+ opt = miscParams->find( "colourDepth" );
+ if( opt != miscParams->end() )
+ depth = StringConverter::parseUnsignedInt( opt->second );
+- }
+-
+-
+- NSOpenGLPixelFormat* openglFormat;
+- {
+- NSOpenGLPixelFormatAttribute attribs[30];
+- int i=0;
+-
+- if(fullScreen)
++
++ /*if ((opt = miscParams->find("externalGLContext")) != end)
++ {
++ mContext = new OSXCocoaContext(glContext);
++ mGlrc = (HGLRC)StringConverter::parseUnsignedLong(opt->second);
++ if( mGlrc )
++ mIsExternalGLContext = true;
++ }*/
++
++ opt = miscParams->find("currentGLContext");
++ if (opt != miscParams->end() && StringConverter::parseBool(opt->second))
+ {
+- GLRenderSystem *rs = static_cast<GLRenderSystem*>(Root::getSingleton().getRenderSystem());
+- OSXContext *mainContext = (OSXContext*)rs->_getMainContext();
+-
+- CGLContextObj share = NULL;
+- if(mainContext == 0)
++ LogManager::getSingleton().logMessage(String("OSX: Using CurrentGL Context"));
++ if (! CGLGetCurrentContext())
+ {
+- share = NULL;
++ LogManager::getSingleton().logMessage(String("OSX: CurrentGL Context does not exist"));
++ OGRE_EXCEPT(Exception::ERR_RENDERINGAPI_ERROR, "currentGLContext was specified with no current GL context", "GLXWindow::create");
+ }
+- else if(mainContext->getContextType() == "NSOpenGL")
+- {
+- OSXCocoaContext* cocoaContext = static_cast<OSXCocoaContext*>(mainContext);
+- NSOpenGLContext* nsShare = cocoaContext->getContext();
+- share = (CGLContextObj)[nsShare CGLContextObj];
+- }
+- else if(mainContext->getContextType() == "CGL")
+- {
+- OSXCGLContext* cglShare = static_cast<OSXCGLContext*>(mainContext);
+- share = cglShare->getContext();
+- }
+-
+- // create the context
+- createCGLFullscreen(width, height, depth, fsaa_samples, share);
+- }
+- else
+- {
+- // Specifying "NoRecovery" gives us a context that cannot fall back to the software renderer. This makes the View-based context a compatible with the fullscreen context, enabling us to use the "shareContext" feature to share textures, display lists, and other OpenGL objects between the two.
+- attribs[i++] = NSOpenGLPFANoRecovery;
+-
+- attribs[i++] = NSOpenGLPFAAccelerated;
+- attribs[i++] = NSOpenGLPFADoubleBuffer;
+-
+- attribs[i++] = NSOpenGLPFAAlphaSize;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
+-
+- attribs[i++] = NSOpenGLPFAStencilSize;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 1;
+-
+- attribs[i++] = NSOpenGLPFAAccumSize;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
+-
+- attribs[i++] = NSOpenGLPFADepthSize;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) (hasDepthBuffer? 16 : 0);
+-
+- if(fsaa_samples > 0)
+- {
+- attribs[i++] = NSOpenGLPFASampleBuffers;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 1;
+-
+- attribs[i++] = NSOpenGLPFASamples;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) fsaa_samples;
+- }
+-
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
+-
+- openglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes: attribs] autorelease];
+- }
+-
+- NameValuePairList::const_iterator opt2 = 0;
+- if(miscParams)
+- {
+- opt2 = miscParams->find("pixelFormat");
+- if(opt2 != miscParams->end())
+- openglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes: (NSOpenGLPixelFormatAttribute*)StringConverter::parseUnsignedLong(opt2->second)] autorelease];
+- }
+- GLRenderSystem *rs = static_cast<GLRenderSystem*>(Root::getSingleton().getRenderSystem());
+- OSXCocoaContext *mainContext = (OSXCocoaContext*)rs->_getMainContext();
+- NSOpenGLContext *shareContext = mainContext == 0? nil : mainContext->getContext();
+-
+- glContext = [[NSOpenGLContext alloc] initWithFormat: openglFormat shareContext:shareContext];
+-
+- NameValuePairList::const_iterator opt = 0;
+- if(miscParams)
+- opt = miscParams->find("externalWindowHandle");
+- if(!miscParams || opt == miscParams->end())
+- {
+- //Not sure why this should be but it is required for the window to work at fullscreen.
+- int styleMask = fullScreen? NSBorderlessWindowMask : NSResizableWindowMask;
+-
+- mWindow = [[OgreWindow alloc] initWithContentRect:NSMakeRect(winx, winy, width, height) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
+- [mWindow setTitle:windowTitle];
+-
+- if(winx == 0 && winy == 0) [mWindow center];
+-
+- mView = [[OgreView alloc] initWithGLOSXWindow:this];
+- [mWindow setContentView:mView];
+- }
+- else
+- {
+- mView = (OgreView*)StringConverter::parseUnsignedLong(opt->second);
+- [mView setOgreWindow:this];
+-
+- NSRect b = [mView bounds];
+- width = b.size.width;
+- height = b.size.height;
+- }
+-
+- [glContext setView:mView];
+-
+- mName = name;
+- mWidth = width;
+- mHeight = height;
+-
+- // Create register the context with the rendersystem and associate it with this window
+- mContext = new OSXCocoaContext(glContext);
+- /*rs->_registerContext(this, newContext);
+-
+- if (rs->_getMainContext() == 0)
+- [glContext makeCurrentContext];
+- */
+- //show window
+- if(mWindow)
+- [mWindow performSelectorOnMainThread:@selector(makeKeyAndOrderFront:) withObject:NULL waitUntilDone:NO];
++ mIsExternalGLContext = 1;
+
+- [arp release];
+- }
+-
+- // make active
+- mActive = true;
++ }
++
++
++ }
++
++
++ if ( !mIsExternalGLContext )
++ {
++ NSOpenGLPixelFormat* openglFormat;
++ NSOpenGLPixelFormatAttribute attribs[30];
++ int i=0;
++
++ if(fullScreen)
++ {
++ GLRenderSystem *rs = static_cast<GLRenderSystem*>(Root::getSingleton().getRenderSystem());
++ OSXContext *mainContext = (OSXContext*)rs->_getMainContext();
++
++ CGLContextObj share = NULL;
++ if(mainContext == 0)
++ {
++ share = NULL;
++ }
++ else if(mainContext->getContextType() == "NSOpenGL")
++ {
++ OSXCocoaContext* cocoaContext = static_cast<OSXCocoaContext*>(mainContext);
++ NSOpenGLContext* nsShare = cocoaContext->getContext();
++ share = (CGLContextObj)[nsShare CGLContextObj];
++ }
++ else if(mainContext->getContextType() == "CGL")
++ {
++ OSXCGLContext* cglShare = static_cast<OSXCGLContext*>(mainContext);
++ share = cglShare->getContext();
++ }
++
++ // create the context
++ createCGLFullscreen(width, height, depth, fsaa_samples, share);
++ }
++ else
++ {
++ // Specifying "NoRecovery" gives us a context that cannot fall back to the software renderer. This makes the View-based context a compatible with the fullscreen context, enabling us to use the "shareContext" feature to share textures, display lists, and other OpenGL objects between the two.
++ attribs[i++] = NSOpenGLPFANoRecovery;
++
++ attribs[i++] = NSOpenGLPFAAccelerated;
++ attribs[i++] = NSOpenGLPFADoubleBuffer;
++
++ attribs[i++] = NSOpenGLPFAAlphaSize;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
++
++ attribs[i++] = NSOpenGLPFAStencilSize;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 1;
++
++ attribs[i++] = NSOpenGLPFAAccumSize;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
++
++ attribs[i++] = NSOpenGLPFADepthSize;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) (hasDepthBuffer? 16 : 0);
++
++ if(fsaa_samples > 0)
++ {
++ attribs[i++] = NSOpenGLPFASampleBuffers;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 1;
++
++ attribs[i++] = NSOpenGLPFASamples;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) fsaa_samples;
++ }
++
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
++
++ openglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes: attribs] autorelease];
++ }
++
++ // Either full screen has been setup or we're setup the attributes for a window
++
++ NameValuePairList::const_iterator opt2 = 0;
++ if(miscParams)
++ {
++ opt2 = miscParams->find("pixelFormat");
++ if(opt2 != miscParams->end())
++ openglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes: (NSOpenGLPixelFormatAttribute*)StringConverter::parseUnsignedLong(opt2->second)] autorelease];
++ }
++ LogManager::getSingleton().logMessage(String("OSX: Checking for Shared Context"));
++
++ // check if there is an existing context and use it as a shared context
++ GLRenderSystem *rs = static_cast<GLRenderSystem*>(Root::getSingleton().getRenderSystem());
++ OSXCocoaContext *mainContext = (OSXCocoaContext*)rs->_getMainContext();
++
++ NSOpenGLContext *shareContext = mainContext == 0? nil : mainContext->getContext();
++ glContext = [[NSOpenGLContext alloc] initWithFormat: openglFormat shareContext:shareContext];
++ LogManager::getSingleton().logMessage(String("OSX: Created base Context"));
++
++ NameValuePairList::const_iterator opt = 0;
++ if(miscParams)
++ opt = miscParams->find("externalWindowHandle");
++ if(!miscParams || opt == miscParams->end())
++ {
++ //Not sure why this should be but it is required for the window to work at fullscreen.
++ int styleMask = fullScreen? NSBorderlessWindowMask : NSResizableWindowMask;
++
++ mWindow = [[OgreWindow alloc] initWithContentRect:NSMakeRect(winx, winy, width, height) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
++ //[mWindow setTitle:windowTitle];
++
++ //if(winx == 0 && winy == 0) [mWindow center];
++
++ mView = [[OgreView alloc] initWithGLOSXWindow:this];
++ [mWindow setContentView:mView];
++ }
++ else
++ {
++ mView = (OgreView*)StringConverter::parseUnsignedLong(opt->second);
++ [mView setOgreWindow:this];
++
++ NSRect b = [mView bounds];
++ width = b.size.width;
++ height = b.size.height;
++ }
++
++ [glContext setView:mView];
++ mName = name;
++ mWidth = width;
++ mHeight = height;
++ }
++ else { // it's an external context
++ // we've let everything setup normally to this point -- now change context to the current one if needed
++ glContext = [NSOpenGLContext currentContext]; //[glContext currentContext];
++ LogManager::getSingleton().logMessage(String("OSX: Set to current Context"));
++ //[glContext setView:mView];
++ NSRect f = NSMakeRect(0,0,width,height );
++ mView = [[OgreView alloc] initWithFrame:f];
++ // could do everything from the context view
++ // mView = [glContext view];
++ //[mWindow setContentView:mView];
++ //[mView setOgreWindow:this];
++ mWindow=0;
++ //mWindow = [glContext view:window];
++ }
++
++ // Create register the context with the rendersystem and associate it with this window
++ LogManager::getSingleton().logMessage(String("OSX: Creating OSXCocoaContext"));
++
++ mContext = new OSXCocoaContext(glContext);
++ /*rs->_registerContext(this, newContext);
++
++ if (rs->_getMainContext() == 0)
++ [glContext makeCurrentContext];
++ */
++ //show window
++ if(mWindow)
++ [mWindow performSelectorOnMainThread:@selector(makeKeyAndOrderFront:) withObject:NULL waitUntilDone:NO];
++ LogManager::getSingleton().logMessage(String("OSX: Done creating !"));
++
++ [arp release];
++
++ // make active
++ mActive = true;
+ }
+-
++
+ void OSXCocoaWindow::destroy(void)
+ {
+- if(mIsFullScreen)
+- destroyCGLFullscreen();
+-
+- // Unregister and destroy OGRE GLContext
+- delete mContext;
+-
+- if(mWindow) [mWindow close];
+-
++ if(mIsFullScreen)
++ destroyCGLFullscreen();
++
++ // Unregister and destroy OGRE GLContext
++ delete mContext;
++
++ if(mWindow) [mWindow close];
++
+ mActive = false;
+-
++
+ Root::getSingleton().getRenderSystem()->detachRenderTarget( this->getName() );
+ }
+-
+- /*OgreView* OSXCocoaWindow::ogreView() const
+- {
+- return [window contentView];
+- }*/
+-
++
++ /*OgreView* OSXCocoaWindow::ogreView() const
++ {
++ return [window contentView];
++ }*/
++
+ bool OSXCocoaWindow::isActive() const
+ {
+ return mActive;
+ }
+-
++
+ bool OSXCocoaWindow::isClosed() const
+ {
+ return false;
+ }
+-
++
+ void OSXCocoaWindow::reposition(int left, int top)
+ {
+- if(!mWindow) return;
+-
+- NSRect frame = [mWindow frame];
+- frame.origin.x = left;
+- frame.origin.y = top-frame.size.height;
+- [mWindow setFrame:frame display:YES];
+- }
++ LogManager::getSingleton().logMessage(String("OSX::: Reposition !"));
+
++ if(!mWindow) return;
++
++ NSRect frame = [mWindow frame];
++ frame.origin.x = left;
++ frame.origin.y = top-frame.size.height;
++ [mWindow setFrame:frame display:YES];
++ }
++
+ void OSXCocoaWindow::resize(unsigned int width, unsigned int height)
+ {
+- if(!mWindow) return;
+-
+- NSRect frame = [mWindow frame];
+- frame.size.width = width;
+- frame.size.height = height;
+- [mWindow setFrame:frame display:YES];
+- /*SHOULD be called from delegate
+- for (ViewportList::iterator it = mViewportList.begin(); it != mViewportList.end(); ++it)
+- {
+- (*it).second->_updateDimensions();
+- }*/
++ LogManager::getSingleton().logMessage(String("OSX::: Resize !"));
++ if(!mWindow) return;
++
++ NSRect frame = [mWindow frame];
++ frame.size.width = width;
++ frame.size.height = height;
++ [mWindow setFrame:frame display:YES];
++ /*SHOULD be called from delegate
++ for (ViewportList::iterator it = mViewportList.begin(); it != mViewportList.end(); ++it)
++ {
++ (*it).second->_updateDimensions();
++ }*/
+ }
+-
++
+ void OSXCocoaWindow::windowMovedOrResized()
+ {
+- [glContext update];
+- NSRect frame = [mView frame];
+- mWidth = (unsigned int)frame.size.width;
+- mHeight = (unsigned int)frame.size.height;
++ LogManager::getSingleton().logMessage(String("OSX::: windowMovedOrResized !"));
++ [glContext update];
++ NSRect frame = [mView frame];
++ mWidth = (unsigned int)frame.size.width;
++ mHeight = (unsigned int)frame.size.height;
+ mLeft = (int)frame.origin.x;
+ mTop = (int)frame.origin.y+(unsigned int)frame.size.height;
+-
++
+ for (ViewportList::iterator it = mViewportList.begin(); it != mViewportList.end(); ++it)
+ {
+ (*it).second->_updateDimensions();
+ }
+ }
+-
++
+ void OSXCocoaWindow::swapBuffers(bool waitForVSync)
+ {
+- if(!mIsFullScreen)
+- [glContext flushBuffer];
+- else
+- swapCGLBuffers();
+-
+- /*if(![[[NSRunLoop currentRunLoop] currentMode] isEqualTo:NSEventTrackingRunLoopMode])
+- {
+- NSEvent *e = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
+- if(e)
+- [NSApp sendEvent:e];
+- }*/
++ LogManager::getSingleton().logMessage(String("OSX: swapBuffers 1"));
++ // return;
++ if ( mIsExternalGLContext ) {
++ //glFlush();
++ return;
++ }
++ if(!mIsFullScreen)
++ [glContext flushBuffer];
++ else
++ swapCGLBuffers();
++
++ /*if(![[[NSRunLoop currentRunLoop] currentMode] isEqualTo:NSEventTrackingRunLoopMode])
++ {
++ NSEvent *e = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
++ if(e)
++ [NSApp sendEvent:e];
++ }*/
++ }
++
++ //-------------------------------------------------------------------------------------------------//
++ void OSXCocoaWindow::getCustomAttribute( const String& name, void* pData )
++ {
++ if( name == "GLCONTEXT" )
++ {
++ *static_cast<OSXContext**>(pData) = mContext;
++ return;
++ }
+ }
+-
+- //-------------------------------------------------------------------------------------------------//
+- void OSXCocoaWindow::getCustomAttribute( const String& name, void* pData )
+- {
+- if( name == "GLCONTEXT" )
+- {
+- *static_cast<OSXContext**>(pData) = mContext;
+- return;
+- }
+- }
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-28 00:36:44
|
Revision: 857
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=857&view=rev
Author: andy_miller
Date: 2009-01-28 00:36:40 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
Further Mac updates - 4 more modules now building (et, noise, cadunetree, caelum)
Modified Paths:
--------------
trunk/python-ogre/SConstruct
trunk/python-ogre/code_generators/cadunetree/customization_data.py
trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h
trunk/python-ogre/code_generators/caelum/customization_data.py
trunk/python-ogre/code_generators/caelum/python_caelum.h
trunk/python-ogre/code_generators/et/customization_data.py
trunk/python-ogre/code_generators/et/python_et.h
trunk/python-ogre/code_generators/hydrax/customization_data.py
trunk/python-ogre/code_generators/hydrax/python_hydrax.h
trunk/python-ogre/code_generators/noise/customization_data.py
trunk/python-ogre/code_generators/noise/python_noise.h
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/SConstruct 2009-01-28 00:36:40 UTC (rev 857)
@@ -68,6 +68,7 @@
else:
CCFLAGS = ' -I./ -O3 -dynamic -fPIC -DBOOST_PYTHON_NO_PY_SIGNATURES -DBOOST_PYTHON_MAX_ARITY=19 '
CCFLAGS += ' -ftemplate-depth-128 -finline-functions -Wno-inline -Wall -no-cpp-precomp -gdwarf-2 -DNDEBUG '
+ CCFLAGS += ' -include strings.h -include Carbon/Carbon.h '
# -ftemplate-depth-128 -D_POSIX_C_SOURCE -no-cpp-precomp -gdwarf-2 -finline-functions -Wno-inline -Wall -DBOOST_ALL_NO_LIB=1 -DBOOST_PYTHON_SOURCE
# -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/
# -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/ CCFLAGS = ' -I -pipe -O3 -I./'
Modified: trunk/python-ogre/code_generators/cadunetree/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/cadunetree/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,7 +1,9 @@
-
+import os
def header_files( version ):
- return [ 'CaduneTree.h']
-
+ ret= [ 'CaduneTree.h']
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
def huge_classes( version ):
return []
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "CTParameters.h"
#include "CTSerializer.h"
//#include "CTSection.h"
Modified: trunk/python-ogre/code_generators/caelum/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/caelum/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,7 +1,9 @@
-
+import os
def header_files( version ):
- return [ 'Caelum.h']
-
+ ret = [ 'Caelum.h']
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
def huge_classes( version ):
return []
Modified: trunk/python-ogre/code_generators/caelum/python_caelum.h
===================================================================
--- trunk/python-ogre/code_generators/caelum/python_caelum.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/caelum/python_caelum.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "Caelum.h"
// First we create a magic namespace to hold all our aliases
Modified: trunk/python-ogre/code_generators/et/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/et/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/et/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,13 +1,16 @@
-
+import os
def header_files( version ):
- return ['ETTerrainInfo.h',
+ ret = ['ETTerrainInfo.h',
'ETTerrainManager.h',
'ETBrush.h',
'ETSplattingManager.h',
'Ogre.h',
'OgreColourValue.h',
'OgreImage.h'
-]
+ ]
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
##,
## 'OgreColourValue.h'
def huge_classes( version ):
Modified: trunk/python-ogre/code_generators/et/python_et.h
===================================================================
--- trunk/python-ogre/code_generators/et/python_et.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/et/python_et.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "ETTerrainInfo.h"
#include "ETTerrainManager.h"
Modified: trunk/python-ogre/code_generators/hydrax/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/hydrax/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/hydrax/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,11 +1,13 @@
-
+import os
def header_files( version ):
- return [ 'Hydrax.h',
+ ret= [ 'Hydrax.h',
"ProjectedGrid.h",
"SimpleGrid.h",
"Perlin.h"
]
-
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
def huge_classes( version ):
return []
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/hydrax/python_hydrax.h
===================================================================
--- trunk/python-ogre/code_generators/hydrax/python_hydrax.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/hydrax/python_hydrax.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "Hydrax.h"
#include "ProjectedGrid.h"
#include "SimpleGrid.h"
Modified: trunk/python-ogre/code_generators/noise/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/noise/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/noise/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,8 +1,10 @@
-
+import os
def header_files( version ):
- return [ 'noise.h',
+ ret= [ 'noise.h',
'noiseutils.h']
-
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
def huge_classes( version ):
return []
Modified: trunk/python-ogre/code_generators/noise/python_noise.h
===================================================================
--- trunk/python-ogre/code_generators/noise/python_noise.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/noise/python_noise.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "noise.h"
#include "noiseutils.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-28 07:39:27
|
Revision: 861
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=861&view=rev
Author: andy_miller
Date: 2009-01-28 07:39:23 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
Mac updates
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/noise/line.cpp
trunk/python-ogre/code_generators/ogreal/python_ogreal.h
trunk/python-ogre/code_generators/ogrebulletc/python_ogrebullet.h
trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h
trunk/python-ogre/code_generators/ogreforests/python_forests.h
trunk/python-ogre/code_generators/ogreode/python_ode.h
trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h
trunk/python-ogre/code_generators/quickgui/python_quickgui.h
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/ThirdParty/noise/line.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/line.cpp 2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/ThirdParty/noise/line.cpp 2009-01-28 07:39:23 UTC (rev 861)
@@ -19,9 +19,10 @@
#include "line.h"
-using namespace noise;
-using namespace noise::model;
+namespace noise {
+namespace model {
+
Line::Line ():
m_attenuate (true),
@@ -63,3 +64,5 @@
return value;
}
}
+
+} } // namespaces
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/ogreal/python_ogreal.h
===================================================================
--- trunk/python-ogre/code_generators/ogreal/python_ogreal.h 2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogreal/python_ogreal.h 2009-01-28 07:39:23 UTC (rev 861)
@@ -1,6 +1,9 @@
#ifndef __python_ogreal_h_5B402FBF_8DE8_49C9_AF71_1CF9634B5344__
#define __python_ogreal_h_5B402FBF_8DE8_49C9_AF71_1CF9634B5344__
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
//See best practices section in Py++ documentation
//#include "../ogre/python_ogre_masterlist.h"
#include "OgreAL.h"
Modified: trunk/python-ogre/code_generators/ogrebulletc/python_ogrebullet.h
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletc/python_ogrebullet.h 2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogrebulletc/python_ogrebullet.h 2009-01-28 07:39:23 UTC (rev 861)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "OgreBulletCollisions.h"
// First we create a magic namespace to hold all our aliases
Modified: trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h 2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h 2009-01-28 07:39:23 UTC (rev 861)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "OgreBulletDynamics.h"
#include "LinearMath/btStackAlloc.h"
#include "LinearMath/btPoolAllocator.h"
Modified: trunk/python-ogre/code_generators/ogreforests/python_forests.h
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/python_forests.h 2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogreforests/python_forests.h 2009-01-28 07:39:23 UTC (rev 861)
@@ -1,4 +1,10 @@
#include <string>
+
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
+
#include "PagedGeometry.h"
#include "GrassLoader.h"
Modified: trunk/python-ogre/code_generators/ogreode/python_ode.h
===================================================================
--- trunk/python-ogre/code_generators/ogreode/python_ode.h 2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogreode/python_ode.h 2009-01-28 07:39:23 UTC (rev 861)
@@ -6,7 +6,10 @@
#include <vector>
#include <string>
#include <map>
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "ode/ode.h"
#include "ode/common.h"
#include "ode/odecpp.h"
Modified: trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h 2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h 2009-01-28 07:39:23 UTC (rev 861)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "Ogre.h"
#include "OgrePortal.h"
#include "OgrePCZSceneNode.h"
Modified: trunk/python-ogre/code_generators/quickgui/python_quickgui.h
===================================================================
--- trunk/python-ogre/code_generators/quickgui/python_quickgui.h 2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/quickgui/python_quickgui.h 2009-01-28 07:39:23 UTC (rev 861)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "Ogre.h" // need to include this
#include "QuickGUIRoot.h"
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/environment.py 2009-01-28 07:39:23 UTC (rev 861)
@@ -1722,7 +1722,7 @@
descText = "Generate 'noise'"
class watermesh:
- active = True
+ active = False
pythonModule = True
version="1.0"
parent="ogre/addons"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-30 13:42:51
|
Revision: 867
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=867&view=rev
Author: andy_miller
Date: 2009-01-30 13:42:48 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
Update Changelog
Fix possible issue with Canvas based upon forum comments - testing yet to happen
Added multiple moduel dependencies to OgreODE (Ogre + Ode)
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/ThirdParty/canvas/Atlas.cpp
trunk/python-ogre/ThirdParty/canvas/Canvas.cpp
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogreode/generate_code.py
trunk/python-ogre/demos/ogre/tests/Test_DataStream.py
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/ChangeLog.txt 2009-01-30 13:42:48 UTC (rev 867)
@@ -1,3 +1,7 @@
+xxxx 2009 : Release 1.6.1.xxx
+================================
+Fix: Exposed std::vector<bool> for joystick buttons in OIS
+
Janurary 25 2009 : Release 1.6.1
================================
Latest build using Ogre 1.6.1 -- Note that the underlying Ogre C++ is NOT Patched!!
Modified: trunk/python-ogre/ThirdParty/canvas/Atlas.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/canvas/Atlas.cpp 2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/ThirdParty/canvas/Atlas.cpp 2009-01-30 13:42:48 UTC (rev 867)
@@ -215,8 +215,9 @@
if(!bitmap.buffer || (!bitmap.rows && !bitmap.width))
continue;
- unsigned char* buffer = new unsigned char[bitmap.rows * bitmap.pitch * 2];
-
+ //unsigned char* buffer = new unsigned char[bitmap.rows * bitmap.pitch * 2];
+ unsigned char* buffer = OGRE_ALLOC_T(unsigned char, bitmap.rows * bitmap.pitch * 2, Ogre::MEMCATEGORY_GENERAL);
+
for(int idx = 0; idx < bitmap.rows * bitmap.pitch; idx++)
{
buffer[idx * 2] = 255;
@@ -251,7 +252,8 @@
rectangles.push_back(new ComputationRect(*i, resourceGroup));
}
- unsigned char* vcolBuffer = new unsigned char[16];
+ //unsigned char* vcolBuffer = new unsigned char[16];
+ unsigned char* vcolBuffer = OGRE_ALLOC_T(unsigned char, 16, Ogre::MEMCATEGORY_GENERAL);
memset(vcolBuffer, 255, 16);
rectangles.push_back(new ComputationRect("VertexColor", vcolBuffer, 2, 2));
Modified: trunk/python-ogre/ThirdParty/canvas/Canvas.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/canvas/Canvas.cpp 2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/ThirdParty/canvas/Canvas.cpp 2009-01-30 13:42:48 UTC (rev 867)
@@ -82,7 +82,7 @@
************************/
Canvas::Canvas(Atlas* atlas, Ogre::Viewport* viewport) : atlas(atlas), viewport(viewport), vertexData(0), indexData(0),
- bufferSize(100), renderQueueID(Ogre::RENDER_QUEUE_OVERLAY), isDirty(false), visibility(true)
+ bufferSize(100), renderQueueID(Ogre::RENDER_QUEUE_OVERLAY + 1), isDirty(false), visibility(true)
{
viewport->getTarget()->addListener(this);
material = Ogre::MaterialManager::getSingleton().getByName(atlas->getMaterialName());
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-30 13:42:48 UTC (rev 867)
@@ -789,7 +789,8 @@
common_utils.Fix_Pointer_Returns ( main_ns, pointee_types, ignore_names )
# functions that need to have implicit conversions turned off
- ImplicitClasses=['Radian','Degree', 'TimeIndex', 'LiSPSMShadowCameraSetup' ]
+ ## This is already turned off - don't want to turn it back on...
+ ImplicitClasses=[] ## 'Radian','Degree', 'TimeIndex', 'LiSPSMShadowCameraSetup' ]
common_utils.Fix_Implicit_Conversions ( main_ns, ImplicitClasses )
# variables that are readonly and mutable need to be changed from 'vars' to properties so there
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2009-01-30 13:42:48 UTC (rev 867)
@@ -289,6 +289,7 @@
# if this module depends on another set it here
mb.register_module_dependency ( environment.ogre.generated_dir )
+ mb.register_module_dependency ( environment.ois.generated_dir )
# normally implicit conversions work OK, however they can cause strange things to happen so safer to leave off
mb.constructors().allow_implicit_conversion = False
Modified: trunk/python-ogre/demos/ogre/tests/Test_DataStream.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_DataStream.py 2009-01-30 05:44:36 UTC (rev 866)
+++ trunk/python-ogre/demos/ogre/tests/Test_DataStream.py 2009-01-30 13:42:48 UTC (rev 867)
@@ -54,6 +54,9 @@
print p
## if you want you can confirm this
+ print dataptr
+ print type(dataptr)
+ #sys.exit()
ogre.MaterialManager.getSingleton().parseScript( dataptr, "General" )
print "MATERIAL OK using Ctypes"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-30 13:53:27
|
Revision: 868
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=868&view=rev
Author: andy_miller
Date: 2009-01-30 13:53:17 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
OgreNewt fixed for Mac -- now build OgreNewt C++ along with the wrapper code much like many of the thirdparty modules
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogrenewt/generate_code.py
trunk/python-ogre/code_generators/ogrenewt/python_ogrenewt.h
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/code_generators/ogrenewt/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2009-01-30 13:42:48 UTC (rev 867)
+++ trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2009-01-30 13:53:17 UTC (rev 868)
@@ -214,13 +214,13 @@
, environment.ogrenewt.cache_file )
defined_symbols = [ 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE',
- 'ogrenewt_NONCLIENT_BUILD','OIS_NONCLIENT_BUILD', 'OIS_STATIC_BUILD' ]
+ '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')
- if environment.isLinux():
+ if environment.isLinux():
defined_symbols.append('BOOST_IS_ENUM')
mb = module_builder.module_builder_t( [ xml_cached_fc ]
@@ -228,6 +228,7 @@
, working_directory=environment.root_dir
, include_paths=environment.ogrenewt.include_dirs
, define_symbols=defined_symbols
+ , cflags=environment.ogrenewt.cflags
, indexing_suite_version=2 )
## This module depends on Ogre
@@ -293,6 +294,19 @@
# if not os.path.exists( return_pointee_value_target_path ):
# shutil.copy( return_pointee_value_source_path, environment.ogrenewt.generated_dir )
+ if environment.isMac():
+ ## now we need to ensure a series of headers and additional source files are
+ ## copied to the generated directory..
+ basePath = os.path.join(environment.Config.PATH_OgreAddons,'ogrenewt', 'OgreNewt_Main')
+ common_utils.copyTree ( sourcePath = os.path.join(basePath, 'inc'),
+ destPath = environment.ogrenewt.generated_dir,
+ recursive= False,
+ extensions = ['h'] )
+ common_utils.copyTree ( sourcePath = os.path.join(basePath, 'src'),
+ destPath = environment.ogrenewt.generated_dir,
+ recursive= False,
+ collapse = True, # put all the source in a single directory
+ extensions = ['cpp'] )
if __name__ == '__main__':
start_time = time.clock()
Modified: trunk/python-ogre/code_generators/ogrenewt/python_ogrenewt.h
===================================================================
--- trunk/python-ogre/code_generators/ogrenewt/python_ogrenewt.h 2009-01-30 13:42:48 UTC (rev 867)
+++ trunk/python-ogre/code_generators/ogrenewt/python_ogrenewt.h 2009-01-30 13:53:17 UTC (rev 868)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include <vector>
#include <string>
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-30 13:42:48 UTC (rev 867)
+++ trunk/python-ogre/environment.py 2009-01-30 13:53:17 UTC (rev 868)
@@ -705,7 +705,8 @@
[0, "cp OgrePrerequisites.h Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
[0, "xcodebuild -project ogre/Mac/Ogre/Ogre.xcodeproj -configuration Release", ''],
[0, "xcodebuild -project ogre/Mac/Samples/Samples.xcodeproj -configuration Release", ''],
- [0, "cp -R *.framework ~/Library/Frameworks", os.path.join(os.getcwd() ,'ogre',"Mac", "build", "Release") ]
+ [0, "cp -R *.framework ~/Library/Frameworks", os.path.join(os.getcwd() ,'ogre',"Mac", "build", "Release") ],
+ [0, "cp -R *.framework ~/Library/Frameworks", os.path.join(os.getcwd() ,'ogre',"Dependencies") ]
]
libs=[boost.lib]
@@ -844,9 +845,11 @@
base = 'ogreaddons/ogrenewt'
if isWindows():
libs = ['Newton', boost.lib, 'OgreNewt_Main', 'OgreMain']
+ elif isLinux():
+ libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
else:
- libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
-# libs.append ( boost_python_index.lib )
+ libs = ['Newton32', boost.lib, 'OgreMain']
+
if _STABLE:
source = [
[cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
@@ -883,6 +886,19 @@
, Config.PATH_LIB_Ogre_OgreMain
]
+ if isMac():
+ include_dirs = [Config.PATH_Boost
+ , Config.PATH_Newton # only one path for Newton
+ , Config.PATH_INCLUDE_Ogre
+ , Config.PATH_INCLUDE_Ogre_Dependencies #needed for OIS/OIS.h
+ ,os.path.join(Config.PATH_OgreAddons,'ogrenewt', 'OgreNewt_Main', 'inc')
+ ]
+ lib_dirs = [ boost.PATH_LIB
+ ,Config.PATH_LIB_Newton
+ , Config.PATH_LIB_Ogre_OgreMain
+ ]
+ if isMac():
+ LINKFLAGS = ' -framework OIS '
ModuleName = 'OgreNewt'
CheckIncludes=['boost/python.hpp', 'Ogre.h', 'OgreNewt.h', 'Newton.h']
@@ -901,8 +917,10 @@
pchbuild = 'buildpch.cpp'
pchincludes = ['boost/python.hpp', 'cegui.h']
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ]
+ elif isLinux():
+ libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
else:
- libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
+ libs=[boost.lib, 'CEGUI', 'OgreMain', 'CEGUIOgreRenderer' ]
# libs.append ( boost_python_index.lib )
if isLinux() or isMac():
@@ -960,9 +978,10 @@
, Config.PATH_LIB_Ogre_Dependencies
]
ModuleName = 'CEGUI'
+ if isMac():
+ LINKFLAGS = ' -F CEGUI '
+
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
-# if isLinux():
-# LINKFLAGS = "-l%s" % boost_python_index.lib
class ode:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-07 03:44:09
|
Revision: 875
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=875&view=rev
Author: andy_miller
Date: 2009-02-07 03:44:05 +0000 (Sat, 07 Feb 2009)
Log Message:
-----------
Updates for ffmpeg video wrapper
Dotscene loader demo (needs media files)
Removed unused wrapper code from Ogre (replaced by ctypes support)
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ThirdParty/dxwebsetup.exe
trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.cpp
trunk/python-ogre/code_generators/common_utils/shared_ptr.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogredshow/generate_code.py
trunk/python-ogre/demos/dshow/Demo_Video.py
trunk/python-ogre/demos/ffmpeg/Demo_Video.py
trunk/python-ogre/demos/ffmpeg/resources.cfg
trunk/python-ogre/demos/ogre/dotscene.py
trunk/python-ogre/demos/ogre/tests/Test_WriteToTexture.py
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/UpdateDLLs.bat
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/extra/bin/avcodec-52.dll
trunk/python-ogre/ThirdParty/extra/bin/avdevice-52.dll
trunk/python-ogre/ThirdParty/extra/bin/avformat-52.dll
trunk/python-ogre/ThirdParty/extra/bin/avutil-49.dll
trunk/python-ogre/ThirdParty/extra/bin/swscale-0.dll
trunk/python-ogre/ThirdParty/extra/lib/avcodec-52.lib
trunk/python-ogre/ThirdParty/extra/lib/avdevice-52.lib
trunk/python-ogre/ThirdParty/extra/lib/avformat-52.lib
trunk/python-ogre/ThirdParty/extra/lib/avutil-49.lib
trunk/python-ogre/ThirdParty/extra/lib/swscale-0.lib
trunk/python-ogre/demos/ogre/Demo_DotScene.py
trunk/python-ogre/demos/ogre/tests/Simple1.py
trunk/python-ogre/demos/ogre/tests/Simple1_slow.py
trunk/python-ogre/demos/ogre/tests/Test_Manual1.py
trunk/python-ogre/demos/ogre/tests/Test_userDefinedObject.py
trunk/python-ogre/demos/ogre/tests/Test_wx.py
trunk/python-ogre/demos/ogre/tests/pygametest.py
trunk/python-ogre/demos/ogre/tests/test_1.py
trunk/python-ogre/demos/ogre/tests/test_dermont1
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/extra/bin/avcodec.dll
trunk/python-ogre/ThirdParty/extra/bin/avcodec.lib
trunk/python-ogre/ThirdParty/extra/bin/avdevice.dll
trunk/python-ogre/ThirdParty/extra/bin/avdevice.lib
trunk/python-ogre/ThirdParty/extra/bin/avformat.dll
trunk/python-ogre/ThirdParty/extra/bin/avformat.lib
trunk/python-ogre/ThirdParty/extra/bin/avutil.dll
trunk/python-ogre/ThirdParty/extra/bin/avutil.lib
trunk/python-ogre/ThirdParty/extra/bin/swscale.dll
trunk/python-ogre/ThirdParty/extra/bin/swscale.lib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-07 06:52:09
|
Revision: 877
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=877&view=rev
Author: andy_miller
Date: 2009-02-07 06:52:06 +0000 (Sat, 07 Feb 2009)
Log Message:
-----------
Updated DotScene demo to have a nicer starting location.
Added necessary media for DotScene demo
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/demos/ogre/Demo_DotScene.py
Added Paths:
-----------
trunk/python-ogre/demos/media_extra/quake/
trunk/python-ogre/demos/media_extra/quake/roadster/
trunk/python-ogre/demos/media_extra/quake/roadster/Scene.material
trunk/python-ogre/demos/media_extra/quake/roadster/b_glass.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/b_hlites.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/b_int.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/b_main.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/b_main1.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/b_steer.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/b_tlites.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/b_under.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/pPlane2.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/pPlane3.mesh
trunk/python-ogre/demos/media_extra/quake/roadster/roadster.scene
trunk/python-ogre/demos/media_extra/quake/textures/
trunk/python-ogre/demos/media_extra/quake/textures/gibs.png
trunk/python-ogre/demos/media_extra/quake/textures/glass.tga
trunk/python-ogre/demos/media_extra/quake/textures/green_main.tga
trunk/python-ogre/demos/media_extra/quake/textures/hlites.tga
trunk/python-ogre/demos/media_extra/quake/textures/int.tga
trunk/python-ogre/demos/media_extra/quake/textures/under.tga
trunk/python-ogre/demos/ogreforests/media/grass/__ReadMe__.txt
trunk/python-ogre/demos/ogreforests/media/terrains/terrain2.cfg
trunk/python-ogre/demos/ogreforests/media/terrains/terrain_lightmap.jpg
trunk/python-ogre/demos/ogreforests/media/terrains/terrain_texture2.jpg
trunk/python-ogre/demos/ogreforests/media/trees/Bush.blend
trunk/python-ogre/demos/ogreforests/media/trees/Bush.mesh
trunk/python-ogre/demos/ogreforests/media/trees/Tree0.blend
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-08 05:33:27
|
Revision: 879
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=879&view=rev
Author: andy_miller
Date: 2009-02-08 05:33:24 +0000 (Sun, 08 Feb 2009)
Log Message:
-----------
Minor Mac updates
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/environment.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-08 06:35:14
|
Revision: 883
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=883&view=rev
Author: andy_miller
Date: 2009-02-08 06:35:11 +0000 (Sun, 08 Feb 2009)
Log Message:
-----------
Update to get CEGUI working on the MAC
Modified Paths:
--------------
trunk/python-ogre/environment.py
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-09 22:51:07
|
Revision: 886
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=886&view=rev
Author: andy_miller
Date: 2009-02-09 22:34:17 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
Significant update on bullet wrapper to match 2.73 version...
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ReportVersion.py
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h
trunk/python-ogre/code_generators/bullet/customization_data.py
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/bullet/python_bullet.h
trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h
trunk/python-ogre/code_generators/bullet/python_bullet_sizeof.h
trunk/python-ogre/environment.py
trunk/python-ogre/patch/cegui.patch
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-10 05:55:45
|
Revision: 888
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=888&view=rev
Author: andy_miller
Date: 2009-02-10 05:55:38 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
Fixes for OgreBullet wrapper generation
Made a fix for VC9 gccxml code generation (implemented it as a global change in environment.py)
Exposing functions that return simple pointers with ctypes return_addressof functionality (previously had been excluded)
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.cpp
trunk/python-ogre/code_generators/common_utils/__init__.py
trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
trunk/python-ogre/environment.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-14 00:50:54
|
Revision: 890
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=890&view=rev
Author: andy_miller
Date: 2009-02-14 00:50:43 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Updated QuickGUI to 9.02
Finished Canvas wrapper and demo
Additional work on bullet
Started on the RakNet wrapper (not working yet)
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ThirdParty/canvas/Canvas.cpp
trunk/python-ogre/ThirdParty/canvas/Canvas.h
trunk/python-ogre/code_generators/bullet/customization_data.py
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/bullet/python_bullet.h
trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h
trunk/python-ogre/code_generators/bullet/python_bullet_sizeof.h
trunk/python-ogre/code_generators/canvas/customization_data.py
trunk/python-ogre/code_generators/canvas/python_canvas.h
trunk/python-ogre/code_generators/common_utils/__init__.py
trunk/python-ogre/code_generators/common_utils/extract_documentation.py
trunk/python-ogre/code_generators/ois/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
trunk/python-ogre/code_generators/quickgui/python_quickgui_sizeof.h
trunk/python-ogre/code_generators/template/generate_code.py
trunk/python-ogre/demos/ogrebullet/Demo_OgreCollision01.py
trunk/python-ogre/demos/qgui/Demo_QuickGUI01.py
trunk/python-ogre/demos/qgui/resources.cfg
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/canvas/CanvasPO.h
trunk/python-ogre/ThirdParty/canvas/DancingGraphElement.cpp
trunk/python-ogre/ThirdParty/canvas/DancingGraphElement.h
trunk/python-ogre/ThirdParty/canvas/Document.cpp
trunk/python-ogre/ThirdParty/canvas/Document.h
trunk/python-ogre/ThirdParty/canvas/Element.cpp
trunk/python-ogre/ThirdParty/canvas/Element.h
trunk/python-ogre/ThirdParty/canvas/ImageElement.cpp
trunk/python-ogre/ThirdParty/canvas/ImageElement.h
trunk/python-ogre/ThirdParty/canvas/Parser.cpp
trunk/python-ogre/ThirdParty/canvas/Parser.h
trunk/python-ogre/ThirdParty/canvas/TextFlowElement.cpp
trunk/python-ogre/ThirdParty/canvas/TextFlowElement.h
trunk/python-ogre/ThirdParty/canvas/Utils.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUI.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIAnchors.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBaseDesc.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorderEnums.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBrush.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBrush.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBrushEnums.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIColorPicker.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIColorPicker.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComponentType.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComponentType.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComponentWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComponentWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsoleEnums.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsoleInputHandler.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIContainerWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIContainerWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIContextMenu.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIContextMenu.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIDefinitionProperty.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIDefinitionProperty.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIDesc.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEventArgs.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEventHandlerManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEventHandlerManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEventHandlerPointer.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEventTypes.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIException.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIException.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIFactory.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIFactoryManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIFactoryManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIKeyCode.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListImageItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListImageItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuPanel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIModalWindow.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIModalWindow.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseButtonID.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPadding.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPoint.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPoint.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBarEnums.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGrid.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGrid.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridBoolProperty.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridBoolProperty.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridComboBoxProperty.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridComboBoxProperty.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridProperty.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridProperty.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridSection.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridSection.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridTextProperty.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPropertyGridTextProperty.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRadioButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRadioButton.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRect.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRect.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRoot.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRoot.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptDefinition.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptDefinition.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptNode.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptNode.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptProperty.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptReader.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptReader.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptToken.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptWriter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptWriter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollBarButtonLayouts.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialBase.cpp
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/QuickGUISerializable.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheetManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheetManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISize.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISize.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinDefinition.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinDefinition.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinDefinitionManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinDefinitionManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinElement.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinElement.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinType.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinType.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinTypeManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinTypeManager.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/QuickGUITabControl.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITabControl.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/QuickGUITextCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextCursor.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextInputValidator.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextLine.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextLine.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimer.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimer.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimerManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimerManager.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/QuickGUIToolBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBarEnums.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBarItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBarItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeView.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeView.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeViewCheckBoxNode.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeViewCheckBoxNode.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeViewNode.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeViewNode.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeViewRadioButtonNode.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeViewRadioButtonNode.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIUVRect.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIUVRect.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertex.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.h
trunk/python-ogre/code_generators/raknet/
trunk/python-ogre/code_generators/raknet/RakMasterInclude.h
trunk/python-ogre/code_generators/raknet/customization_data.py
trunk/python-ogre/code_generators/raknet/generate_code.py
trunk/python-ogre/code_generators/raknet/hand_made_wrappers.py
trunk/python-ogre/code_generators/raknet/python_raknet.h
trunk/python-ogre/code_generators/raknet/python_raknet_aliases.h
trunk/python-ogre/code_generators/raknet/python_raknet_sizeof.h
trunk/python-ogre/demos/canvas/
trunk/python-ogre/demos/canvas/Demo_Canvas.py
trunk/python-ogre/demos/canvas/media/
trunk/python-ogre/demos/canvas/media/DemoLayout.txt
trunk/python-ogre/demos/canvas/media/LucidaSans.ttf
trunk/python-ogre/demos/canvas/media/LucidaSansBold.ttf
trunk/python-ogre/demos/canvas/media/LucidaSansBoldItalic.ttf
trunk/python-ogre/demos/canvas/media/LucidaSansItalic.ttf
trunk/python-ogre/demos/canvas/media/logo.png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-17 00:59:09
|
Revision: 891
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=891&view=rev
Author: andy_miller
Date: 2009-02-17 00:59:03 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
Adding new features that are still in development:
* functional transformation to treat char *'s as python strings/lists
* doctester to create 'Sphinx' compatible documentation
Modified Paths:
--------------
trunk/python-ogre/code_generators/common_utils/__init__.py
trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
trunk/python-ogre/demos/ogre/tests/Test_Corners.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/code_generators/common_utils/PO_FuncTransform.py
trunk/python-ogre/code_generators/common_utils/sphinx_extract.py
trunk/python-ogre/code_generators/doctester/
trunk/python-ogre/code_generators/doctester/customization_data.py
trunk/python-ogre/code_generators/doctester/doc.out
trunk/python-ogre/code_generators/doctester/generate_code.py
trunk/python-ogre/code_generators/doctester/hand_made_wrappers.py
trunk/python-ogre/code_generators/doctester/python_doctester.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-18 06:25:15
|
Revision: 893
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=893&view=rev
Author: andy_miller
Date: 2009-02-18 06:25:04 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
First loadable version of RakNet (untested yet)
Work on Sphinx documentation
Fixed small bug in extract document
Improved on new functional transformer to handle char *
Modified Paths:
--------------
trunk/python-ogre/ReportVersion.py
trunk/python-ogre/code_generators/common_utils/PO_FuncTransform.py
trunk/python-ogre/code_generators/common_utils/__init__.py
trunk/python-ogre/code_generators/common_utils/extract_documentation.py
trunk/python-ogre/code_generators/common_utils/sphinx_extract.py
trunk/python-ogre/code_generators/doctester/generate_code.py
trunk/python-ogre/code_generators/doctester/python_doctester.h
trunk/python-ogre/code_generators/raknet/RakMasterInclude.h
trunk/python-ogre/code_generators/raknet/customization_data.py
trunk/python-ogre/code_generators/raknet/generate_code.py
trunk/python-ogre/environment.py
trunk/python-ogre/setup.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-22 03:09:52
|
Revision: 894
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=894&view=rev
Author: andy_miller
Date: 2009-02-22 03:09:46 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Added PLSM2 support (Thanks Dermont)
Added RakNet support
Fixed bug in char * argument support (added terminating null)
Added helper functions to Physx wrapper from SampleCommonCode
Exposed std functions in Ogre -- requires fixes in latest Py++ trunk
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ReportVersion.py
trunk/python-ogre/code_generators/common_utils/PO_FuncTransform.py
trunk/python-ogre/code_generators/common_utils/__init__.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/ogre/python_ogre_sizeof.h
trunk/python-ogre/code_generators/physx/customization_data.py
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
trunk/python-ogre/code_generators/physx/python_physx.h
trunk/python-ogre/code_generators/plib/hand_made_wrappers.py
trunk/python-ogre/code_generators/raknet/RakMasterInclude.h
trunk/python-ogre/code_generators/raknet/customization_data.py
trunk/python-ogre/code_generators/raknet/generate_code.py
trunk/python-ogre/code_generators/raknet/hand_made_wrappers.py
trunk/python-ogre/code_generators/raknet/python_raknet_aliases.h
trunk/python-ogre/demos/qgui/Demo_QuickGUI01.py
trunk/python-ogre/environment.py
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/plsm2/
trunk/python-ogre/ThirdParty/plsm2/DRGNURBSSurface.cpp
trunk/python-ogre/ThirdParty/plsm2/DRGNURBSSurface.h
trunk/python-ogre/ThirdParty/plsm2/OgreDebugRectangle2D.cpp
trunk/python-ogre/ThirdParty/plsm2/OgreDebugRectangle2D.h
trunk/python-ogre/ThirdParty/plsm2/OgreOcclusionBoundingBox.cpp
trunk/python-ogre/ThirdParty/plsm2/OgreOcclusionBoundingBox.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeAxisAlignedBoxSceneQuery.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeAxisAlignedBoxSceneQuery.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeCallBackEvent.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeCallback.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeCamera.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeCamera.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2DManager.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2DManager.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightField.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightField.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldBlendNeighbor.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldBlendNeighbor.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldN.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldN.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldNTC.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldNTC.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldRaw.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldRaw.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldRawTC.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldRawTC.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldTC.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_HeightFieldTC.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_Spline.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeData2D_Spline.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeHorizon.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeHorizon.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeIndexBuffer.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeIndexBuffer.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeIntersectionSceneQuery.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeIntersectionSceneQuery.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeListener.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeListenerManager.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeListenerManager.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeMeshDecal.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeMeshDecal.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusion.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusion.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionCHCTraversal.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionCHCTraversal.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionCameraTraversal.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionCameraTraversal.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionDebugTraversal.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionDebugTraversal.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionElement.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionElement.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionQuerySet.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionQuerySet.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionSWTraversal.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionSWTraversal.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionSorter.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionTraversal.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionTraversal.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionVFTraversal.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionVFTraversal.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOcclusionVisibilityData.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctree.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctree.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeAxisAlignedBoxSceneQuery.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeAxisAlignedBoxSceneQuery.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeCamera.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeCamera.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeIntersectionSceneQuery.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeIntersectionSceneQuery.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeNode.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeNode.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreePlaneBoundedVolumeListSceneQuery.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreePlaneBoundedVolumeListSceneQuery.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeRaySceneQuery.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeRaySceneQuery.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeSceneManager.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeSceneManager.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeSphereSceneQuery.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOctreeSphereSceneQuery.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOptions.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeOptions.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePage.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePage.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePageManager.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePageManager.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePageRenderable.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePageRenderable.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePoolSet.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePrecompiledHeaders.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePrecompiledHeaders.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapePrerequisites.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeQueue.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeRaySceneQuery.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeRaySceneQuery.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeRenderable.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeRenderable.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeRenderableManager.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeRenderableManager.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeSceneManager.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeSceneManager.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeSceneManagerDll.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTextureCoordinatesManager.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTextureCoordinatesManager.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTextureManager.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTextureManager.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_BaseTexture.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_BaseTexture.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_BaseTexture2.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_BaseTexture2.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Image.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Image.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_InstantBaseTexture.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_InstantBaseTexture.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_InstantBaseTextureEdit.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_InstantBaseTextureEdit.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_InstantBaseTextureShadowed.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_InstantBaseTextureShadowed.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_None.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting2.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting2.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting2Edit.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting2Edit.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting3.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting3.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting4.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting4.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting5.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting5.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting6.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting6.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting7.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting7.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting7Edit.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_Splatting7Edit.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_SplattingShader.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_SplattingShader.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_SplattingShaderEdit.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTexture_SplattingShaderEdit.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTile.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTile.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTileInfo.h
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTileManager.cpp
trunk/python-ogre/ThirdParty/plsm2/OgrePagingLandScapeTileManager.h
trunk/python-ogre/ThirdParty/plsm2/PagingLandScape2Terrainlistener.h
trunk/python-ogre/ThirdParty/plsm2/_ColourValue__value_traits.pypp.hpp
trunk/python-ogre/ThirdParty/plsm2/filetutils.cpp
trunk/python-ogre/ThirdParty/plsm2/fileutils.h
trunk/python-ogre/code_generators/plsm2/
trunk/python-ogre/code_generators/plsm2/customization_data.py
trunk/python-ogre/code_generators/plsm2/generate_code.py
trunk/python-ogre/code_generators/plsm2/hand_made_wrappers.py
trunk/python-ogre/code_generators/plsm2/python_plsm2.h
trunk/python-ogre/code_generators/plsm2/python_plsm2_aliases.h
trunk/python-ogre/code_generators/plsm2/python_plsm2_sizeof.h
trunk/python-ogre/demos/plsm2/
trunk/python-ogre/demos/plsm2/Demo_Simple.py
trunk/python-ogre/demos/plsm2/plugins.cfg
trunk/python-ogre/demos/plsm2/resources.cfg
trunk/python-ogre/demos/raknet/
trunk/python-ogre/demos/raknet/Demo_Chat_Client.py
trunk/python-ogre/demos/raknet/Demo_Chat_Server.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-22 08:51:53
|
Revision: 895
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=895&view=rev
Author: andy_miller
Date: 2009-02-22 08:51:49 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Raknet demos working - along with additional helper function on receive to process packet..
Modified Paths:
--------------
trunk/python-ogre/code_generators/raknet/hand_made_wrappers.py
trunk/python-ogre/demos/raknet/Demo_Chat_Client.py
trunk/python-ogre/demos/raknet/Demo_Chat_Server.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
