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...> - 2007-10-23 13:54:15
|
Revision: 455
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=455&view=rev
Author: andy_miller
Date: 2007-10-23 06:54:19 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
remove ogrebullet from the default build while waiting for CVS update to fix Linux issues
Modified Paths:
--------------
trunk/python-ogre/scripts/06-GenerateCode.sh
trunk/python-ogre/scripts/07-BuildModules.sh
Modified: trunk/python-ogre/scripts/06-GenerateCode.sh
===================================================================
--- trunk/python-ogre/scripts/06-GenerateCode.sh 2007-10-23 06:05:12 UTC (rev 454)
+++ trunk/python-ogre/scripts/06-GenerateCode.sh 2007-10-23 13:54:19 UTC (rev 455)
@@ -72,11 +72,11 @@
echo ' -- creating ogrebulletc code '
echo ' -- creating ogrebulletc code' >> $INSTALL_DIR/log.out
- $INSTALL_DIR/gen_code.sh ogrebulletc
+### $INSTALL_DIR/gen_code.sh ogrebulletc
echo ' -- creating ogrebulletd code '
echo ' -- creating ogrebulletd code' >> $INSTALL_DIR/log.out
- $INSTALL_DIR/gen_code.sh ogrebulletd
+### $INSTALL_DIR/gen_code.sh ogrebulletd
# echo ' -- creating nxogre code '
# echo ' -- creating nxogre code' >> $INSTALL_DIR/log.out
Modified: trunk/python-ogre/scripts/07-BuildModules.sh
===================================================================
--- trunk/python-ogre/scripts/07-BuildModules.sh 2007-10-23 06:05:12 UTC (rev 454)
+++ trunk/python-ogre/scripts/07-BuildModules.sh 2007-10-23 13:54:19 UTC (rev 455)
@@ -12,7 +12,7 @@
then
scons PROJECTS=$1 -i
else
- scons PROJECTS=ogre,ois,cegui,plib,ogrenewt,ogreode,ogreal,quickgui,et,caelum,bullet,ogrebulletc,ogrebulletd -i
+ scons PROJECTS=ogre,ois,cegui,plib,ogrenewt,ogreode,ogreal,quickgui,et,caelum,bullet -i
#,ogrebulletc,ogrebulletd -i
fi
#opcode -- not really suited to a linux build -- lots of work needed ?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-23 06:05:11
|
Revision: 454
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=454&view=rev
Author: andy_miller
Date: 2007-10-22 23:05:12 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
QuickGUI updates
New version of OgreAL (base library updated with various bug fixes)
Updated Ogrebullet
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp
trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp
trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisions.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConvexCast.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsMeshToShapeConverter.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObject.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamics.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRigidBody.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUI.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.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.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuad.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuad.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/demos/qgui/Demo_QuickGUI01.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/ogreal/OgreALException.cpp
trunk/python-ogre/ThirdParty/ogreal/OgreALException.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEffect.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEffect.h
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/ogreal/Makefile.am
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.cpp
Deleted: trunk/python-ogre/ThirdParty/ogreal/Makefile.am
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/Makefile.am 2007-10-23 00:32:24 UTC (rev 453)
+++ trunk/python-ogre/ThirdParty/ogreal/Makefile.am 2007-10-23 06:05:12 UTC (rev 454)
@@ -1 +0,0 @@
-pkginclude_HEADERS = OgreAL.h OgreALListener.h OgreALOggSound.h OgreALOggSoundStream.h OgreALPrereqs.h OgreALSound.h OgreALSoundManager.h OgreALSoundStream.h OgreALWavSound.h
Added: trunk/python-ogre/ThirdParty/ogreal/OgreALException.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALException.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALException.cpp 2007-10-23 06:05:12 UTC (rev 454)
@@ -0,0 +1,12 @@
+#include "OgreALException.h"
+#include "OgreException.h"
+
+namespace OgreAL {
+ void check(bool condition, const int errorNumber, const Ogre::String& description, const Ogre::String& source)
+ {
+ if (!condition)
+ {
+ throw Ogre::Exception(errorNumber, description, source);
+ }
+ }
+} // Namespace
Added: trunk/python-ogre/ThirdParty/ogreal/OgreALException.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALException.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALException.h 2007-10-23 06:05:12 UTC (rev 454)
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+** This source file is part of OgreAL **
+** an OpenAL plugin for the Ogre Rendering Engine. **
+** **
+** Copyright 2006 Casey Borders **
+** **
+** OgreAL 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, or (at your option) any later **
+** version. **
+** **
+** The developer really likes screenshots and while he recognises that the **
+** fact that this is an AUDIO plugin means that the fruits of his labor will **
+** never been seen in these images he would like to kindly ask that you send **
+** screenshots of your application using his library to **
+** scr...@mo... **
+** **
+** Please bear in mind that the sending of these screenshots means that you **
+** are agreeing to allow the developer to display them in the media of his **
+** choice. They will, however, be fully credited to the person sending the **
+** email or, if you wish them to be credited differently, please state that **
+** in the body of the email. **
+** **
+** OgreAL 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 General Public License for **
+** more details. **
+** **
+** You should have received a copy of the GNU General Public License along **
+** with OgreAL; see the file LICENSE. If not, write to the **
+** Free Software Foundation, Inc., **
+** 59 Temple Place - Suite 330, **
+** Boston, MA 02111-1307, USA. **
+\*---------------------------------------------------------------------------*/
+#ifndef _OGREAL_EXCEPTION_H_
+#define _OGREAL_EXCEPTION_H_
+
+#include "OgreString.h"
+
+namespace OgreAL {
+ void check(bool condition, const int errorNumber, const Ogre::String& description, const Ogre::String& source);
+
+ #define OGREAL_CHECK(condition, errorNumber, description) check((condition), (errorNumber), (description), __FUNCTION__)
+} // Namespace
+#endif
Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp 2007-10-23 00:32:24 UTC (rev 453)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp 2007-10-23 06:05:12 UTC (rev 454)
@@ -35,6 +35,7 @@
#include "OgreALOggSound.h"
#include "OgreALSoundManager.h"
+#include "OgreALException.h"
namespace OgreAL {
OggSound::OggSound(const Ogre::String& name, const Ogre::String& soundFile, bool loop, AudioFormat format) :
@@ -43,96 +44,110 @@
mVorbisInfo(0),
mVorbisComment(0)
{
- if(!(mOggFile = fopen(soundFile.c_str(), "rb")))
+ try
{
- throw Ogre::Exception(1, "Could not open Ogg file.", "OgreAL::OggSound::ctor");
- }
+ mOggFile = fopen(soundFile.c_str(), "rb");
+ OGREAL_CHECK(mOggFile != 0, 1, "Could not open Ogg file.");
- if(ov_open(mOggFile, &mOggStream, NULL, 0) < 0)
- {
- fclose(mOggFile);
- throw Ogre::Exception(1, "Could not open Ogg stream.", "OgreAL::OggSound::ctor");
- }
+ OGREAL_CHECK(ov_open(mOggFile, &mOggStream, NULL, 0) >= 0, 1, "Could not open Ogg stream.");
+ mVorbisInfo = ov_info(&mOggStream, -1);
- mVorbisInfo = ov_info(&mOggStream, -1);
+ unsigned long channels = mVorbisInfo->channels;
+ mFreq = mVorbisInfo->rate;
+ mLoop = loop;
- unsigned long channels = mVorbisInfo->channels;
- mFreq = mVorbisInfo->rate;
- mLoop = loop;
+ switch(channels)
+ {
+ case 1:
+ mFormat = AL_FORMAT_MONO16;
+ // Set BufferSize to 250ms (Frequency * 2 (16bit) divided by 4 (quarter of a second))
+ mBufferSize = mFreq >> 1;
+ // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
+ mBufferSize -= (mBufferSize % 2);
+ break;
+ case 2:
+ mFormat = AL_FORMAT_STEREO16;
+ // Set BufferSize to 250ms (Frequency * 4 (16bit stereo) divided by 4 (quarter of a second))
+ mBufferSize = mFreq;
+ // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
+ mBufferSize -= (mBufferSize % 4);
+ break;
+ case 4:
+ mFormat = alGetEnumValue("AL_FORMAT_QUAD16");
+ // Set BufferSize to 250ms (Frequency * 8 (16bit 4-channel) divided by 4 (quarter of a second))
+ mBufferSize = mFreq * 2;
+ // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
+ mBufferSize -= (mBufferSize % 8);
+ break;
+ case 6:
+ mFormat = alGetEnumValue("AL_FORMAT_51CHN16");
+ // Set BufferSize to 250ms (Frequency * 12 (16bit 6-channel) divided by 4 (quarter of a second))
+ mBufferSize = mFreq * 3;
+ // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
+ mBufferSize -= (mBufferSize % 12);
+ break;
+ case 7:
+ mFormat = alGetEnumValue("AL_FORMAT_61CHN16");
+ // Set BufferSize to 250ms (Frequency * 16 (16bit 7-channel) divided by 4 (quarter of a second))
+ mBufferSize = mFreq * 4;
+ // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
+ mBufferSize -= (mBufferSize % 16);
+ break;
+ case 8:
+ mFormat = alGetEnumValue("AL_FORMAT_71CHN16");
+ // Set BufferSize to 250ms (Frequency * 20 (16bit 8-channel) divided by 4 (quarter of a second))
+ mBufferSize = mFreq * 5;
+ // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
+ mBufferSize -= (mBufferSize % 20);
+ break;
+ default:
+ // Couldn't determine buffer format so log the error and default to mono
+ Ogre::LogManager::getSingleton().logMessage("!!WARNING!! Could not determine buffer format! Defaulting to MONO");
- if(channels == 1)
- {
- mFormat = AL_FORMAT_MONO16;
- // Set BufferSize to 250ms (Frequency * 2 (16bit) divided by 4 (quarter of a second))
- mBufferSize = mFreq >> 1;
- // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
- mBufferSize -= (mBufferSize % 2);
+ mFormat = AL_FORMAT_MONO16;
+ // Set BufferSize to 250ms (Frequency * 2 (16bit) divided by 4 (quarter of a second))
+ mBufferSize = mFreq >> 1;
+ // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
+ mBufferSize -= (mBufferSize % 2);
+ break;
+ }
+
+ alGenBuffers(1, &mBuffer);
+ OGREAL_CHECK(alGetError() == AL_NO_ERROR, 13, "Could not generate buffer");
+ int currSection;
+ long size = 0;
+ char data[4096*8];
+ std::vector<char> buffer;
+ do
+ {
+ size = ov_read(&mOggStream, data, sizeof(data), 0, 2, 1, &currSection);
+ buffer.insert(buffer.end(), data, data + size);
+ }while(size > 0);
+
+ ov_clear(&mOggStream);
+ alBufferData(mBuffer, mFormat, &buffer[0], static_cast<ALsizei>(buffer.size()), mFreq);
+ OGREAL_CHECK(alGetError() == AL_NO_ERROR, 13, "Could not generate buffer");
}
- else if(channels == 2)
+ catch(Exception e)
{
- mFormat = AL_FORMAT_STEREO16;
- // Set BufferSize to 250ms (Frequency * 4 (16bit stereo) divided by 4 (quarter of a second))
- mBufferSize = mFreq;
- // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
- mBufferSize -= (mBufferSize % 4);
- }
- else if(channels == 4)
- {
- mFormat = alGetEnumValue("AL_FORMAT_QUAD16");
- // Set BufferSize to 250ms (Frequency * 8 (16bit 4-channel) divided by 4 (quarter of a second))
- mBufferSize = mFreq * 2;
- // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
- mBufferSize -= (mBufferSize % 8);
- }
- else if(channels == 6)
- {
- mFormat = alGetEnumValue("AL_FORMAT_51CHN16");
- // Set BufferSize to 250ms (Frequency * 12 (16bit 6-channel) divided by 4 (quarter of a second))
- mBufferSize = mFreq * 3;
- // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
- mBufferSize -= (mBufferSize % 12);
- }
- else if(channels == 7)
- {
- mFormat = alGetEnumValue("AL_FORMAT_61CHN16");
- // Set BufferSize to 250ms (Frequency * 16 (16bit 7-channel) divided by 4 (quarter of a second))
- mBufferSize = mFreq * 4;
- // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
- mBufferSize -= (mBufferSize % 16);
- }
- else if(channels == 8)
- {
- mFormat = alGetEnumValue("AL_FORMAT_71CHN16");
- // Set BufferSize to 250ms (Frequency * 20 (16bit 8-channel) divided by 4 (quarter of a second))
- mBufferSize = mFreq * 5;
- // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
- mBufferSize -= (mBufferSize % 20);
- }
- else
- {
- // Couldn't determine buffer format so log the error and default to mono
- Ogre::LogManager::getSingleton().logMessage("!!WARNING!! Could not determine buffer format! Defaulting to MONO");
+ if (mBuffer)
+ {
+ if (alIsBuffer(mBuffer) == AL_TRUE)
+ {
+ alDeleteBuffers(1, &mBuffer);
+ }
+ }
- mFormat = AL_FORMAT_MONO16;
- // Set BufferSize to 250ms (Frequency * 2 (16bit) divided by 4 (quarter of a second))
- mBufferSize = mFreq >> 1;
- // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ...
- mBufferSize -= (mBufferSize % 2);
- }
+ if(mOggFile)
+ {
+ fclose(mOggFile);
+ mOggFile = 0;
+ }
- alGenBuffers(1, &mBuffer);
- int currSection;
- long size = 0;
- char data[4096*8];
- std::vector<char> buffer;
- do
- {
- size = ov_read(&mOggStream, data, sizeof(data), 0, 2, 1, &currSection);
- buffer.insert(buffer.end(), data, data + size);
- }while(size > 0);
+ ov_clear(&mOggStream);
- ov_clear(&mOggStream);
- alBufferData(mBuffer, mFormat, &buffer[0], static_cast<ALsizei>(buffer.size()), mFreq);
+ throw (e);
+ }
createAndBindSource();
}
Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h 2007-10-23 00:32:24 UTC (rev 453)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h 2007-10-23 06:05:12 UTC (rev 454)
@@ -42,7 +42,6 @@
#if OGRE_COMPILER == OGRE_COMPILER_MSVC
# include "al.h"
# include "alc.h"
- # include "AL/alut.h"
# include "xram.h"
# ifndef OgreAL_Export
# ifdef OGRE_AL_EXPORT
@@ -54,7 +53,6 @@
#elif OGRE_COMPILER == OGRE_COMPILER_GNUC
# include "AL/al.h"
# include "AL/alc.h"
- # include "AL/alut.h"
# if defined(OGRE_AL_EXPORT) && OGRE_COMP_VER >= 400
# define OgreAL_Export __attribute__ ((visibility("default")))
# else
@@ -66,7 +64,6 @@
#else // Other Compilers
# include "al.h"
# include "alc.h"
- # include "alut.h"
# include "xram.h"
# define OgreAL_Export
#endif
@@ -125,5 +122,22 @@
delete pair.second;
}
};
+
+ static unsigned short readByte16(const unsigned char buffer[2])
+ {
+ #if(OGRE_ENDIAN == OGRE_ENDIAN_BIG)
+ return (buffer[0] << 8) + buffer[1];
+ #else
+ return (buffer[1] << 8) + buffer[0];
+ #endif
+ }
+ static unsigned long readByte32(const unsigned char buffer[4])
+ {
+ #if(OGRE_ENDIAN == OGRE_ENDIAN_BIG)
+ return (buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3];
+ #else
+ return (buffer[3] << 24) + (buffer[2] << 16) + (buffer[1] << 8) + buffer[0];
+ #endif
+ }
}
#endif
Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp 2007-10-23 00:32:24 UTC (rev 453)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp 2007-10-23 06:05:12 UTC (rev 454)
@@ -35,25 +35,151 @@
#include "OgreALWavSound.h"
#include "OgreALSoundManager.h"
+#include "OgreALException.h"
namespace OgreAL {
WavSound::WavSound(const Ogre::String& name, const Ogre::String& soundFile, bool loop, AudioFormat format) :
- Sound(name, soundFile)
+ Sound(name, soundFile),
+ mWavFile(0)
{
- alGenBuffers(1, &mBuffer);
- checkError(__FUNCTION__);
+ const unsigned int BUFFER_SIZE = 32768; // 32 KB buffers
+ size_t bytes;
+ std::vector <char> data;
- ALbyte* filename = reinterpret_cast<ALbyte*>(const_cast<char*>(soundFile.c_str()));
- alutLoadWAVFile(filename, &mFormat, &mData, &mSize, &mFreq, &mLoop);
+ // Local resources
+ char *array = NULL;
- // Use a different buffer format?
- const FormatData *formatData = SoundManager::getSingleton().retrieveFormatData(format);
- if(formatData)
- mFormat = formatData->formatEnum;
+ // Main process
+ try
+ {
+ // Open for binary reading
+ mWavFile = fopen(soundFile.c_str(), "rb");
+ OGREAL_CHECK(mWavFile != 0, 13, "Could not load wav from " + soundFile);
- alBufferData(mBuffer, mFormat, mData, mSize, mFreq);
- alutUnloadWAV(mFormat, mData, mSize, mFreq);
+ // buffers
+ char magic[5];
+ magic[4] = '\0';
+ unsigned char buffer32[4];
+ unsigned char buffer16[2];
+ // check magic
+ OGREAL_CHECK(fread(magic,4,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ OGREAL_CHECK(std::string(magic) == "RIFF", 13, "Wrong wav file format. This file is not a .wav file (no RIFF magic): "+ soundFile );
+
+ // skip 4 bytes (file size)
+ fseek(mWavFile,4,SEEK_CUR);
+
+ // check file format
+ OGREAL_CHECK(fread(magic,4,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ OGREAL_CHECK(std::string(magic) == "WAVE", 13, "Wrong wav file format. This file is not a .wav file (no WAVE format): "+ soundFile );
+
+ // check 'fmt ' sub chunk (1)
+ OGREAL_CHECK(fread(magic,4,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ OGREAL_CHECK(std::string(magic) == "fmt ", 13, "Wrong wav file format. This file is not a .wav file (no 'fmt ' subchunk): "+ soundFile );
+
+ // read (1)'s size
+ OGREAL_CHECK(fread(buffer32,4,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ unsigned long subChunk1Size = readByte32(buffer32);
+ OGREAL_CHECK(subChunk1Size >= 16, 13, "Wrong wav file format. This file is not a .wav file ('fmt ' chunk too small, truncated file?): "+ soundFile );
+
+ // check PCM audio format
+ OGREAL_CHECK(fread(buffer16,2,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ unsigned short audioFormat = readByte16(buffer16);
+ OGREAL_CHECK(audioFormat == 1, 13, "Wrong wav file format. This file is not a .wav file (audio format is not PCM): "+ soundFile );
+
+ // read number of channels
+ OGREAL_CHECK(fread(buffer16,2,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ unsigned short channels = readByte16(buffer16);
+
+ // read frequency (sample rate)
+ OGREAL_CHECK(fread(buffer32,4,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ unsigned long frequency = readByte32(buffer32);
+
+ // skip 6 bytes (Byte rate (4), Block align (2))
+ fseek(mWavFile,6,SEEK_CUR);
+
+ // read bits per sample
+ OGREAL_CHECK(fread(buffer16,2,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ unsigned short bps = readByte16(buffer16);
+
+ if (channels == 1)
+ mFormat = (bps == 8) ? AL_FORMAT_MONO8 : AL_FORMAT_MONO16;
+ else
+ mFormat = (bps == 8) ? AL_FORMAT_STEREO8 : AL_FORMAT_STEREO16;
+
+ // check 'data' sub chunk (2)
+ OGREAL_CHECK(fread(magic,4,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ OGREAL_CHECK(std::string(magic) == "data" || std::string(magic) == "fact", 13, "Wrong wav file format. This file is not a .wav file (no data subchunk): "+ soundFile );
+
+ // fact is an option section we don't need to worry about
+ if(std::string(magic) == "fact")
+ {
+ fseek(mWavFile,8,SEEK_CUR);
+ }
+
+ OGREAL_CHECK(fread(buffer32,4,1,mWavFile) == 1, 13, "Cannot read wav file "+ soundFile );
+ unsigned long subChunk2Size = readByte32(buffer32);
+
+ // The frequency of the sampling rate
+ mFreq = frequency;
+ OGREAL_CHECK(sizeof(mFreq) == sizeof(frequency), 13, "freq and frequency different sizes");
+
+ array = new char[BUFFER_SIZE];
+
+ while (data.size() != subChunk2Size)
+ {
+ // Read up to a buffer's worth of decoded sound data
+ bytes = fread(array, 1, BUFFER_SIZE, mWavFile);
+
+ if (bytes <= 0)
+ break;
+
+ if (data.size() + bytes > subChunk2Size)
+ bytes = subChunk2Size - data.size();
+
+ // Append to end of buffer
+ data.insert(data.end(), array, array + bytes);
+ }
+
+ delete []array;
+ array = NULL;
+
+ fclose(mWavFile);
+ mWavFile = 0;
+
+ alGenBuffers(1, &mBuffer);
+ OGREAL_CHECK(alGetError() == AL_NO_ERROR, 13, "Could not generate buffer");
+ OGREAL_CHECK(AL_NONE != mBuffer, 13, "Could not generate buffer");
+
+ alBufferData(mBuffer, mFormat, &data[0], Size(data.size()), mFreq);
+ OGREAL_CHECK(alGetError() == AL_NO_ERROR, 13, "Could not load buffer data");
+
+ //return buffer;
+ }
+ catch(Exception e)
+ {
+ if (mBuffer)
+ {
+ if (alIsBuffer(mBuffer) == AL_TRUE)
+ {
+ alDeleteBuffers(1, &mBuffer);
+ }
+ }
+
+ if (array)
+ {
+ delete []array;
+ }
+
+ if(mWavFile)
+ {
+ fclose(mWavFile);
+ mWavFile = 0;
+ }
+
+ throw (e);
+ }
+
mLoop = loop?AL_TRUE:AL_FALSE;
createAndBindSource();
Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h 2007-10-23 00:32:24 UTC (rev 453)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h 2007-10-23 06:05:12 UTC (rev 454)
@@ -78,6 +78,9 @@
ALvoid* mData;
friend class SoundFactory;
+
+ private:
+ FILE* mWavFile;
};
} // Namespace
#endif
Deleted: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp 2007-10-23 00:32:24 UTC (rev 453)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp 2007-10-23 06:05:12 UTC (rev 454)
@@ -1,650 +0,0 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
-(Object-oriented Graphics Rendering Engine Bullet Wrapper)
-For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
-Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-
-#include "OgreBulletCollisions.h"
-
-#include "Ogre.h"
-#include "OgreFontManager.h"
-
-#include "Debug/OgreBulletCollisionsDebugContact.h"
-#include "OgreBulletCollisionsShape.h"
-#include "OgreBulletCollisionsObject.h"
-#include "OgreBulletCollisionsWorld.h"
-
-using namespace Ogre;
-
-#define POS_TEX_BINDING 0
-#define COLOUR_BINDING 1
-
-namespace OgreBulletCollisions
-{
- //------------------------------------------------------------------------------------------------
- DebugContact::DebugContact(const String &name, CollisionsWorld *world) :
- _name(name),
- _world(world),
- _enabled(false)
- {
- // scene node
- _node = _world->getSceneManager()->getRootSceneNode ()->createChildSceneNode ();
-
- // sphere attach to contact point
- _point = _world->getSceneManager()->createEntity(name + String("_debug_point"), "sphere.mesh");
- _point_node = _node->createChildSceneNode ();
- _point_node->attachObject (_point);
- _point_node->setScale(0.001, 0.001, 0.001);
-
- // normal direction debug
- _normal = new DebugNormal();
- _node->attachObject (_normal);
-
- // text info on contact
- _text = new DebugContactText(name + String("_debug_text"), _node->createChildSceneNode ());
- _text->setPosition (Vector3(0,5,0));
- _text->setCaption ("-");
- _text->setVisible (false);
-
- _node->setVisible (false);
- }
- //------------------------------------------------------------------------------------------------
- DebugContact::~DebugContact()
- {
- delete _text;
-
- _point_node->detachObject (_point->getName ());
- _node->detachObject (_normal->getName ());
-
- _world->getSceneManager()->destroyEntity (_point->getName ());
-
- _node->detachAllObjects ();
- _node->removeAndDestroyAllChildren ();
-
- delete _normal;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContact::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
- {
- _node->setPosition (pt);
-
- _point_node->setPosition (depth * normal);
-
- //String contactLabel("p: ");
- //contactLabel = contactLabel + StringConverter::toString(contact->getPosition());
- //contactLabel = contactLabel + ", n: ";
- //contactLabel = contactLabel + StringConverter::toString(contact->getNormal());
- //_text->setCaption (contactLabel);
- //_text->setVisible (false);
-
- //_text->setPosition (contact->getPosition () + Vector3(0,5,0));
-
- _normal->update (normal, pt, depth);
- }
- //------------------------------------------------------------------------------------------------
- bool DebugContact::isEnabled () const
- {
- return _enabled;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContact::setEnabled (bool enable)
- {
- _enabled = enable;
- _node->setVisible (_enabled);
- };
- //------------------------------------------------------------------------------------------------
- void DebugNormal::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
- {
- DebugLines::clear ();
- // set normal following contact normal
- //contact->_normal
- //contact->_position
- DebugLines::addLine (Vector3::ZERO,
- 5*normal);
- DebugLines::draw ();
- }
- //------------------------------------------------------------------------------------------------
- DebugContactText::DebugContactText(const String &name,
- SceneNode *node,
- const String &caption,
- const String &fontName,
- int charHeight,
- const ColourValue &color)
- : mpCam(NULL)
- , mpWin(NULL)
- , mpFont(NULL)
- , mName(name)
- , mCaption(caption)
- , mFontName(fontName)
- , mCharHeight(charHeight)
- , mColor(color)
- , mType("DebugContact")
- , mTimeUntilNextToggle(0)
- , mSpaceWidth(0)
- , mUpdateColors(true)
- , mOnTop(false)
- , mHorizontalAlignment(H_LEFT)
- , mVerticalAlignment(V_BELOW)
- , mAdditionalHeight(0.0)
- , mNode(node)
-
- {
- if (name.empty())
- Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without name", "DebugContact::DebugContact");
-//
-// if (caption.empty())
-// Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without caption", "DebugContact::DebugContact");
-
- mRenderOp.vertexData = NULL;
- this->setFontName(mFontName);
- //this->_setupGeometry();
- mNode->attachObject(this);
- }
- //------------------------------------------------------------------------------------------------
- DebugContactText::~DebugContactText()
- {
- mNode->detachObject(this->getName());
- if (mRenderOp.vertexData)
- delete mRenderOp.vertexData;
- }
-#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
- void DebugContactText::visitRenderables(Renderable::Visitor* visitor,
- bool debugRenderables)
- {
- visitor->visit(this, 0, false);
- }
-#endif
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setPosition(const Vector3 &pos)
- {
- mNode->setPosition (pos);
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setFontName(const String &fontName)
- {
- if((Ogre::MaterialManager::getSingletonPtr()->resourceExists(mName + "Material")))
- {
- Ogre::MaterialManager::getSingleton().remove(mName + "Material");
- }
-
- if (mFontName != fontName || mpMaterial.isNull() || !mpFont)
- {
- mFontName = fontName;
- mpFont = (Font *)FontManager::getSingleton().getByName(mFontName).getPointer();
- if (!mpFont)
- Exception(Exception::ERR_ITEM_NOT_FOUND, "Could not find font " + fontName, "DebugContact::setFontName");
-
- mpFont->load();
- if (!mpMaterial.isNull())
- {
- MaterialManager::getSingletonPtr()->remove(mpMaterial->getName());
- mpMaterial.setNull();
- }
-
- mpMaterial = mpFont->getMaterial()->clone(mName + "Material");
- if (!mpMaterial->isLoaded())
- mpMaterial->load();
-
- mpMaterial->setDepthCheckEnabled(!mOnTop);
- //mpMaterial->setDepthBias(!mOnTop);
- mpMaterial->setDepthBias(0,!mOnTop);
- mpMaterial->setDepthWriteEnabled(mOnTop);
- mpMaterial->setLightingEnabled(false);
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setCaption(const String &caption)
- {
- if (caption != mCaption)
- {
- mCaption = caption;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setColor(const ColourValue &color)
- {
- if (color != mColor)
- {
- mColor = color;
- mUpdateColors = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setCharacterHeight(unsigned int height)
- {
- if (height != mCharHeight)
- {
- mCharHeight = height;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setSpaceWidth(unsigned int width)
- {
- if (width != mSpaceWidth)
- {
- mSpaceWidth = width;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setTextAlignment(const HorizontalAlignment& horizontalAlignment, const VerticalAlignment& verticalAlignment)
- {
- if(mHorizontalAlignment != horizontalAlignment)
- {
- mHorizontalAlignment = horizontalAlignment;
- mNeedUpdate = true;
- }
- if(mVerticalAlignment != verticalAlignment)
- {
- mVerticalAlignment = verticalAlignment;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setAdditionalHeight( Real height )
- {
- if( mAdditionalHeight != height )
- {
- mAdditionalHeight = height;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::showOnTop(bool show)
- {
- if( mOnTop != show && !mpMaterial.isNull() )
- {
- mOnTop = show;
- mpMaterial->setDepthBias(0,!mOnTop);
- mpMaterial->setDepthCheckEnabled(!mOnTop);
- mpMaterial->setDepthWriteEnabled(mOnTop);
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_setupGeometry()
- {
- assert(mpFont);
- assert(!mpMaterial.isNull());
-
- unsigned int vertexCount = static_cast<unsigned int>(mCaption.size() * 6);
-
- if (mRenderOp.vertexData)
- {
- // Removed this test as it causes problems when replacing a caption
- // of the same size: replacing "Hello" with "hello"
- // as well as when changing the text alignment
- //if (mRenderOp.vertexData->vertexCount != vertexCount)
- {
- delete mRenderOp.vertexData;
- mRenderOp.vertexData = NULL;
- mUpdateColors = true;
- }
- }
-
- if (!mRenderOp.vertexData)
- mRenderOp.vertexData = new VertexData();
-
- mRenderOp.indexData = 0;
- mRenderOp.vertexData->vertexStart = 0;
- mRenderOp.vertexData->vertexCount = vertexCount;
- mRenderOp.operationType = RenderOperation::OT_TRIANGLE_LIST;
- mRenderOp.useIndexes = false;
-
- VertexDeclaration *decl = mRenderOp.vertexData->vertexDeclaration;
- VertexBufferBinding *bind = mRenderOp.vertexData->vertexBufferBinding;
- size_t offset = 0;
-
- // create/bind positions/tex.ccord. buffer
- if (!decl->findElementBySemantic(VES_POSITION))
- decl->addElement(POS_TEX_BINDING, offset, VET_FLOAT3, VES_POSITION);
-
- offset += VertexElement::getTypeSize(VET_FLOAT3);
-
- if (!decl->findElementBySemantic(VES_TEXTURE_COORDINATES))
- decl->addElement(POS_TEX_BINDING, offset, Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES, 0);
-
- HardwareVertexBufferSharedPtr ptbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(POS_TEX_BINDING),
- mRenderOp.vertexData->vertexCount,
- HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
- bind->setBinding(POS_TEX_BINDING, ptbuf);
-
- // Colours - store these in a separate buffer because they change less often
- if (!decl->findElementBySemantic(VES_DIFFUSE))
- decl->addElement(COLOUR_BINDING, 0, VET_COLOUR, VES_DIFFUSE);
-
- HardwareVertexBufferSharedPtr cbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(COLOUR_BINDING),
- mRenderOp.vertexData->vertexCount,
- HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
- bind->setBinding(COLOUR_BINDING, cbuf);
-
- size_t charlen = mCaption.size();
- Real *pPCBuff = static_cast<Real*>(ptbuf->lock(HardwareBuffer::HBL_DISCARD));
-
- float largestWidth = 0;
- float left = 0 * 2.0 - 1.0;
- float top = -((0 * 2.0) - 1.0);
-
- // Derive space width from a capital A
- if (mSpaceWidth == 0)
- mSpaceWidth = mpFont->getGlyphAspectRatio('A') * mCharHeight * 2.0;
-
- // for calculation of AABB
- Ogre::Vector3 min, max, currPos;
- Ogre::Real maxSquaredRadius;
- bool first = true;
-
- // Use iterator
- String::iterator i, iend;
- iend = mCaption.end();
- bool newLine = true;
- Real len = 0.0f;
-
- if(mVerticalAlignment == DebugContactText::V_ABOVE)
- {
- // Raise the first line of the caption
- top += mCharHeight;
- for (i = mCaption.begin(); i != iend; ++i)
- {
- if (*i == '\n')
- top += mCharHeight * 2.0;
- }
- }
-
- for (i = mCaption.begin(); i != iend; ++i)
- {
- if (newLine)
- {
- len = 0.0f;
- for (String::iterator j = i; j != iend && *j != '\n'; j++)
- {
- if (*j == ' ')
- len += mSpaceWidth;
- else
- len += mpFont->getGlyphAspectRatio(*j) * mCharHeight * 2.0;
- }
- newLine = false;
- }
-
- if (*i == '\n')
- {
- left = 0 * 2.0 - 1.0;
- top -= mCharHeight * 2.0;
- newLine = true;
- continue;
- }
-
- if (*i == ' ')
- {
- // Just leave a gap, no tris
- left += mSpaceWidth;
- // Also reduce tri count
- mRenderOp.vertexData->vertexCount -= 6;
- continue;
- }
-
- Real horiz_height = mpFont->getGlyphAspectRatio(*i);
-
- //mpFont->getGlyphTexCoords(*i, u1, v1, u2, v2);
- const Font::UVRect &uvRect = mpFont->getGlyphTexCoords(*i);
- const Real u1 = uvRect.left;
- const Real u2 = uvRect.right;
- const Real v1 = uvRect.top;
- const Real v2 = uvRect.bottom;
-
- // each vert is (x, y, z, u, v)
- //-------------------------------------------------------------------------------------
- // First tri
- //
- // Upper left
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u1;
- *pPCBuff++ = v1;
-
- // Deal with bounds
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- currPos = Ogre::Vector3(left, top, -1.0);
- else
- currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
- if (first)
- {
- min = max = currPos;
- maxSquaredRadius = currPos.squaredLength();
- first = false;
- }
- else
- {
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
- }
-
- top -= mCharHeight * 2.0;
-
- // Bottom left
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u1;
- *pPCBuff++ = v2;
-
- // Deal with bounds
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- currPos = Ogre::Vector3(left, top, -1.0);
- else
- currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- top += mCharHeight * 2.0;
- left += horiz_height * mCharHeight * 2.0;
-
- // Top right
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u2;
- *pPCBuff++ = v1;
- //-------------------------------------------------------------------------------------
-
- // Deal with bounds
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- currPos = Ogre::Vector3(left, top, -1.0);
- else
- currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- //-------------------------------------------------------------------------------------
- // Second tri
- //
- // Top right (again)
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u2;
- *pPCBuff++ = v1;
-
- currPos = Ogre::Vector3(left, top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- top -= mCharHeight * 2.0;
- left -= horiz_height * mCharHeight * 2.0;
-
- // Bottom left (again)
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u1;
- *pPCBuff++ = v2;
-
- currPos = Ogre::Vector3(left, top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- left += horiz_height * mCharHeight * 2.0;
-
- // Bottom right
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u2;
- *pPCBuff++ = v2;
- //-------------------------------------------------------------------------------------
-
- currPos = Ogre::Vector3(left, top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- // Go back up with top
- top += mCharHeight * 2.0;
-
- float currentWidth = (left + 1)/2 - 0;
- if (currentWidth > largestWidth)
- largestWidth = currentWidth;
- }
-
- // Unlock vertex buffer
- ptbuf->unlock();
-
- // update AABB/Sphere radius
- mAABB = Ogre::AxisAlignedBox(min, max);
- mRadius = Ogre::Math::Sqrt(maxSquaredRadius);
-
- if (mUpdateColors)
- this->_updateColors();
-
- mNeedUpdate = false;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_updateColors(void)
- {
- assert(mpFont);
- assert(!mpMaterial.isNull());
-
- // Convert to system-specific
- RGBA color;
- Root::getSingleton().convertColourValue(mColor, &color);
- HardwareVertexBufferSharedPtr vbuf = mRenderOp.vertexData->vertexBufferBinding->getBuffer(COLOUR_BINDING);
- RGBA *pDest = static_cast<RGBA*>(vbuf->lock(HardwareBuffer::HBL_DISCARD));
- for (unsigned int i = 0; i < mRenderOp.vertexData->vertexCount; ++i)
- *pDest++ = color;
- vbuf->unlock();
- mUpdateColors = false;
- }
- //------------------------------------------------------------------------------------------------
- const Quaternion& DebugContactText::getWorldOrientation(void) const
- {
- assert(mpCam);
- return const_cast<Quaternion&>(mpCam->getDerivedOrientation());
- }
- //------------------------------------------------------------------------------------------------
- const Vector3& DebugContactText::getWorldPosition(void) const
- {
- assert(mParentNode);
- return mParentNode->_getDerivedPosition();
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::getWorldTransforms(Matrix4 *xform) const
- {
- if (this->isVisible() && mpCam)
- {
- Matrix3 rot3x3, scale3x3 = Matrix3::IDENTITY;
-
- // store rotation in a matrix
- mpCam->getDerivedOrientation().ToRotationMatrix(rot3x3);
-
- // parent node position
- Vector3 ppos = mParentNode->_getDerivedPosition() + Vector3::UNIT_Y*mAdditionalHeight;
-
- // apply scale
- scale3x3[0][0] = mParentNode->_getDerivedScale().x / 2;
- scale3x3[1][1] = mParentNode->_getDerivedScale().y / 2;
- scale3x3[2][2] = mParentNode->_getDerivedScale().z / 2;
-
- // apply all transforms to xform
- *xform = (rot3x3 * scale3x3);
- xform->setTrans(ppos);
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::getRenderOperation(RenderOperation &op)
- {
- if (this->isVisible())
- {
- if (mNeedUpdate)
- this->_setupGeometry();
- if (mUpdateColors)
- this->_updateColors();
- op = mRenderOp;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_notifyCurrentCamera(Camera *cam)
- {
- mpCam = cam;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_updateRenderQueue(RenderQueue* queue)
- {
- if (this->isVisible())
- {
- if (mNeedUpdate)
- this->_setupGeometry();
- if (mUpdateColors)
- this->_updateColors();
-
- queue->addRenderable(this, mRenderQueueID, OGRE_RENDERABLE_DEFAULT_PRIORITY);
- // queue->addRenderable(this, mRenderQueueID, RENDER_QUEUE_SKIES_LATE);
- }
- }
-}
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h 2007-10-23 00:32:24 UTC (rev 453)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h 2007-10-23 06:05:12 UTC (rev 454)
@@ -1,177 +1,177 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
- (Object-oriented Graphics Rendering Engine Bullet Wrapper)
- For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
- Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef __OgreBulletCollisionsDebugContact_H__
-#define __OgreBulletCollisionsDebugContact_H__
-
-#include "OgreBulletCollisionsPreRequisites.h"
-#include "Debug/OgreBulletCollisionsDebugLines.h"
-
-
-namespace OgreBulletCollisions
-{
- //------------------------------------------------------------------------------------------------
- class DebugContact
- {
- public:
- DebugContact(const Ogre::String &name, CollisionsWorld *world);
- ~DebugContact();
-
- bool isEnabled () const;
- void setEnabled (bool enable);
-
- void update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth);
-
- private:
- DebugNormal *_normal;
- DebugContactText *_text;
- Ogre::Entity *_point;
- bool _enabled;
- Ogre::String _name;
- Ogre::SceneNode *_node;
- Ogre::SceneNode *_point_node;
- CollisionsWorld *_world;
- };
-
- //------------------------------------------------------------------------------------------------
- class DebugNormal : public DebugLines
- {
- public:
- DebugNormal() : DebugLines(){};
- ~DebugNormal(){};
-
- void update (const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth);
- };
-
- //------------------------------------------------------------------------------------------------
- class DebugContactText : public Ogre::MovableObject, public Ogre::Renderable
- {
- public:
- enum HorizontalAlignment {H_LEFT, H_CENTER};
- enum VerticalAlignment {V_BELOW, V_ABOVE};
- /******************************** public methods ******************************/
- public:
- DebugContactText(const Ogre::String &name,
- Ogre::SceneNode *node,
- const Ogre::String &caption = "",
- const Ogre::String &fontName = "BlueHighway",
- int charHeight = 32,
- const Ogre::ColourValue &color = Ogre::ColourValue::White);
-
-
- ~DebugContactText();
-
-#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
- void visitRenderables(Renderable::Visitor* visitor, bool debugRenderables);
-#endif
- // Set settings
- void setPosition(const Ogre::Vector3 &pos);
-
- void setFontName(const Ogre::String &fontName);
- void setCaption(const Ogre::String &caption);
- void setColor(const Ogre::ColourValue &color);
- void setCharacterHeight(unsigned int height);
- void setSpaceWidth(unsigned int width);
- void setTextAlignment(const HorizontalAlignment& horizontalAlignment,
- const VerticalAlignment& verticalAlignment);
- void setAdditionalHeight( Ogre::Real height );
- void showOnTop(bool show=true);
-
- // Get settings
- const Ogre::String &getFontName() const {return mFontName;}
- const Ogre::String &getCaption() const {return mCaption;}
- const Ogre::ColourValue &getColor() const {return mColor;}
-
- unsigned int getCharacterHeight() const {return mCharHeight;}
- unsigned int getSpaceWidth() const {return mSpaceWidth;}
- Ogre::Real getAdditionalHeight() const {return mAdditionalHeight;}
- bool getShowOnTop() const {return mOnTop;}
- Ogre::AxisAlignedBox GetAABB(void) { return mAABB; }
-
- /******************************** protected methods and overload **************/
- protected:
-
- // from OgreBulletCollisionsDebugContact, create the object
- void _setupGeometry();
- void _updateColors();
-
- // from MovableObject
- void getWorldTransforms(Ogre::Matrix4 *xform) const;
- Ogre::Real getBoundingRadius(void) const {return mRadius;};
- Ogre::Real getSquaredViewDepth(const Ogre::Camera *cam) const {return 0;};
- const Ogre::Quaternion &getWorldOrientation(void) const;
- const Ogre::Vector3 &getWorldPosition(void) const;
- const Ogre::AxisAlignedBox &getBoundingBox(void) const {return mAABB;};
- const Ogre::String &getName(void) const {return mName;};
- const Ogre::String &getMovableType(void) const {static Ogre::String movType = "MovableText"; return movType;};
-
- void _notifyCurrentCamera(Ogre::Camera *cam);
- void _updateRenderQueue(Ogre::RenderQueue* queue);
-
- // from renderable
- void getRenderOperation(Ogre::RenderOperation &op);
- const Ogre::MaterialPtr &getMaterial(void) const {assert(!mpMaterial.isNull());return mpMaterial;};
- const Ogre::LightList &getLights(void) const {return mLList;};
-
- /******************************** OgreBulletCollisionsDebugContact data ****************************/
-
-
- protected:
- Ogre::String mFontName;
- Ogre::String mType;
- Ogre::String mName;
- Ogre::String mCaption;
- HorizontalAlignment mHorizontalAlignment;
- VerticalAlignment mVerticalAlignment;
-
- Ogre::ColourValue mColor;
- Ogre::RenderOperation mRenderOp;
- Ogre::AxisAlignedBox mAABB;
- Ogre::LightList mLList;
-
- unsigned int mCharHeight;
- unsigned int mSpaceWidth;
-
- bool mNeedUpdate;
- ...
[truncated message content] |
|
From: <and...@us...> - 2007-10-23 00:32:21
|
Revision: 453
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=453&view=rev
Author: andy_miller
Date: 2007-10-22 17:32:24 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Added Ben's forest demo to demo/showcase_01
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
Added Paths:
-----------
trunk/python-ogre/demos/showcase_01/
trunk/python-ogre/demos/showcase_01/Demo_Forest.py
trunk/python-ogre/demos/showcase_01/Demo_Forest.py.bak
trunk/python-ogre/demos/showcase_01/Ogre.log
trunk/python-ogre/demos/showcase_01/SampleFramework.py
trunk/python-ogre/demos/showcase_01/media/
trunk/python-ogre/demos/showcase_01/media/Triplanar/
trunk/python-ogre/demos/showcase_01/media/Triplanar/New Text Document.txt
trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg
trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.bak
trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.old
trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material
trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material.bak
trunk/python-ogre/demos/showcase_01/media/Triplanar/TerrainShadows.cg
trunk/python-ogre/demos/showcase_01/media/Triplanar/TerrainShadows.cg.bak
trunk/python-ogre/demos/showcase_01/media/Triplanar/Thumbs.db
trunk/python-ogre/demos/showcase_01/media/Triplanar/fp0.frag
trunk/python-ogre/demos/showcase_01/media/Triplanar/grass_1024.jpg
trunk/python-ogre/demos/showcase_01/media/Triplanar/normal_terrain.png
trunk/python-ogre/demos/showcase_01/media/Triplanar/overhang.cg
trunk/python-ogre/demos/showcase_01/media/Triplanar/project.gdp
trunk/python-ogre/demos/showcase_01/media/Triplanar/reliefmap.cg
trunk/python-ogre/demos/showcase_01/media/Triplanar/tangent_map.py
trunk/python-ogre/demos/showcase_01/media/Triplanar/tangent_map.py.bak
trunk/python-ogre/demos/showcase_01/media/Triplanar/tangentmap.png
trunk/python-ogre/demos/showcase_01/media/Triplanar/terr_rock6.jpg
trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain.cfg
trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain.png
trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain_dds.png
trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain_detail.jpg
trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain_texture.jpg
trunk/python-ogre/demos/showcase_01/media/Triplanar/vp0.vert
trunk/python-ogre/demos/showcase_01/media/grass/
trunk/python-ogre/demos/showcase_01/media/grass/BdBush.material
trunk/python-ogre/demos/showcase_01/media/grass/BigDarkBush.mesh
trunk/python-ogre/demos/showcase_01/media/grass/ShortGrass.mesh
trunk/python-ogre/demos/showcase_01/media/grass/Thumbs.db
trunk/python-ogre/demos/showcase_01/media/grass/bush3_IMG_1409.png
trunk/python-ogre/demos/showcase_01/media/grass/bush3_IMG_1409.tga.bmp
trunk/python-ogre/demos/showcase_01/media/grass/fgrass1_v2_256.png
trunk/python-ogre/demos/showcase_01/media/grass/grass.material
trunk/python-ogre/demos/showcase_01/media/grass/grass.png
trunk/python-ogre/demos/showcase_01/media/grass/grass1.material
trunk/python-ogre/demos/showcase_01/media/grass/grass1_SKIN#02.bmp
trunk/python-ogre/demos/showcase_01/media/grass/grass2.png
trunk/python-ogre/demos/showcase_01/media/grass/grass2_grass2.BMP.bmp
trunk/python-ogre/demos/showcase_01/media/grass/grass3_SKIN#22.bmp
trunk/python-ogre/demos/showcase_01/media/grass/grass4_SKIN#32.bmp
trunk/python-ogre/demos/showcase_01/media/grass/grass5_SKIN#33.bmp
trunk/python-ogre/demos/showcase_01/media/grass/grass6_SKIN#41.bmp
trunk/python-ogre/demos/showcase_01/media/grass/meshmagick.log
trunk/python-ogre/demos/showcase_01/media/grass/shortgrass.material
trunk/python-ogre/demos/showcase_01/media/grass/tall_grass.png
trunk/python-ogre/demos/showcase_01/media/terrains/
trunk/python-ogre/demos/showcase_01/media/terrains/Thumbs.db
trunk/python-ogre/demos/showcase_01/media/terrains/densitymap.png
trunk/python-ogre/demos/showcase_01/media/terrains/terrain.cfg
trunk/python-ogre/demos/showcase_01/media/terrains/terrain.png
trunk/python-ogre/demos/showcase_01/media/terrains/terrain_detail.jpg
trunk/python-ogre/demos/showcase_01/media/terrains/terrain_texture_greeb.jpg
trunk/python-ogre/demos/showcase_01/media/trees/
trunk/python-ogre/demos/showcase_01/media/trees/BendyPalm.mesh
trunk/python-ogre/demos/showcase_01/media/trees/KinkyPalm.mesh
trunk/python-ogre/demos/showcase_01/media/trees/LEAFS.JPG
trunk/python-ogre/demos/showcase_01/media/trees/LEAFS.png
trunk/python-ogre/demos/showcase_01/media/trees/Leaves.png
trunk/python-ogre/demos/showcase_01/media/trees/OgreXMLConverter.log
trunk/python-ogre/demos/showcase_01/media/trees/PLANTS09.JPG
trunk/python-ogre/demos/showcase_01/media/trees/Pine1.mesh
trunk/python-ogre/demos/showcase_01/media/trees/PineLeaves.png
trunk/python-ogre/demos/showcase_01/media/trees/StraightPalm.mesh
trunk/python-ogre/demos/showcase_01/media/trees/TREE00.JPG
trunk/python-ogre/demos/showcase_01/media/trees/Thumbs.db
trunk/python-ogre/demos/showcase_01/media/trees/beech.material
trunk/python-ogre/demos/showcase_01/media/trees/beech_tree.mesh
trunk/python-ogre/demos/showcase_01/media/trees/benTree.mesh
trunk/python-ogre/demos/showcase_01/media/trees/birch.material
trunk/python-ogre/demos/showcase_01/media/trees/birch.mesh
trunk/python-ogre/demos/showcase_01/media/trees/blenTree.material
trunk/python-ogre/demos/showcase_01/media/trees/blue_shroom.jpg
trunk/python-ogre/demos/showcase_01/media/trees/blue_shroom.jpg.tga
trunk/python-ogre/demos/showcase_01/media/trees/blue_shroom.mesh
trunk/python-ogre/demos/showcase_01/media/trees/branches.png
trunk/python-ogre/demos/showcase_01/media/trees/meshmagick.log
trunk/python-ogre/demos/showcase_01/media/trees/mrbenTree.blend
trunk/python-ogre/demos/showcase_01/media/trees/mrbenTree.blend1
trunk/python-ogre/demos/showcase_01/media/trees/palms.material
trunk/python-ogre/demos/showcase_01/media/trees/palmtree_palmtexture_2.t.bmp
trunk/python-ogre/demos/showcase_01/media/trees/shrooms.blend
trunk/python-ogre/demos/showcase_01/media/trees/shrooms.blend1
trunk/python-ogre/demos/showcase_01/media/trees/spotted_shroom.material
trunk/python-ogre/demos/showcase_01/media/trees/spotty_shroom.jpg
trunk/python-ogre/demos/showcase_01/media/trees/spotty_shroom.mesh
trunk/python-ogre/demos/showcase_01/media/trees/tipi.blend
trunk/python-ogre/demos/showcase_01/media/trees/tipi.jpg
trunk/python-ogre/demos/showcase_01/media/trees/tipi.material
trunk/python-ogre/demos/showcase_01/media/trees/tipi.mesh
trunk/python-ogre/demos/showcase_01/media/trees/tree.blend
trunk/python-ogre/demos/showcase_01/media/trees/tree.blend1
trunk/python-ogre/demos/showcase_01/media/trees/tree.material
trunk/python-ogre/demos/showcase_01/media/trees/tree.mesh
trunk/python-ogre/demos/showcase_01/media/trees/tree2.mesh
trunk/python-ogre/demos/showcase_01/media/trees/tree_01 - Default.mesh
trunk/python-ogre/demos/showcase_01/media/trees/tree_bush.png
trunk/python-ogre/demos/showcase_01/media/trees/wood7.jpg
trunk/python-ogre/demos/showcase_01/ogre.cfg
trunk/python-ogre/demos/showcase_01/plugins.cfg
trunk/python-ogre/demos/showcase_01/resources.cfg
trunk/python-ogre/demos/showcase_01/triplanar_terrain.cfg
trunk/python-ogre/plugins/
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2007-10-22 10:13:50 UTC (rev 452)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2007-10-23 00:32:24 UTC (rev 453)
@@ -26,7 +26,7 @@
PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk','sdk')
PATH_FMOD = os.path.join(BASE_DIR, 'fmod')
-PATH_ODE = os.path.join(BASE_DIR, 'ode-0.8')
+PATH_ODE = os.path.join(BASE_DIR, 'ode-0.9')
PATH_OGG = os.path.join(BASE_DIR, 'ogg')
PATH_VORBIS= os.path.join(BASE_DIR, 'vorbis')
PATH_OPENAL= os.path.join(BASE_DIR, 'openal')
Added: trunk/python-ogre/demos/showcase_01/Demo_Forest.py
===================================================================
--- trunk/python-ogre/demos/showcase_01/Demo_Forest.py (rev 0)
+++ trunk/python-ogre/demos/showcase_01/Demo_Forest.py 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,330 @@
+
+
+
+
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+import ogre.renderer.OGRE as ogre
+import ogre.addons.ogreforests as forests
+import SampleFramework as sf
+import math, random
+warnings.simplefilter('default', RuntimeWarning)
+
+class ForestApplication(sf.Application):
+ def _chooseSceneManager(self):
+ # self.sceneManager = self.root.createSceneManager("TerrainSceneManager")
+ self.sceneManager = self.root.createSceneManager(ogre.ST_EXTERIOR_CLOSE)
+ # self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE)
+
+ def getTerrainHeight( self, x, z ):
+ if ( x < 0 or z < 0 or x > 1500 or z > 1500 ): return 0
+ self.updateRay.setOrigin( ogre.Vector3(x, 0.0, z) )
+ self.updateRay.setDirection( ogre.Vector3.UNIT_Y )
+ self.raySceneQuery.setRay( self.updateRay )
+ self.raySceneQuery.execute( self.raySceneQueryListener )
+ return self.raySceneQueryListener.resultDistance
+
+ ##Loads world
+ def _createScene(self):
+ camera = self.camera
+
+ ## Set ambient light
+ self.sceneManager.setAmbientLight((0.5, 0.5, 0.5))
+
+ ## Create a light
+ l = self.sceneManager.createLight("MainLight")
+ l.setPosition(20,80,50)
+ ## Fog
+ ## NB it's VERY important to set this before calling setWorldGeometry
+ ## because the vertex program picked will be different
+ ##ColourValue fadeColour(0.93, 0.86, 0.76)
+ fadeColour = (120.0/255, 173.0/255, 246.0/255)
+ self.sceneManager.setFog( ogre.FOG_LINEAR, fadeColour, .001, 200, 1000)
+ self.renderWindow.getViewport(0).setBackgroundColour(fadeColour)
+
+ terrain_cfg = "./triplanar_terrain.cfg"
+
+ self.sceneManager.setWorldGeometry( terrain_cfg )
+ ## Infinite far plane?
+ if self.root.getRenderSystem().getCapabilities().hasCapability(ogre.RSC_INFINITE_FAR_PLANE):
+ camera.setFarClipDistance(0)
+ ##camera.setFarClipDistance(1000)
+
+ ## Set a nice viewpoint
+ camera.setPosition(750,100,750)
+ camera.lookAt(750, 100, 750+1)
+ ##camera.setPolygonMode(PM_WIREFRAME)
+
+ plane = ogre.Plane()
+ n = plane.normal
+ n.x, n.y, n.z = 0, -1, 0
+ plane.d = 5000
+ self.sceneManager.setSkyPlane(True, plane, 'Examples/CloudySky', 1000, 3)
+
+ #self.sceneManager.setSkyPlane(True, 'Examples/CloudySky', 5, 8)
+
+
+ ##---- PagedGeometry test ----
+
+ ## TREES
+ ##Initialize the PagedGeometry engine
+ self.trees = forests.PagedGeometry()
+ self.trees.setCamera( camera )
+ self.trees.setPageSize( 100 )
+ self.trees.setBounds( ogre.FloatRect(0, 0, 1500, 1500) )
+
+ ##Set up LODs
+ ##self.trees.addDetailLevelEntityPage(50, 50)
+ self.trees.addDetailLevelBatchPage(50, 50)
+ self.trees.addDetailLevelImpostorPage(900, 50)
+
+ ##Set up a TreeLoader for easy use
+ self.treeLoader = forests.TreeLoader2D( self.trees, ogre.FloatRect(0, 0, 1500, 1500) )
+ self.trees.setPageLoader(self.treeLoader)
+ self.treeLoader.setHeightFunction(self, "getTerrainHeight")
+
+ ##And add 20,000 trees to the scene through the "easy-to-use" TreeLoader class
+ palm1 = self.sceneManager.createEntity("MyTree", "KinkyPalm.mesh")
+ palm2 = self.sceneManager.createEntity("pineTree", "StraightPalm.mesh")
+ palm3 = self.sceneManager.createEntity("palmBendy", "BendyPalm.mesh")
+ bush1 = self.sceneManager.createEntity("bush1", "BigDarkBush.mesh")
+ birch = self.sceneManager.createEntity("birch", "birch.mesh")
+ benTree = self.sceneManager.createEntity("benTree", "benTree.mesh")
+ spot_shroom = self.sceneManager.createEntity("redShroom", "spotty_shroom.mesh")
+ blue_shroom = self.sceneManager.createEntity("blueShroom", "blue_shroom.mesh")
+ beech = self.sceneManager.createEntity("beech", "beech_tree.mesh")
+
+ self.treeModels = [ bush1, benTree, spot_shroom, blue_shroom, beech]
+ # fix the damn rotations
+## rotNode = self.sceneManager.getRootSceneNode().createChildSceneNode( "rotNode" )
+## rotNode.attachObject( self.palm1 )
+## rotNode.attachObject( self.palm2 )
+## rotNode.attachObject( self.palm3 )
+## rotNode.attachObject( self.bush1 )
+## rotNode.pitch(ogre.Degree(-90).valueRadians())
+
+
+
+ x=0
+ z=0
+ for i in range (10000):
+ yaw = random.randrange(0, 360)
+
+ if (random.randrange(0, 1000) <= 800):
+ x += random.randrange(-10.0, 10.0)
+ z += random.randrange(-10.0, 10.0)
+ if (x < 0): x = 0
+ elif (x > 1500): x = 1500
+ if (z < 0): z = 0
+ elif (z > 1500): z = 1500
+ else:
+ x = random.randrange(0, 1500)
+ z = random.randrange(0, 1500)
+
+ scale = random.randrange(9, 20) / 10
+
+ t_type = random.randrange(0, len(self.treeModels))
+ self.treeLoader.addTree(self.treeModels[t_type], ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+
+## if t_type == 0:
+## self.treeLoader.addTree(self.palm1, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+## elif t_type == 1:
+## self.treeLoader.addTree(self.palm2, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+## elif t_type == 2:
+## self.treeLoader.addTree(self.palm3, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+## elif t_type == 3:
+## self.treeLoader.addTree(self.bush1, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+ ##Grass
+
+ ##Initialize the PagedGeometry engine
+ self.grass = forests.PagedGeometry(camera, 30)
+ ##trees = new PagedGeometry(camera, 50, ogre.FloatRect(0, 0, 1500, 1500))
+
+ ##Set up LODs
+ self.grass.addDetailLevelGrassPage(100.0,0.0)
+
+ ##Set up a TreeLoader for easy use
+ self.grassLoader = forests.GrassLoader(self.grass)
+ self.grass.setPageLoader(self.grassLoader)
+ self.grassLoader.setHeightFunction(self, "getTerrainHeight")
+
+ ## iterate grass materials
+ for nam in ["grass", "dry_grass", "tall_grass"]:
+ grassLayer = self.grassLoader.addLayer(nam)
+
+ grassLayer.setAnimationEnabled(True)
+ grassLayer.setSwaySpeed(1.5)
+ grassLayer.setSwayLength(0.08)
+ grassLayer.setSwayDistribution(10.0)
+
+ grassLayer.setDensity(0.6)
+
+ grassLayer.setMapBounds(ogre.FloatRect(0, 0, 1500, 1500))
+
+ grassLayer.setColorMap("terrain_texture_greeb.jpg")
+ grassLayer.setColorMapFilter(forests.MAPFILTER_BILINEAR)
+
+ grassLayer.setDensityMap("densitymap.png")
+ grassLayer.setDensityMapFilter(forests.MAPFILTER_NONE)
+
+ ##grassLayer.setMinimumSize(0.5,0.5)
+ ##grassLayer.setMaximumSize(1.0, 1.0)
+
+ grassLayer.setMinimumSize(4.0,2.0)
+ grassLayer.setMaximumSize(4.0,2.0)
+
+ grassLayer.setFadeTechnique(forests.FADETECH_GROW)
+
+ self.robots = []
+
+ for i in range(5):
+ robo = Robot(self)
+ robo.spawn(ogre.Vector3(700 + (i * 10), 100, 750), i)
+ self.robots.append(robo)
+
+
+
+ #rNode.translate(ogre.Vector3(750,70,760))
+ #rNode.setScale(ogre.Vector3(0.5,0.5,0.5))
+
+ self.updateRay = ogre.Ray();
+
+ ##RaySceneQuery for terrain height check
+ self.updateRay.setOrigin(camera.getPosition())
+ self.updateRay.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+ self.raySceneQuery = self.sceneManager.createRayQuery(self.updateRay)
+ self.raySceneQuery.setQueryTypeMask(ogre.SceneManager.WORLD_GEOMETRY_TYPE_MASK )
+ self.raySceneQuery.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
+ self.raySceneQueryListener = myRaySceneQueryListener()
+
+ tipi_ent = self.sceneManager.createEntity("tipi", "tipi.mesh")
+ tipi_node = self.sceneManager.getRootSceneNode().createChildSceneNode()
+ tipi_node.attachObject(tipi_ent)
+ tipi_node.setPosition(ogre.Vector3(700, 100, 750))
+ pos = tipi_node.getPosition()
+ tipi_node.setPosition(pos.x, self.getTerrainHeight(700,750) + 0, pos.z)
+
+ def _createFrameListener(self):
+ self.frameListener = GrassFrameListener(self)
+ self.root.addFrameListener(self.frameListener)
+
+ self.roboListener = robotsListener(self)
+ self.root.addFrameListener(self.roboListener)
+
+
+class Robot:
+ def __init__(self, app):
+ self.app = app
+ self.speed = 5.0
+ self.decisionTime = 5.0
+ self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
+ self.mustRotate = True
+
+ def spawn(self, position, numActors):
+ self.timer = 0.0
+ self.ent = self.app.sceneManager.createEntity("robot_" + str(numActors), "robot.mesh")
+ self.posNode = self.app.sceneManager.getRootSceneNode().createChildSceneNode()
+ self.rotNode = self.posNode.createChildSceneNode()
+ self.posNode.setScale(ogre.Vector3(0.1, 0.1, 0.1))
+ self.rotNode.attachObject(self.ent)
+ self.posNode.setPosition(position)
+ self.rotNode.yaw(ogre.Degree(90))
+ print self.posNode.position
+ self.animation = self.ent.getAnimationState('Walk')
+ self.animation.Enabled = True
+
+
+
+ def addTime(self, time):
+ self.animation.addTime(time)
+ #print self.Node.position
+ self.timer += time
+ if self.timer >= self.decisionTime:
+ self.timer = 0
+ self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
+ self.direction.normalise()
+ self.mustRotate = True
+ self.posNode.setDirection(self.direction.x, 0, self.direction.y, self.posNode.TS_WORLD)
+ print self.posNode.position
+ if self.mustRotate:
+ pass
+
+ pos = self.posNode.position
+ off = self.direction * (self.speed * time)
+ self.posNode.setPosition(pos.x + off.x, pos.y, pos.z + off.y)
+
+
+
+class robotsListener(sf.FrameListener):
+ def __init__(self, app):
+ sf.FrameListener.__init__(self, app.renderWindow, app.camera)
+ self.app = app
+ self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
+ ogre.Vector3.NEGATIVE_UNIT_Y))
+ self.Ray = ogre.Ray()
+
+
+ def frameStarted(self, frameEvent):
+ for r in self.app.robots:
+ r.addTime(frameEvent.timeSinceLastFrame)
+ self.Ray.setOrigin(r.posNode.position)
+ self.Ray.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+ self.raySceneQuery.Ray = self.Ray
+ for queryResult in self.raySceneQuery.execute():
+ if queryResult.worldFragment is not None:
+ pos = r.posNode.position
+ r.posNode.setPosition(pos.x, pos.y - queryResult.distance + 0.6, pos.z)
+ break
+ return sf.FrameListener.frameStarted(self, frameEvent)
+
+class GrassFrameListener(sf.FrameListener):
+ def __init__(self, app):
+ sf.FrameListener.__init__(self, app.renderWindow, app.camera)
+ self.app = app
+ self.timeSince = 0.0
+ self.updateToggle = True
+ # use this to tweak the persons position
+ self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
+ ogre.Vector3.NEGATIVE_UNIT_Y))
+
+
+ def frameStarted(self, frameEvent):
+ if self.updateToggle:
+ self.app.trees.update()
+ else:
+ self.app.grass.update()
+ self.updateToggle = not self.updateToggle
+ self.app.grassLoader.updateAnimation()
+ self.timeSince = frameEvent.timeSinceLastFrame
+ updateRay = ogre.Ray()
+ updateRay.setOrigin (self.camera.getPosition() + ogre.Vector3(0.0, 10.0, 0.0))
+ updateRay.setDirection (ogre.Vector3.NEGATIVE_UNIT_Y)
+ self.raySceneQuery.Ray = updateRay
+ for queryResult in self.raySceneQuery.execute():
+ if queryResult.worldFragment is not None:
+ pos = self.camera.getPosition()
+ self.camera.setPosition (pos.x, pos.y - queryResult.distance + 18.0, pos.z)
+ break
+ return sf.FrameListener.frameStarted(self, frameEvent)
+
+ def _moveCamera(self):
+ self.camera.yaw(self.rotationX)
+ self.camera.pitch(self.rotationY)
+ try:
+ self.camera.translate(self.translateVector * 0.1 * self.timeSince) # for using OgreRefApp
+ except AttributeError:
+ self.camera.moveRelative(self.translateVector * 0.1 * self.timeSince)
+
+
+class myRaySceneQueryListener ( ogre.RaySceneQueryListener ):
+ def queryResult(self, fragment, distance):
+ self.resultDistance = distance
+ return False
+
+
+if __name__ == '__main__':
+ try:
+ application = ForestApplication()
+ application.go()
+ except ogre.OgreException, e:
+ print e
Added: trunk/python-ogre/demos/showcase_01/Demo_Forest.py.bak
===================================================================
--- trunk/python-ogre/demos/showcase_01/Demo_Forest.py.bak (rev 0)
+++ trunk/python-ogre/demos/showcase_01/Demo_Forest.py.bak 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,326 @@
+
+
+
+
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+import ogre.renderer.OGRE as ogre
+import ogre.addons.ogreforests as forests
+import SampleFramework as sf
+import math, random
+warnings.simplefilter('default', RuntimeWarning)
+
+class ForestApplication(sf.Application):
+ def _chooseSceneManager(self):
+ # self.sceneManager = self.root.createSceneManager("TerrainSceneManager")
+ self.sceneManager = self.root.createSceneManager(ogre.ST_EXTERIOR_CLOSE)
+ # self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE)
+
+ def getTerrainHeight( self, x, z ):
+ if ( x < 0 or z < 0 or x > 1500 or z > 1500 ): return 0
+ self.updateRay.setOrigin( ogre.Vector3(x, 0.0, z) )
+ self.updateRay.setDirection( ogre.Vector3.UNIT_Y )
+ self.raySceneQuery.setRay( self.updateRay )
+ self.raySceneQuery.execute( self.raySceneQueryListener )
+ return self.raySceneQueryListener.resultDistance
+
+ ##Loads world
+ def _createScene(self):
+ camera = self.camera
+
+ ## Set ambient light
+ self.sceneManager.setAmbientLight((0.5, 0.5, 0.5))
+
+ ## Create a light
+ l = self.sceneManager.createLight("MainLight")
+ l.setPosition(20,80,50)
+ ## Fog
+ ## NB it's VERY important to set this before calling setWorldGeometry
+ ## because the vertex program picked will be different
+ ##ColourValue fadeColour(0.93, 0.86, 0.76)
+ fadeColour = (120.0/255, 173.0/255, 246.0/255)
+ self.sceneManager.setFog( ogre.FOG_LINEAR, fadeColour, .001, 200, 1000)
+ self.renderWindow.getViewport(0).setBackgroundColour(fadeColour)
+
+ terrain_cfg = "./triplanar_terrain.cfg"
+
+ self.sceneManager.setWorldGeometry( terrain_cfg )
+ ## Infinite far plane?
+ if self.root.getRenderSystem().getCapabilities().hasCapability(ogre.RSC_INFINITE_FAR_PLANE):
+ camera.setFarClipDistance(0)
+ ##camera.setFarClipDistance(1000)
+
+ ## Set a nice viewpoint
+ camera.setPosition(750,100,750)
+ camera.lookAt(750, 100, 750+1)
+ ##camera.setPolygonMode(PM_WIREFRAME)
+
+ plane = ogre.Plane()
+ n = plane.normal
+ n.x, n.y, n.z = 0, -1, 0
+ plane.d = 5000
+ self.sceneManager.setSkyPlane(True, plane, 'Examples/CloudySky', 1000, 3)
+
+ #self.sceneManager.setSkyPlane(True, 'Examples/CloudySky', 5, 8)
+
+
+ ##---- PagedGeometry test ----
+
+ ## TREES
+ ##Initialize the PagedGeometry engine
+ self.trees = forests.PagedGeometry()
+ self.trees.setCamera( camera )
+ self.trees.setPageSize( 100 )
+ self.trees.setBounds( ogre.FloatRect(0, 0, 1500, 1500) )
+
+ ##Set up LODs
+ ##self.trees.addDetailLevelEntityPage(50, 50)
+ self.trees.addDetailLevelBatchPage(50, 50)
+ self.trees.addDetailLevelImpostorPage(900, 50)
+
+ ##Set up a TreeLoader for easy use
+ self.treeLoader = forests.TreeLoader2D( self.trees, ogre.FloatRect(0, 0, 1500, 1500) )
+ self.trees.setPageLoader(self.treeLoader)
+ self.treeLoader.setHeightFunction(self, "getTerrainHeight")
+
+ ##And add 20,000 trees to the scene through the "easy-to-use" TreeLoader class
+ palm1 = self.sceneManager.createEntity("MyTree", "KinkyPalm.mesh")
+ palm2 = self.sceneManager.createEntity("pineTree", "StraightPalm.mesh")
+ palm3 = self.sceneManager.createEntity("palmBendy", "BendyPalm.mesh")
+ bush1 = self.sceneManager.createEntity("bush1", "BigDarkBush.mesh")
+ birch = self.sceneManager.createEntity("birch", "birch.mesh")
+ benTree = self.sceneManager.createEntity("benTree", "benTree.mesh")
+ spot_shroom = self.sceneManager.createEntity("redShroom", "spotty_shroom.mesh")
+ blue_shroom = self.sceneManager.createEntity("blueShroom", "blue_shroom.mesh")
+
+ self.treeModels = [ bush1, benTree, spot_shroom, blue_shroom]
+ # fix the damn rotations
+## rotNode = self.sceneManager.getRootSceneNode().createChildSceneNode( "rotNode" )
+## rotNode.attachObject( self.palm1 )
+## rotNode.attachObject( self.palm2 )
+## rotNode.attachObject( self.palm3 )
+## rotNode.attachObject( self.bush1 )
+## rotNode.pitch(ogre.Degree(-90).valueRadians())
+
+
+
+ x=0
+ z=0
+ for i in range (10000):
+ yaw = random.randrange(0, 360)
+
+ if (random.randrange(0, 1000) <= 800):
+ x += random.randrange(-10.0, 10.0)
+ z += random.randrange(-10.0, 10.0)
+ if (x < 0): x = 0
+ elif (x > 1500): x = 1500
+ if (z < 0): z = 0
+ elif (z > 1500): z = 1500
+ else:
+ x = random.randrange(0, 1500)
+ z = random.randrange(0, 1500)
+
+ scale = random.randrange(9, 20) / 10
+
+ t_type = random.randrange(0, len(self.treeModels))
+ self.treeLoader.addTree(self.treeModels[t_type], ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+
+## if t_type == 0:
+## self.treeLoader.addTree(self.palm1, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+## elif t_type == 1:
+## self.treeLoader.addTree(self.palm2, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+## elif t_type == 2:
+## self.treeLoader.addTree(self.palm3, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+## elif t_type == 3:
+## self.treeLoader.addTree(self.bush1, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+ ##Grass
+
+ ##Initialize the PagedGeometry engine
+ self.grass = forests.PagedGeometry(camera, 30)
+ ##trees = new PagedGeometry(camera, 50, ogre.FloatRect(0, 0, 1500, 1500))
+
+ ##Set up LODs
+ self.grass.addDetailLevelGrassPage(100.0,0.0)
+
+ ##Set up a TreeLoader for easy use
+ self.grassLoader = forests.GrassLoader(self.grass)
+ self.grass.setPageLoader(self.grassLoader)
+ self.grassLoader.setHeightFunction(self, "getTerrainHeight")
+
+ ## iterate grass materials
+ for nam in ["grass", "dry_grass"]:
+ grassLayer = self.grassLoader.addLayer(nam)
+
+ grassLayer.setAnimationEnabled(True)
+ grassLayer.setSwaySpeed(1.5)
+ grassLayer.setSwayLength(0.08)
+ grassLayer.setSwayDistribution(10.0)
+
+ grassLayer.setDensity(0.6)
+
+ grassLayer.setMapBounds(ogre.FloatRect(0, 0, 1500, 1500))
+
+ grassLayer.setColorMap("terrain_texture_greeb.jpg")
+ grassLayer.setColorMapFilter(forests.MAPFILTER_BILINEAR)
+
+ grassLayer.setDensityMap("densitymap.png")
+ grassLayer.setDensityMapFilter(forests.MAPFILTER_NONE)
+
+ ##grassLayer.setMinimumSize(0.5,0.5)
+ ##grassLayer.setMaximumSize(1.0, 1.0)
+
+ grassLayer.setMinimumSize(4.0,2.0)
+ grassLayer.setMaximumSize(4.0,2.0)
+
+ grassLayer.setFadeTechnique(forests.FADETECH_GROW)
+
+ self.robots = []
+
+ for i in range(5):
+ robo = Robot(self)
+ robo.spawn(ogre.Vector3(700 + (i * 10), 100, 750), i)
+ self.robots.append(robo)
+
+ tipi_ent = self.sceneManager.createEntity("tipi", "tipi.mesh")
+ tipi_node = self.sceneManager.getRootSceneNode().createChildSceneNode()
+ tipi_node.attachObject(tipi_ent)
+ tipi_node.setPosition(ogre.Vector3(700, 100, 750))
+ tipi_node.position.y = self.getTerrainHeight(700,750)
+
+ #rNode.translate(ogre.Vector3(750,70,760))
+ #rNode.setScale(ogre.Vector3(0.5,0.5,0.5))
+
+ self.updateRay = ogre.Ray();
+
+ ##RaySceneQuery for terrain height check
+ self.updateRay.setOrigin(camera.getPosition())
+ self.updateRay.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+ self.raySceneQuery = self.sceneManager.createRayQuery(self.updateRay)
+ self.raySceneQuery.setQueryTypeMask(ogre.SceneManager.WORLD_GEOMETRY_TYPE_MASK )
+ self.raySceneQuery.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
+ self.raySceneQueryListener = myRaySceneQueryListener()
+
+ def _createFrameListener(self):
+ self.frameListener = GrassFrameListener(self)
+ self.root.addFrameListener(self.frameListener)
+
+ self.roboListener = robotsListener(self)
+ self.root.addFrameListener(self.roboListener)
+
+
+class Robot:
+ def __init__(self, app):
+ self.app = app
+ self.speed = 5.0
+ self.decisionTime = 5.0
+ self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
+ self.mustRotate = True
+
+ def spawn(self, position, numActors):
+ self.timer = 0.0
+ self.ent = self.app.sceneManager.createEntity("robot_" + str(numActors), "robot.mesh")
+ self.posNode = self.app.sceneManager.getRootSceneNode().createChildSceneNode()
+ self.rotNode = self.posNode.createChildSceneNode()
+ self.posNode.setScale(ogre.Vector3(0.1, 0.1, 0.1))
+ self.rotNode.attachObject(self.ent)
+ self.posNode.setPosition(position)
+ self.rotNode.yaw(ogre.Degree(90))
+ print self.posNode.position
+ self.animation = self.ent.getAnimationState('Walk')
+ self.animation.Enabled = True
+
+
+
+ def addTime(self, time):
+ self.animation.addTime(time)
+ #print self.Node.position
+ self.timer += time
+ if self.timer >= self.decisionTime:
+ self.timer = 0
+ self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
+ self.direction.normalise()
+ self.mustRotate = True
+ self.posNode.setDirection(self.direction.x, 0, self.direction.y, self.posNode.TS_WORLD)
+ print self.posNode.position
+ if self.mustRotate:
+ pass
+
+ pos = self.posNode.position
+ off = self.direction * (self.speed * time)
+ self.posNode.setPosition(pos.x + off.x, pos.y, pos.z + off.y)
+
+
+
+class robotsListener(sf.FrameListener):
+ def __init__(self, app):
+ sf.FrameListener.__init__(self, app.renderWindow, app.camera)
+ self.app = app
+ self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
+ ogre.Vector3.NEGATIVE_UNIT_Y))
+ self.Ray = ogre.Ray()
+
+
+ def frameStarted(self, frameEvent):
+ for r in self.app.robots:
+ r.addTime(frameEvent.timeSinceLastFrame)
+ self.Ray.setOrigin(r.posNode.position)
+ self.Ray.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+ self.raySceneQuery.Ray = self.Ray
+ for queryResult in self.raySceneQuery.execute():
+ if queryResult.worldFragment is not None:
+ pos = r.posNode.position
+ r.posNode.setPosition(pos.x, pos.y - queryResult.distance + 0.6, pos.z)
+ break
+ return sf.FrameListener.frameStarted(self, frameEvent)
+
+class GrassFrameListener(sf.FrameListener):
+ def __init__(self, app):
+ sf.FrameListener.__init__(self, app.renderWindow, app.camera)
+ self.app = app
+ self.timeSince = 0.0
+ self.updateToggle = True
+ # use this to tweak the persons position
+ self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
+ ogre.Vector3.NEGATIVE_UNIT_Y))
+
+
+ def frameStarted(self, frameEvent):
+ if self.updateToggle:
+ self.app.trees.update()
+ else:
+ self.app.grass.update()
+ self.updateToggle = not self.updateToggle
+ self.app.grassLoader.updateAnimation()
+ self.timeSince = frameEvent.timeSinceLastFrame
+ updateRay = ogre.Ray()
+ updateRay.setOrigin (self.camera.getPosition() + ogre.Vector3(0.0, 10.0, 0.0))
+ updateRay.setDirection (ogre.Vector3.NEGATIVE_UNIT_Y)
+ self.raySceneQuery.Ray = updateRay
+ for queryResult in self.raySceneQuery.execute():
+ if queryResult.worldFragment is not None:
+ pos = self.camera.getPosition()
+ self.camera.setPosition (pos.x, pos.y - queryResult.distance + 18.0, pos.z)
+ break
+ return sf.FrameListener.frameStarted(self, frameEvent)
+
+ def _moveCamera(self):
+ self.camera.yaw(self.rotationX)
+ self.camera.pitch(self.rotationY)
+ try:
+ self.camera.translate(self.translateVector * 0.1 * self.timeSince) # for using OgreRefApp
+ except AttributeError:
+ self.camera.moveRelative(self.translateVector * 0.1 * self.timeSince)
+
+
+class myRaySceneQueryListener ( ogre.RaySceneQueryListener ):
+ def queryResult(self, fragment, distance):
+ self.resultDistance = distance
+ return False
+
+
+if __name__ == '__main__':
+ try:
+ application = ForestApplication()
+ application.go()
+ except ogre.OgreException, e:
+ print e
Added: trunk/python-ogre/demos/showcase_01/Ogre.log
===================================================================
--- trunk/python-ogre/demos/showcase_01/Ogre.log (rev 0)
+++ trunk/python-ogre/demos/showcase_01/Ogre.log 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,30 @@
+08:23:00: Creating resource group General
+08:23:00: Creating resource group Internal
+08:23:00: Creating resource group Autodetect
+08:23:00: SceneManagerFactory for type 'DefaultSceneManager' registered.
+08:23:00: Registering ResourceManager for type Material
+08:23:00: Registering ResourceManager for type Mesh
+08:23:00: Registering ResourceManager for type Skeleton
+08:23:00: MovableObjectFactory for type 'ParticleSystem' registered.
+08:23:00: OverlayElementFactory for type Panel registered.
+08:23:00: OverlayElementFactory for type BorderPanel registered.
+08:23:00: OverlayElementFactory for type TextArea registered.
+08:23:00: Registering ResourceManager for type Font
+08:23:00: ArchiveFactory for archive type FileSystem registered.
+08:23:00: ArchiveFactory for archive type Zip registered.
+08:23:00: FreeImage version: 3.9.2
+08:23:00: This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details
+08:23:00: Supported formats: bmp,ico,jpg,jif,jpeg,jpe,jng,koa,iff,lbm,mng,pbm,pbm,pcd,pcx,pgm,pgm,png,ppm,ppm,ras,tga,targa,tif,tiff,wap,wbmp,wbm,psd,cut,xbm,xpm,gif,hdr,g3,sgi
+08:23:00: DDS codec registering
+08:23:00: Registering ResourceManager for type HighLevelGpuProgram
+08:23:00: Registering ResourceManager for type Compositor
+08:23:00: MovableObjectFactory for type 'Entity' registered.
+08:23:00: MovableObjectFactory for type 'Light' registered.
+08:23:00: MovableObjectFactory for type 'BillboardSet' registered.
+08:23:00: MovableObjectFactory for type 'ManualObject' registered.
+08:23:00: MovableObjectFactory for type 'BillboardChain' registered.
+08:23:00: MovableObjectFactory for type 'RibbonTrail' registered.
+08:23:00: Loading library ../../plugins\RenderSystem_GL.dll
+08:23:00: OGRE EXCEPTION(7:InternalErrorException): Could not load dynamic library ../../plugins\RenderSystem_GL.dll. System Error: The specified module could not be found.
+
+ in DynLib::load at ..\src\OgreDynLib.cpp (line 80)
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-10-23 00:32:24 UTC (rev 453)
@@ -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 *
+
+
+
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/New Text Document.txt
===================================================================
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg
===================================================================
--- trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg (rev 0)
+++ trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,125 @@
+// Linear fogged morphing terrain
+void OverhangTerrain_vp_linear_cg(
+ float4 position : POSITION,
+// float2 uv1 : TEXCOORD0,
+// float2 uv2 : TEXCOORD1,
+ float delta : BLENDWEIGHT,
+
+ out float4 oPosition : POSITION,
+ out float2 oUv1 : TEXCOORD0,
+ out float2 oUv2 : TEXCOORD1,
+ out float4 colour : COLOR,
+ out float fog : FOG,
+ uniform float4x4 worldViewProj,
+ uniform float4x4 world,
+ uniform float morphFactor
+ )
+{
+ float2 protoUv = mul(world, position).xz;
+ // Main texture coords
+ oUv1 = protoUv / 1500;
+ // Detail texture coords
+ oUv2 = protoUv / 62.5;
+ // Apply morph
+ position.y = position.y + (delta.x * morphFactor);
+ // world / view / projection
+ oPosition = mul(worldViewProj, position);
+ // Full bright (no lighting)
+ colour = float4(1,1,1,1);
+ // Fog
+ // f = end - camz / end - start
+ // when start / end has been set, fog value is distance
+ fog = oPosition.z;
+}
+
+void OverhangTerrain_fp_cg (
+ float2 uv1 : TEXCOORD0,
+ float2 uv2 : TEXCOORD1,
+ float fog : FOG,
+
+ out float4 color : COLOR,
+
+ uniform sampler2D worldTex,
+ uniform sampler2D detailTex
+ )
+ {
+ color = tex2D(worldTex, uv1) * tex2D(detailTex, uv2);
+// color = float4(1, 1,1,1);
+// color = color * (1-fog);
+ }
+
+//
+void OverhangTerrain_vp_linear_triplanar_cg(
+ float4 position : POSITION,
+ float delta : BLENDWEIGHT,
+ float3 normal : NORMAL,
+
+ out float4 oPosition : POSITION,
+ out float2 oUv1 : TEXCOORD0,
+ out float3 oUv2 : TEXCOORD1,
+ out float4 colour : COLOR,
+ out float fog : TEXCOORD3,
+ out float3 oNormal : TEXCOORD2,
+ uniform float4x4 worldViewProj,
+ uniform float4x4 world,
+ uniform float morphFactor
+ )
+{
+ float3 protoUv = mul(world, position);
+ // Main texture coords
+ oUv1 = (protoUv / 1500).xz;
+ // Detail texture coords
+ oUv2 = protoUv / 62.5;
+ // Apply morph
+ position.y = position.y + (delta.x * morphFactor);
+ // world / view / projection
+ oPosition = mul(worldViewProj, position);
+ // Full bright (no lighting)
+ colour = float4(1,1,1,1);
+ // Fog
+ // f = end - camz / end - start
+ // when start / end has been set, fog value is distance
+ fog = oPosition.z / 1500;
+ oNormal = normal;
+}
+
+void OverhangTerrain_fp_triplanar_cg (
+ float2 uv1 : TEXCOORD0,
+ float3 uv2 : TEXCOORD1,
+ float3 normal : TEXCOORD2,
+ float fog : TEXCOORD3,
+
+ out float4 color : COLOR,
+
+ uniform sampler2D worldTex : register(s0),
+ uniform sampler2D detailTex : register(s1),
+ uniform sampler2D rock : register(s2)
+ )
+ {
+ //taken from Cascades DX10 demo.
+ float3 blendWeights = normalize(normal);
+ blendWeights = abs(blendWeights);
+ blendWeights *= float3(7,7,7);
+ blendWeights = pow(blendWeights, float3(3,3,3));
+ blendWeights = max(float3(0.0,0.0,0.0), blendWeights);
+ //so they sum to 1.0:
+ blendWeights /= dot(blendWeights, float3(1.0,1.0,1.0));
+
+ float4 worldColor = tex2D(worldTex, uv1);
+ float4 color1 = tex2D(rock, uv2.xy*3);
+ float4 color2 = tex2D(rock, uv2.yz*3);
+ float4 color3;
+ if(normal.y < 0.0)
+ color3 = tex2D(rock, uv2.xz*3);
+ else
+ color3 = tex2D(detailTex, uv2.xz);
+// float4 color1 = float4(1,0,0,1);
+// float4 color2 = float4(0,1,0,1);
+// float4 color3 = float4(0,0,1,1);
+
+ color = color1*blendWeights.z + color2*blendWeights.x + color3*blendWeights.y;
+// color = color1*normal.z + color2*normal.x + color3*normal.y;
+ color *= worldColor;
+ color = color * (1-fog) + float4(0.93, 0.86, 0.76, 1.0)*fog;
+ }
+
\ No newline at end of file
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.bak
===================================================================
--- trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.bak (rev 0)
+++ trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.bak 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,150 @@
+
+
+void OverhangTerrain_vp_linear_triplanar_cg(
+ float4 position : POSITION,
+ float delta : BLENDWEIGHT,
+ float4 normal : NORMAL,
+
+ out float4 oPosition : POSITION,
+ out float2 oUv1 : TEXCOORD0,
+ out float3 oUv2 : TEXCOORD1,
+ out float4 colour : COLOR,
+ out float fog : TEXCOORD3,
+ out float3 oNormal : TEXCOORD2,
+ out float4 tangent : TEXCOORD4,
+ out float4 binormal : TEXCOORD5,
+
+ uniform float4x4 worldViewProj,
+ uniform float4 lightPos,
+ uniform float4 ambient,
+ uniform float4 lightDiffuseColour,
+ uniform float4x4 world,
+ uniform float morphFactor
+ )
+{
+ float3 protoUv = mul(world, position);
+ // Main texture coords
+ oUv1 = (protoUv / 1500).xz;
+ // Detail texture coords
+ oUv2 = protoUv / 62.5;
+ // Apply morph
+ position.y = position.y + (delta.x * morphFactor);
+ // world / view / projection
+ oPosition = mul(worldViewProj, position);
+ // Full bright (no lighting)
+ //colour = float4(0.5,0.5,0.5,1);
+ // Fog
+ // f = end - camz / end - start
+ // when start / end has been set, fog value is distance
+ fog = oPosition.z / 1500;
+ oNormal = normal;
+
+ float3 lightDir = normalize(
+ lightPos.xyz - (position.xyz * lightPos.w));
+
+ //colour = ambient + saturate(dot(lightDir, normal)) * lightDiffuseColour;
+ colour = float4(0.0, 0.0, 0.0, 1.0);
+
+ //tangent = normalize(worldViewProj[1] - (position * worldViewProj[1].w));
+ //binormal = dot(tangent, normal);
+}
+
+
+
+void OverhangTerrain_fp_triplanar_cg (
+ //float4 pos : POSITION,
+ float2 uv1 : TEXCOORD0,
+ float3 uv2 : TEXCOORD1,
+ float4 normal : TEXCOORD2,
+ float fog : TEXCOORD3,
+ float4 col : COLOR,
+
+
+ // shadows
+ //float4 tangent : TEXCOORD4,
+ //float4 binormal : TEXCOORD5,
+ //
+
+ out float4 color : COLOR,
+
+ uniform float4 lightPos,
+ uniform float4 ambient,
+ uniform float4 lightDiffuseColour,
+
+ uniform sampler2D worldTex : register(s0),
+ uniform sampler2D detailTex : register(s1),
+ uniform sampler2D rock : register(s2),
+ uniform sampler2D normTex: register(s3)
+ )
+ {
+ //taken from Cascades DX10 demo.
+ float3 blendWeights = normalize(normal);
+ blendWeights = abs(blendWeights);
+ blendWeights *= float3(7,7,7);
+ blendWeights = pow(blendWeights, float3(3,3,3));
+ blendWeights = max(float3(0.0,0.0,0.0), blendWeights);
+ //so they sum to 1.0:
+ blendWeights /= dot(blendWeights, float3(1.0,1.0,1.0));
+
+ float4 worldColor = tex2D(worldTex, uv1);
+ float4 color1 = tex2D(rock, uv2.xy*3);
+ float4 color2 = tex2D(rock, uv2.yz*3);
+ float4 color3;
+ if(normal.y < 0.0)
+ color3 = tex2D(rock, uv2.xz*3);
+ else
+ color3 = tex2D(detailTex, uv2.xz);
+ float4 color1 = float4(1,0,0,1);
+ float4 color2 = float4(0,1,0,1);
+ float4 color3 = float4(0,0,1,1);
+
+ //float3 lightDir = normalize(
+ //lightPos.xyz - (uv2.xyz * lightPos.w));
+
+ //float4 lightcolour = ambient + saturate(dot(lightDir, normal)) * lightDiffuseColour;
+
+ //fog = ambient;
+ //color = color1*blendWeights.z + color2*blendWeights.x + color3*blendWeights.y;
+ color = color1*normal.z + color2*normal.x + color3*normal.y;
+ //color *= lightcolour;
+ //color = color * (1-fog) + ambient*fog;
+ //color *= 0.8;
+
+
+ // SHADOWS -------------------------------
+ // compute light ray vector in texture space
+
+ float4 tangent = tex2D(worldTex, uv1.xy);
+ float4 binormal = dot(tangent, normal);
+
+ float depth = 4.0;
+ float4 scale= float4(tangent.w, binormal.w, depth, 1.0);
+ float light_depth_bias=(2*lightPos.z-lightPos.z*lightPos.z);
+ lightPos.xy*=light_depth_bias;
+ lightPos.z=-lightPos.z;
+ lightPos*=scale.z/(scale*lightPos.z);
+
+ //compute light ray entry point in texture space
+ float3 lp=uv2-lightPos.xyz*uv2.z;
+ //ray_intersect_rm_linear(normTex,lp,lightPos);
+
+
+ const int linear_search_steps=6;
+
+ lightPos/=linear_search_steps;
+
+ for( int i=0;i<linear_search_steps-1;i++ ) {
+
+ float4 t=tex2D(worldTex,lp.xy);
+ if (lp.z<t.w)
+ lp+=lightPos;
+ }
+
+
+ if (lp.z<uv2.z-0.05) // if pixel in shadow
+ {
+ color*=0.25;
+ }
+ // ------------------------------------
+
+ }
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.old
===================================================================
--- trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.old (rev 0)
+++ trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.old 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,150 @@
+
+
+void OverhangTerrain_vp_linear_triplanar_cg(
+ float4 position : POSITION,
+ float delta : BLENDWEIGHT,
+ float4 normal : NORMAL,
+
+ out float4 oPosition : POSITION,
+ out float2 oUv1 : TEXCOORD0,
+ out float3 oUv2 : TEXCOORD1,
+ out float4 colour : COLOR,
+ out float fog : TEXCOORD3,
+ out float3 oNormal : TEXCOORD2,
+ out float4 tangent : TEXCOORD4,
+ out float4 binormal : TEXCOORD5,
+
+ uniform float4x4 worldViewProj,
+ uniform float4 lightPos,
+ uniform float4 ambient,
+ uniform float4 lightDiffuseColour,
+ uniform float4x4 world,
+ uniform float morphFactor
+ )
+{
+ float3 protoUv = mul(world, position);
+ // Main texture coords
+ oUv1 = (protoUv / 1500).xz;
+ // Detail texture coords
+ oUv2 = protoUv / 62.5;
+ // Apply morph
+ position.y = position.y + (delta.x * morphFactor);
+ // world / view / projection
+ oPosition = mul(worldViewProj, position);
+ // Full bright (no lighting)
+ //colour = float4(0.5,0.5,0.5,1);
+ // Fog
+ // f = end - camz / end - start
+ // when start / end has been set, fog value is distance
+ fog = oPosition.z / 1500;
+ oNormal = normal;
+
+ float3 lightDir = normalize(
+ lightPos.xyz - (position.xyz * lightPos.w));
+
+ //colour = ambient + saturate(dot(lightDir, normal)) * lightDiffuseColour;
+ colour = float4(0.0, 0.0, 0.0, 1.0);
+
+ //tangent = normalize(worldViewProj[1] - (position * worldViewProj[1].w));
+ //binormal = dot(tangent, normal);
+}
+
+
+
+void OverhangTerrain_fp_triplanar_cg (
+ //float4 pos : POSITION,
+ float2 uv1 : TEXCOORD0,
+ float3 uv2 : TEXCOORD1,
+ float4 normal : TEXCOORD2,
+ float fog : TEXCOORD3,
+ float4 col : COLOR,
+
+
+ // shadows
+ //float4 tangent : TEXCOORD4,
+ //float4 binormal : TEXCOORD5,
+ //
+
+ out float4 color : COLOR,
+
+ uniform float4 lightPos,
+ uniform float4 ambient,
+ uniform float4 lightDiffuseColour,
+
+ uniform sampler2D worldTex : register(s0),
+ uniform sampler2D detailTex : register(s1),
+ uniform sampler2D rock : register(s2),
+ uniform sampler2D normTex: register(s3)
+ )
+ {
+ //taken from Cascades DX10 demo.
+ float3 blendWeights = normalize(normal);
+ blendWeights = abs(blendWeights);
+ blendWeights *= float3(7,7,7);
+ blendWeights = pow(blendWeights, float3(3,3,3));
+ blendWeights = max(float3(0.0,0.0,0.0), blendWeights);
+ //so they sum to 1.0:
+ blendWeights /= dot(blendWeights, float3(1.0,1.0,1.0));
+
+ float4 worldColor = tex2D(worldTex, uv1);
+ //float4 color1 = tex2D(rock, uv2.xy*3);
+ //float4 color2 = tex2D(rock, uv2.yz*3);
+ //float4 color3;
+ //if(normal.y < 0.0)
+ //color3 = tex2D(rock, uv2.xz*3);
+ //else
+ //color3 = tex2D(detailTex, uv2.xz);
+ float4 color1 = float4(1,0,0,1);
+ float4 color2 = float4(0,1,0,1);
+ float4 color3 = float4(0,0,1,1);
+
+ //float3 lightDir = normalize(
+ //lightPos.xyz - (uv2.xyz * lightPos.w));
+
+ //float4 lightcolour = ambient + saturate(dot(lightDir, normal)) * lightDiffuseColour;
+
+ //fog = ambient;
+ //color = color1*blendWeights.z + color2*blendWeights.x + color3*blendWeights.y;
+ color = color1*normal.z + color2*normal.x + color3*normal.y;
+ //color *= lightcolour;
+ //color = color * (1-fog) + ambient*fog;
+ //color *= 0.8;
+
+
+ // SHADOWS -------------------------------
+ // compute light ray vector in texture space
+
+ float4 tangent = tex2D(worldTex, uv1.xy);
+ float4 binormal = dot(tangent, normal);
+
+ float depth = 4.0;
+ float4 scale= float4(tangent.w, binormal.w, depth, 1.0);
+ float light_depth_bias=(2*lightPos.z-lightPos.z*lightPos.z);
+ lightPos.xy*=light_depth_bias;
+ lightPos.z=-lightPos.z;
+ lightPos*=scale.z/(scale*lightPos.z);
+
+ //compute light ray entry point in texture space
+ float3 lp=uv2-lightPos.xyz*uv2.z;
+ //ray_intersect_rm_linear(normTex,lp,lightPos);
+
+
+ const int linear_search_steps=3;
+
+ lightPos/=linear_search_steps;
+
+ for( int i=0;i<linear_search_steps-1;i++ ) {
+
+ float4 t=tex2D(worldTex,lp.xy);
+ if (lp.z<t.w)
+ lp+=lightPos;
+ }
+
+
+ if (lp.z<uv2.z-0.05) // if pixel in shadow
+ {
+ color*=0.25;
+ }
+ // ------------------------------------
+
+ }
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material
===================================================================
--- trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material (rev 0)
+++ trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,101 @@
+vertex_program OverhangTerrain_vp_linear cg
+{
+ source OverhangTerrainSceneManager.cg
+ entry_point OverhangTerrain_vp_linear_triplanar_cg
+// entry_point OverhangTerrain_vp_linear_cg
+ profiles vs_2_0 arbvp1
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named_auto world world_matrix
+ }
+}
+
+fragment_program OverhangTerrain_fp cg
+{
+ source OverhangTerrainSceneManager.cg
+ entry_point OverhangTerrain_fp_triplanar_cg
+// entry_point OverhangTerrain_fp_cg
+ profiles ps_2_0 arbfp1
+}
+
+material OverhangTerrain_simple
+{
+ technique
+ {
+ pass
+ {
+ vertex_program_ref OverhangTerrain_vp_linear
+ {
+ }
+ fragment_program_ref OverhangTerrain_fp
+ {
+ }
+
+ texture_unit worldTex
+ {
+ texture terrain_texture.jpg
+ }
+ texture_unit detailTex
+ {
+// texture terrain_detail.jpg
+// texture terr_dirt-grass.jpg
+ texture grass_1024.jpg
+ }
+ texture_unit rock
+ {
+ texture terr_rock6.jpg
+ }
+ }
+ }
+}
+
+
+material Transparent
+{
+ technique
+ {
+ colour_write_off
+ }
+}
+
+material Transparent1
+{
+ technique
+ {
+ pass
+ {
+ ambient 0.2 0.2 0.3
+ diffuse 0.2 0.2 0.2
+ scene_blend modulate
+ depth_write off
+
+ }
+ }
+}
+
+material Transparent2
+{
+ technique
+ {
+ pass
+ {
+ ambient 0.9 0.9 1.0
+ diffuse 0.9 0.9 1.0
+ scene_blend modulate
+ depth_write off
+
+// texture_unit
+// {
+// texture Water01.jpg
+// scroll_anim 0.25 0
+// }
+
+// texture_unit
+// {
+// texture Water01.jpg
+// wave_xform scroll_y sine 0 0.1 0 0.5
+// }
+ }
+ }
+}
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material.bak
===================================================================
--- trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material.bak (rev 0)
+++ trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material.bak 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,118 @@
+vertex_program OverhangTerrain_vp_linear cg
+{
+ source OverhangTerrainSceneManager.cg
+ entry_point OverhangTerrain_vp_linear_triplanar_cg
+ profiles vs_2_0 arbvp1
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named_auto world world_matrix
+ param_named_auto ambient ambient_light_colour
+ param_named_auto lightDiffuseColour light_diffuse_colour 0
+ param_named_auto lightPos light_position 0
+ }
+}
+
+fragment_program OverhangTerrain_fp cg
+{
+ source OverhangTerrainSceneManager.cg
+ entry_point OverhangTerrain_fp_triplanar_cg
+ profiles ps_2_0 arbfp1
+ default_params
+ {
+ param_named_auto ambient ambient_light_colour
+ param_named_auto lightDiffuseColour light_diffuse_colour 0
+ param_named_auto lightPos light_position 0
+ }
+}
+
+
+
+
+
+material OverhangTerrain_simple
+{
+ technique
+ {
+ pass
+ {
+ vertex_program_ref OverhangTerrain_vp_linear
+ {
+ }
+ fragment_program_ref OverhangTerrain_fp
+ {
+ }
+
+ texture_unit worldTex
+ {
+ texture terrain_texture.jpg
+ }
+ texture_unit detailTex
+ {
+// texture terrain_detail.jpg
+// texture terr_dirt-grass.jpg
+ texture grass_1024.jpg
+ }
+ texture_unit rock
+ {
+ texture terr_rock6.jpg
+ }
+// texture_unit worldNorm
+// {
+// texture normal_terrain.png
+// }
+
+ }
+
+ }
+}
+
+
+material Transparent
+{
+ technique
+ {
+ colour_write_off
+ }
+}
+
+material Transparent1
+{
+ technique
+ {
+ pass
+ {
+ ambient 0.2 0.2 0.3
+ diffuse 0.2 0.2 0.2
+ scene_blend modulate
+ depth_write off
+
+ }
+ }
+}
+
+material Transparent2
+{
+ technique
+ {
+ pass
+ {
+ ambient 0.9 0.9 1.0
+ diffuse 0.9 0.9 1.0
+ scene_blend modulate
+ depth_write off
+
+// texture_unit
+// {
+// texture Water01.jpg
+// scroll_anim 0.25 0
+// }
+
+// texture_unit
+// {
+// texture Water01.jpg
+// wave_xform scroll_y sine 0 0.1 0 0.5
+// }
+ }
+ }
+}
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/TerrainShadows.cg
===================================================================
--- trunk/python-ogre/demos/showcase_01/media/Triplanar/TerrainShadows.cg (rev 0)
+++ trunk/python-ogre/demos/showcase_01/media/Triplanar/TerrainShadows.cg 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,42 @@
+void ray_intersect_rm_linear(
+ in sampler2D reliefmap,
+ inout float3 p,
+ inout float3 v)
+{
+
+ const int linear_search_steps=20;
+
+ const int linear_search_steps=10;
+
+
+ v/=linear_search_steps;
+
+ for( int i=0;i<linear_search_steps-1;i++ )
+ {
+ float4 t=tex2D(reliefmap,p.xy);
+ if (p.z<t.w)
+ p+=v;
+ }
+}
+
+void ray_intersect_rm_binary(
+ in sampler2D reliefmap,
+ inout float3 p,
+ inout float3 v)
+{
+ const int binary_search_steps=6;
+
+ for( int i=0;i<binary_search_steps;i++ )
+ {
+ v*=0.5;
+ float4 t=tex2D(reliefmap,p.xy);
+ if (p.z<t.w)
+ p+=2*v;
+ p-=v;
+ }
+}
+
+
+void TerrainShadow_fp (
+
+ uniform sampler2D rmtex:TEXUNIT0, // rm texture map
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/TerrainShadows.cg.bak
===================================================================
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/Thumbs.db
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/showcase_01/media/Triplanar/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/showcase_01/media/Triplanar/fp0.frag
===================================================================
--- trunk/python-ogre/demos/showcase_01/media/Triplanar/fp0.frag (rev 0)
+++ trunk/python-ogre/demos/showcase_01/media/Triplanar/fp0.frag 2007-10-23 00:32:24 UTC (rev 453)
@@ -0,0 +1,90 @@
+void OverhangTerrain_fp_triplanar_cg (
+ float2 uv1 : TEXCOORD0,
+ float2 uv2 : TEXCOORD1,
+ float3 normal : TEXCOORD2,
+ float fog : TEXCOORD3,
+
+ // shadows
+ //float4 tangent : TEXCOORD1,
+ //float4 binormal : TEXCOORD2,
+ //
+
+ out float4 color : COLOR,
+
+ uniform float4 lightPos,
+ uniform float4 ambient,
+ uniform float4 lightDiffuseColour,
+
+ uniform sampler2D worldTex : register(s0),
+ uniform sampler2D detailTex : register(s1),
+ uniform sampler2D rock : register(s2)
+ //uniform sampler2D normTex: register(s3)
+ )
+ {
+ //taken from Cascades DX10 demo.
+ float3 blendWeights = normalize(normal);
+ blendWeights = abs(blendWeights);
+ blendWeights *= float3(7,7,7);
+ blendWeights = pow(blendWeights, float3(3,3,3));...
[truncated message content] |
|
From: <and...@us...> - 2007-10-22 10:13:46
|
Revision: 452
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=452&view=rev
Author: andy_miller
Date: 2007-10-22 03:13:50 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Force the ogre gui to be Xt
Modified Paths:
--------------
trunk/python-ogre/scripts/04-BuildBaseLibs.sh
Modified: trunk/python-ogre/scripts/04-BuildBaseLibs.sh
===================================================================
--- trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-22 09:55:04 UTC (rev 451)
+++ trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-22 10:13:50 UTC (rev 452)
@@ -62,7 +62,7 @@
pushd ogrenew
aclocal
./bootstrap
-./configure --prefix=$PREFIX
+./configure --prefix=$PREFIX --with-gui=Xt
make
make install
#cd ReferenceApplication
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-22 09:55:02
|
Revision: 451
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=451&view=rev
Author: andy_miller
Date: 2007-10-22 02:55:04 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Fixed Linux build issue where --includedir needs to be forced on CEGUI, OIS etc otherwise the $includedir isn't set in their pkgconfig files
Change to using ode 0.9
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/01-RetrieveSource.sh
trunk/python-ogre/scripts/02-ExtractAndPatch.sh
trunk/python-ogre/scripts/04-BuildBaseLibs.sh
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-10-22 03:57:27 UTC (rev 450)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-10-22 09:55:04 UTC (rev 451)
@@ -30,7 +30,7 @@
PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK','sdk')
-PATH_ODE = os.path.join(BASE_DIR, 'ode-0.8')
+PATH_ODE = os.path.join(BASE_DIR, 'ode-0.9')
PATH_OGG = os.path.join(BASE_DIR, 'libogg-1.1.3')
PATH_VORBIS= os.path.join(BASE_DIR, 'libvorbis-1.2.0')
PATH_OPENAL= os.path.join(BASE_DIR, 'openal-0.0.8')
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-10-22 03:57:27 UTC (rev 450)
+++ trunk/python-ogre/environment.py 2007-10-22 09:55:04 UTC (rev 451)
@@ -300,7 +300,7 @@
############# these are under construction and DO NOT WORK (Yet) #####################
class ode:
- version= "0.8"
+ version= "0.9"
parent = "ogre/physics"
libs=[Config.LIB_Boost, 'ode']
if os.name=="nt":
@@ -309,7 +309,8 @@
, Config.PATH_LIB_ODE
]
include_dirs = [ Config.PATH_Boost
- , Config.PATH_INCLUDE_ODE
+ , Config.PATH_INCLUDE_ODE
+ , os.path.join(Config.PATH_ODE, 'OPCODE')
]
ModuleName = 'ODE'
Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-10-22 03:57:27 UTC (rev 450)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-10-22 09:55:04 UTC (rev 451)
@@ -19,7 +19,7 @@
##$WGET http://prdownloads.sourceforge.net/scons/scons-0.96.96.tar.gz
$WGET http://downloads.sourceforge.net/scons/scons-0.97.0d20070918.tar.gz
$WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2
-$WGET http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip
+$WGET http://prdownloads.sourceforge.net/opende/ode-src-0.9.zip
$WGET http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2
$WGET http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz
$WGET http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh
===================================================================
--- trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-22 03:57:27 UTC (rev 450)
+++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-22 09:55:04 UTC (rev 451)
@@ -19,7 +19,7 @@
echo " -- Unpacking Newton"
tar zxf $DOWNLOADS/newtonLinux-1.53.tar.gz
echo " -- Unpacking ODE"
-unzip -q -o $DOWNLOADS/ode-src-0.8.zip
+unzip -q -o $DOWNLOADS/ode-src-0.9.zip
echo " -- Unpacking OgreAL Support"
tar zxf $DOWNLOADS/libogg-1.1.3.tar.gz
tar zxf $DOWNLOADS/libvorbis-1.2.0.tar.gz
Modified: trunk/python-ogre/scripts/04-BuildBaseLibs.sh
===================================================================
--- trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-22 03:57:27 UTC (rev 450)
+++ trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-22 09:55:04 UTC (rev 451)
@@ -11,7 +11,7 @@
echo " -- building zzlib --"
pushd zziplib-0.13.49
aclocal
-./configure --prefix=$PREFIX --datadir=$PREFIX/share
+./configure --prefix=$PREFIX --datadir=$PREFIX/share --includedir=$PREFIX/include
make
make install
popd
@@ -24,8 +24,9 @@
#patch -q -i ../python-ogre/patch/cegui.patch -p0
#echo "EMPTY" >>./INSTALL
#echo "EMPTY" >>./NEWS
+## Note the --includedir to ensure it writes the correct pkgconfig/CEGUI.pc
automake
-./configure --prefix=$PREFIX --enable-freeimage=yes --disable-samples --without-ogre-renderer
+./configure --prefix=$PREFIX --enable-freeimage=yes --disable-samples --without-ogre-renderer --includedir=$PREFIX/include
make
make install
popd
@@ -36,7 +37,7 @@
echo " -- Builing OIS"
pushd ois-1.0RC1
./bootstrap
-./configure --prefix=$PREFIX
+./configure --prefix=$PREFIX --includedir=$PREFIX/include
make
make install
popd
@@ -46,10 +47,10 @@
# Install and build ODE
#
echo " -- Building ODE"
-pushd ode-0.8
+pushd ode-0.9
chmod +x autogen.sh
./autogen.sh
-./configure --prefix=$PREFIX
+./configure --prefix=$PREFIX --includedir=$PREFIX/include
make
make install
popd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-22 03:57:25
|
Revision: 450
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=450&view=rev
Author: andy_miller
Date: 2007-10-21 20:57:27 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Allow libpath override
Modified Paths:
--------------
trunk/python-ogre/demos/PythonOgreConfig.py
Modified: trunk/python-ogre/demos/PythonOgreConfig.py
===================================================================
--- trunk/python-ogre/demos/PythonOgreConfig.py 2007-10-22 03:36:58 UTC (rev 449)
+++ trunk/python-ogre/demos/PythonOgreConfig.py 2007-10-22 03:57:27 UTC (rev 450)
@@ -2,19 +2,29 @@
# a single config file that is imported 'first' by the Python-Ogre demos
# this is primarly used to manage Linux demos when we have binaries in non standard (safe) locations
-import os,sys
+import os,sys
+
+#########################################################################
+### Override this setting if you are using non standard locations
+
+libpath = ""
+
+#########################################################################
+
+
if os.name == 'nt':
libpath=""
pythonpath = ""
-else:
- localpath = os.path.abspath('.') ## should be one of the demo directories
- libpath = os.path.abspath(os.path.join(localpath,'../../lib'))
- if not os.path.exists ( libpath ): #we must be running from the development environment
- libpath = os.path.abspath(os.path.join(localpath,'../../../root/usr/lib'))
- if not os.path.exists ( libpath ):
- ## should die here
- print "**Problem finding libraries"
- libpath=localpath
+else:
+ if libpath == "" : # we need to find this ourselves
+ localpath = os.path.abspath(os.path.dirname(__file__) ) # assume that this module is in the ./demos directory
+ libpath = os.path.abspath(os.path.join(localpath,'../lib')) # so in the binary release the lib is one path back up
+ if not os.path.exists ( libpath ): #we must be running from the development environment
+ libpath = os.path.abspath(os.path.join(localpath,'../../root/usr/lib'))
+ if not os.path.exists ( libpath ):
+ ## should die here
+ print "**Problem finding libraries"
+ libpath=localpath
## path to the Python-Ogre modules
pythonpath = os.path.abspath(os.path.join(libpath, 'python2.5/site-packages') )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-22 03:36:54
|
Revision: 449
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=449&view=rev
Author: andy_miller
Date: 2007-10-21 20:36:58 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Allow demos to find their library files without environment variables being set
Modified Paths:
--------------
trunk/python-ogre/demos/PythonOgreConfig.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/demos/PythonOgreConfig.py
===================================================================
--- trunk/python-ogre/demos/PythonOgreConfig.py 2007-10-22 03:02:20 UTC (rev 448)
+++ trunk/python-ogre/demos/PythonOgreConfig.py 2007-10-22 03:36:58 UTC (rev 449)
@@ -3,7 +3,29 @@
# this is primarly used to manage Linux demos when we have binaries in non standard (safe) locations
import os,sys
-if os.name != 'nt':
+if os.name == 'nt':
libpath=""
- pythonpath = ""
-
\ No newline at end of file
+ pythonpath = ""
+else:
+ localpath = os.path.abspath('.') ## should be one of the demo directories
+ libpath = os.path.abspath(os.path.join(localpath,'../../lib'))
+ if not os.path.exists ( libpath ): #we must be running from the development environment
+ libpath = os.path.abspath(os.path.join(localpath,'../../../root/usr/lib'))
+ if not os.path.exists ( libpath ):
+ ## should die here
+ print "**Problem finding libraries"
+ libpath=localpath
+
+ ## path to the Python-Ogre modules
+ pythonpath = os.path.abspath(os.path.join(libpath, 'python2.5/site-packages') )
+ ## and insert it into the system path
+ sys.path.insert(0,pythonpath)
+
+ ## now we need to set the library path so the shared libraries can be found
+ try:
+ ldpath = os.environ['LD_LIBRARY_PATH']
+ except:
+ ldpath=""
+ newldpath = libpath + ":" + ldpath
+ os.environ['LD_LIBRARY_PATH'] = newldpath
+
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-10-22 03:02:20 UTC (rev 448)
+++ trunk/python-ogre/environment.py 2007-10-22 03:36:58 UTC (rev 449)
@@ -389,7 +389,7 @@
## note the defined for _QuickGUIExport forces non dll usage
CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_QuickGUIExport="" '
else:
- CCFLAGS = ''
+ CCFLAGS = ' -D_QuickGUIExport="" '
cflags=""
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-22 03:02:16
|
Revision: 448
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=448&view=rev
Author: andy_miller
Date: 2007-10-21 20:02:20 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Missing files from last commit...
Added Paths:
-----------
trunk/python-ogre/demos/PythonOgreConfig.py
trunk/python-ogre/demos/SampleFramework.py
Added: trunk/python-ogre/demos/PythonOgreConfig.py
===================================================================
--- trunk/python-ogre/demos/PythonOgreConfig.py (rev 0)
+++ trunk/python-ogre/demos/PythonOgreConfig.py 2007-10-22 03:02:20 UTC (rev 448)
@@ -0,0 +1,9 @@
+#
+# a single config file that is imported 'first' by the Python-Ogre demos
+# this is primarly used to manage Linux demos when we have binaries in non standard (safe) locations
+
+import os,sys
+if os.name != 'nt':
+ libpath=""
+ pythonpath = ""
+
\ No newline at end of file
Added: trunk/python-ogre/demos/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/SampleFramework.py (rev 0)
+++ trunk/python-ogre/demos/SampleFramework.py 2007-10-22 03:02:20 UTC (rev 448)
@@ -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: <and...@us...> - 2007-10-20 01:23:46
|
Revision: 447
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=447&view=rev
Author: andy_miller
Date: 2007-10-19 18:23:48 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py
trunk/python-ogre/demos/OgreNewt/Demo02_Joints.py
trunk/python-ogre/demos/OgreNewt/Demo03_CollisionCallbacks.py
trunk/python-ogre/demos/OgreNewt/Demo04_RayCasting.py
trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py
trunk/python-ogre/demos/OgreNewt/Demo06_SimpleBuoyancy.py
trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py
trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py
trunk/python-ogre/demos/caelum/Demo_Caelum01.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_DragnDrop.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_Facial.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_Gui.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_NewGui.py
trunk/python-ogre/demos/dshow/Demo_Video.py
trunk/python-ogre/demos/et/Demo_CEGUI_ET.py
trunk/python-ogre/demos/ffmpeg/Demo_Video.py
trunk/python-ogre/demos/navi/Demo_navi.py
trunk/python-ogre/demos/nxogre/Demo_101.py
trunk/python-ogre/demos/nxogre/Demo_102.py
trunk/python-ogre/demos/nxogre/Demo_103.py
trunk/python-ogre/demos/ode/tutorial1.py
trunk/python-ogre/demos/ode/tutorial3.py
trunk/python-ogre/demos/ogre/Demo_BSP.py
trunk/python-ogre/demos/ogre/Demo_Basic.py
trunk/python-ogre/demos/ogre/Demo_Bezier.py
trunk/python-ogre/demos/ogre/Demo_Blank.py
trunk/python-ogre/demos/ogre/Demo_BspCollision.py
trunk/python-ogre/demos/ogre/Demo_CameraTracking.py
trunk/python-ogre/demos/ogre/Demo_CelShading.py
trunk/python-ogre/demos/ogre/Demo_Compositor.py
trunk/python-ogre/demos/ogre/Demo_EnvMap.py
trunk/python-ogre/demos/ogre/Demo_Facial.py
trunk/python-ogre/demos/ogre/Demo_Fresnel.py
trunk/python-ogre/demos/ogre/Demo_Grass.py
trunk/python-ogre/demos/ogre/Demo_Lighting.py
trunk/python-ogre/demos/ogre/Demo_NodeListener.py
trunk/python-ogre/demos/ogre/Demo_OgreCollision02.py
trunk/python-ogre/demos/ogre/Demo_OneFish.py
trunk/python-ogre/demos/ogre/Demo_ParticleFX.py
trunk/python-ogre/demos/ogre/Demo_RenderToTexture.py
trunk/python-ogre/demos/ogre/Demo_RendererCreate.py
trunk/python-ogre/demos/ogre/Demo_Shadows.py
trunk/python-ogre/demos/ogre/Demo_Shadows_Org.py
trunk/python-ogre/demos/ogre/Demo_SkeletalAnimation.py
trunk/python-ogre/demos/ogre/Demo_SkeletonAnimation.py
trunk/python-ogre/demos/ogre/Demo_SkyBox.py
trunk/python-ogre/demos/ogre/Demo_SkyDome.py
trunk/python-ogre/demos/ogre/Demo_SkyPlane.py
trunk/python-ogre/demos/ogre/Demo_Smoke.py
trunk/python-ogre/demos/ogre/Demo_Spinner.py
trunk/python-ogre/demos/ogre/Demo_Terrain.py
trunk/python-ogre/demos/ogre/Demo_TextureFX.py
trunk/python-ogre/demos/ogre/Demo_Transparency.py
trunk/python-ogre/demos/ogre/Demo_Video.py
trunk/python-ogre/demos/ogre/Demo_WX.py
trunk/python-ogre/demos/ogre/Demo_Water.py
trunk/python-ogre/demos/ogre/WaterMesh.py
trunk/python-ogre/demos/ogre/tests/Test_SceneManagerOptions.py
trunk/python-ogre/demos/ogreal/Demo_RenderToTexture.py
trunk/python-ogre/demos/ogrebullet/Demo_OgreCollision01.py
trunk/python-ogre/demos/ogreforests/Demo_Forest.py
trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
trunk/python-ogre/demos/ogreode/Demo_Scenes.py
trunk/python-ogre/demos/opcode/Demo_OgreCollision01.py
trunk/python-ogre/demos/opcode/Demo_OpcodeBoxes.py
trunk/python-ogre/demos/opcode/Demo_OpcodeCollision01.py
trunk/python-ogre/demos/qgui/Demo_QuickGUI01.py
trunk/python-ogre/demos/theora/demo_video.py
Added Paths:
-----------
trunk/python-ogre/demos/nxogre/Demo_OgreCollision01.py
trunk/python-ogre/demos/nxogre/Lesson701.py
trunk/python-ogre/demos/nxogre/motor.py
Removed Paths:
-------------
trunk/python-ogre/demos/OgreNewt/SampleFramework.py
trunk/python-ogre/demos/caelum/SampleFramework.py
trunk/python-ogre/demos/cegui/SampleFramework.py
trunk/python-ogre/demos/dshow/SampleFramework.py
trunk/python-ogre/demos/et/SampleFramework.py
trunk/python-ogre/demos/ffmpeg/SampleFramework.py
trunk/python-ogre/demos/navi/SampleFramework.py
trunk/python-ogre/demos/nxogre/SampleFramework.py
trunk/python-ogre/demos/ogre/SampleFramework.py
trunk/python-ogre/demos/ogre/demo_basic1.py
trunk/python-ogre/demos/ogreal/SampleFramework.py
trunk/python-ogre/demos/ogrebullet/SampleFramework.py
trunk/python-ogre/demos/ogreforests/SampleFramework.py
trunk/python-ogre/demos/ogreode/SampleFramework.py
trunk/python-ogre/demos/opcode/SampleFramework.py
trunk/python-ogre/demos/qgui/SampleFramework.py
trunk/python-ogre/demos/theora/SampleFramework.py
Modified: trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -3,6 +3,9 @@
# Demo01_TheBasics - basic demo that shows a simple OgreNewt world, and how
# to setup basic rigid bodies.
#
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as Ogre
import ogre.physics.OgreNewt as OgreNewt
Modified: trunk/python-ogre/demos/OgreNewt/Demo02_Joints.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo02_Joints.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/OgreNewt/Demo02_Joints.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -3,6 +3,9 @@
# Demo02_Joints - basic demo that shows how to connect rigid bodies via joints.
# */
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as Ogre
import ogre.physics.OgreNewt as OgreNewt
Modified: trunk/python-ogre/demos/OgreNewt/Demo03_CollisionCallbacks.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo03_CollisionCallbacks.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/OgreNewt/Demo03_CollisionCallbacks.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -6,6 +6,10 @@
# material callbacks to create hot spots, or make sound effects, or spawn particles, etc. this example
# uses a conveyor belt as an example. look at the conveyorMatCallback to see how it's implemented.
# */
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
import ogre.renderer.OGRE as Ogre
import ogre.physics.OgreNewt as OgreNewt
import ogre.io.OIS as OIS
Modified: trunk/python-ogre/demos/OgreNewt/Demo04_RayCasting.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo04_RayCasting.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/OgreNewt/Demo04_RayCasting.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -3,6 +3,10 @@
# Demo04_Raycasting - how raycasting in Newton works, implemented with a simple way to drag objects around.
# */
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
import ogre.renderer.OGRE as Ogre
import ogre.physics.OgreNewt as OgreNewt
import ogre.io.OIS as OIS
Modified: trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/OgreNewt/Demo05_SimpleVehicle.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -3,7 +3,11 @@
# Demo02_Joints - basic demo that shows how to connect rigid bodies via joints.
# */
-import exceptions, sys
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import exceptions
import ogre.renderer.OGRE as Ogre
import ogre.physics.OgreNewt as OgreNewt
import ogre.io.OIS as OIS
Modified: trunk/python-ogre/demos/OgreNewt/Demo06_SimpleBuoyancy.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo06_SimpleBuoyancy.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/OgreNewt/Demo06_SimpleBuoyancy.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -3,6 +3,10 @@
# Demo04_Raycasting - how raycasting in Newton works, implemented with a simple way to drag objects around.
# */
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
import ogre.renderer.OGRE as Ogre
import ogre.physics.OgreNewt as OgreNewt
import ogre.io.OIS as OIS
Modified: trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/OgreNewt/Demo07_CustomJoints.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -3,6 +3,9 @@
# Demo07_CustomJoints - basic demo that shows a simple OgreNewt world, and how
# to setup basic rigid bodies.
#
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as Ogre
import ogre.physics.OgreNewt as OgreNewt
Modified: trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/OgreNewt/Demo08_Ragdoll.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -6,6 +6,10 @@
### DEMO NOT YET WORKING......
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
import ogre.renderer.OGRE as Ogre
import ogre.physics.OgreNewt as OgreNewt
import ogre.io.OIS as OIS
Deleted: trunk/python-ogre/demos/OgreNewt/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/SampleFramework.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/OgreNewt/SampleFramework.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,14 +0,0 @@
-# This code is in the Public Domain
-# it has been changed to a "wrapper" to handle both the 1.2.3 version of Ogre (current SDK) and the CVS version
-# which is different in that it uses OIS for all input handling.
-#
-
-import ogre.renderer.OGRE as ogre
-
-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 *
-
-
-
Modified: trunk/python-ogre/demos/caelum/Demo_Caelum01.py
===================================================================
--- trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -3,12 +3,14 @@
## This source file is based on Caelum's CaelumTest1
## -----------------------------------------------------------------------------
## */
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as ogre
import ogre.io.OIS as ois
import ogre.addons.caelum as caelum
import SampleFramework as sf
-import sys
import ctypes
## ------------------------------------------------------------------
Deleted: trunk/python-ogre/demos/caelum/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/caelum/SampleFramework.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/caelum/SampleFramework.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,14 +0,0 @@
-# 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 *
-
-
-
Modified: trunk/python-ogre/demos/cegui/Demo_CEGUI_DragnDrop.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_DragnDrop.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_DragnDrop.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -16,6 +16,9 @@
# Example control creation using UDIM
# Simple Tooltip Text / injectTimePulse
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as ogre
import ogre.gui.CEGUI as cegui
Modified: trunk/python-ogre/demos/cegui/Demo_CEGUI_Facial.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_Facial.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_Facial.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -5,6 +5,9 @@
#
# ===============================================================
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as ogre
import ogre.gui.CEGUI as cegui
Modified: trunk/python-ogre/demos/cegui/Demo_CEGUI_Gui.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_Gui.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_Gui.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -11,6 +11,9 @@
# LGPL like the rest of the engine.
# -----------------------------------------------------------------------------
# */
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as ogre
import ogre.gui.CEGUI as CEGUI
Modified: trunk/python-ogre/demos/cegui/Demo_CEGUI_NewGui.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_NewGui.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_NewGui.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -15,13 +15,16 @@
###
### This is a blank template to make it easier to convert existing samples
###
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as ogre
import ogre.gui.CEGUI as CEGUI
import ogre.io.OIS as OIS
import SampleFramework
-import sys, exceptions, random
+import exceptions, random
from CEGUI_framework import * ## we need the OIS version of the framelistener etc
Deleted: trunk/python-ogre/demos/cegui/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/cegui/SampleFramework.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/cegui/SampleFramework.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,14 +0,0 @@
-# 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 *
-
-
-
Modified: trunk/python-ogre/demos/dshow/Demo_Video.py
===================================================================
--- trunk/python-ogre/demos/dshow/Demo_Video.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/dshow/Demo_Video.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -9,6 +9,10 @@
# You may use this sample code for anything you like, it is not covered by the
# LGPL.
# -----------------------------------------------------------------------------
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
import ogre.renderer.OGRE as ogre
import ogre.addons.ogredshow as OgreDshow
import SampleFramework as sf
Deleted: trunk/python-ogre/demos/dshow/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/dshow/SampleFramework.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/dshow/SampleFramework.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,14 +0,0 @@
-# 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 *
-
-
-
Modified: trunk/python-ogre/demos/et/Demo_CEGUI_ET.py
===================================================================
--- trunk/python-ogre/demos/et/Demo_CEGUI_ET.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/et/Demo_CEGUI_ET.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -90,12 +90,16 @@
## add Menus
## add proper brushes
## add libnoise capabilities
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
import ogre.renderer.OGRE as ogre
import ogre.addons.et as ET
import ogre.io.OIS as OIS
import ogre.gui.CEGUI as CEGUI
import SampleFramework
-import sys, exceptions, random, os
+import exceptions, random, os
from CEGUI_framework import * ## we need the OIS version of the framelistener etc
### You may have to include this, it causes a problem for me with
Deleted: trunk/python-ogre/demos/et/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/et/SampleFramework.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/et/SampleFramework.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,14 +0,0 @@
-# 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 *
-
-
-
Modified: trunk/python-ogre/demos/ffmpeg/Demo_Video.py
===================================================================
--- trunk/python-ogre/demos/ffmpeg/Demo_Video.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/ffmpeg/Demo_Video.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -11,7 +11,11 @@
# -----------------------------------------------------------------------------
## Note the first frame doesn't get displayed ...........
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
import ogre.renderer.OGRE as ogre
import SampleFramework as sf
import ogre.io.OIS as OIS
Deleted: trunk/python-ogre/demos/ffmpeg/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/ffmpeg/SampleFramework.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/ffmpeg/SampleFramework.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,14 +0,0 @@
-# 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 *
-
-
-
Modified: trunk/python-ogre/demos/navi/Demo_navi.py
===================================================================
--- trunk/python-ogre/demos/navi/Demo_navi.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/navi/Demo_navi.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -9,6 +9,10 @@
# You may use this sample code for anything you like, it is not covered by the
# LGPL.
# -----------------------------------------------------------------------------
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
import ogre.renderer.OGRE as ogre
import ogre.gui.navi as navi
import ogre.io.OIS as OIS
Deleted: trunk/python-ogre/demos/navi/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/navi/SampleFramework.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/navi/SampleFramework.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,14 +0,0 @@
-# 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 *
-
-
-
Modified: trunk/python-ogre/demos/nxogre/Demo_101.py
===================================================================
--- trunk/python-ogre/demos/nxogre/Demo_101.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/nxogre/Demo_101.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,6 +1,9 @@
"""
"""
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as ogre
import ogre.physics.PhysX as physx
Modified: trunk/python-ogre/demos/nxogre/Demo_102.py
===================================================================
--- trunk/python-ogre/demos/nxogre/Demo_102.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/nxogre/Demo_102.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,6 +1,9 @@
"""
"""
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as ogre
import ogre.physics.PhysX as physx
Modified: trunk/python-ogre/demos/nxogre/Demo_103.py
===================================================================
--- trunk/python-ogre/demos/nxogre/Demo_103.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/nxogre/Demo_103.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,6 +1,9 @@
"""
"""
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
import ogre.renderer.OGRE as ogre
import ogre.physics.PhysX as physx
Added: trunk/python-ogre/demos/nxogre/Demo_OgreCollision01.py
===================================================================
--- trunk/python-ogre/demos/nxogre/Demo_OgreCollision01.py (rev 0)
+++ trunk/python-ogre/demos/nxogre/Demo_OgreCollision01.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -0,0 +1,231 @@
+##
+## This is a very ugly hack in progress to test collisions (without Physics)
+##
+## It uses the Ogre Intersection Query functions with the intention of extending it
+## to use Opcode to see if there is a performance difference
+##
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.physics.OgreBulletC as bulletC
+import ogre.physics.bullet as bullet
+import SampleFramework as sf
+import random
+from math import *
+
+BULLET = True
+NXOGRE = False
+
+# enum QueryFlags
+# {
+# ANY_QUERY_MASK = 1<<0,
+# RAGDOLL_QUERY_MASK = 1<<1,
+# GEOMETRY_QUERY_MASK = 1<<2,
+# VEHICLE_QUERY_MASK = 1<<3,
+# STATIC_GEOMETRY_QUERY_MASK = 1<<4
+# };
+
+class OgreCollideApplication(sf.Application):
+ #
+ # first lets create a nice scene with a floor plane (that also get's collided
+ #
+ def _createScene(self):
+ sceneManager = self.sceneManager
+ ## Set ambient light
+ sceneManager.setAmbientLight ( (0.6, 0.6, 0.6) )
+
+# sceneManager.setWorldGeometry('terrain.cfg')
+
+ ## Create a skydome
+ sceneManager.setSkyDome (True, "Examples/CloudySky",5,8)
+ light = sceneManager.createLight('MainLight')
+ light.setPosition (20, 80, 50)
+
+ # create the floor
+ plane = ogre.Plane()
+ plane.normal = ogre.Vector3.UNIT_Y
+ plane.d = 200
+ mm = ogre.MeshManager.getSingleton()
+ mm.createPlane('FloorPlane', 'General', plane, 200000.0, 200000.0,
+ 20, 20, True, 1, 50, 50, ogre.Vector3.UNIT_Z)
+ entity = sceneManager.createEntity('floor', 'FloorPlane')
+ entity.setMaterialName('Examples/RustySteel')
+ sceneManager.getRootSceneNode().createChildSceneNode().attachObject(entity)
+
+ # create the camera node & attach camera
+ cameraNode = sceneManager.getRootSceneNode().createChildSceneNode()
+ cameraNode.attachObject(self.camera)
+
+ # how many barrels and pallets do we want
+ self.numBoxes = 300
+ if BULLET:
+ bounds = ogre.AxisAlignedBox ((-1000, -1000, -1000),(1000, 1000, 1000))
+ self.world = bulletC.CollisionsWorld(self.sceneManager, bounds )
+
+ # we need a framelistener to make life easy
+ def _createFrameListener(self):
+ self.frameListener = OgreCollideListener(self.renderWindow, self.camera, self.sceneManager, self.numBoxes, self)
+ self.root.addFrameListener(self.frameListener)
+
+# def _chooseSceneManager(self):
+# self.sceneManager = self.root.createSceneManager("TerrainSceneManager")
+
+
+class OgreCollideQueryListener(ogre.IntersectionSceneQueryListener):
+ """ the listener that gets called for each pair of intersecting objects """
+ def __init__ ( self ):
+ ogre.IntersectionSceneQueryListener.__init__ ( self )
+
+ def queryResult ( self, first, second ):
+ """ the actual function that gets called - for the demo I simply change the material type
+ so we see the collisions - except I don't change the floor material"""
+ if first.name != "floor":
+ first.setMaterialName('Examples/Chrome')
+ if second.name != "floor":
+ second.setMaterialName('Examples/TextureEffect2')
+ return True
+
+class OgreCollideListener(sf.FrameListener):
+ """ the frame listener we are using"""
+
+ def __init__(self, renderWindow, camera, sm, num, app):
+ sf.FrameListener.__init__(self, renderWindow, camera)
+ if not BULLET:
+ # Create an intersection query
+ self.intersectSceneQuery = sm.createIntersectionQuery()
+ # and a listener to receive the results
+ self.querylistener = OgreCollideQueryListener()
+
+ # I then create a range of crates and barrels to test with
+ self.numBoxes = num
+ self.sceneManager = sm
+ self.parent = app
+ self.CreateBoxes ( num )
+ self.frametime = 0
+ self.entitiesInstanced = 0
+ self.paused = False
+ self.doOnestep = False
+
+ def frameStarted(self, frameEvent):
+ """ called each frame (at the start), check if it's time to do collision checking and
+ if so do it, otherwise pass through"""
+ self.frametime += frameEvent.timeSinceLastFrame
+
+ # for performance reasons lets check for collisions about 5 times a second
+ if self.frametime > 0.2:
+ self.ResetBoxes()
+ if BULLET:
+ if not ( self.paused or self.doOnestep):
+ print dir(self.parent.world.getBulletCollisionWorld())
+
+ self.parent.world.getBulletCollisionWorld().performDiscreteCollisionDetection()
+# self.parent.world.getBulletCollisionWorld().performBroadCollisionDetection()
+ print "##"
+
+# objs = self.parent.world.getBulletCollisionWorld().getCollidingObjects()
+# if len(objs) > 0:
+# print "Colliding", objs
+ else:
+ self.intersectSceneQuery.execute( self.querylistener )
+ self.frametime = 0
+ return sf.FrameListener.frameStarted(self, frameEvent)
+
+ def frameEnded ( self, ev ):
+ """and at the end of the frame we update the objects positions in preparation for the
+ next frame"""
+ self.UpdateBoxes(ev.timeSinceLastFrame)
+ return sf.FrameListener.frameEnded(self, ev)
+
+
+
+ def CreateBoxes (self, num):
+ self.numBoxes=num
+ self._bodies=[]
+ names = ['WoodPallet','Barrel']
+ self.mBoxTime = [] #new float[mNbBoxes]
+ self.nodes = []
+ self._shapes = []
+ self._bBodies = []
+ self.mSpeed = .000001
+ self.mAmplitude = .5
+ for i in range ( self.numBoxes ):
+ ## Create the visual representation (the Ogre entity and scene node)
+ name = "object" + str(i)
+ entityname = names[i % len(names)]
+
+ entity = self.sceneManager.createEntity(name, entityname + ".mesh")
+
+ node = self.sceneManager.getRootSceneNode().createChildSceneNode(name)
+ node.attachObject(entity)
+ entity.setNormaliseNormals(True)
+ entity.setCastShadows(True)
+ ## Pick a size
+ scale= 100
+ size = ogre.Vector3((random.random() * 0.5 + 0.1) * scale,
+ (random.random() * 0.5 + 0.1) * scale,
+ (random.random() * 0.5 + 0.1) * scale)
+ position = ogre.Vector3((random.random() -0.5 ) * 800.0,
+ (random.random() - 0.5 ) * 500.0,
+ (random.random() - 0.5 ) * 800.0)
+
+ if BULLET:
+ shape = bulletC.MeshToShapeConverter( entity )
+ if entityname == 'WoodPallet':
+ shape = shape.createBox()
+ else:
+ shape = shape.createCylinder()
+
+ ## this creates an object with a MainRootNode and a child noe containing the shape
+ ## probably could attach the entity to this and us it but going to do it backwards..
+ bBody = bulletC.Object( "BulletObject" + str(i), self.parent.world, True)
+ bBody.setShape ( shape, position, ogre.Quaternion(0,0,0,1))
+
+ # detach from parent (as it's connected to the SceneManger Root node)
+ bBody.getRootNode().getParent().removeChild( bBody.getRootNode() )
+ # and attach it to our node..
+ node.addChild ( bBody.getRootNode() )
+# self._shapes.append ( shape )
+# self._bBodies.append ( bBody )
+ self.parent.world.addObject ( bBody )
+ node.setScale (size.x * 0.1,size.y * 0.1,size.z * 0.1)
+ node.setPosition (position)
+ # we need access to the entity and nodes to reset the material
+ self._bodies.append ( entity)
+ self.nodes.append( node)
+ self.mBoxTime.append ( 10.0*random.random() )
+
+ def ResetBoxes(self):
+ """ set the objects back to their original materials
+ """
+ for i in range ( self.numBoxes):
+ if i % 2 :
+ self._bodies[i].setMaterialName('RustyBarrel')
+ else:
+ self._bodies[i].setMaterialName('WoodPallet')
+
+ def UpdateBoxes(self, timesincelastframe):
+ """ move the objects in an interesting way :) """
+ for i in range ( self.numBoxes):
+ self.mBoxTime[i] += timesincelastframe * 0.001 # self.mSpeed
+ Center = ogre.Vector3()
+ n = self.nodes[i]
+ Center.x = cos(self.mBoxTime[i]*2.17)*self.mAmplitude + sin(self.mBoxTime[i])*self.mAmplitude*0.5
+ Center.y = cos(self.mBoxTime[i]*1.38)*self.mAmplitude + sin(self.mBoxTime[i]*self.mAmplitude)
+ Center.z = sin(self.mBoxTime[i]*0.777)*self.mAmplitude
+ pos = n.Position
+ pos.x += Center.x
+ pos.y += Center.y
+ pos.z += Center.y
+ n.Position = pos
+
+
+if __name__ == '__main__':
+ try:
+ application = OgreCollideApplication()
+ application.go()
+ except ogre.OgreException, e:
+ print e
+
+
Added: trunk/python-ogre/demos/nxogre/Lesson701.py
===================================================================
--- trunk/python-ogre/demos/nxogre/Lesson701.py (rev 0)
+++ trunk/python-ogre/demos/nxogre/Lesson701.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -0,0 +1,333 @@
+## ===============================================================================
+## AGEIA PHYSX SDK TRAINING PROGRAMS
+## LESSON 701: WHEEL SHAPES
+##
+## Written by Bob Schade, 5-1-06
+## ===============================================================================
+
+
+
+import ogre.renderer.OGRE as ogre
+import ogre.physics.PhysX as physx
+import ogre.physics.NxOgre as nxogre
+import CakeFramework as cf
+
+class NxTutorial ( cf.Cake ):
+ def __init__ ( self ):
+ cf.Cake.__init__(self)
+
+ ##////////////////////////////////////////////////////////////////////////////////////////////////
+
+ def start(self ):
+ self.World = nxogre.World("Log: html")
+
+ self.Scene = self.World.createScene("Main", self.SceneMgr,"gravity: yes, floor: yes")
+
+ self.Scene.createBody('sphere.50cm.mesh',nxogre.SphereShape(0.5),
+ ogre.Vector3(3,1.5,0), "mass: 10" )
+
+
+ ##////////////////////////////////////////////////////////////////////////////////////////////////
+ def stop(self):
+ ## Time to go, better tell NxOgre we are leaving.
+ del self.World
+
+ ##////////////////////////////////////////////////////////////////////////////////////////////////
+
+ def onFrame(self, _time) :
+ if not self.mTargetActor:
+ return
+ if self.InputHandler.isKeyDown(cf.Action.Z):
+ self.mTargetActor.addTorque(ogre.Vector3(0,0,150))
+ if self.InputHandler.isKeyDown(cf.Action.NEG_Z):
+ self.mTargetActor.addTorque(ogre.Vector3(0,0,-150))
+ if self.InputHandler.isKeyDown(cf.Action.X):
+ self.mTargetActor.addTorque(ogre.Vector3(150,0,0))
+ if self.InputHandler.isKeyDown(cf.Action.NEG_X):
+ self.mTargetActor.addTorque(ogre.Vector3(-150,0,0))
+ if self.InputHandler.isKeyDown(cf.Action.Y):
+ self.mTargetActor.addTorque(ogre.Vector3(0,150,0))
+ if self.InputHandler.isKeyDown(cf.Action.NEG_Y):
+ self.mTargetActor.addTorque(ogre.Vector3(0,-150,0))
+
+ def getWorld(self):
+ return self.World
+ ##////////////////////////////////////////////////////////////////////////////////////////////////
+
+ def getTutorialSettings( self ):
+ self.TutorialName = "101"
+ self.TutorialDescription = "Cube on a plane"
+
+ ##////////////////////////////////////////////////////////////////////////////////////////////////
+
+if __name__ == '__main__':
+ import exceptions,sys
+ try:
+ application = NxTutorial ()
+ application.pre()
+ application.start()
+ application.WorldInstance = application.getWorld()
+ application.startRendering(application)
+ application.stop()
+ application.post()
+
+ except ogre.OgreException, e:
+ print e
+
+
+
+# # # def PrintControls():
+# # #
+# # # print("\n Flight Controls:\n ----------------\n w = forward, s = back\n a = strafe left, d = strafe right\n q = up, z = down\n")
+# # # print("\n Force Controls:\n ---------------\n i = +z, k = -z\n j = +x, l = -x\n u = +y, m = -y\n")
+# # # print("\n Miscellaneous:\n --------------\n p = Pause\n r = Select Next Actor\n f = Toggle Force Mode\n b = Toggle Debug Wireframe Mode\n x = Toggle Shadows\n t = Move Focus Actor to (0,5,0)\n")
+# # #
+# # #
+# # # def RenderActors(bool shadows)
+# # #
+# # # ## Render all the actors in the scene
+# # # NxU32 nbActors = self.Scene.getNbActors()
+# # # NxActor** actors = self.Scene.getActors()
+# # # while (nbActors--)
+# # #
+# # # NxActor* actor = *actors++
+# # # DrawActor(actor, self.SelectedActor, False)
+# # #
+# # # ## Handle shadows
+# # # if (shadows):
+# # #
+# # # DrawActorShadow(actor, False)
+# # #
+
+
+
+def UpdateWheelShapeUserData(self):
+ ## Look for wheel shapes
+ nbActors = self.Scene.getNbActors()
+ actors = self.Scene.getActors()
+ while nbActors > 0:
+ nbActors -= 1
+ nbShapes = actors[nbActors].getNbShapes()
+ shapes = actors[nbActors].getShapes()
+ while nbShapes > 0:
+ nbShapes -= 1
+
+ shape = shapes[nbShapes]
+ if (shape.getType() == nxogre.NX_SHAPE_WHEEL):
+
+# NxWheelShape* ws = (NxWheelShape*)shape
+# ShapeUserData* sud = (ShapeUserData*)(shape.userData)
+ ws = shape
+ sud = shape.userData
+ if sud:
+ ## Need to save away roll angle in wheel shape user data
+ rollAngle = sud.wheelShapeRollAngle
+## rollAngle += ws.getAxleSpeed() * 1.0/60.0f
+ rollAngle += ws.getAxleSpeed() * gDeltaTime
+ while (rollAngle > nxogre.NxTwoPi) ##normally just 1x
+ rollAngle -= nxogre.NxTwoPi
+ while (rollAngle < -nxogre.NxTwoPi) ##normally just 1x
+ rollAngle += nxogre.NxTwoPi
+
+ ## We have the roll angle for the wheel now
+ sud.wheelShapeRollAngle = rollAngle
+
+
+ pose = ws.getGlobalPose()
+
+ wcd = nxogre.NxWheelContactData ()
+ s = ws.getContact(wcd)
+
+ r = ws.getRadius()
+ st = ws.getSuspensionTravel()
+ steerAngle = ws.getSteerAngle()
+
+## NxWheelShapeDesc state
+## ws.saveToDesc(state)
+
+ dir_ = NxVec3 ()
+# # /*
+# # getWorldSegmentFast(seg)
+# # seg.computeDirection(dir)
+# # dir.normalize()
+# # */
+ p0 = pose.t ##cast from shape origin
+ pose.M.getColumn(1, dir_)
+ dir_ = -dir_ ##cast along -Y.
+ castLength = r + st ##cast ray self long
+
+## renderer.addArrow(p0, dir, castLength, 1.0)
+
+ ##have ground contact?
+ ## This code is from WheelShape.cpp in SDKs/core/common/src
+ ## if (contactPosition != nxogre.NX_MAX_REAL) :
+ if s and (wcd.contactForce > -1000) :
+
+## pose.t = p0 + dir * wcd.contactPoint
+## pose.t -= dir * state.radius //go from contact pos to center pos.
+ pose.t = wcd.contactPoint
+ pose.t -= dir_ * r ##go from contact pos to center pos.
+
+ rot = nxogre.NxMat33()
+ axisRot = nxogre.NxMat33 ()
+ rot.rotY(steerAngle)
+ axisRot.rotY(0)
+
+## NxReal rollAngle = ((ShapeUserData*)(wheel.userData)).rollAngle
+
+ rollRot = nxogre.NxMat33 ()
+ rollRot.rotX(rollAngle)
+
+ pose.M = rot * pose.M * axisRot * rollRot
+
+ sud.wheelShapePose = pose
+
+
+ else:
+
+ pose.t = p0 + dir * st
+ sud.wheelShapePose = pose
+
+
+
+def AddWheelToActor(self, actor, wheelDesc):
+
+ wheelShapeDesc = nxogre.NxWheelShapeDesc ()
+
+ ## Create a shared car wheel material to be used by all wheels
+ if (!self.wsm):
+
+ m = nxogre.NxMaterialDesc ()
+ m.flags |= nxogre.NX_MF_DISABLE_FRICTION
+ self.wsm = self.Scene.createMaterial(m)
+
+ wheelShapeDesc.materialIndex = self.wsm.getMaterialIndex()
+
+ wheelShapeDesc.localPose.t = wheelDesc.position
+ q = nxogre.NxQuat ()
+ q.fromAngleAxis(90, nxogre.NxVec3(0,1,0))
+ wheelShapeDesc.localPose.M.fromQuat(q)
+
+ heightModifier = (wheelDesc.wheelSuspension + wheelDesc.wheelRadius) / wheelDesc.wheelSuspension
+
+ wheelShapeDesc.suspension.spring = wheelDesc.springRestitution*heightModifier
+ wheelShapeDesc.suspension.damper = 0 ##wheelDesc.springDamping*heightModifier;
+ wheelShapeDesc.suspension.targetValue = wheelDesc.springBias*heightModifier
+
+ wheelShapeDesc.radius = wheelDesc.wheelRadius
+ wheelShapeDesc.suspensionTravel = wheelDesc.wheelSuspension
+ wheelShapeDesc.inverseWheelMass = 0.1 ##not given!? TODO
+
+ ## wheelShapeDesc.lateralTireForceFunction = //TODO
+ ## wheelShapeDesc.longitudalTireForceFunction = //TODO
+
+# # NxWheelShape* wheelShape
+# # wheelShape = static_cast<NxWheelShape *>(actor.createShape(wheelShapeDesc))
+
+
+def CreateCab( self, pos):
+ """ create the cab from a box """
+ actor = self.CreateBox(pos + nxogre.NxVec3(0,1,0), nxogre.NxVec3(1,0.5,0.5), 10)
+ actor.raiseBodyFlag(nxogre.NX_BF_FROZEN_ROT_X)
+ actor.raiseBodyFlag(nxogre.NX_BF_FROZEN_ROT_Z)
+ actor.setAngularDamping(0.5)
+
+ wheelDesc =nxogre.NxWheelDesc
+ ##wheelDesc.wheelAxis.set(0,0,1)
+ ##wheelDesc.downAxis.set(0,-1,0)
+ wheelDesc.wheelApproximation = 10
+ wheelDesc.wheelRadius = 0.5
+ wheelDesc.wheelWidth = 0.1
+ wheelDesc.wheelSuspension = 0.2
+ wheelDesc.springRestitution = 7000
+ wheelDesc.springDamping = 800
+ wheelDesc.springBias = 0
+ wheelDesc.maxBrakeForce = 1
+ wheelDesc.frictionToFront = 0.1
+ wheelDesc.frictionToSide = 0.99
+ wheelDesc.position = nxogre.NxVec3(0,-0.4,0)
+ wheelDesc.wheelFlags = nxogre.NX_WF_USE_WHEELSHAPE | nxogre.NX_WF_BUILD_LOWER_HALF | nxogre.NX_WF_ACCELERATED |
+ nxogre.NX_WF_AFFECTED_BY_HANDBRAKE | nxogre.NX_WF_STEERABLE_INPUT | nxogre.NX_WF_BUILD_LOWER_HALF
+ self.AddWheelToActor(actor, wheelDesc)
+ return actor
+
+
+def InitNx()
+
+ ## Create a memory allocator
+ gAllocator = new UserAllocator
+
+ ## Create the physics SDK
+ self.gPhysicsSDK = NxCreatePhysicsSDK(nxogre.NX_PHYSICS_SDK_VERSION, gAllocator)
+ if (!self.gPhysicsSDK) return :
+
+ ## Set the physics parameters
+ self.gPhysicsSDK.setParameter(nxogre.NX_SKIN_WIDTH, 0.05)
+
+ ## Set the debug visualization parameters
+ self.gPhysicsSDK.setParameter(nxogre.NX_VISUALIZATION_SCALE, 1)
+ self.gPhysicsSDK.setParameter(nxogre.NX_VISUALIZE_ACTOR_AXES, 1)
+ self.gPhysicsSDK.setParameter(nxogre.NX_VISUALIZE_COLLISION_SHAPES, 1)
+
+ self.gPhysicsSDK.setParameter(nxogre.NX_VISUALIZE_CONTACT_POINT, 1)
+ self.gPhysicsSDK.setParameter(nxogre.NX_VISUALIZE_CONTACT_NORMAL, 1)
+
+ ## Create the scene
+ sceneDesc = nxogre.NxSceneDesc ()
+ sceneDesc.gravity = gDefaultGravity
+ sceneDesc.simType = nxogre.NX_SIMULATION_HW
+ self.Scene = self.gPhysicsSDK.createScene(sceneDesc)
+ if(!self.Scene){ :
+ sceneDesc.simType = nxogre.NX_SIMULATION_SW
+ self.Scene = self.gPhysicsSDK.createScene(sceneDesc)
+ if(!self.Scene) return :
+
+
+ ## Create the default material
+ NxMaterial* defaultMaterial = self.Scene.getMaterialFromIndex(0)
+ defaultMaterial.setRestitution(0.5)
+ defaultMaterial.setStaticFriction(0.5)
+ defaultMaterial.setDynamicFriction(0.5)
+
+ ## Create the objects in the scene
+ groundPlane = CreateGroundPlane()
+
+ self.box = CreateBox(NxVec3(5,0,0), NxVec3(0.5,1,0.5), 20)
+ self.sphere = CreateSphere(NxVec3(0,0,5), 1, 10)
+ self.capsule = CreateCapsule(NxVec3(-5,0,0), 2, 0.5, 10)
+
+ ## Reset wheel material
+ self.wsm = None
+
+ self.cab = CreateCab(NxVec3(0,0,0))
+
+ self.SelectedActor = cab
+ self.gForceStrength = 35000
+
+ ## Turn on all contact notifications
+ self.Scene.setActorGroupPairFlags(0, 0, NX_NOTIFY_ON_TOUCH)
+
+ AddUserDataToActors(self.Scene)
+
+ ## Initialize HUD
+ InitializeHUD()
+
+ ## Get the current time
+ UpdateTime()
+
+ ## Start the first frame of the simulation
+ if (self.Scene) StartPhysics() :
+
+
+int main(int argc, char** argv)
+
+ PrintControls()
+ InitGlut(argc, argv, "Lesson 701: Wheel Shapes")
+ InitNx()
+ glutMainLoop()
+ ReleaseNx()
+ return 0
+
+
+
+
Deleted: trunk/python-ogre/demos/nxogre/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/nxogre/SampleFramework.py 2007-10-20 00:42:29 UTC (rev 446)
+++ trunk/python-ogre/demos/nxogre/SampleFramework.py 2007-10-20 01:23:48 UTC (rev 447)
@@ -1,793 +0,0 @@
-import ogre.renderer.OGRE as ogre
-import ogre.io.OIS as ois
-import ogre.physics.PhysX as physx
-import ogre.physics.NxOgre as nxogre
-import SampleFramework as sf
-import BetaGui as BetaGUI
-from Enums import *
-
-Key = Enum ('QUIT','SCREENSHOT','DEBUG_MODE','RESET_SCENE', 'PAUSE', 'SLOWER', 'FASTER',
- 'OPTION_1','OPTION_2','OPTION_3','OPTION_4',
- 'PAN_FORWARD','PAN_BACKWARD','PAN_LEFT','PAN_RIGHT','PAN_UP','PAN_DOWN',
- 'X','NEG_X','Y','NEG_Y','Z','NEG_Z',
- 'MOUSE_PRIMARY','MOUSE_ALT','MOUSE_NONE','MOUSE_BOTH' )
-
-MouseMode = Enum ('CAMERA_FOLLOW','CAMERA_FORCE','CAMERA_CONTROL','PICK')
-
-class SimpleTutorial ( ogre.FrameListener, ois.KeyListener, BetaGUI.BetaGUIListener):
-
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
- def __init__(self):
- ogre.FrameListener.__init__(self)
- ois.KeyListener.__init__(self)
- BetaGUI.BetaGUIListener.__init__(self)
-
- self.TutorialName = "???"
- self.TutorialDescription = "???"
- self.ShutdownNow = False
- self.MouseMode = MouseMode.PICK
- self.Construct = False
- self.settings={}
- self.TranslateVector = ogre.Vector3.ZERO
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def __del__(self):
- pass
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def Run(self):
-
- self.getSetup()
-
- self.resetConfig()
- self.getConfig()
-
- self.setupRenderSystem()
-
- cf =ogre.ConfigFile()
- cf.load("media/resources.cfg")
-
- seci = cf.getSectionIterator()
- while seci.hasMoreElements():
- SectionName = seci.peekNextKey()
- Section = seci.getNext()
- for item in Section:
- ogre.ResourceGroupManager.getSingleton().\
- addResourceLocation(item.value, item.key, SectionName)
-
- self.Window = self.Root.initialise(True, "NxOgre: " + self.TutorialName + " - " + self.TutorialDescription)
-
- self.SceneMgr = self.Root.createSceneManager(ogre.ST_GENERIC, "NxOgre")
- print "\nSM: ",self.SceneMgr ,"\n\n"
- self.Camera = self.SceneMgr.createCamera("MainCamera")
- self.Camera.setPosition(ogre.Vector3(0,0,0))
- self.Camera.lookAt(ogre.Vector3(0,0,0))
- self.Camera.setNearClipDistance(0.1)
-
- self.Viewport = self.Window.addViewport(self.Camera)
-
- if not self.Construct:
- self.Viewport.setBackgroundColour(ogre.ColourValue.Black)
- else:
- self.Viewport.setBackgroundColour(ogre.ColourValue.White)
- self.Camera.setAspectRatio(self.Viewport.getActualWidth() / self.Viewport.getActualHeight())
-
- ogre.TextureManager.getSingleton().setDefaultNumMipmaps(1)
- ogre.MaterialManager.getSingleton().setDefaultTextureFiltering(ogre.TFO_ANISOTROPIC)
- ogre.MaterialManager.getSingleton().setDefaultAnisotropy(8)
- ogre.ResourceGroupManager.getSingleton().initialiseAllResourceGroups()
-
- self.Overlay = ogre.OverlayManager.getSingleton().create("GUI")
- self.Overlay.setZOrder(549)
-
- loadingBackMat = "boot.any"
-
- if not ogre.MaterialManager.getSingleton().getByName("boot." + self.TutorialName):
- loadingBackMat = "boot." + self.TutorialName
-
- loadingBack = self.createOverlay("loadBack",ogre.Vector2(0,0),
- ogre.Vector2(self.Viewport.getActualWidth(),
- self.Viewport.getActualHeight()),loadingBackMat)
- loading = self.createOverlay("load",
- ogre.Vector2((self.Window.getWidth() / 2) - 64,(self.Window.getHeight() / 2) - 16),
- ogre.Vector2(128,32),"gui_loading")
-
- self.Overlay.show()
-
- self.Root.renderOneFrame()
-
- loading.hide()
- loadingBack.hide()
-
- self.createInputSys(self.Window)
-
- self.GUI = BetaGUI.GUI("nxogrefont",16)
-
- self.GUI_ExitWindow = self.GUI.createWindow(ogre.Vector4(self.Window.getWidth() - 128- 4,4,128,22),\
- "", BetaGUI.wt.NONE)
- self.GUI_ExitButton = self.GUI_ExitWindow.createButton(ogre.Vector4(128 - 22,0,22,22),
- "bgui.exit", "", BetaGUI.Callback(self))
- self.GUI_PauseButton = self.GUI_ExitWindow.createButton(ogre.Vector4(128 - (22 * 2) - 4,0,22,22),
- "bgui.pause", "", BetaGUI.Callback(self))
- self.GUI_DebugButton = self.GUI_ExitWindow.createButton(ogre.Vector4(128 - (22 * 3) - 4,0,22,22),
- "bgui.debug", "", BetaGUI.Callback(self))
-
- ##self.Pointer = createOverlay("Pointer", ogre.Vector2((self.Window.getWidth() / 2) - 16, (self.Window.getHeight() / 2) - 16), ogre.Vector2(32,32), "nx.arrow")
- ##self.Pointer.hide()
- self.Pointer = self.GUI.createMousePointer(ogre.Vector2(24,24), "bgui.pointer")
- self.GUI.injectMouse((self.Window.getWidth() / 2) - 16, (self.Window.getHeight() / 2) - 16, False)
- self.Pointer.hide()
-
- self.gui_pause = self.createOverlay("paused", ogre.Vector2(16, self.Window.getHeight() - 100 - 32),
- ogre.Vector2(128,128), "gui_pause")
- self.gui_pause.hide()
-
- self.gui_slowfast = self.createOverlay("slowfast", ogre.Vector2(16 + 100, self.Window.getHeight() - 100 - 32),
- ogre.Vector2(128,128), "", "0")
- self.gui_slowfast.hide()
-
- self.Camera.lookAt(0,0,0)
-
- self.Caption1 = self.createOverlay("caption.1",ogre.Vector2(8,128),ogre.Vector2(16,256),""," ")
- self.Caption2 = self.createOverlay("caption.2",ogre.Vector2(8,128 + 16),ogre.Vector2(16,256),""," ")
- self.Caption3 = self.createOverlay("caption.3",ogre.Vector2(8,self.Window.getHeight() - 16 - 8),
- ogre.Vector2(16,256),""," ")
-
-
- self.ApplicationStart()
-
- if not self.Construct :
- self.sg = self.SceneMgr.createStaticGeometry("grid")
- self.CreateEntNode("nx.floor2", ogre.Vector3(0,-0.05,0))
- self.CreateEntNode("nx.body.axis", ogre.Vector3(0,0,0))
- self.sg.build()
-
-
- if not self.Construct :
- self.SceneMgr.setFog(ogre.FOG_LINEAR, ogre.ColourValue.Black, 0.0005, 4000,4500)
- self.SceneMgr.setAmbientLight(ogre.ColourValue(0.6,0.6,0.6))
-
- else :
- self.SceneMgr.setFog(ogre.FOG_LINEAR, ogre.ColourValue.White, 0.0005, 4000,4500)
- self.SceneMgr.setAmbientLight(ogre.ColourValue(0.9,0.9,0.9))
-
-
- self.SceneMgr.setShadowTechnique( ogre.SHADOWTYPE_STENCIL_ADDITIVE )
-
- mLight = self.SceneMgr.createLight("SunLight")
- mLight.setPosition( ogre.Vector3(150, 100, -150) )
-
- if (self.MouseMode == MouseMode.PICK):
- self.Pointer.show()
-
- self.Root.addFrameListener(self)
-
- self.Root.startRendering()
-
- return True
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def setupRenderSystem(self):
- self.Root = ogre.Root("","","ogre.graphics.log")
- self.Root.loadPlugin("RenderSystem_Direct3D9")
- self.Root.loadPlugin("RenderSystem_GL")
- self.Root.loadPlugin("Plugin_ParticleFX")
-
- rs = "Direct3D9 Rendering Subsystem"
-
- pRenderSystemList = self.Root.getAvailableRenderers()
-
- for pRenderSystem in pRenderSystemList:
- if pRenderSystem.getName() == rs:
- self.RenderSystem = pRenderSystem
- break
- pRenderSystem+=1
-
- self.Root.setRenderSystem(self.RenderSystem)
-
- self.RenderSystem.setConfigOption("Full Screen", self.settings["fullscreen"])
- self.RenderSystem.setConfigOption("VSync", self.settings["vsync"])
-
- if rs == "Direct3D9 Rendering Subsystem" :
- self.RenderSystem.setConfigOption("Video Mode",
- self.settings["width"]
- + " x " + self.settings["height"]
- + " @ " + self.settings["depth"] + "-bit colour"
- )
-
- else :
- self.RenderSystem.setConfigOption("Video Mode", self.settings["width"] + " x " + self.settings["height"])
-
- self.RenderSystem.setConfigOption("Colour Depth",self.settings["depth"])
- ##self.RenderSystem.setConfigOption("FSAA", "2")
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def resetConfig(self):
-
- self.settings={}
- self.settings["device"] = "Direct3D9 Rendering Subsystem"
- self.settings["width"] = "800"
- self.settings["height"] = "600"
- self.settings["depth"] = "32"
- self.settings["aa"] = "0"
- self.settings["vsync"] = "No"
- self.settings["fullscreen"] = "No"
-
- self.keys={}
- self.keys[Key.QUIT] = ois.KC_ESCAPE
- self.keys[Key.SCREENSHOT] = ois.KC_F1
- self.keys[Key.DEBUG_MODE] = ois.KC_F2
- self.keys[Key.PAUSE] = ois.KC_F3
- self.keys[Key.SLOWER] = ois.KC_F4
- self.keys[Key.FASTER] = ois.KC_F5
- self.keys[Key.RESET_SCENE] = ois.KC_F12
- self.keys[Key.OPTION_1] = ois.KC_1
- self.keys[Key.OPTION_2] = ois.KC_2
- self.keys[Key.OPTION_3] = ois.KC_3
- self.keys[Key.OPTION_4] = ois.KC_4
- self.keys[Key.PAN_FORWARD] = ois.KC_W
- self.keys[Key.PAN_BACKWARD] = ois.KC_S
- self.keys[Key.PAN_LEFT] = ois.KC_A
- self.keys[Key.PAN_RIGHT] = ois.KC_D
- self.keys[Key.PAN_UP] = ois.KC_Q
- self.keys[Key.PAN_DOWN] = ois.KC_Z
- self.keys[Key.X] = ois.KC_J
- self.keys[Key.NEG_X] = ois.KC_L
- self.keys[Key.Y] = ois.KC_U
- self.keys[Key.NEG_Y] = ois.KC_M
- self.keys[Key.Z] = ois.KC_I
- self.keys[Key.NEG_Z] = ois.KC_K
-
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def getConfig(self):
-
- cf=ogre.ConfigFile()
- cf.load("config.yaml",":",True)
-
- seci = cf.getSectionIterator()
- while (seci.hasMoreElements()):
- secName = seci.peekNextKey()
- csettings = seci.getNext()
- for i in csettings:
- if (i.key == "device") :
- if (i.value == "dx9") :
- self.settings["device"] = "Direct3D9 Rendering Subsystem"
- else :
- self.settings["device"] = "OpenGL Rendering Subsystem" ## Check..
- elif (i.key == "width") :
- self.settings["width"] = i.value # str(i.value) ## AJM may have to parse int???
-
- elif (i.key == "height") :
- self.settings["height"] = i.value #str(i.value)
-
- elif (i.key == "depth") :
- self.settings["depth"] = i.value #str(i.value)
-
- elif (i.key == "aa") :
- self.settings["aa"] = i.value #str(i.value)
-
- elif (i.key == "fullscreen") :
- self.settings["fullscreen"] = i.value
-
- elif (i.key == "vsync") :
- self.settings["aa"] = i.value
-
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def createInputSys(self, _window):
- ogre.LogManager.getSingletonPtr().logMessage("*** Initializing OIS ***")
-
- windowHnd = self.Window.getCustomAttributeInt("WINDOW")
- self.InputManager = \
- ois.createPythonInputSystem([("WINDOW",str(windowHnd))])
-
- self.Keyboard = self.InputManager.createInputObjectKeyboard( ois.OISKeyboard, True )
- self.Mouse = self.InputManager.createInputObjectMouse( ois.OISMouse, True )
- self.Keyboard.setEventCallback(self)
- self.Keyboard.setBuffered(True)
-
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def onButtonPress(self, ref):
-
- if ref == self.GUI_ExitButton:
- self.ShutdownNow = True
-
- if ref == self.GUI_PauseButton and self.timeSince >= 0.5:
- if self.World.isPaused():
- nxogre.self.World.resume()
- self.GUI_PauseButton.mmn = "bgui.pause"
- self.GUI_PauseButton.mma = "bgui.pause.active"
-
- else :
- self.World.pause()
- self.GUI_PauseButton.mmn = "bgui.play"
- self.GUI_PauseButton.mma = "bgui.play.active"
-
- self.timeSince = 0.0
-
-
-
- if ref == self.GUI_DebugButton and self.timeSince >= 0.25 :
- self.World.showDebugOverlay(self.Camera, self.Window)
- self.World.debug( self.World.isDebugRendering() ^ 1)
-
- if (self.World.isDebugRendering()) :
- self.GUI_DebugButton.mmn = "bgui.debugon"
- self.GUI_DebugButton.mma = "bgui.debugon.active"
-
- else :
- self.GUI_DebugButton.mmn = "bgui.debug"
- self.GUI_DebugButton.mma = "bgui.debug.active"
-
- self.timeSince = 0.0
-
- self.GUIbuttonPressed(ref)
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def captureInput(self):
- self.Keyboard.capture()
- self.Mouse.capture()
-
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def isKeyDown(self, k):
- return self.Keyboard.isKeyDown(self.keys[k])
-
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def keyPressed( self, arg ):
- if (arg.text == 8) :
- self.GUI.injectBackspace(self.Pointer.getLeft(), self.Pointer.getTop())
- return True
-
- if (arg.text < 32 or arg.text > 126):
- return True
-
- k = chr(arg.text)
- self.GUI.injectKey(k, self.Pointer.getLeft(), self.Pointer.getTop())
- return True
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def keyReleased( self, arg ):
- ##self.GUI.injectKey(self.Keyboard.getAsString((OIS.KeyCode) arg.text), self.Pointer.getLeft(), self.Pointer.getTop())
- return True
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def getRMouseX(self):
- ms = self.Mouse.getMouseState()
- return ms.X.rel
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def getRMouseY(self):
- ms = self.Mouse.getMouseState()
- return ms.Y.rel
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def getRMouseZ(self):
- ms = self.Mouse.getMouseState()
- return ms.Z.rel
-
- ##//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- def getMouseButton(self):
-
- ms = self.Mouse.getMouseState()
-
- if ms.buttons == 1:
- return Key.MOUSE_PRIMARY
- elif ms.buttons == 2:
- return Key.MOUSE_ALT
- elif ms.buttons == 3:
- return Key.MOUSE_BOTH
- else:
- ...
[truncated message content] |
|
From: <and...@us...> - 2007-10-20 00:42:27
|
Revision: 446
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=446&view=rev
Author: andy_miller
Date: 2007-10-19 17:42:29 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Updates for Caelum to match the 1.1.b patch release
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/demos/caelum/Demo_Caelum01.py
trunk/python-ogre/demos/caelum/media/CaelumShaders.cg
trunk/python-ogre/demos/caelum/media/LayeredClouds.material
trunk/python-ogre/demos/caelum/media/Terrain.material
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/demos/caelum/media/CaelumDemoTerrain.cfg
trunk/python-ogre/demos/caelum/media/GroundFog.material
trunk/python-ogre/demos/caelum/media/GroundFog.program
trunk/python-ogre/demos/caelum/media/Haze.program
trunk/python-ogre/demos/caelum/media/SunGradient.png
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2007-10-19 13:17:02 UTC (rev 445)
+++ trunk/python-ogre/ChangeLog.txt 2007-10-20 00:42:29 UTC (rev 446)
@@ -1,3 +1,16 @@
+October 20 2007: Version 1.1.b SnapShot
+========================================
+* Fixed Caelum demo
+
+October 19 2007: Version 1.1.a SnapShot
+========================================
+* Significant fixes to Bullet and OgreBullet modules
+* Added Caelum - "Sky" module
+* Updated QuickGui
+* Additions to Ogre Wrapper
+ setOptions and getOptions work
+
+
October 05 2007: Version 1.1 Release
====================================
* Built with Ogre 1.4.4+
Modified: trunk/python-ogre/demos/caelum/Demo_Caelum01.py
===================================================================
--- trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2007-10-19 13:17:02 UTC (rev 445)
+++ trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2007-10-20 00:42:29 UTC (rev 446)
@@ -90,15 +90,8 @@
# clamp to terrain
ret = TerrainFrameListener.frameStarted(self, frameEvent)
- t = self.caelumSystem.getSun().getSunPositionModel()
- espm = caelum.castAsEarthSunPositionModel ( t )
-
- if espm :
- espm.setJulianDate (self.caelumSystem.getUniversalClock ().getCurrentRelativeTime ())
-
- self.timeTillNextUpdate-= frameEvent.timeSinceLastFrame
-
## keyboard input
+ self.timeTillNextUpdate -= frameEvent.timeSinceLastFrame
if (self.timeTillNextUpdate<= 0):
if (self.Keyboard.isKeyDown (ois.KC_SPACE)):
self.timeTillNextUpdate = 1
@@ -123,11 +116,18 @@
self.PostFiltering = False
else:
self.PostFiltering = True
- ogre.CompositorManager.getSingleton().setCompositorEnabled (self.window.getViewport (0), "Bloom", self.postFiltering)
-
+ ogre.CompositorManager.getSingleton().setCompositorEnabled (self.window.getViewport (0), "Bloom", self.PostFiltering)
+
+ if self.caelumSystem.getSun():
+ t = self.caelumSystem.getSun().getSunPositionModel()
+ espm = caelum.castAsEarthSunPositionModel ( t )
+ if espm :
+ espm.setJulianDate (self.caelumSystem.getUniversalClock ().getCurrentRelativeTime ())
+
## EXTRA! Update the haze sun light position
mat = ogre.MaterialManager.getSingleton().getByName("CaelumDemoTerrain")
- mat.getTechnique(0).getPass("Haze").getVertexProgramParameters().setNamedConstant("sunDirection", self.caelumSystem.getSun().getSunDirection())
+ if mat:
+ mat.getTechnique(0).getPass("CaelumHaze").getVertexProgramParameters().setNamedConstant("sunDirection", self.caelumSystem.getSun().getSunDirection())
return ret
@@ -150,7 +150,12 @@
self.root.removeFrameListener(self.frameListener)
self.frameListener = None
print "deleted Listeners"
+ t = self.caelumSystem.getSun().setSunPositionModel(None)
+ print "Sun is None", t
+ t = self.caelumSystem.getSun().getSunPositionModel()
+ print "Sun is None", t
+
## ====================================================================
## This the one difference between the python and c++ demo. In c++ the
@@ -207,16 +212,9 @@
camera.setNearClipDistance(0.01)
## Initialise Caelum
- try:
- self.caelumSystem = caelum.CaelumSystem(self.root, self.sceneManager
- ,createSkyDome=skyDome, createClouds=clouds
- )
- except RuntimeError, e:
- print "\nError occured when creating the CaelumSystem - do you have a graphics card that supports vertex programs?\n"
- sys.exit(-1)
- except:
- print "Exception Occured:", sys.exc_info()[0]
- sys.exit(-1)
+ self.caelumSystem = caelum.CaelumSystem(self.root, self.sceneManager )
+# ,createSkyDome=skyDome, createClouds=clouds
+# )
## Setup sun position model.
self.spm = caelum.SimpleSunPositionModel (ogre.Degree (13))
@@ -234,8 +232,8 @@
## Basic fogging setup.
## This is a hack until proper fogging is implemented.
- self.caelumSystem.getSkyColourModel().setFogDensityMultiplier(0.0015)
- self.caelumSystem.setManageFog(True)
+# self.caelumSystem.getSkyColourModel().setFogDensityMultiplier(0.0015)
+# self.caelumSystem.setManageFog(True)
## Setup cloud options
if clouds:
Added: trunk/python-ogre/demos/caelum/media/CaelumDemoTerrain.cfg
===================================================================
--- trunk/python-ogre/demos/caelum/media/CaelumDemoTerrain.cfg (rev 0)
+++ trunk/python-ogre/demos/caelum/media/CaelumDemoTerrain.cfg 2007-10-20 00:42:29 UTC (rev 446)
@@ -0,0 +1,35 @@
+# Heightmap source
+PageSource=Heightmap
+
+# Heightmap-source specific settings
+Heightmap.image=terrain.png
+
+# 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=1500
+PageWorldZ=1500
+
+# Maximum height of the terrain
+MaxHeight=100
+
+# Upper LOD limit
+MaxMipMapLevel=5
+
+# 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
+
+# Use vertex program to morph LODs, if available
+VertexProgramMorph=no
+
+# Caelum demo uses a custom material with fogging support.
+CustomMaterialName=CaelumDemoTerrain
Modified: trunk/python-ogre/demos/caelum/media/CaelumShaders.cg
===================================================================
--- trunk/python-ogre/demos/caelum/media/CaelumShaders.cg 2007-10-19 13:17:02 UTC (rev 445)
+++ trunk/python-ogre/demos/caelum/media/CaelumShaders.cg 2007-10-20 00:42:29 UTC (rev 446)
@@ -7,7 +7,7 @@
sunColour = sunColour * (1 - absorption) * half4 (0.9, 0.5, 0.09, 1);
- return sunColour * scatteredSunlight;
+ return sunColour * scatteredSunlight;
}
half fogExp (half z, half density) {
@@ -99,8 +99,8 @@
void Haze_fp (half haze : TEXCOORD0,
half2 sunlight : TEXCOORD1,
out half4 oCol : COLOR,
- uniform sampler atmRelativeDepth : register(s0),
- uniform sampler gradientsMap : register (s1),
+ uniform sampler1D atmRelativeDepth : register(s0),
+ uniform sampler2D gradientsMap : register (s1),
uniform half4 fogColour)
{
half incidenceAngleCos = sunlight.x;
@@ -133,3 +133,211 @@
oCol = hazeColour;
oCol.a = haze;
}
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+
+
+// Global cloud textures
+sampler cloud_shape1 : register(s0);
+sampler cloud_shape2 : register(s1);
+sampler cloud_detail : register(s2);
+
+// Global cloud parameters.
+uniform float cloudMassInvScale;
+uniform float cloudDetailInvScale;
+
+uniform float2 cloudMassOffset;
+uniform float2 cloudDetailOffset;
+
+uniform float cloudCover;
+uniform float cloudMassBlend;
+uniform float cloudDetailBlend;
+
+uniform float cloudSharpness;
+uniform float cloudThickness;
+uniform float cloudShininess;
+
+// Get cloud layer intensity at a certain point.
+float LayeredClouds_intensity(in float2 pos)
+{
+ // Calculate the base alpha
+ float2 finalMassOffset = cloudMassOffset + pos;
+ float aCloud = lerp(tex2D(cloud_shape1, finalMassOffset * cloudMassInvScale).r,
+ tex2D(cloud_shape2, finalMassOffset * cloudMassInvScale).r,
+ cloudMassBlend);
+ float aDetail = tex2D(cloud_detail, (cloudDetailOffset + pos) * cloudDetailInvScale).r;
+ aCloud = (aCloud + aDetail * cloudDetailBlend) / (1 + cloudDetailBlend);
+ return max(0, aCloud - (1 - cloudCover));
+}
+
+// Entry point for Cloud vertex program.
+void LayeredClouds_vp
+(
+ in float4 position : POSITION,
+ in float2 uv : TEXCOORD0,
+
+ out float4 oPosition : POSITION,
+ out float2 oUv : TEXCOORD0,
+ out float oGlow : TEXCOORD1,
+ out float3 relPosition : TEXCOORD2,
+
+ uniform float4x4 worldViewProj,
+ uniform float3 sunDirection
+) {
+ relPosition = normalize (position);
+ oGlow = dot (relPosition, normalize (-sunDirection));
+ oPosition = mul(worldViewProj, position);
+ oUv = uv;
+}
+
+// Entry point for Cloud fragment program.
+void LayeredClouds_fp
+(
+ in float2 uv : TEXCOORD0,
+ in float glow : TEXCOORD1,
+ in float3 relPosition : TEXCOORD2,
+
+ uniform float cameraHeight,
+ uniform float3 sunDirection,
+ uniform float4 sunColour,
+ uniform float4 fogColour,
+
+ out float4 oCol : COLOR
+) {
+ // Initialize output.
+ oCol.rgba = float4(1, 1, 1, 0);
+
+ // Get cloud intensity.
+ float intensity = LayeredClouds_intensity(uv);
+
+ // Opacity is exponential.
+ float aCloud = saturate(exp(cloudSharpness * intensity) - 1);
+
+ float shine = pow(saturate(glow), 8) / 4;
+ sunColour.rgb *= 1.5;
+ float3 cloudColour = fogColour.rgb * (1 - intensity / 3);
+ float thickness = saturate(0.8 - exp(-cloudThickness * (intensity + 0.2 - shine)));
+
+ oCol.rgb = lerp(sunColour.rgb, cloudColour.rgb, thickness);
+ //oCol.rgb = thickness;
+ //oCol.rgb = sunColour.rgb;
+ //oCol.rgb = cloudColour.rgb;
+
+ // bottom 20th of the sky clouds vanish.
+ // Simple and effective.e
+ aCloud *= saturate (20 * relPosition.y);
+
+ oCol.a = aCloud;
+ oCol.rgb = (oCol.rgb);
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+
+
+// Return fogging through a layer of fog which drops exponentially by height.
+// Foginess at a certain point is exp(-verticalDecay * (h - fogLevel));
+// A fogLevel from the ground fogginess is 1.
+float ExpGroundFog (float invSinView, float h1, float h2,
+ float density, float verticalDecay, float fogLevel)
+{
+ // Integrate fog on a vertical line from h1 to h2.
+ float vFog = (-1 / verticalDecay) *
+ (exp (-verticalDecay * (h2 - fogLevel)) -
+ exp (-verticalDecay * (h1 - fogLevel)));
+ return 1 - exp (-density * invSinView * vFog);
+}
+
+// Just like ExpGroundFog with infinite h2
+float ExpGroundFogInf (float invSinView, float h1,
+ float density, float verticalDecay, float fogLevel)
+{
+ // Integrate fog on a vertical line from h1 to h2.
+ float vFog = exp (-verticalDecay * (h1 - fogLevel)) / verticalDecay;
+ return 1 - exp (-density * invSinView * vFog);
+}
+
+// Entry point for GroundFog vertex program.
+void GroundFog_vp
+(
+ float4 position : POSITION,
+
+ out float4 oPosition : POSITION,
+ out float4 worldPos : TEXCOORD0,
+
+ uniform float4x4 worldViewProj,
+ uniform float4x4 world
+) {
+ oPosition = mul(worldViewProj, position);
+ worldPos = mul(world, position);
+}
+
+// Entry point for GroundFog fragment program.
+void GroundFog_fp
+(
+ float3 worldPos : TEXCOORD0,
+
+ uniform float3 camPos,
+ uniform float4 fogColour,
+ uniform float fogDensity,
+ uniform float fogVerticalDecay,
+ uniform float fogGroundLevel,
+
+ out float4 oCol : COLOR
+) {
+ float h1 = camPos.y;
+ float h2 = worldPos.y;
+ float invSinView = length(camPos - worldPos) / (h2 - h1);
+ float fog = ExpGroundFog(invSinView,
+ h1, h2, fogDensity, fogVerticalDecay, fogGroundLevel);
+
+ oCol.rgb = fogColour.rgb;
+ oCol.a = fog;
+}
+
+// Entry point for GroundFogDome vertex program.
+void GroundFogDome_vp
+(
+ in float4 position : POSITION,
+ out float4 oPosition : POSITION,
+ out float3 relPosition : TEXCOORD0,
+ uniform float4x4 worldViewProj
+) {
+ oPosition = mul(worldViewProj, position);
+ relPosition = normalize(position);
+}
+
+// Entry point for the GroundFogDome fragment program.
+void GroundFogDome_fp
+(
+ in float3 relPosition : TEXCOORD0,
+
+ uniform float cameraHeight,
+ uniform float4 fogColour,
+ uniform float fogDensity,
+ uniform float fogVerticalDecay,
+ uniform float fogGroundLevel,
+
+ out float4 oCol : COLOR
+) {
+ // Fog magic.
+ float invSinView = 1 / (relPosition.y);
+ float h1 = cameraHeight;
+ float aFog;
+
+ if (invSinView < 0) {
+ // Gazing into the abyss
+ aFog = 0;
+ } else {
+ aFog = saturate (ExpGroundFogInf (
+ invSinView, h1, fogDensity, fogVerticalDecay, fogGroundLevel));
+ }
+
+ oCol.a = aFog;
+ oCol.rgb = fogColour.rgb;
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/caelum/media/GroundFog.material
===================================================================
--- trunk/python-ogre/demos/caelum/media/GroundFog.material (rev 0)
+++ trunk/python-ogre/demos/caelum/media/GroundFog.material 2007-10-20 00:42:29 UTC (rev 446)
@@ -0,0 +1,49 @@
+// Sample base material for using CaelumGroundFog.
+material CaelumGroundFogBase
+{
+ technique Default
+ {
+ pass Main
+ {
+ fog_override true none
+ }
+
+ // Fog pass
+ pass CaelumGroundFog
+ {
+ vertex_program_ref CaelumGroundFogVP
+ {
+ }
+
+ fragment_program_ref CaelumGroundFogFP
+ {
+ }
+
+ scene_blend alpha_blend
+ }
+ }
+}
+
+material CaelumGroundFogDome
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_check off
+ depth_write off
+ fog_override true
+ scene_blend alpha_blend
+ cull_hardware none
+
+ vertex_program_ref CaelumGroundFogDomeVP
+ {
+ }
+
+ fragment_program_ref CaelumGroundFogDomeFP
+ {
+ }
+ }
+ }
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/caelum/media/GroundFog.program
===================================================================
--- trunk/python-ogre/demos/caelum/media/GroundFog.program (rev 0)
+++ trunk/python-ogre/demos/caelum/media/GroundFog.program 2007-10-20 00:42:29 UTC (rev 446)
@@ -0,0 +1,65 @@
+vertex_program CaelumGroundFogVP cg
+{
+ source CaelumShaders.cg
+ entry_point GroundFog_vp
+ profiles vs_2_x arbvp1 vp30
+ compile_arguments -posinv
+
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named_auto world world_matrix
+ }
+}
+
+fragment_program CaelumGroundFogFP cg
+{
+ source CaelumShaders.cg
+ entry_point GroundFog_fp
+ profiles ps_2_x arbfp1 fp30
+
+ default_params
+ {
+ param_named_auto camPos camera_position
+
+ // _auto seems wrong here, since the fog formulas are different than
+ // for standard exp fog.
+ param_named fogDensity float 0
+ param_named fogVerticalDecay float 0
+ param_named fogGroundLevel float 0
+ param_named fogColour float4 0 0 0 0
+ }
+}
+
+vertex_program CaelumGroundFogDomeVP cg
+{
+ source CaelumShaders.cg
+ entry_point GroundFogDome_vp
+ profiles vs_2_0 arbvp1
+ compile_arguments -posinv
+
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ }
+}
+
+fragment_program CaelumGroundFogDomeFP cg
+{
+ source CaelumShaders.cg
+ entry_point GroundFogDome_fp
+ profiles ps_2_0 arbfp1
+
+ default_params
+ {
+ // Fog parameters.
+ param_named fogColour float4 0 0 0 0
+ param_named fogDensity float 0
+ param_named fogVerticalDecay float 0
+ param_named fogGroundLevel float 0
+
+ // Send camera height. We can't send camera_position because
+ // the entity is always moved with the camera. Joy.
+ param_named cameraHeight float 0
+ }
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/caelum/media/Haze.program
===================================================================
--- trunk/python-ogre/demos/caelum/media/Haze.program (rev 0)
+++ trunk/python-ogre/demos/caelum/media/Haze.program 2007-10-20 00:42:29 UTC (rev 446)
@@ -0,0 +1,26 @@
+vertex_program CaelumHazeVP cg
+{
+ source CaelumShaders.cg
+ entry_point Haze_vp
+ profiles vs_2_0 arbvp1 vp30
+ compile_arguments -posinv
+
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named_auto camPos camera_position
+ }
+}
+
+fragment_program CaelumHazeFP cg
+{
+ source CaelumShaders.cg
+ entry_point Haze_fp
+ profiles ps_2_0 arbfp1 fp30
+ compile_arguments -posinv
+
+ default_params
+ {
+ param_named_auto fogColour fog_colour
+ }
+}
\ No newline at end of file
Modified: trunk/python-ogre/demos/caelum/media/LayeredClouds.material
===================================================================
--- trunk/python-ogre/demos/caelum/media/LayeredClouds.material 2007-10-19 13:17:02 UTC (rev 445)
+++ trunk/python-ogre/demos/caelum/media/LayeredClouds.material 2007-10-20 00:42:29 UTC (rev 446)
@@ -1,9 +1,10 @@
-vertex_program LayeredCloudVP cg
+vertex_program CaelumLayeredCloudsVP cg
{
- source LayeredCloud.cg
- entry_point main_vp
- profiles vs_2_0 arbvp1 vp30
-
+ source CaelumShaders.cg
+ entry_point LayeredClouds_vp
+ profiles vs_2_0 arbvp1
+ compile_arguments -posinv
+
default_params
{
param_named_auto worldViewProj worldviewproj_matrix
@@ -11,131 +12,80 @@
}
}
-fragment_program LayeredCloudFP cg
+fragment_program CaelumLayeredCloudsFP cg
{
- source LayeredCloud.cg
- entry_point main_fp
- profiles ps_2_0 arbfp1 fp30
+ source CaelumShaders.cg
+ entry_point LayeredClouds_fp
+ profiles ps_2_0 arbfp1
default_params
{
- param_named time float 0 // Time offset
- param_named_auto fogColour fog_colour
+ // Caelum sky properties
param_named sunDirection float3 -1 -1 0
param_named sunColour float4 1 1 1 1
- param_named lightInvScattering float 1 // The inverse of the light scattering: The higher, the less scatter (and glow)
- param_named absorptionFactor float 0.5 // How much light the cloud absorbs; [0, 1]
- param_named cloudInvScale float 1.5 // The inverse of the cloud forms scale
- param_named detailInvScale float 7 // The inverse of the cloud details scale
- param_named noiseInvScale float 31 // The inverse of the cloud noise scale
- param_named cloudSpeed float2 0 0 // The cloud speed
- param_named detailSpeed float2 0 0 // The cloud details speed
- param_named haloThreshold float 0 // The halo threshold. If the cloud glow is below this threshold, it's boosted suddenly, forming a halo.
+
+ // The inverse of the cloud forms scale
+ param_named cloudMassInvScale float 1.2
+ // The inverse of the cloud details scale
+ param_named cloudDetailInvScale float 4.8
+
+ // Cloud mass offset
+ param_named cloudMassOffset float2 0 0
+ // Cloud details offset
+ param_named cloudDetailOffset float2 0.5 0.5
+
+ // Cloud coverage, between 0 and 1
+ param_named cloudCover float 0.9
+ // Blending factor between Cloud1 and Cloud2
+ param_named cloudMassBlend float 0.9
+ // Cloud detail weight.
+ param_named cloudDetailBlend float 0.5
+
+ // Cloud sharpness. Lower values result in softer clouds.
+ param_named cloudSharpness float 4
+
+ // Cloud thickness. Bigger values results in darker clouds.
+ param_named cloudThickness float 3
+
+ // Fog colour; used as the base cloud colour.
+ param_named fogColour float4
}
}
-material LayeredCloud
+material CaelumLayeredClouds
{
technique
{
pass
{
lighting off
+ depth_check off
+ depth_write off
scene_blend alpha_blend
+ fog_override true
- vertex_program_ref LayeredCloudVP
+ vertex_program_ref CaelumLayeredCloudsVP
{
}
- fragment_program_ref LayeredCloudFP
+
+ fragment_program_ref CaelumLayeredCloudsFP
{
- param_named cloudSpeed float2 0.000025 0.00002
- param_named detailSpeed float2 -0.00001 -0.000015
}
- texture_unit Cloud
+ texture_unit Cloud1
{
- texture CloudLayer.png
+ anim_texture noise1.png noise2.png noise3.png noise4.png 600
}
- texture_unit Detail
+
+ texture_unit Cloud2
{
- texture AltocumulusDetail.png
+ anim_texture noise2.png noise3.png noise4.png noise1.png 600
}
- texture_unit Noise
+
+ texture_unit Detail
{
- texture CloudNoise1.png
+ texture noise4.png
}
}
}
-}
-
-material Altocumulus : LayeredCloud
-{
- set_texture_alias Detail AltocumulusDetail.png
- set_texture_alias Noise CloudNoise1.png
-
- technique
- {
- pass
- {
- fragment_program_ref LayeredCloudFP
- {
- param_named lightInvScattering float 3
- param_named absorptionFactor float 0.6
- }
- }
- }
-}
-
-material Altostratus : LayeredCloud
-{
- set_texture_alias Detail AltostratusDetail.png
- set_texture_alias Noise AltostratusDetail.png
-
- technique
- {
- pass
- {
- fragment_program_ref LayeredCloudFP
- {
- param_named absorptionFactor float 0.4
- param_named haloThreshold float 0.85
- }
- }
- }
-}
-
-material Cirrostratus : LayeredCloud
-{
- set_texture_alias Detail CirrostratusDetail.png
- set_texture_alias Noise AltostratusDetail.png
-
- technique
- {
- pass
- {
- fragment_program_ref LayeredCloudFP
- {
- param_named absorptionFactor float 0
- param_named haloThreshold float 0.85
- }
- }
- }
-}
-
-material Cirrus : LayeredCloud
-{
- set_texture_alias Detail CirrusDetail.png
- set_texture_alias Noise AltostratusDetail.png
-
- technique
- {
- pass
- {
- fragment_program_ref LayeredCloudFP
- {
- param_named absorptionFactor float 0
- param_named haloThreshold float 0.85
- }
- }
- }
-}
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/caelum/media/SunGradient.png
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/caelum/media/SunGradient.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/python-ogre/demos/caelum/media/Terrain.material
===================================================================
--- trunk/python-ogre/demos/caelum/media/Terrain.material 2007-10-19 13:17:02 UTC (rev 445)
+++ trunk/python-ogre/demos/caelum/media/Terrain.material 2007-10-20 00:42:29 UTC (rev 446)
@@ -1,69 +1,78 @@
-vertex_program HazeVP cg
-{
- source CaelumShaders.cg
- entry_point Haze_vp
- profiles vs_2_0 arbvp1 vp30
-
- default_params
- {
- param_named_auto worldViewProj worldviewproj_matrix
- param_named_auto camPos camera_position
- }
-}
-
-fragment_program HazeFP cg
-{
- source CaelumShaders.cg
- entry_point Haze_fp
- profiles ps_2_0 arbfp1 fp30
-
- default_params
- {
- param_named_auto fogColour fog_colour
- }
-}
-
-material CaelumDemoTerrain
-{
- technique
- {
- pass
- {
- texture_unit
- {
- texture terrain_texture.jpg
- }
-
- texture_unit
- {
- texture terrain_detail.jpg
- scale 0.1 0.1
- }
- }
-
- // Haze pass
- pass Haze
- {
- vertex_program_ref HazeVP
- {
- }
- fragment_program_ref HazeFP
- {
- }
-
- lighting off
- scene_blend alpha_blend
-
- texture_unit
- {
- texture AtmosphereDepth.png
- tex_address_mode clamp clamp clamp
- }
- texture_unit
- {
- texture EarthClearSky2.png
- tex_address_mode wrap clamp clamp
- }
- }
- }
-}
+// Base class for materials in the caelum demo.
+// They have a main pass and additional fog passes.
+// Perhaps might be better to do this at runtime somehow?
+material CaelumDemoBase
+{
+ technique
+ {
+ pass Main
+ {
+ fog_override true none
+ }
+
+ // Haze pass
+ pass CaelumHaze
+ {
+ vertex_program_ref CaelumHazeVP
+ {
+ }
+ fragment_program_ref CaelumHazeFP
+ {
+ }
+
+ lighting off
+ scene_blend alpha_blend
+ fog_override false
+
+ texture_unit
+ {
+ texture AtmosphereDepth.png 1D
+ tex_address_mode clamp clamp clamp
+ }
+ texture_unit
+ {
+ texture EarthClearSky2.png
+ tex_address_mode wrap clamp clamp
+ }
+ }
+
+ // Ground fog pass.
+ pass CaelumGroundFog
+ {
+ vertex_program_ref CaelumGroundFogVP
+ {
+ }
+
+ fragment_program_ref CaelumGroundFogFP
+ {
+ }
+
+ lighting off
+ //depth_write off
+ //colour_write off
+ scene_blend alpha_blend
+ }
+ }
+}
+
+// Demo terrain material.
+material CaelumDemoTerrain: CaelumDemoBase
+{
+ technique
+ {
+ // Main terrain pass.
+ pass Main
+ {
+ texture_unit
+ {
+ texture terrain_texture.jpg
+ }
+
+ texture_unit
+ {
+ texture terrain_detail.jpg
+ scale 0.1 0.1
+ }
+ }
+ }
+}
Modified: trunk/python-ogre/setup.py
===================================================================
--- trunk/python-ogre/setup.py 2007-10-19 13:17:02 UTC (rev 445)
+++ trunk/python-ogre/setup.py 2007-10-20 00:42:29 UTC (rev 446)
@@ -33,7 +33,7 @@
METADATA = {
"name": "Python-Ogre",
- "version": "1.0 RC2d",
+ "version": "1.1.a",
"license": "LGPL",
"url": "http://python-ogre.python-hosting.com/",
"author": "Lakin Wecker, Roman Yakovenko, Andy",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-19 13:16:59
|
Revision: 445
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=445&view=rev
Author: andy_miller
Date: 2007-10-19 06:17:02 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Updated QuckGUI and Caelum to latest versions
Added helper function to Caelum (createSimpleSunPositionModel) to help with Linux issues
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/caelum/CaelumExceptions.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/SkyColourModel.cpp
trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h
trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp
trunk/python-ogre/ThirdParty/caelum/UniversalClock.cpp
trunk/python-ogre/ThirdParty/caelum/UniversalClock.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.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/QuickGUIRect.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.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/QuickGUIText.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalTrackBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.h
trunk/python-ogre/code_generators/caelum/hand_made_wrappers.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
Added Paths:
-----------
trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp
trunk/python-ogre/ThirdParty/caelum/GroundFog.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.h
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumExceptions.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumExceptions.h 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumExceptions.h 2007-10-19 13:17:02 UTC (rev 445)
@@ -1,21 +1,21 @@
-#ifndef CAELUMEXCEPTIONS_H
-#define CAELUMEXCEPTIONS_H
-
-#include "CaelumPrerequisites.h"
-
-namespace caelum {
-
-/** Exception class for unsupported features.
- * @author Jesús Alonso Abad.
- */
-class DllExport UnsupportedException : public Ogre::Exception {
- public:
- /** Constructor.
- */
- UnsupportedException (int number, const Ogre::String &description, const Ogre::String &source, const char *file, long line)
- : Ogre::Exception (number, description, source, "UnsupportedException", file, line) { }
-};
-
-} // namespace caelum
-
-#endif // CAELUMEXCEPTIONS_H
+#ifndef CAELUMEXCEPTIONS_H
+#define CAELUMEXCEPTIONS_H
+
+#include "CaelumPrerequisites.h"
+
+namespace caelum {
+
+/** Exception class for unsupported features.
+ * @author Jesús Alonso Abad.
+ */
+class DllExport UnsupportedException : public Ogre::Exception {
+ public:
+ /** Constructor.
+ */
+ UnsupportedException (int number, const Ogre::String &description, const Ogre::String &source, const char *file, long line)
+ : Ogre::Exception (number, description, source, "UnsupportedException", file, line) { }
+};
+
+} // namespace caelum
+
+#endif // CAELUMEXCEPTIONS_H
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.cpp 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.cpp 2007-10-19 13:17:02 UTC (rev 445)
@@ -1 +1 @@
-#include "CaelumPrecompiled.h"
+#include "CaelumPrecompiled.h"
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.h 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrecompiled.h 2007-10-19 13:17:02 UTC (rev 445)
@@ -1 +1 @@
-#include "Ogre.h"
+#include "Ogre.h"
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2007-10-19 13:17:02 UTC (rev 445)
@@ -4,7 +4,20 @@
// Include external headers
#include "Ogre.h"
-#define DllExport
+// Define the dll export qualifier if compiling for Windows
+// // // #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+// // // #ifdef CAELUM_LIB
+// // // #define DllExport __declspec (dllexport)
+// // // #else
+// // // #ifdef __MINGW32__
+// // // #define DllExport
+// // // #else
+// // // #define DllExport __declspec (dllimport)
+// // // #endif
+// // // #endif
+// // // #else
+ #define DllExport
+// // // #endif
// Define the version code
#define CAELUM_VERSION_MAIN 0
@@ -22,7 +35,7 @@
*/
const float CAMERA_DISTANCE_MODIFIER = 0;
- // Render grounp for caelum stuff
+ // Render group for caelum stuff
// It's best to have them all together
enum CaelumRenderQueueGroupId
{
@@ -30,6 +43,7 @@
CAELUM_RENDER_QUEUE_SKYDOME = Ogre::RENDER_QUEUE_SKIES_EARLY + 1,
CAELUM_RENDER_QUEUE_SUN = Ogre::RENDER_QUEUE_SKIES_EARLY + 2,
CAELUM_RENDER_QUEUE_CLOUDS = Ogre::RENDER_QUEUE_SKIES_EARLY + 3,
+ CAELUM_RENDER_QUEUE_GROUND_FOG = Ogre::RENDER_QUEUE_SKIES_EARLY + 4,
};
}
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumSystem.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumSystem.cpp 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumSystem.cpp 2007-10-19 13:17:02 UTC (rev 445)
@@ -9,14 +9,10 @@
CaelumSystem::CaelumSystem
(
Ogre::Root *root,
- Ogre::SceneManager *sceneMgr,
- bool createSkyColourModel,
- bool createSkyDome,
- bool createSun,
- bool createStarfield,
- bool createClouds,
- bool manageResGroup,
- const Ogre::String &resGroupName
+ Ogre::SceneManager *sceneMgr,
+ CaelumComponent componentsToCreate/* = CAELUM_COMPONENTS_DEFAULT*/,
+ bool manageResGroup/* = true*/,
+ const Ogre::String &resGroupName/* = RESOURCE_GROUP_NAME*/
):
mCleanup(false)
{
@@ -51,27 +47,31 @@
mUniversalClock = new UniversalClock ();
// Set-up attributes
- mManageFog = false;
+ mManageSceneFog = false;
+ mGlobalFogDensityMultiplier = 1;
+ mSceneFogDensityMultiplier = 1;
+ mGroundFogDensityMultiplier = 1;
LOG ("System attributes set up.");
- assert(getSun() == 0);
- assert(getClouds() == 0);
- // Create basic elements
- if (createSkyColourModel) {
+ // Create default components; as requested.
+ if (componentsToCreate & CAELUM_COMPONENT_SKY_COLOUR_MODEL) {
this->setSkyColourModel (new SkyColourModel ());
}
- if (createSkyDome) {
+ if (componentsToCreate & CAELUM_COMPONENT_SKY_DOME) {
this->setSkyDome (new SkyDome (mSceneMgr));
}
- if (createSun) {
+ if (componentsToCreate & CAELUM_COMPONENT_SUN) {
this->setSun (new Sun (mSceneMgr));
}
- if (createClouds) {
+ if (componentsToCreate & CAELUM_COMPONENT_STARFIELD) {
+ this->setStarfield (new Starfield (mSceneMgr));
+ }
+ if (componentsToCreate & CAELUM_COMPONENT_CLOUDS) {
this->setClouds (new LayeredClouds (mSceneMgr));
}
- if (createStarfield) {
- this->setStarfield (new Starfield (mSceneMgr));
+ if (componentsToCreate & CAELUM_COMPONENT_GROUND_FOG) {
+ this->setGroundFog (new GroundFog (mSceneMgr));
}
// Auto-register itself as a frame listener
@@ -97,6 +97,8 @@
setSun (0);
setStarfield (0);
setClouds (0);
+ setGroundFog (0);
+ setSkyColourModel (0);
// Destroy the clock
if (mUniversalClock) {
@@ -143,6 +145,10 @@
if (getClouds ()) {
getClouds ()->notifyCameraChanged (cam);
}
+
+ if (getGroundFog ()) {
+ getGroundFog ()->notifyCameraChanged (cam);
+ }
}
UniversalClock *CaelumSystem::getUniversalClock () const {
@@ -172,25 +178,44 @@
sunDir = Ogre::Vector3::UNIT_Y;
}
+ // Update sun.
if (getSun ()) {
getSun ()->update (relDayTime);
}
+ // Update starfield
if (getStarfield ()) {
getStarfield ()->update (relDayTime);
}
+ // Update skydome.
if (getSkyDome ()) {
getSkyDome ()->setSunDirection (sunDir);
}
- if (mManageFog) {
- // TODO: Fog stuff here!!!
- if (getSkyColourModel ()) {
- mSceneMgr->setFog (Ogre::FOG_EXP2,
- mSkyColourModel->getFogColour (relDayTime, sunDir) * 0.7,
- mSkyColourModel->getFogDensity (relDayTime, sunDir));
- }
+ // Init fog properties from sky colour model.
+ double fogDensity;
+ Ogre::ColourValue fogColour;
+ if (getSkyColourModel ()) {
+ fogDensity = getSkyColourModel ()->getFogDensity (relDayTime, sunDir);
+ fogDensity *= mGlobalFogDensityMultiplier;
+ fogColour = mSkyColourModel->getFogColour (relDayTime, sunDir);
+ } else {
+ fogDensity = 0;
+ fogColour = Ogre::ColourValue::Black;
+ }
+
+ // Update scene fog.
+ if (getManageSceneFog ()) {
+ mSceneMgr->setFog (Ogre::FOG_EXP2,
+ fogColour * 0.7,
+ fogDensity * mSceneFogDensityMultiplier);
+ }
+
+ // Update ground fog.
+ if (getGroundFog ()) {
+ getGroundFog ()->setColour (fogColour);
+ getGroundFog ()->setDensity (fogDensity * mGroundFogDensityMultiplier);
}
// Set sun colours.
@@ -205,7 +230,9 @@
}
}
+ // Update clouds
// This has to be moved out of here, but Universal clock doesn't calculate deltaT
+ // Maybe it's better to update everything every frame?
if (getClouds()) {
double time = mUniversalClock->getCurrentRelativeDayTime ();
Ogre::Vector3 sunDir = getSun() ? mSun->getSunDirection() : Ogre::Vector3::UNIT_Y;
@@ -218,14 +245,42 @@
return true;
}
-void CaelumSystem::setManageFog (bool manage) {
- mManageFog = manage;
+void CaelumSystem::setManageSceneFog (bool value) {
+ mManageSceneFog = value;
+ // Prevent having some stale values around.
+ if (!value) {
+ mSceneMgr->setFog (Ogre::FOG_NONE);
+ }
}
-bool CaelumSystem::isFogManaged () const {
- return mManageFog;
+bool CaelumSystem::getManageSceneFog () const {
+ return mManageSceneFog;
}
+void CaelumSystem::setSceneFogDensityMultiplier (double value) {
+ mSceneFogDensityMultiplier = value;
+}
+
+double CaelumSystem::getSceneFogDensityMultiplier () const {
+ return mSceneFogDensityMultiplier;
+}
+
+void CaelumSystem::setGroundFogDensityMultiplier (double value) {
+ mGroundFogDensityMultiplier = value;
+}
+
+double CaelumSystem::getGroundFogDensityMultiplier () const {
+ return mGroundFogDensityMultiplier;
+}
+
+void CaelumSystem::setGlobalFogDensityMultiplier (double value) {
+ mGlobalFogDensityMultiplier = value;
+}
+
+double CaelumSystem::getGlobalFogDensityMultiplier () const {
+ return mGlobalFogDensityMultiplier;
+}
+
bool CaelumSystem::fireStartedEvent (const Ogre::FrameEvent &e) {
std::set<CaelumListener *>::iterator it, iend = mListeners.end ();
bool flag = true;
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumSystem.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumSystem.h 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumSystem.h 2007-10-19 13:17:02 UTC (rev 445)
@@ -9,12 +9,33 @@
#include "SkyDome.h"
#include "Starfield.h"
#include "LayeredClouds.h"
+#include "GroundFog.h"
#include "Sun.h"
namespace caelum {
/** Root of the Caelum system.
- This class is the root of the Caelum system.
+
+ Caelum is built from several classes for different sky elements (the sun,
+ clouds, etc). Those classes know very little about each other and are
+ connected through the main CaelumSystem class. This class is responsible
+ for tracking and updating sub-components. It "owns" all of the components,
+ using std::auto_ptr members.
+
+ The constructor will create a standard set of components but you can
+ disable some or change others. When you do something like setXxx(new Xxx())
+ CaelumSystem takes control of the object's lifetime.
+
+ This class is also reponsible for doing all per-frame and per-RenderTarget
+ updates. It's better to keep that logic here instead of coupling components
+ together.
+
+ It's difficult to build a CaelumSystem class which will work for any
+ combination of sky elements. It might be a good idea to have different
+ classes for vastly different sky systems. Alternatively the update logic
+ from Caelum could be refactor to only transfer a number of "common sky
+ parameter" around; but that is a lot harder and ultimately less flexible.
+
@author Jes\xFAs Alonso Abad
*/
class DllExport CaelumSystem : public Ogre::FrameListener, public Ogre::RenderTargetListener {
@@ -43,9 +64,17 @@
/// Reference to the universal clock.
UniversalClock *mUniversalClock;
- /** Flag to indicate if Caelum should manage the fog or not.
- */
- bool mManageFog;
+ /// Flag to indicate if Caelum manages standard Ogre::Scene fog.
+ bool mManageSceneFog;
+
+ /// Global fog density multiplier.
+ double mGlobalFogDensityMultiplier;
+
+ /// Scene fog density multiplier.
+ double mSceneFogDensityMultiplier;
+
+ /// Ground fog density multiplier.
+ double mGroundFogDensityMultiplier;
/** The sky dome.
*/
@@ -67,25 +96,58 @@
*/
std::auto_ptr<SkyColourModel> mSkyColourModel;
+ /** Reference to ground fog; if enabled.
+ */
+ std::auto_ptr<GroundFog> mGroundFog;
+
// Methods --------------------------------------------------------------------
public:
+ /** Flags enumeration for caelum components.
+ * This is an enumeration for the components to create by default in
+ * Caelum's constructor. You can still pass 0 and create everything
+ * by hand.
+ *
+ * CaelumSystem's constructor used to take a number of bools but now
+ * there are too many components and this is nicer.
+ *
+ * CAELUM_COMPONENT_ members are for individual components.
+ * CAELUM_COMPONENTS_ are standard bitmasks.
+ * CAELUM_COMPONENTS_DEFAULT picks elements that don't require
+ * modifications to external materials (right now it excludes ground fog).
+ */
+ enum CaelumComponent
+ {
+ CAELUM_COMPONENT_SKY_COLOUR_MODEL = 1 << 0,
+ CAELUM_COMPONENT_SKY_DOME = 1 << 1,
+ CAELUM_COMPONENT_SUN = 1 << 2,
+ CAELUM_COMPONENT_STARFIELD = 1 << 3,
+ CAELUM_COMPONENT_CLOUDS = 1 << 4,
+ CAELUM_COMPONENT_GROUND_FOG = 1 << 5,
+
+ CAELUM_COMPONENTS_NONE = 0x0000,
+ CAELUM_COMPONENTS_DEFAULT = 0x001F,
+ CAELUM_COMPONENTS_ALL = 0x002F,
+ };
+
/** Constructor.
Registers itself in the Ogre engine and initialises the system.
- @param root The Ogre rool.
- @param sceneMgr The Ogre scene manager.
- @param manageResGroup Tells the system if the resource group has been created externally (true) or if it's to be managed by the system.
- @param resGroupName The resource group name, if it's desired to use an existing one or just a different name.
+ It can also initialize a bunch of default components.
+
+ @param root The Ogre root.
+ @param scene The Ogre scene manager.
+ @param compoment The components to create.
+ @param manageResGroup Tells the system if the resource group has
+ been created externally (true) or if it's to be managed by the system.
+ @param resGroupName The resource group name, if it's desired to
+ use an existing one or just a different name.
*/
CaelumSystem (
Ogre::Root *root,
Ogre::SceneManager *sceneMgr,
- bool createSkyColourModel = true,
- bool createSkyDome = true,
- bool createSun = true,
- bool createStarfield = true,
- bool createClouds = true,
+ CaelumComponent componentsToCreate = CAELUM_COMPONENTS_DEFAULT,
bool manageResGroup = true,
- const Ogre::String &resGroupName = RESOURCE_GROUP_NAME);
+ const Ogre::String &resGroupName = RESOURCE_GROUP_NAME
+ );
/** Destructor.
*/
@@ -193,16 +255,76 @@
return mSkyColourModel.get();
}
- /** Enables/disables the Caelum fog management.
- @param manage True if you want Caelum to manage the fog for you.
+ /** Sets ground fog system.
+ * @param model The sky colour model, or null to disable
*/
- void setManageFog (bool manage);
+ inline void setGroundFog (GroundFog *model) {
+ mGroundFog.reset(model);
+ }
+ /** Get ground fog; if any.
+ */
+ inline GroundFog* getGroundFog () const {
+ return mGroundFog.get();
+ }
+
+ /** Enables/disables Caelum managing standard Ogre::Scene fog.
+ This makes CaelumSystem control standard Ogre::Scene fogging. It
+ will use EXP2 fog with density from SkyColourModel.
+
+ Fog density multipliers are used; final scene fog density is:
+ SceneMultiplier * GlobalMultiplier * SkyColourModel.GetFogDensity
+
+ When this is set to false it also disables all scene fog (but you
+ control it afterwards).
+
+ @param value New value
+ */
+ void setManageSceneFog (bool value);
+
/** Tells if Caelum is managing the fog or not.
- @return True if Caelum manages the fog.
+ @return The value set in setManageSceneFog.
*/
- bool isFogManaged () const;
+ bool getManageSceneFog () const;
+ /** Multiplier for scene fog density (default 1).
+ This is an additional multiplier for Ogre::Scene fog density.
+ This has no effect if getManagerSceneFog is false.
+
+ Final scene fog density is:
+ SceneMultiplier * GlobalMultiplier * SkyColourModel.GetFogDensity
+ */
+ void setSceneFogDensityMultiplier (double value);
+
+ /** Get the value set by setSceneFogDensityMultiplier.
+ */
+ double getSceneFogDensityMultiplier () const;
+
+ /** Multiplier for ground fog density (default 1).
+ This is an additional multiplier for Caelum::GroundFog density.
+ This has no effect if GroundFog is not used.
+
+ Final ground fog density is:
+ GroundFogMultipler * GlobalMultiplier * SkyColourModel.GetFogDensity
+ */
+ void setGroundFogDensityMultiplier (double value);
+
+ /** Get the value set by setGroundFogDensityMultiplier.
+ */
+ double getGroundFogDensityMultiplier () const;
+
+ /** Multiplier for global fog density (default 1).
+ This is an additional multiplier for fog density as received from
+ SkyColourModel. There are other multipliers you can tweak for
+ individual kinds of fog; but this is what you should change from
+ whatever "game logic" you might have.
+ */
+ void setGlobalFogDensityMultiplier (double value);
+
+ /** Get the value set by setSceneFogDensityMultiplier.
+ */
+ double getGlobalFogDensityMultiplier () const;
+
private:
/** Fires the start event to all the registered listeners.
@param e The Ogre FrameEvent object passed this frame.
Added: trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp 2007-10-19 13:17:02 UTC (rev 445)
@@ -0,0 +1,180 @@
+#include "CaelumPrecompiled.h"
+#include "GroundFog.h"
+#include "CaelumExceptions.h"
+
+namespace caelum {
+ const Ogre::String GroundFog::DEFAULT_PASS_NAME = "CaelumGroundFog";
+
+ GroundFog::GroundFog(
+ Ogre::SceneManager *scene,
+ const Ogre::String &domeMaterialName,
+ const Ogre::String &domeEntityName):
+ mScene(scene)
+ {
+ // Create dome entity, using a prefab sphere.
+ // The prefab sphere has a radius of 50 units.
+ // If this changes in future version of ogre this might break.
+ mDomeEntity = mScene->createEntity(domeEntityName, Ogre::SceneManager::PT_SPHERE);
+ mDomeEntity->setMaterialName(domeMaterialName);
+ mDomeEntity->setCastShadows(false);
+ mDomeEntity->setRenderQueueGroup (CAELUM_RENDER_QUEUE_GROUND_FOG);
+
+ mDomeNode = mScene->getRootSceneNode ()->createChildSceneNode ();
+ mDomeNode->attachObject (mDomeEntity);
+
+ // Maybe it would be better to create the material at runtime instead.
+ // More consistent with the rest of Caelum.
+ mDomeMaterial = static_cast<Ogre::MaterialPtr>(
+ Ogre::MaterialManager::getSingleton().getByName(domeMaterialName));
+ mDomeMaterial->load();
+ if (mDomeMaterial->getBestTechnique() == 0) {
+ throw new UnsupportedException (0, "GroundFog dome material not supported.",
+ "GroundFog", "GroundFog.cpp", -1);
+ }
+ mDomeMaterial->getBestTechnique()->getPass(0)->getFragmentProgramParameters()->setIgnoreMissingParams(true);
+ mDomeMaterial->getBestTechnique()->getPass(0)->getVertexProgramParameters()->setIgnoreMissingParams(true);
+
+ // Initialize default fog parameters
+ mDensity = 0.1;
+ mVerticalDecay = 0.2;
+ mGroundLevel = 5;
+ mFogColour = Ogre::ColourValue::Black;
+
+ forceUpdate();
+ }
+
+ GroundFog::~GroundFog() {
+ mDomeNode->detachObject(mDomeEntity);
+ mScene->destroyEntity(mDomeEntity);
+ mDomeEntity = 0;
+ static_cast<Ogre::SceneNode*>(mDomeNode->getParent())->
+ removeAndDestroyChild(mDomeNode->getName());
+ mDomeNode = 0;
+ mScene = 0;
+ }
+
+ GroundFog::PassSet& GroundFog::getPasses() {
+ return mPasses;
+ }
+
+ const GroundFog::PassSet& GroundFog::getPasses() const {
+ return mPasses;
+ }
+
+ void GroundFog::findFogPassesByName (const Ogre::String& passName) {
+ Ogre::MaterialManager *matManager = Ogre::MaterialManager::getSingletonPtr();
+ Ogre::MaterialManager::ResourceMapIterator matIt = matManager->getResourceIterator();
+ while (matIt.hasMoreElements()) {
+ Ogre::MaterialPtr mat = matIt.getNext();
+ Ogre::Material::TechniqueIterator techIt = mat->getTechniqueIterator();
+ while (techIt.hasMoreElements()) {
+ Ogre::Technique *tech = techIt.getNext();
+ Ogre::Technique::PassIterator passIt = tech->getPassIterator();
+ while (passIt.hasMoreElements()) {
+ Ogre::Pass *pass = passIt.getNext();
+ if (pass->getName() == passName) {
+ mPasses.insert(pass);
+ }
+ }
+ }
+ }
+ forceUpdate();
+ }
+
+ void GroundFog::setDensity (Ogre::Real density) {
+ if (Ogre::Math::Abs(mDensity - density) > 0.000001) {
+ for (PassSet::iterator it = mPasses.begin(); it != mPasses.end(); ++it) {
+ Ogre::GpuProgramParametersSharedPtr params = (*it)->getFragmentProgramParameters();
+ params->setNamedConstant("fogDensity", density);
+ }
+ mDensity = density;
+ }
+ updateSkyFogging();
+ }
+
+ Ogre::Real GroundFog::getDensity () {
+ return mDensity;
+ }
+
+ void GroundFog::setColour (const Ogre::ColourValue &colour) {
+ for (PassSet::iterator it = mPasses.begin(); it != mPasses.end(); ++it) {
+ Ogre::GpuProgramParametersSharedPtr params = (*it)->getFragmentProgramParameters();
+ params->setNamedConstant("fogColour", colour);
+ }
+ mFogColour = colour;
+ updateSkyFogging();
+ }
+
+ Ogre::ColourValue GroundFog::getColour () {
+ return mFogColour;
+ }
+
+ void GroundFog::setVerticalDecay (Ogre::Real verticalDecay) {
+ if (Ogre::Math::Abs(mVerticalDecay - verticalDecay) > 0.000001) {
+ for (PassSet::iterator it = mPasses.begin(); it != mPasses.end(); ++it) {
+ Ogre::GpuProgramParametersSharedPtr params = (*it)->getFragmentProgramParameters();
+ params->setNamedConstant("fogVerticalDecay", verticalDecay);
+ }
+ mVerticalDecay = verticalDecay;
+ }
+ updateSkyFogging();
+ }
+
+ Ogre::Real GroundFog::getVerticalDecay () {
+ return mVerticalDecay;
+ }
+
+ void GroundFog::setGroundLevel (Ogre::Real groundLevel) {
+ if (Ogre::Math::Abs(mGroundLevel - groundLevel) > 0.000001) {
+ for (PassSet::iterator it = mPasses.begin(); it != mPasses.end(); ++it) {
+ Ogre::GpuProgramParametersSharedPtr params = (*it)->getFragmentProgramParameters();
+ params->setNamedConstant("fogGroundLevel", groundLevel);
+ }
+ mGroundLevel = groundLevel;
+ }
+ updateSkyFogging();
+ }
+
+ Ogre::Real GroundFog::getGroundLevel () {
+ return mGroundLevel;
+ }
+
+ void GroundFog::forceUpdate () {
+ for (PassSet::iterator it = mPasses.begin(); it != mPasses.end(); ++it) {
+ Ogre::GpuProgramParametersSharedPtr params = (*it)->getFragmentProgramParameters();
+ params->setNamedConstant("fogDensity", mDensity);
+ params->setNamedConstant("fogVerticalDecay", mVerticalDecay);
+ params->setNamedConstant("fogGroundLevel", mGroundLevel);
+ params->setNamedConstant("fogColour", mFogColour);
+ }
+ updateSkyFogging();
+ }
+
+ void GroundFog::notifyCameraChanged (Ogre::Camera *cam)
+ {
+ // Move and sky to fill the sky.
+ // Adjust for radius 50.
+ mDomeNode->setPosition (cam->getRealPosition ());
+ if (cam->getFarClipDistance () > 0) {
+ mDomeNode->setScale (Ogre::Vector3::UNIT_SCALE * (1 / 50.0) *
+ (cam->getFarClipDistance () - CAMERA_DISTANCE_MODIFIER));
+ } else {
+ mDomeNode->setScale (Ogre::Vector3::UNIT_SCALE * (1 / 50.0) *
+ (cam->getNearClipDistance () + CAMERA_DISTANCE_MODIFIER));
+ }
+
+ // Send camera height to shader.
+ Ogre::GpuProgramParametersSharedPtr params =
+ mDomeMaterial->getBestTechnique()->getPass(0)->getFragmentProgramParameters();
+ params->setNamedConstant("cameraHeight", cam->getDerivedPosition().y);
+ }
+
+ void GroundFog::updateSkyFogging() {
+ Ogre::GpuProgramParametersSharedPtr params =
+ mDomeMaterial->getBestTechnique()->getPass(0)->getFragmentProgramParameters();
+ params->setNamedConstant("fogDensity", getDensity());
+ params->setNamedConstant("fogColour", getColour());
+ params->setNamedConstant("fogVerticalDecay", getVerticalDecay());
+ params->setNamedConstant("fogGroundLevel", getGroundLevel());
+ }
+}
\ No newline at end of file
Added: trunk/python-ogre/ThirdParty/caelum/GroundFog.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/GroundFog.h (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/GroundFog.h 2007-10-19 13:17:02 UTC (rev 445)
@@ -0,0 +1,126 @@
+#ifndef GROUNDFOG_H
+#define GROUNDFOG_H
+
+#include "CaelumPrerequisites.h"
+
+namespace caelum {
+
+/** Exponential ground fog system implementation.
+ *
+ * This class controls CaelumGroundFog passes in a potentially large number
+ * of materials, changing shader program parameters. This class keeps a list
+ * of passes to control; which can be build based on pass name.
+ *
+ * This simulates a field of fog where "absorption" at a certain point is
+ * exp(-verticalDecay * (h - fogLevel)). This absorption is multiplicative,
+ * the total fog alpha is e^(-density * absorption_on_view_path).
+ *
+ * You can set verticalDecay to 0 and get standard GL_EXP fog. Don't actually
+ * do that though because you'll get a division by 0.
+ */
+class DllExport GroundFog {
+ public:
+ static const Ogre::String DEFAULT_PASS_NAME;
+
+ /** Constructor.
+ */
+ GroundFog (Ogre::SceneManager *scene,
+ const Ogre::String &domeMaterialName = "CaelumGroundFogDome",
+ const Ogre::String &domeEntityName = "CaelumGroundFogDome");
+
+ /** Virtual destructor.
+ */
+ virtual ~GroundFog ();
+
+ /// Handle camera change.
+ void notifyCameraChanged (Ogre::Camera *cam);
+
+ /** Typedef for easier manipulation of a set of Passes.
+ */
+ typedef std::set<Ogre::Pass *> PassSet;
+
+ /** Get the set of currently controlled passes.
+ * This is provided if you really want to change the set by hand.
+ * You should call forceUpdate after modifying this set.
+ */
+ PassSet& getPasses();
+
+ /** Get the set of currently controlled passes.
+ * This is a const overload which doesn't let you modify the
+ * underlying collection.
+ */
+ const PassSet& getPasses () const;
+
+ /** Find caelum fog passes to control by name.
+ * By default this looks for passes called "CaleumGroundFog".
+ * @note This calls forceUpdate()
+ */
+ void findFogPassesByName (const Ogre::String& passName = DEFAULT_PASS_NAME);
+
+ /// Sets the fog density multiplier
+ void setDensity (Ogre::Real density);
+
+ /// Get the fog density multiplier
+ Ogre::Real getDensity ();
+
+ /// Sets fog colour
+ void setColour (const Ogre::ColourValue &colour);
+
+ /// Gets fog colour
+ Ogre::ColourValue getColour ();
+
+ /// Sets the vertical fog decay constant.
+ void setVerticalDecay (Ogre::Real verticalDecay);
+
+ /// Get the vertical fog decay constant.
+ Ogre::Real getVerticalDecay ();
+
+ /** Sets the ground level.
+ * At ground level 'fogginess' is equal to 1.
+ */
+ void setGroundLevel (Ogre::Real GroundLevela);
+
+ /** Get the ground level.
+ */
+ Ogre::Real getGroundLevel ();
+
+ /** Forces an update of all the passes. You have to use this if you modify
+ * the set of passes by hand, otherwise avoid it.
+ */
+ void forceUpdate ();
+
+ private:
+ /// Cached Density
+ Ogre::Real mDensity;
+
+ /// Cached VerticalDecay
+ Ogre::Real mVerticalDecay;
+
+ /// Cached GroundLevel
+ Ogre::Real mGroundLevel;
+
+ /// Fog colour
+ Ogre::ColourValue mFogColour;
+
+ /// The passes to control.
+ PassSet mPasses;
+
+ /// Sky dome material
+ Ogre::MaterialPtr mDomeMaterial;
+
+ /// Sky dome mesh
+ Ogre::SceneNode *mDomeNode;
+
+ /// Sky dome entity
+ Ogre::Entity *mDomeEntity;
+
+ /// The scene to control fog in.
+ Ogre::SceneManager* mScene;
+
+ // Called whenever something changes to update the sky dome.
+ void updateSkyFogging();
+};
+
+}
+
+#endif //GROUNDFOG_H
\ No newline at end of file
Modified: trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp 2007-10-19 13:17:02 UTC (rev 445)
@@ -57,7 +57,7 @@
float SkyColourModel::getFogDensity (float time, const Ogre::Vector3 &sunDir) {
float elevation = sunDir.dotProduct (Ogre::Vector3::UNIT_Y) * 0.5 + 0.5;
Ogre::ColourValue col = getInterpolatedColour (elevation, 1, mSkyGradientsImage, false);
- return col.a * mFogDensityMultiplier;
+ return col.a;
}
Ogre::ColourValue SkyColourModel::getSunSphereColour (float time, const Ogre::Vector3 &sunDir) {
@@ -75,36 +75,45 @@
float elevation = sunDir.dotProduct (Ogre::Vector3::UNIT_Y) * 0.5 + 0.5;
// Hack: return averaged sky colours
- Ogre::ColourValue col = getInterpolatedColour (elevation, elevation, mSkyGradientsImage);
+ Ogre::ColourValue col = getInterpolatedColour (elevation, elevation, mSkyGradientsImage, false);
return Ogre::ColourValue::White * (col.r + col.g + col.b) / 3;
}
-Ogre::ColourValue SkyColourModel::getInterpolatedColour (float x, float height, Ogre::Image *img, bool wrap) {
- // Get the image width
- int width = static_cast<int>(img->getWidth ()) - 1;
+Ogre::ColourValue SkyColourModel::getInterpolatedColour (float fx, float fy, Ogre::Image *img, bool wrapX) {
+ // Don't -> all the time, and avoid unsigned warnings
+ int imgWidth = static_cast<int>(img->getWidth ());
+ int imgHeight = static_cast<int>(img->getHeight ());
- // calculate the height
- height = Ogre::Math::Abs (height);
- int y = (int )((img->getHeight () - 1) * height);
- if (y >= static_cast<int>(img->getHeight ()))
- y--;
+ // Calculate pixel y coord.
+ int py = Ogre::Math::IFloor(Ogre::Math::Abs (fy) * (imgHeight - 1));
+ // Snap to py image bounds.
+ py = std::max(0, std::min(py, imgHeight - 1));
- // Get the two closest pixels
- int curPix, auxPix;
- float diff;
- curPix = (int )(width * x);
- diff = width * x - curPix;
- if (diff < 0) {
- auxPix = curPix - 1;
- }
- else {
- auxPix = curPix + 1;
- }
+ // Get the two closest pixels on x.
+ // px1 and px2 are the closest integer pixels to px.
+ float px = fx * (img->getWidth () - 1);
+ int px1, px2;
+ px1 = Ogre::Math::IFloor(px);
+ px2 = Ogre::Math::ICeil(px);
+ if (wrapX) {
+ // Wrap x coords. The funny addition ensures that it does
+ // "the right thing" for negative values.
+ px1 = (px1 % imgWidth + imgWidth) % imgWidth;
+ px2 = (px2 % imgWidth + imgWidth) % imgWidth;
+ } else {
+ px1 = std::max(0, std::min(px1, imgWidth - 1));
+ px2 = std::max(0, std::min(px2, imgWidth - 1));
+ }
+
// Calculate the interpolated pixel
Ogre::ColourValue c1, c2, cf;
- c1 = img->getColourAt (wrap ? curPix % width : curPix < 0 ? 0 : curPix > width ? width : curPix, y, 0);
- c2 = img->getColourAt (wrap ? auxPix % width : auxPix < 0 ? 0 : auxPix > width ? width : auxPix, y, 0);
+ c1 = img->getColourAt (px1, py, 0);
+ c2 = img->getColourAt (px2, py, 0);
+
+ // Blend the two pixels together.
+ // diff is the weight between pixel 1 and pixel 2.
+ float diff = px - px1;
cf = c1 * (1 - diff) + c2 * diff;
return cf;
Modified: trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h 2007-10-19 13:17:02 UTC (rev 445)
@@ -52,14 +52,6 @@
*/
float getFogDensity (float time, const Ogre::Vector3 &sunDir);
- inline float getFogDensityMultiplier() {
- return mFogDensityMultiplier;
- }
-
- inline void setFogDensityMultiplier(float value) {
- mFogDensityMultiplier = value;
- }
-
/** Get the colour of the sun sphere.
* This colour is used to draw the sun sphere in the sky.
* @return The colour of the sun.
@@ -83,13 +75,19 @@
protected:
/** Gets the interpolated colour between two pixels from an image.
- @param x The horizontal coordinate in the range [0, 1].
- @param height The height at which the pixels are located in the range [0, 1] (will be converted to integer).
+ Interpolate a texture pixel by hand. (fx, fy) are in texture coordinates,
+ ranging [0-1] across the entire texture.
+ Smooth blending is only done on the x coordinate.
+ Wrapping is only supported on X as well.
+
+ @param fx Horizontal coordinate.
+ @param fy Vertical coordiate.
@param img The lookup image.
- @param wrap If the map wraps horizontally or not.
+ @param wrapX To wrap the x coordinate.
@return The interpolated colour.
*/
- static Ogre::ColourValue getInterpolatedColour (float x, float height, Ogre::Image *img, bool wrap = true);
+ static Ogre::ColourValue getInterpolatedColour (float fx, float fy, Ogre::Image *img,
+ bool wrapX = true);
};
} // namespace caelum
Modified: trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp 2007-10-19 13:17:02 UTC (rev 445)
@@ -1,68 +1,68 @@
-#include "CaelumPrecompiled.h"
-#include "SkyDome.h"
-#include "GeometryFactory.h"
-#include "CaelumExceptions.h"
-
-namespace caelum {
-
-const Ogre::String SkyDome::SPHERIC_DOME_NAME = "CaelumSphericDome";
-const Ogre::String SkyDome::SKY_DOME_MATERIAL_NAME = "CaelumSkyDomeMaterial";
-
-SkyDome::SkyDome (Ogre::SceneManager *sceneMgr) {
- mAutoRadius = true;
-
- createSkyDomeMaterial ();
-
- GeometryFactory::generateSphericDome (SPHERIC_DOME_NAME, 32);
- Ogre::Entity *ent = sceneMgr->createEntity ("Dome", SPHERIC_DOME_NAME);
- ent->setMaterialName (SKY_DOME_MATERIAL_NAME);
- ent->setRenderQueueGroup (CAELUM_RENDER_QUEUE_SKYDOME);
- ent->setCastShadows (false);
-
- mNode = sceneMgr->getRootSceneNode ()->createChildSceneNode ();
- mNode->attachObject (ent);
-}
-
-SkyDome::~SkyDome () {
- if (mNode) {
- // Detach and destroy attached entity.
- Ogre::Entity *ent = static_cast<Ogre::Entity *>(mNode->detachObject ("Dome"));
- ent->_getManager ()->destroyEntity (ent);
-
- // Destroy the node
- static_cast<Ogre::SceneNode *>(mNode->getParent ())->removeAndDestroyChild (mNode->getName ());
- mNode = 0;
- }
-
- destroySkyDomeMaterial ();
-}
-
-void SkyDome::notifyCameraChanged (Ogre::Camera *cam) {
- mNode->setPosition (cam->getRealPosition ());
- if (mAutoRadius) {
- if (cam->getFarClipDistance () > 0) {
- mNode->setScale (Ogre::Vector3::UNIT_SCALE * (
- cam->getFarClipDistance () - CAMERA_DISTANCE_MODIFIER));
- } else {
- mNode->setScale (Ogre::Vector3::UNIT_SCALE * (
- cam->getNearClipDistance () + CAMERA_DISTANCE_MODIFIER));
- }
- }
-}
-
-void SkyDome::setFarRadius (float radius) {
- if (radius > 0) {
- mNode->setScale (Ogre::Vector3::UNIT_SCALE * radius);
- mAutoRadius = false;
- } else {
- mAutoRadius = true;
- }
-}
-
-void SkyDome::setSunDirection (Ogre::Vector3 sunDir) {
+#include "CaelumPrecompiled.h"
+#include "SkyDome.h"
+#include "GeometryFactory.h"
+#include "CaelumExceptions.h"
+
+namespace caelum {
+
+const Ogre::String SkyDome::SPHERIC_DOME_NAME = "CaelumSphericDome";
+const Ogre::String SkyDome::SKY_DOME_MATERIAL_NAME = "CaelumSkyDomeMaterial";
+
+SkyDome::SkyDome (Ogre::SceneManager *sceneMgr) {
+ mAutoRadius = true;
+
+ createSkyDomeMaterial ();
+
+ GeometryFactory::generateSphericDome (SPHERIC_DOME_NAME, 32);
+ Ogre::Entity *ent = sceneMgr->createEntity ("Dome", SPHERIC_DOME_NAME);
+ ent->setMaterialName (SKY_DOME_MATERIAL_NAME);
+ ent->setRenderQueueGroup (CAELUM_RENDER_QUEUE_SKYDOME);
+ ent->setCastShadows (false);
+
+ mNode = sceneMgr->getRootSceneNode ()->createChildSceneNode ();
+ mNode->attachObject (ent);
+}
+
+SkyDome::~SkyDome () {
+ if (mNode) {
+ // Detach and destroy attached entity.
+ Ogre::Entity *ent = static_cast<Ogre::Entity *>(mNode->detachObject ("Dome"));
+ ent->_getManager ()->destroyEntity (ent);
+
+ // Destroy the node
+ static_cast<Ogre::SceneNode *>(mNode->getParent ())->removeAndDestroyChild (mNode->getName ());
+ mNode = 0;
+ }
+
+ destroySkyDomeMaterial ();
+}
+
+void SkyDome::notifyCameraChanged (Ogre::Camera *cam) {
+ mNode->setPosition (cam->getRealPosition ());
+ if (mAutoRadius) {
+ if (cam->getFarClipDistance () > 0) {
+ mNode->setScale (Ogre::Vector3::UNIT_SCALE * (
+ cam->getFarClipDistance () - CAMERA_DISTANCE_MODIFIER));
+ } else {
+ mNode->setScale (Ogre::Vector3::UNIT_SCALE * (
+ cam->getNearClipDistance () + CAMERA_DISTANCE_MODIFIER));
+ }
+ }
+}
+
+void SkyDome::setFarRadius (float radius) {
+ if (radius > 0) {
+ mNode->setScale (Ogre::Vector3::UNIT_SCALE * radius);
+ mAutoRadius = false;
+ } else {
+ mAutoRadius = true;
+ }
+}
+
+void SkyDome::setSunDirection (Ogre::Vector3 sunDir) {
float elevation = sunDir.dotProduct (Ogre::Vector3::UNIT_Y);
- elevation = elevation * 0.5 + 0.5;
-
+ elevation = elevation * 0.5 + 0.5;
+
Ogre::GpuProgramParametersSharedPtr vpParams =
mMaterial->getBestTechnique()->getPass(0)->getVertexProgramParameters();
Ogre::GpuProgramParametersSharedPtr fpParams =
@@ -70,150 +70,152 @@
Ogre::TextureUnitState* gradientsTus =
mMaterial->getBestTechnique()->getPass(0)->getTextureUnitState(0);
- vpParams->setNamedConstant ("sunDirection", sunDir);
- fpParams->setNamedConstant ("offset", elevation);
- gradientsTus->setTextureUScroll (elevation);
-}
-
-void SkyDome::setLightAbsorption (float absorption) const {
- if (absorption > 1)
- absorption = 1;
- else if (absorption < 0)
- absorption = 0;
-
+ vpParams->setNamedConstant ("sunDirection", sunDir);
+ fpParams->setNamedConstant ("offset", elevation);
+ gradientsTus->setTextureUScroll (elevation);
+}
+
+void SkyDome::setLightAbsorption (float absorption) const {
+ if (absorption > 1)
+ absorption = 1;
+ else if (absorption < 0)
+ absorption = 0;
+
Ogre::GpuProgramParametersSharedPtr vpParams =
mMaterial->getBestTechnique()->getPass(0)->getVertexProgramParameters();
- vpParams->setNamedConstant ("lightAbsorption", absorption);
-}
-
-void SkyDome::setLightScattering (float scattering) const {
- if (scattering <= 0)
- scattering = 0.00001;
-
+ vpParams->setNamedConstant ("lightAbsorption", absorption);
+}
+
+void SkyDome::setLightScattering (float scattering) const {
+ if (scattering <= 0)
+ scattering = 0.00001;
+
Ogre::GpuProgramParametersSharedPtr fpParams =
mMaterial->getBestTechnique()->getPass(0)->getFragmentProgramParameters();
- fpParams->setNamedConstant ("lightInvScattering", 1.0f / scattering);
-}
-
-void SkyDome::setAtmosphereHeight (float height) const {
- if (height <= 0) {
- height = 0.00001;
- } else if (height > 1) {
- height = 1;
- }
-
+ fpParams->setNamedConstant ("lightInvScattering", 1.0f / scattering);
+}
+
+void SkyDome::setAtmosphereHeight (float height) const {
+ if (height <= 0) {
+ height = 0.00001;
+ } else if (height > 1) {
+ height = 1;
+ }
+
Ogre::GpuProgramParametersSharedPtr fpParams =
mMaterial->getBestTechnique()->getPass(0)->getFragmentProgramParameters();
- fpParams->setNamedConstant ("atmosphereInvHeight", 1.0f / height);
-}
-
-void SkyDome::setSkyGradientsImage (const Ogre::String& gradients) {
- Ogre::TextureUnitState* gradientsTus =
- mMaterial->getTechnique (0)->getPass (0)->getTextureUnitState(0);
-
- gradientsTus->setTextureAddressingMode (Ogre::TextureUnitState::TAM_CLAMP);
-
+ fpParams->setNamedConstant ("atmosphereInvHeight", 1.0f / height);
+}
+
+void SkyDome::setSkyGradientsImage (const Ogre::String& gradients) {
+ Ogre::TextureUnitState* gradientsTus =
+ mMaterial->getTechnique (0)->getPass (0)->getTextureUnitState(0);
+
+ gradientsTus->setTextureAddressingMode (Ogre::TextureUnitState::TAM_CLAMP);
+
// Dagon and Eihort compatibility
#if OGRE_VERSION < ((1 << 16) | (3 << 8))
gradientsTus->setTextureName (gradients, Ogre::TEX_TYPE_2D, -1, true);
#else
gradientsTus->setTextureName (gradients, Ogre::TEX_TYPE_2D);
gradientsTus->setIsAlpha (true);
- #endif
-}
-
-void SkyDome::setAtmosphereDepthImage (const Ogre::String& atmosphereDepth) {
- Ogre::TextureUnitState* atmosphereTus =
- mMaterial->getTechnique (0)->getPass (0)->getTextureUnitState(1);
-
- atmosphereTus->setTextureName (atmosphereDepth, Ogre::TEX_TYPE_1D);
- atmosphereTus->setTextureAddressingMode (Ogre::TextureUnitState::TAM_CLAMP, Ogre::TextureUnitState::TAM_WRAP, Ogre::TextureUnitState::TAM_WRAP);
-}
-
-void SkyDome::createSkyDomeMaterial () {
- // Check shader support.
- // It would be nice to check supported profiles in detail.
- if (!Ogre::Root::getSingleton ().getRenderSystem ()->getCapabilities ()->hasCapability (Ogre::RSC_FRAGMENT_PROGRAM)) {
- throw new UnsupportedException (0, "The card doesn't support fragment programs for the sky dome material.", "SkyDome", "SkyDome.cpp", -1);
- }
- if (!Ogre::Root::getSingleton ().getRenderSystem ()->getCapabilities ()->hasCapability (Ogre::RSC_VERTEX_PROGRAM)) {
- throw new UnsupportedException (0, "The card doesn't support vertex programs for the sky dome material.", "SkyDome", "SkyDome.cpp", -1);
- }
-
- LOG ("Generating sky dome material...");
- if (!Ogre::MaterialManager::getSingleton ().resourceExists (SKY_DOME_MATERIAL_NAME)) {
- LOG ("\tMaterial not found; creating...");
- mMaterial = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton ().create (SKY_DOME_MATERIAL_NAME, RESOURCE_GROUP_NAME));
- mMaterial->setReceiveShadows (false);
- LOG ("\t\tMaterial [OK]");
-
- Ogre::Pass *pass = mMaterial->getTechnique (0)->getPass (0);
- pass->setSceneBlending (Ogre::SBT_TRANSPARENT_ALPHA);
- pass->setDepthCheckEnabled (false);
- pass->setDepthWriteEnabled (false);
- pass->setLightingEnabled (false);
- pass->setFog (true);
-
- // Bind fragment program.
- if (Ogre::Root::getSingleton ().getRenderSystem ()->getCapabilities ()->hasCapability (Ogre::RSC_FRAGMENT_PROGRAM)) {
- Ogre::HighLevelGpuProgramPtr fp = Ogre::HighLevelGpuProgramManager::getSingleton().createProgram ("SkyDomeFP", RESOURCE_GROUP_NAME, "cg", Ogre::GPT_FRAGMENT_PROGRAM);
- fp->setSourceFile ("CaelumShaders.cg");
- fp->setParameter ("entry_point", "SkyDome_fp");
- fp->setParameter ("profiles", "ps_2_0 arbfp1");
- pass->setFragmentProgram ("SkyDomeFP");
- Ogre::GpuProgramParametersSharedPtr parameters = pass->getFragmentProgramParameters();
- parameters->setNamedConstant ("offset", 0.0f);
- parameters->setNamedAutoConstant ("hazeColour", Ogre::GpuProgramParameters::ACT_FOG_COLOUR);
- }
-
- // Bind vertex program.
- if (Ogre::Root::getSingleton ().getRenderSystem ()->getCapabilities ()->hasCapability (Ogre::RSC_VERTEX_PROGRAM)) {
- Ogre::HighLevelGpuProgramPtr vp = Ogre::HighLevelGpuProgramManager::getSingleton().createProgram ("SkyDomeVP", RESOURCE_GROUP_NAME, "cg", Ogre::GPT_VERTEX_PROGRAM);
- vp->setSourceFile ("CaelumShaders.cg");
- vp->setParameter ("entry_point", "SkyDome_vp");
- vp->setParameter ("profiles", "vs_2_0 arbvp1");
- pass->setVertexProgram ("SkyDomeVP");
- Ogre::GpuProgramParametersSharedPtr parameters = pass->getVertexProgramParameters();
- parameters->setNamedAutoConstant ("worldViewProj", Ogre::GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);
- parameters->setNamedConstant ("sunDirection", Ogre::Vector3 (1, 0, 0));
- }
- LOG ("\t\tPass [OK]");
-
- // Create first texture unit; gradients image.
- pass->createTextureUnitState ();
- setSkyGradientsImage("EarthClearSky2.png");
- LOG ("\t\tTextureUnit - Sky gradient [OK]");
-
- // Create second texture unit; atmosphere depth image.
- pass->createTextureUnitState ();
- setAtmosphereDepthImage("AtmosphereDepth.png");
- LOG ("\t\tTextureUnit - Atmosphere depth [OK]");
-
- mMaterial->load ();
- LOG ("\tDONE");
- } else {
- mMaterial = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton ().getByName (SKY_DOME_MATERIAL_NAME));
- }
- LOG ("DONE");
-}
-
-void SkyDome::destroySkyDomeMaterial () {
- LOG ("Removing sky dome material...");
- if ((Ogre::HighLevelGpuProgramManager::getSingletonPtr()->resourceExists("SkyDomeFP"))) {
- LOG ("Removing sky dome SkyDomeFP...");
- Ogre::HighLevelGpuProgramManager::getSingletonPtr()->remove("SkyDomeFP");
- }
-
- if ((Ogre::HighLevelGpuProgramManager::getSingletonPtr()->resourceExists("SkyDomeVP"))) {
- LOG ("Removing sky dome SkyDomeVP...");
- Ogre::HighLevelGpuProgramManager::getSingletonPtr()->remove("SkyDomeVP");
- }
-
- if (!Ogre::MaterialManager::getSingleton ().resourceExists (SKY_DOME_MATERIAL_NAME)) {
- Ogre::MaterialManager::getSingleton ().remove (SKY_DOME_MATERIAL_NAME);
- }
- mMaterial.setNull ();
- LOG ("DONE");
-}
-
-} // namespace caelum
+ #endif
+}
+
+void SkyDome::setAtmosphereDepthImage (const Ogre::String& atmosphereDepth) {
+ Ogre::TextureUnitState* atmosphereTus =
+ mMaterial->getTechnique (0)->getPass (0)->getTextureUnitState(1);
+
+ atmosphereTus->setTextureName (atmosphereDepth, Ogre::TEX_TYPE_1D);
+ atmosphereTus->setTextureAddressingMode (Ogre::TextureUnitState::TAM_CLAMP, Ogre::TextureUnitState::TAM_WRAP, Ogre::TextureUnitState::TAM_WRAP);
+}
+
+void SkyDome::createSkyDomeMaterial () {
+ // Check shader support.
+ // It would be nice to check supported profiles in detail.
+ if (!Ogre::Root::getSingleton ().getRenderSystem ()->getCapabilities ()->hasCapability (Ogre::RSC_FRAGMENT_PROGRAM)) {
+ throw new UnsupportedException (0, "The card doesn't support fragment programs for the sky dome material.", "SkyDome", "SkyDome.cpp", -1);
+ }
+ if (!Ogre::Root::getSingleton ().getRenderSystem ()->getCapabilities ()->hasCapability (Ogre::RSC_VERTEX_PROGRAM)) {
+ throw new UnsupportedException (0, "The card doesn't support vertex programs for the sky dome material.", "SkyDome", "SkyDome.cpp", -1);
+ }
+
+ LOG ("Generating sky dome material...");
+ if (!Ogre::MaterialManager::getSingleton ().resourceExists (SKY_DOME_MATERIAL_NAME)) {
+ LOG ("\tMaterial not found; creating...");
+ mMaterial = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton ().create (SKY_DOME_MATERIAL_NAME, RESOURCE_GROUP_NAME));
+ mMaterial->setReceiveShadows (false);
+ LOG ("\t\tMaterial [OK]");
+
+ Ogre::Pass *pass = mMaterial->getTechnique (0)->getPass (0);
+ pass->setSceneBlending (Ogre::SBT_TRANSPARENT_ALPHA);
+ pass->setDepthCheckEnabled (false);
+ pass->setDepthWriteEnabled (false);
+ pass->setLightingEnabled (false);
+ pass->setFog (true);
+
+ // Bind fragment program.
+ if (Ogre::Root::getSingleton ().getRenderSystem ()->getCapabilities ()->hasCapability (Ogre::RSC_FRAGMENT_PROGRAM)) {
+ Ogre::HighLevelGpuProgramPtr fp = Ogre::HighLevelGpuProgramManager::getSingleton().createProgram ("SkyDomeFP", RESOURCE_GROUP_NAME, "cg", Ogre::GPT_FRAGMENT_PROGRAM);
+ fp->setSourceFile ("CaelumShaders.cg");
+ fp->setParameter ("entry_point", "SkyDome_fp");
+ fp->setParameter ("profiles", "ps_2_0 arbfp1");
+ pass->setFragmentProgram ("SkyDomeFP");
+ Ogre::GpuProgramParametersSharedPtr parameters = pass->getFragmentProgramParameters();
+ parameters->setIgnoreMissingParams(true);
+ parameters->setNamedConstant ("offset", 0.0f);
+ parameters->setNamedAutoConstant ("hazeColour", Ogre::GpuProgramParameters::ACT_FOG_COLOUR);
+ }
+
+ // Bind vertex program.
+ if (Ogre::Root::getSingleton ().getRenderSystem ()->getCapabilities ()->hasCapability (Ogre::RSC_VERTEX_PROGRAM)) {
+ Ogre::HighLevelGpuProgramPtr vp = Ogre::HighLevelGpuProgramManager::getSingleton().createProgram ("SkyDomeVP", RESOURCE_GROUP_NAME, "cg", Ogre::GPT_VERTEX_PROGRAM);
+ vp->setSourceFile ("CaelumShaders.cg");
+ vp->setParameter ("entry_point", "SkyDome_vp");
+ vp->setParameter ("profiles", "vs_2_0 arbvp1");
+ pass->setVertexProgram ("SkyDomeVP");
+ Ogre::GpuProgramParametersSharedPtr parameters = pass->getVertexProgramParameters();
+ parameters->setIgnoreMissingParams(true);
+ parameters->setNamedAutoConstant ("worldViewProj", Ogre::GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);
+ parameters->setNamedConstant ("sunDirection", Ogre::Vector3 (1, 0, 0));
+ }
+ LOG ("\t\tPass [OK]");
+
+ // Create first texture unit; gradients image.
+ pass->createTextureUnitState ();
+ setSkyGradientsImage("EarthClearSky2.png");
+ LOG ("\t\tTextureUnit - Sky gradient [OK]");
+
+ // Create second texture unit; atmosphere depth image.
+ pass->createTextureUnitState ();
+ setAtmosphereDepthImage("AtmosphereDepth.png");
+ LOG ("\t\tTextureUnit - Atmosphere depth [OK]");
+
+ mMaterial->load ();
+ LOG ("\tDONE");
+ } else {
+ mMaterial = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton ().getByName (SKY_DOME_MATERIAL_NAME));
+ }
+ LOG ("DONE");
+}
+
+void SkyDome::destroySkyDomeMaterial () {
+ LOG ("Removing sky dome material...");
+ if ((Ogre::HighLevelGpuProgramManager::getSingletonPtr()->resourceExists("SkyDomeFP"))) {
+ LOG ("Removing sky dome SkyDomeFP...");
+ Ogre::HighLevelGpuProgramManager::getSingletonPtr()->remove("SkyDomeFP");
+ }
+
+ if ((Ogre::HighLevelGpuProgramManager::getSingletonPtr()->resourceExists("SkyDomeVP"))) {
+ LOG ("Removing sky dome SkyDomeVP...");
+ Ogre::HighLevelGpuProgramManager::getSingletonPtr()->remove("SkyDomeVP");
+ }
+
+ if (!Ogre::MaterialManager::getSingleton ().resourceExists (SKY_DOME_MATERIAL_NAME)) {
+ Ogre::MaterialManager::getSingleton ().remove (SKY_DOME_MATERIAL_NAME);
+ }
+ mMaterial.setNull ();
+ LOG ("DONE");
+}
+
+} // namespace caelum
Modified: trunk/python-ogre/ThirdParty/caelum/UniversalClock.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/UniversalClock.cpp 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/UniversalClock.cpp 2007-10-19 13:17:02 UTC (rev 445)
@@ -1,106 +1,106 @@
-#include "CaelumPrecompiled.h"
-#include "UniversalClock.h"
-
-namespace caelum {
-
-UniversalClock::UniversalClock () {
- setSecondsPerDay (86400);
- setDaysPerYear (365);
-
- setTimeScale (1.0);
- setUpdateRate (0); // Sets a new mTimeSinceLastUpdate value as well
-}
-
-void UniversalClock::setSecondsPerDay (const Ogre::Real secs) {
- mSecondsPerDay = secs;
-
- updateSecondsPerYear ();
-}
-
-Ogre::Real UniversalClock::getSecondsPerDay () const {
- return mSecondsPerDay;
-}
-
-void UniversalClock::setDaysPerYear (const Ogre::Real days) {
- mDaysPerYear = days;
-
- updateSecondsPerYear ();
-}
-
-Ogre::Real UniversalClock::getDaysPerYear () const {
- return mDaysPerYear;
-}
-
-void UniversalClock::setCurrentTime (const Ogre::Real sec) {
- mCurrentSecond = Ogre::Math::Abs (sec);
-
- mCurrentSecond -= mSecondsPerYear * Ogre::Math::Floor (mCurrentSecond / mSecondsPerYear);
-}
-
-void UniversalClock::setCurrentRelativeTime (const Ogre::Real time) {
- setCurrentTime (mSecondsPerYear * time);
-}
-
-Ogre::Real UniversalClock::getCurrentTime () const {
- return mCurrentSecond;
-}
-
-Ogre::Real UniversalClock::getCurrentRelativeTime () const {
- return getCurrentTime () / mSecondsPerYear;
-}
-
-Ogre::Real UniversalClock::getCurrentDayTime () const {
- return mCurrentSecond - (mSecondsPerDay * Ogre::Math::Floor (mCurrentSecond / mSecondsPerDay));
-}
-
-Ogre::Real UniversalClock::getCurrentRelativeDayTime () const {
- return getCurrentDayTime () / mSecondsPerDay;
-}
-
-void UniversalClock::setTimeScale (const Ogre::Real scale) {
- mTimeScale = scale;
-}
-
-Ogre::Real UniversalClock::getTimeScale () const {
- return mTimeScale;
-}
-
-void UniversalClock::setUpdateRate (const Ogre::Real rate) {
- mUpdateRate = rate;
-
- if (mUpdateRate < 0)
- mUpdateRate = 0;
-
- forceUpdate ();
-}
-
-Ogre::Real UniversalClock::getUpdateRate () const {
- return mUpdateRate;
-}
-
-bool UniversalClock::update (const Ogre::Real time) {
- setCurrentTime (mCurrentSecond + time * mTimeScale);
-
- mTimeSinceLastUpdate += time;
-
- if (mTimeSinceLastUpdate > mUpdateRate) {
- mTimeSinceLastUpdate -= mUpdateRate * Ogre::Math::Floor (mUpdateRate > 0 ? mTimeSinceLastUpdate / mUpdateRate : 0);
-
- return true;
- }
- else {
- return false;
- }
-}
-
-void UniversalClock::updateSecondsPerYear () {
- mSecondsPerYear = mSecondsPerDay * mDaysPerYear;
-
- forceUpdate ();
-}
-
-void UniversalClock::forceUpdate () {
- mTimeSinceLastUpdate = mUpdateRate + 1;
-}
-
-} // namespace caelum
+#include "CaelumPrecompiled.h"
+#include "UniversalClock.h"
+
+namespace caelum {
+
+UniversalClock::UniversalClock () {
+ setSecondsPerDay (86400);
+ setDaysPerYear (365);
+
+ setTimeScale (1.0);
+ setUpdateRate (0); // Sets a new mTimeSinceLastUpdate value as well
+}
+
+void UniversalClock::setSecondsPerDay (const Ogre::Real secs) {
+ mSecondsPerDay = secs;
+
+ updateSecondsPerYear ();
+}
+
+Ogre::Real UniversalClock::getSecondsPerDay () const {
+ return mSecondsPerDay;
+}
+
+void UniversalClock::setDaysPerYear (const Ogre::Real days) {
+ mDaysPerYear = days;
+
+ updateSecondsPerYear ();
+}
+
+Ogre::Real UniversalClock::getDaysPerYear () const {
+ return mDaysPerYear;
+}
+
+void UniversalClock::setCurrentTime (const Ogre::Real sec) {
+ mCurrentSecond = Ogre::Math::Abs (sec);
+
+ mCurrentSecond -= mSecondsPerYear * Ogre::Math::Floor (mCurrentSecond / mSecondsPerYear);
+}
+
+void UniversalClock::setCurrentRelativeTime (const Ogre::Real time) {
+ setCurrentTime (mSecondsPerYear * time);
+}
+
+Ogre::Real UniversalClock::getCurrentTime () const {
+ return mCurrentSecond;
+}
+
+Ogre::Real UniversalClock::getCurrentRelativeTime () const {
+ return getCurrentTime () / mSecondsPerYear;
+}
+
+Ogre::Real UniversalClock::getCurrentDayTime () const {
+ return mCurrentSecond - (mSecondsPerDay * Ogre::Math::Floor (mCurrentSecond / mSecondsPerDay));
+}
+
+Ogre::Real UniversalClock::getCurrentRelativeDayTime () const {
+ return getCurrentDayTime () / mSecondsPerDay;
+}
+
+void UniversalClock::setTimeScale (const Ogre::Real scale) {
+ mTimeScale = scale;
+}
+
+Ogre::Real UniversalClock::getTimeScale () const {
+ return mTimeScale;
+}
+
+void UniversalClock::setUpdateRate (const Ogre::Real rate) {
+ mUpdateRate = rate;
+
+ if (mUpdateRate < 0)
+ mUpdateRate = 0;
+
+ forceUpdate ();
+}
+
+Ogre::Real UniversalClock::getUpdateRate () const {
+ return mUpdateRate;
+}
+
+bool UniversalClock::update (const Ogre::Real time) {
+ setCurrentTime (mCurrentSecond + time * mTimeScale);
+
+ mTimeSinceLastUpdate += time;
+
+ if (mTimeSinceLastUpdate > mUpdateRate) {
+ mTimeSinceLastUpdate -= mUpdateRate * Ogre::Math::Floor (mUpdateRate > 0 ? mTimeSinceLastUpdate / mUpdateRate : 0);
+
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
+void UniversalClock::updateSecondsPerYear () {
+ mSecondsPerYear = mSecondsPerDay * mDaysPerYear;
+
+ forceUpdate ();
+}
+
+void UniversalClock::forceUpdate () {
+ mTimeSinceLastUpdate = mUpdateRate + 1;
+}
+
+} // namespace caelum
Modified: trunk/python-ogre/ThirdParty/caelum/UniversalClock.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/UniversalClock.h 2007-10-19 10:21:27 UTC (rev 444)
+++ trunk/python-ogre/ThirdParty/caelum/UniversalClock.h 2007-10-19 13:17:02 UTC (rev 445)
@@ -...
[truncated message content] |
|
From: <and...@us...> - 2007-10-19 10:21:34
|
Revision: 444
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=444&view=rev
Author: andy_miller
Date: 2007-10-19 03:21:27 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Further Linux updates
Modified Paths:
--------------
trunk/python-ogre/code_generators/physx/build.out
trunk/python-ogre/code_generators/physx/customization_data.pyc
trunk/python-ogre/code_generators/physx/hand_made_wrappers.pyc
trunk/python-ogre/demos/nxogre/CakeFramework.py
trunk/python-ogre/demos/nxogre/config.yaml
trunk/python-ogre/demos/nxogre/plugins.cfg
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/01-RetrieveSource.sh
trunk/python-ogre/scripts/06-GenerateCode.sh
trunk/python-ogre/scripts/07-BuildModules.sh
trunk/python-ogre/scripts/master.sh
Modified: trunk/python-ogre/code_generators/physx/build.out
===================================================================
--- trunk/python-ogre/code_generators/physx/build.out 2007-10-19 10:06:58 UTC (rev 443)
+++ trunk/python-ogre/code_generators/physx/build.out 2007-10-19 10:21:27 UTC (rev 444)
@@ -4,6 +4,10 @@
WARNING: Unable to find ode/odecpp.h include file (ogreode class) in include_dirs
WARNING: Unable to find Ogreode_Prefab.h include file (ogreode class) in include_dirs
+INFO Creating xml file "/home/andy/development/python-ogre/code_generators/cache/physx_2.7.2_cache.xml" from source file "/home/andy/development/python-ogre/code_generators/physx/python_physx.h" ...
+
+INFO gccxml cmd: /home/andy/development/gccxml-build/bin/gccxml -I"/home/andy/development/python-ogre" -I"/home/andy/development/root/usr/include/boost-1_34" -I"/home/andy/development/root/usr/include/OGRE" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/Cooking/Include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/Foundation/include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/PhysXLoader/include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/NxCharacter/include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/NxExtensions/include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/Physics/include" -D"LINUX" -D"VERSION_2.7.2" "/home/andy/development/python-ogre/code_generators/physx/python_physx.h" -fxml="/home/andy/development/python-ogre/code_generators/cache/physx_2.7.2_cache.xml"
+
INFO Parsing xml file "/home/andy/development/python-ogre/code_generators/cache/physx_2.7.2_cache.xml" ...
Excluding static const NX_NO_HIGH_LIMIT [variable]
Excluding static const NX_NO_LOW_LIMIT [variable]
@@ -100,361 +104,312 @@
Excluded: NxShapeDesc * * NxArray<NxShapeDesc*, NxAllocatorDefault>::reallocate(size_t n, NxShapeDesc * * old) [member function]
WARNING: void NxUtilLib::NxSegmentPlaneIntersect(NxVec3 const & v1, NxVec3 const & v2, NxPlane const & plane, NxReal & dist, NxVec3 & pointOnPlane) [member function]
-> execution error W1009: The function takes as argument (name=dist, pos=3) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=dist, pos=3) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxUtilLib::NxRayPlaneIntersect(NxRay const & ray, NxPlane const & plane, NxReal & dist, NxVec3 & pointOnPlane) [member function]
-> execution error W1009: The function takes as argument (name=dist, pos=2) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=dist, pos=2) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxUtilLib::NxRaySphereIntersect(NxVec3 const & origin, NxVec3 const & dir, NxReal length, NxVec3 const & center, NxReal radius, NxReal & hit_time, NxVec3 & hit_pos) [member function]
-> execution error W1009: The function takes as argument (name=hit_time, pos=5) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=hit_time, pos=5) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxU32 NxUtilLib::NxRayAABBIntersect2(NxVec3 const & min, NxVec3 const & max, NxVec3 const & origin, NxVec3 const & dir, NxVec3 & coord, NxReal & t) [member function]
-> execution error W1009: The function takes as argument (name=t, pos=5) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=t, pos=5) non-const reference to Python immutable type - function could not be called
+> from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxUtilLib::NxRayTriIntersect(NxVec3 const & orig, NxVec3 const & dir, NxVec3 const & vert0, NxVec3 const & vert1, NxVec3 const & vert2, float & t, float & u, float & v, bool cull) [member function]
-> execution error W1009: The function takes as argument (name=t, pos=5) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=t, pos=5) non-const reference to Python immutable type - function could not be called
+> from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxUtilLib::NxRayTriIntersect(NxVec3 const & orig, NxVec3 const & dir, NxVec3 const & vert0, NxVec3 const & vert1, NxVec3 const & vert2, float & t, float & u, float & v, bool cull) [member function]
-> execution error W1009: The function takes as argument (name=u, pos=6) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=u, pos=6) non-const reference to Python immutable type - function could not be called
+> from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxUtilLib::NxRayTriIntersect(NxVec3 const & orig, NxVec3 const & dir, NxVec3 const & vert0, NxVec3 const & vert1, NxVec3 const & vert2, float & t, float & u, float & v, bool cull) [member function]
-> execution error W1009: The function takes as argument (name=v, pos=7) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=v, pos=7) non-const reference to Python immutable type - function could not be called
+> from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxUserWheelContactModify::onWheelContact(NxWheelShape * wheelShape, NxVec3 & contactPoint, NxVec3 & contactNormal, NxReal & contactPosition, NxReal & normalForce, NxShape * otherShape, NxMaterialIndex & otherShapeMaterialIndex, NxU32 otherShapeFeatureIndex) [member function]
-> execution error W1009: The function takes as argument (name=contactPosition, pos=3) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=contactPosition, pos=3) non-const reference to Python immutable type - function could
+> not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxUserWheelContactModify::onWheelContact(NxWheelShape * wheelShape, NxVec3 & contactPoint, NxVec3 & contactNormal, NxReal & contactPosition, NxReal & normalForce, NxShape * otherShape, NxMaterialIndex & otherShapeMaterialIndex, NxU32 otherShapeFeatureIndex) [member function]
-> execution error W1009: The function takes as argument (name=normalForce, pos=4) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=normalForce, pos=4) non-const reference to Python immutable type - function could not
+> be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxUserWheelContactModify::onWheelContact(NxWheelShape * wheelShape, NxVec3 & contactPoint, NxVec3 & contactNormal, NxReal & contactPosition, NxReal & normalForce, NxShape * otherShape, NxMaterialIndex & otherShapeMaterialIndex, NxU32 otherShapeFeatureIndex) [member function]
-> execution error W1009: The function takes as argument (name=otherShapeMaterialIndex, pos=6) non-const reference to Python
-> immutable type - function could not be called from Python. Take a look on "Function Transformation" functionality and
-> define the transformation.
+> execution error W1009: The function takes as argument (name=otherShapeMaterialIndex, pos=6) non-const reference to Python immutable type -
+> function could not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxCompartmentType [enumeration]
-> execution error W1032: Boost.Python library does not support enums with duplicate values. You can read more about this
-> here: http://boost.org/libs/python/todo.html#support-for-enums-with-duplicate-values . The quick work around is to add new
-> class variable to the exported enum, from Python.
+> execution error W1032: Boost.Python library does not support enums with duplicate values. You can read more about this here:
+> http://boost.org/libs/python/todo.html#support-for-enums-with-duplicate-values . The quick work around is to add new class variable to the
+> exported enum, from Python.
WARNING: NxSimulationStatus [enumeration]
-> execution error W1032: Boost.Python library does not support enums with duplicate values. You can read more about this
-> here: http://boost.org/libs/python/todo.html#support-for-enums-with-duplicate-values . The quick work around is to add new
-> class variable to the exported enum, from Python.
+> execution error W1032: Boost.Python library does not support enums with duplicate values. You can read more about this here:
+> http://boost.org/libs/python/todo.html#support-for-enums-with-duplicate-values . The quick work around is to add new class variable to the
+> exported enum, from Python.
WARNING: void NxSpringAndDamperEffector::getLinearSpring(NxReal & distCompressSaturate, NxReal & distRelaxed, NxReal & distStretchSaturate, NxReal & maxCompressForce, NxReal & maxStretchForce) [member function]
-> execution error W1009: The function takes as argument (name=distCompressSaturate, pos=0) non-const reference to Python
-> immutable type - function could not be called from Python. Take a look on "Function Transformation" functionality and
-> define the transformation.
+> execution error W1009: The function takes as argument (name=distCompressSaturate, pos=0) non-const reference to Python immutable type - function
+> could not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxSpringAndDamperEffector::getLinearSpring(NxReal & distCompressSaturate, NxReal & distRelaxed, NxReal & distStretchSaturate, NxReal & maxCompressForce, NxReal & maxStretchForce) [member function]
-> execution error W1009: The function takes as argument (name=distRelaxed, pos=1) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=distRelaxed, pos=1) non-const reference to Python immutable type - function could not
+> be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxSpringAndDamperEffector::getLinearSpring(NxReal & distCompressSaturate, NxReal & distRelaxed, NxReal & distStretchSaturate, NxReal & maxCompressForce, NxReal & maxStretchForce) [member function]
-> execution error W1009: The function takes as argument (name=distStretchSaturate, pos=2) non-const reference to Python
-> immutable type - function could not be called from Python. Take a look on "Function Transformation" functionality and
-> define the transformation.
+> execution error W1009: The function takes as argument (name=distStretchSaturate, pos=2) non-const reference to Python immutable type - function
+> could not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxSpringAndDamperEffector::getLinearSpring(NxReal & distCompressSaturate, NxReal & distRelaxed, NxReal & distStretchSaturate, NxReal & maxCompressForce, NxReal & maxStretchForce) [member function]
-> execution error W1009: The function takes as argument (name=maxCompressForce, pos=3) non-const reference to Python
-> immutable type - function could not be called from Python. Take a look on "Function Transformation" functionality and
-> define the transformation.
+> execution error W1009: The function takes as argument (name=maxCompressForce, pos=3) non-const reference to Python immutable type - function could
+> not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxSpringAndDamperEffector::getLinearSpring(NxReal & distCompressSaturate, NxReal & distRelaxed, NxReal & distStretchSaturate, NxReal & maxCompressForce, NxReal & maxStretchForce) [member function]
-> execution error W1009: The function takes as argument (name=maxStretchForce, pos=4) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=maxStretchForce, pos=4) non-const reference to Python immutable type - function could
+> not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxSpringAndDamperEffector::getLinearDamper(NxReal & velCompressSaturate, NxReal & velStretchSaturate, NxReal & maxCompressForce, NxReal & maxStretchForce) [member function]
-> execution error W1009: The function takes as argument (name=velCompressSaturate, pos=0) non-const reference to Python
-> immutable type - function could not be called from Python. Take a look on "Function Transformation" functionality and
-> define the transformation.
+> execution error W1009: The function takes as argument (name=velCompressSaturate, pos=0) non-const reference to Python immutable type - function
+> could not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxSpringAndDamperEffector::getLinearDamper(NxReal & velCompressSaturate, NxReal & velStretchSaturate, NxReal & maxCompressForce, NxReal & maxStretchForce) [member function]
-> execution error W1009: The function takes as argument (name=velStretchSaturate, pos=1) non-const reference to Python
-> immutable type - function could not be called from Python. Take a look on "Function Transformation" functionality and
-> define the transformation.
+> execution error W1009: The function takes as argument (name=velStretchSaturate, pos=1) non-const reference to Python immutable type - function
+> could not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxSpringAndDamperEffector::getLinearDamper(NxReal & velCompressSaturate, NxReal & velStretchSaturate, NxReal & maxCompressForce, NxReal & maxStretchForce) [member function]
-> execution error W1009: The function takes as argument (name=maxCompressForce, pos=2) non-const reference to Python
-> immutable type - function could not be called from Python. Take a look on "Function Transformation" functionality and
-> define the transformation.
+> execution error W1009: The function takes as argument (name=maxCompressForce, pos=2) non-const reference to Python immutable type - function could
+> not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxSpringAndDamperEffector::getLinearDamper(NxReal & velCompressSaturate, NxReal & velStretchSaturate, NxReal & maxCompressForce, NxReal & maxStretchForce) [member function]
-> execution error W1009: The function takes as argument (name=maxStretchForce, pos=3) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=maxStretchForce, pos=3) non-const reference to Python immutable type - function could
+> not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxSoftBody::raycast(NxRay const & worldRay, NxVec3 & hit, NxU32 & vertexId) [member function]
-> execution error W1009: The function takes as argument (name=vertexId, pos=2) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=vertexId, pos=2) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxSoftBody::getShapePointers(NxShape * * shapePointers, NxU32 * flags) [member function]
-> warning W1051: The function takes as argument (name=shapePointers, pos=0) "NxShape * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=shapePointers, pos=0) "NxShape * *" type. You have to specify a call policies or to use
+> "Function Transformation" functionality.
WARNING: void NxSoftBody::setShapePointers(NxShape * * shapePointers, unsigned int numShapes) [member function]
-> warning W1051: The function takes as argument (name=shapePointers, pos=0) "NxShape * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=shapePointers, pos=0) "NxShape * *" type. You have to specify a call policies or to use
+> "Function Transformation" functionality.
WARNING: bool NxCloth::raycast(NxRay const & worldRay, NxVec3 & hit, NxU32 & vertexId) [member function]
-> execution error W1009: The function takes as argument (name=vertexId, pos=2) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=vertexId, pos=2) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxCloth::getShapePointers(NxShape * * shapePointers, NxU32 * flags=0) [member function]
-> warning W1051: The function takes as argument (name=shapePointers, pos=0) "NxShape * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=shapePointers, pos=0) "NxShape * *" type. You have to specify a call policies or to use
+> "Function Transformation" functionality.
WARNING: void NxCloth::setShapePointers(NxShape * * shapePointers, unsigned int numShapes) [member function]
-> warning W1051: The function takes as argument (name=shapePointers, pos=0) "NxShape * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=shapePointers, pos=0) "NxShape * *" type. You have to specify a call policies or to use
+> "Function Transformation" functionality.
WARNING: void NxCompartment::getTiming(NxReal & maxTimestep, NxU32 & maxIter, NxTimeStepMethod & method, NxU32 * numSubSteps=0) const [member function]
-> execution error W1009: The function takes as argument (name=maxTimestep, pos=0) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=maxTimestep, pos=0) non-const reference to Python immutable type - function could not
+> be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxCompartment::getTiming(NxReal & maxTimestep, NxU32 & maxIter, NxTimeStepMethod & method, NxU32 * numSubSteps=0) const [member function]
-> execution error W1009: The function takes as argument (name=maxIter, pos=1) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=maxIter, pos=1) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxCompartment::getTiming(NxReal & maxTimestep, NxU32 & maxIter, NxTimeStepMethod & method, NxU32 * numSubSteps=0) const [member function]
-> execution error W1009: The function takes as argument (name=method, pos=2) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=method, pos=2) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxU32 NxPhysicsSDK::getInternalVersion(NxU32 & apiRev, NxU32 & descRev, NxU32 & branchId) const [member function]
-> execution error W1009: The function takes as argument (name=apiRev, pos=0) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=apiRev, pos=0) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxU32 NxPhysicsSDK::getInternalVersion(NxU32 & apiRev, NxU32 & descRev, NxU32 & branchId) const [member function]
-> execution error W1009: The function takes as argument (name=descRev, pos=1) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=descRev, pos=1) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxU32 NxPhysicsSDK::getInternalVersion(NxU32 & apiRev, NxU32 & descRev, NxU32 & branchId) const [member function]
-> execution error W1009: The function takes as argument (name=branchId, pos=2) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=branchId, pos=2) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxJoint::getActors(NxActor * * actor1, NxActor * * actor2) [member function]
-> warning W1051: The function takes as argument (name=actor1, pos=0) "NxActor * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=actor1, pos=0) "NxActor * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: void NxJoint::getActors(NxActor * * actor1, NxActor * * actor2) [member function]
-> warning W1051: The function takes as argument (name=actor2, pos=1) "NxActor * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=actor2, pos=1) "NxActor * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: void NxJoint::getBreakable(NxReal & maxForce, NxReal & maxTorque) [member function]
-> execution error W1009: The function takes as argument (name=maxForce, pos=0) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=maxForce, pos=0) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxJoint::getBreakable(NxReal & maxForce, NxReal & maxTorque) [member function]
-> execution error W1009: The function takes as argument (name=maxTorque, pos=1) non-const reference to Python immutable type
-> - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=maxTorque, pos=1) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxJoint::getNextLimitPlane(NxVec3 & planeNormal, NxReal & planeD, NxReal * restitution=0) [member function]
-> execution error W1009: The function takes as argument (name=planeD, pos=1) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=planeD, pos=1) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxConvexMesh::getMassInformation(NxReal & mass, NxMat33 & localInertia, NxVec3 & localCenterOfMass) const [member function]
-> execution error W1009: The function takes as argument (name=mass, pos=0) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=mass, pos=0) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxTriangleMesh::getMassInformation(NxReal & mass, NxMat33 & localInertia, NxVec3 & localCenterOfMass) const [member function]
-> execution error W1009: The function takes as argument (name=mass, pos=0) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=mass, pos=0) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxU32 NxScene::getCompartmentArray(NxCompartment * * userBuffer, NxU32 bufferSize, NxU32 & usersIterator) const [member function]
-> warning W1051: The function takes as argument (name=userBuffer, pos=0) "NxCompartment * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=userBuffer, pos=0) "NxCompartment * *" type. You have to specify a call policies or to use
+> "Function Transformation" functionality.
WARNING: NxU32 NxScene::getCompartmentArray(NxCompartment * * userBuffer, NxU32 bufferSize, NxU32 & usersIterator) const [member function]
-> execution error W1009: The function takes as argument (name=usersIterator, pos=2) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=usersIterator, pos=2) non-const reference to Python immutable type - function could
+> not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxU32 NxScene::getActorGroupPairArray(NxActorGroupPair * userBuffer, NxU32 bufferSize, NxU32 & userIterator) const [member function]
-> execution error W1009: The function takes as argument (name=userIterator, pos=2) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=userIterator, pos=2) non-const reference to Python immutable type - function could not
+> be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxScene::getFilterOps(NxFilterOp & op0, NxFilterOp & op1, NxFilterOp & op2) const [member function]
-> execution error W1009: The function takes as argument (name=op0, pos=0) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=op0, pos=0) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxScene::getFilterOps(NxFilterOp & op0, NxFilterOp & op1, NxFilterOp & op2) const [member function]
-> execution error W1009: The function takes as argument (name=op1, pos=1) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=op1, pos=1) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxScene::getFilterOps(NxFilterOp & op0, NxFilterOp & op1, NxFilterOp & op2) const [member function]
-> execution error W1009: The function takes as argument (name=op2, pos=2) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=op2, pos=2) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxActiveTransform * NxScene::getActiveTransforms(NxU32 & nbTransformsOut) [member function]
-> execution error W1009: The function takes as argument (name=nbTransformsOut, pos=0) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=nbTransformsOut, pos=0) non-const reference to Python immutable type - function could
+> not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxU32 NxScene::getIslandArrayFromActor(NxActor & actor, NxActor * * userBuffer, NxU32 bufferSize, NxU32 & userIterator) [member function]
-> warning W1051: The function takes as argument (name=userBuffer, pos=1) "NxActor * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=userBuffer, pos=1) "NxActor * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: NxU32 NxScene::getIslandArrayFromActor(NxActor & actor, NxActor * * userBuffer, NxU32 bufferSize, NxU32 & userIterator) [member function]
-> execution error W1009: The function takes as argument (name=userIterator, pos=3) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=userIterator, pos=3) non-const reference to Python immutable type - function could not
+> be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: NxU32 NxScene::getMaterialArray(NxMaterial * * userBuffer, NxU32 bufferSize, NxU32 & usersIterator) [member function]
-> warning W1051: The function takes as argument (name=userBuffer, pos=0) "NxMaterial * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=userBuffer, pos=0) "NxMaterial * *" type. You have to specify a call policies or to use
+> "Function Transformation" functionality.
WARNING: NxU32 NxScene::getMaterialArray(NxMaterial * * userBuffer, NxU32 bufferSize, NxU32 & usersIterator) [member function]
-> execution error W1009: The function takes as argument (name=usersIterator, pos=2) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=usersIterator, pos=2) non-const reference to Python immutable type - function could
+> not be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxScene::getTiming(NxReal & maxTimestep, NxU32 & maxIter, NxTimeStepMethod & method, NxU32 * numSubSteps=0) const [member function]
-> execution error W1009: The function takes as argument (name=maxTimestep, pos=0) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=maxTimestep, pos=0) non-const reference to Python immutable type - function could not
+> be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxScene::getTiming(NxReal & maxTimestep, NxU32 & maxIter, NxTimeStepMethod & method, NxU32 * numSubSteps=0) const [member function]
-> execution error W1009: The function takes as argument (name=maxIter, pos=1) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=maxIter, pos=1) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxScene::getTiming(NxReal & maxTimestep, NxU32 & maxIter, NxTimeStepMethod & method, NxU32 * numSubSteps=0) const [member function]
-> execution error W1009: The function takes as argument (name=method, pos=2) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=method, pos=2) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: bool NxScene::raycastAnyShape(NxRay const & worldRay, NxShapesType shapesType, NxU32 groups=0x0ffffffff, NxReal maxDist=3.4028234663852885981170418348451692544e+38, NxGroupsMask const * groupsMask=0, NxShape * * cache=0) const [member function]
-> warning W1051: The function takes as argument (name=cache, pos=5) "NxShape * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=cache, pos=5) "NxShape * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: NxShape * NxScene::raycastClosestShape(NxRay const & worldRay, NxShapesType shapeType, NxRaycastHit & hit, NxU32 groups=0x0ffffffff, NxReal maxDist=3.4028234663852885981170418348451692544e+38, NxU32 hintFlags=0x0ffffffff, NxGroupsMask const * groupsMask=0, NxShape * * cache=0) const [member function]
-> warning W1051: The function takes as argument (name=cache, pos=7) "NxShape * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=cache, pos=7) "NxShape * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: NxU32 NxScene::overlapSphereShapes(NxSphere const & worldSphere, NxShapesType shapeType, NxU32 nbShapes, NxShape * * shapes, NxUserEntityReport<NxShape*> * callback, NxU32 activeGroups=0x0ffffffff, NxGroupsMask const * groupsMask=0, bool accurateCollision=false) [member function]
-> warning W1051: The function takes as argument (name=shapes, pos=3) "NxShape * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=shapes, pos=3) "NxShape * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: NxU32 NxScene::overlapAABBShapes(NxBounds3 const & worldBounds, NxShapesType shapeType, NxU32 nbShapes, NxShape * * shapes, NxUserEntityReport<NxShape*> * callback, NxU32 activeGroups=0x0ffffffff, NxGroupsMask const * groupsMask=0, bool accurateCollision=false) [member function]
-> warning W1051: The function takes as argument (name=shapes, pos=3) "NxShape * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=shapes, pos=3) "NxShape * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: NxU32 NxScene::overlapOBBShapes(NxBox const & worldBox, NxShapesType shapeType, NxU32 nbShapes, NxShape * * shapes, NxUserEntityReport<NxShape*> * callback, NxU32 activeGroups=0x0ffffffff, NxGroupsMask const * groupsMask=0, bool accurateCollision=false) [member function]
-> warning W1051: The function takes as argument (name=shapes, pos=3) "NxShape * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=shapes, pos=3) "NxShape * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: NxU32 NxScene::overlapCapsuleShapes(NxCapsule const & worldCapsule, NxShapesType shapeType, NxU32 nbShapes, NxShape * * shapes, NxUserEntityReport<NxShape*> * callback, NxU32 activeGroups=0x0ffffffff, NxGroupsMask const * groupsMask=0, bool accurateCollision=false) [member function]
-> warning W1051: The function takes as argument (name=shapes, pos=3) "NxShape * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=shapes, pos=3) "NxShape * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: NxU32 NxScene::cullShapes(NxU32 nbPlanes, NxPlane const * worldPlanes, NxShapesType shapeType, NxU32 nbShapes, NxShape * * shapes, NxUserEntityReport<NxShape*> * callback, NxU32 activeGroups=0x0ffffffff, NxGroupsMask const * groupsMask=0) [member function]
-> warning W1051: The function takes as argument (name=shapes, pos=4) "NxShape * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=shapes, pos=4) "NxShape * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: bool NxUserContactModify::onContactConstraint(NxU32 & changeFlags, NxShape const * shape0, NxShape const * shape1, unsigned int const featureIndex0, unsigned int const featureIndex1, NxUserContactModify::NxContactCallbackData & data) [member function]
-> execution error W1009: The function takes as argument (name=changeFlags, pos=0) non-const reference to Python immutable
-> type - function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=changeFlags, pos=0) non-const reference to Python immutable type - function could not
+> be called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxUserNotify::onWake(NxActor * * actors, NxU32 count) [member function]
-> warning W1051: The function takes as argument (name=actors, pos=0) "NxActor * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=actors, pos=0) "NxActor * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: void NxUserNotify::onSleep(NxActor * * actors, NxU32 count) [member function]
-> warning W1051: The function takes as argument (name=actors, pos=0) "NxActor * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=actors, pos=0) "NxActor * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: bool NxUserEntityReport<NxShape*>::onEvent(NxU32 nbEntities, NxShape * * entities) [member function]
-> warning W1051: The function takes as argument (name=entities, pos=1) "NxShape * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=entities, pos=1) "NxShape * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: void NxVec3::set(NxF32 const * v) [member function]
-> execution error W1010: The function introduces registration order problem. For more information about the problem read next
-> document: http://language-binding.net/pyplusplus/documentation/functions/registration_order.html Problematic functions
-> list: void NxVec3::set(NxReal v) [member function]
+> execution error W1010: The function introduces registration order problem. For more information about the problem read next document: http
+> ://language-binding.net/pyplusplus/documentation/functions/registration_order.html Problematic functions list: void NxVec3::set(NxReal v)
+> [member function]
WARNING: void NxVec3::set(NxReal v) [member function]
-> execution error W1010: The function introduces registration order problem. For more information about the problem read next
-> document: http://language-binding.net/pyplusplus/documentation/functions/registration_order.html Problematic functions
-> list: void NxVec3::set(NxF32 const * v) [member function]
+> execution error W1010: The function introduces registration order problem. For more information about the problem read next document: http
+> ://language-binding.net/pyplusplus/documentation/functions/registration_order.html Problematic functions list: void NxVec3::set(NxF32
+> const * v) [member function]
WARNING: void NxQuat::getAngleAxis(NxReal & angle, NxVec3 & axis) const [member function]
-> execution error W1009: The function takes as argument (name=angle, pos=0) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=angle, pos=0) non-const reference to Python immutable type - function could not be
+> called from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: static void NxMath::sinCos(NxF32 f, NxF32 & s, NxF32 & c) [member function]
-> execution error W1009: The function takes as argument (name=s, pos=1) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=s, pos=1) non-const reference to Python immutable type - function could not be called
+> from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: static void NxMath::sinCos(NxF32 f, NxF32 & s, NxF32 & c) [member function]
-> execution error W1009: The function takes as argument (name=c, pos=2) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=c, pos=2) non-const reference to Python immutable type - function could not be called
+> from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: static void NxMath::sinCos(NxF64 a, NxF64 & s, NxF64 & c) [member function]
-> execution error W1009: The function takes as argument (name=s, pos=1) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=s, pos=1) non-const reference to Python immutable type - function could not be called
+> from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: static void NxMath::sinCos(NxF64 a, NxF64 & s, NxF64 & c) [member function]
-> execution error W1009: The function takes as argument (name=c, pos=2) non-const reference to Python immutable type -
-> function could not be called from Python. Take a look on "Function Transformation" functionality and define the
-> transformation.
+> execution error W1009: The function takes as argument (name=c, pos=2) non-const reference to Python immutable type - function could not be called
+> from Python. Take a look on "Function Transformation" functionality and define the transformation.
WARNING: void NxArray<NxShapeDesc*, NxAllocatorDefault>::insert(NxShapeDesc * * where, unsigned int n, NxShapeDesc * const & x) [member function]
-> warning W1051: The function takes as argument (name=where, pos=0) "NxShapeDesc * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=where, pos=0) "NxShapeDesc * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: void NxArray<NxShapeDesc*, NxAllocatorDefault>::erase(NxShapeDesc * * from, NxShapeDesc * * to) [member function]
-> warning W1051: The function takes as argument (name=from, pos=0) "NxShapeDesc * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=from, pos=0) "NxShapeDesc * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: void NxArray<NxShapeDesc*, NxAllocatorDefault>::erase(NxShapeDesc * * from, NxShapeDesc * * to) [member function]
-> warning W1051: The function takes as argument (name=to, pos=1) "NxShapeDesc * *" type. You have to specify a call policies
-> or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=to, pos=1) "NxShapeDesc * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: void NxArray<NxShapeDesc*, NxAllocatorDefault>::erase(NxShapeDesc * * from) [member function]
-> warning W1051: The function takes as argument (name=from, pos=0) "NxShapeDesc * *" type. You have to specify a call
-> policies or to use "Function Transformation" functionality.
+> warning W1051: The function takes as argument (name=from, pos=0) "NxShapeDesc * *" type. You have to specify a call policies or to use "Function
+> Transformation" functionality.
WARNING: void NxRemoteDebugger::writeParameter(NxReal const & parameter, void * object, bool create, char const * name, NxU32 mask) [member function]
> warning W1044: Py++ created an ugly alias ("writeParameter_b50e9ef8956c46e675a5e7f008b9dba4") for function wrapper.
@@ -487,9 +442,735 @@
> warning W1044: Py++ created an ugly alias ("writeParameter_7df00078d56d1bb262d4e9659c58bab9") for function wrapper.
WARNING: _Nx3F32 [struct]
-> execution error W1040: The declaration is unexposed, but there are other declarations, which refer to it. This could cause
-> "no to_python converter found" run time error. Declarations: NxVec3::NxVec3(Nx3F32 const & d) [constructor] NxVec3 const
-> & NxVec3::operator=(Nx3F32 const & d) [member operator]
+> execution error W1040: The declaration is unexposed, but there are other declarations, which refer to it. This could cause "no to_python converter
+> found" run time error. Declarations: NxVec3::NxVec3(Nx3F32 const & d) [constructor] NxVec3 const & NxVec3::operator=(Nx3F32 const & d) [member
+> operator]
+INFO: file "__array_1.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "__call_policies.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "named_tuple.py" - updated( 0.000000 seconds )
+
+INFO: file "NxActiveTransform.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActiveTransform.pypp.cpp" - updated( 0.010000 seconds )
+
+INFO: file "NxSweepCache.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxSweepCache.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActor.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActor.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActorDescBase.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActorDescBase.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActorDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActorDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActorGroupPair.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActorGroupPair.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActorPairFilter.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxActorPairFilter.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxAllocateable.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxAllocateable.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxAllocatorDefault.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxAllocatorDefault.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxArrayFluidEmitterDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxArrayFluidEmitterDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxArrayShapeDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxArrayShapeDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBitField.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBitField.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBodyDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBodyDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBounds3.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBounds3.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBox.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBox.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxForceFieldShape.pypp.hpp" - updated( 0.010000 seconds )
+
+INFO: file "NxForceFieldShape.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBoxForceFieldShape.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBoxForceFieldShape.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxForceFieldShapeDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxForceFieldShapeDesc.pypp.cpp" - updated( 0.010000 seconds )
+
+INFO: file "NxBoxForceFieldShapeDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBoxForceFieldShapeDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxShape.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxShape.pypp.cpp" - updated( 0.010000 seconds )
+
+INFO: file "NxBoxShape.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBoxShape.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxShapeDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxShapeDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBoxShapeDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxBoxShapeDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCCDSkeleton.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCCDSkeleton.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxSegment.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxSegment.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCapsule.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCapsule.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCapsuleForceFieldShape.pypp.hpp" - updated( 0.010000 seconds )
+
+INFO: file "NxCapsuleForceFieldShape.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCapsuleForceFieldShapeDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCapsuleForceFieldShapeDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCapsuleShape.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCapsuleShape.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCapsuleShapeDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCapsuleShapeDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCloth.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCloth.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxClothDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxClothDesc.pypp.cpp" - updated( 0.010000 seconds )
+
+INFO: file "NxClothMesh.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxClothMesh.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxSimpleTriangleMesh.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxSimpleTriangleMesh.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxClothMeshDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxClothMeshDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCompartment.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCompartment.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCompartmentDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCompartmentDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConstraintDominance.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConstraintDominance.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxContactPair.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxContactPair.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxContactStreamIterator.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxContactStreamIterator.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexForceFieldShape.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexForceFieldShape.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexForceFieldShapeDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexForceFieldShapeDesc.pypp.cpp" - updated( 0.010000 seconds )
+
+INFO: file "NxConvexMesh.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexMesh.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexMeshDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexMeshDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexShape.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexShape.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexShapeDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxConvexShapeDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxUserAllocator.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxUserAllocator.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxUserOutputStream.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxUserOutputStream.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCookingInterface.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCookingInterface.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCookingParams.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCookingParams.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxJoint.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxJoint.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCylindricalJoint.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCylindricalJoint.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxJointDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxJointDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCylindricalJointDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxCylindricalJointDesc.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxD6Joint.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxD6Joint.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxD6JointDesc.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxD6JointDesc.pypp.cpp" - updated( 0.010000 seconds )
+
+INFO: file "NxDebugLine.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxDebugLine.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxDebugPoint.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "NxDebugPoint.pypp.cpp" - updated( 0.000000 seconds )
+
+INFO: file "NxDebugRenderable.pypp.hpp" - updated( 0.000000 seconds )
+
+INFO: file "Nx...
[truncated message content] |
|
From: <and...@us...> - 2007-10-19 10:06:54
|
Revision: 443
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=443&view=rev
Author: andy_miller
Date: 2007-10-19 03:06:58 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Linux fixes
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp 2007-10-19 07:11:32 UTC (rev 442)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp 2007-10-19 10:06:58 UTC (rev 443)
@@ -567,10 +567,13 @@
s << "Cloth Mesh failed to cook";
NxThrow_Error(s.str());
- }
+ }
+
+ MemoryReadBuffer readbuffer (buf.data);
+ NxStream & streambuffer = dynamic_cast< NxStream & > (readbuffer);
+
+ mClothMesh = mOwner->getNxScene()->getPhysicsSDK().createClothMesh(streambuffer);
- mClothMesh = mOwner->getNxScene()->getPhysicsSDK().createClothMesh((NxStream)MemoryReadBuffer(buf.data));
-
#else
NxString filename;
@@ -729,8 +732,9 @@
NxThrow_Error(s.str());
}
-
- mClothMesh = mOwner->getNxScene()->getPhysicsSDK().createClothMesh((NxStream)MemoryReadBuffer(buf.data));
+ MemoryReadBuffer readbuffer (buf.data);
+ NxStream & streambuffer = dynamic_cast< NxStream & > (readbuffer);
+ mClothMesh = mOwner->getNxScene()->getPhysicsSDK().createClothMesh(streambuffer);
#else
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.cpp 2007-10-19 07:11:32 UTC (rev 442)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.cpp 2007-10-19 10:06:58 UTC (rev 443)
@@ -698,13 +698,13 @@
if (mEnum & NX_AF_DISABLE_COLLISION)
l.insert(NxString("NX_AF_DISABLE_COLLISION"));
-
+#ifndef NX_DISABLE_FLUIDS
if (mEnum & NX_FE_CONSTANT_PRESSURE)
l.insert(NxString("NX_FE_CONSTANT_PRESSURE"));
if (mEnum & NX_FE_CONSTANT_FLOW_RATE)
l.insert(NxString("NX_FE_CONSTANT_FLOW_RATE"));
-
+#endif
return l;
}
@@ -714,13 +714,13 @@
StringList EnumsBlueprint::AsNxEmitterShape() {
StringList l;
-
+#ifndef NX_DISABLE_FLUIDS
if (mEnum & NX_FE_RECTANGULAR)
l.insert(NxString("NX_FE_RECTANGULAR"));
if (mEnum & NX_FE_ELLIPSE)
l.insert(NxString("NX_FE_ELLIPSE"));
-
+ #endif
return l;
}
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp 2007-10-19 07:11:32 UTC (rev 442)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp 2007-10-19 10:06:58 UTC (rev 443)
@@ -170,8 +170,10 @@
NxThrow_Error(s.str());
}
-
- mSoftBodyMesh = mOwner->getNxScene()->getPhysicsSDK().createSoftBodyMesh((NxStream)MemoryReadBuffer(buf.data));
+ MemoryReadBuffer readbuffer (buf.data);
+ NxStream & streambuffer = dynamic_cast< NxStream & > (readbuffer);
+
+ mSoftBodyMesh = mOwner->getNxScene()->getPhysicsSDK().createSoftBodyMesh(streambuffer);
#else
@@ -319,8 +321,10 @@
NxThrow_Error(s.str());
}
+ MemoryReadBuffer readbuffer (buf.data);
+ NxStream & streambuffer = dynamic_cast< NxStream & > (readbuffer);
- mSoftBodyMesh = mOwner->getNxScene()->getPhysicsSDK().createSoftBodyMesh((NxStream)MemoryReadBuffer(buf.data));
+ mSoftBodyMesh = mOwner->getNxScene()->getPhysicsSDK().createSoftBodyMesh(streambuffer);
#else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-19 07:11:28
|
Revision: 442
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=442&view=rev
Author: andy_miller
Date: 2007-10-19 00:11:32 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Start of making NxOgre work under Linux -
# ifdefs to remove fluid functions and enums
# casting for Memorybuffers to NxStream
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.cpp
trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.h
trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp 2007-10-18 14:01:33 UTC (rev 441)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp 2007-10-19 07:11:32 UTC (rev 442)
@@ -569,7 +569,7 @@
NxThrow_Error(s.str());
}
- mClothMesh = mOwner->getNxScene()->getPhysicsSDK().createClothMesh(MemoryReadBuffer(buf.data));
+ mClothMesh = mOwner->getNxScene()->getPhysicsSDK().createClothMesh((NxStream)MemoryReadBuffer(buf.data));
#else
@@ -730,7 +730,7 @@
NxThrow_Error(s.str());
}
- mClothMesh = mOwner->getNxScene()->getPhysicsSDK().createClothMesh(MemoryReadBuffer(buf.data));
+ mClothMesh = mOwner->getNxScene()->getPhysicsSDK().createClothMesh((NxStream)MemoryReadBuffer(buf.data));
#else
@@ -1383,5 +1383,5 @@
return toVector3(vertices[vertex]);
}
-} //End of NxOgre namespace.
+} //End of NxOgre namespace.
////#endif
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.cpp 2007-10-18 14:01:33 UTC (rev 441)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.cpp 2007-10-19 07:11:32 UTC (rev 442)
@@ -71,12 +71,15 @@
case FT_NxSphericalJointFlag: return AsNxSphericalJointFlag(); break;
case FT_NxPulleyJointFlag: return AsNxPulleyJointFlag(); break;
case FT_NxContactPairFlag: return AsNxContactPairFlag(); break;
+
+#ifndef NX_DISABLE_FLUIDS
case FT_NxFluidSimulationMethod: return AsNxFluidSimulationMethod(); break;
case FT_NxFluidCollisionMethod: return AsNxFluidCollisionMethod(); break;
case FT_NxFluidFlag: return AsNxFluidFlag(); break;
+ case FT_NxFluidEmitterFlag: return AsNxFluidEmitterFlag(); break;
+#endif
case FT_NxEmitterType: return AsNxEmitterType(); break;
case FT_NxEmitterShape: return AsNxEmitterShape(); break;
- case FT_NxFluidEmitterFlag: return AsNxFluidEmitterFlag(); break;
case FT_NxClothFlag: return AsNxClothFlag(); break;
case FT_NxForceFieldCoordinates: return AsNxForceFieldCoordinates(); break;
case FT_NxSceneFlags: return AsNxSceneFlags(); break;
@@ -567,6 +570,10 @@
}
+
+
+#ifndef NX_DISABLE_FLUIDS
+
////////////////////////////////////////////////////////////////////////////////////////////////
StringList EnumsBlueprint::AsNxFluidSimulationMethod() {
@@ -632,44 +639,8 @@
return l;
}
-
////////////////////////////////////////////////////////////////////////////////////////////////
-StringList EnumsBlueprint::AsNxEmitterType() {
-
- StringList l;
-
- if (mEnum & NX_AF_DISABLE_COLLISION)
- l.insert(NxString("NX_AF_DISABLE_COLLISION"));
-
- if (mEnum & NX_FE_CONSTANT_PRESSURE)
- l.insert(NxString("NX_FE_CONSTANT_PRESSURE"));
-
- if (mEnum & NX_FE_CONSTANT_FLOW_RATE)
- l.insert(NxString("NX_FE_CONSTANT_FLOW_RATE"));
-
- return l;
-
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-StringList EnumsBlueprint::AsNxEmitterShape() {
-
- StringList l;
-
- if (mEnum & NX_FE_RECTANGULAR)
- l.insert(NxString("NX_FE_RECTANGULAR"));
-
- if (mEnum & NX_FE_ELLIPSE)
- l.insert(NxString("NX_FE_ELLIPSE"));
-
- return l;
-
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
StringList EnumsBlueprint::AsNxFluidEmitterFlag() {
StringList l;
@@ -716,8 +687,47 @@
}
+#endif // NX_DISABLE_FLUIDS
+
+
////////////////////////////////////////////////////////////////////////////////////////////////
+StringList EnumsBlueprint::AsNxEmitterType() {
+
+ StringList l;
+
+ if (mEnum & NX_AF_DISABLE_COLLISION)
+ l.insert(NxString("NX_AF_DISABLE_COLLISION"));
+
+ if (mEnum & NX_FE_CONSTANT_PRESSURE)
+ l.insert(NxString("NX_FE_CONSTANT_PRESSURE"));
+
+ if (mEnum & NX_FE_CONSTANT_FLOW_RATE)
+ l.insert(NxString("NX_FE_CONSTANT_FLOW_RATE"));
+
+ return l;
+
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+StringList EnumsBlueprint::AsNxEmitterShape() {
+
+ StringList l;
+
+ if (mEnum & NX_FE_RECTANGULAR)
+ l.insert(NxString("NX_FE_RECTANGULAR"));
+
+ if (mEnum & NX_FE_ELLIPSE)
+ l.insert(NxString("NX_FE_ELLIPSE"));
+
+ return l;
+
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+
StringList EnumsBlueprint::AsNxClothFlag() {
StringList l;
@@ -1188,4 +1198,4 @@
////////////////////////////////////////////////////////////////////////////////////////////////
} //End of Serialiser namespace.
-} //End of NxOgre namespace.
+} //End of NxOgre namespace.
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.h
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.h 2007-10-18 14:01:33 UTC (rev 441)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.h 2007-10-19 07:11:32 UTC (rev 442)
@@ -49,12 +49,16 @@
FT_NxSphericalJointFlag,
FT_NxPulleyJointFlag,
FT_NxContactPairFlag,
+
+ #ifndef NX_DISABLE_FLUIDS
FT_NxFluidSimulationMethod,
FT_NxFluidCollisionMethod,
FT_NxFluidFlag,
+ FT_NxFluidEmitterFlag,
+ #endif
+
FT_NxEmitterType,
FT_NxEmitterShape,
- FT_NxFluidEmitterFlag,
FT_NxClothFlag,
FT_NxForceFieldCoordinates,
FT_NxSceneFlags,
@@ -102,12 +106,16 @@
StringList AsNxSphericalJointFlag();
StringList AsNxPulleyJointFlag();
StringList AsNxContactPairFlag();
+
+ #ifndef NX_DISABLE_FLUIDS
StringList AsNxFluidSimulationMethod();
StringList AsNxFluidCollisionMethod();
StringList AsNxFluidFlag();
+ StringList AsNxFluidEmitterFlag();
+ #endif
+
StringList AsNxEmitterType();
StringList AsNxEmitterShape();
- StringList AsNxFluidEmitterFlag();
StringList AsNxClothFlag();
StringList AsNxForceFieldCoordinates();
StringList AsNxSceneFlags();
Modified: trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp 2007-10-18 14:01:33 UTC (rev 441)
+++ trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp 2007-10-19 07:11:32 UTC (rev 442)
@@ -171,7 +171,7 @@
NxThrow_Error(s.str());
}
- mSoftBodyMesh = mOwner->getNxScene()->getPhysicsSDK().createSoftBodyMesh(MemoryReadBuffer(buf.data));
+ mSoftBodyMesh = mOwner->getNxScene()->getPhysicsSDK().createSoftBodyMesh((NxStream)MemoryReadBuffer(buf.data));
#else
@@ -320,7 +320,7 @@
NxThrow_Error(s.str());
}
- mSoftBodyMesh = mOwner->getNxScene()->getPhysicsSDK().createSoftBodyMesh(MemoryReadBuffer(buf.data));
+ mSoftBodyMesh = mOwner->getNxScene()->getPhysicsSDK().createSoftBodyMesh((NxStream)MemoryReadBuffer(buf.data));
#else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-18 14:01:29
|
Revision: 441
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=441&view=rev
Author: andy_miller
Date: 2007-10-18 07:01:33 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Further Linux updates -- remove a file a fix a typo
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsMeshToShapeConverter.cpp
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConvexCast.cpp
Deleted: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConvexCast.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConvexCast.cpp 2007-10-18 11:00:31 UTC (rev 440)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConvexCast.cpp 2007-10-18 14:01:33 UTC (rev 441)
@@ -1,23 +0,0 @@
-
-#include "OgreBulletCollisions.h"
-
-#include "OgreBulletCollisionsEmptyShape.h"
-
-using namespace Ogre;
-using namespace OgreBulletCollisions;
-
-namespace OgreBulletCollisions
-{
- // -------------------------------------------------------- //
- EmptyCollisionShape::EmptyCollisionShape():
- CollisionShape()
- {
- mShape = new btEmptyShape();
- }
- // -------------------------------------------------------- //
- EmptyCollisionShape::~EmptyCollisionShape()
- {
- }
-
-}
-
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsMeshToShapeConverter.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsMeshToShapeConverter.cpp 2007-10-18 11:00:31 UTC (rev 440)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsMeshToShapeConverter.cpp 2007-10-18 14:01:33 UTC (rev 441)
@@ -28,7 +28,7 @@
#include "Utils/OgreBulletCollisionsMeshToShapeConverter.h"
-#include "Shapes/OgreBulletCollisionsTriMeshShape.h"
+#include "Shapes/OgreBulletCollisionsTrimeshShape.h"
#include "Shapes/OgreBulletCollisionsCylinderShape.h"
#include "Shapes/OgreBulletCollisionsSphereShape.h"
#include "Shapes/OgreBulletCollisionsBoxShape.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-18 11:00:28
|
Revision: 440
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=440&view=rev
Author: andy_miller
Date: 2007-10-18 04:00:31 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Maybe ogrebullet to correct this time ?? :)
Added Paths:
-----------
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
Added: trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h 2007-10-18 11:00:31 UTC (rev 440)
@@ -0,0 +1,56 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef _OGREBULLETDYNAMICS_PREREQUISITES_H
+#define _OGREBULLETDYNAMICS_PREREQUISITES_H
+
+#include "btBulletCollisionCommon.h"
+#include "btBulletDynamicsCommon.h"
+
+#include "Ogre.h"
+#include "OgreBulletCollisions.h"
+
+
+namespace OgreBulletDynamics
+{
+ class RigidBody;
+ class PhysicState;
+ class DynamicsWorld;
+
+ class TypedConstraint;
+ class HingeConstraint;
+ class SixDofConstraint;
+ class PointToPointConstraint;
+ class ConeTwistConstraint;
+
+ class WheeledRigidBody;
+ class VehicleRayCaster;
+ class VehicleTuning;
+ class RaycastVehicle;
+ class WheelInfo;
+}
+
+#endif //_OGREBULLETDYNAMICS_PREREQUISITES_H
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-18 10:59:58
|
Revision: 439
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=439&view=rev
Author: andy_miller
Date: 2007-10-18 04:00:01 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h
Deleted: trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h 2007-10-18 10:59:21 UTC (rev 438)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h 2007-10-18 11:00:01 UTC (rev 439)
@@ -1,56 +0,0 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
-(Object-oriented Graphics Rendering Engine Bullet Wrapper)
-For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
-Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef _OGREBULLETDYNAMICS_PREREQUISITES_H
-#define _OGREBULLETDYNAMICS_PREREQUISITES_H
-
-#include "btBulletCollisionCommon.h"
-#include "btBulletDynamicsCommon.h"
-
-#include "Ogre.h"
-#include "OgreBulletCollisions.h"
-
-
-namespace OgreBulletDynamics
-{
- class RigidBody;
- class PhysicState;
- class DynamicsWorld;
-
- class TypedConstraint;
- class HingeConstraint;
- class SixDofConstraint;
- class PointToPointConstraint;
- class ConeTwistConstraint;
-
- class WheeledRigidBody;
- class VehicleRayCaster;
- class VehicleTuning;
- class RaycastVehicle;
- class WheelInfo;
-}
-
-#endif //_OGREBULLETDYNAMICS_PREREQUISITES_H
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-18 10:59:40
|
Revision: 438
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=438&view=rev
Author: andy_miller
Date: 2007-10-18 03:59:21 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h
Added: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h 2007-10-18 10:59:21 UTC (rev 438)
@@ -0,0 +1,89 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef _OGREBULLETCOLLISIONS_PREREQUISITES_H
+#define _OGREBULLETCOLLISIONS_PREREQUISITES_H
+
+#include "btBulletCollisionCommon.h"
+
+#include "Ogre.h"
+
+/* Some <math.h> files do not define M_PI... */
+#ifndef M_PI
+#define M_PI 3.14159265
+#endif
+
+namespace OgreBulletCollisions
+{
+ class BtOgreConverter;
+ class OgreBtConverter;
+
+ class CollisionsWorld;
+
+ class CollisionRayResultCallback;
+ class CollisionClosestRayResultCallback;
+
+ class DebugLines;
+
+ class DebugDrawer;
+
+ class DebugContact;
+ class DebugNormal;
+ class DebugContactText;
+
+ class DebugCollisionShape;
+ class BoxDebugShape;
+ class SphereDebugShape;
+ class ConeDebugShape;
+ class TriangleMeshDebugShape;
+ class RayDebugShape;
+
+ class CollisionShape;
+ class BoxCollisionShape;
+ class SphereCollisionShape;
+ class CylinderCollisionShape;
+ class ConeCollisionShape;
+
+ class CompoundCollisionShape;
+
+ class MultiSphereCollisionShape;
+ class MinkowskiSumCollisionShape;
+
+ class ConvexHullCollisionShape;
+ class TriangleMeshCollisionShape;
+
+ class Object;
+
+ class ObjectState;
+
+ typedef std::vector<Ogre::Vector3> Vector3Vector;
+ typedef std::map<unsigned char, Vector3Vector* > BoneIndex;
+ typedef std::pair<unsigned short, Vector3Vector* > BoneKeyIndex;
+
+}
+
+#endif //_OGREBULLETCOLLISIONS_PREREQUISITES_H
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-18 10:58:56
|
Revision: 437
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=437&view=rev
Author: andy_miller
Date: 2007-10-18 03:58:59 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h
Deleted: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h 2007-10-18 05:11:08 UTC (rev 436)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h 2007-10-18 10:58:59 UTC (rev 437)
@@ -1,89 +0,0 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
-(Object-oriented Graphics Rendering Engine Bullet Wrapper)
-For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
-Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef _OGREBULLETCOLLISIONS_PREREQUISITES_H
-#define _OGREBULLETCOLLISIONS_PREREQUISITES_H
-
-#include "btBulletCollisionCommon.h"
-
-#include "Ogre.h"
-
-/* Some <math.h> files do not define M_PI... */
-#ifndef M_PI
-#define M_PI 3.14159265
-#endif
-
-namespace OgreBulletCollisions
-{
- class BtOgreConverter;
- class OgreBtConverter;
-
- class CollisionsWorld;
-
- class CollisionRayResultCallback;
- class CollisionClosestRayResultCallback;
-
- class DebugLines;
-
- class DebugDrawer;
-
- class DebugContact;
- class DebugNormal;
- class DebugContactText;
-
- class DebugCollisionShape;
- class BoxDebugShape;
- class SphereDebugShape;
- class ConeDebugShape;
- class TriangleMeshDebugShape;
- class RayDebugShape;
-
- class CollisionShape;
- class BoxCollisionShape;
- class SphereCollisionShape;
- class CylinderCollisionShape;
- class ConeCollisionShape;
-
- class CompoundCollisionShape;
-
- class MultiSphereCollisionShape;
- class MinkowskiSumCollisionShape;
-
- class ConvexHullCollisionShape;
- class TriangleMeshCollisionShape;
-
- class Object;
-
- class ObjectState;
-
- typedef std::vector<Ogre::Vector3> Vector3Vector;
- typedef std::map<unsigned char, Vector3Vector* > BoneIndex;
- typedef std::pair<unsigned short, Vector3Vector* > BoneKeyIndex;
-
-}
-
-#endif //_OGREBULLETCOLLISIONS_PREREQUISITES_H
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-18 05:11:13
|
Revision: 436
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=436&view=rev
Author: andy_miller
Date: 2007-10-17 22:11:08 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
ogrebullet BACK into the SVN
Added Paths:
-----------
trunk/python-ogre/ThirdParty/ogrebullet/
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisions.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsBoxShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsCompoundShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConeShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConvexCast.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConvexCast.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConvexHullShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsCylinderShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsDebugContact.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsDebugDrawer.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsDebugLines.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsDebugShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsMeshToShapeConverter.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsMinkowskiSumShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsMultiSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObject.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObject.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrecompiled.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsStaticPlaneShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsTriangleShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsTrimeshShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamics.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamics6DofConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsConeTwistConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsHingeConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsObjectState.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPoint2pointConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrecompiled.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRaycastVehicle.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRigidBody.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRigidBody.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.h
Added: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp 2007-10-18 05:11:08 UTC (rev 436)
@@ -0,0 +1,650 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "OgreBulletCollisions.h"
+
+#include "Ogre.h"
+#include "OgreFontManager.h"
+
+#include "Debug/OgreBulletCollisionsDebugContact.h"
+#include "OgreBulletCollisionsShape.h"
+#include "OgreBulletCollisionsObject.h"
+#include "OgreBulletCollisionsWorld.h"
+
+using namespace Ogre;
+
+#define POS_TEX_BINDING 0
+#define COLOUR_BINDING 1
+
+namespace OgreBulletCollisions
+{
+ //------------------------------------------------------------------------------------------------
+ DebugContact::DebugContact(const String &name, CollisionsWorld *world) :
+ _name(name),
+ _world(world),
+ _enabled(false)
+ {
+ // scene node
+ _node = _world->getSceneManager()->getRootSceneNode ()->createChildSceneNode ();
+
+ // sphere attach to contact point
+ _point = _world->getSceneManager()->createEntity(name + String("_debug_point"), "sphere.mesh");
+ _point_node = _node->createChildSceneNode ();
+ _point_node->attachObject (_point);
+ _point_node->setScale(0.001, 0.001, 0.001);
+
+ // normal direction debug
+ _normal = new DebugNormal();
+ _node->attachObject (_normal);
+
+ // text info on contact
+ _text = new DebugContactText(name + String("_debug_text"), _node->createChildSceneNode ());
+ _text->setPosition (Vector3(0,5,0));
+ _text->setCaption ("-");
+ _text->setVisible (false);
+
+ _node->setVisible (false);
+ }
+ //------------------------------------------------------------------------------------------------
+ DebugContact::~DebugContact()
+ {
+ delete _text;
+
+ _point_node->detachObject (_point->getName ());
+ _node->detachObject (_normal->getName ());
+
+ _world->getSceneManager()->destroyEntity (_point->getName ());
+
+ _node->detachAllObjects ();
+ _node->removeAndDestroyAllChildren ();
+
+ delete _normal;
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContact::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
+ {
+ _node->setPosition (pt);
+
+ _point_node->setPosition (depth * normal);
+
+ //String contactLabel("p: ");
+ //contactLabel = contactLabel + StringConverter::toString(contact->getPosition());
+ //contactLabel = contactLabel + ", n: ";
+ //contactLabel = contactLabel + StringConverter::toString(contact->getNormal());
+ //_text->setCaption (contactLabel);
+ //_text->setVisible (false);
+
+ //_text->setPosition (contact->getPosition () + Vector3(0,5,0));
+
+ _normal->update (normal, pt, depth);
+ }
+ //------------------------------------------------------------------------------------------------
+ bool DebugContact::isEnabled () const
+ {
+ return _enabled;
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContact::setEnabled (bool enable)
+ {
+ _enabled = enable;
+ _node->setVisible (_enabled);
+ };
+ //------------------------------------------------------------------------------------------------
+ void DebugNormal::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
+ {
+ DebugLines::clear ();
+ // set normal following contact normal
+ //contact->_normal
+ //contact->_position
+ DebugLines::addLine (Vector3::ZERO,
+ 5*normal);
+ DebugLines::draw ();
+ }
+ //------------------------------------------------------------------------------------------------
+ DebugContactText::DebugContactText(const String &name,
+ SceneNode *node,
+ const String &caption,
+ const String &fontName,
+ int charHeight,
+ const ColourValue &color)
+ : mpCam(NULL)
+ , mpWin(NULL)
+ , mpFont(NULL)
+ , mName(name)
+ , mCaption(caption)
+ , mFontName(fontName)
+ , mCharHeight(charHeight)
+ , mColor(color)
+ , mType("DebugContact")
+ , mTimeUntilNextToggle(0)
+ , mSpaceWidth(0)
+ , mUpdateColors(true)
+ , mOnTop(false)
+ , mHorizontalAlignment(H_LEFT)
+ , mVerticalAlignment(V_BELOW)
+ , mAdditionalHeight(0.0)
+ , mNode(node)
+
+ {
+ if (name.empty())
+ Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without name", "DebugContact::DebugContact");
+//
+// if (caption.empty())
+// Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without caption", "DebugContact::DebugContact");
+
+ mRenderOp.vertexData = NULL;
+ this->setFontName(mFontName);
+ //this->_setupGeometry();
+ mNode->attachObject(this);
+ }
+ //------------------------------------------------------------------------------------------------
+ DebugContactText::~DebugContactText()
+ {
+ mNode->detachObject(this->getName());
+ if (mRenderOp.vertexData)
+ delete mRenderOp.vertexData;
+ }
+#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
+ void DebugContactText::visitRenderables(Renderable::Visitor* visitor,
+ bool debugRenderables)
+ {
+ visitor->visit(this, 0, false);
+ }
+#endif
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setPosition(const Vector3 &pos)
+ {
+ mNode->setPosition (pos);
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setFontName(const String &fontName)
+ {
+ if((Ogre::MaterialManager::getSingletonPtr()->resourceExists(mName + "Material")))
+ {
+ Ogre::MaterialManager::getSingleton().remove(mName + "Material");
+ }
+
+ if (mFontName != fontName || mpMaterial.isNull() || !mpFont)
+ {
+ mFontName = fontName;
+ mpFont = (Font *)FontManager::getSingleton().getByName(mFontName).getPointer();
+ if (!mpFont)
+ Exception(Exception::ERR_ITEM_NOT_FOUND, "Could not find font " + fontName, "DebugContact::setFontName");
+
+ mpFont->load();
+ if (!mpMaterial.isNull())
+ {
+ MaterialManager::getSingletonPtr()->remove(mpMaterial->getName());
+ mpMaterial.setNull();
+ }
+
+ mpMaterial = mpFont->getMaterial()->clone(mName + "Material");
+ if (!mpMaterial->isLoaded())
+ mpMaterial->load();
+
+ mpMaterial->setDepthCheckEnabled(!mOnTop);
+ //mpMaterial->setDepthBias(!mOnTop);
+ mpMaterial->setDepthBias(0,!mOnTop);
+ mpMaterial->setDepthWriteEnabled(mOnTop);
+ mpMaterial->setLightingEnabled(false);
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setCaption(const String &caption)
+ {
+ if (caption != mCaption)
+ {
+ mCaption = caption;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setColor(const ColourValue &color)
+ {
+ if (color != mColor)
+ {
+ mColor = color;
+ mUpdateColors = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setCharacterHeight(unsigned int height)
+ {
+ if (height != mCharHeight)
+ {
+ mCharHeight = height;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setSpaceWidth(unsigned int width)
+ {
+ if (width != mSpaceWidth)
+ {
+ mSpaceWidth = width;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setTextAlignment(const HorizontalAlignment& horizontalAlignment, const VerticalAlignment& verticalAlignment)
+ {
+ if(mHorizontalAlignment != horizontalAlignment)
+ {
+ mHorizontalAlignment = horizontalAlignment;
+ mNeedUpdate = true;
+ }
+ if(mVerticalAlignment != verticalAlignment)
+ {
+ mVerticalAlignment = verticalAlignment;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setAdditionalHeight( Real height )
+ {
+ if( mAdditionalHeight != height )
+ {
+ mAdditionalHeight = height;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::showOnTop(bool show)
+ {
+ if( mOnTop != show && !mpMaterial.isNull() )
+ {
+ mOnTop = show;
+ mpMaterial->setDepthBias(0,!mOnTop);
+ mpMaterial->setDepthCheckEnabled(!mOnTop);
+ mpMaterial->setDepthWriteEnabled(mOnTop);
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::_setupGeometry()
+ {
+ assert(mpFont);
+ assert(!mpMaterial.isNull());
+
+ unsigned int vertexCount = static_cast<unsigned int>(mCaption.size() * 6);
+
+ if (mRenderOp.vertexData)
+ {
+ // Removed this test as it causes problems when replacing a caption
+ // of the same size: replacing "Hello" with "hello"
+ // as well as when changing the text alignment
+ //if (mRenderOp.vertexData->vertexCount != vertexCount)
+ {
+ delete mRenderOp.vertexData;
+ mRenderOp.vertexData = NULL;
+ mUpdateColors = true;
+ }
+ }
+
+ if (!mRenderOp.vertexData)
+ mRenderOp.vertexData = new VertexData();
+
+ mRenderOp.indexData = 0;
+ mRenderOp.vertexData->vertexStart = 0;
+ mRenderOp.vertexData->vertexCount = vertexCount;
+ mRenderOp.operationType = RenderOperation::OT_TRIANGLE_LIST;
+ mRenderOp.useIndexes = false;
+
+ VertexDeclaration *decl = mRenderOp.vertexData->vertexDeclaration;
+ VertexBufferBinding *bind = mRenderOp.vertexData->vertexBufferBinding;
+ size_t offset = 0;
+
+ // create/bind positions/tex.ccord. buffer
+ if (!decl->findElementBySemantic(VES_POSITION))
+ decl->addElement(POS_TEX_BINDING, offset, VET_FLOAT3, VES_POSITION);
+
+ offset += VertexElement::getTypeSize(VET_FLOAT3);
+
+ if (!decl->findElementBySemantic(VES_TEXTURE_COORDINATES))
+ decl->addElement(POS_TEX_BINDING, offset, Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES, 0);
+
+ HardwareVertexBufferSharedPtr ptbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(POS_TEX_BINDING),
+ mRenderOp.vertexData->vertexCount,
+ HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
+ bind->setBinding(POS_TEX_BINDING, ptbuf);
+
+ // Colours - store these in a separate buffer because they change less often
+ if (!decl->findElementBySemantic(VES_DIFFUSE))
+ decl->addElement(COLOUR_BINDING, 0, VET_COLOUR, VES_DIFFUSE);
+
+ HardwareVertexBufferSharedPtr cbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(COLOUR_BINDING),
+ mRenderOp.vertexData->vertexCount,
+ HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
+ bind->setBinding(COLOUR_BINDING, cbuf);
+
+ size_t charlen = mCaption.size();
+ Real *pPCBuff = static_cast<Real*>(ptbuf->lock(HardwareBuffer::HBL_DISCARD));
+
+ float largestWidth = 0;
+ float left = 0 * 2.0 - 1.0;
+ float top = -((0 * 2.0) - 1.0);
+
+ // Derive space width from a capital A
+ if (mSpaceWidth == 0)
+ mSpaceWidth = mpFont->getGlyphAspectRatio('A') * mCharHeight * 2.0;
+
+ // for calculation of AABB
+ Ogre::Vector3 min, max, currPos;
+ Ogre::Real maxSquaredRadius;
+ bool first = true;
+
+ // Use iterator
+ String::iterator i, iend;
+ iend = mCaption.end();
+ bool newLine = true;
+ Real len = 0.0f;
+
+ if(mVerticalAlignment == DebugContactText::V_ABOVE)
+ {
+ // Raise the first line of the caption
+ top += mCharHeight;
+ for (i = mCaption.begin(); i != iend; ++i)
+ {
+ if (*i == '\n')
+ top += mCharHeight * 2.0;
+ }
+ }
+
+ for (i = mCaption.begin(); i != iend; ++i)
+ {
+ if (newLine)
+ {
+ len = 0.0f;
+ for (String::iterator j = i; j != iend && *j != '\n'; j++)
+ {
+ if (*j == ' ')
+ len += mSpaceWidth;
+ else
+ len += mpFont->getGlyphAspectRatio(*j) * mCharHeight * 2.0;
+ }
+ newLine = false;
+ }
+
+ if (*i == '\n')
+ {
+ left = 0 * 2.0 - 1.0;
+ top -= mCharHeight * 2.0;
+ newLine = true;
+ continue;
+ }
+
+ if (*i == ' ')
+ {
+ // Just leave a gap, no tris
+ left += mSpaceWidth;
+ // Also reduce tri count
+ mRenderOp.vertexData->vertexCount -= 6;
+ continue;
+ }
+
+ Real horiz_height = mpFont->getGlyphAspectRatio(*i);
+
+ //mpFont->getGlyphTexCoords(*i, u1, v1, u2, v2);
+ const Font::UVRect &uvRect = mpFont->getGlyphTexCoords(*i);
+ const Real u1 = uvRect.left;
+ const Real u2 = uvRect.right;
+ const Real v1 = uvRect.top;
+ const Real v2 = uvRect.bottom;
+
+ // each vert is (x, y, z, u, v)
+ //-------------------------------------------------------------------------------------
+ // First tri
+ //
+ // Upper left
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u1;
+ *pPCBuff++ = v1;
+
+ // Deal with bounds
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ currPos = Ogre::Vector3(left, top, -1.0);
+ else
+ currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
+ if (first)
+ {
+ min = max = currPos;
+ maxSquaredRadius = currPos.squaredLength();
+ first = false;
+ }
+ else
+ {
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+ }
+
+ top -= mCharHeight * 2.0;
+
+ // Bottom left
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u1;
+ *pPCBuff++ = v2;
+
+ // Deal with bounds
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ currPos = Ogre::Vector3(left, top, -1.0);
+ else
+ currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ top += mCharHeight * 2.0;
+ left += horiz_height * mCharHeight * 2.0;
+
+ // Top right
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u2;
+ *pPCBuff++ = v1;
+ //-------------------------------------------------------------------------------------
+
+ // Deal with bounds
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ currPos = Ogre::Vector3(left, top, -1.0);
+ else
+ currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ //-------------------------------------------------------------------------------------
+ // Second tri
+ //
+ // Top right (again)
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u2;
+ *pPCBuff++ = v1;
+
+ currPos = Ogre::Vector3(left, top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ top -= mCharHeight * 2.0;
+ left -= horiz_height * mCharHeight * 2.0;
+
+ // Bottom left (again)
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u1;
+ *pPCBuff++ = v2;
+
+ currPos = Ogre::Vector3(left, top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ left += horiz_height * mCharHeight * 2.0;
+
+ // Bottom right
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u2;
+ *pPCBuff++ = v2;
+ //-------------------------------------------------------------------------------------
+
+ currPos = Ogre::Vector3(left, top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ // Go back up with top
+ top += mCharHeight * 2.0;
+
+ float currentWidth = (left + 1)/2 - 0;
+ if (currentWidth > largestWidth)
+ largestWidth = currentWidth;
+ }
+
+ // Unlock vertex buffer
+ ptbuf->unlock();
+
+ // update AABB/Sphere radius
+ mAABB = Ogre::AxisAlignedBox(min, max);
+ mRadius = Ogre::Math::Sqrt(maxSquaredRadius);
+
+ if (mUpdateColors)
+ this->_updateColors();
+
+ mNeedUpdate = false;
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::_updateColors(void)
+ {
+ assert(mpFont);
+ assert(!mpMaterial.isNull());
+
+ // Convert to system-specific
+ RGBA color;
+ Root::getSingleton().convertColourValue(mColor, &color);
+ HardwareVertexBufferSharedPtr vbuf = mRenderOp.vertexData->vertexBufferBinding->getBuffer(COLOUR_BINDING);
+ RGBA *pDest = static_cast<RGBA*>(vbuf->lock(HardwareBuffer::HBL_DISCARD));
+ for (unsigned int i = 0; i < mRenderOp.vertexData->vertexCount; ++i)
+ *pDest++ = color;
+ vbuf->unlock();
+ mUpdateColors = false;
+ }
+ //------------------------------------------------------------------------------------------------
+ const Quaternion& DebugContactText::getWorldOrientation(void) const
+ {
+ assert(mpCam);
+ return const_cast<Quaternion&>(mpCam->getDerivedOrientation());
+ }
+ //------------------------------------------------------------------------------------------------
+ const Vector3& DebugContactText::getWorldPosition(void) const
+ {
+ assert(mParentNode);
+ return mParentNode->_getDerivedPosition();
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::getWorldTransforms(Matrix4 *xform) const
+ {
+ if (this->isVisible() && mpCam)
+ {
+ Matrix3 rot3x3, scale3x3 = Matrix3::IDENTITY;
+
+ // store rotation in a matrix
+ mpCam->getDerivedOrientation().ToRotationMatrix(rot3x3);
+
+ // parent node position
+ Vector3 ppos = mParentNode->_getDerivedPosition() + Vector3::UNIT_Y*mAdditionalHeight;
+
+ // apply scale
+ scale3x3[0][0] = mParentNode->_getDerivedScale().x / 2;
+ scale3x3[1][1] = mParentNode->_getDerivedScale().y / 2;
+ scale3x3[2][2] = mParentNode->_getDerivedScale().z / 2;
+
+ // apply all transforms to xform
+ *xform = (rot3x3 * scale3x3);
+ xform->setTrans(ppos);
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::getRenderOperation(RenderOperation &op)
+ {
+ if (this->isVisible())
+ {
+ if (mNeedUpdate)
+ this->_setupGeometry();
+ if (mUpdateColors)
+ this->_updateColors();
+ op = mRenderOp;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::_notifyCurrentCamera(Camera *cam)
+ {
+ mpCam = cam;
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::_updateRenderQueue(RenderQueue* queue)
+ {
+ if (this->isVisible())
+ {
+ if (mNeedUpdate)
+ this->_setupGeometry();
+ if (mUpdateColors)
+ this->_updateColors();
+
+ queue->addRenderable(this, mRenderQueueID, OGRE_RENDERABLE_DEFAULT_PRIORITY);
+ // queue->addRenderable(this, mRenderQueueID, RENDER_QUEUE_SKIES_LATE);
+ }
+ }
+}
Added: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h 2007-10-18 05:11:08 UTC (rev 436)
@@ -0,0 +1,177 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+ (Object-oriented Graphics Rendering Engine Bullet Wrapper)
+ For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+ Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef __OgreBulletCollisionsDebugContact_H__
+#define __OgreBulletCollisionsDebugContact_H__
+
+#include "OgreBulletCollisionsPreRequisites.h"
+#include "Debug/OgreBulletCollisionsDebugLines.h"
+
+
+namespace OgreBulletCollisions
+{
+ //------------------------------------------------------------------------------------------------
+ class DebugContact
+ {
+ public:
+ DebugContact(const Ogre::String &name, CollisionsWorld *world);
+ ~DebugContact();
+
+ bool isEnabled () const;
+ void setEnabled (bool enable);
+
+ void update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth);
+
+ private:
+ DebugNormal *_normal;
+ DebugContactText *_text;
+ Ogre::Entity *_point;
+ bool _enabled;
+ Ogre::String _name;
+ Ogre::SceneNode *_node;
+ Ogre::SceneNode *_point_node;
+ CollisionsWorld *_world;
+ };
+
+ //------------------------------------------------------------------------------------------------
+ class DebugNormal : public DebugLines
+ {
+ public:
+ DebugNormal() : DebugLines(){};
+ ~DebugNormal(){};
+
+ void update (const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth);
+ };
+
+ //------------------------------------------------------------------------------------------------
+ class DebugContactText : public Ogre::MovableObject, public Ogre::Renderable
+ {
+ public:
+ enum HorizontalAlignment {H_LEFT, H_CENTER};
+ enum VerticalAlignment {V_BELOW, V_ABOVE};
+ /******************************** public methods ******************************/
+ public:
+ DebugContactText(const Ogre::String &name,
+ Ogre::SceneNode *node,
+ const Ogre::String &caption = "",
+ const Ogre::String &fontName = "BlueHighway",
+ int charHeight = 32,
+ const Ogre::ColourValue &color = Ogre::ColourValue::White);
+
+
+ ~DebugContactText();
+
+#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
+ void visitRenderables(Renderable::Visitor* visitor, bool debugRenderables);
+#endif
+ // Set settings
+ void setPosition(const Ogre::Vector3 &pos);
+
+ void setFontName(const Ogre::String &fontName);
+ void setCaption(const Ogre::String &caption);
+ void setColor(const Ogre::ColourValue &color);
+ void setCharacterHeight(unsigned int height);
+ void setSpaceWidth(unsigned int width);
+ void setTextAlignment(const HorizontalAlignment& horizontalAlignment,
+ const VerticalAlignment& verticalAlignment);
+ void setAdditionalHeight( Ogre::Real height );
+ void showOnTop(bool show=true);
+
+ // Get settings
+ const Ogre::String &getFontName() const {return mFontName;}
+ const Ogre::String &getCaption() const {return mCaption;}
+ const Ogre::ColourValue &getColor() const {return mColor;}
+
+ unsigned int getCharacterHeight() const {return mCharHeight;}
+ unsigned int getSpaceWidth() const {return mSpaceWidth;}
+ Ogre::Real getAdditionalHeight() const {return mAdditionalHeight;}
+ bool getShowOnTop() const {return mOnTop;}
+ Ogre::AxisAlignedBox GetAABB(void) { return mAABB; }
+
+ /******************************** protected methods and overload **************/
+ protected:
+
+ // from OgreBulletCollisionsDebugContact, create the object
+ void _setupGeometry();
+ void _updateColors();
+
+ // from MovableObject
+ void getWorldTransforms(Ogre::Matrix4 *xform) const;
+ Ogre::Real getBoundingRadius(void) const {return mRadius;};
+ Ogre::Real getSquaredViewDepth(const Ogre::Camera *cam) const {return 0;};
+ const Ogre::Quaternion &getWorldOrientation(void) const;
+ const Ogre::Vector3 &getWorldPosition(void) const;
+ const Ogre::AxisAlignedBox &getBoundingBox(void) const {return mAABB;};
+ const Ogre::String &getName(void) const {return mName;};
+ const Ogre::String &getMovableType(void) const {static Ogre::String movType = "MovableText"; return movType;};
+
+ void _notifyCurrentCamera(Ogre::Camera *cam);
+ void _updateRenderQueue(Ogre::RenderQueue* queue);
+
+ // from renderable
+ void getRenderOperation(Ogre::RenderOperation &op);
+ const Ogre::MaterialPtr &getMaterial(void) const {assert(!mpMaterial.isNull());return mpMaterial;};
+ const Ogre::LightList &getLights(void) const {return mLList;};
+
+ /******************************** OgreBulletCollisionsDebugContact data ****************************/
+
+
+ protected:
+ Ogre::String mFontName;
+ Ogre::String mType;
+ Ogre::String mName;
+ Ogre::String mCaption;
+ HorizontalAlignment mHorizontalAlignment;
+ VerticalAlignment mVerticalAlignment;
+
+ Ogre::ColourValue mColor;
+ Ogre::RenderOperation mRenderOp;
+ Ogre::AxisAlignedBox mAABB;
+ Ogre::LightList mLList;
+
+ unsigned int mCharHeight;
+ unsigned int mSpaceWidth;
+
+ bool mNeedUpdate;
+ bool mUpdateColors;
+ bool mOnTop;
+
+ Ogre::Real mTimeUntilNextToggle;
+ Ogre::Real mRadius;
+ Ogre::Real mAdditionalHeight;
+
+ Ogre::Camera *mpCam;
+ Ogre::RenderWindow *mpWin;
+ Ogre::Font *mpFont;
+ Ogre::MaterialPtr mpMaterial;
+ Ogre::MaterialPtr mpBackgroundMaterial;
+
+ Ogre::SceneNode *mNode;
+ };
+}
+
+#endif //__OgreBulletCollisionsDebugContact_H__
+
Added: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp 2007-10-18 05:11:08 UTC (rev 436)
@@ -0,0 +1,237 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#include "OgreBulletCollisions.h"
+
+#include "Debug/OgreBulletCollisionsDebugDrawer.h"
+#include "Utils/OgreBulletConverter.h"
+
+using namespace OgreBulletCollisions;
+using namespace Ogre;
+
+//------------------------------------------------------------------------------------------------
+DebugDrawer::DebugDrawer() :
+ DebugLines(),
+ btIDebugDraw(),
+ mDebugMode(0)
+{
+}
+//------------------------------------------------------------------------------------------------
+DebugDrawer::~DebugDrawer()
+{
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::reportErrorWarning(const char* warningString)
+{
+ Ogre::LogManager::getSingleton().getDefaultLog()->logMessage(warningString);
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawAabb(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawAabb;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawAabb;
+}
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawAabb () const {return (mDebugMode & btIDebugDraw::DBG_DrawAabb) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawWireframe () const {return (mDebugMode & btIDebugDraw::DBG_DrawWireframe) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawFeaturesText () const {return (mDebugMode & btIDebugDraw::DBG_DrawFeaturesText) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawContactPoints () const {return (mDebugMode & btIDebugDraw::DBG_DrawContactPoints) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesNoDeactivation () const {return (mDebugMode & btIDebugDraw::DBG_NoDeactivation) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesNoHelpText () const {return (mDebugMode & btIDebugDraw::DBG_NoHelpText) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawText () const {return (mDebugMode & btIDebugDraw::DBG_DrawText) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesProfileTimings () const {return (mDebugMode & btIDebugDraw::DBG_ProfileTimings) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesEnableSatComparison () const {return (mDebugMode & btIDebugDraw::DBG_EnableSatComparison) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDisableBulletLCP () const {return (mDebugMode & btIDebugDraw::DBG_DisableBulletLCP) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesEnableCCD () const {return (mDebugMode & btIDebugDraw::DBG_EnableCCD) != 0;};
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawWireframe(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawWireframe;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawWireframe;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawFeaturesText(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawFeaturesText;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawFeaturesText;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawContactPoints(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawContactPoints;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawContactPoints;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setNoDeactivation(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_NoDeactivation;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_NoDeactivation;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setNoHelpText(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_NoHelpText;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_NoHelpText;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawText(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawText;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawText;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setProfileTimings(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_ProfileTimings;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_ProfileTimings;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setEnableSatComparison(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_EnableSatComparison;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_EnableSatComparison;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDisableBulletLCP (bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DisableBulletLCP ;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DisableBulletLCP ;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setEnableCCD(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_EnableCCD;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_EnableCCD;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawAabb(const btVector3& from,const btVector3& to,const btVector3& color)
+{
+ if (mDebugMode & btIDebugDraw::DBG_DrawAabb)
+ {
+ drawAabb (BtOgreConverter::to(from), BtOgreConverter::to(to), BtOgreConverter::to (color));
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawLine(const btVector3& from,const btVector3& to,const btVector3& color)
+{
+ if (mDebugMode > 0)
+ {
+ drawLine (BtOgreConverter::to(from), BtOgreConverter::to(to), BtOgreConverter::to (color));
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,
+ btScalar distance,int lifeTime,const btVector3& color)
+{
+ if (mDebugMode & btIDebugDraw::DBG_DrawContactPoints)
+ {
+ //
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawAabb (const Ogre::Vector3& from,const Ogre::Vector3& to,const Ogre::Vector3& color)
+{
+ if (mDebugMode & btIDebugDraw::DBG_DrawAabb)
+ {
+ Vector3 halfExtents = (to-from)* 0.5f;
+ Vector3 center = (to+from) *0.5f;
+ int i,j;
+
+ Vector3 edgecoord(1.f,1.f,1.f),pa,pb;
+ for (i=0;i<4;i++)
+ {
+ for (j=0;j<3;j++)
+ {
+ pa = Vector3(edgecoord[0]*halfExtents[0], edgecoord[1]*halfExtents[1],
+ edgecoord[2]*halfExtents[2]);
+ pa+=center;
+
+ int othercoord = j%3;
+ edgecoord[othercoord]*=-1.f;
+ pb = Vector3(edgecoord[0]*halfExtents[0], edgecoord[1]*halfExtents[1],
+ edgecoord[2]*halfExtents[2]);
+ pb+=center;
+
+ drawLine(pa,pb,color);
+ }
+ edgecoord = Vector3(-1.f,-1.f,-1.f);
+ if (i<3)
+ edgecoord[i]*=-1.f;
+ }
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawLine(const Ogre::Vector3& from,const Ogre::Vector3& to,const Ogre::Vector3& color)
+{
+ if (mDebugMode > 0)
+ {
+ addLine (from, to);
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawContactPoint(const Ogre::Vector3& PointOnB,const Ogre::Vector3& normalOnB,
+ Real distance,int lifeTime,const Ogre::Vector3& color)
+{
+ if (mDebugMode & btIDebugDraw::DBG_DrawContactPoints)
+ {
+
+ }
+ //...
+}
+//------------------------------------------------------------------------------------------------
+
Added: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h 2007-10-18 05:11:08 UTC (rev 436)
@@ -0,0 +1,88 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+#ifndef _OgreBulletCollisions_DebugDrawer_H_
+#define _OgreBulletCollisions_DebugDrawer_H_
+
+#include "OgreBulletCollisionsPreRequisites.h"
+
+#include "Debug/OgreBulletCollisionsDebugLines.h"
+
+namespace OgreBulletCollisions
+{
+ //------------------------------------------------------------------------------------------------
+ class DebugDrawer : public DebugLines, public btIDebugDraw
+ {
+ public:
+ DebugDrawer();
+ virtual ~DebugDrawer();
+
+
+ virtual void setDebugMode(int mode){mDebugMode = mode;};
+ virtual int getDebugMode() const { return mDebugMode;};
+
+ virtual void drawLine(const btVector3& from,const btVector3& to,const btVector3& color);
+ virtual void drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,
+ btScalar distance,int lifeTime,const btVector3& color);
+
+ void drawAabb(const Ogre::Vector3& from,const Ogre::Vector3& to,const Ogre::Vector3& color);
+ void drawLine(const Ogre::Vector3& from,const Ogre::Vector3& to,const Ogre::Vector3& color);
+ void drawContactPoint(const Ogre::Vector3& PointOnB,const Ogre::Vector3& normalOnB,
+ Ogre::Real distance,int lifeTime,const Ogre::Vector3& color);
+
+ void setDrawAabb(bool enable);
+ void setDrawWireframe(bool enable);
+ void setDrawFeaturesText(bool enable);
+ void setDrawContactPoints(bool enable);
+ void setNoDeactivation(bool enable);
+ void setNoHelpText(bool enable);
+ void setDrawText(bool enable);
+ void setProfileTimings(bool enable);
+ void setEnableSatComparison(bool enable);
+ void setDisableBulletLCP (bool enable);
+ void setEnableCCD(bool enable);
+
+ bool doesDrawAabb () const;
+ bool doesDrawWireframe () const;
+ bool doesDrawFeaturesText () const;
+ bool doesDrawContactPoints () const;
+ bool doesNoDeactivation () const;
+ bool doesNoHelpText () const;
+ bool doesDrawText () const;
+ bool doesProfileTimings () const;
+ bool doesEnableSatComparison () const;
+ bool doesDisableBulletLCP () const;
+ bool doesEnableCCD () const;
+
+ void drawAabb(const btVector3& from,const btVector3& to,const btVector3& color);
+
+ void reportErrorWarning(const char* warningString);
+ protected:
+ int mDebugMode;
+ };
+}
+
+#endif //_OgreBulletCollisions_DebugDrawer_H_
+
Added: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.cpp 2007-10-18 05:11:08 UTC (rev 436)
@@ -0,0 +1,162 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#include "OgreBulletCollisions.h"
+
+#include "Debug/OgreBulletCollisionsDebugLines.h"
+#include "Utils/OgreBulletConverter.h"
+
+using namespace OgreBulletCollisions;
+using namespace Ogre;
+
+//------------------------------------------------------------------------------------------------
+bool DebugLines::_materials_created = false;
+//------------------------------------------------------------------------------------------------
+DebugLines::DebugLines() : SimpleRenderable()
+{
+ mRenderOp.vertexData = new Ogre::VertexData();
+ _drawn = false;
+
+ if (!_materials_created)
+ {
+ MaterialPtr red = MaterialManager::getSingleton().create("OgreBulletCollisionsDebugLines/Disabled","OgreBulletCollisions");
+ MaterialPtr green = MaterialManager::getSingleton().create("OgreBulletCollisionsDebugLines/Enabled","OgreBulletCollisions");
+ MaterialPtr blue = MaterialManager::getSingleton().create("OgreBulletCollisionsDebugLines/Static","OgreBulletCollisions");
+
+ red->setReceiveShadows(false);
+ red->getTechnique(0)->setLightingEnabled(true);
+ red->getTechnique(0)->getPass(0)->setSelfIllumination(1,0,0);
+
+ green->setReceiveShadows(false);
+ green->getTechnique(0)->setLightingEnabled(true);
+ green->getTechnique(0)->getPass(0)->setSelfIllumination(0,1,0);
+
+ blue->setReceiveShadows(false);
+ blue->getTechnique(0)->setLightingEnabled(true);
+ blue->getTechnique(0)->getPass(0)->setSelfIllumination(0,0,1);
+
+ _materials_created = true;
+ }
+ setCastShadows (false);
+ this->setMaterial("OgreBulletCollisionsDebugLines/Enabled");
+}
+
+
+//------------------------------------------------------------------------------------------------
+void DebugLines::clear()
+{
+ if (_drawn)
+ {
+ _drawn = false;
+ _points.clear();
+ delete mRenderOp.vertexData;
+
+ mRenderOp.vertexData = new Ogre::VertexData();
+ }
+}
+//-----...
[truncated message content] |
|
From: <and...@us...> - 2007-10-18 05:05:21
|
Revision: 435
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=435&view=rev
Author: andy_miller
Date: 2007-10-17 22:05:17 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Ogrebullet got messed up need to delete and re add
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/ogrebullet/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-18 04:48:26
|
Revision: 434
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=434&view=rev
Author: andy_miller
Date: 2007-10-17 21:48:31 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Removed file/folder
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h~
Deleted: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h~
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h~ 2007-10-18 04:47:46 UTC (rev 433)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h~ 2007-10-18 04:48:31 UTC (rev 434)
@@ -1,57 +0,0 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
-(Object-oriented Graphics Rendering Engine Bullet Wrapper)
-For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
-Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef _OGREBULLETCOLLISIONS_Shape_H
-#define _OGREBULLETCOLLISIONS_Shape_H
-
-#include "OgreBulletCollisionsPrerequisites.h"
-
-
-namespace OgreBulletCollisions
-{
- // -------------------------------------------------------------------------
- // basic Shape
- class CollisionShape
- {
-
- public:
- CollisionShape();
- virtual ~CollisionShape();
-
- inline btCollisionShape* getBulletShape () {return mShape;};
-
- virtual bool drawWireFrame(DebugLines *wire,
- const Ogre::Vector3 &pos = Ogre::Vector3::ZERO,
- const Ogre::Quaternion &quat= Ogre::Quaternion::IDENTITY) const;
-
- protected:
- btCollisionShape* mShape;
- bool drawConvexWireFrame(DebugLines *wire, const Ogre::Vector3 &pos, const Ogre::Quaternion &quat) const;
-
- };
-}
-#endif //_OGREBULLETCOLLISIONS_Shape_H
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-18 04:47:42
|
Revision: 433
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=433&view=rev
Author: andy_miller
Date: 2007-10-17 21:47:46 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Removed file/folder
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h
Deleted: trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h 2007-10-18 04:46:56 UTC (rev 432)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrerequisites.h 2007-10-18 04:47:46 UTC (rev 433)
@@ -1,56 +0,0 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
-(Object-oriented Graphics Rendering Engine Bullet Wrapper)
-For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
-Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef _OGREBULLETDYNAMICS_PREREQUISITES_H
-#define _OGREBULLETDYNAMICS_PREREQUISITES_H
-
-#include "btBulletCollisionCommon.h"
-#include "btBulletDynamicsCommon.h"
-
-#include "Ogre.h"
-#include "OgreBulletCollisions.h"
-
-
-namespace OgreBulletDynamics
-{
- class RigidBody;
- class PhysicState;
- class DynamicsWorld;
-
- class TypedConstraint;
- class HingeConstraint;
- class SixDofConstraint;
- class PointToPointConstraint;
- class ConeTwistConstraint;
-
- class WheeledRigidBody;
- class VehicleRayCaster;
- class VehicleTuning;
- class RaycastVehicle;
- class WheelInfo;
-}
-
-#endif //_OGREBULLETDYNAMICS_PREREQUISITES_H
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-18 04:46:57
|
Revision: 432
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=432&view=rev
Author: andy_miller
Date: 2007-10-17 21:46:56 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Removed file/folder
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h
Deleted: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h 2007-10-17 07:14:28 UTC (rev 431)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrerequisites.h 2007-10-18 04:46:56 UTC (rev 432)
@@ -1,89 +0,0 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
-(Object-oriented Graphics Rendering Engine Bullet Wrapper)
-For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
-Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef _OGREBULLETCOLLISIONS_PREREQUISITES_H
-#define _OGREBULLETCOLLISIONS_PREREQUISITES_H
-
-#include "btBulletCollisionCommon.h"
-
-#include "Ogre.h"
-
-/* Some <math.h> files do not define M_PI... */
-#ifndef M_PI
-#define M_PI 3.14159265
-#endif
-
-namespace OgreBulletCollisions
-{
- class BtOgreConverter;
- class OgreBtConverter;
-
- class CollisionsWorld;
-
- class CollisionRayResultCallback;
- class CollisionClosestRayResultCallback;
-
- class DebugLines;
-
- class DebugDrawer;
-
- class DebugContact;
- class DebugNormal;
- class DebugContactText;
-
- class DebugCollisionShape;
- class BoxDebugShape;
- class SphereDebugShape;
- class ConeDebugShape;
- class TriangleMeshDebugShape;
- class RayDebugShape;
-
- class CollisionShape;
- class BoxCollisionShape;
- class SphereCollisionShape;
- class CylinderCollisionShape;
- class ConeCollisionShape;
-
- class CompoundCollisionShape;
-
- class MultiSphereCollisionShape;
- class MinkowskiSumCollisionShape;
-
- class ConvexHullCollisionShape;
- class TriangleMeshCollisionShape;
-
- class Object;
-
- class ObjectState;
-
- typedef std::vector<Ogre::Vector3> Vector3Vector;
- typedef std::map<unsigned char, Vector3Vector* > BoneIndex;
- typedef std::pair<unsigned short, Vector3Vector* > BoneKeyIndex;
-
-}
-
-#endif //_OGREBULLETCOLLISIONS_PREREQUISITES_H
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-17 07:14:26
|
Revision: 431
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=431&view=rev
Author: andy_miller
Date: 2007-10-17 00:14:28 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
duplicated
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
Deleted: trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h 2007-10-17 07:07:35 UTC (rev 430)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h 2007-10-17 07:14:28 UTC (rev 431)
@@ -1,56 +0,0 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
-(Object-oriented Graphics Rendering Engine Bullet Wrapper)
-For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
-Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef _OGREBULLETDYNAMICS_PREREQUISITES_H
-#define _OGREBULLETDYNAMICS_PREREQUISITES_H
-
-#include "btBulletCollisionCommon.h"
-#include "btBulletDynamicsCommon.h"
-
-#include "Ogre.h"
-#include "OgreBulletCollisions.h"
-
-
-namespace OgreBulletDynamics
-{
- class RigidBody;
- class PhysicState;
- class DynamicsWorld;
-
- class TypedConstraint;
- class HingeConstraint;
- class SixDofConstraint;
- class PointToPointConstraint;
- class ConeTwistConstraint;
-
- class WheeledRigidBody;
- class VehicleRayCaster;
- class VehicleTuning;
- class RaycastVehicle;
- class WheelInfo;
-}
-
-#endif //_OGREBULLETDYNAMICS_PREREQUISITES_H
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
