You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(30) |
Oct
(60) |
Nov
(17) |
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(33) |
Feb
(18) |
Mar
(3) |
Apr
(5) |
May
(6) |
Jun
(34) |
Jul
(54) |
Aug
(33) |
Sep
(36) |
Oct
(33) |
Nov
(40) |
Dec
(6) |
| 2009 |
Jan
(37) |
Feb
(38) |
Mar
(31) |
Apr
(23) |
May
(24) |
Jun
(2) |
Jul
(6) |
Aug
(5) |
Sep
(1) |
Oct
(14) |
Nov
(12) |
Dec
(26) |
| 2010 |
Jan
(23) |
Feb
(17) |
Mar
(17) |
Apr
(2) |
May
(10) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
| 2011 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
|
From: <and...@us...> - 2008-01-06 11:29:58
|
Revision: 530
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=530&view=rev
Author: andy_miller
Date: 2008-01-06 03:30:00 -0800 (Sun, 06 Jan 2008)
Log Message:
-----------
Mac Updates
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2008-01-06 07:08:09 UTC (rev 529)
+++ trunk/python-ogre/BuildModule.py 2008-01-06 11:30:00 UTC (rev 530)
@@ -151,7 +151,7 @@
classList = getClassList ()
(options, args) = parseInput()
- if len(args) == 0:
+ if len(args) == 0 and not (options.compilecodeall or options.gencodeall):
exit("The module to build wasn't specified. Use -h for help")
if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False\
@@ -170,7 +170,7 @@
os.mkdir ( os.path.join(environment.Config.ROOT_DIR, 'usr' ) )
if options.gencodeall or options.compilecodeall:
for name,cls in environment.projects.items():
- if cls.active and cls.PythonModule:
+ if cls.active and cls.pythonModule:
if options.gencodeall:
generateCode( cls )
if options.compilecodeall:
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2008-01-06 07:08:09 UTC (rev 529)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-01-06 11:30:00 UTC (rev 530)
@@ -6,6 +6,9 @@
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"'
# the base of the /usr/... dircetory structure that we are using
ROOT_DIR = os.path.join(BASE_DIR,'root')
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-01-06 07:08:09 UTC (rev 529)
+++ trunk/python-ogre/environment.py 2008-01-06 11:30:00 UTC (rev 530)
@@ -188,6 +188,15 @@
[0,"make", os.path.join(os.getcwd(),'gccxml-build')],
[0,"make install",os.path.join(os.getcwd(),'gccxml-build')]
]
+class install:
+ pythonModule = False
+ active = True
+ source = [
+ ]
+
+ buildCmds = [
+ [0,"python setup.py install --prefix=%s" % PREFIX, os.path.join(os.getcwd(),'python-ogre')]
+ ]
class newton:
pythonModule = False
@@ -211,11 +220,11 @@
if isMac():
base = 'newton'
source = [
- [wget, "http://www.newtondynamics.com/downloads/newtonMac-1.53.zip", downloadPath]
+ [wget, "http://www.newtondynamics.com/downloads/NewtonMac-1.53.zip", downloadPath]
]
buildCmds = [
- [0, "unzip -q -o " + os.path.join(downloadPath, "newtonMac-1.53.zip"), ''],
+ [0, "unzip -q -o " + os.path.join(downloadPath, "NewtonMac-1.53.zip"), ''],
[0,"patch -s -i ./python-ogre/patch/Newton.patch -p0 ", ''],
[0, "cp newtonSDK/sdk/Newton.h %s/include" % PREFIX, ''],
[0, "cp newtonSDK/sdk/*.a %s/lib" % PREFIX, ''],
@@ -513,12 +522,11 @@
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
, python_include_dirs
- , '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon'
]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
+ CCFLAGS = ''
LINKFLAGS = ''
- cflags += '--gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
+ cflags += ''
CheckIncludes=['boost/python.hpp', 'Ogre.h']
@@ -1365,7 +1373,7 @@
for name, cls in projects.items():
- # little hack to allow overriding of settings from the config file
+ # little hack to allow overriding of settings from the PythonOgreConfig_xxxxx.py file
if hasattr(Config, name): # look to see if the class exists in the config file
print "Using Override for class ", name
_class = Config.__dict__[name] # get the class
@@ -1373,12 +1381,28 @@
if not key.startswith('_'):
cls.__dict__[key] = value
print "Set %s.%s to %s" % (name, key, value)
-
- CheckPaths( cls, name )
+
+
+ ##CheckPaths( cls, name )
cls.root_dir = os.path.join( root_dir, 'code_generators', name )
cls.dir_name = name + '_' + str(cls.version)
cls.generated_dir = os.path.join( generated_dir, cls.dir_name )
cls.cache_file = os.path.join( declarations_cache_dir, cls.dir_name + '_cache.xml' )
+
+ if isMac(): # On the mac the Ogre library is lined in with the -framework command in scons
+ try:
+ cls.libs.remove('OgreMain')
+ except:
+ pass
+ ## and we have a commond set of flags that I will set here...
+ cls.include_dirs.append(Config.MAC_SDK_INCLUDE)
+ if not hasattr(cls, 'CCFLAGS'):
+ cls.CCFLAGS=''
+ cls.CCFLAGS += Config.MAC_CCFLAGS
+ if not hasattr(cls, 'cflags'):
+ cls.cflags=''
+ cls.cflags += Config.MAC_cflags
+
if not hasattr (cls, 'ModuleName'):
cls.ModuleName = name[0].upper() + name[1:]
if not hasattr (cls, 'PydName'):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-01-06 07:08:03
|
Revision: 529
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=529&view=rev
Author: andy_miller
Date: 2008-01-05 23:08:09 -0800 (Sat, 05 Jan 2008)
Log Message:
-----------
Changed pygccxml source to use http and not https
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-01-06 05:41:58 UTC (rev 528)
+++ trunk/python-ogre/environment.py 2008-01-06 07:08:09 UTC (rev 529)
@@ -228,7 +228,7 @@
if isLinux() or isMac():
base = 'pygccxml'
source = [
- [svn, " co https://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
+ [svn, " co http://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
]
buildCmds = [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-01-06 05:41:54
|
Revision: 528
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=528&view=rev
Author: andy_miller
Date: 2008-01-05 21:41:58 -0800 (Sat, 05 Jan 2008)
Log Message:
-----------
V2 build fixes
--this line, and those below, will be ignored--
M environment.py
M SConstruct
M demos/ogre/plugins.cfg
Modified Paths:
--------------
trunk/python-ogre/SConstruct
trunk/python-ogre/demos/ogre/plugins.cfg
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2007-12-31 07:21:40 UTC (rev 527)
+++ trunk/python-ogre/SConstruct 2008-01-06 05:41:58 UTC (rev 528)
@@ -65,7 +65,7 @@
CCFLAGS += ' '
else:
- CCFLAGS = ' -I -pipe -Os -I./'
+ CCFLAGS = ' -I -pipe -O3 -I./'
return CCFLAGS
def get_source_files(cls, _dir, usepch = False):
@@ -89,15 +89,15 @@
return source_files ## "Image.pypp.cpp" ##source_files
def get_linkflags():
- if os.name=='nt':
+ if environment.isWindows():
#LINKFLAGS = " /NOLOGO /INCREMENTAL:NO /DLL /OPT:NOREF /OPT:NOICF /OPT:NOWIN98 /subsystem:console " # no change
LINKFLAGS = " /MAP:FULL /MAPINFO:EXPORTS /NOLOGO /OPT:REF /INCREMENTAL:NO /DLL /OPT:ICF /subsystem:console " # 7 minutes 25% smaller 16.6 Meg
#LINKFLAGS = " /NOLOGO /INCREMENTAL:NO /DLL /subsystem:console " ### LONG Link , 80 minutes - 15.7 meg
- elif os.name == 'posix':
+ if environment.isLinux():
if os.sys.platform <> 'darwin':
LINKFLAGS = ' `pkg-config --libs OGRE` --strip-all -lstdc++ '
- else:
- LINKFLAGS = ''
+ if environment.isMac():
+ LINKFLAGS = ' -Wl,-x -framework Python -framework Ogre -framework Carbon -F' + environment.Config.FRAMEWORK_DIR + ' '
return LINKFLAGS
def build_pch( cls, pchfile ):
@@ -149,8 +149,7 @@
_env = Environment(ENV=os.environ)
if environment.rpath:
- _env.Append(RPATH=_env.Literal(environment.rpath))
- _env.Append( LINKFLAGS = Split('-z origin') )
+ _env.Append(RPATH=environment.rpath)
# Stores signatures in a separate .sconsign file
# in each directory as the single one was getting huge
@@ -204,13 +203,16 @@
## ugly hack - scons returns a list of targets from SharedLibrary - we have to choose the one we want
index = 0 # this is the index into a list of targets - '0' should be the platform default
- if os.name=="nt":
+ if environment.isWindows():
## and lets have it install the output into the 'package_dir_name/ModuleName' dir and rename to the PydName
_env.AddPostAction(package,\
'mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % { 'name':package[index] } )
- else:
+ if environment.isLinux():
_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] } )
_env.InstallAs(os.path.join(environment.package_dir_name, cls.parent,
cls.ModuleName, cls.PydName),
Modified: trunk/python-ogre/demos/ogre/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogre/plugins.cfg 2007-12-31 07:21:40 UTC (rev 527)
+++ trunk/python-ogre/demos/ogre/plugins.cfg 2008-01-06 05:41:58 UTC (rev 528)
@@ -2,7 +2,7 @@
## Use this for Windows
# Define plugin folder
-PluginFolder=/home/andy/development/root/usr/lib/OGRE
+#PluginFolder=/Users/andy/development/python-ogre/demos/ogre/
#Plugin=RenderSystem_GL.dll
#Plugin=RenderSystem_Direct3D9.dll
#Plugin=Plugin_ParticleFX.dll
@@ -13,7 +13,7 @@
##
## NOTE use this for MacOS or Linux
Plugin=RenderSystem_GL
- Plugin=Plugin_ParticleFX
- Plugin=Plugin_BSPSceneManager
- Plugin=Plugin_OctreeSceneManager
- Plugin=Plugin_CgProgramManager
+# Plugin=Plugin_ParticleFX
+# Plugin=Plugin_BSPSceneManager
+# Plugin=Plugin_OctreeSceneManager
+## Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-12-31 07:21:40 UTC (rev 527)
+++ trunk/python-ogre/environment.py 2008-01-06 05:41:58 UTC (rev 528)
@@ -134,7 +134,7 @@
mv = "mv "
rm = "rm -f "
cp = "cp -f "
- unzip = "unzip "
+ unzip = "unzip -o "
cvs = "cvs -z3 -q "
svn = "svn --non-interactive "
if isMac():
@@ -494,15 +494,15 @@
]
buildCmds = [
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
- [0, unzip + os.path.join(downloadPath,base)+".zip ",os.path.join(os.getcwd(), 'ogrenew') ],
+ [0, unzip + os.path.join(downloadPath,basedep)+".zip ",os.path.join(os.getcwd(), 'ogrenew') ],
[0, "mkdir ~/Library/Frameworks", ''], ## Note that this will fail if the directory exists !!!
- [0,cp + " -R "+os.path.join(os.getcwd(), 'ogrenew', '__MACOS','Dependencies')+'/*.framework ' + Config.FRAMEWORK_DIR,''],
+ [0,cp + " -R "+os.path.join(os.getcwd(), 'ogrenew', '__MACOSX','Dependencies')+'/*.framework ' + Config.FRAMEWORK_DIR,''],
[0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()],
[0, "mkdir Ogre",os.path.join(os.getcwd() ,'ogrenew','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() ,'ogrenew','OgreMain', 'include') ],
[0, "cp OgreRenderSystem.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ],
- [0, "cp OgrePreRequisities.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ],
+ [0, "cp OgrePrerequisites.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ],
[0, "xcodebuild -project ogrenew/Mac/Ogre/Ogre.xcodeproj -configuration Release", ''],
[0, "xcodebuild -project ogrenew/Mac/Samples/Samples.xcodeproj -configuration Release", ''],
[0, "cp -R *.framework " + Config.FRAMEWORK_DIR, os.path.join(os.getcwd() ,'ogrenew',"Mac", "build", "Release") ]
@@ -1074,7 +1074,8 @@
[0, "tar zxf " + os.path.join(downloadPath, "libvorbis-1.2.0.tar.gz"), ''],
[0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libogg-1.1.3")],
[0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
- [0, "./autogen.sh\n./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
+ [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")]
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-31 07:21:37
|
Revision: 527
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=527&view=rev
Author: andy_miller
Date: 2007-12-30 23:21:40 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Mac OSX fixes
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-12-31 04:21:49 UTC (rev 526)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-12-31 07:21:40 UTC (rev 527)
@@ -27,8 +27,9 @@
# and the Py++ directory as sometimes we need access to the code repository there
pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
-SDK = True
-SDK = False
+SDK = False
+if os.sys.platform == 'darwin': # we use the pre built sdk for OSX
+ SDK = True
# # ## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-12-31 04:21:49 UTC (rev 526)
+++ trunk/python-ogre/environment.py 2007-12-31 07:21:40 UTC (rev 527)
@@ -211,7 +211,7 @@
if isMac():
base = 'newton'
source = [
- [wget, "http://www.newtondynamics.com/downloads/newtonMac-1.53.zip", donwloadPath]
+ [wget, "http://www.newtondynamics.com/downloads/newtonMac-1.53.zip", downloadPath]
]
buildCmds = [
@@ -219,7 +219,7 @@
[0,"patch -s -i ./python-ogre/patch/Newton.patch -p0 ", ''],
[0, "cp newtonSDK/sdk/Newton.h %s/include" % PREFIX, ''],
[0, "cp newtonSDK/sdk/*.a %s/lib" % PREFIX, ''],
- [0, "cp newtonSDK/sdk/*.a ogreaddons/ogrenewt" % PREFIX, '']
+ [0, "cp newtonSDK/sdk/*.a ogreaddons/ogrenewt" , '']
]
class pygccxml:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-31 04:21:44
|
Revision: 526
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=526&view=rev
Author: andy_miller
Date: 2007-12-30 20:21:49 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Simplified debug output
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2007-12-31 03:15:35 UTC (rev 525)
+++ trunk/python-ogre/BuildModule.py 2007-12-31 04:21:49 UTC (rev 526)
@@ -83,7 +83,7 @@
env["PATH"]=PREFIX+"/bin:" + PATH
- logger.debug ( "Spawning '%s' in '%s' %s " % (task,cwdin, env["PYTHONPATH"]) )
+ logger.debug ( "Spawning '%s' in '%s'" % (task,cwdin) )
process = subprocess.Popen (task, shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd = cwdin, env=env)
out,err = process.communicate()
returncode = process.returncode
@@ -141,6 +141,8 @@
parser.add_option("-g", "--gen", action="store_true", default=False ,dest="gencode", help="Generate Source Code for the module")
parser.add_option("-c", "--compile", action="store_true", default=False ,dest="compilecode", help="Compile Source Code for the module")
parser.add_option("-l", "--logfilename", default="log.out" ,dest="logfilename", help="Override the default log file name")
+ parser.add_option("-G", "--genall", action="store_true", default=False ,dest="gencodeall", help="Generate Source Code for all possible modules")
+ parser.add_option("-C", "--compileall", action="store_true", default=False ,dest="compilecodeall", help="Compile Source Code for all posssible modules")
(options, args) = parser.parse_args()
return (options,args)
@@ -152,7 +154,8 @@
if len(args) == 0:
exit("The module to build wasn't specified. Use -h for help")
- if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False:
+ if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False\
+ and options.compilecodeall==False and options.gencodeall==False:
exit ( "You need to specific at least one option. Use -h for help")
setupLogging(options.logfilename)
@@ -165,23 +168,31 @@
os.mkdir ( environment.Config.ROOT_DIR )
if not os.path.exists( os.path.join(environment.Config.ROOT_DIR, 'usr' ) ):
os.mkdir ( os.path.join(environment.Config.ROOT_DIR, 'usr' ) )
+ if options.gencodeall or options.compilecodeall:
+ for name,cls in environment.projects.items():
+ if cls.active and cls.PythonModule:
+ if options.gencodeall:
+ generateCode( cls )
+ if options.compilecodeall:
+ compileCode( cls )
- for moduleName in args:
- if not classList.has_key( moduleName ):
- exit("Module specificed was not found (%s is not in environment.py) " % moduleName )
- if options.retrieve:
- retrieveSource ( classList[ moduleName ] )
- if options.build :
- buildModule ( classList[ moduleName ] )
- if options.gencode :
- if classList[ moduleName ].pythonModule == True:
- generateCode ( classList[ moduleName ] )
- else:
- exit ( "Module specificed does not generate source code (%s is a supporting module)" % moduleName )
- if options.compilecode :
- if classList[ moduleName ].pythonModule == True:
- compileCode ( classList[ moduleName ] )
- else:
- exit ( "Module specificed does not need compiling (%s is a supporting module)" % moduleName )
+ else:
+ for moduleName in args:
+ if not classList.has_key( moduleName ):
+ exit("Module specificed was not found (%s is not in environment.py) " % moduleName )
+ if options.retrieve:
+ retrieveSource ( classList[ moduleName ] )
+ if options.build :
+ buildModule ( classList[ moduleName ] )
+ if options.gencode :
+ if classList[ moduleName ].pythonModule == True:
+ generateCode ( classList[ moduleName ] )
+ else:
+ exit ( "Module specificed does not generate source code (%s is a supporting module)" % moduleName )
+ if options.compilecode :
+ if classList[ moduleName ].pythonModule == True:
+ compileCode ( classList[ moduleName ] )
+ else:
+ exit ( "Module specificed does not need compiling (%s is a supporting module)" % moduleName )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-31 03:15:30
|
Revision: 525
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=525&view=rev
Author: andy_miller
Date: 2007-12-30 19:15:35 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
improvement with python version string handling
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2007-12-30 23:35:28 UTC (rev 524)
+++ trunk/python-ogre/BuildModule.py 2007-12-31 03:15:35 UTC (rev 525)
@@ -72,12 +72,12 @@
env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
env["CXXFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
##env["LDFLAGS"]="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin" ### Mac GCC 4.0.1 doesn't support rpath
- env["PYTHONPATH"]=PREFIX+"/lib/python2.5/site-packages"
+ env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages"
else:
env["CFLAGS"]="-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib")
env["CXXFLAGS"]=env["CFLAGS"]
env["LDFLAGS"]="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin"
- env["PYTHONPATH"]=PREFIX+"/lib/python2.5/site-packages"
+ env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages"
env["ZZIPLIB_LIBS"]="-lzzip"
env["PATH"]=PREFIX+"/bin:" + PATH
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-30 23:35:23
|
Revision: 524
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=524&view=rev
Author: andy_miller
Date: 2007-12-30 15:35:28 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Bug fixes in a couple of demos
Modified Paths:
--------------
trunk/python-ogre/demos/ogre/Demo_Bezier.py
trunk/python-ogre/demos/ogreode/SimpleScenes_Chain.py
Modified: trunk/python-ogre/demos/ogre/Demo_Bezier.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_Bezier.py 2007-12-30 10:58:24 UTC (rev 523)
+++ trunk/python-ogre/demos/ogre/Demo_Bezier.py 2007-12-30 23:35:28 UTC (rev 524)
@@ -91,14 +91,7 @@
# register our listener
self.currentLog.addListener ( self.myLog )
- def __del__(self):
- global pVert
- if (self.patchCtlPoints):
- del self.patchCtlPoints
- del pVert
- sf.Application.__del__(self)
-
-
+
def _createScene(self):
global patchPass, patch, pVert
sceneManager = self.sceneManager
@@ -237,7 +230,9 @@
ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
pMat.getTechnique(0).getPass(0).createTextureUnitState( "BumpyMetal.jpg" )
patchEntity.setMaterialName("TextMat")
-
+ patchPass = pMat.getTechnique(0).getPass(0)
+
+
## Attach the entity to the root of the scene
sceneManager.getRootSceneNode().attachObject(patchEntity)
Modified: trunk/python-ogre/demos/ogreode/SimpleScenes_Chain.py
===================================================================
--- trunk/python-ogre/demos/ogreode/SimpleScenes_Chain.py 2007-12-30 10:58:24 UTC (rev 523)
+++ trunk/python-ogre/demos/ogreode/SimpleScenes_Chain.py 2007-12-30 23:35:28 UTC (rev 524)
@@ -21,7 +21,7 @@
self._first_body = None
self._box_body = None
self._force = 0
- self._force_to_apply = 0
+ self._force_to_apply = ogre.Vector3.ZERO
## Set up the sizes of stuff
link_size = 0.4
@@ -91,7 +91,7 @@
## Forward/back
elif (input.isKeyDown(OIS.KC_K)): self._force_to_apply += forward * self._force
elif (input.isKeyDown(OIS.KC_I)): self._force_to_apply -= forward * self._force
- else: self._force_to_apply = 0
+ else: self._force_to_apply = ogre.Vector3.ZERO
self._mgr.getCamera("PlayerCam")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-30 10:58:19
|
Revision: 523
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=523&view=rev
Author: andy_miller
Date: 2007-12-30 02:58:24 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Case sensitivity issue in included file
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogre/customization_data.py
Modified: trunk/python-ogre/code_generators/ogre/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/customization_data.py 2007-12-30 10:53:44 UTC (rev 522)
+++ trunk/python-ogre/code_generators/ogre/customization_data.py 2007-12-30 10:58:24 UTC (rev 523)
@@ -2,7 +2,7 @@
def header_files( version ):
if not version.startswith("1.2"):
## 21Nov07; Change to precompiled header support
- return [ 'Python_ogre_precompiled.h'
+ 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-30 10:53:40
|
Revision: 522
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=522&view=rev
Author: andy_miller
Date: 2007-12-30 02:53:44 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Further V2 changes
Fix with ogre code generation due to newer gccxml (unsigned => unsigned int)
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2007-12-30 08:48:40 UTC (rev 521)
+++ trunk/python-ogre/BuildModule.py 2007-12-30 10:53:44 UTC (rev 522)
@@ -14,12 +14,12 @@
logger = None
-def setupLogging ():
+def setupLogging (logfilename):
# set up logging to file
logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
datefmt='%m-%d %H:%M',
- filename='log.out',
+ filename=logfilename,
filemode='w')
# define a Handler which writes INFO messages or higher to the sys.stderr
console = logging.StreamHandler()
@@ -77,7 +77,7 @@
env["CFLAGS"]="-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib")
env["CXXFLAGS"]=env["CFLAGS"]
env["LDFLAGS"]="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin"
- env["PYTHONPATH"]=PREFIX+"/lib/python25/site-packages"
+ env["PYTHONPATH"]=PREFIX+"/lib/python2.5/site-packages"
env["ZZIPLIB_LIBS"]="-lzzip"
env["PATH"]=PREFIX+"/bin:" + PATH
@@ -140,13 +140,12 @@
parser.add_option("-b", "--build", action="store_true", default=False ,dest="build", help="Build the appropiate module")
parser.add_option("-g", "--gen", action="store_true", default=False ,dest="gencode", help="Generate Source Code for the module")
parser.add_option("-c", "--compile", action="store_true", default=False ,dest="compilecode", help="Compile Source Code for the module")
+ parser.add_option("-l", "--logfilename", default="log.out" ,dest="logfilename", help="Override the default log file name")
(options, args) = parser.parse_args()
return (options,args)
if __name__ == '__main__':
- setupLogging()
- logger = logging.getLogger('PythonOgre.BuildModule')
classList = getClassList ()
(options, args) = parseInput()
@@ -156,11 +155,16 @@
if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False:
exit ( "You need to specific at least one option. Use -h for help")
+ setupLogging(options.logfilename)
+ logger = logging.getLogger('PythonOgre.BuildModule')
+
if not os.path.exists( environment.downloadPath ):
os.mkdir ( environment.downloadPath )
if not os.path.exists( environment.Config.ROOT_DIR ):
os.mkdir ( environment.Config.ROOT_DIR )
+ if not os.path.exists( os.path.join(environment.Config.ROOT_DIR, 'usr' ) ):
+ os.mkdir ( os.path.join(environment.Config.ROOT_DIR, 'usr' ) )
for moduleName in args:
if not classList.has_key( moduleName ):
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-12-30 08:48:40 UTC (rev 521)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-12-30 10:53:44 UTC (rev 522)
@@ -27,7 +27,8 @@
# and the Py++ directory as sometimes we need access to the code repository there
pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
-SDK = True
+SDK = True
+SDK = False
# # ## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2007-12-30 08:48:40 UTC (rev 521)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2007-12-30 10:53:44 UTC (rev 522)
@@ -679,7 +679,7 @@
elif sys.platform.startswith ('linux'):
pass
mb.global_ns.class_('vector<int, std::allocator<int> >').alias='VectorInt'
- mb.global_ns.class_('vector<std::pair<unsigned, unsigned>, std::allocator<std::pair<unsigned, unsigned> > >').alias='VectorUnsignedUnsigned'
+ mb.global_ns.class_('vector<std::pair<unsigned int, unsigned int>, std::allocator<std::pair<unsigned int, unsigned int> > >').alias='VectorUnsignedUnsigned'
#as reported by mike with linux:bp::arg("flags")=(std::_Ios_Fmtflags)0
mb.namespace( MAIN_NAMESPACE ).class_('StringConverter').member_functions('toString').exclude()
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-12-30 08:48:40 UTC (rev 521)
+++ trunk/python-ogre/environment.py 2007-12-30 10:53:44 UTC (rev 522)
@@ -1063,12 +1063,21 @@
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
- Source = [
- ["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz",''],
- ["wget", "http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz",''],
- ["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",''],
- ]
-
+ source = [
+ ["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz",downloadPath],
+ ["wget", "http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz",downloadPath],
+ ["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",downloadPath],
+ ]
+ buildCmds = [
+ [0, "tar zxf " + os.path.join(downloadPath, "openal-0.0.8.tar.gz"), ''],
+ [0, "tar zxf " + os.path.join(downloadPath, "libogg-1.1.3.tar.gz"), ''],
+ [0, "tar zxf " + os.path.join(downloadPath, "libvorbis-1.2.0.tar.gz"), ''],
+ [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libogg-1.1.3")],
+ [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
+ [0, "./autogen.sh\n./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
+ ]
+
+
class ogrevideoffmpeg:
active = True
pythonModule = True
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-30 08:48:39
|
Revision: 521
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=521&view=rev
Author: andy_miller
Date: 2007-12-30 00:48:40 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Further Build V2 enhancements
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
trunk/python-ogre/environment.py
trunk/python-ogre/patch/ogre.patch
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2007-12-30 01:24:56 UTC (rev 520)
+++ trunk/python-ogre/BuildModule.py 2007-12-30 08:48:40 UTC (rev 521)
@@ -66,18 +66,20 @@
PREFIX = environment.PREFIX
PATH = os.environ["PATH"]
env = os.environ
- env["PKG_CONFIG_PATH"]=PREFIX+"/lib/pkgconfig"
- env["LD_LIBRARY_PATH"]=PREFIX+"/lib"
+ env["PKG_CONFIG_PATH"]=os.path.join(PREFIX,"lib/pkgconfig")
+ env["LD_LIBRARY_PATH"]=os.path.join(PREFIX,"lib")
if environment.isMac():
- env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib" ### XXX Note the space after the -I needed for the MAC, not tested yet on Linux
+ env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
env["CXXFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
##env["LDFLAGS"]="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin" ### Mac GCC 4.0.1 doesn't support rpath
env["PYTHONPATH"]=PREFIX+"/lib/python2.5/site-packages"
else:
- env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
- env["CXXFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
- env["LDFLAGS"]="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin"
- env["PYTHONPATH"]=PREFIX+"/lib/python25/site-packages"
+ env["CFLAGS"]="-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib")
+ env["CXXFLAGS"]=env["CFLAGS"]
+ env["LDFLAGS"]="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin"
+ env["PYTHONPATH"]=PREFIX+"/lib/python25/site-packages"
+ env["ZZIPLIB_LIBS"]="-lzzip"
+
env["PATH"]=PREFIX+"/bin:" + PATH
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-12-30 01:24:56 UTC (rev 520)
+++ trunk/python-ogre/environment.py 2007-12-30 08:48:40 UTC (rev 521)
@@ -189,6 +189,38 @@
[0,"make install",os.path.join(os.getcwd(),'gccxml-build')]
]
+class newton:
+ pythonModule = False
+ active = True
+ if not os.path.exists( os.path.join(os.getcwd(), 'ogreaddons/ogrenewt')):
+ os.makedirs ( os.path.join(os.getcwd(), 'ogreaddons/ogrenewt') )
+
+ if isLinux():
+ base = 'newton'
+ source = [
+ [wget, "http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz", downloadPath]
+ ]
+
+ buildCmds = [
+ [0, "tar zxf " + os.path.join(downloadPath, "newtonLinux-1.53.tar.gz"), ''],
+ [0,"patch -s -i ./python-ogre/patch/Newton.patch -p0 ", ''],
+ [0, "cp newtonSDK/sdk/Newton.h %s/include" % PREFIX, ''],
+ [0, "cp newtonSDK/sdk/*.a %s/lib" % PREFIX, ''],
+ [0, "cp newtonSDK/sdk/*.a ogreaddons/ogrenewt",'']
+ ]
+ if isMac():
+ base = 'newton'
+ source = [
+ [wget, "http://www.newtondynamics.com/downloads/newtonMac-1.53.zip", donwloadPath]
+ ]
+
+ buildCmds = [
+ [0, "unzip -q -o " + os.path.join(downloadPath, "newtonMac-1.53.zip"), ''],
+ [0,"patch -s -i ./python-ogre/patch/Newton.patch -p0 ", ''],
+ [0, "cp newtonSDK/sdk/Newton.h %s/include" % PREFIX, ''],
+ [0, "cp newtonSDK/sdk/*.a %s/lib" % PREFIX, ''],
+ [0, "cp newtonSDK/sdk/*.a ogreaddons/ogrenewt" % PREFIX, '']
+ ]
class pygccxml:
pythonModule = False
@@ -251,12 +283,12 @@
if isLinux() or isMac():
base = 'FreeImage'
source = [
- [wget, " http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip",downloadPath],
+ [wget, " http://prdownloads.sourceforge.net/freeimage/FreeImage3100.zip",downloadPath],
]
if isLinux():
buildCmds = [
- [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "393.zip", ''],
+ [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3100.zip", ''],
##
# Note the use of a single command that does multiple sed's
##
@@ -269,7 +301,7 @@
]
if isMac(): ## mac has a crap sed command implementation and a different shell interaction, plus make file is a little different (or course)
buildCmds = [
- [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "393.zip", ''],
+ [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3100.zip", ''],
##
# Note the use of a single command that does multiple sed's
##
@@ -428,6 +460,24 @@
externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', Config.LIB_Boost+'.dll']
elif isLinux():
libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
+ base = "ogre-linux_osx-v1-4-6"
+ source = [
+ [wget, "http://prdownloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
+ ]
+ buildCmds = [
+ [0, "env >1", ''],
+ [0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
+ [0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()],
+ [0, "aclocal", os.path.join(os.getcwd(), 'ogrenew')],
+ [0, "./bootstrap", os.path.join(os.getcwd(), 'ogrenew')],
+ #[1, "import os\nos.environ['ZZIPLIB_LIBS']='-lzzip'", ''],
+ [0, "./configure --prefix=%s --with-gui=Xt --disable-devil" % PREFIX, os.path.join(os.getcwd(), 'ogrenew')],
+ #export ZZIPLIB_LIBS="-lzzip"
+ [0, "make", os.path.join(os.getcwd(), 'ogrenew')],
+ [0, "make install", os.path.join(os.getcwd(), 'ogrenew')],
+ ]
+
+ libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
lib_dirs = [ Config.LOCAL_LIB
]
include_dirs = [ Config.PATH_Boost
@@ -436,7 +486,7 @@
CCFLAGS = '' ## -DBOOST_PYTHON_MAX_ARITY=19'
LINKFLAGS = ''
elif isMac():
- base = "ogre-linux_osx-v1-4-5"
+ base = "ogre-linux_osx-v1-4-6"
basedep = "OgreDependenciesOSX_20070929"
source = [
[wget, "http://prdownloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
@@ -481,7 +531,19 @@
cflags=''
parent = "ogre/io"
if isMac():
- source=[]
+ source=[]
+ if isLinux():
+ base = "ois-1.0RC1"
+ source=[
+ [wget, "http://prdownloads.sourceforge.net/wgois/ois-1.0RC1.tar.gz", downloadPath]
+ ]
+ buildCmds = [
+ [0, tar + " zxf " + os.path.join(downloadPath,base)+".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 )],
+ [0,'make install', os.path.join(os.getcwd(), base )]
+ ]
if os.name=='nt':
if _PreCompiled:
pchstop = 'OIS.h'
@@ -510,8 +572,17 @@
pythonModule = True
version = "1.4"
name = 'ogrerefapp'
- parent = "ogre/physics"
- if os.name=="nt":
+ parent = "ogre/physics"
+ baseDir = os.path.join(os.getcwd(),'ogrenew', 'ReferenceApplication')
+ source = []
+ buildCmds=[
+ [0, "aclocal", baseDir],
+ [0, "./bootstrap", baseDir],
+ [0, "./configure --prefix=%s " % PREFIX, baseDir],
+ [0, "make", baseDir],
+ [0, "make install", baseDir],
+ ]
+ if isWindows():
libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'ReferenceAppLayer']
else:
libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'ReferenceAppLayer']
@@ -534,11 +605,24 @@
pythonModule = True
version = "1.0"
name = 'ogrenewt'
- parent = "ogre/physics"
- if os.name =="nt":
+ parent = "ogre/physics"
+ base = 'ogreaddons/ogrenewt'
+ if isWindows():
libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
else:
- libs = ['Newton', Config.LIB_Boost, 'OgreNewt', 'OgreMain']
+ libs = ['Newton', Config.LIB_Boost, 'OgreNewt', 'OgreMain']
+ source = [
+ [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -P "+base, os.getcwd()]
+ ]
+ baseDir = os.path.join(os.getcwd(), base )
+ buildCmds = [
+ [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
+ [0, "cp SConscript OgreNewt_Main", baseDir],
+ #[0, "rm SConscript", baseDir],
+ [0, "rm -r ./OgreNewt_Main/inc/boost", baseDir],
+ [0, "scons prefix=%s boost=%s/include/%s install" % (PREFIX, PREFIX, boost.base), baseDir],
+ ]
+
include_dirs = [Config.PATH_Boost
, Config.PATH_Newton # only one path for Newton
, Config.PATH_INCLUDE_Ogre
@@ -561,15 +645,32 @@
version = "0.5.0b"
parent = "ogre/gui"
name = 'cegui'
- if os.name=='nt':
+ if isWindows():
if _PreCompiled:
pchstop = 'cegui.h'
pchbuild = 'buildpch.cpp'
pchincludes = ['boost/python.hpp', 'cegui.h']
libs=[Config.LIB_Boost, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ]
else:
- libs=[Config.LIB_Boost, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
+ libs=[Config.LIB_Boost, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
+ if isLinux():
+ base = "CEGUI-0.5.0"
+ source=[
+ [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz", downloadPath]
+ ]
+ buildCmds = [
+ [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)],
+ [0, "aclocal", os.path.join(os.getcwd(),base)],
+ [0, "automake" ,os.path.join(os.getcwd(), base )],
+ [0,"./configure --prefix=%s --enable-freeimage=yes --disable-samples --without-ogre-renderer --includedir=%s/include" %(PREFIX,PREFIX) ,os.path.join(os.getcwd(), base )],
+ [0,'make', os.path.join(os.getcwd(), base )],
+ [0,'make install', os.path.join(os.getcwd(), base )]
+ ]
+
include_dirs = [Config.PATH_Boost
,Config.PATH_INCLUDE_CEGUI
,Config.PATH_CEGUI
@@ -588,9 +689,7 @@
ModuleName = 'CEGUI'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
-
-############# these are under construction and DO NOT WORK (Yet) #####################
-
+
class ode:
active = True
pythonModule = True
@@ -610,10 +709,19 @@
ModuleName = 'ODE'
CheckIncludes = ['boost/python.hpp', 'ode/ode.h']
- Source = [
- ["wget", "http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip",'']
- ]
-
+ source = [
+ ["wget", "http://prdownloads.sourceforge.net/opende/ode-src-0.9.zip",downloadPath]
+ ]
+ baseDir = os.path.join(os.getcwd(),"ode-0.9")
+ buildCmds = [
+ [0, "unzip -q -o "+ os.path.join(downloadPath,"ode-src-0.9.zip"), ''],
+ [0, "chmod +x autogen.sh", baseDir],
+ [0, "./autogen.sh", baseDir],
+ [0, "./configure --prefix=%s --includedir=%s/include" %(PREFIX, PREFIX), baseDir],
+ [0, "make", baseDir],
+ [0, "make install", baseDir]
+
+ ]
class opcode:
active = True
pythonModule = True
@@ -656,6 +764,7 @@
version= "1.0"
name='ogreode'
parent = "ogre/physics"
+ base = 'ogreaddons/ogreode'
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_OgreOde
@@ -671,6 +780,18 @@
, Config.PATH_INCLUDE_OgreOdeLoader
, Config.PATH_INCLUDE_Ogre
]
+ source = [
+ [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -P "+base, os.getcwd()]
+ ]
+ baseDir = os.path.join(os.getcwd(), base )
+ buildCmds = [
+ [0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir],
+ [0, "chmod +x autogen.sh", baseDir],
+ [0, "./autogen.sh", baseDir],
+ [0, "./configure --prefix=%s" % PREFIX, baseDir],
+ [0, "make", baseDir],
+ [0, "make install", baseDir],
+ ]
libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
@@ -1018,7 +1139,9 @@
active = True
pythonModule = True
version= "2.64"
- name='bullet'
+ name='bullet'
+ base = "bullet-2.64"
+ baseDir = os.path.join(os.getcwd(), base)
parent = "ogre/physics"
libs=[Config.LIB_Boost, 'LibBulletCollision', 'LibBulletDynamics']
if os.name == 'nt':
@@ -1029,6 +1152,15 @@
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
]
+ source=[
+ [wget, "http://downloads.sourceforge.net/bullet/"+base+".tgz", downloadPath]
+ ]
+ buildCmds = [
+ [0, "tar zxf " +os.path.join(downloadPath, base)+".tgz", ''],
+ [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
+ [0, "make", baseDir],
+ [0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
+ ]
ModuleName = 'bullet'
CheckIncludes = ['boost/python.hpp']
Modified: trunk/python-ogre/patch/ogre.patch
===================================================================
--- trunk/python-ogre/patch/ogre.patch 2007-12-30 01:24:56 UTC (rev 520)
+++ trunk/python-ogre/patch/ogre.patch 2007-12-30 08:48:40 UTC (rev 521)
@@ -7,6 +7,7 @@
+CFLAGS_VISIBILITY=""
AC_SUBST(CFLAGS_VISIBILITY)
AC_LANG_POP
+
--- ogrenew/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
+++ ogrenew/OgreMain/include/OgreDataStream.h 24 Nov 2007 00:35:47 -0000
@@ -33,6 +33,7 @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-30 01:24:51
|
Revision: 520
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=520&view=rev
Author: andy_miller
Date: 2007-12-29 17:24:56 -0800 (Sat, 29 Dec 2007)
Log Message:
-----------
fixed patch -- removed extra space
Modified Paths:
--------------
trunk/python-ogre/patch/ogre.patch
Modified: trunk/python-ogre/patch/ogre.patch
===================================================================
--- trunk/python-ogre/patch/ogre.patch 2007-12-29 00:23:02 UTC (rev 519)
+++ trunk/python-ogre/patch/ogre.patch 2007-12-30 01:24:56 UTC (rev 520)
@@ -7,7 +7,7 @@
+CFLAGS_VISIBILITY=""
AC_SUBST(CFLAGS_VISIBILITY)
AC_LANG_POP
- --- ogrenew/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
+--- ogrenew/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
+++ ogrenew/OgreMain/include/OgreDataStream.h 24 Nov 2007 00:35:47 -0000
@@ -33,6 +33,7 @@
#include "OgreString.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-29 00:22:59
|
Revision: 519
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=519&view=rev
Author: andy_miller
Date: 2007-12-28 16:23:02 -0800 (Fri, 28 Dec 2007)
Log Message:
-----------
Missing piece from patch
Modified Paths:
--------------
trunk/python-ogre/patch/ogre.patch
Modified: trunk/python-ogre/patch/ogre.patch
===================================================================
--- trunk/python-ogre/patch/ogre.patch 2007-12-27 03:04:27 UTC (rev 518)
+++ trunk/python-ogre/patch/ogre.patch 2007-12-29 00:23:02 UTC (rev 519)
@@ -1,4 +1,13 @@
---- ogrenew/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
+--- ogrenew/configure.in 2007-05-15 22:43:31.000000000 +0800
++++ ogrenew/configure.in 2007-05-15 22:43:18.000000000 +0800
+@@ -59,6 +58,7 @@
+ ;;
+ esac
+ ])
++CFLAGS_VISIBILITY=""
+ AC_SUBST(CFLAGS_VISIBILITY)
+ AC_LANG_POP
+ --- ogrenew/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
+++ ogrenew/OgreMain/include/OgreDataStream.h 24 Nov 2007 00:35:47 -0000
@@ -33,6 +33,7 @@
#include "OgreString.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-27 03:04:23
|
Revision: 518
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=518&view=rev
Author: andy_miller
Date: 2007-12-26 19:04:27 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
Updates for Build system V2
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2007-12-26 14:48:44 UTC (rev 517)
+++ trunk/python-ogre/BuildModule.py 2007-12-27 03:04:27 UTC (rev 518)
@@ -74,9 +74,9 @@
##env["LDFLAGS"]="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin" ### Mac GCC 4.0.1 doesn't support rpath
env["PYTHONPATH"]=PREFIX+"/lib/python2.5/site-packages"
else:
- env["CFLAGS"]="\"-I"+PREFIX+"/include -L"+PREFIX+"/lib\""
- env["CXXFLAGS"]="\"-I"+PREFIX+"/include -L"+PREFIX+"/lib\""
- env["LDFLAGS"]="\"-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin\""
+ env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
+ env["CXXFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
+ env["LDFLAGS"]="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin"
env["PYTHONPATH"]=PREFIX+"/lib/python25/site-packages"
env["PATH"]=PREFIX+"/bin:" + PATH
@@ -135,7 +135,7 @@
usage = "usage: %prog [options] moduleName"
parser = OptionParser(usage=usage, version="%prog 1.0")
parser.add_option("-r", "--retrieve", action="store_true", default=False,dest="retrieve", help="Retrieve the appropiate source before building")
- parser.add_option("-n", "--build", action="store_true", default=False ,dest="build", help="Build the appropiate module")
+ parser.add_option("-b", "--build", action="store_true", default=False ,dest="build", help="Build the appropiate module")
parser.add_option("-g", "--gen", action="store_true", default=False ,dest="gencode", help="Generate Source Code for the module")
parser.add_option("-c", "--compile", action="store_true", default=False ,dest="compilecode", help="Compile Source Code for the module")
@@ -148,31 +148,34 @@
classList = getClassList ()
(options, args) = parseInput()
- if len(args) != 1:
+ if len(args) == 0:
exit("The module to build wasn't specified. Use -h for help")
if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False:
exit ( "You need to specific at least one option. Use -h for help")
- moduleName = args[0]
- if not classList.has_key( moduleName ):
- exit("Module specificed was not found (%s is not in environment.py) " % moduleName )
-
if not os.path.exists( environment.downloadPath ):
- os.mkdir ( environment.downloadPath )
- if options.retrieve:
- retrieveSource ( classList[ moduleName ] )
- if options.build :
- buildModule ( classList[ moduleName ] )
- if options.gencode :
- if classList[ moduleName ].pythonModule == True:
- generateCode ( classList[ moduleName ] )
- else:
- exit ( "Module specificed does not generate source code (%s is a supporting module)" % moduleName )
- if options.compilecode :
- if classList[ moduleName ].pythonModule == True:
- compileCode ( classList[ moduleName ] )
- else:
- exit ( "Module specificed does not need compiling (%s is a supporting module)" % moduleName )
+ os.mkdir ( environment.downloadPath )
+
+ if not os.path.exists( environment.Config.ROOT_DIR ):
+ os.mkdir ( environment.Config.ROOT_DIR )
+
+ for moduleName in args:
+ if not classList.has_key( moduleName ):
+ exit("Module specificed was not found (%s is not in environment.py) " % moduleName )
+ if options.retrieve:
+ retrieveSource ( classList[ moduleName ] )
+ if options.build :
+ buildModule ( classList[ moduleName ] )
+ if options.gencode :
+ if classList[ moduleName ].pythonModule == True:
+ generateCode ( classList[ moduleName ] )
+ else:
+ exit ( "Module specificed does not generate source code (%s is a supporting module)" % moduleName )
+ if options.compilecode :
+ if classList[ moduleName ].pythonModule == True:
+ compileCode ( classList[ moduleName ] )
+ else:
+ exit ( "Module specificed does not need compiling (%s is a supporting module)" % moduleName )
-
\ No newline at end of file
+
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-12-26 14:48:44 UTC (rev 517)
+++ trunk/python-ogre/environment.py 2007-12-27 03:04:27 UTC (rev 518)
@@ -137,6 +137,10 @@
unzip = "unzip "
cvs = "cvs -z3 -q "
svn = "svn --non-interactive "
+ if isMac():
+ sed_ = "sed -i '' "
+ else:
+ sed_ = "sed --in-place "
if isMac():
Config.PATH_Boost = os.path.join(Config.LOCAL_INCLUDE, 'boost-1_34_1')
@@ -206,7 +210,7 @@
if isLinux():
base = 'Cg-2.0_Dec2007_x86'
source = [
- [wget, " http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/"+base+".tar.gz",downloadPath]
+ [wget, " http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0010/"+base+".tar.gz",downloadPath]
]
buildCmds = [
@@ -340,7 +344,7 @@
source = [
[wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.16.tgz', downloadPath],
[wget,'http://downloads.sourceforge.net/boost/boost_1_34_1.tar.gz',downloadPath]
- ]
+ ]
buildCmds = [
## first handle bjam
[0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''],
@@ -351,9 +355,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,cp + ' -R'+os.path.join('python-ogre','boost') + '* ' + base , ''], # need to overwrite the boost with our files
- [0,"sed -i '' 's/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/' boost_1_34_1/configure", '' ],
- [0,"sed -i '' s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost_1_34_1/boost/python/detail/preprocessor.hpp", ''],
+ [0,cp + ' -R '+os.path.join('python-ogre','boost','*') +' ' + base , ''], # need to overwrite the boost with our files
+ [0, sed_ + " 's/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/' boost_1_34_1/configure", '' ],
+ [0, sed_ + " s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost_1_34_1/boost/python/detail/preprocessor.hpp", ''],
[0,"./configure --with-libraries=python --prefix=%s" % PREFIX, os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-26 14:48:46
|
Revision: 517
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=517&view=rev
Author: andy_miller
Date: 2007-12-26 06:48:44 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
Update to ogre generation -- creates auto casting functionsto expose base classes
Modified Paths:
--------------
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_sizeof.h
Modified: trunk/python-ogre/code_generators/ogre/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/customization_data.py 2007-12-26 14:40:50 UTC (rev 516)
+++ trunk/python-ogre/code_generators/ogre/customization_data.py 2007-12-26 14:48:44 UTC (rev 517)
@@ -2,7 +2,7 @@
def header_files( version ):
if not version.startswith("1.2"):
## 21Nov07; Change to precompiled header support
- return [ 'python_ogre_precompiled.h'
+ 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
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2007-12-26 14:40:50 UTC (rev 516)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2007-12-26 14:48:44 UTC (rev 517)
@@ -662,7 +662,6 @@
elif os.name =='posix':
Fix_Posix( mb )
- common_utils.Auto_Document( mb, MAIN_NAMESPACE )
###############################################################################
##
@@ -680,10 +679,7 @@
elif sys.platform.startswith ('linux'):
pass
mb.global_ns.class_('vector<int, std::allocator<int> >').alias='VectorInt'
- try:
- mb.global_ns.class_('vector<std::pair<unsigned int, unsigned int>, std::allocator<std::pair<unsigned int, unsigned int> > >').alias='VectorUnsignedUnsigned'
- except:
- pass
+ mb.global_ns.class_('vector<std::pair<unsigned, unsigned>, std::allocator<std::pair<unsigned, unsigned> > >').alias='VectorUnsignedUnsigned'
#as reported by mike with linux:bp::arg("flags")=(std::_Ios_Fmtflags)0
mb.namespace( MAIN_NAMESPACE ).class_('StringConverter').member_functions('toString').exclude()
@@ -816,6 +812,48 @@
#~ # # c.exclude() ## exclude the first constructor..
#~ # # break
+def autoCasting ( main_ns, ignores = ['ParamCommand','MovableObjectFactory'] ):
+ """ looks for classes that have parents (bases) and there are overlapping/hidden functions
+ When we find one insert a asPARENT helper function just in case it might be needed
+
+ Only real world case I know of is casting a Bone to a Node so you can create a new node.
+
+ """
+
+ CastReg=\
+ """
+ def( "%(functionName)s", &::%(className)s_%(functionName)s,\
+ "Python-Ogre Hand Wrapped to cast to a parent(base) type\\n\
+ In this case from a %(className)s to a %(castName)s",\
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
+ """
+ CastDec=\
+ """
+ %(returnType)s *
+ %(className)s_%(functionName)s ( %(classDecl)s * me ) {
+ return ( (%(returnType)s * ) me );
+ }
+ """
+
+ for c in main_ns.classes():
+ if len(c.bases) > 0:
+ for b in c.bases:
+ r = b.related_class
+ if not '<' in r.decl_string : ##and c.name != 'BillboardSet': # don't worry about templates or factories..
+ if not r.name in ignores: # there are some bases that we don't care about overlaps on
+ for f in c.member_functions(allow_empty=True):
+ if r.member_functions(f.name, allow_empty=True ):
+ values = { 'returnType':r.decl_string, 'functionName': "as"+r.name,
+ 'className':c.name, 'classDecl': c.decl_string,
+ 'castName':r.name }
+
+ regcode = CastReg % values
+ deccode = CastDec % values
+ c.add_declaration_code( deccode )
+ c.add_registration_code( regcode )
+ print "Hand wrapper (as"+r.name+") created to cast from", c.name, "to", r.name ## b.access
+ break
+
#
# the 'main'function
#
@@ -878,7 +916,7 @@
mb.classes().always_expose_using_scope = True
-
+
#
# We filter (both include and exclude) specific classes and functions that we want to wrap
#
@@ -887,7 +925,8 @@
main_ns = global_ns.namespace( MAIN_NAMESPACE )
main_ns.include()
-
+ autoCasting ( main_ns ) ##
+
common_utils.AutoExclude ( mb, MAIN_NAMESPACE )
ManualExclude ( mb )
common_utils.AutoInclude ( mb, MAIN_NAMESPACE )
@@ -899,6 +938,9 @@
ManualAlias ( mb )
AutoFixes ( mb, MAIN_NAMESPACE )
ManualFixes ( mb )
+# # indicated where underlying libraries are protected etc in the doc strings
+ common_utils.Auto_Document( mb, MAIN_NAMESPACE )
+
common_utils.Auto_Functional_Transformation ( main_ns, special_vars=['::Ogre::Real &','::Ogre::ushort &','size_t &'] )
for cls in main_ns.classes():
@@ -928,6 +970,7 @@
# the manual stuff all done here !!!
#
hand_made_wrappers.apply( mb )
+
NoPropClasses = ["UTFString"]
for cls in main_ns.classes():
@@ -986,7 +1029,7 @@
## copied to the generaated directory..
additional_files=[
os.path.join( environment.shared_ptr_dir, 'py_shared_ptr.h'),
- os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'python_ogre_precompiled.h' ),
+ os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'python_ogre_precompiled.h' ),
os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'python_ogre_masterlist.h' ),
os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'generators.h' ),
os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'custom_rvalue.cpp' ),
Modified: trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2007-12-26 14:40:50 UTC (rev 516)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2007-12-26 14:48:44 UTC (rev 517)
@@ -6,15 +6,15 @@
sizeof ( Ogre::MapIterator< std::multimap<Ogre::String, Ogre::String> > );
sizeof ( Ogre::MapIterator< std::map<Ogre::String, std::multimap<Ogre::String, Ogre::String>*> > );
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, Ogre::Node*, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, Ogre::Node*> >, false> > );
//sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, unsigned short, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, unsigned short> >, false> > );
sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, Ogre::SharedPtr<Ogre::Resource>, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, Ogre::SharedPtr<Ogre::Resource> > >, false> > );
sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, Ogre::MovableObject*, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, Ogre::MovableObject*> >, false> > );
-#endif
-
-sizeof ( std::pair<Ogre::SharedPtr<Ogre::Resource>, bool> );
+#endif
+sizeof( std::pair<Ogre::SharedPtr<Ogre::Resource>, bool> );
+
std::vector< int > v;
std::set< std::string > s;
std::multimap< std::string, std::string > ms;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-26 14:40:49
|
Revision: 516
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=516&view=rev
Author: andy_miller
Date: 2007-12-26 06:40:50 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
Updates to support the new 'BuildModule' build system -- currently in test with MacOS
Updated Ogre patch and the showcase demo to wotrk with the newer Caelum
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/demos/showcase_01/Demo_Forest.py
trunk/python-ogre/environment.py
trunk/python-ogre/patch/ogre.patch
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/BuildModule.py
Added: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py (rev 0)
+++ trunk/python-ogre/BuildModule.py 2007-12-26 14:40:50 UTC (rev 516)
@@ -0,0 +1,178 @@
+#
+# BuildModule will build a Python-Ogre module.
+#
+
+## Curent
+
+from optparse import OptionParser
+import subprocess
+import environment
+import logging
+import sys
+import types
+import os
+
+logger = None
+
+def setupLogging ():
+ # set up logging to file
+ logging.basicConfig(level=logging.DEBUG,
+ format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
+ datefmt='%m-%d %H:%M',
+ filename='log.out',
+ filemode='w')
+ # define a Handler which writes INFO messages or higher to the sys.stderr
+ console = logging.StreamHandler()
+ console.setLevel(logging.INFO)
+ # set a format which is simpler for console use
+ formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
+ # tell the handler to use this format
+ console.setFormatter(formatter)
+ # add the handler to the root logger
+ logging.getLogger('').addHandler(console)
+
+
+def getClassList ():
+ """ create a dictionary of classes from the enfironment modules
+ """
+ dict = {}
+ for c in dir(environment):
+ var = environment.__dict__[c]
+ if isinstance ( var, types.ClassType ) : ## OK so we know it's a class
+# logger.debug ( "getClassList: Checking %s" % c )
+ if hasattr(var, 'active') and hasattr(var, 'pythonModule'): # and it looks like one we can about
+# logger.debug ( "getClassList: it's one of ours")
+ dict[c] = var
+ return dict
+
+def exit( ExitMessage ):
+ logger.error( ExitMessage )
+ sys.exit( -1 )
+
+
+## This stuff has to be in my spawing sub process
+# # export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$PREFIX/lib/pkgconfig
+# # export LD_LIBRARY_PATH=$PREFIX/lib
+# # export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
+# # export CXXFLAGS=$CFLAGS
+# # export LDFLAGS="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin"
+# # export PATH=$PREFIX/bin:$PATH
+# # export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages
+
+
+def spawnTask ( task, cwdin = '' ):
+ """Execute a command line task and manage the return code etc
+ """
+ PREFIX = environment.PREFIX
+ PATH = os.environ["PATH"]
+ env = os.environ
+ env["PKG_CONFIG_PATH"]=PREFIX+"/lib/pkgconfig"
+ env["LD_LIBRARY_PATH"]=PREFIX+"/lib"
+ if environment.isMac():
+ env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib" ### XXX Note the space after the -I needed for the MAC, not tested yet on Linux
+ env["CXXFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
+ ##env["LDFLAGS"]="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin" ### Mac GCC 4.0.1 doesn't support rpath
+ env["PYTHONPATH"]=PREFIX+"/lib/python2.5/site-packages"
+ else:
+ env["CFLAGS"]="\"-I"+PREFIX+"/include -L"+PREFIX+"/lib\""
+ env["CXXFLAGS"]="\"-I"+PREFIX+"/include -L"+PREFIX+"/lib\""
+ env["LDFLAGS"]="\"-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin\""
+ env["PYTHONPATH"]=PREFIX+"/lib/python25/site-packages"
+ env["PATH"]=PREFIX+"/bin:" + PATH
+
+
+ logger.debug ( "Spawning '%s' in '%s' %s " % (task,cwdin, env["PYTHONPATH"]) )
+ process = subprocess.Popen (task, shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd = cwdin, env=env)
+ out,err = process.communicate()
+ returncode = process.returncode
+ if returncode != 0:
+ logger.warning ( "Task Failed" )
+ logger.debug ( out )
+ logger.debug ( err )
+ return returncode
+
+def retrieveSource ( module ):
+ """ Here's we we retrieve the necessary source files
+ """
+ for cmd,args,cwd in module.source:
+ logger.info ("Retrieving %s" % args )
+ ret = spawnTask ( cmd+ " " + args, cwd )
+
+def buildModule ( module ):
+ """ Execute the build commands for the module
+ """
+ for type_,cmd,path in module.buildCmds:
+ if path =='':
+ path = os.getcwd()
+ if type_ == 0 : # it's a shell command
+ logger.info ("Build Command %s " % cmd)
+ ret = spawnTask ( cmd, path )
+ elif type_ == 1 :
+ logger.debug ("Compiling %s " % cmd )
+ code = compile ( cmd, '<string>', 'exec' )
+ logger.debug ("executing codeblock " )
+ exec code
+ logger.debug ( "Exec done")
+
+def generateCode ( module ):
+ """ Generate the C++ wrapper code
+ """
+ logger.info ( "Building Source code for " + module.name )
+ ### AJM -- note the assumption that environment.py is sitting in the 'python-ogre' directory...
+ ret = spawnTask ( 'python generate_code.py', os.path.join(environment.root_dir, 'code_generators', module.name) )
+
+def compileCode ( module ):
+ """ Compile the wrapper code and make the modules
+ """
+ logger.info ( "Compiling Source code for " + module.name )
+ ### AJM -- note the assumption that environment.py is sitting in the 'python-ogre' directory...
+ ret = spawnTask ( 'scons PROJECTS='+module.name, os.path.join(environment.root_dir) )
+
+
+
+def parseInput():
+ """Handle command line input """
+ usage = "usage: %prog [options] moduleName"
+ parser = OptionParser(usage=usage, version="%prog 1.0")
+ parser.add_option("-r", "--retrieve", action="store_true", default=False,dest="retrieve", help="Retrieve the appropiate source before building")
+ parser.add_option("-n", "--build", action="store_true", default=False ,dest="build", help="Build the appropiate module")
+ parser.add_option("-g", "--gen", action="store_true", default=False ,dest="gencode", help="Generate Source Code for the module")
+ parser.add_option("-c", "--compile", action="store_true", default=False ,dest="compilecode", help="Compile Source Code for the module")
+
+ (options, args) = parser.parse_args()
+ return (options,args)
+
+if __name__ == '__main__':
+ setupLogging()
+ logger = logging.getLogger('PythonOgre.BuildModule')
+ classList = getClassList ()
+
+ (options, args) = parseInput()
+ if len(args) != 1:
+ exit("The module to build wasn't specified. Use -h for help")
+
+ if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False:
+ exit ( "You need to specific at least one option. Use -h for help")
+
+ moduleName = args[0]
+ if not classList.has_key( moduleName ):
+ exit("Module specificed was not found (%s is not in environment.py) " % moduleName )
+
+ if not os.path.exists( environment.downloadPath ):
+ os.mkdir ( environment.downloadPath )
+ if options.retrieve:
+ retrieveSource ( classList[ moduleName ] )
+ if options.build :
+ buildModule ( classList[ moduleName ] )
+ if options.gencode :
+ if classList[ moduleName ].pythonModule == True:
+ generateCode ( classList[ moduleName ] )
+ else:
+ exit ( "Module specificed does not generate source code (%s is a supporting module)" % moduleName )
+ if options.compilecode :
+ if classList[ moduleName ].pythonModule == True:
+ compileCode ( classList[ moduleName ] )
+ else:
+ exit ( "Module specificed does not need compiling (%s is a supporting module)" % moduleName )
+
+
\ No newline at end of file
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-12-26 14:36:36 UTC (rev 515)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-12-26 14:40:50 UTC (rev 516)
@@ -5,17 +5,19 @@
## 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
+
# 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_34')
+PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_34_1')
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = LOCAL_LIB
## and the name of the boost python library
-LIB_Boost = 'libboost_python-gcc41-1_34'
+LIB_Boost = 'libboost_python-gcc41-1_34_1'
# in Linux we need to code in the Relative path for the library
RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\''
@@ -25,6 +27,7 @@
# and the Py++ directory as sometimes we need access to the code repository there
pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
+SDK = True
# # ## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
@@ -32,6 +35,11 @@
PATH_OgreAddons = os.path.join(BASE_DIR, 'ogreaddons')
PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
+
+if SDK:
+ PATH_CEGUI = os.path.join(BASE_DIR, 'ogrenew','Dependencies')
+ PATH_OIS = os.path.join(BASE_DIR, 'ogrenew','Dependencies')
+
PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK','sdk')
PATH_ODE = os.path.join(BASE_DIR, 'ode-0.9')
PATH_OGG = os.path.join(BASE_DIR, 'libogg-1.1.3')
@@ -73,8 +81,14 @@
PATH_LIB_OgreRefApp = os.path.join( LOCAL_LIB ) # PATH_Ogre, 'ReferenceApplication/ReferenceAppLayer/lib/Release')
PATH_LIB_OgreNewt = os.path.join( LOCAL_LIB ) #PATH_OgreAddons, r'ogrenewt/OgreNewt_Main/lib/Release')
PATH_LIB_Newton = os.path.join( LOCAL_LIB ) # PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
+
PATH_LIB_OIS = os.path.join( LOCAL_LIB ) #PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
PATH_LIB_CEGUI = os.path.join( LOCAL_LIB ) #PATH_Ogre, r'Dependencies/lib/Release' )
+if SDK:
+ PATH_LIB_OIS = os.path.join( PATH_OIS,'lib', '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_Ogre_OgreMain= os.path.join( PATH_Ogre, 'OgreMain/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')
@@ -97,10 +111,17 @@
PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_Ogre_Dependencies = PATH_INCLUDE_Ogre # os.path.join( PATH_Ogre, 'Dependencies/include')
+
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:
+ 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')
+
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_CEGUI = os.path.join(LOCAL_INCLUDE,'CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
PATH_INCLUDE_ODE = os.path.join(LOCAL_INCLUDE,'ode') #os.path.join( PATH_ODE, 'include')
PATH_INCLUDE_OPCODE = PATH_OPCODE
PATH_INCLUDE_ODESOURCE = '' # os.path.join( PATH_ODE, 'ode/src')
Modified: trunk/python-ogre/demos/showcase_01/Demo_Forest.py
===================================================================
--- trunk/python-ogre/demos/showcase_01/Demo_Forest.py 2007-12-26 14:36:36 UTC (rev 515)
+++ trunk/python-ogre/demos/showcase_01/Demo_Forest.py 2007-12-26 14:40:50 UTC (rev 516)
@@ -14,10 +14,12 @@
import math, random, ctypes
warnings.simplefilter('default', RuntimeWarning)
-import psyco
-psyco.full()
+try:
+ import psyco
+ psyco.full()
+except:
+ pass
-
WORLD_SIZE = 5000
WATER_LEVEL = 80
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-12-26 14:36:36 UTC (rev 515)
+++ trunk/python-ogre/environment.py 2007-12-26 14:40:50 UTC (rev 516)
@@ -27,6 +27,22 @@
if _LOGGING_ON:
print __file__, "LOG::", instring
+def isWindows():
+ if os.name == 'nt':
+ return True
+ return False
+
+def isLinux():
+ if os.name == 'posix' and os.sys.platform != 'darwin':
+ return True
+ return False
+
+def isMac():
+ if os.sys.platform == 'darwin':
+ return True
+ return False
+
+
PythonOgreMajorVersion = "1"
PythonOgreMinorVersion = "1" # change to 0.7 due to lowercase properties
PythonOgrePatchVersion = "0"
@@ -39,16 +55,16 @@
## I want a version string 2.4 or 2.5 etc
PythonVersionString = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
-if os.name =='nt':
- python_include_dirs = os.path.join ( PATH_Python, 'include')
- python_lib_dirs = os.path.join ( PATH_Python, 'libs' )
+if isWindows():
+ python_include_dirs = os.path.join ( PATH_Python, 'include')
+ python_lib_dirs = os.path.join ( PATH_Python, 'libs' )
##
## for linux or darwin (MAC OS X)
else:
if os.sys.platform <> 'darwin':
## It's linux of some sort
- python_include_dirs = os.path.join ( '/usr/include/python'+PythonVersionString,'')
- python_lib_dirs = os.path.join ( '/usr/lib/python'+PythonVersionString, 'libs' )
+ python_include_dirs = os.path.join ( '/usr/include/python'+PythonVersionString,'')
+ python_lib_dirs = os.path.join ( '/usr/lib/python'+PythonVersionString, 'libs' )
else:
## it's Mac OS X
pathlist = PATH_Python.split('/')
@@ -102,64 +118,277 @@
######################
+downloadPath = os.path.abspath("downloads")
+wget = "wget -c -nc "
+tar = "tar "
+gzip = "gzip "
-## Hopefully we can make the rest of this 'automagic' ##
-class Default:
- version = ""
+if isWindows():
+ mv = "move /Y "
+ rm = "del /Q "
+ cp = "copy /Y "
+ unzip = "unzip "
+ cvs = "cvs -z3 -q "
+ svn = "svn "
+else:
+ mv = "mv "
+ rm = "rm -f "
+ cp = "cp -f "
+ unzip = "unzip "
+ cvs = "cvs -z3 -q "
+ svn = "svn --non-interactive "
+
+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
+ROOT = os.path.join(os.getcwd(),'root' )
+PREFIX = os.path.join(os.getcwd(),'root', 'usr' )
+
+
+def unTarGz ( base, source ):
+ """ a complete hack to cope with untar gziping a source file in the downloads directory into it's own directory
+ Needed as the GNU tools for windows don't handle tar forking gzip or working on files that are in
+ different directories
+ """
+ ret =[
+ [0,cp + os.path.join(downloadPath, base +".tar.gz") + " " + os.getcwd(), '' ],
+ [0,gzip + " -f -d " + os.path.join(os.getcwd(), base + ".tar.gz"), ''],
+ [0,tar + " xf " + base + ".tar", '' ],
+ [0,rm + base + ".tar", '']
+ ]
+ return ret
+
+
+
+
+####################################################
+##
+## These are the base tools and libraries
+##
+####################################################
+class gccxml:
pythonModule = False
- ModuleName = ""
- myHome = ""
- myLibraryPaths = [ ]
- myLibraries = [ ]
- parent = None
- children = []
- codeGenerationFlags=[]
- dependsOn = []
- compileFlags = []
- linkFlags= []
- includePaths = []
- myIncludes = []
- libaries = myLibraries # a list of the libraries I need plus
- Source = [] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'}
- BuildCmds = [] # commands to build the library with
+ active = True
+ if isLinux() or isMac():
+ base = 'gccxml'
+ source = [
+ [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co "+base, os.getcwd()]
+ ]
+
+ buildCmds = [
+ [0,"mkdir -p gccxml-build", ''],
+ [0,"cmake ../gccxml -DCMAKE_INSTALL_PREFIX:PATH="+ PREFIX,os.path.join(os.getcwd(),'gccxml-build')],
+ [0,"make", os.path.join(os.getcwd(),'gccxml-build')],
+ [0,"make install",os.path.join(os.getcwd(),'gccxml-build')]
+ ]
+
+
+class pygccxml:
+ pythonModule = False
+ active = True
+ if isLinux() or isMac():
+ base = 'pygccxml'
+ source = [
+ [svn, " co https://pygccxml.svn.sourceforge.net/svnroot/pygccxml "+base, os.getcwd()]
+ ]
+
+ buildCmds = [
+ [0,"python setup.py install --prefix="+ PREFIX , os.path.join (os.getcwd(), base, "pygccxml_dev") ],
+ [0,"python setup.py install --prefix=" + PREFIX , os.path.join (os.getcwd(), base, "pyplusplus_dev") ]
+ ]
+
+class cg:
+ pythonModule = False
+ active = True
+ if isLinux():
+ base = 'Cg-2.0_Dec2007_x86'
+ source = [
+ [wget, " http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/"+base+".tar.gz",downloadPath]
+ ]
+
+ buildCmds = [
+ [0,tar + " xvzf "+ os.path.join(downloadPath,base) + ".tar.gz --overwrite", ROOT], # unpack it directly into 'our' root
+ ]
+ if isMac():
+ source = [
+ [wget, "http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0010/Cg-2.0_Dec2007.dmg", downloadPath ]
+
+ ]
+ buildCmds = [
+ ]
+## "http://downloads.sourceforge.net/ogre/OgreDependenciesOSX_20070929.zip"
-######################
-class GeneralModules:
+
+class zziplib:
+ ## The 'install' "fails" on the mac however it's actually OK
pythonModule = False
- Source = [
- ["wget", "http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/Cg-1.5_Aug2007_x86.tar.gz",''],
- ["wget", "http://www.cmake.org/files/v2.4/cmake-2.4.6-Linux-i386.tar.gz",''],
- ["wget", "http://downloads.sourceforge.net/scons/scons-0.97.0d20070918.tar.gz",''],
- ]
+ active = True
+ if isLinux() or isMac():
+ base = 'zziplib-0.13.49'
+ source = [
+ [wget, " http://downloads.sourceforge.net/zziplib/"+base+".tar.bz2",downloadPath],
+ ]
+
+ buildCmds = [
+ [0,tar + " xjf "+ os.path.join(downloadPath,base) + ".tar.bz2 --overwrite", ''],
+ [0,"aclocal", os.path.join(os.getcwd(), base) ],
+ [0,"./configure --prefix=%s --datadir=%s/share --includedir=%s/include " % (PREFIX,PREFIX,PREFIX), os.path.join(os.getcwd(), base) ],
+ [0,"make" ,os.path.join(os.getcwd(), base) ],
+ [0,"make install",os.path.join(os.getcwd(), base) ]
+ ]
+
+
+class freeimage:
+ pythonModule = False
+ active = True
+ if isLinux() or isMac():
+ base = 'FreeImage'
+ source = [
+ [wget, " http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip",downloadPath],
+ ]
+
+ if isLinux():
+ buildCmds = [
+ [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "393.zip", ''],
+ ##
+ # Note the use of a single command that does multiple sed's
+ ##
+ [0, """sed --in-place -s 's|/usr/include|\$(DESTINC)|' Makefile.*\n\
+ sed --in-place -s 's|/usr/lib|\$(DESTLIB)|' Makefile.*\n\
+ sed --in-place -s 's|-o root -g root||' Makefile.*\n\
+ sed --in-place -s 's|ldconfig||' Makefile.*""", os.path.join(os.getcwd(), base) ],
+ [0, "make", os.path.join(os.getcwd(), base) ],
+ [0, "make DESTINC=%s/include DESTLIB=%s/lib install " % (PREFIX, PREFIX) ,os.path.join(os.getcwd(), base) ]
+ ]
+ if isMac(): ## mac has a crap sed command implementation and a different shell interaction, plus make file is a little different (or course)
+ buildCmds = [
+ [0, unzip + " -q -o " + os.path.join(downloadPath,base) + "393.zip", ''],
+ ##
+ # Note the use of a single command that does multiple sed's
+ ##
+ [0, """sed -i '' 's|/usr/local|$(DEST)|' Makefile.*\n\
+ sed -i '' 's|-o root -g wheel||' Makefile.*\n\
+ sed -i '' 's|ldconfig||' Makefile.*""", os.path.join(os.getcwd(), base) ],
+ [0, "make", os.path.join(os.getcwd(), base) ],
+ [0, "make DEST=%s install " % PREFIX ,os.path.join(os.getcwd(), base) ]
+ ]
+
+
+class cmake:
+ pythonModule = False
+ active = True
+ if isLinux() or isMac():
+ base = 'cmake-2.4.6-Linux-i386'
+
+ if isMac():
+ base = 'cmake-2.4.7-Darwin-universal'
+
+ source = [
+ [wget, "http://www.cmake.org/files/v2.4/"+base+".tar.gz",downloadPath],
+ ]
-class boost:
+
+ buildCmds = [
+ [0,tar + " xzf "+ os.path.join(downloadPath,base) + ".tar.gz --overwrite", ''], # unpack it
+ [0,cp + "-R * " + PREFIX, os.path.join (os.getcwd(), base) ] # copy to our bin area
+ ]
+
+class scons:
+ pythonModule = False
active = True
+ base = 'scons-0.97.0d20071212'
+ source = [
+ [wget, "http://downloads.sourceforge.net/scons/"+base+".tar.gz",downloadPath],
+ ]
+
+ # the utils in Windows don't handle paths or tar spawing gzip hence the work arounds
+ if isLinux():
+ buildCmds = [
+ [0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",'' ],
+ [0,"python setup.py install --prefix=%s" % PREFIX , os.path.join (os.getcwd(), base) ]
+ ]
+
+ else:
+ buildCmds = unTarGz( base, downloadPath ) +\
+ [
+ [0,"python setup.py install --prefix=%s" % PREFIX , os.path.join (os.getcwd(), base) ]
+ ]
+
+class boost: ## also included bjam
+ active = True
version = "3.4"
pythonModule = False
ModuleName = ""
- myHome = 'boost'
+ base = 'boost_1_34_1'
+
myLibraryPaths = [ 'boost/bin.v2/libs/python2.5/build/msvc-8.0/release/threading-multi' ]
myLibraries = [ 'boost_python-vc80-mt-1_35']
- parent = None
- children = []
- codeGenerationFlags=[]
- dependsOn = []
- compileFlags = []
- linkFlags= []
- includePaths = []
- myIncludes = []
- libaries = myLibraries # a list of the libraries I need plus
- Source = [
- ['wget','http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz',''] ,
- ['wget','http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2','']
- ] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'}
+
+
+ if isLinux() or isMac():
+ bjambase = 'boost-jam-3.1.16'
+ if isMac():
+ bjambuilddir = 'bin.macosxx86'
+ bjambuildset = 'darwin'
+ else:
+ bjambuilddir = 'bin.linuxx86'
+ bjambuildset = 'gcc'
+
+ source = [
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.16.tgz', downloadPath],
+ [wget,'http://downloads.sourceforge.net/boost/boost_1_34_1.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,cp + " bjam %s/bin" % PREFIX, os.path.join(os.getcwd(), bjambase, bjambuilddir )], ## 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,cp + ' -R'+os.path.join('python-ogre','boost') + '* ' + base , ''], # need to overwrite the boost with our files
+ [0,"sed -i '' 's/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/' boost_1_34_1/configure", '' ],
+ [0,"sed -i '' s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost_1_34_1/boost/python/detail/preprocessor.hpp", ''],
+ [0,"./configure --with-libraries=python --prefix=%s" % 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.16-1-ntx86'
+ source = [
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.16-1-ntx86.zip',downloadPath] ,
+ [wget,'http://downloads.sourceforge.net/boost/boost_1_34_1.tar.gz',downloadPath]
+ ]
+
+ buildCmds = unTarGz( base, downloadPath ) +\
+ [
+ [0,cp + ' -r '+os.path.join('python-ogre','boost') + '* ' + base , ''], # need to overwrite the boost with our files
+ [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ boost_1_34_1/configure', '' ],
+ [0,"sed -i s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost_1_34_1/boost/python/detail/preprocessor.hpp", ''],
+ [0, unzip + " " + os.path.join ( downloadPath, bjambase) + ".zip", ''],
+ ]
+
BuildCmds = [] # commands to build the library with
+
+
+####################################################
+##
+## Now for the actual Python-Ogre Modules
+##
+####################################################
+
class ogre:
active = True
pythonModule = True
version = "1.4"
- myName='ogre'
+ name='ogre'
ModuleName='OGRE'
cflags = ""
moduleParentLocation = "renderer"
@@ -173,7 +402,7 @@
# libraries += mod.libraries
#
- if os.name =='nt':
+ if isWindows():
# requirements to build a precompiled header on the fly
if _PreCompiled:
pchstop = 'python_ogre_precompiled.h'
@@ -193,7 +422,7 @@
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 '
LINKFLAGS = ''
externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', Config.LIB_Boost+'.dll']
- elif os.sys.platform <> 'darwin':
+ elif isLinux():
libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
lib_dirs = [ Config.LOCAL_LIB
]
@@ -202,7 +431,29 @@
]
CCFLAGS = '' ## -DBOOST_PYTHON_MAX_ARITY=19'
LINKFLAGS = ''
- else:
+ elif isMac():
+ base = "ogre-linux_osx-v1-4-5"
+ basedep = "OgreDependenciesOSX_20070929"
+ source = [
+ [wget, "http://prdownloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
+ [wget, "http://downloads.sourceforge.net/ogre/" +basedep +".zip",downloadPath],
+ ]
+ buildCmds = [
+ [0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
+ [0, unzip + os.path.join(downloadPath,base)+".zip ",os.path.join(os.getcwd(), 'ogrenew') ],
+ [0, "mkdir ~/Library/Frameworks", ''], ## Note that this will fail if the directory exists !!!
+ [0,cp + " -R "+os.path.join(os.getcwd(), 'ogrenew', '__MACOS','Dependencies')+'/*.framework ' + Config.FRAMEWORK_DIR,''],
+ [0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()],
+ [0, "mkdir Ogre",os.path.join(os.getcwd() ,'ogrenew','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() ,'ogrenew','OgreMain', 'include') ],
+ [0, "cp OgreRenderSystem.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ],
+ [0, "cp OgrePreRequisities.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ],
+ [0, "xcodebuild -project ogrenew/Mac/Ogre/Ogre.xcodeproj -configuration Release", ''],
+ [0, "xcodebuild -project ogrenew/Mac/Samples/Samples.xcodeproj -configuration Release", ''],
+ [0, "cp -R *.framework " + Config.FRAMEWORK_DIR, os.path.join(os.getcwd() ,'ogrenew',"Mac", "build", "Release") ]
+ ]
+
libs=[Config.LIB_Boost]
lib_dirs = [ Config.PATH_LIB_Boost ]
include_dirs = [ Config.PATH_Boost
@@ -212,22 +463,21 @@
]
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
- LINKFLAGS = '-framework Python -framework Ogre'
+ LINKFLAGS = ''
cflags += '--gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
- Source = [
- ["wget", "http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2",''],
- ["wget", "http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip",''],
-
- ]
+
class ois:
active = True
pythonModule = True
version= "1.1"
+ name = 'ois'
cflags=''
parent = "ogre/io"
+ if isMac():
+ source=[]
if os.name=='nt':
if _PreCompiled:
pchstop = 'OIS.h'
@@ -253,7 +503,9 @@
class ogrerefapp:
active = True
+ pythonModule = True
version = "1.4"
+ name = 'ogrerefapp'
parent = "ogre/physics"
if os.name=="nt":
libs=[Config.LIB_Boost, 'OgreMain', 'ode', 'ReferenceAppLayer']
@@ -274,8 +526,10 @@
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'OgreReferenceAppLayer.h', 'ode/ode.h']
class ogrenewt:
- active=True
+ active = True
+ pythonModule = True
version = "1.0"
+ name = 'ogrenewt'
parent = "ogre/physics"
if os.name =="nt":
libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
@@ -299,8 +553,10 @@
class cegui:
active = True
+ pythonModule = True
version = "0.5.0b"
parent = "ogre/gui"
+ name = 'cegui'
if os.name=='nt':
if _PreCompiled:
pchstop = 'cegui.h'
@@ -332,7 +588,10 @@
############# these are under construction and DO NOT WORK (Yet) #####################
class ode:
+ active = True
+ pythonModule = True
version= "0.9"
+ name ='ode'
parent = "ogre/physics"
libs=[Config.LIB_Boost, 'ode']
if os.name=="nt":
@@ -347,13 +606,15 @@
ModuleName = 'ODE'
CheckIncludes = ['boost/python.hpp', 'ode/ode.h']
- active=True
Source = [
["wget", "http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip",'']
]
class opcode:
+ active = True
+ pythonModule = True
version= "1.3"
+ name = 'opcode'
parent = "ogre/physics"
libs=[Config.LIB_Boost]
lib_dirs = [ Config.PATH_LIB_Boost
@@ -366,9 +627,11 @@
CCFLAGS = ' -DBAN_OPCODE_AUTOLINK -DICE_NO_DLL '
ModuleName = 'Opcode'
CheckIncludes = ['boost/python.hpp', 'Opcode.h']
- active=True
class caelum:
+ active = True
+ pythonModule = True
+ name = 'caelum'
version="0.2.1"
parent="ogre/addons"
cflags = ""
@@ -381,18 +644,13 @@
]
CheckIncludes=[]
libs=[ Config.LIB_Boost, 'OgreMain' ]
- ModuleName="caelum"
- active=True
-
-# class newton:
-# version= "1.0"
-# active=False
-# include_dirs = [r'c:/development/newtonsdk/sdk']
-# lib_dirs=[]
-# ModuleName = 'NEWTON'
-# parent = ""
+ ModuleName="caelum"
+
class ogreode:
+ active = True
+ pythonModule = True
version= "1.0"
+ name='ogreode'
parent = "ogre/physics"
lib_dirs = [ Config.PATH_LIB_Boost
@@ -416,10 +674,12 @@
'Ogreode_Prefab.h']
ModuleName='OgreOde'
- active=True
class quickgui:
+ active = True
+ pythonModule = True
version="0.9.7"
+ name ='quickgui'
parent="ogre/gui"
## note the defined for _QuickGUIExport forces non dll usage
if os.name=='nt':
@@ -444,11 +704,13 @@
CheckIncludes=[]
libs=[ Config.LIB_Boost, 'OgreMain' ]
ModuleName="QuickGUI"
- active=True
class navi:
+ active = True
+ pythonModule = True
version="1.4"
parent="ogre/gui"
+ name ='navi'
CCFLAGS = '-D"WIN32" -D"NDEBUG", -D"WINDOWS"'
cflags=""
include_dirs = [ Config.PATH_Boost
@@ -466,10 +728,12 @@
'kernel32.lib', 'gdi32.lib', 'winspool.lib', 'comdlg32.lib', 'advapi32.lib',
'shell32.lib','ole32.lib','oleaut32.lib','uuid.lib' ]
ModuleName="navi"
- active=False
class betagui:
+ active = True
+ pythonModule = True
version="2.0"
+ name='betagui'
parent="ogre/gui"
CCFLAGS = ' ' # -D"FT2_BUILD_LIBRARY"
cflags=""
@@ -484,10 +748,12 @@
CheckIncludes=[]
libs=[ Config.LIB_Boost, 'OgreMain' ]
ModuleName="betagui"
- active=True
class ogreforests:
+ active = True
+ pythonModule = True
version="0.1"
+ name='ogreforests'
parent="ogre/addons"
CCFLAGS = ' ' # -D"FT2_BUILD_LIBRARY"
cflags=""
@@ -501,10 +767,13 @@
CheckIncludes=[]
libs=[ Config.LIB_Boost, 'OgreMain' ]
ModuleName="ogreforests"
- active=True
+
class particleuniverse:
- version="0.4"
+ active = True
+ pythonModule = True
+ version="0.5"
+ name='particleuniverse'
parent="ogre/addons"
CCFLAGS = ' '
cflags=""
@@ -519,10 +788,12 @@
CheckIncludes=[]
libs=[ Config.LIB_Boost, 'OgreMain', 'ParticleUniverse' ]
ModuleName="particleuniverse"
- active=True
-
+
class nxogre:
- version="0.9"
+ active = True
+ pythonModule = True
+ version="1.0a"
+ name='nxogre'
parent="ogre/physics"
cflags=""
include_dirs = [ Config.PATH_Boost,
@@ -532,7 +803,7 @@
for d in Config.PATH_INCLUDE_PhysX:
include_dirs.append( d )
if os.name == 'nt':
- CCFLAGS = ' -D"WIN32" '
+ CCFLAGS = ' -DWIN32 -DNxExport="" '
# if _PreCompiled:
# pchstop = 'nxogre.h'
# pchbuild = 'buildpch.cpp'
@@ -552,13 +823,15 @@
else:
libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain' ]
ModuleName="NxOgre"
- active=True
class theora:
+ active = True
+ pythonModule = True
version="0.5.0"
parent="ogre/addons"
cflags=""
+ name='theora'
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
Config.PATH_INCLUDE_Theora,
@@ -576,10 +849,12 @@
CheckIncludes=[]
libs=[ Config.LIB_Boost, 'Plugin_TheoraVideoSystem','OgreMain' ]
ModuleName="theora"
- active=True
class plib:
+ active = True
+ pythonModule = True
version="1.8.4"
+ name='plib'
parent="ogre/addons"
cflags=""
CCFLAGS = ' -D"_CRT_SECURE_NO_WARNINGS" '
@@ -595,10 +870,11 @@
else:
libs = [ Config.LIB_Boost ] # Note sure what linux libraries are needed
+class physx:
active = True
-
-class physx:
+ pythonModule = True
version="2.7.3"
+ name='physx'
parent="ogre/physics"
cflags=""
include_dirs = [ Config.PATH_Boost,
@@ -620,11 +896,12 @@
else:
libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
ModuleName="PhysX"
- active=True
class ogreal:
- ## changes to compile ogreal as part of Python-Ogre to make it easier under linux
+ active = True
+ pythonModule = True
version="0.3"
+ name='ogreal'
parent = "ogre/sound"
include_dirs = [ Config.PATH_Boost
@@ -661,14 +938,17 @@
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
- active=True
Source = [
["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz",''],
["wget", "http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz",''],
["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",''],
]
+
class ogrevideoffmpeg:
+ active = True
+ pythonModule = True
version="0.2.1"
+ name='ogrevideoffmpeg'
parent="ogre/addons"
cflags = ""
include_dirs = [ Config.PATH_Boost,
@@ -687,10 +967,12 @@
else:
libs=[ Config.LIB_Boost, 'OgreMain', 'avformat', 'avcodec', 'avutil', 'z', 'GL', 'GLU', 'Xxf86vm', 'Xext', 'X11' ]
ModuleName="ogrevideoffmpeg"
- active=True
class ogredshow:
+ active = False
+ pythonModule = True
version="0.1"
+ name='ogredshow'
parent="ogre/addons"
if os.name=='nt':
## note the defined for _ETManagerExport forces non dll usage
@@ -709,10 +991,12 @@
CheckIncludes=[]
libs=[ Config.LIB_Boost, 'OgreMain','Strmiids' , 'ole32']
ModuleName="ogredshow"
- active=False ### Dec 01 -- seems like dxtrans.h is missing from newer Directx DSK?
class et: ## editable terrain
+ active = True
+ pythonModule = True
version= "2.2"
+ name='et'
parent = "ogre/addons"
libs=[ Config.LIB_Boost, 'OgreMain' ]
lib_dirs = [ Config.PATH_LIB_Boost,
@@ -724,11 +1008,13 @@
]
ModuleName = 'et'
CheckIncludes = ['boost/python.hpp']
- active=True
cflags = ""
class bullet:
+ active = True
+ pythonModule = True
version= "2.64"
+ name='bullet'
parent = "ogre/physics"
libs=[Config.LIB_Boost, 'LibBulletCollision', 'LibBulletDynamics']
if os.name == 'nt':
@@ -742,11 +1028,12 @@
ModuleName = 'bullet'
CheckIncludes = ['boost/python.hpp']
- active=True
cflags = ""
class ogrebulletc: #
- active=True
+ active = True
+ pythonModule = True
+ name='ogrebulletc'
version = "1.0"
cflags = ""
parent = "ogre/physics"
@@ -773,8 +1060,10 @@
CheckIncludes=['boost/python.hpp', 'Ogre.h']
class ogrebulletd: #
- active=True
+ active = True
+ pythonModule = True
version = "1.0"
+ name='ogrebulletd'
cflags = ""
parent = "ogre/physics"
libs = [Config.LIB_Boost, 'OgreMain',
@@ -801,8 +1090,11 @@
CheckIncludes=['boost/python.hpp', 'Ogre.h']
class noise:
+ active = True
+ pythonModule = True
version="1.0"
parent="ogre/addons"
+ name='noise'
cflags = ""
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_noise,
@@ -814,11 +1106,13 @@
CheckIncludes=[]
libs=[ Config.LIB_Boost]
ModuleName="noise"
- active=True
class watermesh:
+ active = True
+ pythonModule = True
version="1.0"
parent="ogre/addons"
+ name='watermesh'
cflags = ""
include_dirs = [ Config.PATH_Boost,
Config.PATH_watermesh
@@ -830,10 +1124,12 @@
CheckIncludes=[]
libs=[ Config.LIB_Boost, 'OgreMain' ]
ModuleName="watermesh"
- active=True
class ofusion:
+ active = True
+ pythonModule = True
version="1.0"
+ name='ofusion'
parent="ogre/addons"
cflags = ""
include_dirs = [ Config.PATH_Boost,
@@ -846,7 +1142,6 @@
CheckIncludes=[]
libs=[ Config.LIB_Boost, 'OgreMain' ]
ModuleName="ofusion"
- active=True
############################################################################################
@@ -901,18 +1196,19 @@
found = True
break
if not found:
- print "WARNING: Unable to find %s include file (%s class) in include_dirs" % (incfile, name)
- if os.name =='nt':
- for libfile in cls.libs :
- libfile += '.lib'
- found = False
- log ( "Checking for %s library (%s class) in lib_dirs" % (libfile, name) )
- for lookdir in cls.lib_dirs:
- if os.path.isfile ( os.path.join ( lookdir, libfile ) ):
- found = True
- break
- if not found:
- print "WARNING: Unable to find %s library (%s class) in lib_dirs" % (libfile, name)
+ pass
+# print "WARNING: Unable to find %s include file (%s class) in include_dirs" % (incfile, name)
+# # if os.name =='nt':
+# # for libfile in cls.libs :
+# # libfile += '.lib'
+# # found = False
+# # log ( "Checking for %s library (%s class) in lib_dirs" % (libfile, name) )
+# # for lookdir in cls.lib_dirs:
+# # if os.path.isfile ( os.path.join ( lookdir, libfile ) ):
+# # found = True
+# # break
+# # if not found:
+# # print "WARNING: Unable to find %s library (%s class) in lib_dirs" % (libfile, name)
#
# a couple of specials that should be done differently
Modified: trunk/python-ogre/patch/ogre.patch
===================================================================
--- trunk/python-ogre/patch/ogre.patch 2007-12-26 14:36:36 UTC (rev 515)
+++ trunk/python-ogre/patch/ogre.patch 2007-12-26 14:40:50 UTC (rev 516)
@@ -1,13 +1,3 @@
---- ogrenew/configure.in 2007-05-15 22:43:31.000000000 +0800
-+++ ogrenew/configure.in 2007-05-15 22:43:18.000000000 +0800
-@@ -59,6 +58,7 @@
- ;;
- esac
- ])
-+CFLAGS_VISIBILITY=""
- AC_SUBST(CFLAGS_VISIBILITY)
- AC_LANG_POP
-
--- ogrenew/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12
+++ ogrenew/OgreMain/include/OgreDataStream.h 24 Nov 2007 00:35:47 -0000
@@ -33,6 +33,7 @@
Modified: trunk/python-ogre/setup.py
===================================================================
--- trunk/python-ogre/setup.py 2007-12-26 14:36:36 UTC (rev 515)
+++ trunk/python-ogre/setup.py 2007-12-26 14:40:50 UTC (rev 516)
@@ -70,7 +70,8 @@
'ogre.addons.ogrevideoffmpeg', 'ogre.addons.ogredshow',
'ogre.addons.plib','ogre.gui.navi',
'ogre.addons.ogreforests', 'ogre.addons.et', 'ogre.addons.caelum',
- 'ogre.addons.noise', 'ogre.addons.watermesh', 'ogre.addons.ofusion' ],
+ 'ogre.addons.noise', 'ogre.addons.watermesh', 'ogre.addons.ofusion',
+ 'ogre.addons.particleuniverse' ],
"package_dir": {'': 'packages_'+ PythonVersionString },
"package_data": {'': ['*.pyd', '*.dll', '*.so']}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-26 14:36:39
|
Revision: 515
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=515&view=rev
Author: andy_miller
Date: 2007-12-26 06:36:36 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
Missed a file from Nxogre
Added Paths:
-----------
trunk/python-ogre/ThirdParty/NxOgreResourceStreamPtr.h
Added: trunk/python-ogre/ThirdParty/NxOgreResourceStreamPtr.h
===================================================================
--- trunk/python-ogre/ThirdParty/NxOgreResourceStreamPtr.h (rev 0)
+++ trunk/python-ogre/ThirdParty/NxOgreResourceStreamPtr.h 2007-12-26 14:36:36 UTC (rev 515)
@@ -0,0 +1,175 @@
+//
+// NxOgre a wrapper for the PhysX (formerly Novodex) physics library and the Ogre 3D rendering engine.
+// Copyright (C) 2005 - 2007 Robin Southern and NxOgre.org http://www.nxogre.org
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+#ifndef __NXOGRE_RESOURCESTREAMPTR_H__
+#define __NXOGRE_RESOURCESTREAMPTR_H__
+
+#include "NxOgrePrerequisites.h"
+
+namespace NxOgre {
+
+ /** @brief A generic abstract class to read or to write to a Resource, without exacting knowing
+ what exactly it is. It takes on a SmartPtr role in life, and the resource will be only
+ deleted from memory when it is no longer used.
+
+ @note All of ResourceStreamPtr code was used from the Ogre SmartPtr class, except for a changed
+ constructor and removal of template.
+
+ @see Ogre::SmartPtr
+ */
+ class NxExport ResourceStreamPtr {
+
+ protected:
+
+ ResourceStream* pStream;
+ unsigned int* pUseCount;
+
+ public:
+
+ OGRE_AUTO_SHARED_MUTEX // public to allow external locking
+ /** Constructor, does not initialise the ResourceStreamPtr.
+ @remarks
+ <b>Dangerous!</b> You have to call bind() before using the ResourceStreamPtr.
+ */
+ ResourceStreamPtr();
+
+ ResourceStreamPtr(ResourceIdentifier);
+ ResourceStreamPtr(ResourceIdentifier, void*);
+
+ ResourceStreamPtr(const ResourceStreamPtr& r)
+ : pStream(0), pUseCount(0)
+ {
+ // lock & copy other mutex pointer
+
+ OGRE_SET_AUTO_SHARED_MUTEX_NULL
+ OGRE_MUTEX_CONDITIONAL(r.OGRE_AUTO_MUTEX_NAME)
+ {
+ OGRE_LOCK_MUTEX(*r.OGRE_AUTO_MUTEX_NAME)
+ OGRE_COPY_AUTO_SHARED_MUTEX(r.OGRE_AUTO_MUTEX_NAME)
+ pStream = r.pStream;
+ pUseCount = r.pUseCount;
+ // Handle zero pointer gracefully to manage STL containers
+ if(pUseCount)
+ {
+ ++(*pUseCount);
+ }
+ }
+ }
+
+ void createStream(ResourceIdentifier);
+ void destroyStream();
+
+ ResourceStreamPtr& operator=(const ResourceStreamPtr& r) {
+ if (pStream == r.pStream)
+ return *this;
+ // Swap current data into a local copy
+ // this ensures we deal with rhs and this being dependent
+ ResourceStreamPtr tmp(r);
+ swap(tmp);
+ return *this;
+ }
+
+ virtual ~ResourceStreamPtr() {
+ release();
+ }
+
+ ResourceStream& operator*() const { assert(pStream); return *pStream; }
+ ResourceStream* operator->() const { assert(pStream); return pStream; }
+ ResourceStream* get() const { return pStream; }
+
+ /** Binds rep to the ResourceStreamPtr.
+ @remarks
+ Assumes that the ResourceStreamPtr is uninitialised!
+ */
+ void bind(ResourceStream* rep) {
+ assert(!pStream && !pUseCount);
+ OGRE_NEW_AUTO_SHARED_MUTEX
+ OGRE_LOCK_AUTO_SHARED_MUTEX
+ pUseCount = new unsigned int(1);
+ pStream = rep;
+ }
+
+ bool unique() const { OGRE_LOCK_AUTO_SHARED_MUTEX assert(pUseCount); return *pUseCount == 1; }
+ unsigned int useCount() const { OGRE_LOCK_AUTO_SHARED_MUTEX assert(pUseCount); return *pUseCount; }
+ unsigned int* useCountPointer() const { return pUseCount; }
+
+ ResourceStream* getPointer() const { return pStream; }
+
+ bool isNull(void) const { return pStream == 0; }
+
+ void setNull(void) {
+ if (pStream)
+ {
+ // can't scope lock mutex before release incase deleted
+ release();
+ pStream = 0;
+ pUseCount = 0;
+ }
+ }
+
+ protected:
+
+ void release(void)
+ {
+ bool destroyThis = false;
+
+ /* If the mutex is not initialized to a non-zero value, then neither is pUseCount nor pStream.
+ */
+
+ OGRE_MUTEX_CONDITIONAL(OGRE_AUTO_MUTEX_NAME)
+ {
+ // lock own mutex in limited scope (must unlock before destroy)
+ OGRE_LOCK_AUTO_SHARED_MUTEX
+ if (pUseCount)
+ {
+ if (--(*pUseCount) == 0)
+ {
+ destroyThis = true;
+ }
+ }
+ }
+ if (destroyThis)
+ destroy();
+
+ OGRE_SET_AUTO_SHARED_MUTEX_NULL
+ }
+
+ virtual void destroy(void);
+
+ virtual void swap(ResourceStreamPtr &other) {
+ std::swap(pStream, other.pStream);
+ std::swap(pUseCount, other.pUseCount);
+ #if OGRE_THREAD_SUPPORT
+ std::swap(OGRE_AUTO_MUTEX_NAME, other.OGRE_AUTO_MUTEX_NAME);
+ #endif
+ }
+
+ };
+
+ bool operator==(ResourceStreamPtr const& a, ResourceStreamPtr const& b){
+ return a.get() == b.get();
+ }
+
+ bool operator!=(ResourceStreamPtr const& a, ResourceStreamPtr const& b) {
+ return a.get() != b.get();
+ }
+
+}; // End of namespace
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-12-26 14:34:44
|
Revision: 514
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=514&view=rev
Author: andy_miller
Date: 2007-12-26 06:34:48 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
Thirdparty source updates - Ogreal, Quickgui, Caelum and OgreForests
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/caelum/Caelum.h
trunk/python-ogre/ThirdParty/caelum/CaelumExceptions.h
trunk/python-ogre/ThirdParty/caelum/CaelumListener.h
trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.cpp
trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.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/CameraBoundElement.cpp
trunk/python-ogre/ThirdParty/caelum/CameraBoundElement.h
trunk/python-ogre/ThirdParty/caelum/EarthSunPositionModel.cpp
trunk/python-ogre/ThirdParty/caelum/EarthSunPositionModel.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/ImageHelper.cpp
trunk/python-ogre/ThirdParty/caelum/ImageHelper.h
trunk/python-ogre/ThirdParty/caelum/LayeredClouds.cpp
trunk/python-ogre/ThirdParty/caelum/LayeredClouds.h
trunk/python-ogre/ThirdParty/caelum/SimpleSunPositionModel.cpp
trunk/python-ogre/ThirdParty/caelum/SimpleSunPositionModel.h
trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp
trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h
trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp
trunk/python-ogre/ThirdParty/caelum/SkyDome.h
trunk/python-ogre/ThirdParty/caelum/Starfield.cpp
trunk/python-ogre/ThirdParty/caelum/Starfield.h
trunk/python-ogre/ThirdParty/caelum/Sun.cpp
trunk/python-ogre/ThirdParty/caelum/Sun.h
trunk/python-ogre/ThirdParty/caelum/SunPositionModel.h
trunk/python-ogre/ThirdParty/caelum/UniversalClock.cpp
trunk/python-ogre/ThirdParty/caelum/UniversalClock.h
trunk/python-ogre/ThirdParty/forests/BatchPage.cpp
trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h
trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp
trunk/python-ogre/ThirdParty/forests/GrassLoader.h
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/PropertyMaps.h
trunk/python-ogre/ThirdParty/forests/StaticBillboardSet.cpp
trunk/python-ogre/ThirdParty/forests/StaticBillboardSet.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/ogreal/OgreAL.h
trunk/python-ogre/ThirdParty/ogreal/OgreALException.h
trunk/python-ogre/ThirdParty/ogreal/OgreALListener.cpp
trunk/python-ogre/ThirdParty/ogreal/OgreALListener.h
trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp
trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.h
trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
trunk/python-ogre/ThirdParty/ogreal/OgreALSound.cpp
trunk/python-ogre/ThirdParty/ogreal/OgreALSound.h
trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp
trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.h
trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp
trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUI.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEventArgs.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp
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/QuickGUIList.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPrecompiledHeaders.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPrerequisites.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuad.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuad.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuadContainer.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuadContainer.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSetManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextHelper.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextHelper.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertexBuffer.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertexBuffer.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalTrackBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
Modified: trunk/python-ogre/ThirdParty/caelum/Caelum.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/Caelum.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/Caelum.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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_H
#define CAELUM_H
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumExceptions.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumExceptions.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumExceptions.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 CAELUMEXCEPTIONS_H
#define CAELUMEXCEPTIONS_H
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumListener.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumListener.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumListener.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 CAELUMLISTENER_H
#define CAELUMLISTENER_H
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1 +1,21 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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"
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1 +1,21 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "Ogre.h"
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 CAELUMPREREQUISITES_H
#define CAELUMPREREQUISITES_H
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumSystem.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumSystem.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumSystem.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "CaelumSystem.h"
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumSystem.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumSystem.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumSystem.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 CAELUMSYSTEM_H
#define CAELUMSYSTEM_H
Modified: trunk/python-ogre/ThirdParty/caelum/CameraBoundElement.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CameraBoundElement.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/CameraBoundElement.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "CameraBoundElement.h"
Modified: trunk/python-ogre/ThirdParty/caelum/CameraBoundElement.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CameraBoundElement.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/CameraBoundElement.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 CAMERABOUNDELEMENT_H
#define CAMERABOUNDELEMENT_H
Modified: trunk/python-ogre/ThirdParty/caelum/EarthSunPositionModel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/EarthSunPositionModel.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/EarthSunPositionModel.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "EarthSunPositionModel.h"
Modified: trunk/python-ogre/ThirdParty/caelum/EarthSunPositionModel.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/EarthSunPositionModel.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/EarthSunPositionModel.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 EARTHSUNPOSITIONMODEL_H
#define EARTHSUNPOSITIONMODEL_H
Modified: trunk/python-ogre/ThirdParty/caelum/GeometryFactory.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/GeometryFactory.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/GeometryFactory.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "GeometryFactory.h"
Modified: trunk/python-ogre/ThirdParty/caelum/GeometryFactory.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/GeometryFactory.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/GeometryFactory.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 GEOMETRYFACTORY_H
#define GEOMETRYFACTORY_H
Modified: trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "GroundFog.h"
#include "CaelumExceptions.h"
Modified: trunk/python-ogre/ThirdParty/caelum/GroundFog.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/GroundFog.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/GroundFog.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 GROUNDFOG_H
#define GROUNDFOG_H
Modified: trunk/python-ogre/ThirdParty/caelum/ImageHelper.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/ImageHelper.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/ImageHelper.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "ImageHelper.h"
Modified: trunk/python-ogre/ThirdParty/caelum/ImageHelper.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/ImageHelper.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/ImageHelper.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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_HEADER__IMAGE_HELPER_H
#define CAELUM_HEADER__IMAGE_HELPER_H
Modified: trunk/python-ogre/ThirdParty/caelum/LayeredClouds.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/LayeredClouds.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/LayeredClouds.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "LayeredClouds.h"
#include "CaelumExceptions.h"
Modified: trunk/python-ogre/ThirdParty/caelum/LayeredClouds.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/LayeredClouds.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/LayeredClouds.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 LAYEREDCLOUDS_H
#define LAYEREDCLOUDS_H
Modified: trunk/python-ogre/ThirdParty/caelum/SimpleSunPositionModel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SimpleSunPositionModel.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/SimpleSunPositionModel.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "SimpleSunPositionModel.h"
Modified: trunk/python-ogre/ThirdParty/caelum/SimpleSunPositionModel.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SimpleSunPositionModel.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/SimpleSunPositionModel.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 SIMPLESUNPOSITIONMODEL_H
#define SIMPLESUNPOSITIONMODEL_H
Modified: trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "SkyColourModel.h"
#include "ImageHelper.h"
Modified: trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 SKYCOLOURMODEL_H
#define SKYCOLOURMODEL_H
Modified: trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "SkyDome.h"
#include "GeometryFactory.h"
Modified: trunk/python-ogre/ThirdParty/caelum/SkyDome.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyDome.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/SkyDome.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 SKYDOME_H
#define SKYDOME_H
Modified: trunk/python-ogre/ThirdParty/caelum/Starfield.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/Starfield.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/Starfield.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "Starfield.h"
#include "GeometryFactory.h"
Modified: trunk/python-ogre/ThirdParty/caelum/Starfield.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/Starfield.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/Starfield.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 STARFIELD_H
#define STARFIELD_H
Modified: trunk/python-ogre/ThirdParty/caelum/Sun.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/Sun.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/Sun.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "Sun.h"
#include "SimpleSunPositionModel.h"
Modified: trunk/python-ogre/ThirdParty/caelum/Sun.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/Sun.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/Sun.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 SUN_H
#define SUN_H
Modified: trunk/python-ogre/ThirdParty/caelum/SunPositionModel.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SunPositionModel.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/SunPositionModel.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 SUNPOSITIONMODEL_H
#define SUNPOSITIONMODEL_H
Modified: trunk/python-ogre/ThirdParty/caelum/UniversalClock.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/UniversalClock.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/UniversalClock.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 "UniversalClock.h"
Modified: trunk/python-ogre/ThirdParty/caelum/UniversalClock.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/UniversalClock.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/caelum/UniversalClock.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -1,3 +1,23 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 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 UNIVERSALCLOCK_H
#define UNIVERSALCLOCK_H
Modified: trunk/python-ogre/ThirdParty/forests/BatchPage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchPage.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/forests/BatchPage.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -36,7 +36,7 @@
void BatchPage::init(PagedGeometry *geom)
{
sceneMgr = geom->getSceneManager();
- batch = new BatchedGeometry(sceneMgr);
+ batch = new BatchedGeometry(sceneMgr, geom->getSceneNode());
fadeEnabled = false;
Modified: trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -36,14 +36,14 @@
//-------------------------------------------------------------------------------------
-BatchedGeometry::BatchedGeometry(SceneManager *mgr)
+BatchedGeometry::BatchedGeometry(SceneManager *mgr, SceneNode *rootSceneNode)
: withinFarDistance(0),
minDistanceSquared(0),
sceneNode(NULL),
sceneMgr(mgr),
built(false),
- boundsUndefined(true)
-
+ boundsUndefined(true),
+ parentSceneNode(rootSceneNode)
{
clear();
}
@@ -144,7 +144,7 @@
radius = bounds.getMaximum().length(); //Calculate BB radius
//Create scene node
- sceneNode = sceneMgr->getRootSceneNode()->createChildSceneNode(center);
+ sceneNode = parentSceneNode->createChildSceneNode(center);
//Build each batch
for (SubBatchMap::iterator i = subBatchMap.begin(); i != subBatchMap.end(); ++i){
@@ -207,7 +207,7 @@
withinFarDistance = true;
} else {
//Calculate camera distance
- Vector3 camVec = cam->getDerivedPosition() - center;
+ Vector3 camVec = _convertToLocal(cam->getDerivedPosition()) - center;
Real centerDistanceSquared = camVec.squaredLength();
minDistanceSquared = std::max(0.0f, centerDistanceSquared - (radius * radius));
//Note: centerDistanceSquared measures the distance between the camera and the center of the GeomBatch,
@@ -219,9 +219,16 @@
}
}
+Ogre::Vector3 BatchedGeometry::_convertToLocal(const Vector3 &globalVec) const
+{
+ assert(parentSceneNode);
+ //Convert from the given global position to the local coordinate system of the parent scene node.
+ return (parentSceneNode->getOrientation().Inverse() * globalVec);
+}
+
BatchedGeometry::SubBatch::SubBatch(BatchedGeometry *parent, SubMesh *mesh)
{
meshType = mesh;
@@ -306,15 +313,21 @@
//Misc. setup
Vector3 batchCenter = parent->center;
+ HardwareIndexBuffer::IndexType srcIndexType = meshType->indexData->indexBuffer->getType();
+ HardwareIndexBuffer::IndexType destIndexType;
+ if (vertexData->vertexCount > 0xFFFF || srcIndexType == HardwareIndexBuffer::IT_32BIT)
+ destIndexType = HardwareIndexBuffer::IT_32BIT;
+ else
+ destIndexType = HardwareIndexBuffer::IT_16BIT;
+
//Allocate the index buffer
- HardwareIndexBuffer::IndexType indexType = meshType->indexData->indexBuffer->getType();
indexData->indexBuffer = HardwareBufferManager::getSingleton()
- .createIndexBuffer(indexType, indexData->indexCount, HardwareBuffer::HBU_STATIC_WRITE_ONLY);
+ .createIndexBuffer(destIndexType, indexData->indexCount, HardwareBuffer::HBU_STATIC_WRITE_ONLY);
//Lock the index buffer
uint32 *indexBuffer32;
uint16 *indexBuffer16;
- if (indexType == HardwareIndexBuffer::IT_32BIT)
+ if (destIndexType == HardwareIndexBuffer::IT_32BIT)
indexBuffer32 = static_cast<uint32*>(indexData->indexBuffer->lock(HardwareBuffer::HBL_DISCARD));
else
indexBuffer16 = static_cast<uint16*>(indexData->indexBuffer->lock(HardwareBuffer::HBL_DISCARD));
@@ -498,7 +511,7 @@
//Copy mesh index data into the index buffer
- if (indexType == HardwareIndexBuffer::IT_32BIT) {
+ if (srcIndexType == HardwareIndexBuffer::IT_32BIT) {
//Lock the input buffer
uint32 *source = static_cast<uint32*>(sourceIndexData->indexBuffer->lock(
sourceIndexData->indexStart, sourceIndexData->indexCount, HardwareBuffer::HBL_READ_ONLY
@@ -516,22 +529,43 @@
//Increment the index offset
indexOffset += sourceVertexData->vertexCount;
} else {
- //Lock the input buffer
- uint16 *source = static_cast<uint16*>(sourceIndexData->indexBuffer->lock(
- sourceIndexData->indexStart, sourceIndexData->indexCount, HardwareBuffer::HBL_READ_ONLY
- ));
- uint16 *sourceEnd = source + sourceIndexData->indexCount;
+ if (destIndexType == HardwareIndexBuffer::IT_32BIT){
+ //-- Convert 16 bit to 32 bit indices --
+ //Lock the input buffer
+ uint16 *source = static_cast<uint16*>(sourceIndexData->indexBuffer->lock(
+ sourceIndexData->indexStart, sourceIndexData->indexCount, HardwareBuffer::HBL_READ_ONLY
+ ));
+ uint16 *sourceEnd = source + sourceIndexData->indexCount;
- //And copy it to the output buffer
- while (source != sourceEnd) {
- *indexBuffer16++ = static_cast<uint16>(*source++ + indexOffset);
- }
+ //And copy it to the output buffer
+ while (source != sourceEnd) {
+ uint32 indx = *source++;
+ *indexBuffer32++ = (indx + indexOffset);
+ }
- //Unlock the input buffer
- sourceIndexData->indexBuffer->unlock();
+ //Unlock the input buffer
+ sourceIndexData->indexBuffer->unlock();
- //Increment the index offset
- indexOffset += sourceVertexData->vertexCount;
+ //Increment the index offset
+ indexOffset += sourceVertexData->vertexCount;
+ } else {
+ //Lock the input buffer
+ uint16 *source = static_cast<uint16*>(sourceIndexData->indexBuffer->lock(
+ sourceIndexData->indexStart, sourceIndexData->indexCount, HardwareBuffer::HBL_READ_ONLY
+ ));
+ uint16 *sourceEnd = source + sourceIndexData->indexCount;
+
+ //And copy it to the output buffer
+ while (source != sourceEnd) {
+ *indexBuffer16++ = static_cast<uint16>(*source++ + indexOffset);
+ }
+
+ //Unlock the input buffer
+ sourceIndexData->indexBuffer->unlock();
+
+ //Increment the index offset
+ indexOffset += sourceVertexData->vertexCount;
+ }
}
}
@@ -590,7 +624,7 @@
Real BatchedGeometry::SubBatch::getSquaredViewDepth(const Camera* cam) const
{
- Vector3 camVec = cam->getDerivedPosition() - parent->center;
+ Vector3 camVec = parent->_convertToLocal(cam->getDerivedPosition()) - parent->center;
return camVec.squaredLength();
}
Modified: trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -16,7 +16,6 @@
#ifndef __BatchedGeometry_H__
#define __BatchedGeometry_H__
-#include "Ogre.h"
#include "OgrePrerequisites.h"
#include "OgreMovableObject.h"
#include "OgreSceneNode.h"
@@ -26,13 +25,15 @@
class BatchedGeometry: public Ogre::MovableObject
{
public:
- BatchedGeometry(Ogre::SceneManager *mgr);
+ BatchedGeometry(Ogre::SceneManager *mgr, Ogre::SceneNode *rootSceneNode);
~BatchedGeometry();
void addEntity(Ogre::Entity *ent, const Ogre::Vector3 &position, const Ogre::Quaternion &orientation = Ogre::Quaternion::IDENTITY, const Ogre::Vector3 &scale = Ogre::Vector3::UNIT_SCALE, const Ogre::ColourValue &color = Ogre::ColourValue::White);
void build();
void clear();
+ Ogre::Vector3 _convertToLocal(const Ogre::Vector3 &globalVec) const;
+
void _notifyCurrentCamera(Ogre::Camera *cam);
void _updateRenderQueue(Ogre::RenderQueue *queue);
bool isVisible();
@@ -110,7 +111,7 @@
Ogre::Real radius;
Ogre::SceneManager *sceneMgr;
- Ogre::SceneNode *sceneNode;
+ Ogre::SceneNode *sceneNode, *parentSceneNode;
Ogre::Real minDistanceSquared;
bool withinFarDistance;
@@ -125,4 +126,4 @@
-#endif
+#endif
\ No newline at end of file
Modified: trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -48,6 +48,7 @@
renderQueue = RENDER_QUEUE_6;
windTimer.reset();
+ lastTime = 0;
}
GrassLoader::~GrassLoader()
@@ -70,7 +71,6 @@
void GrassLoader::frameUpdate()
{
- static unsigned long lastTime = 0;
unsigned long currentTime = windTimer.getMilliseconds();
unsigned long ellapsedTime = currentTime - lastTime;
lastTime = currentTime;
@@ -1100,11 +1100,17 @@
void GrassPage::init(PagedGeometry *geom)
{
sceneMgr = geom->getSceneManager();
+ rootNode = geom->getSceneNode();
}
+GrassPage::~GrassPage()
+{
+ removeEntities();
+}
+
void GrassPage::addEntity(Entity *entity, const Vector3 &position, const Quaternion &rotation, const Vector3 &scale, const Ogre::ColourValue &color)
{
- SceneNode *node = sceneMgr->getRootSceneNode()->createChildSceneNode();
+ SceneNode *node = rootNode->createChildSceneNode();
node->setPosition(position);
nodeList.push_back(node);
Modified: trunk/python-ogre/ThirdParty/forests/GrassLoader.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/GrassLoader.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/forests/GrassLoader.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -176,6 +176,7 @@
//Animation
Ogre::Timer windTimer;
Ogre::Vector3 windDir;
+ unsigned long lastTime;
static unsigned long GUID;
static inline Ogre::String getUniqueID()
@@ -501,6 +502,8 @@
{
public:
void init(PagedGeometry *geom);
+ ~GrassPage();
+
void addEntity(Ogre::Entity *ent, const Ogre::Vector3 &position, const Ogre::Quaternion &rotation, const Ogre::Vector3 &scale, const Ogre::ColourValue &color);
void removeEntities();
void setFade(bool enabled, Ogre::Real visibleDist, Ogre::Real invisibleDist) {}
@@ -508,6 +511,7 @@
private:
Ogre::SceneManager *sceneMgr;
+ Ogre::SceneNode *rootNode;
std::list<Ogre::SceneNode*> nodeList;
@@ -519,4 +523,3 @@
};
#endif
-
Modified: trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2007-12-26 14:34:48 UTC (rev 514)
@@ -31,6 +31,7 @@
int ImpostorPage::impostorResolution = 128;
ColourValue ImpostorPage::impostorBackgroundColor = ColourValue(0.0f, 0.3f, 0.0f, 0.0f);
+BillboardOrigin ImpostorPage::impostorPivot = BBO_CENTER;
void ImpostorPage::init(PagedGeometry *geom)
@@ -44,7 +45,7 @@
if (++selfInstances == 1){
//Set up a single instance of a scene node which will be used when rendering impostor textures
- sceneMgr->getRootSceneNode()->createChildSceneNode("ImpostorPage::renderNode");
+ geom->getSceneNode()->createChildSceneNode("ImpostorPage::renderNode");
}
}
@@ -139,8 +140,8 @@
void ImpostorPage::update()
{
//Calculate the direction the impostor batches should be facing
- Vector3 camPos = geom->getCamera()->getDerivedPosition();
-
+ Vector3 camPos = geom->_convertToLocal(geom->getCamera()->getDerivedPosition());
+
//Update all batches
float distX = camPos.x - center.x;
float distZ = camPos.z - center.z;
@@ -152,7 +153,7 @@
if (distRelZ > geom->getPageSize() * 3) {
yaw = Math::ATan2(distX, distZ);
} else {
- Vector3 dir = geom->getCamera()->getDerivedDirection();
+ Vector3 dir = geom->_convertToLocal(geom->getCamera()->getDerivedDirection());
yaw = Math::ATan2(-dir.x, -dir.z);
}
@@ -175,6 +176,12 @@
ImpostorTexture::regenerateAll();
}
+void ImpostorPage::setImpostorPivot(BillboardOrigin origin)
+{
+ if (origin != BBO_CENTER && origin != BBO_BOTTOM_CENTER)
+ OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Invalid origin - only BBO_CENTER and BBO_BOTTOM_CENTER is supported", "ImpostorPage::setImpostorPivot()");
+ impostorPivot = origin;
+}
//-------------------------------------------------------------------------------------
@@ -188,9 +195,11 @@
tex = ImpostorTexture::getTexture(group, entity);
//Create billboard set
- bbset = new StaticBillboardSet(group->sceneMgr);
+ bbset = new StaticBillboardSet(group->sceneMgr, group->geom->getSceneNode());
bbset->setTextureStacksAndSlices(IMPOSTOR_PITCH_ANGLES, IMPOSTOR_YAW_ANGLES);
+ setBillboardOrigin(ImpostorPage::impostorPivot);
+
//Default the angle to 0 degrees
pitchIndex = -1;
yawIndex = -1;
@@ -258,7 +267,16 @@
}
}
+void ImpostorBatch::setBillboardOrigin(BillboardOrigin origin)
+{
+ bbset->setBillboardOrigin(origin);
+ if (bbset->getBillboardOrigin() == BBO_CENTER)
+ entityBBCenter = tex->entityCenter;
+ else if (bbset->getBillboardOrigin() == BBO_BOTTOM_CENTER)
+ entityBBCenter = Vector3(tex->entityCenter.x, -tex->entityCenter.y, tex->entityCenter.z);
+}
+
//-------------------------------------------------------------------------------------
std::map<ResourceHandle, ImpostorTexture *> ImpostorTexture::selfList;
Modified: trunk/python-ogre/ThirdParty/forests/ImpostorPage.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/ImpostorPage.h 2007-12-26 14:29:56 UTC (rev 513)
+++ trunk/python-ogre/ThirdParty/forests/ImpostorPage.h 2007-12-26 14:34:48 UTC (rev 514)
@@ -116,6 +116,20 @@
}
/**
+ \brief Sets the billboard pivot point used when rendering camera-facing impostors
+
+ This function can be used to set how impostors should rotate to face the camera. By default,
+ impostors are pointed towards the camera by rotating around the impostor billboard's center.
+ By choosing an alternate pivot point with this function, you can acheive better results under
+ certain conditions. For example, when looking up or down very steep hills, you'll probably want
+ to set BBO_BOTTOM_CENTER as the pivot point. For most other cases, however, the default pivot
+ point of BBO_CENTER works best.
+
+ \note Only BBO_CENTER and BBO_BOTTOM_CENTER is supported by this function currently.
+ */
+ static void setImpostorPivot(Ogre::BillboardOrigin origin);
+
+ /**
\brief Regenerates the impostor texture for the specified entity
\param ent The entity which will have it's impostor texture regenerated
@@ -154,6 +168,7 @@
ImpostorBlendMode blendMode;
static int impostorResolution;
static Ogre::ColourValue impostorBackgroundColor;
+ static ...
[truncated message content] |
|
From: <and...@us...> - 2007-12-26 14:29:56
|
Revision: 513
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=513&view=rev
Author: andy_miller
Date: 2007-12-26 06:29:56 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
nxogre update
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/nxogre/NxOgre.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacterController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreClothRaycaster.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreContainer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreCooking.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreCooking.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreDebugRenderer.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreDebugRenderer.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreError.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreError.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreFluid.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreFluidMesh.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreFluidMesh.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreForceField.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreGlobalFunctions.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreGroup.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreGroup.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreHelpers.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJoint.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreJoint.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointSet1.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointSet2.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreJointSet2.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreLog.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMaterial.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreMaterial.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreParams.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgrePhysXDriver.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgrePhysXDriver.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePose.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgrePose.h
trunk/python-ogre/ThirdParty/nxogre/NxOgrePrerequisites.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRaycaster.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreRaycaster.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreRemoteDebuggerConnection.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreScene.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreScene.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneBlueprint.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneContactController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneController.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSceneController.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShape.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShape.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeBlueprint.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeBlueprintConvex.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeBlueprintMesh.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeBlueprintPrimitives.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeBlueprintWheel.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeBlueprintWheel.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeConvex.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeConvex.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeMesh.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeMesh.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapePrimitives.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapePrimitives.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeTerrain.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeTerrain.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeWheel.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeWheel.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSimpleShape.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSimpleShape.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSkeleton.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreStable.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreTesting.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreTrigger.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreUserAllocator.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreUserAllocator.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreUserData.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreUserStream.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreUserStream.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreWorld.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreWorld.h
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/nxogre/NxuStream2/
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgre.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgre.h 2007-12-17 18:04:28 UTC (rev 512)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgre.h 2007-12-26 14:29:56 UTC (rev 513)
@@ -1,22 +1,67 @@
-//
-// NxOgre a wrapper for the PhysX (formerly Novodex) physics library and the Ogre 3D rendering engine.
-// Copyright (C) 2005 - 2007 Robin Southern and NxOgre.org http://www.nxogre.org
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
+/** @mainpage NxOgre
+@section licence Licence
+<pre>
+NxOgre a wrapper for the PhysX (formerly Novodex) physics library and the Ogre 3D rendering engine.
+Copyright (C) 2005 - 2007 Robin Southern and NxOgre.org http://www.nxogre.org
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+</pre>
+
+@section whatisit What is it?
+NxOgre is a physics connector library between the physics library PhysX and the Ogre 3D rendering system.
+With a help of some short, fast and neat code you can have a quick physics system within your Ogre game
+or engine within a matter of minutes.
+
+@section installing Installing
+@subsection Ogre
+
+The SDK or Source versions will both work with NxOgre. You should have some knowledege with working Ogre.
+If you can make a simple application that can show an Ogre head with a movement camera, you can work with
+NxOgre.
+\n\n
+You will need to create an environmental variable called "OGRE_HOME" pointing to the ogremain directory
+in your Ogre folder. Normally for SDK users this is automatically created by the installer, but it's work
+checking, if you installed Ogre from the source you'll need to create one.
+
+[1] http://www.ogre3d.org/wiki/index.php/Installing_An_SDK \n
+[2] http://www.ogre3d.org/wiki/index.php/Building_From_Source \n
+
+@subsection PhysX
+The PhysX SDK can be downloaded from the Ageia Support Center, a user account is required to download the
+SDK. Once your account has been registered (Accounts are processed by hand, so a wait of 1-2 business days
+is common), download the PhysX SDK and the SystemSoftware.
+\n\n
+Install the SystemSoftware first, then the PhysX SDK. I recommend you install the PhysX SDK in the same
+parent directory as Ogre. Once the installation is completed, create a Environmental variable called
+"<code>PHYSX_DIR</code>" pointing to the PhysX SDK directory.
+\n\n
+[3] http://devsupport.ageia.com/ \n
+
+@subsection NxOgre
+ - Create a "NxOgre" folder, it should be in the parent of your Ogre or nearby
+ - Using Tortoise SVN or another Subversion client checkout the HEAD repositry
+ - Go to the parent directory of Ogre and the PhysX SDK i.e. (c:/dev/)
+ - New Folder, name as NxOgre, and go inside
+ - File, SVN, SVN Checkout
+ - Set the URL to http://latest.nxogre.org/nxogre3/
+ - Click okay
+ - Open up the project and compile.
+
+*/
+
#ifndef __NXOGRE_H__
#define __NXOGRE_H__
@@ -27,23 +72,34 @@
#include "NxOgrePhysXDriver.h"
#include "NxOgreError.h"
#include "NxOgreLog.h"
+#include "NxOgreExtendedTypes.h"
///////////////////////////////////////////
#include "NxOgreActor.h"
#include "NxOgreActorBlueprint.h"
#include "NxOgreBody.h"
+#include "NxOgreContactStream.h"
#include "NxOgreContainer.h"
#include "NxOgreCooking.h"
-#include "NxOgreCharacter.h"
-#include "NxOgreCharacterController.h"
-#include "NxOgreCharacterHitReport.h"
+#if NX_USE_LEGACY_NXCONTROLLER
+# include "NxOgreLegacyCharacter.h"
+# include "NxOgreLegacyCharacterController.h"
+# include "NxOgreLegacyCharacterHitReport.h"
+#else
+# include "NxOgreCharacterSystem.h"
+# include "NxOgreCharacter.h"
+# include "NxOgreCharacterModel.h"
+# include "NxOgreCharacterMovementModel.h"
+#endif
#include "NxOgreCloth.h"
#include "NxOgreClothRaycaster.h"
#include "NxOgreCompound.h"
#include "NxOgreDebugRenderer.h"
#include "NxOgreDominanceGroup.h"
+#include "NxOgreEngine.h"
#include "NxOgreEnumsBlueprint.h"
+#include "NxOgreFileResourceSystem.h"
#include "NxOgreFluid.h"
#include "NxOgreFluidMesh.h"
#include "NxOgreForceField.h"
@@ -51,19 +107,26 @@
#include "NxOgreHelpers.h"
#include "NxOgreJointSet1.h"
#include "NxOgreJointSet2.h"
-#include "NxOgreHelper.h"
#include "NxOgreIntersection.h"
#include "NxOgreMaterial.h"
-#include "NxOgreMotor.h"
+#include "NxOgreMachine.h"
+#include "NxOgreNodeRenderable.h"
+#include "NxOgreResourceManager.h"
+#include "NxOgreOgreResourceSystem.h"
#include "NxOgreParams.h"
#include "NxOgrePose.h"
#include "NxOgreRaycaster.h"
+#include "NxOgreRenderable.h"
+#include "NxOgreRenderableSource.h"
#include "NxOgreRemoteDebuggerConnection.h"
+#include "NxOgreResourceSystem.h"
+#include "NxOgreResourceStreamPtr.h"
#include "NxOgreSerialiser.h"
#include "NxOgreScene.h"
#include "NxOgreSceneBlueprint.h"
#include "NxOgreSceneController.h"
#include "NxOgreSceneContactController.h"
+#include "NxOgreSceneRenderer.h"
#include "NxOgreShape.h"
#include "NxOgreShapeBlueprint.h"
#include "NxOgreShapeBlueprintConvex.h"
@@ -82,9 +145,16 @@
#include "NxOgreStateMachine.h"
#include "NxOgreTesting.h"
#include "NxOgreTrigger.h"
-#include "NxOgreUserStream.h"
+#include "NxOgreMemoryStream.h"
#include "NxOgreUserAllocator.h"
+#include "NxOgreUserData.h"
+#include "NxOgreWheelSet.h"
#include "NxOgreWorld.h"
#include "NxOgreWorldBlueprint.h"
+///////////////////////////////////////////
+
+#include "NxOgreOgreSceneRenderer.h"
+#include "NxOgreOgreNodeRenderable.h"
+
#endif
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.cpp 2007-12-17 18:04:28 UTC (rev 512)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.cpp 2007-12-26 14:29:56 UTC (rev 513)
@@ -30,44 +30,51 @@
#include "NxOgreContainer.h" // For Getting an ActorGroup
#include "NxOgreActorBlueprint.h" // For Quick Duplication.
+#include "OgreStringConverter.h"
+#include "OgreRoot.h"
+#include "OgreSingleton.h"
+#include "OgreMatrix3.h"
+
namespace NxOgre {
//////////////////////////////////////////////////////////
void ActorParams::setToDefault() {
- mDensity = 0.0f;
- mActorFlags = 0;
- mGroupAsIndex = 0;
- mGroupAsName = "";
+
+ mDensity = 0.0f;
+ mActorFlags = 0;
+ mGroupAsIndex = 0;
+ mGroupAsName = "";
#if NX_SDK_VERSION_NUMBER >= 272
- mDominanceGroupAsIndex = 0;
- mDominanceGroupAsName = "";
+ mDominanceGroupAsIndex = 0;
+ mDominanceGroupAsName = "";
#endif
#if NX_SDK_VERSION_NUMBER >= 260
- mCompartment = NULL;
+ mCompartment = NULL;
#endif
- mMassLocalPose . id();
- mMassSpaceInertia . zero();
- mLinearVelocity . zero();
- mAngularVelocity . zero();
- mWakeUpCounter = 20.0f*0.02f;
- mMass = 10.0f;
- mLinearDamping = 0.0f;
- mAngularDamping = 0.05f;
- mMaxAngularVelocity = -1.0f;
- mBodyFlags = NX_BF_VISUALIZATION;
- mSleepLinearVelocity = -1.0f;
- mSleepAngularVelocity = -1.0f;
- mCCDMotionThreshold = 0.0f;
- mSolverIterationCount = 4;
- mBodyFlags = NX_BF_ENERGY_SLEEP_TEST;
- mSleepEnergyThreshold = -1.0f;
- mSleepDamping = 0.0f;
+ mMassLocalPose . id();
+ mMassSpaceInertia . zero();
+ mLinearVelocity . zero();
+ mAngularVelocity . zero();
+ mWakeUpCounter = 20.0f * 0.02f;
+ mMass = 10.0f;
+ mLinearDamping = 0.0f;
+ mAngularDamping = 0.05f;
+ mMaxAngularVelocity = -1.0f;
+ mBodyFlags = NX_BF_VISUALIZATION;
+ mBodyFlags |= NX_BF_ENERGY_SLEEP_TEST;
+ mSleepLinearVelocity = -1.0f;
+ mSleepAngularVelocity = -1.0f;
+ mCCDMotionThreshold = 0.0f;
+ mSolverIterationCount = 4;
+ mSleepEnergyThreshold = -1.0f;
+ mSleepDamping = 0.0f;
- mNodeScale = Ogre::Vector3(1,1,1);
- mNodeName = "";
- mNodeShadows = true;
+ mNodeScale = Ogre::Vector3(1,1,1);
+ mNodeName = "";
+ mNodeShadows = true;
+ mNodePose . id();
}
@@ -122,6 +129,8 @@
if (Set("node-scale", (*p), mNodeScale)) continue;
if (Set("node-shadows", (*p), mNodeShadows)) continue;
if (Set("node", (*p), mNodeName)) continue;
+ if (Set("node-orientation", (*p), mNodePose.q)) continue;
+ if (Set("node-offset", (*p), mNodePose.v)) continue;
}
@@ -176,11 +185,11 @@
//////////////////////////////////////////////////////////
-Actor::Actor(const NxString& name, Scene* scene, ShapeBlueprint *shape, const Pose& pose, ActorParams params) : mName(name), mOwner(scene) {
+Actor::Actor(const NxString& name, Scene* scene, ShapeBlueprint *shape, const Pose& pose, ActorParams params)
+: mName(name), mOwner(scene) {
if (name.length() == 0) {
mName = NxCreateID(scene->getNbActors(), "Actor");
- mVisualIdentifier = NxString();
}
else {
@@ -190,12 +199,9 @@
if (splitID.size() == 1) {
identifier = name;
- mVisualIdentifier = name;
}
else {
identifier = splitID[0];
- mVisualIdentifier = splitID[1];
- Ogre::StringUtil::trim(mVisualIdentifier);
}
Ogre::StringUtil::trim(identifier);
@@ -310,7 +316,7 @@
bd.wakeUpCounter = params.mWakeUpCounter;
ad.body = &bd;
}
-
+
shape->_bindToActorDescription(this, 0, ad.shapes);
mActor = mOwner->mScene->createActor(ad);
@@ -334,7 +340,7 @@
i++;
}
-#if (OGRE_VERSION_MINOR >= 5)
+#if (OGRE_VERSION_MAJOR >= 1) && (OGRE_VERSION_MINOR >= 5)
mBirthFrame = Ogre::Root::getSingletonPtr()->getNextFrameNumber() - 1;
#else
mBirthFrame = Ogre::Root::getSingletonPtr()->getCurrentFrameNumber();
@@ -352,32 +358,6 @@
//////////////////////////////////////////////////////////
-void Actor::simulate(float dT) {
- shapeSimulate(dT);
-}
-
-//////////////////////////////////////////////////////////
-
-void Actor::render(float) {
- // No.
-}
-
-//////////////////////////////////////////////////////////
-
-void Actor::shapeSimulate(float t) {
- for(Shape* shape = mDynamicCollisionModel.begin();shape = mDynamicCollisionModel.next();)
- shape->simulate(t);
-}
-
-//////////////////////////////////////////////////////////
-
-void Actor::shapeRender(float t) {
- for(Shape* shape = mDynamicCollisionModel.begin();shape = mDynamicCollisionModel.next();)
- shape->render(t);
-}
-
-//////////////////////////////////////////////////////////
-
void Actor::setName(NxString name) {
mOwner->mActors.rename(mName, name);
mName = name;
@@ -385,7 +365,7 @@
//////////////////////////////////////////////////////////
-NxString Actor::getName() {
+NxString Actor::getName() const {
return mName;
}
@@ -423,25 +403,25 @@
//////////////////////////////////////////////////////////
Ogre::Quaternion Actor::getGlobalOrientation() {
- return toQuaternion(mActor->getGlobalOrientationQuat());
+ return NxConvert<Ogre::Quaternion, NxQuat>(mActor->getGlobalOrientationQuat());
}
//////////////////////////////////////////////////////////
void Actor::setGlobalOrientation(const Ogre::Quaternion& quat) {
- mActor->setGlobalOrientation(toNxQuat(quat));
+ mActor->setGlobalOrientation(NxConvert<NxQuat, Ogre::Quaternion>(quat));
}
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getGlobalPosition() {
- return toVector3(mActor->getGlobalPosition());
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getGlobalPosition());
}
//////////////////////////////////////////////////////////
void Actor::setGlobalPosition(const Ogre::Vector3& vec) {
- mActor->setGlobalPosition(toNxVec3(vec));
+ mActor->setGlobalPosition(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
@@ -453,13 +433,13 @@
//////////////////////////////////////////////////////////
void Actor::moveGlobalPosition(const Ogre::Vector3& vec) {
- mActor->moveGlobalPosition(toNxVec3(vec));
+ mActor->moveGlobalPosition(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
void Actor::moveGlobalOrientation(const Ogre::Quaternion& quat) {
- mActor->moveGlobalOrientationQuat(toNxQuat(quat));
+ mActor->moveGlobalOrientationQuat(NxConvert<NxQuat, Ogre::Quaternion>(quat));
}
////////////////////////////////////////////////////////
@@ -474,6 +454,7 @@
////////////////////////////////////////////////////////
#if 0
+
const ShapeBlueprint& Actor::createShapeDescription(const ShapeBlueprint& s) {
NxUnderConstruction;
return s;
@@ -512,6 +493,7 @@
NxUnderConstruction;
return NULL;
}
+
#endif
//////////////////////////////////////////////////////////
@@ -571,7 +553,7 @@
//////////////////////////////////////////////////////////
void Actor::setCMassOffsetLocalPosition(const Ogre::Vector3& vec) {
- mActor->setCMassOffsetLocalPosition(toNxVec3(vec));
+ mActor->setCMassOffsetLocalPosition(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
@@ -584,7 +566,6 @@
void Actor::setCMassOffsetLocalOrientation(const Ogre::Matrix3& vec) {
NxUnderConstruction;
-
}
//////////////////////////////////////////////////////////
@@ -596,7 +577,7 @@
//////////////////////////////////////////////////////////
void Actor::setCMassOffsetGlobalPosition(const Ogre::Vector3& vec) {
- mActor->setCMassOffsetGlobalPosition(toNxVec3(vec));
+ mActor->setCMassOffsetGlobalPosition(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
@@ -622,7 +603,7 @@
//////////////////////////////////////////////////////////
void Actor::setCMassGlobalPosition(const Ogre::Vector3& vec) {
- mActor->setCMassGlobalPosition(toNxVec3(vec));
+ mActor->setCMassGlobalPosition(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
@@ -644,13 +625,13 @@
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getCMassLocalPosition() const {
- return toVector3(mActor->getCMassLocalPosition());
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getCMassLocalPosition());
}
//////////////////////////////////////////////////////////
Ogre::Quaternion Actor::getCMassLocalOrientation() const {
- return toQuaternion(mActor->getCMassLocalOrientation());
+ return NxConvert<Ogre::Quaternion, NxQuat>(mActor->getCMassLocalOrientation());
}
//////////////////////////////////////////////////////////
@@ -664,7 +645,7 @@
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getCMassGlobalPosition() const {
- return toVector3(mActor->getCMassGlobalPosition());
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getCMassGlobalPosition());
}
//////////////////////////////////////////////////////////
@@ -672,7 +653,7 @@
Ogre::Quaternion Actor::getCMassGlobalOrientation() const {
NxQuat quat;
mActor->getCMassGlobalOrientation().toQuat(quat);
- return toQuaternion(quat);
+ return NxConvert<Ogre::Quaternion, NxQuat>(quat);
}
//////////////////////////////////////////////////////////
@@ -692,13 +673,13 @@
void Actor::setMassSpaceInertiaTensor(const Ogre::Vector3& vec) {
- mActor->setMassSpaceInertiaTensor(toNxVec3(vec));
+ mActor->setMassSpaceInertiaTensor(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getMassSpaceInertiaTensor() const {
- return toVector3(mActor->getMassSpaceInertiaTensor());
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getMassSpaceInertiaTensor());
}
//////////////////////////////////////////////////////////
@@ -758,26 +739,26 @@
//////////////////////////////////////////////////////////
void Actor::setLinearVelocity(const Ogre::Vector3& vec) {
- mActor->setLinearVelocity(toNxVec3(vec));
+ mActor->setLinearVelocity(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
void Actor::setAngularVelocity(const Ogre::Vector3& vec) {
- mActor->setAngularVelocity(toNxVec3(vec));
+ mActor->setAngularVelocity(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getLinearVelocity() const {
- return toVector3(mActor->getLinearVelocity());
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getLinearVelocity());
}
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getAngularVelocity() const {
- return toVector3(mActor->getAngularVelocity());
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getAngularVelocity());
}
//////////////////////////////////////////////////////////
@@ -808,73 +789,91 @@
//////////////////////////////////////////////////////////
void Actor::setLinearMomentum(const Ogre::Vector3& vec) {
- mActor->setLinearMomentum(toNxVec3(vec));
+ mActor->setLinearMomentum(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
void Actor::setAngularMomentum(const Ogre::Vector3& vec) {
- mActor->setAngularMomentum(toNxVec3(vec));
+ mActor->setAngularMomentum(NxConvert<NxVec3, Ogre::Vector3>(vec));
}
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getLinearMomentum() const {
- return toVector3(mActor->getLinearMomentum());
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getLinearMomentum());
}
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getAngularMomentum() const {
- return toVector3(mActor->getAngularMomentum());
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getAngularMomentum());
}
//////////////////////////////////////////////////////////
void Actor::addForceAtPos(const Ogre::Vector3& force, const Ogre::Vector3& pos, NxForceMode mode, bool wakeup) {
- mActor->addForceAtPos(toNxVec3(force), toNxVec3(pos), mode, wakeup);
+ mActor->addForceAtPos(NxConvert<NxVec3, Ogre::Vector3>(force), NxConvert<NxVec3, Ogre::Vector3>(pos), mode, wakeup);
}
//////////////////////////////////////////////////////////
void Actor::addForceAtLocalPos(const Ogre::Vector3& force, const Ogre::Vector3& pos, NxForceMode mode, bool wakeup) {
- mActor->addForceAtLocalPos(toNxVec3(force), toNxVec3(pos), mode, wakeup);
+ mActor->addForceAtLocalPos(NxConvert<NxVec3, Ogre::Vector3>(force), NxConvert<NxVec3, Ogre::Vector3>(pos), mode, wakeup);
}
//////////////////////////////////////////////////////////
void Actor::addLocalForceAtPos(const Ogre::Vector3& force, const Ogre::Vector3& pos, NxForceMode mode, bool wakeup) {
- mActor->addLocalForceAtPos(toNxVec3(force), toNxVec3(pos), mode, wakeup);
+ mActor->addLocalForceAtPos(NxConvert<NxVec3, Ogre::Vector3>(force), NxConvert<NxVec3, Ogre::Vector3>(pos), mode, wakeup);
}
//////////////////////////////////////////////////////////
void Actor::addLocalForceAtLocalPos(const Ogre::Vector3& force, const Ogre::Vector3& pos, NxForceMode mode, bool wakeup) {
- mActor->addLocalForceAtLocalPos(toNxVec3(force), toNxVec3(pos), mode, wakeup);
+ mActor->addLocalForceAtLocalPos(NxConvert<NxVec3, Ogre::Vector3>(force), NxConvert<NxVec3, Ogre::Vector3>(pos), mode, wakeup);
}
//////////////////////////////////////////////////////////
void Actor::addForce(const Ogre::Vector3& force, NxForceMode mode, bool wakeup) {
- mActor->addForce(toNxVec3(force), mode, wakeup);
+ mActor->addForce(NxConvert<NxVec3, Ogre::Vector3>(force), mode, wakeup);
}
//////////////////////////////////////////////////////////
+void Actor::addForce(const NxVec3& force, NxForceMode mode, bool wakeup) {
+ mActor->addForce(force, mode, wakeup);
+}
+
+//////////////////////////////////////////////////////////
+
+void Actor::addForce(NxReal x, NxReal y, NxReal z, NxForceMode mode, bool wakeup) {
+ mActor->addForce(NxVec3(x,y,z), mode, wakeup);
+}
+
+//////////////////////////////////////////////////////////
+
void Actor::addLocalForce(const Ogre::Vector3& force, NxForceMode mode, bool wakeup) {
- mActor->addLocalForce(toNxVec3(force), mode, wakeup);
+ mActor->addLocalForce(NxConvert<NxVec3, Ogre::Vector3>(force), mode, wakeup);
}
//////////////////////////////////////////////////////////
+void Actor::addTorque(const NxVec3& torque, NxForceMode mode, bool wakeup) {
+ mActor->addTorque(torque, mode, wakeup);
+}
+
+//////////////////////////////////////////////////////////
+
void Actor::addTorque(const Ogre::Vector3& torque, NxForceMode mode, bool wakeup) {
- mActor->addTorque(toNxVec3(torque), mode, wakeup);
+ mActor->addTorque(NxConvert<NxVec3, Ogre::Vector3>(torque), mode, wakeup);
}
//////////////////////////////////////////////////////////
void Actor::addLocalTorque(const Ogre::Vector3& torque, NxForceMode mode, bool wakeup) {
- mActor->addLocalTorque(toNxVec3(torque), mode, wakeup);
+ mActor->addLocalTorque(NxConvert<NxVec3, Ogre::Vector3>(torque), mode, wakeup);
}
//////////////////////////////////////////////////////////
@@ -886,13 +885,13 @@
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getPointVelocity(const Ogre::Vector3& vec) const {
- return toVector3(mActor->getPointVelocity(toNxVec3(vec)));
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getPointVelocity(NxConvert<NxVec3, Ogre::Vector3>(vec)));
}
//////////////////////////////////////////////////////////
Ogre::Vector3 Actor::getLocalPointVelocity(const Ogre::Vector3& vec) const {
- return toVector3(mActor->getLocalPointVelocity(toNxVec3(vec)));
+ return NxConvert<Ogre::Vector3, NxVec3>(mActor->getLocalPointVelocity(NxConvert<NxVec3, Ogre::Vector3>(vec)));
}
//////////////////////////////////////////////////////////
@@ -990,7 +989,7 @@
#if NX_SUPPORT_SWEEP_API
NxU32 Actor::linearSweep(const Ogre::Vector3& motion, NxU32 flags, void* userData, NxU32 nbShapeDescriptions, NxSweepQueryHit* shapes, NxUserEntityReport<NxSweepQueryHit>* callback, const NxSweepCache* sweepCache) {
- return mActor->linearSweep(toNxVec3(motion), flags, userData, nbShapeDescriptions, shapes, callback, sweepCache);
+ return mActor->linearSweep(NxConvert<NxVec3, Ogre::Vector3>(motion), flags, userData, nbShapeDescriptions, shapes, callback, sweepCache);
}
#endif
@@ -1083,6 +1082,12 @@
//////////////////////////////////////////////////////////
+NxActorUserData* Actor::getUserData() {
+ return mNxActorUserData;
+}
+
+//////////////////////////////////////////////////////////
+
StringPairList Actor::saveCustom() {
StringPairList l;
l.insert("ActorType", "Actor");
@@ -1093,6 +1098,7 @@
//////////////////////////////////////////////////////////
void Actor::disable() {
+
mActor->raiseActorFlag(NX_AF_DISABLE_COLLISION);
mActor->raiseActorFlag(NX_AF_DISABLE_RESPONSE);
mActor->raiseActorFlag(NX_AF_FLUID_DISABLE_COLLISION);
@@ -1103,7 +1109,7 @@
mActor->setLinearMomentum(NxVec3(0,0,0));
mActor->setLinearVelocity(NxVec3(0,0,0));
- disableVisualisation();
+// disableVisualisation();
}
//////////////////////////////////////////////////////////
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.h 2007-12-17 18:04:28 UTC (rev 512)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreActor.h 2007-12-26 14:29:56 UTC (rev 513)
@@ -23,11 +23,11 @@
#include "NxOgrePrerequisites.h"
#include "NxOgreContainer.h" // For: mCollisionList
#include "NxOgreParams.h"
+#include "NxOgrePose.h"
namespace NxOgre {
- /**
- \page actorparams ActorParams
+ /** \page actorparams ActorParams
String base params are case and space insensitive.
@@ -173,109 +173,180 @@
*/
+
/** ActorParams
- See \ref actorparams for the full string argument documentation.
+ @see \ref actorparams for the full string argument documentation.
*/
class NxExport ActorParams : public Params {
public:
+ /** @brief Class based params.
+ @note Faster, less readable and reusable.
+ @see \ref actorparams
+ @example
+ <code>
+ ActorParams ap;
+ ap.mMass = 10;
+ ap.mGroup = "myGroup";
+ ..., ap, ...
+ </code>
- ActorParams(){setToDefault();}
- ActorParams(const char* p) {process(p);}
- ActorParams(NxString p) {process(p);}
+ */
+ ActorParams() {
+ setToDefault();
+ }
+ /** @brief String based params. "mass: 10, group: myGroup"
+ @note Slower but readable.
+ @params String of params.
+ @see \ref actorparams
+ @example
+ <code>
+ ..., "mass: 10, group: myGroup", ...
+ </code>
+ */
+ ActorParams(const char* p) {
+ process(p);
+ }
+
+ /** @brief String based params. "mass: 10, group: myGroup"
+ @note Slower but readable.
+ @params
+ @see \ref actorparams
+ @example
+ <code>
+ ..., "mass: 10, group: myGroup", ...
+ </code>
+ */
+ ActorParams(NxString p) {
+ process(p);
+ }
+
+ /** @brief Set's the Params to default based on NxActorDesc and NxBodyDesc defaults.
+ */
void setToDefault();
- void parse(Parameters);
+
+ /** @brief Set's the Params based from an NxActorDesc
+ */
void fromNxActorDesc(NxActorDesc&);
+
+ /** @brief Set's the Params based from a NxBodyDesc
+ */
void fromNxBodyDesc(NxBodyDesc&);
////////////////////////////////////////////////////////////////
#if NX_SDK_VERSION_NUMBER >= 260
- /// NxCompartment of the Actor to sit in.
- /// @todo NxOgre-ify
- /// @default NULL
+ /** NxCompartment of the Actor to sit in.
+ @todo NxOgre-ify
+ @default NULL
+ */
NxCompartment* mCompartment;
#endif
- /// Density, mass must be 0 when density is used.
+ /** Density, mass must be 0 when density is used.
+ @default 0
+ @see ActorParams::mMass
+ */
NxReal mDensity;
#if NX_SDK_VERSION_NUMBER >= 272
- /// DominanceGroup (as Name).
- /// @default ""
+ /** @brief DominanceGroup (as Name).
+ @default "" (Resorts to dominance group with identifier "Default")
+ */
NxString mDominanceGroupAsName;
- /// DominanceGroup (as Index)
- /// @default 0
+ /** @brief DominanceGroup (as Index)
+ @default 0
+ */
NxDominanceGroup mDominanceGroupAsIndex;
+
#endif
- /// Flags for the NxActor
- /// @see NxActorFlags
- /// @default 0
+ /** @brief Flags for the NxActor
+ @see NxActorFlags
+ @default 0
+ */
NxU32 mActorFlags;
- /// Group to use as index. GroupAsName must be blank.
- /// @default 0
+ /** @brief Group to use as index. GroupAsName must be blank.
+ @default 0
+ */
NxActorGroup mGroupAsIndex;
- /// Group to use from name. GroupAsIndex must be 0.
- /// @default Blank String
+ /** @brief Group to use from name. GroupAsIndex must be 0.
+ @default Blank String (Resorts to actor group with identifier "Default")
+ */
NxString mGroupAsName;
////////////////////////////////////////////////////////////////
- /// Angular Damping
+ /** @brief Angular Damping
+ */
NxReal mAngularDamping;
- /// Angular Velocity
+ /** @brief Angular Velocity
+ */
NxVec3 mAngularVelocity;
- ///
+ /** @brief CCD Motion Threshold
+ */
NxReal mCCDMotionThreshold;
- ///
+ /** @brief Flags for the Body portion of an Actor, assuming it is dynamic.
+ @see NxBodyDesc
+ */
NxU32 mBodyFlags;
- ///
+ /** @brief Linear Damping of the Actor
+ */
NxReal mLinearDamping;
- ///
+ /** @brief Initial linear velocity of the actor
+ */
NxVec3 mLinearVelocity;
- /// Mass of the Actor. When used, make sure density is zero.
+ /** @brief Mass of the Actor.
+ @note When used, make sure density is zero.
+ @default 10
+ */
NxReal mMass;
- ///
+ /** @brief Mass Local Pose of the body portion of the Actor
+ @default NxMatrix34.id()
+ */
NxMat34 mMassLocalPose;
- ///
+ /** @brief Mass Space Inertia of the body portion of the Actor
+ */
NxVec3 mMassSpaceInertia;
- ///
+ /** @brief Maximum angular velocity of the Actor
+ */
NxReal mMaxAngularVelocity;
- ///
+ /**
+ */
NxReal mSleepAngularVelocity;
- ///
+ /**
+ */
NxReal mSleepDamping;
@@ -307,10 +378,24 @@
/// Set the first Entity of the Visual based Actors to have shadows or not.
bool mNodeShadows;
+ Pose mNodePose;
+ private:
+
+ //! \internal
+ void parse(Parameters);
+
}; // End of ActorParams class
+ /** Actor
+ An Actor is a single unit of matter in the Scene. It is physically represented by a "Collision Model" or a shape. If the actor
+ has some mass then it is known as a Dynamic Actor, capable of scurrying around in the Scene. If the Actor has
+ no mass then it is a static actor which never ever moves.
+
+
+
+ */
class NxExport Actor {
public:
@@ -329,14 +414,13 @@
//////////////////////////////////////////////////////////
+ virtual NxShortHashIdentifier getType() const {return NxHashes_Actor; /* "NxOgre-Actor" */}
+ virtual NxString getStringType() const {return "NxOgre-Actor";}
+
virtual bool hasVisualisation() const {return false;}
- virtual void simulate(float);
- virtual void render(float);
- virtual void shapeSimulate(float);
- virtual void shapeRender(float);
bool isDead() { return (mActor == NULL); }
+
-
/** Duplicate this actor
@param name Name of the new Actor
@@ -359,7 +443,7 @@
//////////////////////////////////////////////////////////
void setName(NxString);
- NxString getName();
+ NxString getName() const;
////////////////////////////////////////////////////////
@@ -473,8 +557,17 @@
void addForceAtLocalPos(const Ogre::Vector3& force, const Ogre::Vector3& pos, NxForceMode mode = NX_FORCE, bool wakeup = true);
void addLocalForceAtPos(const Ogre::Vector3& force, const Ogre::Vector3& pos, NxForceMode mode = NX_FORCE, bool wakeup = true);
void addLocalForceAtLocalPos(const Ogre::Vector3& force, const Ogre::Vector3& pos, NxForceMode mode = NX_FORCE, bool wakeup = true);
+
+
void addForce(const Ogre::Vector3& force, NxForceMode mode = NX_FORCE, bool wakeup = true);
+ void addForce(const NxVec3& force, NxForceMode = NX_FORCE, bool wakeup = true);
+ void addForce(NxReal x, NxReal y, NxReal z, NxForceMode = NX_FORCE, bool wakeup = true);
void addLocalForce(const Ogre::Vector3& force, NxForceMode mode = NX_FORCE, bool wakeup = true);
+
+ void addTorque(NxReal x, NxReal y, NxReal z, NxForceMode mode = NX_FORCE, bool wakeup = true) {
+ addTorque(NxVec3(x,y,z), mode, wakeup);
+ }
+ void addTorque(const NxVec3& torque, NxForceMode mode = NX_FORCE, bool wakeup = true);
void addTorque(const Ogre::Vector3& torque, NxForceMode mode = NX_FORCE, bool wakeup = true);
void addLocalTorque(const Ogre::Vector3& torque, NxForceMode mode = NX_FORCE, bool wakeup = true);
NxReal computeKineticEnergy() const;
@@ -521,6 +614,7 @@
mDynamicCollisionModel;
void* getNxActorUserData();
+ NxActorUserData* getUserData();
/** joinWith
@@ -543,8 +637,6 @@
*/
void disable();
- virtual void disableVisualisation() {}
-
NxU32 getBirthFrame() {return mBirthFrame;}
//////////////////////////////////////////////////////////
@@ -558,9 +650,8 @@
NxActor* mActor;
NxString mName;
NxActorUserData* mNxActorUserData;
- NxString mVisualIdentifier;
NxU32 mBirthFrame;
-
+
private:
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.cpp 2007-12-17 18:04:28 UTC (rev 512)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.cpp 2007-12-26 14:29:56 UTC (rev 513)
@@ -25,6 +25,13 @@
#include "NxOgreScene.h" // For: Actor::mOwner
#include "NxOgreShapeBlueprint.h"
#include "NxOgreContainer.h"
+#include "NxOgreOgreNodeRenderable.h"
+#include "NxOgreRenderable.h"
+#include "NxOgreRenderableSource.h"
+#include "NxOgreNodeRenderable.h"
+#include "NxOgreSceneRenderer.h"
+#include "NxOgreUserData.h"
+#include "NxOgreHelpers.h"
namespace NxOgre {
@@ -37,11 +44,51 @@
//////////////////////////////////////////////////////////
Body::Body(const NxString& identifier, Scene* scene, ShapeBlueprint *firstShapeDescription, const Pose& pose, ActorParams params)
-: mNode(0), mEntity(0), Actor(identifier, scene, firstShapeDescription, pose, params)
+: Actor(identifier, scene, firstShapeDescription, pose, params)
{
+ NodeRenderableParams visualParams;
+ visualParams.Identifier = identifier;
+ visualParams.IdentifierType = visualParams.IT_CREATE;
+ visualParams.Intent = getStringType();
+
+ std::vector<NxString> splitID = Ogre::StringUtil::split(identifier, ";", 2);
+
+ NxString visualIdentifier;
+
+ if (splitID.size() == 1) {
+ visualIdentifier = identifier;
+ }
+ else {
+ visualIdentifier = splitID[1];
+ }
+
+ Ogre::StringUtil::trim(visualIdentifier);
+
+ if (Ogre::StringUtil::startsWith(visualIdentifier, "(reference)")) {
+ NxString entityName = visualIdentifier.substr(11, entityName.length() - 11);
+ Ogre::StringUtil::trim(entityName);
+ visualParams.GraphicsModel = entityName;
+ visualParams.GraphicsModelType = visualParams.GMT_EXISTING_REFERENCE;
+ }
+ else {
+ visualParams.GraphicsModel = visualIdentifier;
+ visualParams.GraphicsModelType = visualParams.GMT_RESOURCE_IDENTIFIER;
+ }
+
+ setLevelOfDetail(LOD_High);
+ mRenderable = mOwner->getSceneRenderer()->createNodeRenderable(visualParams);
+ mNodeRenderable = static_cast<NodeRenderable*>(mRenderable);
+ mNxActorUserData->RenderPtr = this;
+ mDeltaPose = mLastPose = getGlobalPose();
+
+
+ mOwner->getSceneRenderer()->registerSource(this);
+
+#if 0
+
if (params.mNodeName.length() == 0) {
mNode = mOwner->getSceneManager()->createSceneNode();
}
@@ -77,13 +124,10 @@
NxString entityName = mVisualIdentifier.substr(8, entityName.length() - 8);
Ogre::StringUtil::trim(entityName);
mEntity = mOwner->getSceneManager()->getEntity(entityName);
- mNode->attachObject(mEntity);
-
}
else if (Ogre::StringUtil::endsWith(mVisualIdentifier, ".mesh")) {
mEntity = mOwner->getSceneManager()->createEntity(mName + "-0", mVisualIdentifier);
mEntity->setCastShadows(params.mNodeShadows);
- mNode->attachObject(mEntity);
}
if (mActor->getMass() == 0 && mOwner->getStaticGeometry()) {
@@ -91,6 +135,14 @@
mOwner->getStaticGeometry()->addSceneNode(mNode);
}
+ if (params.mNodePose.isZero() && mEntity && mNode) {
+ mNode->attachObject(mEntity);
+ }
+ else if (mEntity && mNode) {
+ Ogre::SceneNode* childNode = mNode->createChildSceneNode(params.mNodePose.getVector3(), params.mNodePose.getQuaternion());
+ childNode->attachObject(mEntity);
+ }
+
if (params.mNodeScale != Ogre::Vector3(1,1,1)) {
mNode->scale(params.mNodeScale);
}
@@ -100,13 +152,39 @@
mNode->setOrientation(pose);
}
+#endif
+}
+Body::Body(const NxString& identifier, Scene* scene, ShapeBlueprint *firstShapeDescription, const Pose& pose, NodeRenderableParams visualParams, ActorParams params)
+: Actor(identifier, scene, firstShapeDescription, pose, params)
+{
+
+ if (visualParams.Intent.size() == 0)
+ visualParams.Intent = getStringType();
+
+ setLevelOfDetail(LOD_High);
+ setInterpolation(I_Absolute);
+ mLastPoseCount = 0;
+ mRenderable = mOwner->getSceneRenderer()->createNodeRenderable(visualParams);
+ mNodeRenderable = static_cast<NodeRenderable*>(mRenderable);
+ mNxActorUserData->RenderPtr = this;
+
+
+ mOwner->getSceneRenderer()->registerSource(this);
}
//////////////////////////////////////////////////////////
Body::~Body() {
+ mOwner->getSceneRenderer()->unregisterSource(this);
+
+ if (mRenderable) {
+ delete mRenderable;
+ mRenderable = 0;
+ }
+
+#if 0
if (mNode == 0)
return;
@@ -129,26 +207,131 @@
if (mNode)
mOwner->getSceneManager()->destroySceneNode(mNode->getName());
+#endif
}
//////////////////////////////////////////////////////////
-void Body::simulate(float dT) {
- shapeSimulate(dT);
+void Body::__renderSelf() {
+
+ switch (mInterpolation) {
+ case I_Absolute:
+ {
+ mDeltaPose = getGlobalPose();
+ mRenderable->setPose(mDeltaPose);
+ mLastPose = mDeltaPose;
+ }
+ break;
+
+ case I_Linear:
+ {
+ Pose blended_pose = NxInterpolate(mLastPose, getGlobalPose(), mOwner->getLastAlphaValue());
+ mLastPose = getGlobalPose();
+ mRenderable->setPose(blended_pose);
+ }
+ break;
+
+ case I_Linear_x4:
+ {
+ mLastPoseCount++;
+
+ if (mLastPoseCount == 4) {
+
+ mDeltaPose = getGlobalPose();
+
+ if (mDeltaPose.v != mLastPose.v) {
+ mDeltaPose = NxInterpolate(mDeltaPose, mLastPose);
+ mLastPose = getGlobalPose();
+ mLastPoseCount = 0;
+ }
+ else {
+ mLastPoseCount--;
+ mDeltaPose = mLastPose;
+ }
+
+ }
+
+ mRenderable->setPose(mDeltaPose);
+ }
+ break;
+
+ case I_Linear_x8:
+ {
+ mLastPoseCount++;
+
+ if (mLastPoseCount == 8) {
+
+ mDeltaPose = getGlobalPose();
+
+ if (mDeltaPose.v != mLastPose.v) {
+ mDeltaPose = NxInterpolate(mDeltaPose, mLastPose);
+ mLastPose = getGlobalPose();
+ mLastPoseCount = 0;
+ }
+ else {
+ mLastPoseCount--;
+ mDeltaPose = mLastPose;
+ }
+
+ }
+
+ mRenderable->setPose(mDeltaPose);
+ }
+ break;
+ }
+
}
//////////////////////////////////////////////////////////
-void Body::render(float) {
+#if 0
+void Body::renderTo(const Pose& pose) {
+ mNode->setPosition(pose);
+ mNode->setOrientation(pose);
+}
+#endif
+
+//////////////////////////////////////////////////////////
+
+
+/*
+void Body::render(float dT) {
+
#if (NX_UNSTABLE_USE_SCENE_ACTIVE_TRANSFORM == 1)
+#if (NX_UNSTABLE_ACCUMULATOR == 1)
+
+ #define alpha dT
+ assert ( alpha >= 0.0f && alpha <= 1.0f );
+
NxMat34 nm = mActor->getGlobalPose();
+ NxVec3 destPos = nm.t;
+ NxQuat destOri = nm.M;
+
+ NxVec3 renderPos = mPreviousPosition * ( 1.0f - alpha ) + destPos * alpha;
+ NxQuat renderOri;
+ renderOri.slerp( alpha , mPreviousOrientation, destOri );
+
+ mNode->setPosition( NxConvert<Ogre::Vector3, NxVec3>(renderPos) );
+ mNode->setOrientation( NxConvert<Ogre::Quaternion, NxQuat>(renderOri) );
+
+ mPreviousPosition = destPos;
+ mPreviousOrientation = destOri;
+
+ shapeRender(0.0f);
+
+#else
+
+ NxMat34 nm = mActor->getGlobalPose();
NxVec3 nv(nm.t);
NxQuat nq(nm.M);
mNode->setPosition(nv.x, nv.y, nv.z);
mNode->setOrientation(nq.w,nq.x,nq.y,nq.z);
shapeRender(0);
+
+#endif
+
#else
if (mActor && mNode) {
mNode->setPosition(getGlobalPosition());
@@ -156,8 +339,10 @@
shapeRender(dT);
}
#endif
+
}
-
+*/
+#if 0
//////////////////////////////////////////////////////////
void Body::setNode(Ogre::SceneNode* node) {
@@ -314,4 +499,24 @@
//////////////////////////////////////////////////////////
+#endif
+
+
+
+StringPairList Body::saveCustom() {
+
+ // Temp
+ StringPairList l;
+ return l;
+}
+
+//////////////////////////////////////////////////////////
+
+void Body::restoreCustom(StringPairList spl) {
+
+ // TEMP
+}
+
+//////////////////////////////////////////////////////////
+
} //End of NxOgre namespace.
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.h 2007-12-17 18:04:28 UTC (rev 512)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreBody.h 2007-12-26 14:29:56 UTC (rev 513)
@@ -22,35 +22,65 @@
#include "NxOgrePrerequisites.h"
#include "NxOgreActor.h" // For: Body inherits Actor
+#include "NxOgrePose.h"
+#include "NxOgreRenderableSource.h"
+#include "NxOgreRenderable.h"
+#include "NxOgreNodeRenderable.h"
namespace NxOgre {
- class NxExport Body : public Actor {
+ class NxExport Body : public Actor, public RenderableSource {
public:
- Body(const NxString& name, Scene*);
- Body(const NxString& name, Scene*, ShapeBlueprint*, const Pose&, ActorParams = ActorParams());
+ Body(const NxString& NameAndOrShorthandVisualIdentifier, Scene*);
+
+ /** @brief Body constructor with limited short-hand visualisation specification.
+ How the body is visualised is built into the identifier.
+
+ - "myBody"
+ No Visualisation
+
+ - "myBody; cow.mesh"
+ Visualisation as "cow.mesh" as the graphics model loading it from
+ the rendersystems resource system.
+ (Default behaviour)
+
+ - "myBody; (reference) cow.mesh"
+ Visualisation as "cow.mesh" from a pre-existing model that has
+ already been loaded and in the scene already.
+ (Moving it from one visualisation node to this one)
+ */
+ Body(const NxString& Identifier, Scene*, ShapeBlueprint*, const Pose&, ActorParams = ActorParams());
+
+ /** Body constructor with full visualisation.
+
+ mSceneMgr->createBody("myBody", new CubeShape(2,2,2), Vector3(0,5,0), "model: cube.1m.mesh, scale: 2 2 2", "mass: 10");
+
+ */
+ Body(const NxString& Identifier, Scene*, ShapeBlueprint*, const Pose&, NodeRenderableParams, ActorParams = ActorParams());
+
+ /** @brief Body destructor. If you hate memory leaks and crashes, use mScene->destroyActor(...);
+ */
+
virtual ~Body();
- virtual bool hasVisualisation() const {return true;}
- Ogre::SceneNode* getNode() {return mNode;}
- Ogre::Entity* getEntity() {return mEntity;}
- void setNode(Ogre::SceneNode*);
- void setEntity(Ogre::Entity*);
- void simulate(float);
- void render(float);
+ NxShortHashIdentifier getType() const {return NxHashes_Body; /* "NxOgre-Example-Body" */}
+ NxString getStringType() const {return "NxOgre-Example-Body";}
+
StringPairList saveCustom();
void restoreCustom(StringPairList);
- void disableVisualisation();
protected:
- Ogre::SceneNode* mNode;
- Ogre::Entity* mEntity;
+ void __renderSelf();
+ NodeRenderable* mNodeRenderable;
+
+
+
};
};
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.cpp 2007-12-17 18:04:28 UTC (rev 512)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.cpp 2007-12-26 14:29:56 UTC (rev 513)
@@ -19,306 +19,77 @@
#include "NxOgreStable.h"
-#if (NX_USE_CHARACTER_API == 1)
+#if (NX_USE_LEGACY_NXCONTROLLER == 0)
#include "NxOgreCharacter.h"
-#include "NxOgrePose.h" // For: Character position and orientation
-#include "NxOgreCharacterController.h" // For: HitReport and Character creation
-#include "NxOgreScene.h" // For: getNxScene in Scene
-#include "NxOgreHelpers.h" // For: NxVec3 to Vector3 conversion
-#include "NxOgreUserData.h" // For: Actor's UserData
+#include "NxOgreScene.h"
+#include "NxOgreNxActorController.h"
-#include "NxCharacter.h"
-#include "NxBoxController.h"
-#include "NxCapsuleController.h"
+#if (NX_USE_CHARACTER_API == 1)
+# include "NxOgreNxCharacterController.h"
+#endif
namespace NxOgre {
-////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////
-Character::Character(const NxString &name, Scene* scene, CharacterController* cc, Pose p , CharacterParams cp)
-: mName(name), mScene(scene), mCharacterController(cc), mNode(0), mEntity(0) {
-
- mMoveVectorController = mCharacterController;
- mCharacterController->_registerCharacter(mName, this);
- mType = cp.mType;
- mDimensions = cp.mDimensions;
- mUpAxis = cp.mUpAxis;
- mSlopeLimit = cp.mSlopeLimit;
- mStepOffset = cp.mStepOffset;
- mSkinWidth = cp.mSkinWidth;
- mMove_ActiveGroupsMask = cp.mActiveGroupsMask;
- mMove_Sharpness = cp.mSharpness;
- mMove_GroupMask = cp.mGroupMask;
- mNextMovementDirection.zero();
- mDirection.id();
- mMass = 100; /// TEMP.
+void CharacterParams::setToDefault() {
- if (mType == CharacterParams::CT_Box) {
+#if (NX_USE_CHARACTER_API == 1)
+ mControllerType = CT_NXCONTROLLER;
+#else
+ mControllerType = CT_NXACTOR;
+#endif
- NxBoxControllerDesc desc;
- desc.setToDefault();
- desc.position.set(p.v.x,p.v.y,p.v.z); // 0,0,0
- desc.extents.set(mDimensions.x * 0.5f, mDimensions.y * 0.5f, mDimensions.z * 0.5f); // 0.5, 1, 0.5
- desc.upDirection = mUpAxis; // NX_Y
- desc.slopeLimit = mSlopeLimit; // 0.707
- desc.stepOffset = mStepOffset; // 0.5
- desc.skinWidth = mSkinWidth; // 0.1
- desc.callback = mCharacterController;
- desc.userData = this;
-
- mCharacter = mCharacterController->mControllerManager->createController(mScene->getNxScene(), desc);
+ mStepOffset = 0.0f;
+ mSlopeLimit = 0.0f;
+ mUpDirection = NX_AXIS_PLUS_Y;
+ //mGroupMask;
+ mControllerCollisionShape = 0;
- }
- else {
+}
- NxCapsuleControllerDesc desc;
- desc.setToDefault();
- desc.radius = mDimensions.x;
- desc.height = mDimensions.y;
- desc.position.set(p.v.x,p.v.y,p.v.z); // 0,0,0
- desc.upDirection = mUpAxis; // NX_Y
- desc.slopeLimit = mSlopeLimit; // 0.707
- desc.stepOffset = mStepOffset; // 0.5
- desc.skinWidth = mSkinWidth; // 0.1
- desc.callback = mCharacterController;
- desc.userData = this;
+/////////////////////////////////////////////////////////////
- mCharacter = mCharacterController->mControllerManager->createController(mScene->getNxScene(), desc);
-
- }
+Character::Character(NxString identifier, Pose pose, CharacterModel* model, CharacterParams params, CharacterController* character_controller, Scene* scene) {
- if (mCharacter == 0) {
- NxThrow_Error("Character '" + mName + "' could not be created.");
+ if (model == 0) {
+ NxThrow_Error("Character Model pointer is null!");
+ mDead = true;
return;
}
- mNxActorUserData = new NxActorUserData(this, NxActorUserData::T_Character);
- mCharacter->getActor()->setGroup(0);
- mCharacter->getActor()->userData = mNxActorUserData;
- mCharacter->setCollision(true);
-
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-Character::~Character() {
-
- mCharacterController->_unregisterCharacter(mName);
- mCharacterController->mControllerManager->releaseController(*mCharacter);
-
- if (mNode == 0)
+ if (params.mControllerType == CharacterParams::CT_CUSTOM && character_controller == 0) {
+ NxThrow_Error("ControllerType is Custom but pointer is null!");
+ mDead = true;
return;
-
-
- Ogre::SceneNode::ObjectIterator object_it = mNode->getAttachedObjectIterator();
- Ogre::MovableObject *m;
- while(object_it.hasMoreElements()) {
- m = object_it.getNext();
- if (m->getMovableType() == "Entity") {
- mScene->getSceneManager()->destroyEntity((Ogre::Entity*) m);
- }
- else {
- mNode->detachObject(m);
- mScene->getSceneManager()->getRootSceneNode()->attachObject(m);
- }
}
- mNode->detachAllObjects();
- mNode->removeAndDestroyAllChildren();
-
- if (mNode)
- mScene->getSceneManager()->destroySceneNode(mNode->getName());
-
- delete mNxActorUserData;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::simulate(float t) {
-
- NxVec3 moveVector, gravity;
- moveVector.zero();
- mScene->getNxScene()->getGravity(gravity);
-
- // Calculate next movement.
- mMoveVectorController->move(moveVector, mNextMovementDirection, mDirection, gravity, t, this);
-
- // Move it
- mCharacter->move(moveVector, mMove_ActiveGroupsMask, mMove_MinDistance, mCollisionFlags, mMove_Sharpness, &mMove_GroupMask);
-
- // ...And reset.
- mNextMovementDirection.zero();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::render(float) {
- if (mNode) {
- mNode->setPosition(getGlobalPosition());
- mNode->setOrientation(getGlobalOrientation());
+ mName = identifier;
+
+ if (params.mControllerType == CharacterParams::CT_NXACTOR) {
+ mController = new NxActorController(pose.toMat34(), params.mControllerCollisionShape, scene->getNxScene());
}
-}
+#if (NX_USE_CHARACTER_API == 1)
+ else if (params.mControllerType == CharacterParams::CT_NXCONTROLLER) {
+ mController = new NxCharacterController(pose.toMat34(), params.mControllerCollisionShape, scene->getNxScene());
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::createNode() {
- if (mNode)
- return;
- mNode = mScene->getSceneManager()->getRootSceneNode()->createChildSceneNode(mName, toVector3(NxVec3(mCharacter->getPosition().x,mCharacter->getPosition().y,mCharacter->getPosition().z)));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::attachMesh(const NxString& meshName) {
-
- createNode();
-
- if (mEntity == 0) {
- mEntity = mScene->getSceneManager()->createEntity(mName, meshName);
- mNode->attachObject(mEntity);
}
+#endif
else {
- Ogre::Entity* entity = mScene->getSceneManager()->createEntity(mName, meshName);
- mNode->attachObject(entity);
+ mController = character_controller;
}
-}
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::attachSkeletonMesh(const NxString&) {
- NxUnderConstruction;
}
-////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////
-void Character::bindToAnimation(Movement, const NxString& AnimationName) {
- NxUnderConstruction;
-}
+Character::~Character() {
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::bindFeet(const NxString& leftBone, const NxString& rightBone) {
- NxUnderConstruction;
}
-////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////
-void Character::unBindFeet() {
- NxUnderConstruction;
}
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-Ogre::Vector3 Character::getGlobalPosition() {
- return toVector3(NxVec3(mCharacter->getPosition().x, mCharacter->getPosition().y,mCharacter->getPosition().z));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-Ogre::Quaternion Character::getGlobalOrientation() {
- return toQuaternion(mDirection);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::setRawNextMovementDirection(const NxVec3& direction) {
- mNextMovementDirection = direction;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::setDirection(const Ogre::Radian &r) {
- mDirection.fromAngleAxis(r.valueAngleUnits(),NxVec3(0,1,0));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::setDirection(const Ogre::Quaternion &q) {
- mDirection = toNxQuat(q);
- mDirection.x = 0;
- mDirection.z = 0;
-
- mDirection.normalize();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::addMovement(Direction m) {
-
- if (mUpAxis == NX_Y) {
-
- switch (m) {
- case DR_Forward:
- mNextMovementDirection -= NxVec3Axis[NX_X];
- return;
- break;
-
- case DR_Backward:
- mNextMovementDirection += NxVec3Axis[NX_X];
- return;
- break;
-
- case DR_StepLeft:
- mNextMovementDirection -= NxVec3Axis[NX_Z];
- return;
- break;
-
- case DR_StepRight:
- mNextMovementDirection += NxVec3Axis[NX_Z];
- return;
- break;
-
- case DR_Jump_Up:
- // jump inject code
- mNextMovementDirection.zero();
- // jump timer++
- // pass jump timer onto move bit as well.
- break;
-
- case DR_Ladder_Up:
- mNextMovementDirection += NxVec3Axis[NX_Y];
- return;
- break;
-
- case DR_Ladder_Down:
- mNextMovementDirection -= NxVec3Axis[NX_Y];
- return;
- break;
-
- }
-
- return;
- }
- else if (mUpAxis == NX_X) {
- // TODO
- }
- else if (mUpAxis == NX_Z) {
- // TODO
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::setMovementVectorController(CharacterMovementVectorController* cmvc) {
- mMoveVectorController = cmvc;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Character::setPosition(const Ogre::Vector3& v) {
- mCharacter->setPosition(toNxExtendedVec3(v));
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void CharacterMovementVectorController::move(NxVec3 &out, NxVec3 &moveVector, NxQuat &direction, NxVec3 &g, float t, Character*) {
- // TODO: Non NX_Y directions.
- out = ((direction.rot(moveVector) * 1.5) + g) * t;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-} //End of NxOgre namespace.
-
-#endif
+#endif
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.h 2007-12-17 18:04:28 UTC (rev 512)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreCharacter.h 2007-12-26 14:29:56 UTC (rev 513)
@@ -19,138 +19,176 @@
#ifndef __NXOGRE_CHARACTER_H__
#define __NXOGRE_CHARACTER_H__
-#if (NX_USE_CHARACTER_API == 1)
#include "NxOgrePrerequisites.h"
-#include "NxOgreContainer.h" // For: mCollisionList
-#include "NxOgreParams.h" // For: CharacterParams
+#if (NX_USE_LEGACY_NXCONTROLLER == 0)
+
+#incl...
[truncated message content] |
|
From: <bha...@us...> - 2007-12-17 18:04:28
|
Revision: 512
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=512&view=rev
Author: bharling
Date: 2007-12-17 10:04:28 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
Updated to the latest version of the showcase demo.
A little speed improvement.
-bharling
Added Paths:
-----------
trunk/python-ogre/demos/showcase_01/triplanar_terrain.cfg
Added: trunk/python-ogre/demos/showcase_01/triplanar_terrain.cfg
===================================================================
--- trunk/python-ogre/demos/showcase_01/triplanar_terrain.cfg (rev 0)
+++ trunk/python-ogre/demos/showcase_01/triplanar_terrain.cfg 2007-12-17 18:04:28 UTC (rev 512)
@@ -0,0 +1,72 @@
+# The main world texture (if you wish the terrain manager to create a material for you)
+#WorldTexture=terrain_texture.jpg
+
+# The detail texture (if you wish the terrain manager to create a material for you)
+#DetailTexture=terrain_detail.jpg
+
+#number of times the detail texture will tile in a terrain tile
+DetailTile=3
+
+# Heightmap source
+PageSource=Heightmap
+
+# Heightmap-source specific settings
+Heightmap.image=terrain.png
+
+# If you use RAW, fill in the below too
+# RAW-specific setting - size (horizontal/vertical)
+#Heightmap.raw.size=513
+# RAW-specific setting - bytes per pixel (1 = 8bit, 2=16bit)
+#Heightmap.raw.bpp=2
+
+# How large is a page of tiles (in vertices)? Must be (2^n)+1
+PageSize=513
+
+# How large is each tile? Must be (2^n)+1 and be smaller than PageSize
+TileSize=65
+
+# The maximum error allowed when determining which LOD to use
+MaxPixelError=3
+
+# The size of a terrain page, in world units
+PageWorldX=5000
+PageWorldZ=5000
+# Maximum height of the terrain
+MaxHeight=260
+
+
+# Upper LOD limit
+MaxMipMapLevel=5
+
+VertexNormals=yes
+#VertexColors=yes
+#UseTriStrips=yes
+
+# Use vertex program to morph LODs, if available
+VertexProgramMorph=yes
+
+# The proportional distance range at which the LOD morph starts to take effect
+# This is as a proportion of the distance between the current LODs effective range,
+# and the effective range of the next lower LOD
+LODMorphStart=0.2
+
+# This following section is for if you want to provide your own terrain shading routine
+# Note that since you define your textures within the material this makes the
+# WorldTexture and DetailTexture settings redundant
+
+# The name of the vertex program parameter you wish to bind the morph LOD factor to
+# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely
+# to the same position as the next lower LOD
+# USE THIS IF YOU USE HIGH-LEVEL VERTEX PROGRAMS WITH LOD MORPHING
+MorphLODFactorParamName=morphFactor
+
+# The index of the vertex program parameter you wish to bind the morph LOD factor to
+# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely
+# to the same position as the next lower LOD
+# USE THIS IF YOU USE ASSEMBLER VERTEX PROGRAMS WITH LOD MORPHING
+#MorphLODFactorParamIndex=4
+
+# The name of the material you will define to shade the terrain
+CustomMaterialName=OverhangTerrain_simple
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bha...@us...> - 2007-12-17 18:04:23
|
Revision: 511
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=511&view=rev
Author: bharling
Date: 2007-12-17 10:04:21 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
Updated to the latest version of the showcase demo.
A little speed improvement.
-bharling
Added Paths:
-----------
trunk/python-ogre/demos/showcase_01/texture.py
Added: trunk/python-ogre/demos/showcase_01/texture.py
===================================================================
--- trunk/python-ogre/demos/showcase_01/texture.py (rev 0)
+++ trunk/python-ogre/demos/showcase_01/texture.py 2007-12-17 18:04:21 UTC (rev 511)
@@ -0,0 +1,79 @@
+import ogre.renderer.OGRE as ogre
+import ctypes
+import SampleFramework as sf
+
+class textureListener(ogre.FrameListener):
+ def __init__(self, app):
+ ogre.FrameListener.__init__(self)
+ self.app = app
+ self.grnVal = 0
+ self.fading = True
+
+ def frameStarted(self, frameEvent):
+ self.grnVal = self.fading and self.grnVal + 1 or self.grnVal -1
+ if self.grnVal == 255:
+ self.fading = False
+ elif self.grnVal == 0:
+ self.fading = True
+ colArray = [0,self.grnVal,0,128] * 16 * 16
+ self.app.setTextureManual(self.app.mTex, 16,16, colArray)
+ return True
+
+
+class textureTest(sf.Application):
+ def __init__(self):
+ sf.Application.__init__(self)
+
+ def _createScene(self):
+ self.mTex = ogre.TextureManager.getSingleton().createManual(
+ "DynamicTexture",
+ ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME,
+ ogre.TEX_TYPE_2D,
+ 16, 16,
+ 0,
+ ogre.PF_BYTE_BGRA,
+ ogre.TU_DEFAULT)
+ colArray = [0,255,0,128] * 16 * 16
+ self.setTextureManual(self.mTex, 16, 16, colArray)
+ self.material = ogre.MaterialManager.getSingleton().create(
+ "DynamicTextureMaterial",
+ ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
+
+ self.material.getTechnique(0).getPass(0).createTextureUnitState("DynamicTexture")
+ self.material.getTechnique(0).getPass(0).setSceneBlending(ogre.SBT_TRANSPARENT_ALPHA)
+ self.ent = self.sceneManager.createEntity("mrben", "knot.mesh")
+ self.ent.setMaterialName("DynamicTextureMaterial")
+ self.node = self.sceneManager.rootSceneNode.createChildSceneNode('Knot3Node', (-100, -10, -200))
+ self.node.attachObject(self.ent)
+
+ self.lstnr = textureListener(self)
+ ogre.Root.getSingleton().addFrameListener(self.lstnr)
+
+ #Texture is a manually created Texture
+ #dataArray is an array of pixel colour data
+ def setTextureManual(self, texture, width, height, dataArray):
+ import ctypes
+ # Get the pixel buffer
+ pixelBuffer = texture.getBuffer()
+ # Lock the pixel buffer and get a pixel box
+ pointer = pixelBuffer.lock(0,width*height,ogre.HardwareBuffer.HBL_NORMAL)
+ #number 4 here is use to accommodate the bytes for r, g, b, a may vary with different pixel formats
+ storageclass = ctypes.c_uint8 * (width*height*4)
+ cbuffer=storageclass.from_address(ogre.CastInt(pointer))
+ pos=0
+ for j in range(height):
+ for i in range( width ) :
+ cbuffer[pos]= dataArray[pos] # B
+ pos+=1
+ cbuffer[pos]= dataArray[pos] # G
+ pos+=1
+ cbuffer[pos]= dataArray[pos] # R
+ pos+=1
+ cbuffer[pos]= dataArray[pos] # A
+ pos+=1
+ # Unlock the pixel buffer
+ pixelBuffer.unlock()
+
+if __name__=='__main__':
+ ta = textureTest()
+ ta.go()
\ 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: <bha...@us...> - 2007-12-17 18:04:11
|
Revision: 510
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=510&view=rev
Author: bharling
Date: 2007-12-17 10:04:15 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
Updated to the latest version of the showcase demo.
A little speed improvement.
-bharling
Added Paths:
-----------
trunk/python-ogre/demos/showcase_01/screenshot_0.png
Added: trunk/python-ogre/demos/showcase_01/screenshot_0.png
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/showcase_01/screenshot_0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bha...@us...> - 2007-12-17 18:03:42
|
Revision: 509
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=509&view=rev
Author: bharling
Date: 2007-12-17 10:03:45 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
Updated to the latest version of the showcase demo.
A little speed improvement.
-bharling
Added Paths:
-----------
trunk/python-ogre/demos/showcase_01/SampleFramework.pyc
Added: trunk/python-ogre/demos/showcase_01/SampleFramework.pyc
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/showcase_01/SampleFramework.pyc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bha...@us...> - 2007-12-17 18:03:36
|
Revision: 508
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=508&view=rev
Author: bharling
Date: 2007-12-17 10:03:35 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
Updated to the latest version of the showcase demo.
A little speed improvement.
-bharling
Added Paths:
-----------
trunk/python-ogre/demos/showcase_01/SampleFramework.py
Added: trunk/python-ogre/demos/showcase_01/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/showcase_01/SampleFramework.py (rev 0)
+++ trunk/python-ogre/demos/showcase_01/SampleFramework.py 2007-12-17 18:03:35 UTC (rev 508)
@@ -0,0 +1,14 @@
+# This code is in the Public Domain
+#
+
+import ogre.renderer.OGRE as ogre
+
+# We don't use the verisons but it's nice to set them up...
+ogre.OgreVersion = ogre.GetOgreVersion()
+ogre.OgreVersionString = ogre.OgreVersion[0] + ogre.OgreVersion[1] + ogre.OgreVersion[2]
+ogre.PythonOgreVersion = ogre.GetPythonOgreVersion()
+
+from ogre.renderer.OGRE.sf_OIS import *
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bha...@us...> - 2007-12-17 18:03:26
|
Revision: 507
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=507&view=rev
Author: bharling
Date: 2007-12-17 10:03:23 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
Updated to the latest version of the showcase demo.
A little speed improvement.
-bharling
Added Paths:
-----------
trunk/python-ogre/demos/showcase_01/resources.cfg
Added: trunk/python-ogre/demos/showcase_01/resources.cfg
===================================================================
--- trunk/python-ogre/demos/showcase_01/resources.cfg (rev 0)
+++ trunk/python-ogre/demos/showcase_01/resources.cfg 2007-12-17 18:03:23 UTC (rev 507)
@@ -0,0 +1,38 @@
+[Bootstrap]
+Zip=../media/packs/OgreCore.zip
+
+# Resource locations to be added to the default path
+[General]
+FileSystem=../media
+FileSystem=../media/fonts
+FileSystem=../media/sounds
+FileSystem=../media/Audio
+FileSystem=../media/materials/programs
+FileSystem=../media/materials/scripts
+FileSystem=../media/materials/textures
+FileSystem=../media/models
+FileSystem=../media/overlays
+FileSystem=../media/particle
+FileSystem=../media/gui
+Zip=../media/packs/cubemap.zip
+Zip=../media/packs/cubemapsJS.zip
+Zip=../media/packs/dragon.zip
+Zip=../media/packs/fresneldemo.zip
+Zip=../media/packs/ogretestmap.zip
+Zip=../media/packs/skybox.zip
+#Zip=../media/packs/chiropteraDM.pk3
+
+FileSystem=./media/trees
+FileSystem=./media/grass
+FileSystem=./media/terrains
+FileSystem=./media/Triplanar
+FileSystem=./media/SkyManager
+FileSystem=./media/sounds
+FileSystem=./media/water
+FileSystem=./media/Characters
+FileSystem=./media/perPixel
+
+[Caelum]
+FileSystem=../caelum/media
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bha...@us...> - 2007-12-17 18:03:11
|
Revision: 506
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=506&view=rev
Author: bharling
Date: 2007-12-17 10:03:12 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
Updated to the latest version of the showcase demo.
A little speed improvement.
-bharling
Added Paths:
-----------
trunk/python-ogre/demos/showcase_01/prospector.py
Added: trunk/python-ogre/demos/showcase_01/prospector.py
===================================================================
--- trunk/python-ogre/demos/showcase_01/prospector.py (rev 0)
+++ trunk/python-ogre/demos/showcase_01/prospector.py 2007-12-17 18:03:12 UTC (rev 506)
@@ -0,0 +1,41 @@
+import socket as s
+import SocketServer as ss
+import random
+
+NAMES = ['Whittle', 'Bark', 'Chafer', 'Cap', 'Bolete', 'Willow', 'Chestnut',
+ 'Sunny', 'Lemon', 'Spotted', 'Morsel', 'Gummy', 'Fibrous' 'Old-Mans',
+ 'Death', 'Mulch']
+
+class ProspectingManager(ss.BaseRequestHandler):
+ def handle(self):
+ try:
+ datain = self.request[0] # get the input string
+ s=datain.split() ## Assume input data is <count><space><rest of info>
+
+ sock = self.request[1] ## this is the incomming socket
+
+ fname = random.choice(NAMES) + ' ' + random.choice(NAMES)
+
+ ## because this is a UDP demo we need to connect to send info back
+ ## I suspect this isn't needed if we use TCP server
+ #sock.connect ( self.client_address )
+
+ sock.send (fname) ## send data back
+ except:
+ pass
+
+
+
+class Server(ss.ThreadingMixIn, ss.TCPServer): pass
+
+if __name__ == "__main__":
+ # we create a server on the local machine listening to port 4444..
+ # could also use "localhost" instead of gethostname()
+ (family, socktype, proto, canonname, sockaddr) = s.getaddrinfo ( "127.0.0.1", 4444 )[0]
+ myServer = Server ( sockaddr, ProspectingManager )
+ myServer.closenow = False
+ print 'Server Started'
+ while not myServer.closenow:
+ myServer.handle_request()
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
