Menu
▾
▴
mogre-svnmail — Receives SVN commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(13) |
Nov
(32) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(17) |
Feb
(7) |
Mar
(76) |
Apr
(13) |
May
|
Jun
|
Jul
(9) |
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(9) |
| 2008 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(8) |
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2009 |
Jan
|
Feb
|
Mar
(3) |
Apr
(11) |
May
(4) |
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
|
Oct
(2) |
Nov
(7) |
Dec
(4) |
| 2010 |
Jan
|
Feb
(10) |
Mar
(4) |
Apr
(17) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mog...@li...> - 2009-05-26 16:09:58
|
Revision: 270
http://mogre.svn.sourceforge.net/mogre/?rev=270&view=rev
Author: realgantz
Date: 2009-05-26 16:09:44 +0000 (Tue, 26 May 2009)
Log Message:
-----------
- add new version of debugger from ogrenewt : the debugger is now attached to a World
- add logger to the debugger
- commented out some function missing in the previous release
Modified Paths:
--------------
trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj
trunk/MogreNewt/MogreNewt_Main/inc/ContactMaterial.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Prerequisites.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Tools.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Body.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Debugger.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Joint.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Tools.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_World.cpp
trunk/MogreNewt/MogreNewt_VC9.suo
trunk/MogreNewt/Samples/Basics/Demo.Basics.csproj
trunk/MogreNewt/Samples/SimpleVehicle/Demo.SimpleVehicle.csproj
Added Paths:
-----------
trunk/MogreNewt/Samples/Basics/OgreSDKData/
trunk/MogreNewt/Samples/Basics/media/
Modified: trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj 2009-05-26 16:09:44 UTC (rev 270)
@@ -43,8 +43,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".\inc;"C:\devel\Gamedevel (x86)\NewtonWin-2.00\sdk";..\..\Mogre\ogrenew\OgreMain\include"
- AdditionalUsingDirectories="..\..\Mogre\bin\$(ConfigurationName)"
+ AdditionalIncludeDirectories=".\inc;"C:\devel\Gamedevel (x86)\NewtonWin-2.00\sdk";..\..\MogreSDK_1.6.2\include"
+ AdditionalUsingDirectories="..\..\MogreSDK_1.6.2\bin"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_OGRENEWT_DYNAMIC;_OGRENEWT_EXPORTS"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -66,7 +66,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="OgreMain.lib newton.lib"
- AdditionalLibraryDirectories="..\..\Mogre\ogrenew\lib;"C:\devel\Gamedevel (x86)\NewtonWin-2.00\sdk\dll""
+ AdditionalLibraryDirectories="..\..\MogreSDK_1.6.2\lib;"C:\devel\Gamedevel (x86)\NewtonWin-2.00\sdk\dll""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
@@ -121,8 +121,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".\inc;"C:\Program Files (x86)\NewtonSDK\sdk";..\..\Mogre\ogrenew\OgreMain\include"
- AdditionalUsingDirectories="..\..\Mogre\bin\$(ConfigurationName)"
+ AdditionalIncludeDirectories=".\inc;"C:\Program Files (x86)\NewtonSDK\sdk";..\..\MogreSDK_1.6.2\include"
+ AdditionalUsingDirectories="..\..\MogreSDK_1.6.2\bin"
PreprocessorDefinitions="WIN32;_DEBUG;_OGRENEWT_DYNAMIC;"
MinimalRebuild="false"
BasicRuntimeChecks="0"
@@ -145,7 +145,7 @@
Name="VCLinkerTool"
AdditionalDependencies="OgreMain_d.lib newton.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
- AdditionalLibraryDirectories=""..\..\Mogre\ogrenew\lib";"c:\program files (x86)\NewtonSDK\sdk\dll""
+ AdditionalLibraryDirectories=""..\..\MogreSDK_1.6.2\lib";"c:\program files (x86)\NewtonSDK\sdk\dll""
GenerateDebugInformation="true"
AssemblyDebug="1"
RandomizedBaseAddress="1"
@@ -177,8 +177,8 @@
</Configurations>
<References>
<AssemblyReference
- RelativePath="..\..\Mogre\bin\Release\Mogre.dll"
- AssemblyName="Mogre, Version=1.4.8.0, processorArchitecture=x86"
+ RelativePath="..\..\MogreSDK_1.6.2\bin\Mogre.dll"
+ AssemblyName="Mogre, Version=1.6.2.0, processorArchitecture=x86"
MinFrameworkVersion="131072"
/>
</References>
Modified: trunk/MogreNewt/MogreNewt_Main/inc/ContactMaterial.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/ContactMaterial.h 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/inc/ContactMaterial.h 2009-05-26 16:09:44 UTC (rev 270)
@@ -44,26 +44,27 @@
void GetContactTangentDirections([Out] Mogre::Vector3 %dir0, [Out] Mogre::Vector3 %dir1);
dFloat GetContactTangentSpeed(int index);
- ////! set softness of the current contact
- //void SetContactSoftness( Mogre::Real softness ) { NewtonMaterialSetContactSoftness( _mat, (float)softness ); }
- ////! set elasticity of the current contact
- //void SetContactElasticity( Mogre::Real elasticity ) { NewtonMaterialSetContactElasticity( _mat, (float)elasticity ); }
+ //! set softness of the current contact
+ void SetContactSoftness( Mogre::Real softness ) { NewtonMaterialSetContactSoftness( _mat, (float)softness ); }
- ////! set friction state of current contact
- //void SetContactFrictionState( int state, int index ) { NewtonMaterialSetContactFrictionState( _mat, state, index ); }
+ //! set elasticity of the current contact
+ void SetContactElasticity( Mogre::Real elasticity ) { NewtonMaterialSetContactElasticity( _mat, (float)elasticity ); }
- ////! set tangent acceleration for contact
- //void SetContactTangentAcceleration( Mogre::Real accel, int index ) { NewtonMaterialSetContactTangentAcceleration( _mat, (float)accel, index ); }
+ //! set friction state of current contact
+ void SetContactFrictionState( int state, int index ) { NewtonMaterialSetContactFrictionState( _mat, state, index ); }
- ////! align tangent vectors with a user supplied direction
- //void RotateTangentDirections( Mogre::Vector3 dir ) { NewtonMaterialContactRotateTangentDirections( _mat, &dir.x ); }
+ //! set tangent acceleration for contact
+ void SetContactTangentAcceleration( Mogre::Real accel, int index ) { NewtonMaterialSetContactTangentAcceleration( _mat, (float)accel, index ); }
- ////! manually set the normal for the collision.
- //void SetContactNormalDirection( Mogre::Vector3 dir ) { NewtonMaterialSetContactNormalDirection( _mat, &dir.x ); }
+ //! align tangent vectors with a user supplied direction
+ void RotateTangentDirections( Mogre::Vector3 dir ) { NewtonMaterialContactRotateTangentDirections( _mat, &dir.x ); }
- ////! manually set the acceleration along the collision normal.
- //void SetContactNormalAcceleration( Mogre::Real accel ) { NewtonMaterialSetContactNormalAcceleration( _mat, accel ); }
+ //! manually set the normal for the collision.
+ void SetContactNormalDirection( Mogre::Vector3 dir ) { NewtonMaterialSetContactNormalDirection( _mat, &dir.x ); }
+
+ //! manually set the acceleration along the collision normal.
+ void SetContactNormalAcceleration( Mogre::Real accel ) { NewtonMaterialSetContactNormalAcceleration( _mat, accel ); }
};
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h 2009-05-26 16:09:44 UTC (rev 270)
@@ -19,9 +19,9 @@
#include <Ogre.h>
#include <Newton.h>
-#include "OgreNewt_World.h"
+#include "OgreNewt_Prerequisites.h"
+#include "OgreNewt_MaterialID.h"
#include "OgreNewt_Collision.h"
-#include "OgreNewt_MaterialID.h"
#include "ContactJoint.h"
#include <gcroot.h>
@@ -32,6 +32,8 @@
{
ref class Body;
+ref class World;
+ref class MaterialID;
class BodyNativeInfo;
public delegate void ForceCallbackHandler( MogreNewt::Body^ body ,float timeStep, int threadIndex);
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h 2009-05-26 16:09:44 UTC (rev 270)
@@ -18,6 +18,7 @@
namespace MogreNewt
{
+ value class ContactMaterial;
//! custom contact behavior
/*!
this class is for creating custom behavior between material GroupIDs.
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h 2009-05-26 16:09:44 UTC (rev 270)
@@ -14,11 +14,13 @@
#include <Ogre.h>
#include <Newton.h>
-#include "OgreNewt_World.h"
+#include "OgreNewt_Tools.h"
namespace MogreNewt
{
+ ref class MaterialID;
+ ref class Body;
//! For viewing the Newton rigid bodies visually.
/*!
This class implements a debug view of the Newton world. it is a Singleton!
@@ -29,18 +31,16 @@
However, the Line3D (default) version requires that you include Line3D.cpp into your project, as it is not compiled into OgreNewt_Main.
This file is included with OgreNewt, in the demos/Include folder.
*/
- public ref class Debugger
+ public ref class Debugger : Mogre::Node::Listener
{
public:
+ //! Standard constructor, create the debugger.
+ Debugger(MogreNewt::World^ world);
+
+ //! Standard Destructor, destroys the debugger.
~Debugger();
- //! get the singleton reference
- property Debugger^ Instance
- {
- static Debugger^ get();
- }
-
//! init the debugger.
/*
\param smgr pointer to your Ogre::SceneManager
@@ -50,51 +50,137 @@
//! de-init the debugger (cleantup)
void DeInit();
+ virtual void NodeDestroyed(Mogre::Node^ node) override;
+
//! show the newton world
/*!
Draws the Newton world as 3D lines.
\param world pointer to the MogreNewt::World
*/
- void ShowLines( MogreNewt::World^ world ){ ShowLines(world,true);}
- void ShowLines( MogreNewt::World^ world ,bool clearPrevious);
+ void ShowDebugInformation();
- //void ShowContacts( MogreNewt::World^ world) { ShowContacts(world,false); }
- //void ShowContacts( MogreNewt::World^ world, bool clearPrevious );
+ /*
+ overload, add the ability to show/hide the movabletext containing debug information at the top of the bodies
+ */
+ void ShowDebugInformation( bool ShowDebugText);
- //! remove lines drawn.
- void HideLines();
+ /*
+ overload, add the ability to show/hide the movabletext containing debug information at the top of the bodies
+ and the color change based on the body state (static, active, asleep)
+ */
+ //void ShowDebugInformation( bool ShowDebugText,bool ShowStaticAsleep );
+
+ /*
+ overload, add the ability to show/hide the movabletext containing debug information at the top of the bodies
+ and add a log line for each body with the same debug information
+ */
+ void ShowDebugInformation(bool ShowDebugText,bool LogDebugText);
+
+
+ //! remove lines and text drawn
+ void HideDebugInformation();
+
+ //! set default color
+ void SetDefaultColors(Mogre::ColourValue col);
+
+ //! set default color
+ //void SetDefaultColors(Mogre::ColourValue DefaultColor,Mogre::ColourValue AsleepColor);
+
+ //! set default color
+ //void SetDefaultColors(Mogre::ColourValue DefaultColor,Mogre::ColourValue AsleepColor,Mogre::ColourValue StaticColor);
+
+ //! set Material color
+ void SetMaterialColor(MogreNewt::MaterialID^ mat, Mogre::ColourValue col);
+
+ //! enable additional raycast-debugging (this also enables displaying of recorded raycasts!)
+ void StartRaycastRecording(bool markhitbodies);
+
+ //! returns true, if currently recording raycasts
+ property bool IsRaycastRecording
+ {
+ bool get() {return m_recordraycasts;}
+ void set(bool value){m_recordraycasts = true;}
+ }
+
+ //! returns true, if hit bodies are currently recording
+ property bool IsRaycastRecordingHitBodies
+ {
+ bool get() { return m_markhitbodies;}
+ void set(bool value){m_markhitbodies = true;}
+ }
+
+
+ //! clears all raycasts, that are currently shown, should probably be done once per frame!
+ void ClearRaycastsRecorded();
+
+ //! disables raycast-debugging
+ void StopRaycastRecording();
+
+ //! set the color of the raycast-debug-lines
+ void SetRaycastRecordingColor(Mogre::ColourValue rayCol, Mogre::ColourValue convexCol, Mogre::ColourValue hitBodyCol, Mogre::ColourValue prefilterDiscardedBodyCol);
+
+ //! this function is used internally
+ void AddRay(Mogre::Vector3 startpt,Mogre::Vector3 endpt);
+
+ //! this function is used internally
+ void AddConvexRay(MogreNewt::Collision^ col,Mogre::Vector3 startpt,Mogre::Quaternion colori,Mogre::Vector3 endpt);
+
+ //! this function is used internally
+ void AddDiscardedBody(MogreNewt::Body^ body);
+
+ //! this function is used internally
+ void AddHitBody(MogreNewt::Body^ body);
+
+ value class BodyDebugData
+ {
+ public:
+ MogreNewt::Collision^ m_lastcol;
+ Ogre::SceneNode* m_node;
+ Ogre::ManualObject* m_lines;
+ MogreNewt::OgreAddons::MovableText* m_text;
+ int m_updated;
+ };
+
+ value class ManageRaycastObject
+ {
+ public:
+ Ogre::ManualObject* RaycastObject;
+ };
- protected:
- Debugger();
-
private:
+ MogreNewt::World^ m_world;
Ogre::SceneManager* m_smgr;
Ogre::SceneNode* m_debugnode;
- Mogre::MaterialPtr^ m_green;
- Mogre::MaterialPtr^ m_red;
+ System::Collections::Generic::Dictionary<int,Mogre::ColourValue>^ m_materialcolors;
+ System::Collections::Generic::List<ManageRaycastObject>^ mRecordedRaycastObjects;
+ Mogre::ColourValue m_defaultcolor;
+ Mogre::ColourValue m_colorstatic;
+ Mogre::ColourValue m_colorasleep;
+ System::String^ m_Font;
+ bool m_showstaticasleep;
+ bool m_usemovabletext;
+ bool m_enablelogging;
- Mogre::Real m_contactscale;
+ Ogre::SceneNode* m_raycastsnode;
+ bool m_recordraycasts;
+ Mogre::ColourValue m_raycol, m_convexcol, m_hitbodycol, m_prefilterdiscardedcol;
+ bool m_markhitbodies;
- Mogre::ColourValue m_colorstatic;
- Mogre::ColourValue m_coloractiveawake;
- Mogre::ColourValue m_coloractiveasleep;
- static Mogre::ColourValue m_currentcolor;
+ System::Collections::Generic::Dictionary<MogreNewt::Body^,BodyDebugData>^ m_cachemap;
- static Debugger^ instance = gcnew Debugger;
-
+ //! create debug information for one body
+ void ProcessBody(MogreNewt::Body^ body);
+ //! clear debug data cache fo bodies (m_cachemap)
+ void ClearBodyDebugDataCache();
+
};
#pragma managed(push, off)
-
-Ogre::ManualObject* m_debugger_debuglines;
-Ogre::ColourValue um_currentcolor;
-
-void Debugger_newtonPerBody( const NewtonBody* body ,Ogre::ColourValue colorvalue);
void _CDECL Debugger_newtonPerPoly(void* userData, int vertexCount, const float* faceVertec, int id );
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Prerequisites.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Prerequisites.h 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Prerequisites.h 2009-05-26 16:09:44 UTC (rev 270)
@@ -20,6 +20,7 @@
#include <Ogre.h>
+#include "OgreFontManager.h"
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
# define _CDECL _cdecl
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Tools.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Tools.h 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Tools.h 2009-05-26 16:09:44 UTC (rev 270)
@@ -14,11 +14,15 @@
#include <Ogre.h>
#include <Newton.h>
-#include "OgreNewt_World.h"
-#include "OgreNewt_Collision.h"
+#include "OgreNewt_Prerequisites.h"
+/*#include "OgreNewt_World.h"
+#include "OgreNewt_Collision.h"*/
namespace MogreNewt
{
+ ref class World;
+ ref class Collision;
+
namespace NativeConverters
{
void MatrixToQuatPos( const float* matrix, Ogre::Quaternion& quat, Ogre::Vector3 &pos );
@@ -176,6 +180,117 @@
+
+ namespace OgreAddons
+ {
+ /**
+ * File: MovableText.h
+ *
+ * description: This create create a billboarding object that display a text.
+ *
+ * @author 2003 by cTh see gav...@ra...
+ * @update 2006 by barraq see no...@ba...
+ */
+
+
+ using namespace Ogre;
+
+ class MovableText : public MovableObject, public Renderable
+ {
+ /******************************** MovableText data ****************************/
+ public:
+ enum HorizontalAlignment {H_LEFT, H_CENTER};
+ enum VerticalAlignment {V_BELOW, V_ABOVE, V_CENTER};
+
+ 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;
+
+ Ogre::Real mCharHeight;
+ Ogre::Real mSpaceWidth;
+
+ bool mNeedUpdate;
+ bool mUpdateColors;
+ bool mOnTop;
+
+ Ogre::Real mTimeUntilNextToggle;
+ Ogre::Real mRadius;
+
+ Ogre::Vector3 mGlobalTranslation;
+ Ogre::Vector3 mLocalTranslation;
+
+ Ogre::Camera *mpCam;
+ Ogre::RenderWindow *mpWin;
+ Ogre::Font *mpFont;
+ Ogre::MaterialPtr mpMaterial;
+ Ogre::MaterialPtr mpBackgroundMaterial;
+
+ /******************************** public methods ******************************/
+ public:
+ MovableText(const Ogre::String &name, const Ogre::String &caption, const Ogre::String &fontName, Real charHeight, const ColourValue &color = ColourValue::White);
+ virtual ~MovableText();
+
+ // Set settings
+ void setFontName(const Ogre::String &fontName);
+ void setCaption(const Ogre::String &caption);
+ void setColor(const Ogre::ColourValue &color);
+ void setCharacterHeight(Ogre::Real height);
+ void setSpaceWidth(Ogre::Real width);
+ void setTextAlignment(const HorizontalAlignment& horizontalAlignment, const VerticalAlignment& verticalAlignment);
+ void setGlobalTranslation( Ogre::Vector3 trans );
+ void setLocalTranslation( Ogre::Vector3 trans );
+ 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;}
+
+ Ogre::Real getCharacterHeight() const {return mCharHeight;}
+ Ogre::Real getSpaceWidth() const {return mSpaceWidth;}
+ Ogre::Vector3 getGlobalTranslation() const {return mGlobalTranslation;}
+ Ogre::Vector3 getLocalTranslation() const {return mLocalTranslation;}
+ bool getShowOnTop() const {return mOnTop;}
+ Ogre::AxisAlignedBox GetAABB(void) { return mAABB; }
+
+ /******************************** protected methods and overload **************/
+ protected:
+
+ // from MovableText, 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;};
+ void visitRenderables(Ogre::Renderable::Visitor* visitor, bool debugRenderables = false);
+ const Quaternion &getWorldOrientation(void) const;
+ const Vector3 &getWorldPosition(void) const;
+ const 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;};
+ };
+
+ }
+
} // end namespace MogreNewt
#endif
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h 2009-05-26 16:09:44 UTC (rev 270)
@@ -13,8 +13,10 @@
#include <Newton.h>
#include <Ogre.h>
#include "OgreNewt_Prerequisites.h"
+#include "OgreNewt_Debugger.h"
#include "OgreNewt_MaterialID.h"
+
//! main namespace.
/*!
This is the main namespace for the OgreNewt library. all classes are included in this namespace.
@@ -289,12 +291,23 @@
//! updates only the collision of the world and call the callback functions if necessary, can be used for an collision only system
void CollisionUpdate() { NewtonCollisionUpdate( m_world ); }
+
+ //! get the debugger for this world
+ /*!
+ * the debugger needs to be initialized (Debugger::init(...) ) in order to work correctly
+ */
+ property MogreNewt::Debugger^ DebuggerInstance
+ {
+ MogreNewt::Debugger^ get() { return m_debugger;}
+ }
+
protected:
::NewtonWorld* m_world;
MaterialID^ m_defaultMatID;
LeaveWorldEventHandler^ m_leaveWorld;
+ MogreNewt::Debugger^ m_debugger;
private:
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Body.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Body.cpp 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Body.cpp 2009-05-26 16:09:44 UTC (rev 270)
@@ -78,7 +78,6 @@
}
-#include "OgreNoMemoryMacros.h"
// destructor callback
void Body::NewtonDestructor( const ::NewtonBody* body )
@@ -95,9 +94,7 @@
}
-#include "OgreMemoryMacros.h"
-
// transform callback
void Body::NewtonTransformCallback( const ::NewtonBody* body, const float* matrix ,int threadIndex )
{
@@ -108,7 +105,7 @@
if (m_node)
{
- Ogre::Node* ogreNode = m_node;
+ Ogre::Node* ogreNode = (Ogre::Node*)m_node;
ogreNode->setOrientation( orient );
ogreNode->setPosition( pos );
}
@@ -170,7 +167,7 @@
void Body::AttachNode( Mogre::Node^ node )
{
m_node = node;
- m_nativeInfo->node = node;
+ m_nativeInfo->node = (Ogre::Node*)node;
SetupTransformCallback();
}
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp 2009-05-26 16:09:44 UTC (rev 270)
@@ -190,8 +190,6 @@
//unlock buffer
v_sptr->unlock();
}
-
-
}
float matrix[16];
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Debugger.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Debugger.cpp 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Debugger.cpp 2009-05-26 16:09:44 UTC (rev 270)
@@ -2,6 +2,9 @@
#include "OgreNewt_Body.h"
#include "OgreNewt_ContactCallback.h"
+#include<iostream>
+using namespace std;
+
namespace MogreNewt
{
@@ -9,57 +12,366 @@
// DEUBBER FUNCTIONS
//////////////////////////////////////////////////////////
-Debugger::Debugger()
+Debugger::Debugger(MogreNewt::World^ world)
{
- m_debugger_debuglines = NULL;
+ m_world = world;
m_debugnode = NULL;
+ m_raycastsnode = NULL;
+ m_defaultcolor = Mogre::ColourValue::White;
+ m_colorstatic = Mogre::ColourValue(0.8f, 0.8f, 0.8f);
+ m_colorasleep = Mogre::ColourValue::Red;
- m_contactscale = 0.5f;
+ m_recordraycasts = false;
+ m_markhitbodies = false;
- m_colorstatic = Mogre::ColourValue(0.8f, 0.8f, 0.8f);
- m_coloractiveawake = Mogre::ColourValue(0.9f, 0.9f, 0.0f);
- m_coloractiveasleep = Mogre::ColourValue(0.6f, 0.6f, 0.0f);
+ m_raycol = Mogre::ColourValue::Green;
+ m_convexcol = Mogre::ColourValue::Blue;
+ m_hitbodycol = Mogre::ColourValue::Red;
+ m_Font = "BlueHighway-10";
+ m_prefilterdiscardedcol = Mogre::ColourValue::Black;
+ m_materialcolors = gcnew System::Collections::Generic::Dictionary<int,Mogre::ColourValue>();
+ m_cachemap = gcnew System::Collections::Generic::Dictionary<MogreNewt::Body^,BodyDebugData>();
+ mRecordedRaycastObjects = gcnew System::Collections::Generic::List<ManageRaycastObject>();
+
+ //added in mogrenewt
+ m_showstaticasleep = false;
+ m_usemovabletext = false;
+ m_enablelogging = false;
}
Debugger::~Debugger()
{
- Debugger::Instance->DeInit();
+ DeInit();
}
-Debugger^ Debugger::Instance::get()
+
+void Debugger::Init( Mogre::SceneManager^ smgr )
{
- return instance;
+ if( !m_debugnode )
+ {
+ m_debugnode = smgr->RootSceneNode->CreateChildSceneNode("__OgreNewt__Debugger__");
+ m_debugnode->setListener(this);
+ }
+
+ if( !m_raycastsnode )
+ {
+ m_raycastsnode = smgr->RootSceneNode->CreateChildSceneNode("__OgreNewt__Raycasts_Debugger__Node__");
+ m_raycastsnode->setListener(this);
+ }
}
-
-
-void Debugger::Init( Mogre::SceneManager^ smgr )
+
+void Debugger::DeInit()
{
- m_smgr = smgr;
- m_debugnode = smgr->RootSceneNode->CreateChildSceneNode("__OgreNewt__Debugger__");
+ ClearBodyDebugDataCache();
- m_debugger_debuglines = NULL;
- m_debugger_debuglines = new Ogre::ManualObject("__OgreNewt__Debugger__");
-
- m_debugnode->attachObject(m_debugger_debuglines);
+ if (m_debugnode)
+ {
+ m_debugnode->setListener(NULL);
+ m_debugnode->removeAndDestroyAllChildren();
+ m_debugnode->getParentSceneNode()->removeAndDestroyChild( m_debugnode->getName() );
+ m_debugnode = NULL;
+ }
+ ClearRaycastsRecorded();
+
+ if( m_raycastsnode )
+ {
+ m_raycastsnode->setListener(NULL);
+ m_raycastsnode->removeAndDestroyAllChildren();
+ m_raycastsnode->getParentSceneNode()->removeAndDestroyChild( m_raycastsnode->getName() );
+ m_raycastsnode = NULL;
+ }
+
}
-void Debugger::DeInit()
+void Debugger::NodeDestroyed(Mogre::Node^ node)
{
- if (m_debugnode)
+ if(node == m_debugnode)
+ {
+ m_debugnode = NULL;
+ ClearBodyDebugDataCache();
+ }
+
+ if(node == m_raycastsnode)
+ {
+ m_raycastsnode = NULL;
+ ClearRaycastsRecorded();
+ }
+}
+
+void Debugger::ClearBodyDebugDataCache()
+{
+ for each(BodyDebugData data in m_cachemap->Values)
{
- m_debugnode->detachAllObjects();
- if (m_debugger_debuglines) {m_smgr->destroyManualObject(m_debugger_debuglines); delete m_debugger_debuglines; m_debugger_debuglines = NULL; }
- m_debugnode->getParentSceneNode()->removeAndDestroyChild( m_debugnode->getName() );
+ Ogre::ManualObject* mo = data.m_lines;
+ if(mo)
+ delete mo;
- m_debugnode = NULL;
+ MogreNewt::OgreAddons::MovableText* text = data.m_text;
+
+ if(text)
+ delete text;
}
+
+ m_cachemap->Clear();
}
+void Debugger::ShowDebugInformation( bool ShowDebugText,bool LogDebugText)
+{
+ m_enablelogging = LogDebugText;
+ ShowDebugInformation(ShowDebugText);
+}
+void Debugger::ShowDebugInformation( bool ShowDebugText )
+{
+ m_usemovabletext = ShowDebugText;
+ //check if the font for movable text is available
-void Debugger::ShowLines( MogreNewt::World^ world ,bool clearPrevious)
+ IntPtr strfont = Marshal::StringToHGlobalAnsi(m_Font);
+ Ogre::String UMfont = static_cast<char*>(strfont.ToPointer());
+ Marshal::FreeHGlobal( strfont );
+
+ Ogre::Font* pFont = (Ogre::Font *)Ogre::FontManager::getSingleton().getByName(UMfont).getPointer();
+
+ if(!pFont)
+ {
+ Mogre::LogManager::Singleton->LogMessage(Mogre::LogMessageLevel::LML_NORMAL,"MogreNewt - Could not find font "+m_Font+", Debug text disabled");
+ m_usemovabletext = false;
+ }
+
+ pFont = NULL;
+
+ ShowDebugInformation();
+}
+
+
+/*void Debugger::ShowDebugInformation( bool ShowDebugText,bool ShowStaticAsleep )
{
+ m_usemovabletext = ShowDebugText;
+ m_showstaticasleep = ShowStaticAsleep;
+ ShowDebugInformation();
+}*/
+
+void Debugger::ShowDebugInformation( )
+{
+ if (!m_debugnode)
+ return;
+
+ //m_debugnode->removeAllChildren();
+
+ // make the new lines.
+ for (NewtonBody* b = NewtonWorldGetFirstBody(m_world->NewtonWorld); b; b = NewtonWorldGetNextBody(m_world->NewtonWorld, b))
+ {
+ Body^ body = static_cast<BodyNativeInfo*>( NewtonBodyGetUserData(b) )->managedBody;
+ ProcessBody(body);
+ }
+
+
+ // delete old entries
+ System::Collections::Generic::Dictionary<MogreNewt::Body^,BodyDebugData>^ newmap = gcnew System::Collections::Generic::Dictionary<MogreNewt::Body^,BodyDebugData>();
+
+ for each(MogreNewt::Body^ data in m_cachemap->Keys)
+ {
+ if(m_cachemap[data].m_updated)
+ {
+ newmap->Add(data,m_cachemap[data]);
+ }
+ else
+ {
+ m_debugnode->removeChild(m_cachemap[data].m_node);
+ Ogre::ManualObject* mo = m_cachemap[data].m_lines;
+ if(mo)
+ delete mo;
+
+ MogreNewt::OgreAddons::MovableText* text = m_cachemap[data].m_text;
+
+ if(text)
+ delete text;
+ }
+
+ }
+
+ m_cachemap = newmap;
+}
+
+void Debugger::HideDebugInformation()
+{
+ // erase any existing lines!
+ if( m_debugnode )
+ m_debugnode->removeAllChildren();
+
+ for each(MogreNewt::Body^ data in m_cachemap->Keys)
+ {
+ Ogre::ManualObject* mo = m_cachemap[data].m_lines;
+ if(mo)
+ delete mo;
+
+ MogreNewt::OgreAddons::MovableText* text = m_cachemap[data].m_text;
+
+ if(text)
+ delete text;
+ }
+
+ m_cachemap->Clear();
+}
+
+void Debugger::SetMaterialColor(MogreNewt::MaterialID^ mat, Mogre::ColourValue col)
+{
+ m_materialcolors[mat->ID] = col;
+}
+
+void Debugger::SetDefaultColors(Mogre::ColourValue DefaultColor)
+{
+ m_defaultcolor = DefaultColor;
+}
+/*
+void Debugger::SetDefaultColors(Mogre::ColourValue DefaultColor,Mogre::ColourValue AsleepColor)
+{
+ m_defaultcolor = DefaultColor;
+ m_colorasleep = AsleepColor;
+}
+
+void Debugger::SetDefaultColors(Mogre::ColourValue DefaultColor,Mogre::ColourValue AsleepColor,Mogre::ColourValue StaticColor)
+{
+ m_defaultcolor = DefaultColor;
+ m_colorasleep = AsleepColor;
+ m_colorstatic = StaticColor;
+}*/
+
+
+void Debugger::ProcessBody(MogreNewt::Body^ bod )
+{
+ NewtonBody* newtonBody = bod->NewtonBody;
+
+ Mogre::ColourValue mcolor;
+
+ if(m_materialcolors->ContainsKey(bod->MaterialGroupID->ID))
+ {
+ mcolor = m_materialcolors[bod->MaterialGroupID->ID];
+ }
+ else
+ {
+ mcolor = m_defaultcolor;
+ }
+
+
+
+ Mogre::Vector3 pos;
+ Mogre::Quaternion ori;
+ bod->GetPositionOrientation(pos,ori);
+
+ Mogre::Vector3 inertia = Mogre::Vector3::ZERO;
+ float mass = 1.0f;
+ bod->GetMassMatrix(mass,inertia);
+
+ if(m_showstaticasleep)
+ {
+ if (mass == 0.0f)
+ mcolor = m_colorstatic;
+ else
+ mcolor = (!bod->IsAsleep) ? mcolor : m_colorasleep;
+ }
+
+
+ System::String^ oss_name = "__OgreNewt__Debugger__Body__"+bod->ToString()+"__";
+ System::String^ oss_info = "mass: "+ mass.ToString()+" \n inertia: "+inertia.ToString()+" \n position: "+pos.ToString()+" \n orientation: "
+ +ori.ToString()+" \n vel: "+bod->Velocity+" \n omega:"+bod->Omega;
+
+ IntPtr str = Marshal::StringToHGlobalAnsi(oss_name);
+ Ogre::String UMoss_name = static_cast<char*>(str.ToPointer());
+ Marshal::FreeHGlobal( str );
+
+ IntPtr str2 = Marshal::StringToHGlobalAnsi(oss_info);
+ Ogre::String UMoss_info = static_cast<char*>(str2.ToPointer());
+ Marshal::FreeHGlobal( str2 );
+
+ IntPtr Fontstr = Marshal::StringToHGlobalAnsi(m_Font);
+ Ogre::String UMFont = static_cast<char*>(Fontstr.ToPointer());
+ Marshal::FreeHGlobal( Fontstr );
+
+ // set color
+ Ogre::ColourValue ColorValue;
+ ColorValue.setAsABGR(mcolor.GetAsARGB());
+
+ // look for cached data
+ BodyDebugData data;
+
+ if( m_cachemap->ContainsKey(bod)) // use cached data
+ {
+ data = m_cachemap[bod];
+ // set new position...
+ data.m_node->setPosition((Ogre::Vector3)pos);
+ data.m_node->setOrientation((Ogre::Quaternion)ori);
+ data.m_updated = 1;
+ data.m_text->setVisible(m_usemovabletext);
+ data.m_text->setCaption(UMoss_info);
+ data.m_text->setLocalTranslation((bod->BoundingBox->Size.y*1)*Ogre::Vector3::UNIT_Y);
+
+ if(m_enablelogging)
+ Mogre::LogManager::Singleton->LogMessage("MogreNewt - SceneNode name : "+bod->OgreNode->Name+" "+oss_info);
+ }
+ else
+ {
+ data.m_lastcol = bod->Collision;
+ data.m_updated = 1;
+
+ if( data.m_node )
+ {
+ data.m_node->detachAllObjects();
+ data.m_node->setPosition((Ogre::Vector3)pos);
+ data.m_node->setOrientation((Ogre::Quaternion)ori);
+ }
+ else
+ data.m_node = m_debugnode->createChildSceneNode((Ogre::Vector3)pos, (Ogre::Quaternion)ori);
+
+ if( data.m_lines )
+ data.m_lines->clear();
+ else
+ {
+ System::String^ oss = "__OgreNewt__Debugger__Lines__"+bod->ToString()+"__";
+ IntPtr str3 = Marshal::StringToHGlobalAnsi(oss);
+ Ogre::String UMoss = static_cast<char*>(str3.ToPointer());
+ Marshal::FreeHGlobal( str3 );
+ data.m_lines = new Ogre::ManualObject(UMoss);
+ }
+
+ if( data.m_text )
+ {
+ data.m_text->setVisible(m_usemovabletext);
+ data.m_text->setCaption(UMoss_info);
+ data.m_text->setLocalTranslation((bod->BoundingBox->Maximum.y*1)*Ogre::Vector3::UNIT_Y);
+ }
+ else
+ {
+ data.m_text = new MogreNewt::OgreAddons::MovableText( UMoss_name, UMoss_info, UMFont,3);
+ data.m_text->setLocalTranslation((bod->BoundingBox->Maximum.y/2)*Ogre::Vector3::UNIT_Y+Ogre::Vector3::UNIT_Y*0.1);
+ data.m_text->setTextAlignment( MogreNewt::OgreAddons::MovableText::H_LEFT, MogreNewt::OgreAddons::MovableText::V_ABOVE );
+ data.m_text->setVisible(m_usemovabletext);
+ }
+
+ if(m_enablelogging)
+ Mogre::LogManager::Singleton->LogMessage("MogreNewt - SceneNode name : "+bod->OgreNode->Name+" "+oss_info);
+
+ data.m_node->attachObject(data.m_text);
+
+
+ data.m_lines->begin("BaseWhiteNoLighting", Ogre::RenderOperation::OT_LINE_LIST );
+
+ data.m_lines->colour(ColorValue);
+
+ float matrix[16];
+ MogreNewt::Converter::QuatPosToMatrix(Mogre::Quaternion::IDENTITY,Mogre::Vector3::ZERO,&matrix[0]);
+ NewtonCollisionForEachPolygonDo( NewtonBodyGetCollision(newtonBody), &matrix[0], Debugger_newtonPerPoly, data.m_lines );
+
+ data.m_lines->end();
+ data.m_node->attachObject(data.m_lines);
+ m_cachemap->Add(bod,data);
+ }
+}
+
+
+/*void Debugger::ShowLines( MogreNewt::World^ world ,bool clearPrevious)
+{
if (clearPrevious)
m_debugger_debuglines->clear();
@@ -87,7 +399,7 @@
}
m_debugger_debuglines->end();
-}
+}*/
/*
void Debugger::ShowContacts( MogreNewt::World^ world, bool clearPrevious )
{
@@ -145,47 +457,216 @@
m_debugger_debuglines->end();
}
*/
-void Debugger::HideLines()
+
+// ----------------- raycast-debugging -----------------------
+void Debugger::StartRaycastRecording(bool markhitbodies)
{
- // erase any existing lines!
- m_debugger_debuglines->clear();
+ m_recordraycasts = true;
+ m_markhitbodies = markhitbodies;
+ ClearRaycastsRecorded();
}
+void Debugger::ClearRaycastsRecorded()
+{
+ if( m_raycastsnode )
+ {
+ m_raycastsnode->removeAndDestroyAllChildren();
+ }
-#pragma unmanaged
+ for each(ManageRaycastObject rObj in mRecordedRaycastObjects)
+ {
+ delete(*rObj.RaycastObject);
+ }
+ mRecordedRaycastObjects->Clear();
+}
-void Debugger_newtonPerBody( const NewtonBody* body ,Ogre::ColourValue colorvalue)
+void Debugger::StopRaycastRecording()
{
- um_currentcolor = colorvalue;
+ m_recordraycasts = false;
+}
- float matrix[16];
- NewtonBodyGetMatrix(body, &matrix[0]);
- NewtonCollisionForEachPolygonDo( NewtonBodyGetCollision(body), &matrix[0], Debugger_newtonPerPoly, NULL );
+void Debugger::SetRaycastRecordingColor(Mogre::ColourValue rayCol, Mogre::ColourValue convexCol, Mogre::ColourValue hitBodyCol, Mogre::ColourValue prefilterDiscardedBodyCol)
+{
+ m_raycol = rayCol;
+ m_convexcol = convexCol;
+ m_hitbodycol = hitBodyCol;
+ m_prefilterdiscardedcol = prefilterDiscardedBodyCol;
}
-void _CDECL Debugger_newtonPerPoly( void* userData, int vertexCount, const float* faceVertec, int id )
+void Debugger::AddRay(Mogre::Vector3 startpt,Mogre::Vector3 endpt)
{
- Ogre::Vector3 p0, p1;
+ if (!m_raycastsnode)
+ return;
- int i= vertexCount - 1;
- p0 = Ogre::Vector3( faceVertec[(i*3) + 0], faceVertec[(i*3) + 1], faceVertec[(i*3) + 2] );
+ static int i = 0;
+ std::ostringstream oss;
+ oss << "__OgreNewt__Raycast_Debugger__Lines__Raycastline__" << i++ << "__";
+ Ogre::ManualObject *line = new Ogre::ManualObject(oss.str());
+ ManageRaycastObject rObj;
+ rObj.RaycastObject = line;
- for (i=0;i<vertexCount;i++)
- {
- p1 = Ogre::Vector3( faceVertec[(i*3) + 0], faceVertec[(i*3) + 1], faceVertec[(i*3) + 2] );
+ mRecordedRaycastObjects->Add(rObj);
- m_debugger_debuglines->position( p0 );
- m_debugger_debuglines->colour( um_currentcolor );
- m_debugger_debuglines->position( p1 );
- m_debugger_debuglines->colour( um_currentcolor );
+ Ogre::ColourValue umColorValue;
+ umColorValue.setAsABGR(m_raycol.GetAsARGB());
- p0 = p1;
- }
+ line->begin("BaseWhiteNoLighting", Ogre::RenderOperation::OT_LINE_LIST );
+ line->colour(umColorValue);
+ line->position((Ogre::Vector3)startpt);
+ line->position((Ogre::Vector3)endpt);
+ line->end();
+
+ m_raycastsnode->attachObject(line);
}
+void Debugger::AddConvexRay(MogreNewt::Collision^ col, Mogre::Vector3 startpt,Mogre::Quaternion colori,Mogre::Vector3 endpt)
+{
+ if (!m_raycastsnode)
+ return;
+ static int i = 0;
+ // lines from aab
+ std::ostringstream oss;
+ oss << "__OgreNewt__Raycast_Debugger__Lines__Convexcastlines__" << i++ << "__";
+ Ogre::ManualObject *line = new Ogre::ManualObject(oss.str());
+ ManageRaycastObject rObj;
+ rObj.RaycastObject = line;
+ mRecordedRaycastObjects->Add(rObj);
+ m_raycastsnode->attachObject(line);
+
+ Ogre::ColourValue umColorValue;
+ umColorValue.setAsABGR(m_convexcol.GetAsARGB());
+
+ line->begin("BaseWhiteNoLighting", Ogre::RenderOperation::OT_LINE_LIST );
+ line->colour(umColorValue);
+
+ // aab1
+ Mogre::AxisAlignedBox^ aab1 = col->GetAABB(colori,startpt);
+ cli::array<Mogre::Vector3>^ corners1 = aab1->GetAllCorners();
+ Mogre::AxisAlignedBox^ aab2 = col->GetAABB(colori,endpt);
+ cli::array<Mogre::Vector3>^ corners2 = aab2->GetAllCorners();
+
+ //create a temporary variable for storing each vector from array since we can't cast Mogre::Vector3 in Ogre::Vector3 straight from an array -_-
+ Mogre::Vector3 TempVector;
+
+
+ for(int i = 0; i < 4; i++)
+ {
+ TempVector = corners1[i]; line->position((Ogre::Vector3)TempVector); TempVector = corners1[(i+1)%4];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners1[i+4]; line->position((Ogre::Vector3)TempVector); TempVector = corners1[(i+1)%4+4];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners2[i]; line->position((Ogre::Vector3)TempVector); TempVector = corners2[(i+1)%4];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners2[i+4]; line->position((Ogre::Vector3)TempVector); TempVector = corners2[(i+1)%4+4];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners1[i]; line->position((Ogre::Vector3)TempVector); TempVector = corners2[i];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners1[i+4]; line->position((Ogre::Vector3)TempVector); TempVector = corners2[i+4];line->position((Ogre::Vector3)TempVector);
+ }
+
+ TempVector = corners1[0];line->position((Ogre::Vector3)TempVector); TempVector = corners1[6];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners1[1];line->position((Ogre::Vector3)TempVector); TempVector = corners1[5];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners1[2];line->position((Ogre::Vector3)TempVector); TempVector = corners1[4];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners1[3];line->position((Ogre::Vector3)TempVector); TempVector = corners1[7];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners2[0];line->position((Ogre::Vector3)TempVector); TempVector = corners2[6];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners2[1];line->position((Ogre::Vector3)TempVector); TempVector = corners2[5];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners2[2];line->position((Ogre::Vector3)TempVector); TempVector = corners2[4];line->position((Ogre::Vector3)TempVector);
+ TempVector = corners2[3];line->position((Ogre::Vector3)TempVector); TempVector = corners2[7];line->position((Ogre::Vector3)TempVector);
+
+ // bodies
+ float matrix[16];
+ Converter::QuatPosToMatrix(colori, startpt, &matrix[0]);
+ NewtonCollisionForEachPolygonDo( col->NewtonCollision, &matrix[0], Debugger_newtonPerPoly, line );
+ Converter::QuatPosToMatrix(colori, endpt, &matrix[0]);
+ NewtonCollisionForEachPolygonDo( col->NewtonCollision, &matrix[0], Debugger_newtonPerPoly, line );
+
+ line->end();
+}
+
+void Debugger::AddDiscardedBody(MogreNewt::Body^ body)
+{
+ if (!m_raycastsnode)
+ return;
+
+ static int i = 0;
+ float matrix[16];
+
+ std::ostringstream oss;
+ oss << "__OgreNewt__Raycast_Debugger__Lines__DiscardedBody__" << i++ << "__";
+ Ogre::ManualObject *line = new Ogre::ManualObject(oss.str());
+ ManageRaycastObject rObj;
+ rObj.RaycastObject = line;
+ mRecordedRaycastObjects->Add(rObj);
+
+ m_raycastsnode->attachObject(line);
+
+ Ogre::ColourValue umColorValue;
+ umColorValue.setAsABGR(m_prefilterdiscardedcol.GetAsARGB());
+
+ line->begin("BaseWhiteNoLighting", Ogre::RenderOperation::OT_LINE_LIST );
+ line->colour(umColorValue);
+
+ NewtonBodyGetMatrix(body->NewtonBody, &matrix[0]);
+ NewtonCollisionForEachPolygonDo( body->Collision->NewtonCollision , &matrix[0], Debugger_newtonPerPoly, line );
+
+ line->end();
+
+}
+
+void Debugger::AddHitBody(MogreNewt::Body^ body)
+{
+ if (!m_raycastsnode)
+ return;
+
+ static int i = 0;
+ float matrix[16];
+
+ std::ostringstream oss;
+ oss << "__OgreNewt__Raycast_Debugger__Lines__HitBody__" << i++ << "__";
+ Ogre::ManualObject *line = new Ogre::ManualObject(oss.str());
+ ManageRaycastObject rObj;
+ rObj.RaycastObject = line;
+ mRecordedRaycastObjects->Add(rObj);
+
+ m_raycastsnode->attachObject(line);
+
+ Ogre::ColourValue umColorValue;
+ umColorValue.setAsABGR(m_hitbodycol.GetAsARGB());
+
+ line->begin("BaseWhiteNoLighting", Ogre::RenderOperation::OT_LINE_LIST );
+ line->colour(umColorValue);
+
+ NewtonBodyGetMatrix(body->NewtonBody, &matrix[0]);
+ NewtonCollisionForEachPolygonDo( body->Collision->NewtonCollision , &matrix[0], Debugger_newtonPerPoly, line );
+
+ line->end();
+
+}
+
+
+#pragma unmanaged
+
+
+void _CDECL Debugger_newtonPerPoly( void* userData, int vertexCount, const float* faceVertec, int id )
+{
+ Ogre::ManualObject* lines = (Ogre::ManualObject*)userData;
+ Ogre::Vector3 p0, p1;
+
+ if( vertexCount < 2 )
+ return;
+
+ int i= vertexCount - 1;
+ p0 = Ogre::Vector3( faceVertec[(i*3) + 0], faceVertec[(i*3) + 1], faceVertec[(i*3) + 2] );
+
+ for (i=0;i<vertexCount;i++)
+ {
+ p1 = Ogre::Vector3( faceVertec[(i*3) + 0], faceVertec[(i*3) + 1], faceVertec[(i*3) + 2] );
+
+ lines->position( p0 );
+ lines->position( p1 );
+ p0 = p1;
+ }
+
+}
+
} // end namespace MogreNewt
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Joint.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Joint.cpp 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Joint.cpp 2009-05-26 16:09:44 UTC (rev 270)
@@ -31,8 +31,6 @@
}
-#include "OgreNoMemoryMacros.h"
-
void Joint::Destructor( const NewtonJoint* me )
{
NewtonJointSetDestructor( me, NULL );
@@ -41,7 +39,6 @@
delete this;
}
-#include "OgreMemoryMacros.h"
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Tools.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Tools.cpp 2009-05-10 16:57:12 UTC (rev 269)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Tools.cpp 2009-05-26 16:09:44 UTC (rev 270)
@@ -1,4 +1,7 @@
#include "OgreNewt_Tools.h"
+#include "OgreNewt_World.h"
+#include "OgreNewt_Body.h"
+#include "OgreNewt_Collision.h"
namespace MogreNewt
{
@@ -220,6 +223,547 @@
return gcnew Mogre::AxisAlignedBox( min, max );
}
+
+ namespace OgreAddons
+ {
+ /**
+ * File: MovableText.cpp
+ *
+ * description: This create create a billboarding object that display a text.
+ *
+ * @author 2003 by cTh see gav...@ra...
+ * @update 2006 by barraq see no...@ba...
+ */
+
+
+ using namespace Ogre;
+
+ const unsigned short POS_TEX_BINDING = 0;
+ const unsigned short COLOUR_BINDING = 1;
+
+ MovableText::MovableText(const Ogre::String &name, const Ogre::String &caption, const Ogre::String &fontName, Ogre::Real charHeight, const Ogre::ColourValue &color)
+ : mpCam(NULL)
+ , mpWin(NULL)
+ , mpFont(NULL)
+ , mName(name)
+ , mCaption(caption)
+ , mFontName(fontName)
+ , mCharHeight(charHeight)
+ , mColor(color)
+ , mType("MovableText")
+ , mTimeUntilNextToggle(0)
+ , mSpaceWidth(0)
+ , mUpdateColors(true)
+ , mOnTop(false)
+ , mHorizontalAlignment(H_LEFT)
+ , mVerticalAlignment(V_BELOW)
+ , mGlobalTranslation(0.0)
+ , mLocalTranslation(0.0)
+ {
+ if (name == "")
+ throw Ogre::Exception(Ogre::Exception::ERR_INVALIDPARAMS, "Trying to create MovableText without name", "MovableText::MovableText");
+
+ if (caption == "")
+ throw Ogre::Exception(Ogre::Exception::ERR_INVALIDPARAMS, "Trying to create MovableText without caption", "MovableText::MovableText");
+
+ mRenderOp.vertexData = NULL;
+ this->setFontName(mFontName);
+ this->_setupGeometry();
+ }
+
+ MovableText::~MovableText()
+ {
+ if (mRenderOp.vertexData)
+ delete mRenderOp.vertexData;
+ // May cause crashing... check this and comment if it does
+ if (!mpMaterial.isNull())
+ MaterialManager::getSingletonPtr()->remove(mpMaterial->getName());
+ }
+
+ void MovableText::setFontName(const Ogre::String &fontName)
+ {
+ if((Ogre::MaterialManager::getSingletonPtr()->resourceExists(mName + "Material")))
+ {
+ Ogre::MaterialManager::getSingleton().remove(mName + "Material");
+ }
+
+ if (mFontName != fontName || mpMaterial.isNull() || !mpFont)
+ {
+ mFontName = fontName;
+ mpFont = (Ogre::Font *)Ogre::FontManager::getSingleton().getByName(mFontName).getPointer();
+ if (!mpFont)
+ throw Ogre::Exception(Ogre::Exception::ERR_ITEM_NOT_FOUND, "Could not find font " + fontName, "MovableText::setFontName");
+
+ mpFont->load();
+ if (!mpMaterial.isNull())
+ {
+ Ogre::MaterialManager::getSingletonPtr()->remove(mpMaterial->getName());
+ mpMaterial.setNull();
+ }
+
+ mpMaterial = mpFont->getMaterial()->clone(mName + "Material");
+ if (!mpMaterial->isLoaded())
+ mpMaterial->load();
+
+ mpMaterial->setDepthCheckEnabled(!mOnTop);
+ mpMaterial->setDepthBias(1.0,1.0);
+ mpMaterial->setDepthWriteEnabled(mOnTop);
+ mpMaterial->setLightingEnabled(false);
+ mNeedUpdate = true;
+ }
+ }
+
+ void MovableText::setCaption(const Ogre::String &caption)
+ {
+ if (caption != mCaption)
+ {
+ mCaption = caption;
+ mNeedUpdate = true;
+ }
+ }
+
+ void MovableText::setColor(const Ogre::ColourValue &color)
+ {
+ if (color != mColor)
+ {
+ mColor = color;
+ mUpdateColors = true;
+ }
+ }
+
+ void MovableText::setCharacterHeight(Ogre::Real height)
+ {
+ if (height != mCharHeight)
+ {
+ mCharHeight = height;
+ mNeedUpdate = true;
+ }
+ }
+
+ void MovableText::setSpaceWidth(Ogre::Real width)
+ {
+ if (width != mSpaceWidth)
+ {
+ mSpaceWidth = width;
+ mNeedUpdate = true;
+ }
+ }
+
+ void MovableText::setTextAlignment(const HorizontalAlignment& horizontalAlignment, const VerticalAlignment& verticalAlignment)
+ {
+ if(mHorizontalAlignment != horizontalAlignment)
+ {
+ mHorizontalAlignment = horizontalAlignment;
+ mNeedUpdate = true;
+ }
+ if(mVerticalAlignment != verticalAlignment)
+ {
+ mVerticalAlignment = verticalAlignment;
+ mNeedUpdate = true;
+ }
+ }
+
+ void MovableText::setGlobalTranslation( Ogre::Vector3 trans )
+ {
+ mGlobalTranslation = trans;
+ }
+
+ void MovableText::setLocalTranslation( Ogre::Vector3 trans )
+ {
+ mLocalTranslation = trans;
+ }
+
+ void MovableText::showOnTop(bool show)
+ {
+ if( mOnTop != show && !mpMaterial.isNull() )
+ {
+ mOnTop = show;
+ mpMaterial->setDepthBias(1.0,1.0);
+ mpMaterial->setDepthCheckEnabled(!mOnTop);
+ mpMaterial->setDepthWriteEnabled(mOnTop);
+ }
+ }
+
+ void MovableText::_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;
+
+ Ogre::VertexDeclaration *decl = mRenderOp.vertexData->vertexDeclaration;
+ Ogre::VertexBufferBinding *bind = mRenderOp.vertexData->vertexBufferBinding;
+ size_t offset = 0;
+
+ // create/bind positions/tex.ccord. buffer
+ if (!decl->findElementBySemantic(Ogre::VES_POSITION))
+ decl->addElement(POS_TEX_BINDING, offset, Ogre::VET_FLOAT3, Ogre::VES_POSITION);
+
+ offset += Ogre::VertexElement::getTypeSize(VET_FLOAT3);
+
+ if (!decl->findElementBySemantic(VES_TEXTURE_COORDINATES))
+ decl->addElement(POS_TEX_BINDING, offset, Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES, 0);
+
+ Ogre::HardwareVertexBufferSharedPtr ptbuf = Ogre::HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(POS_TEX_BINDING),
+ mRenderOp.vertexData->vertexCount,
+ Ogre::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(Ogre::VES_DIFFUSE))
+ decl->addElement(COLOUR_BINDING, 0, Ogre::VET_COLOUR, Ogre::VES_DIFFUSE);
+
+ HardwareVertexBufferSharedPtr cbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(COLOUR_BINDING),
+ mRenderOp.vertexData->vertexCount,
+ Ogre::HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
+ bind->setBinding(COLOUR_BINDING, cbuf);
+
+ size_t charlen = mCaption.size();
+ float *pPCBuff = static_cast<float*>(ptbuf->lock(Ogre::HardwareBuffer::HBL_DISCARD));
+
+ float largestWidth = 0;
+ float left = 0 * 2.0 - 1.0;
+ float top = -((0 * 2.0) - 1.0);
+
+ Ogre::Real spaceWidth = mSpaceWidth;
+ // Derive space width from a capital A
+ if (spaceWidth == 0)
+ spaceWidth = mpFont->getGlyphAspectRatio('A') * mCharHeight * 2.0;
+
+ // for calculation of AABB
+ Ogre::Vector3 min, max, currPos;
+ Ogre::Real maxSquaredRadius;
+ bool first = true;
+
+ // Use iterator
+ Ogre::String::iterator i, iend;
+ iend = mCaption.end();
+ bool newLine = true;
+ Real len = 0.0f;
+
+ Ogre::Real verticalOffset = 0;
+ switch (mVerticalAlignment)
+ {
+ case MovableText::V_ABOVE:
+ verticalOffset = mCharHeight;
+ break;
+ case MovableText::V_CENTER:
+ verticalOffset = 0.5*mCharHeight;
+ break;
+ case MovableText::V_BELOW:
+ verticalOffset = 0;
+ break;
+ }
+ // Raise the first line of the caption
+ top += verticalOffset;
+ for (i = mCaption.begin(); i != iend; ++i)
+ {
+ if (*i == '\n')
+ top += verticalOffset * 2.0;
+ }
+
+ for (i = mCaption.begin(); i != iend; ++i)
+ {
+ if (newLine)
+ {
+ len = 0.0f;
+ for (Ogre::String::iterator j = i; j != iend && *j != '\n'; j++)
+ {
+ if (*j == ' ')
+ len += spaceWidth;
+ 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 += spaceWidth;
+ // Also reduce tri count
+ mRenderOp.vertexData->vertexCount -= 6;
+ continue;
+ }
+
+ Ogre::Real horiz_height = mpFont->getGlyphAspectRatio(*i);
+ Ogre::Real u1, u2, v1, v2;
+ Ogre::Font::UVRect utmp;
+ utmp = mpFont->getGlyphTexCoords(*i);
+ u1 = utmp.left;
+ u2 = utmp.right;
+ v1 = utmp.top;
+ v2 = utmp.bottom;
+
+ // each vert is (x, y, z, u, v)
+ //-------------------------------------------------------------------------------------
+ // First tri
+ //
+ // Upper left
+ if(mHorizontalAlignment == MovableText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u1;
+ *pPCBuff++ = v1;
+
+ // Deal with bounds
+ if(mHorizontalAlignment == MovableText::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());
+ }
+
+ ...
[truncated message content] |
|
From: <mog...@li...> - 2009-05-10 16:57:24
|
Revision: 269
http://mogre.svn.sourceforge.net/mogre/?rev=269&view=rev
Author: bekas
Date: 2009-05-10 16:57:12 +0000 (Sun, 10 May 2009)
Log Message:
-----------
Remove OGRE_FORCE_ANGLE_TYPES usage, it was removed from Ogre 1.6.
Modified Paths:
--------------
trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h
trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h
trunk/Mogre/Mogre/include/Custom/MogreVector3.h
Modified: trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h 2009-05-08 10:20:18 UTC (rev 268)
+++ trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h 2009-05-10 16:57:12 UTC (rev 269)
@@ -228,16 +228,6 @@
rfAngle = r;
}
void FromAxisAngle (Vector3 rkAxis, Radian fRadians);
-#ifndef OGRE_FORCE_ANGLE_TYPES
- inline void ToAxisAngle ([Out] Vector3% rkAxis, [Out] Real% rfRadians) {
- Radian r;
- ToAxisAngle ( rkAxis, r );
- rfRadians = r.ValueRadians;
- }
- inline void FromAxisAngle (Vector3 rkAxis, Real fRadians) {
- FromAxisAngle ( rkAxis, Radian(fRadians) );
- }
-#endif//OGRE_FORCE_ANGLE_TYPES
// The matrix must be orthonormal. The decomposition is yaw*pitch*roll
// where yaw is rotation about the Up vector, pitch is rotation about the
@@ -260,80 +250,6 @@
void FromEulerAnglesYZX (Radian fYAngle, Radian fPAngle, Radian fRAngle);
void FromEulerAnglesZXY (Radian fYAngle, Radian fPAngle, Radian fRAngle);
void FromEulerAnglesZYX (Radian fYAngle, Radian fPAngle, Radian fRAngle);
-#ifndef OGRE_FORCE_ANGLE_TYPES
- inline bool ToEulerAnglesXYZ ([Out] float% rfYAngle, [Out] float% rfPAngle,
- [Out] float% rfRAngle) {
- Radian y, p, r;
- bool b = ToEulerAnglesXYZ(y,p,r);
- rfYAngle = y.ValueRadians;
- rfPAngle = p.ValueRadians;
- rfRAngle = r.ValueRadians;
- return b;
- }
- inline bool ToEulerAnglesXZY ([Out] float% rfYAngle, [Out] float% rfPAngle,
- [Out] float% rfRAngle) {
- Radian y, p, r;
- bool b = ToEulerAnglesXZY(y,p,r);
- rfYAngle = y.ValueRadians;
- rfPAngle = p.ValueRadians;
- rfRAngle = r.ValueRadians;
- return b;
- }
- inline bool ToEulerAnglesYXZ ([Out] float% rfYAngle, [Out] float% rfPAngle,
- [Out] float% rfRAngle) {
- Radian y, p, r;
- bool b = ToEulerAnglesYXZ(y,p,r);
- rfYAngle = y.ValueRadians;
- rfPAngle = p.ValueRadians;
- rfRAngle = r.ValueRadians;
- return b;
- }
- inline bool ToEulerAnglesYZX ([Out] float% rfYAngle, [Out] float% rfPAngle,
- [Out] float% rfRAngle) {
- Radian y, p, r;
- bool b = ToEulerAnglesYZX(y,p,r);
- rfYAngle = y.ValueRadians;
- rfPAngle = p.ValueRadians;
- rfRAngle = r.ValueRadians;
- return b;
- }
- inline bool ToEulerAnglesZXY ([Out] float% rfYAngle, [Out] float% rfPAngle,
- [Out] float% rfRAngle) {
- Radian y, p, r;
- bool b = ToEulerAnglesZXY(y,p,r);
- rfYAngle = y.ValueRadians;
- rfPAngle = p.ValueRadians;
- rfRAngle = r.ValueRadians;
- return b;
- }
- inline bool ToEulerAnglesZYX ([Out] float% rfYAngle, [Out] float% rfPAngle,
- [Out] float% rfRAngle) {
- Radian y, p, r;
- bool b = ToEulerAnglesZYX(y,p,r);
- rfYAngle = y.ValueRadians;
- rfPAngle = p.ValueRadians;
- rfRAngle = r.ValueRadians;
- return b;
- }
- inline void FromEulerAnglesXYZ (float fYAngle, float fPAngle, float fRAngle) {
- FromEulerAnglesXYZ ( Radian(fYAngle), Radian(fPAngle), Radian(fRAngle) );
- }
- inline void FromEulerAnglesXZY (float fYAngle, float fPAngle, float fRAngle) {
- FromEulerAnglesXZY ( Radian(fYAngle), Radian(fPAngle), Radian(fRAngle) );
- }
- inline void FromEulerAnglesYXZ (float fYAngle, float fPAngle, float fRAngle) {
- FromEulerAnglesYXZ ( Radian(fYAngle), Radian(fPAngle), Radian(fRAngle) );
- }
- inline void FromEulerAnglesYZX (float fYAngle, float fPAngle, float fRAngle) {
- FromEulerAnglesYZX ( Radian(fYAngle), Radian(fPAngle), Radian(fRAngle) );
- }
- inline void FromEulerAnglesZXY (float fYAngle, float fPAngle, float fRAngle) {
- FromEulerAnglesZXY ( Radian(fYAngle), Radian(fPAngle), Radian(fRAngle) );
- }
- inline void FromEulerAnglesZYX (float fYAngle, float fPAngle, float fRAngle) {
- FromEulerAnglesZYX ( Radian(fYAngle), Radian(fPAngle), Radian(fRAngle) );
- }
-#endif//OGRE_FORCE_ANGLE_TYPES
// eigensolver, matrix must be symmetric
void EigenSolveSymmetric (array<Real>^ afEigenvalue,
array<Vector3>^ akEigenvector);
Modified: trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h 2009-05-08 10:20:18 UTC (rev 268)
+++ trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h 2009-05-10 16:57:12 UTC (rev 269)
@@ -81,12 +81,6 @@
{
this->FromAngleAxis(rfAngle, rkAxis);
}
-#ifndef OGRE_FORCE_ANGLE_TYPES
- inline Quaternion(Real rfAngle, Vector3 rkAxis)
- {
- this->FromAngleAxis(rfAngle, rkAxis);
- }
-#endif//OGRE_FORCE_ANGLE_TYPES
/// Construct a quaternion from 3 orthonormal local axes
inline Quaternion(Vector3 xaxis, Vector3 yaxis, Vector3 zaxis)
{
@@ -115,16 +109,6 @@
ToAngleAxis ( rAngle, rkAxis );
dAngle = rAngle;
}
-#ifndef OGRE_FORCE_ANGLE_TYPES
- inline void FromAngleAxis (Real rfAngle, Vector3 rkAxis) {
- FromAngleAxis ( Angle(rfAngle), rkAxis );
- }
- inline void ToAngleAxis ([Out] Real% rfAngle, [Out] Vector3% rkAxis) {
- Radian r;
- ToAngleAxis ( r, rkAxis );
- rfAngle = r.ValueAngleUnits;
- }
-#endif//OGRE_FORCE_ANGLE_TYPES
void FromAxes (array<Vector3>^ akAxis);
void FromAxes (Vector3 xAxis, Vector3 yAxis, Vector3 zAxis);
void ToAxes ([Out] array<Vector3>^% akAxis);
Modified: trunk/Mogre/Mogre/include/Custom/MogreVector3.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVector3.h 2009-05-08 10:20:18 UTC (rev 268)
+++ trunk/Mogre/Mogre/include/Custom/MogreVector3.h 2009-05-10 16:57:12 UTC (rev 269)
@@ -451,18 +451,6 @@
Vector3 RandomDeviant(
Radian angle,
Vector3 up );
-#ifndef OGRE_FORCE_ANGLE_TYPES
- inline Vector3 RandomDeviant(
- Real angle,
- Vector3 up )
- {
- return RandomDeviant ( Radian(angle), up );
- }
- inline Vector3 RandomDeviant( Real angle )
- {
- return RandomDeviant ( Radian(angle), Vector3::ZERO );
- }
-#endif//OGRE_FORCE_ANGLE_TYPES
/** Gets the shortest arc quaternion to rotate this vector to the destination
vector.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-05-08 10:20:21
|
Revision: 268
http://mogre.svn.sourceforge.net/mogre/?rev=268&view=rev
Author: bekas
Date: 2009-05-08 10:20:18 +0000 (Fri, 08 May 2009)
Log Message:
-----------
Handle correctly DisplayString.
Modified Paths:
--------------
trunk/Mogre/AutoWrap/Meta/DefExplicitTypes.cs
Modified: trunk/Mogre/AutoWrap/Meta/DefExplicitTypes.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/DefExplicitTypes.cs 2009-04-21 17:57:57 UTC (rev 267)
+++ trunk/Mogre/AutoWrap/Meta/DefExplicitTypes.cs 2009-05-08 10:20:18 UTC (rev 268)
@@ -1543,7 +1543,7 @@
case PassedByType.Value:
case PassedByType.Reference:
newname = "o_" + name;
- return "DECLARE_NATIVE_STRING( o_" + name + ", " + name + " )\n";
+ return "DECLARE_NATIVE_UTFSTRING( o_" + name + ", " + name + " )\n";
case PassedByType.Pointer:
string expr = FullNativeName + "* arr_" + name + " = new " + FullNativeName + "[" + name + "->Length];\n";
expr += "for (int i=0; i < " + name + "->Length; i++)\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-04-21 17:58:14
|
Revision: 267
http://mogre.svn.sourceforge.net/mogre/?rev=267&view=rev
Author: bekas
Date: 2009-04-21 17:57:57 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
Add IsThrown static property to OgreException.
Modified Paths:
--------------
trunk/Mogre/AutoWrap/Attributes.xml
Modified: trunk/Mogre/AutoWrap/Attributes.xml
===================================================================
--- trunk/Mogre/AutoWrap/Attributes.xml 2009-04-21 17:57:17 UTC (rev 266)
+++ trunk/Mogre/AutoWrap/Attributes.xml 2009-04-21 17:57:57 UTC (rev 267)
@@ -194,7 +194,15 @@
<class name="MaterialSerializer" WrapType="PlainWrapper"/>
<class name="CompositorSerializer" WrapType="PlainWrapper"/>
<!-- to avoid name clash with System.Exception -->
- <class name="Exception" WrapType="PlainWrapper" ReadOnly="" Rename="OgreException"/>
+ <class name="Exception" WrapType="PlainWrapper" ReadOnly="" Rename="OgreException">
+ <_CustomIncDeclaration>
+ property bool IsThrown
+ {
+ public:
+ static bool get() { return LastException != nullptr; }
+ }
+ </_CustomIncDeclaration>
+ </class>
<class name="EdgeData" WrapType="CLRHandle">
<struct name="Triangle" WrapType="NativePtrValueType"/>
<struct name="Edge" WrapType="NativePtrValueType"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-04-21 17:57:24
|
Revision: 266
http://mogre.svn.sourceforge.net/mogre/?rev=266&view=rev
Author: bekas
Date: 2009-04-21 17:57:17 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
Bug fix, USE_CLROBJECT_CLASS has been removed.
Modified Paths:
--------------
trunk/Mogre/Mogre/include/Marshalling.h
Modified: trunk/Mogre/Mogre/include/Marshalling.h
===================================================================
--- trunk/Mogre/Mogre/include/Marshalling.h 2009-04-21 11:33:40 UTC (rev 265)
+++ trunk/Mogre/Mogre/include/Marshalling.h 2009-04-21 17:57:17 UTC (rev 266)
@@ -40,18 +40,14 @@
// In order to use it, a rebuild of OgreMain, the renderers and the plugins is required.
// It doesn't interfere with the Ogre code; native applications that use Ogre will link to the
// new DLLs without problems.
- #if USE_CLROBJECT_CLASS
- #define RETURN_CLR_OBJECT(T,n) \
- if (n == 0) return nullptr; \
- Object^ clr = *n; \
- if (nullptr == clr) { \
- n->_Init_CLRObject(); \
- clr = *n; \
- } \
- return static_cast<T^>(clr);
- #else
- #define RETURN_CLR_OBJECT(T,n) return gcnew T( n );
- #endif
+ #define RETURN_CLR_OBJECT(T,n) \
+ if (n == 0) return nullptr; \
+ Object^ clr = *n; \
+ if (nullptr == clr) { \
+ n->_Init_CLRObject(); \
+ clr = *n; \
+ } \
+ return static_cast<T^>(clr);
#define DEFINE_MANAGED_NATIVE_CONVERSIONS(T) \
static operator T^ (const Ogre::T* t) { \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-04-21 11:33:52
|
Revision: 265
http://mogre.svn.sourceforge.net/mogre/?rev=265&view=rev
Author: bekas
Date: 2009-04-21 11:33:40 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
Add Mogre project files.
Added Paths:
-----------
trunk/Mogre/Mogre/AssemblyInfo.cpp
trunk/Mogre/Mogre/Mogre_vc9.vcproj
trunk/Mogre/Mogre/Ogre/
trunk/Mogre/Mogre/Ogre/CLRConfig.h
trunk/Mogre/Mogre/Ogre/CLRHandle.cpp
trunk/Mogre/Mogre/Ogre/CLRHandle.h
trunk/Mogre/Mogre/Ogre/CLRObject.cpp
trunk/Mogre/Mogre/Ogre/CLRObject.h
trunk/Mogre/Mogre/include/
trunk/Mogre/Mogre/include/CLRHelp.h
trunk/Mogre/Mogre/include/Custom/
trunk/Mogre/Mogre/include/Custom/ManagedDataStream.h
trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h
trunk/Mogre/Mogre/include/Custom/MogreBox.h
trunk/Mogre/Mogre/include/Custom/MogreColourValue.h
trunk/Mogre/Mogre/include/Custom/MogreIteratorWrapper.h
trunk/Mogre/Mogre/include/Custom/MogreMath.h
trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h
trunk/Mogre/Mogre/include/Custom/MogreMatrix4.h
trunk/Mogre/Mogre/include/Custom/MogrePair.h
trunk/Mogre/Mogre/include/Custom/MogreParamCommand.h
trunk/Mogre/Mogre/include/Custom/MogrePlane.h
trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h
trunk/Mogre/Mogre/include/Custom/MogreRay.h
trunk/Mogre/Mogre/include/Custom/MogreRect.h
trunk/Mogre/Mogre/include/Custom/MogreRectangle.h
trunk/Mogre/Mogre/include/Custom/MogreSphere.h
trunk/Mogre/Mogre/include/Custom/MogreVector2.h
trunk/Mogre/Mogre/include/Custom/MogreVector3.h
trunk/Mogre/Mogre/include/Custom/MogreVector4.h
trunk/Mogre/Mogre/include/Custom/MogreVertexElement.i
trunk/Mogre/Mogre/include/Marshalling.h
trunk/Mogre/Mogre/include/MogreStableHeaders.h
trunk/Mogre/Mogre/include/NativeArrayWrappers.h
trunk/Mogre/Mogre/include/PortedClasses.h
trunk/Mogre/Mogre/include/Prerequisites.h
trunk/Mogre/Mogre/include/STLContainerWrappers.h
trunk/Mogre/Mogre/include/STLDeque.h
trunk/Mogre/Mogre/include/STLHashMap.h
trunk/Mogre/Mogre/include/STLList.h
trunk/Mogre/Mogre/include/STLMap.h
trunk/Mogre/Mogre/include/STLMultiMap.h
trunk/Mogre/Mogre/include/STLMultiSet.h
trunk/Mogre/Mogre/include/STLSet.h
trunk/Mogre/Mogre/include/STLVector.h
trunk/Mogre/Mogre/include/SubclassingManager.h
trunk/Mogre/Mogre/include/Wrapper.h
trunk/Mogre/Mogre/include/auto/
trunk/Mogre/Mogre/src/
trunk/Mogre/Mogre/src/Custom/
trunk/Mogre/Mogre/src/Custom/ManagedDataStream.cpp
trunk/Mogre/Mogre/src/Custom/MogreBox.cpp
trunk/Mogre/Mogre/src/Custom/MogreColourValue.cpp
trunk/Mogre/Mogre/src/Custom/MogreCustomPlane.cpp
trunk/Mogre/Mogre/src/Custom/MogreMath.cpp
trunk/Mogre/Mogre/src/Custom/MogreMatrix3.cpp
trunk/Mogre/Mogre/src/Custom/MogreMatrix4.cpp
trunk/Mogre/Mogre/src/Custom/MogreParamCommand.cpp
trunk/Mogre/Mogre/src/Custom/MogreQuaternion.cpp
trunk/Mogre/Mogre/src/Custom/MogreVector3.cpp
trunk/Mogre/Mogre/src/Custom/MogreVertexElement.cpp
trunk/Mogre/Mogre/src/Marshalling.cpp
trunk/Mogre/Mogre/src/MogrePrecompiledHeaders.cpp
trunk/Mogre/Mogre/src/SubclassingManager.cpp
trunk/Mogre/Mogre/src/Wrapper.cpp
trunk/Mogre/Mogre/src/auto/
Added: trunk/Mogre/Mogre/AssemblyInfo.cpp
===================================================================
--- trunk/Mogre/Mogre/AssemblyInfo.cpp (rev 0)
+++ trunk/Mogre/Mogre/AssemblyInfo.cpp 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,38 @@
+using namespace System;
+using namespace System::Reflection;
+using namespace System::Runtime::CompilerServices;
+using namespace System::Runtime::InteropServices;
+using namespace System::Security::Permissions;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly:AssemblyTitleAttribute("MOGRE")];
+[assembly:AssemblyDescriptionAttribute("OGRE 3D .NET Wrapper")];
+[assembly:AssemblyConfigurationAttribute("")];
+[assembly:AssemblyCompanyAttribute("")];
+[assembly:AssemblyProductAttribute("Mogre")];
+[assembly:AssemblyCopyrightAttribute("")];
+[assembly:AssemblyTrademarkAttribute("")];
+[assembly:AssemblyCultureAttribute("")];
+
+//
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the value or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersionAttribute("1.6.2")];
+
+[assembly:ComVisible(false)];
+
+[assembly:CLSCompliantAttribute(true)];
+
+[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];
Added: trunk/Mogre/Mogre/Mogre_vc9.vcproj
===================================================================
--- trunk/Mogre/Mogre/Mogre_vc9.vcproj (rev 0)
+++ trunk/Mogre/Mogre/Mogre_vc9.vcproj 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,1677 @@
+<?xml version="1.0" encoding="windows-1253"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="Mogre"
+ ProjectGUID="{838A5695-BEC6-48D9-B6B4-E622336D2CBD}"
+ RootNamespace="Mogre_vc9"
+ Keyword="ManagedCProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\Ogre\lib"
+ IntermediateDirectory="obj\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ ManagedExtensions="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="include;include\auto;..\Ogre\OgreMain\include;Ogre"
+ PreprocessorDefinitions="WIN32;_DEBUG"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="MogreStableHeaders.h"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="OgreMain_d.lib"
+ OutputFile="$(OutDir)\$(ProjectName)_d.dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\Ogre\lib"
+ GenerateDebugInformation="true"
+ AssemblyDebug="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\$(TargetFileName) ..\Ogre\Samples\Common\bin\$(ConfigurationName)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\Ogre\lib"
+ IntermediateDirectory="obj\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ ManagedExtensions="1"
+ WholeProgramOptimization="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="include;include\auto;..\Ogre\OgreMain\include;Ogre"
+ PreprocessorDefinitions="WIN32;NDEBUG"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="MogreStableHeaders.h"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="OgreMain.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\Ogre\lib"
+ GenerateDebugInformation="true"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(OutDir)\$(TargetFileName) ..\Ogre\Samples\Common\bin\$(ConfigurationName)"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ <AssemblyReference
+ RelativePath="System.dll"
+ AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+ MinFrameworkVersion="131072"
+ />
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\AssemblyInfo.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\Custom\ManagedDataStream.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Marshalling.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\Mogre-WIN32_OgreTimerImp.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreAnimable.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreAnimation.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreAnimationState.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreAnimationTrack.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreArchive.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreArchiveManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreBillboard.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreBillboardChain.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreBillboardParticleRenderer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreBillboardSet.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreBlendMode.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreBone.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreBorderPanelOverlayElement.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreBox.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCamera.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCodec.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreColourValue.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCommon.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCompositionPass.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCompositionTargetPass.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCompositionTechnique.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCompositor.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCompositorChain.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCompositorInstance.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCompositorManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreCompositorSerializer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreConfigFile.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreConfigOptionMap.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreCustomPlane.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreDataStream.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreDDSCodec.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreEdgeListBuilder.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreEntity.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreException.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreExternalTextureSource.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreExternalTextureSourceManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreFileSystem.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreFont.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreFontManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreFrameListener.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreFrustum.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreGpuProgram.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreGpuProgramManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreHardwareBuffer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreHardwareBufferManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreHardwareIndexBuffer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreHardwareOcclusionQuery.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreHardwarePixelBuffer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreHardwareVertexBuffer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreHighLevelGpuProgram.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreHighLevelGpuProgramManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreImage.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreImageCodec.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreInstancedGeometry.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreKeyFrame.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreLight.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreLog.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreLogManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreManualObject.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreMaterial.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreMaterialManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreMaterialSerializer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreMath.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreMatrix3.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreMatrix4.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreMesh.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreMeshManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreMeshSerializer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreMovableObject.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreMovablePlane.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreNode.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreOverlay.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreOverlayContainer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreOverlayElement.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreOverlayElementFactory.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreOverlayManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogrePanelOverlayElement.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreParamCommand.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreParticle.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreParticleAffector.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreParticleAffectorFactory.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreParticleEmitter.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreParticleEmitterFactory.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreParticleIterator.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreParticleSystem.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreParticleSystemManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreParticleSystemRenderer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogrePass.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogrePatchMesh.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogrePatchSurface.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogrePixelFormat.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogrePlane.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogrePlaneBoundedVolume.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogrePlugin.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogrePose.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\MogrePrecompiledHeaders.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreProfiler.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreProgressiveMesh.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreQuaternion.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRectangle2D.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderable.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderOperation.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderQueue.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderQueueInvocation.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderQueueListener.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderQueueSortingGrouping.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderSystem.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderSystemCapabilities.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderSystemCapabilitiesManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderTarget.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderTargetListener.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderTexture.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderToVertexBuffer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRenderWindow.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreResource.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreResourceBackgroundQueue.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreResourceGroupManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreResourceManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRibbonTrail.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRoot.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreRotationalSpline.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSceneManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSceneManagerEnumerator.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSceneNode.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSceneQuery.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSerializer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreShadowCameraSetup.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreShadowCameraSetupFocused.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreShadowCameraSetupLiSPSM.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreShadowCameraSetupPlaneOptimal.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreShadowCameraSetupPSSM.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreShadowCaster.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreShadowTextureManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSimpleRenderable.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSimpleSpline.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSkeleton.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSkeletonInstance.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSkeletonManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSkeletonSerializer.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreStaticGeometry.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreStringConverter.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreStringInterface.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreStringVector.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSubEntity.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreSubMesh.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreTagPoint.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreTechnique.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreTextAreaOverlayElement.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreTexture.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreTextureManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreTextureUnitState.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreUnifiedHighLevelGpuProgram.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreVector3.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Custom\MogreVertexElement.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreVertexIndexData.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreViewport.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreWindowEventUtilities.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreWireBoundingBox.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MogreZip.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\SubclassingManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Wrapper.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\include\CLRHelp.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\CLRObjects.inc"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MakePublicDeclarations.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\ManagedDataStream.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Marshalling.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\Mogre-WIN32_OgreTimerImp.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreAnimable.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreAnimation.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreAnimationState.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreAnimationTrack.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreArchive.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreArchiveManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreAxisAlignedBox.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreBillboard.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreBillboardChain.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreBillboardParticleRenderer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreBillboardSet.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreBlendMode.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreBone.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreBorderPanelOverlayElement.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreBox.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCamera.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCodec.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreColourValue.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreColourValue.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCommon.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCompositionPass.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCompositionTargetPass.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCompositionTechnique.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCompositor.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCompositorChain.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCompositorInstance.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCompositorManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreCompositorSerializer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreConfigFile.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreConfigOptionMap.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreDataStream.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreDDSCodec.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreEdgeListBuilder.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreEntity.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreException.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreExternalTextureSource.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreExternalTextureSourceManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreFileSystem.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreFont.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreFontManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreFrameListener.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreFrustum.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreGpuProgram.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreGpuProgramManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreHardwareBuffer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreHardwareBufferManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreHardwareIndexBuffer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreHardwareOcclusionQuery.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreHardwarePixelBuffer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreHardwareVertexBuffer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreHighLevelGpuProgram.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreHighLevelGpuProgramManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreImage.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreImageCodec.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreInstancedGeometry.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreIteratorWrapper.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreKeyFrame.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreLight.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreLog.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreLogManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreManualObject.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreMaterial.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreMaterialManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreMaterialSerializer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreMath.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreMatrix3.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreMatrix4.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreMesh.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreMeshManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreMeshSerializer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreMovableObject.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreMovablePlane.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreNode.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreNumerics.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreOverlay.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreOverlayContainer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreOverlayElement.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreOverlayElementFactory.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreOverlayManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogrePair.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePanelOverlayElement.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreParamCommand.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreParticle.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreParticleAffector.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreParticleAffectorFactory.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreParticleEmitter.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreParticleEmitterFactory.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreParticleIterator.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreParticleSystem.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreParticleSystemManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreParticleSystemRenderer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePass.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePatchMesh.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePatchSurface.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePixelFormat.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePlane.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogrePlane.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePlaneBoundedVolume.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePlatform.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePlugin.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePose.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogrePrerequisites.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreProfiler.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreProgressiveMesh.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreQuaternion.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreRay.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreRect.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreRectangle.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRectangle2D.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderable.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderOperation.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderQueue.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderQueueInvocation.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderQueueListener.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderQueueSortingGrouping.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderSystem.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderSystemCapabilities.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderSystemCapabilitiesManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderTarget.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderTargetListener.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderTexture.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderToVertexBuffer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRenderWindow.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreResource.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreResourceBackgroundQueue.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreResourceGroupManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreResourceManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRibbonTrail.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRoot.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreRotationalSpline.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSceneManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSceneManagerEnumerator.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSceneNode.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSceneQuery.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSerializer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreShadowCameraSetup.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreShadowCameraSetupFocused.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreShadowCameraSetupLiSPSM.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreShadowCameraSetupPlaneOptimal.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreShadowCameraSetupPSSM.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreShadowCaster.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreShadowTextureManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSimpleRenderable.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSimpleSpline.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSkeleton.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSkeletonInstance.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSkeletonManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSkeletonSerializer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreSphere.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\MogreStableHeaders.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreStaticGeometry.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreString.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreStringConverter.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreStringInterface.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreStringVector.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSubEntity.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreSubMesh.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreTagPoint.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreTechnique.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreTextAreaOverlayElement.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreTexture.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreTextureManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreTextureUnitState.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreUnifiedHighLevelGpuProgram.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreVector2.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreVector3.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MogreVector4.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreVertexBoneAssignment.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreVertexIndexData.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreViewport.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreWindowEventUtilities.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreWireBoundingBox.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MogreZip.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\NativeArrayWrappers.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\PortedClasses.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\PreDeclarations.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Prerequisites.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLContainerWrappers.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLDeque.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLHashMap.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLList.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLMap.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLMultiMap.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLMultiSet.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLSet.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLVector.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\SubclassingManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Wrapper.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/Mogre/Mogre/Ogre/CLRConfig.h
===================================================================
--- trunk/Mogre/Mogre/Ogre/CLRConfig.h (rev 0)
+++ trunk/Mogre/Mogre/Ogre/CLRConfig.h 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,3 @@
+#pragma once
+
+#define LINK_TO_MOGRE 1
Added: trunk/Mogre/Mogre/Ogre/CLRHandle.cpp
===================================================================
--- trunk/Mogre/Mogre/Ogre/CLRHandle.cpp (rev 0)
+++ trunk/Mogre/Mogre/Ogre/CLRHandle.cpp 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,21 @@
+#include "CLRHandle.h"
+#include "CLRConfig.h"
+
+#if LINK_TO_MOGRE
+
+namespace Mogre {
+ namespace Implementation {
+ __declspec(dllimport) void FreeCLRHandle(void* handle);
+ }
+}
+
+void _FreeCLRHandle(void* handle)
+{
+ Mogre::Implementation::FreeCLRHandle(handle);
+}
+
+#else
+
+void _FreeCLRHandle(void* handle) { }
+
+#endif
Added: trunk/Mogre/Mogre/Ogre/CLRHandle.h
===================================================================
--- trunk/Mogre/Mogre/Ogre/CLRHandle.h (rev 0)
+++ trunk/Mogre/Mogre/Ogre/CLRHandle.h 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,72 @@
+#pragma once
+
+#include "OgrePlatform.h"
+#include "CLRObject.h"
+
+#define DECLARE_CLRHANDLE CLRHandle _CLRHandle;
+
+// Free the handle in a separate function in managed context. CLRHandle's destructor
+// will call it only if it's necessary.
+void _OgreExport _FreeCLRHandle(void* handle);
+
+// This is used for plain, struct-like classes that don't form inheritance chains. It is used only for mapping the CLR object that wraps
+// the native object. It doesn't have any virtual method so it's a little bit more lightweight that CLRObject and it avoids
+// problems with classes that crash when getting a virtual destructor (like GpuProgramParameters).
+// CLRHandle is included as public field to a class with "DECLARE_CLRHANDLE".
+PUBLIC_FOR_CLI class CLRHandle
+{
+ void* _handle;
+
+public:
+ CLRHandle() : _handle(0)
+ {
+ }
+ CLRHandle(const CLRHandle& clrHandle)
+ {
+ // Don't let the GC handle get copied by value, otherwise it may get freed multiple times, leading to crashes.
+ _handle = 0;
+ }
+ ~CLRHandle()
+ {
+ if (_handle != 0)
+ _FreeCLRHandle(_handle);
+ }
+
+#ifdef SHOW_MANAGED_CLROBJECT
+
+ typedef System::Runtime::InteropServices::GCHandle GCHandle;
+ typedef System::Runtime::InteropServices::GCHandleType GCHandleType;
+ typedef System::Object Object;
+
+ CLRHandle(Object^ t)
+ {
+ _handle = __GCHANDLE_TO_VOIDPTR(GCHandle::Alloc(t, GCHandleType::Normal));
+ }
+
+ inline CLRHandle& operator=(Object^ t) {
+ if (_handle == 0)
+ _handle = __GCHANDLE_TO_VOIDPTR(GCHandle::Alloc(t, GCHandleType::Normal));
+ else
+ __VOIDPTR_TO_GCHANDLE(_handle).Target = t;
+
+ return *this;
+ }
+
+ void _MapToCLRObject(Object^ t, GCHandleType handleType)
+ {
+ if (_handle == 0)
+ _handle = __GCHANDLE_TO_VOIDPTR(GCHandle::Alloc(t, handleType));
+ else
+ throw gcnew System::Exception("_MapToCLRObject was called on a already mapped native object.");
+ }
+
+ inline operator Object^ () {
+ if (_handle == 0)
+ return nullptr;
+ else
+ return __VOIDPTR_TO_GCHANDLE(_handle).Target;
+ }
+
+#endif
+
+};
Added: trunk/Mogre/Mogre/Ogre/CLRObject.cpp
===================================================================
--- trunk/Mogre/Mogre/Ogre/CLRObject.cpp (rev 0)
+++ trunk/Mogre/Mogre/Ogre/CLRObject.cpp 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,39 @@
+#include "CLRObject.h"
+#include "CLRConfig.h"
+
+#if LINK_TO_MOGRE
+
+namespace Mogre {
+#define CLROBJECT(T) \
+ __declspec(dllimport) void _Init_CLRObject_##T(CLRObject *pObj);
+#include "CLRObjects.inc"
+#undef CLROBJECT
+}
+
+#define CLROBJECT(T) \
+ void __Init_CLRObject_##T(CLRObject *pObj) { \
+ Mogre::_Init_CLRObject_##T(pObj); \
+ }
+
+namespace Mogre {
+ namespace Implementation {
+ __declspec(dllimport) void FreeCLRObject(void* handle);
+ }
+}
+
+void _FreeCLRObject(void* handle)
+{
+ Mogre::Implementation::FreeCLRObject(handle);
+}
+
+#else
+
+#define CLROBJECT(T) \
+ void __Init_CLRObject_##T(CLRObject *pObj) { }
+
+void _FreeCLRObject(void* handle) { }
+
+#endif
+
+#include "CLRObjects.inc"
+#undef CLROBJECT
Added: trunk/Mogre/Mogre/Ogre/CLRObject.h
===================================================================
--- trunk/Mogre/Mogre/Ogre/CLRObject.h (rev 0)
+++ trunk/Mogre/Mogre/Ogre/CLRObject.h 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,91 @@
+#pragma once
+
+#include "OgrePlatform.h"
+
+class CLRObject;
+
+#define CLROBJECT(T) \
+ void _OgreExport __Init_CLRObject_##T(CLRObject *pObj);
+#include "CLRObjects.inc"
+#undef CLROBJECT
+
+//for subclasses of CLRObject
+#define DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(T) virtual void _Init_CLRObject(void) { __Init_CLRObject_##T(this); }
+
+
+#if defined( __cplusplus_cli )
+ //Make CLRObject and CLRHandle public native types for Mogre
+ #define PUBLIC_FOR_CLI public
+
+ // If this file is included in managed code expose all the managed stuff,
+ // otherwise hide them.
+ #define SHOW_MANAGED_CLROBJECT
+ #define __GCHANDLE_TO_VOIDPTR(x) ((GCHandle::operator System::IntPtr(x)).ToPointer())
+ #define __VOIDPTR_TO_GCHANDLE(x) (GCHandle::operator GCHandle(System::IntPtr(x)))
+#else
+ #define PUBLIC_FOR_CLI
+#endif
+
+// Free the handle in a separate function in managed context. CLRObject's destructor
+// will call it only if it's necessary.
+void _OgreExport _FreeCLRObject(void* handle);
+
+PUBLIC_FOR_CLI class CLRObject
+{
+ void* _handle;
+
+public:
+ CLRObject() : _handle(0)
+ {
+ }
+ CLRObject(const CLRObject& clrObject)
+ {
+ // Don't let the GC handle get copied by value, otherwise it may get freed multiple times, leading to crashes.
+ _handle = 0;
+ }
+ virtual ~CLRObject()
+ {
+ if (_handle != 0)
+ _FreeCLRObject(_handle);
+ }
+
+ virtual void _Init_CLRObject(void) = 0;
+
+#ifdef SHOW_MANAGED_CLROBJECT
+
+ typedef System::Runtime::InteropServices::GCHandle GCHandle;
+ typedef System::Runtime::InteropServices::GCHandleType GCHandleType;
+ typedef System::Object Object;
+
+ CLRObject(Object^ t)
+ {
+ _handle = __GCHANDLE_TO_VOIDPTR(GCHandle::Alloc(t, GCHandleType::Normal));
+ }
+
+ inline CLRObject& operator=(Object^ t) {
+ if (_handle == 0)
+ _handle = __GCHANDLE_TO_VOIDPTR(GCHandle::Alloc(t, GCHandleType::Normal));
+ else
+ __VOIDPTR_TO_GCHANDLE(_handle).Target = t;
+
+ return *this;
+ }
+
+ void _MapToCLRObject(Object^ t, GCHandleType handleType)
+ {
+ if (_handle == 0)
+ _handle = __GCHANDLE_TO_VOIDPTR(GCHandle::Alloc(t, handleType));
+ else
+ throw gcnew System::Exception("_MapToCLRObject was called on a already mapped native object.");
+ }
+
+ inline operator Object^ () {
+ if (_handle == 0)
+ return nullptr;
+ else
+ return __VOIDPTR_TO_GCHANDLE(_handle).Target;
+ }
+
+#endif
+
+};
Added: trunk/Mogre/Mogre/include/CLRHelp.h
===================================================================
--- trunk/Mogre/Mogre/include/CLRHelp.h (rev 0)
+++ trunk/Mogre/Mogre/include/CLRHelp.h 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,89 @@
+#pragma once
+
+/* Embeds a native class. Example:
+
+struct NativePoint {
+ int x, y;
+ };
+
+ ref class R {
+ Embedded<NativePoint> np;
+ };
+*/
+template<typename T>
+ ref class Embedded {
+ T* t;
+
+ !Embedded() {
+ if (t != nullptr) {
+ delete t;
+ t = nullptr;
+ }
+ }
+
+ ~Embedded() {
+ this->!Embedded();
+ }
+
+ public:
+ Embedded() : t(new T) {}
+
+ static T* operator&(Embedded% e) { return e.t; }
+ static T* operator->(Embedded% e) { return e.t; }
+ };
+
+
+ /* Replacement for native arrays inside managed classes. Example:
+ ref class R {
+ inline_array<int, 10> arr;
+ };
+*/
+ template<typename T, int length>
+ [System::Runtime::InteropServices::StructLayout
+ (
+ System::Runtime::InteropServices::LayoutKind::Explicit,
+ Size=(sizeof(T)*length)
+ )
+ ]
+ public value struct inline_array {
+ private:
+ [System::Runtime::InteropServices::FieldOffset(0)]
+ T dummy_item;
+
+ public:
+ inline T% operator[](int index) {
+ return *((&dummy_item)+index);
+ }
+
+ static operator interior_ptr<T>(inline_array<T,length>% ia) {
+ return &ia.dummy_item;
+ }
+ };
+
+
+ //To use inline_array with value classes, the size of each array item must be
+ //manually declared. Example:
+ // ref class R {
+ // inline_array_explicit<Vector3, 3*sizeof(Real), 10> arr;
+ // };
+ template<typename T, int size, int length>
+ [System::Runtime::InteropServices::StructLayout
+ (
+ System::Runtime::InteropServices::LayoutKind::Explicit,
+ Size=(size*length)
+ )
+ ]
+ public value struct inline_array_explicit {
+ private:
+ [System::Runtime::InteropServices::FieldOffset(0)]
+ T dummy_item;
+
+ public:
+ inline T% operator[](int index) {
+ return *((&dummy_item)+index);
+ }
+
+ static operator interior_ptr<T>(inline_array_explicit<T,size,length>% ia) {
+ return &ia.dummy_item;
+ }
+ };
Added: trunk/Mogre/Mogre/include/Custom/ManagedDataStream.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/ManagedDataStream.h (rev 0)
+++ trunk/Mogre/Mogre/include/Custom/ManagedDataStream.h 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <gcroot.h>
+#include "OgreDataStream.h"
+#include "MogreDataStream.h"
+
+namespace Mogre
+{
+ public ref class ManagedDataStream : DataStream
+ {
+ Ogre::DataStream* _createNative(System::IO::Stream^ stream);
+
+ internal:
+ System::IO::Stream^ _stream;
+
+ public:
+ ManagedDataStream(System::IO::Stream^ stream) : DataStream( _createNative(stream) )
+ {
+ _createdByCLR = true;
+ }
+
+ property System::IO::Stream^ Stream
+ {
+ System::IO::Stream^ get()
+ {
+ return _stream;
+ }
+ }
+
+ };
+
+ class DataStream_Proxy : public Ogre::DataStream
+ {
+ gcroot<ManagedDataStream^> _managed;
+ long _initPos;
+
+ public:
+ DataStream_Proxy( ManagedDataStream^ managed ) : _managed(managed)
+ {
+ _initPos = managed->_stream->Position;
+ mSize = managed->_stream->Length - _initPos;
+ }
+
+ ~DataStream_Proxy()
+ {
+ _managed->_native = 0;
+ }
+
+ virtual size_t read(void* buf, size_t count);
+
+ /** Skip a defined number of bytes. This can also be a negative value, in which case
+ the file pointer rewinds a defined number of bytes. */
+ virtual void skip(long count) ;
+
+ /** Repositions the read point to a specified byte.
+ */
+ virtual void seek( size_t pos );
+
+ /** Returns the current byte offset from beginning */
+ virtual size_t tell(void) const;
+
+ /** Returns true if the stream has reached the end.
+ */
+ virtual bool eof(void) const;
+
+ /** Close the stream; this makes further operations invalid. */
+ virtual void close(void);
+ };
+}
\ No newline at end of file
Added: trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h (rev 0)
+++ trunk/Mogre/Mogre/include/Custom/MogreAxisAlignedBox.h 2009-04-21 11:33:40 UTC (rev 265)
@@ -0,0 +1,772 @@
+/*
+-----------------------------------------------------------------------------
+This source file is part of OGRE
+ (Object-oriented Graphics Rendering Engine) ported to C++/CLI
+For the latest info, see http://www.ogre3d.org/
+
+Copyright (c) 2000-2005 The OGRE Team
+Also see acknowledgements in Readme.html
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+#pragma once
+
+#include "OgreAxisAlignedBox.h"
+#include "Prerequisites.h"
+#include "Custom\MogreVector3.h"
+#include "Custom\MogreMatrix4.h"
+#include "MogreSphere.h"
+
+namespace Mogre {
+
+ /** A 3D box aligned with the x/y/z axes.
+ @remarks
+ This class represents a simple box which is aligned with the
+ axes. Internally it only stores 2 points as the extremeties of
+ the box, one which is the minima of all 3 axes, and the other
+ which is the maxima of all 3 axes. This class is typically used
+ for an axis-aligned bounding box (AABB) for collision and
+ visibility determination.
+ */
+ [Serializable]
+ public ref class AxisAlignedBox
+ {
+ public:
+ static operator AxisAlignedBox^ (const Ogre::AxisAlignedBox& box)
+ {
+ AxisAlignedBox^ clr_box = gcnew AxisAlignedBox(box.getMinimum(), box.getMaximum());
+ if (box.isNull())
+ clr_box->SetNull();
+ else if (box.isInfinite())
+ clr_box->SetInfinite();
+
+ return clr_box;
+ }
+
+ static operator Ogre::AxisAlignedBox (AxisAlignedBox^ box)
+ {
+ Ogre::AxisAlignedBox o_box((Ogre::Vector3&)box->mMinimum, (Ogre::Vector3&)box->mMaximum);
+ if (box->IsNull)
+ o_box.setNull();
+ else if (box->IsInfinite)
+ o_box.setInfinite();
+
+ return o_box;
+ }
+
+ protected:
+ enum class Extent
+ {
+ EXTENT_NULL,
+ EXTENT_FINITE,
+ EXTENT_INFINITE
+ };
+
+ Vector3 mMinimum;
+ Vector3 mMaximum;
+ Extent mExtent;
+
+ [NonSerialized]
+ array<Vector3>^ mpCorners;
+
+ public:
+ /*
+ 1-----2
+ /| /|
+ / | / |
+ 5-----4 |
+ | 0--|--3
+ | / | /
+ |/ |/
+ 6-----7
+ */
+ enum class CornerEnum {
+ FAR_LEFT_BOTTOM = Ogre::AxisAlignedBox::FAR_LEFT_BOTTOM,
+ FAR_LEFT_TOP = Ogre::AxisAlignedBox::FAR_LEFT_TOP,
+ FAR_RIGHT_TOP = Ogre::AxisAlignedBox::FAR_RIGHT_TOP,
+ FAR_RIGHT_BOTTOM = Ogre::AxisAlignedBox::FAR_RIGHT_BOTTOM,
+ NEAR_RIGHT_BOTTOM = Ogre::AxisAlignedBox::NEAR_RIGHT_BOTTOM,
+ NEAR_LEFT_BOTTOM = Ogre::AxisAlignedBox::NEAR_LEFT_BOTTOM,
+ NEAR_LEFT_TOP = Ogre::AxisAlignedBox::NEAR_LEFT_TOP,
+ NEAR_RIGHT_TOP = Ogre::AxisAlignedBox::NEAR_RIGHT_TOP
+ };
+ AxisAlignedBox()
+ {
+ // Default to a null box
+ SetMinimum( -0.5, -0.5, -0.5 );
+ SetMaximum( 0.5, 0.5, 0.5 );
+ mExtent = Extent::EXTENT_NULL;
+ }
+
+ AxisAlignedBox(AxisAlignedBox^ rkBox)
+ {
+ if (rkBox->IsNull)
+ SetNull();
+ else if (rkBox->IsInfinite)
+ SetInfinite();
+ else
+ SetExtents( rkBox->mMinimum, rkBox->mMaximum );
+ }
+
+ AxisAlignedBox( Vector3 min, Vector3 max )
+ {
+ SetExtents( min, max );
+ }
+
+ AxisAlignedBox(
+ Real mx, Real my, Real mz,
+ Real Mx, Real My, Real Mz )
+ {
+ SetExtents( mx, my, mz, Mx, My, Mz );
+ }
+
+
+ /** Gets the minimum corner of the box.
+ */
+ property Vector3 Minimum
+ {
+ Vector3 get() { return mMinimum; }
+ }
+
+ /** Gets the maximum corner of the box.
+ */
+ property Vector3 Maximum
+ {
+ Vector3 get() { return mMaximum; }
+ }
+
+ /** Sets the minimum corner of the box.
+ */
+ inline void SetMinimum( Vector3 vec )
+ {
+ mExtent = Extent::EXTENT_FINITE;
+ mMinimum = vec;
+ }
+
+ inline void SetMinimum( Real x, Real y, Real z )
+ {
+ mExtent = Extent::EXTENT_FINITE;
+ mMinimum.x = x;
+ mMinimum.y = y;
+ mMinimum.z = z;
+ }
+
+ /** Changes one of the components of the minimum corner of the box
+ used to resize only one dimension of the box
+ */
+ inline void SetMinimumX(Real x)
+ {
+ mMinimum.x = x;
+ }
+
+ inline void SetMinimumY(Real y)
+ {
+ mMinimum.y = y;
+ }
+
+ inline void SetMinimumZ(Real z)
+ {
+ mMinimum.z = z;
+ }
+
+ /** Sets the maximum corner of the box.
+ */
+ inline void SetMaximum( Vector3 vec )
+ {
+ mExtent = Extent::EXTENT_FINITE;
+ mMaximum = vec;
+ }
+
+ inline void SetMaximum( Real x, Real y, Real z )
+ {
+ mExtent = Extent::EXTENT_FINITE;
+ mMaximum.x = x;
+ mMaximum.y = y;
+ mMaximum.z = z;
+ }
+
+ /** Changes one of the components of the maximum corner of the box
+ used to resize only one dimension of the box
+ */
+ inline void SetMaximumX( Real x )
+ {
+ mMaximum.x = x;
+ }
+
+ inline void SetMaximumY( Real y )
+ {
+ mMaximum.y = y;
+ }
+
+ inline void SetMaximumZ( Real z )
+ {
+ mMaximum.z = z;
+ }
+
+ /** Sets both minimum and maximum extents at once.
+ */
+ inline void SetExtents( Vector3 min, Vector3 max )
+ {
+ mExtent = Extent::EXTENT_FINITE;
+ mMinimum = min;
+ mMaximum = max;
+ }
+
+ inline void SetExtents(
+ Real mx, Real my, Real mz,
+ Real Mx, Real My, Real Mz )
+ {
+ mExtent = Extent::EXTENT_FINITE;
+
+ mMinimum.x = mx;
+ mMinimum.y = my;
+ mMinimum.z = mz;
+
+ mMaximum.x = Mx;
+ mMaximum.y = My;
+ mMaximum.z = Mz;
+
+ }
+
+ /** Returns a pointer to an array of 8 corner points, useful for
+ collision vs. non-aligned objects.
+ @remarks
+ If the order of these corners is important, they are as
+ follows: The 4 points of the minimum Z face (note that
+ because Ogre uses right-handed coordinates, the minimum Z is
+ at the 'back' of the box) starting with the minimum point of
+ all, then anticlockwise around this face (if you are looking
+ onto the face from outside the box). Then the 4 points of the
+ maximum Z face, starting with maximum point of all, then
+ anticlockwise around this face (looking onto the face from
+ outside the box). Like this:
+ <pre>
+ 1-----2
+ /| /|
+ / | / |
+ 5-----4 |
+ | 0--|--3
+ | / | /
+ |/ |/
+ 6-----7
+ </pre>
+ @remarks as this implementation uses a static member, make sure to use your own copy !
+ */
+ array<Vector3>^ GetAllCorners()
+ {
+ if (mExtent != Extent::EXTENT_FINITE)
+ throw gcnew System::Exception("Can't get corners of a null or infinite AAB");
+
+ // The order of these items is, using right-handed co-ordinates:
+ // Minimum Z face, starting with Min(all), then anticlockwise
+ // around face (looking onto the face)
+ // Maximum Z face, starting with Max(all), then anticlockwise
+ // around face (looking onto the face)
+ // Only for optimization/compatibility.
+ if (!mpCorners)
+ mpCorners = gcnew array<Vector3>(8);
+
+ mpCorners[0] = mMinimum;
+ mpCorners[1].x = mMinimum.x; mpCorners[1].y = mMaximum.y; mpCorners[1].z = mMinimum.z;
+ mpCorners[2].x = mMaximum.x; mpCorners[2].y = mMaximum.y; mpCorners[2].z = mMinimum.z;
+ mpCorners[3].x = mMaximum.x; mpCorners[3].y = mMinimum.y; mpCorners[3].z = mMinimum.z;
+
+ mpCorners[4] = mMaximum;
+ mpCorners[5].x = mMinimum.x; mpCorners[5].y = mMaximum.y; mpCorners[5].z = mMaximum.z;
+ mpCorners[6].x = mMinimum.x; mpCorners[6].y = mMinimum.y; mpCorners[6].z = mMaximum.z;
+ mpCorners[7].x = mMaximum.x; mpCorners[7].y = mMinimum.y; mpCorners[7].z = mMaximum.z;
+
+ return mpCorners;
+ }
+
+ /** gets the position of one of the corners
+ */
+ Vector3 GetCorner(CornerEnum cornerToGet)
+ {
+ switch(cornerToGet)
+ {
+ case CornerEnum::FAR_LEFT_BOTTOM:
+ return mMinimum;
+ case CornerEnum::FAR_LEFT_TOP:
+ return Vector3(mMinimum.x, mMaximum.y, mMinimum.z);
+ case CornerEnum::FAR_RIGHT_TOP:
+ return Vector3(mMaximum.x, mMaximum.y, mMinimum.z);
+ case CornerEnum::FAR_RIGHT_BOTTOM:
+ return Vector3(mMaximum.x, mMinimum.y, mMinimum.z);
+ case CornerEnum::NEAR_RIGHT_BOTTOM:
+ return Vector3(mMaximum.x, mMinimum.y, mMaximum.z);
+ case CornerEnum::NEAR_LEFT_BOTTOM:
+ return Vector3(mMinimum.x, mMinimum.y, mMaximum.z);
+ case Corn...
[truncated message content] |
|
From: <mog...@li...> - 2009-04-21 11:29:46
|
Revision: 264
http://mogre.svn.sourceforge.net/mogre/?rev=264&view=rev
Author: bekas
Date: 2009-04-21 11:29:43 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
-Update Mogre_vc9.sln
-Add patches for Ogre's source code
Modified Paths:
--------------
trunk/Mogre/Mogre_vc9.sln
Added Paths:
-----------
trunk/Mogre/Ogre Patches/
trunk/Mogre/Ogre Patches/CLRObjects.patch
trunk/Mogre/Ogre Patches/Exception.patch
trunk/Mogre/Ogre Patches/OgreMain_vcproj.patch
Modified: trunk/Mogre/Mogre_vc9.sln
===================================================================
--- trunk/Mogre/Mogre_vc9.sln 2009-04-21 04:23:36 UTC (rev 263)
+++ trunk/Mogre/Mogre_vc9.sln 2009-04-21 11:29:43 UTC (rev 264)
@@ -1,55 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OgreMain", "ogre\OgreMain\scripts\OgreMain_vc9.vcproj", "{35AFBABB-DF05-43DE-91A7-BB828A874015}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mogre", "Mogre\Mogre_vc9.vcproj", "{838A5695-BEC6-48D9-B6B4-E622336D2CBD}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mogre", "Mogre\Mogre_vc9.vcproj", "{F75E973B-C1A0-43EB-8560-C43EF6D57812}"
- ProjectSection(ProjectDependencies) = postProject
- {35AFBABB-DF05-43DE-91A7-BB828A874015} = {35AFBABB-DF05-43DE-91A7-BB828A874015}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_BSPSceneManager", "ogre\PlugIns\BSPSceneManager\scripts\Plugin_BSPSceneManager_vc9.vcproj", "{80DECC17-BDDD-4412-8CF8-F7C1C17A7436}"
- ProjectSection(ProjectDependencies) = postProject
- {35AFBABB-DF05-43DE-91A7-BB828A874015} = {35AFBABB-DF05-43DE-91A7-BB828A874015}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_CgProgramManager", "ogre\PlugIns\CgProgramManager\scripts\Plugin_CgProgramManager_vc9.vcproj", "{1C741C2F-3278-43D8-9FD2-E631A64B70AE}"
- ProjectSection(ProjectDependencies) = postProject
- {35AFBABB-DF05-43DE-91A7-BB828A874015} = {35AFBABB-DF05-43DE-91A7-BB828A874015}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_OctreeSceneManager", "ogre\PlugIns\OctreeSceneManager\scripts\Plugin_OctreeSceneManager_vc9.vcproj", "{A6830BB5-9993-4F6D-8D4E-930F36A1B88F}"
- ProjectSection(ProjectDependencies) = postProject
- {35AFBABB-DF05-43DE-91A7-BB828A874015} = {35AFBABB-DF05-43DE-91A7-BB828A874015}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_ParticleFX", "ogre\PlugIns\ParticleFX\scripts\Plugin_ParticleFX_vc9.vcproj", "{C61A6060-5F0B-4B83-A0BC-678CCDA98FF6}"
- ProjectSection(ProjectDependencies) = postProject
- {35AFBABB-DF05-43DE-91A7-BB828A874015} = {35AFBABB-DF05-43DE-91A7-BB828A874015}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderSystem_Direct3D9", "ogre\RenderSystems\Direct3D9\scripts\RenderSystem_Direct3D9_vc9.vcproj", "{0F172B9C-E5D5-4EB1-BFDB-93D787A37461}"
- ProjectSection(ProjectDependencies) = postProject
- {35AFBABB-DF05-43DE-91A7-BB828A874015} = {35AFBABB-DF05-43DE-91A7-BB828A874015}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderSystem_GL", "ogre\RenderSystems\GL\scripts\RenderSystem_GL_vc9.vcproj", "{7D0A20FE-40A6-4E64-AD26-5E34AE391DF4}"
- ProjectSection(ProjectDependencies) = postProject
- {35AFBABB-DF05-43DE-91A7-BB828A874015} = {35AFBABB-DF05-43DE-91A7-BB828A874015}
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FEE48B4D-7352-4344-BE1D-4A0FC69B031E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_PCZSceneManager", "ogre\PlugIns\PCZSceneManager\scripts\Plugin_PCZSceneManager_vc9.vcproj", "{275186DE-66DF-487D-9D99-A6445E14E162}"
- ProjectSection(ProjectDependencies) = postProject
- {35AFBABB-DF05-43DE-91A7-BB828A874015} = {35AFBABB-DF05-43DE-91A7-BB828A874015}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_OctreeZone", "ogre\PlugIns\OctreeZone\scripts\Plugin_OctreeZone_vc9.vcproj", "{1A466963-7683-46AD-A927-785917C6CEEE}"
- ProjectSection(ProjectDependencies) = postProject
- {35AFBABB-DF05-43DE-91A7-BB828A874015} = {35AFBABB-DF05-43DE-91A7-BB828A874015}
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -58,86 +11,14 @@
ReleaseStaticLib|Win32 = ReleaseStaticLib|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {35AFBABB-DF05-43DE-91A7-BB828A874015}.Debug|Win32.ActiveCfg = Debug|Win32
- {35AFBABB-DF05-43DE-91A7-BB828A874015}.Debug|Win32.Build.0 = Debug|Win32
- {35AFBABB-DF05-43DE-91A7-BB828A874015}.DebugStaticLib|Win32.ActiveCfg = DebugStaticLib|Win32
- {35AFBABB-DF05-43DE-91A7-BB828A874015}.DebugStaticLib|Win32.Build.0 = DebugStaticLib|Win32
- {35AFBABB-DF05-43DE-91A7-BB828A874015}.Release|Win32.ActiveCfg = Release|Win32
- {35AFBABB-DF05-43DE-91A7-BB828A874015}.Release|Win32.Build.0 = Release|Win32
- {35AFBABB-DF05-43DE-91A7-BB828A874015}.ReleaseStaticLib|Win32.ActiveCfg = ReleaseStaticLib|Win32
- {35AFBABB-DF05-43DE-91A7-BB828A874015}.ReleaseStaticLib|Win32.Build.0 = ReleaseStaticLib|Win32
- {F75E973B-C1A0-43EB-8560-C43EF6D57812}.Debug|Win32.ActiveCfg = Debug|Win32
- {F75E973B-C1A0-43EB-8560-C43EF6D57812}.Debug|Win32.Build.0 = Debug|Win32
- {F75E973B-C1A0-43EB-8560-C43EF6D57812}.DebugStaticLib|Win32.ActiveCfg = Debug|Win32
- {F75E973B-C1A0-43EB-8560-C43EF6D57812}.DebugStaticLib|Win32.Build.0 = Debug|Win32
- {F75E973B-C1A0-43EB-8560-C43EF6D57812}.Release|Win32.ActiveCfg = Release|Win32
- {F75E973B-C1A0-43EB-8560-C43EF6D57812}.Release|Win32.Build.0 = Release|Win32
- {F75E973B-C1A0-43EB-8560-C43EF6D57812}.ReleaseStaticLib|Win32.ActiveCfg = Release|Win32
- {F75E973B-C1A0-43EB-8560-C43EF6D57812}.ReleaseStaticLib|Win32.Build.0 = Release|Win32
- {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug|Win32.ActiveCfg = Debug|Win32
- {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug|Win32.Build.0 = Debug|Win32
- {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.DebugStaticLib|Win32.ActiveCfg = DebugStaticLib|Win32
- {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.DebugStaticLib|Win32.Build.0 = DebugStaticLib|Win32
- {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release|Win32.ActiveCfg = Release|Win32
- {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release|Win32.Build.0 = Release|Win32
- {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.ReleaseStaticLib|Win32.ActiveCfg = ReleaseStaticLib|Win32
- {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.ReleaseStaticLib|Win32.Build.0 = ReleaseStaticLib|Win32
- {1C741C2F-3278-43D8-9FD2-E631A64B70AE}.Debug|Win32.ActiveCfg = Debug|Win32
- {1C741C2F-3278-43D8-9FD2-E631A64B70AE}.Debug|Win32.Build.0 = Debug|Win32
- {1C741C2F-3278-43D8-9FD2-E631A64B70AE}.DebugStaticLib|Win32.ActiveCfg = DebugStaticLib|Win32
- {1C741C2F-3278-43D8-9FD2-E631A64B70AE}.DebugStaticLib|Win32.Build.0 = DebugStaticLib|Win32
- {1C741C2F-3278-43D8-9FD2-E631A64B70AE}.Release|Win32.ActiveCfg = Release|Win32
- {1C741C2F-3278-43D8-9FD2-E631A64B70AE}.Release|Win32.Build.0 = Release|Win32
- {1C741C2F-3278-43D8-9FD2-E631A64B70AE}.ReleaseStaticLib|Win32.ActiveCfg = ReleaseStaticLib|Win32
- {1C741C2F-3278-43D8-9FD2-E631A64B70AE}.ReleaseStaticLib|Win32.Build.0 = ReleaseStaticLib|Win32
- {A6830BB5-9993-4F6D-8D4E-930F36A1B88F}.Debug|Win32.ActiveCfg = Debug|Win32
- {A6830BB5-9993-4F6D-8D4E-930F36A1B88F}.Debug|Win32.Build.0 = Debug|Win32
- {A6830BB5-9993-4F6D-8D4E-930F36A1B88F}.DebugStaticLib|Win32.ActiveCfg = DebugStaticLib|Win32
- {A6830BB5-9993-4F6D-8D4E-930F36A1B88F}.DebugStaticLib|Win32.Build.0 = DebugStaticLib|Win32
- {A6830BB5-9993-4F6D-8D4E-930F36A1B88F}.Release|Win32.ActiveCfg = Release|Win32
- {A6830BB5-9993-4F6D-8D4E-930F36A1B88F}.Release|Win32.Build.0 = Release|Win32
- {A6830BB5-9993-4F6D-8D4E-930F36A1B88F}.ReleaseStaticLib|Win32.ActiveCfg = ReleaseStaticLib|Win32
- {A6830BB5-9993-4F6D-8D4E-930F36A1B88F}.ReleaseStaticLib|Win32.Build.0 = ReleaseStaticLib|Win32
- {C61A6060-5F0B-4B83-A0BC-678CCDA98FF6}.Debug|Win32.ActiveCfg = Debug|Win32
- {C61A6060-5F0B-4B83-A0BC-678CCDA98FF6}.Debug|Win32.Build.0 = Debug|Win32
- {C61A6060-5F0B-4B83-A0BC-678CCDA98FF6}.DebugStaticLib|Win32.ActiveCfg = DebugStaticLib|Win32
- {C61A6060-5F0B-4B83-A0BC-678CCDA98FF6}.DebugStaticLib|Win32.Build.0 = DebugStaticLib|Win32
- {C61A6060-5F0B-4B83-A0BC-678CCDA98FF6}.Release|Win32.ActiveCfg = Release|Win32
- {C61A6060-5F0B-4B83-A0BC-678CCDA98FF6}.Release|Win32.Build.0 = Release|Win32
- {C61A6060-5F0B-4B83-A0BC-678CCDA98FF6}.ReleaseStaticLib|Win32.ActiveCfg = ReleaseStaticLib|Win32
- {C61A6060-5F0B-4B83-A0BC-678CCDA98FF6}.ReleaseStaticLib|Win32.Build.0 = ReleaseStaticLib|Win32
- {0F172B9C-E5D5-4EB1-BFDB-93D787A37461}.Debug|Win32.ActiveCfg = Debug|Win32
- {0F172B9C-E5D5-4EB1-BFDB-93D787A37461}.Debug|Win32.Build.0 = Debug|Win32
- {0F172B9C-E5D5-4EB1-BFDB-93D787A37461}.DebugStaticLib|Win32.ActiveCfg = DebugStaticLib|Win32
- {0F172B9C-E5D5-4EB1-BFDB-93D787A37461}.DebugStaticLib|Win32.Build.0 = DebugStaticLib|Win32
- {0F172B9C-E5D5-4EB1-BFDB-93D787A37461}.Release|Win32.ActiveCfg = Release|Win32
- {0F172B9C-E5D5-4EB1-BFDB-93D787A37461}.Release|Win32.Build.0 = Release|Win32
- {0F172B9C-E5D5-4EB1-BFDB-93D787A37461}.ReleaseStaticLib|Win32.ActiveCfg = ReleaseStaticLib|Win32
- {0F172B9C-E5D5-4EB1-BFDB-93D787A37461}.ReleaseStaticLib|Win32.Build.0 = ReleaseStaticLib|Win32
- {7D0A20FE-40A6-4E64-AD26-5E34AE391DF4}.Debug|Win32.ActiveCfg = Debug|Win32
- {7D0A20FE-40A6-4E64-AD26-5E34AE391DF4}.Debug|Win32.Build.0 = Debug|Win32
- {7D0A20FE-40A6-4E64-AD26-5E34AE391DF4}.DebugStaticLib|Win32.ActiveCfg = DebugStaticLib|Win32
- {7D0A20FE-40A6-4E64-AD26-5E34AE391DF4}.DebugStaticLib|Win32.Build.0 = DebugStaticLib|Win32
- {7D0A20FE-40A6-4E64-AD26-5E34AE391DF4}.Release|Win32.ActiveCfg = Release|Win32
- {7D0A20FE-40A6-4E64-AD26-5E34AE391DF4}.Release|Win32.Build.0 = Release|Win32
- {7D0A20FE-40A6-4E64-AD26-5E34AE391DF4}.ReleaseStaticLib|Win32.ActiveCfg = ReleaseStaticLib|Win32
- {7D0A20FE-40A6-4E64-AD26-5E34AE391DF4}.ReleaseStaticLib|Win32.Build.0 = ReleaseStaticLib|Win32
- {275186DE-66DF-487D-9D99-A6445E14E162}.Debug|Win32.ActiveCfg = Debug|Win32
- {275186DE-66DF-487D-9D99-A6445E14E162}.Debug|Win32.Build.0 = Debug|Win32
- {275186DE-66DF-487D-9D99-A6445E14E162}.DebugStaticLib|Win32.ActiveCfg = DebugStaticLib|Win32
- {275186DE-66DF-487D-9D99-A6445E14E162}.DebugStaticLib|Win32.Build.0 = DebugStaticLib|Win32
- {275186DE-66DF-487D-9D99-A6445E14E162}.Release|Win32.ActiveCfg = Release|Win32
- {275186DE-66DF-487D-9D99-A6445E14E162}.Release|Win32.Build.0 = Release|Win32
- {275186DE-66DF-487D-9D99-A6445E14E162}.ReleaseStaticLib|Win32.ActiveCfg = ReleaseStaticLib|Win32
- {275186DE-66DF-487D-9D99-A6445E14E162}.ReleaseStaticLib|Win32.Build.0 = ReleaseStaticLib|Win32
- {1A466963-7683-46AD-A927-785917C6CEEE}.Debug|Win32.ActiveCfg = Debug|Win32
- {1A466963-7683-46AD-A927-785917C6CEEE}.Debug|Win32.Build.0 = Debug|Win32
- {1A466963-7683-46AD-A927-785917C6CEEE}.DebugStaticLib|Win32.ActiveCfg = DebugStaticLib|Win32
- {1A466963-7683-46AD-A927-785917C6CEEE}.DebugStaticLib|Win32.Build.0 = DebugStaticLib|Win32
- {1A466963-7683-46AD-A927-785917C6CEEE}.Release|Win32.ActiveCfg = Release|Win32
- {1A466963-7683-46AD-A927-785917C6CEEE}.Release|Win32.Build.0 = Release|Win32
- {1A466963-7683-46AD-A927-785917C6CEEE}.ReleaseStaticLib|Win32.ActiveCfg = ReleaseStaticLib|Win32
- {1A466963-7683-46AD-A927-785917C6CEEE}.ReleaseStaticLib|Win32.Build.0 = ReleaseStaticLib|Win32
+ {838A5695-BEC6-48D9-B6B4-E622336D2CBD}.Debug|Win32.ActiveCfg = Debug|Win32
+ {838A5695-BEC6-48D9-B6B4-E622336D2CBD}.Debug|Win32.Build.0 = Debug|Win32
+ {838A5695-BEC6-48D9-B6B4-E622336D2CBD}.DebugStaticLib|Win32.ActiveCfg = Debug|Win32
+ {838A5695-BEC6-48D9-B6B4-E622336D2CBD}.DebugStaticLib|Win32.Build.0 = Debug|Win32
+ {838A5695-BEC6-48D9-B6B4-E622336D2CBD}.Release|Win32.ActiveCfg = Release|Win32
+ {838A5695-BEC6-48D9-B6B4-E622336D2CBD}.Release|Win32.Build.0 = Release|Win32
+ {838A5695-BEC6-48D9-B6B4-E622336D2CBD}.ReleaseStaticLib|Win32.ActiveCfg = Release|Win32
+ {838A5695-BEC6-48D9-B6B4-E622336D2CBD}.ReleaseStaticLib|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Added: trunk/Mogre/Ogre Patches/CLRObjects.patch
===================================================================
--- trunk/Mogre/Ogre Patches/CLRObjects.patch (rev 0)
+++ trunk/Mogre/Ogre Patches/CLRObjects.patch 2009-04-21 11:29:43 UTC (rev 264)
@@ -0,0 +1,2089 @@
+Index: OgreMain/include/OgreAnimable.h
+===================================================================
+--- OgreMain/include/OgreAnimable.h (revision 8525)
++++ OgreMain/include/OgreAnimable.h (working copy)
+@@ -62,9 +62,11 @@
+ are often comprised of multiple properties it helps to be able to deal
+ with all values through a single class.
+ */
+- class _OgreExport AnimableValue : public AnimableAlloc
++ class _OgreExport AnimableValue : public AnimableAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(AnimableValue);
++
+ /// The type of the value being animated
+ enum ValueType
+ {
+Index: OgreMain/include/OgreAnimation.h
+===================================================================
+--- OgreMain/include/OgreAnimation.h (revision 8525)
++++ OgreMain/include/OgreAnimation.h (working copy)
+@@ -49,10 +49,12 @@
+ You should not create these animations directly. They will be created via a parent
+ object which owns the animation, e.g. Skeleton.
+ */
+- class _OgreExport Animation : public AnimationAlloc
++ class _OgreExport Animation : public AnimationAlloc, public CLRObject
+ {
+
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Animation);
++
+ /** The types of animation interpolation available. */
+ enum InterpolationMode
+ {
+Index: OgreMain/include/OgreAnimationState.h
+===================================================================
+--- OgreMain/include/OgreAnimationState.h (revision 8525)
++++ OgreMain/include/OgreAnimationState.h (working copy)
+@@ -43,9 +43,10 @@
+ Other classes can hold instances of this class to store the state of any animations
+ they are using.
+ */
+- class _OgreExport AnimationState : public AnimationAlloc
++ class _OgreExport AnimationState : public AnimationAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(AnimationState);
+
+ /// typedef for an array of float values used as a bone blend mask
+ typedef std::vector<float> BoneBlendMask;
+@@ -177,6 +178,8 @@
+ class _OgreExport AnimationStateSet : public AnimationAlloc
+ {
+ public:
++ DECLARE_CLRHANDLE;
++
+ /// Mutex, public for external locking if needed
+ OGRE_AUTO_MUTEX
+ /// Create a blank animation state set
+Index: OgreMain/include/OgreAnimationTrack.h
+===================================================================
+--- OgreMain/include/OgreAnimationTrack.h (revision 8525)
++++ OgreMain/include/OgreAnimationTrack.h (working copy)
+@@ -43,6 +43,9 @@
+ */
+ class _OgreExport TimeIndex
+ {
++ public:
++ DECLARE_CLRHANDLE;
++
+ protected:
+ /** The time position (in relation to the whole animation sequence)
+ */
+@@ -113,9 +116,10 @@
+ It is possible to change this behaviour using
+ setUseShortestRotationPath() method.
+ */
+- class _OgreExport AnimationTrack : public AnimationAlloc
++ class _OgreExport AnimationTrack : public AnimationAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(AnimationTrack);
+
+ /** Listener allowing you to override certain behaviour of a track,
+ for example to drive animation procedurally.
+@@ -256,6 +260,8 @@
+ class _OgreExport NumericAnimationTrack : public AnimationTrack
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(NumericAnimationTrack);
++
+ /// Constructor
+ NumericAnimationTrack(Animation* parent, unsigned short handle);
+ /// Constructor, associates with an AnimableValue
+@@ -317,6 +323,8 @@
+ class _OgreExport NodeAnimationTrack : public AnimationTrack
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(NodeAnimationTrack);
++
+ /// Constructor
+ NodeAnimationTrack(Animation* parent, unsigned short handle);
+ /// Constructor, associates with a Node
+@@ -469,6 +477,8 @@
+ class _OgreExport VertexAnimationTrack : public AnimationTrack
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(VertexAnimationTrack);
++
+ /** The target animation mode */
+ enum TargetMode
+ {
+Index: OgreMain/include/OgreArchive.h
+===================================================================
+--- OgreMain/include/OgreArchive.h (revision 8525)
++++ OgreMain/include/OgreArchive.h (working copy)
+@@ -78,8 +78,11 @@
+ to benefit from OGRE's automatic searching of multiple file locations
+ for the resources you are looking for.
+ */
+- class _OgreExport Archive : public ArchiveAlloc
++ class _OgreExport Archive : public ArchiveAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Archive);
++
+ protected:
+ /// Archive name
+ String mName;
+Index: OgreMain/include/OgreBillboard.h
+===================================================================
+--- OgreMain/include/OgreBillboard.h (revision 8525)
++++ OgreMain/include/OgreBillboard.h (working copy)
+@@ -60,6 +60,9 @@
+
+ class _OgreExport Billboard : public FXAlloc
+ {
++ public:
++ DECLARE_CLRHANDLE;
++
+ friend class BillboardSet;
+ friend class BillboardParticleRenderer;
+ protected:
+Index: OgreMain/include/OgreBillboardChain.h
+===================================================================
+--- OgreMain/include/OgreBillboardChain.h (revision 8525)
++++ OgreMain/include/OgreBillboardChain.h (working copy)
+@@ -71,6 +71,7 @@
+ {
+
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(BillboardChain);
+
+ /** Contains the data of an element of the BillboardChain.
+ */
+@@ -327,6 +328,9 @@
+ /** Factory object for creating BillboardChain instances */
+ class _OgreExport BillboardChainFactory : public MovableObjectFactory
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(BillboardChainFactory);
++
+ protected:
+ MovableObject* createInstanceImpl( const String& name, const NameValuePairList* params);
+ public:
+Index: OgreMain/include/OgreBillboardParticleRenderer.h
+===================================================================
+--- OgreMain/include/OgreBillboardParticleRenderer.h (revision 8525)
++++ OgreMain/include/OgreBillboardParticleRenderer.h (working copy)
+@@ -44,6 +44,9 @@
+ */
+ class _OgreExport BillboardParticleRenderer : public ParticleSystemRenderer
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(BillboardParticleRenderer);
++
+ protected:
+ /// The billboard set that's doing the rendering
+ BillboardSet* mBillboardSet;
+Index: OgreMain/include/OgreBillboardSet.h
+===================================================================
+--- OgreMain/include/OgreBillboardSet.h (revision 8525)
++++ OgreMain/include/OgreBillboardSet.h (working copy)
+@@ -102,6 +102,9 @@
+ */
+ class _OgreExport BillboardSet : public MovableObject, public Renderable
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(BillboardSet);
++
+ protected:
+ /** Private constructor (instances cannot be created directly).
+ */
+@@ -821,6 +824,9 @@
+ /** Factory object for creating BillboardSet instances */
+ class _OgreExport BillboardSetFactory : public MovableObjectFactory
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(BillboardSetFactory);
++
+ protected:
+ MovableObject* createInstanceImpl( const String& name, const NameValuePairList* params);
+ public:
+Index: OgreMain/include/OgreBone.h
+===================================================================
+--- OgreMain/include/OgreBone.h (revision 8525)
++++ OgreMain/include/OgreBone.h (working copy)
+@@ -45,6 +45,8 @@
+ class _OgreExport Bone : public Node
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Bone);
++
+ /** Constructor, not to be used directly (use Bone::createChild or Skeleton::createBone) */
+ Bone(unsigned short handle, Skeleton* creator);
+ /** Constructor, not to be used directly (use Bone::createChild or Skeleton::createBone) */
+Index: OgreMain/include/OgreBorderPanelOverlayElement.h
+===================================================================
+--- OgreMain/include/OgreBorderPanelOverlayElement.h (revision 8525)
++++ OgreMain/include/OgreBorderPanelOverlayElement.h (working copy)
+@@ -51,6 +51,9 @@
+ */
+ class _OgreExport BorderPanelOverlayElement : public PanelOverlayElement
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(BorderPanelOverlayElement);
++
+ friend class BorderRenderable;
+ public:
+ /** Constructor */
+@@ -312,8 +315,11 @@
+ We need this because we have to render twice, once with the inner panel's repeating
+ material (handled by superclass) and once for the border's separate material.
+ */
+- class _OgreExport BorderRenderable : public Renderable, public OverlayAlloc
++ class _OgreExport BorderRenderable : public Renderable, public OverlayAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(BorderRenderable);
++
+ protected:
+ BorderPanelOverlayElement* mParent;
+ public:
+Index: OgreMain/include/OgreCamera.h
+===================================================================
+--- OgreMain/include/OgreCamera.h (revision 8525)
++++ OgreMain/include/OgreCamera.h (working copy)
+@@ -80,6 +80,9 @@
+ */
+ class _OgreExport Camera : public Frustum
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Camera);
++
+ protected:
+ /// Camera name
+ String mName;
+Index: OgreMain/include/OgreCodec.h
+===================================================================
+--- OgreMain/include/OgreCodec.h (revision 8525)
++++ OgreMain/include/OgreCodec.h (working copy)
+@@ -46,8 +46,11 @@
+ The codec concept is a pretty generic one - you can easily understand
+ how it can be used for images, sounds, archives, even compressed data.
+ */
+- class _OgreExport Codec : public CodecAlloc
++ class _OgreExport Codec : public CodecAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Codec);
++
+ protected:
+ typedef std::map< String, Codec* > CodecList;
+ /** A map that contains all the registered codecs.
+@@ -55,9 +58,11 @@
+ static CodecList ms_mapCodecs;
+
+ public:
+- class _OgrePrivate CodecData : public CodecAlloc
++ class _OgrePrivate CodecData : public CodecAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Codec_CodecData);
++
+ virtual ~CodecData() {};
+
+ /** Returns the type of the data.
+Index: OgreMain/include/OgreCompositionPass.h
+===================================================================
+--- OgreMain/include/OgreCompositionPass.h (revision 8525)
++++ OgreMain/include/OgreCompositionPass.h (working copy)
+@@ -41,6 +41,8 @@
+ class _OgreExport CompositionPass : public CompositorInstAlloc
+ {
+ public:
++ DECLARE_CLRHANDLE;
++
+ CompositionPass(CompositionTargetPass *parent);
+ ~CompositionPass();
+
+@@ -203,6 +205,8 @@
+ /// Inputs (for material used for rendering the quad)
+ struct InputTex
+ {
++ DECLARE_CLRHANDLE;
++
+ /// Name (local) of the input texture (empty == no input)
+ String name;
+ /// MRT surface index if applicable
+Index: OgreMain/include/OgreCompositionTargetPass.h
+===================================================================
+--- OgreMain/include/OgreCompositionTargetPass.h (revision 8525)
++++ OgreMain/include/OgreCompositionTargetPass.h (working copy)
+@@ -39,6 +39,8 @@
+ class _OgreExport CompositionTargetPass : public CompositorInstAlloc
+ {
+ public:
++ DECLARE_CLRHANDLE;
++
+ CompositionTargetPass(CompositionTechnique *parent);
+ ~CompositionTargetPass();
+
+Index: OgreMain/include/OgreCompositionTechnique.h
+===================================================================
+--- OgreMain/include/OgreCompositionTechnique.h (revision 8525)
++++ OgreMain/include/OgreCompositionTechnique.h (working copy)
+@@ -36,9 +36,11 @@
+ namespace Ogre {
+ /** Base composition technique, can be subclassed in plugins.
+ */
+- class _OgreExport CompositionTechnique : public CompositorInstAlloc
++ class _OgreExport CompositionTechnique : public CompositorInstAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(CompositionTechnique);
++
+ CompositionTechnique(Compositor *parent);
+ virtual ~CompositionTechnique();
+
+Index: OgreMain/include/OgreCompositor.h
+===================================================================
+--- OgreMain/include/OgreCompositor.h (revision 8525)
++++ OgreMain/include/OgreCompositor.h (working copy)
+@@ -43,6 +43,8 @@
+ class _OgreExport Compositor: public Resource
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Compositor);
++
+ Compositor(ResourceManager* creator, const String& name, ResourceHandle handle,
+ const String& group, bool isManual = false, ManualResourceLoader* loader = 0);
+ ~Compositor();
+Index: OgreMain/include/OgreCompositorChain.h
+===================================================================
+--- OgreMain/include/OgreCompositorChain.h (revision 8525)
++++ OgreMain/include/OgreCompositorChain.h (working copy)
+@@ -38,9 +38,11 @@
+
+ /** Chain of compositor effects applying to one viewport.
+ */
+- class _OgreExport CompositorChain: public RenderTargetListener, public CompositorInstAlloc
++ class _OgreExport CompositorChain: public RenderTargetListener, public CompositorInstAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(CompositorChain);
++
+ CompositorChain(Viewport *vp);
+ /** Another gcc warning here, which is no problem because RenderTargetListener is never used
+ to delete an object.
+Index: OgreMain/include/OgreCompositorInstance.h
+===================================================================
+--- OgreMain/include/OgreCompositorInstance.h (revision 8525)
++++ OgreMain/include/OgreCompositorInstance.h (working copy)
+@@ -39,9 +39,11 @@
+ /** An instance of a Compositor object for one Viewport. It is part of the CompositorChain
+ for a Viewport.
+ */
+- class _OgreExport CompositorInstance : public CompositorInstAlloc
++ class _OgreExport CompositorInstance : public CompositorInstAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(CompositorInstance);
++
+ CompositorInstance(Compositor *filter, CompositionTechnique *technique, CompositorChain *chain);
+ virtual ~CompositorInstance();
+ /** Provides an interface to "listen in" to to render system operations executed by this
+Index: OgreMain/include/OgreEdgeListBuilder.h
+===================================================================
+--- OgreMain/include/OgreEdgeListBuilder.h (revision 8525)
++++ OgreMain/include/OgreEdgeListBuilder.h (working copy)
+@@ -46,6 +46,8 @@
+ class _OgreExport EdgeData : public EdgeDataAlloc
+ {
+ public:
++ DECLARE_CLRHANDLE;
++
+ /** Basic triangle structure. */
+ struct Triangle {
+ /** The set of indexes this triangle came from (NB it is possible that the triangles on
+Index: OgreMain/include/OgreEntity.h
+===================================================================
+--- OgreMain/include/OgreEntity.h (revision 8525)
++++ OgreMain/include/OgreEntity.h (working copy)
+@@ -74,6 +74,9 @@
+ */
+ class _OgreExport Entity: public MovableObject, public Resource::Listener
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Entity);
++
+ // Allow EntityFactory full access
+ friend class EntityFactory;
+ friend class SubEntity;
+@@ -757,6 +760,9 @@
+ /** Factory object for creating Entity instances */
+ class _OgreExport EntityFactory : public MovableObjectFactory
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(EntityFactory);
++
+ protected:
+ MovableObject* createInstanceImpl( const String& name, const NameValuePairList* params);
+ public:
+Index: OgreMain/include/OgreExternalTextureSource.h
+===================================================================
+--- OgreMain/include/OgreExternalTextureSource.h (revision 8525)
++++ OgreMain/include/OgreExternalTextureSource.h (working copy)
+@@ -65,9 +65,11 @@
+ before calling create defined texture... or it will fail, though, it
+ is up to the plugin to report errors to the log file, or raise an
+ exception if need be. */
+- class _OgreExport ExternalTextureSource : public StringInterface
++ class _OgreExport ExternalTextureSource : public StringInterface, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ExternalTextureSource);
++
+ /** Constructor */
+ ExternalTextureSource();
+ /** Virtual destructor */
+Index: OgreMain/include/OgreFileSystem.h
+===================================================================
+--- OgreMain/include/OgreFileSystem.h (revision 8525)
++++ OgreMain/include/OgreFileSystem.h (working copy)
+@@ -41,6 +41,9 @@
+ */
+ class _OgreExport FileSystemArchive : public Archive
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(FileSystemArchive);
++
+ protected:
+ /** Utility method to retrieve all files in a directory matching pattern.
+ @param pattern File pattern
+Index: OgreMain/include/OgreFont.h
+===================================================================
+--- OgreMain/include/OgreFont.h (revision 8525)
++++ OgreMain/include/OgreFont.h (working copy)
+@@ -59,6 +59,9 @@
+ */
+ class _OgreExport Font : public Resource, public ManualResourceLoader
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Font);
++
+ protected:
+ /// Command object for Font - see ParamCommand
+ class _OgreExport CmdType : public ParamCommand
+Index: OgreMain/include/OgreFrustum.h
+===================================================================
+--- OgreMain/include/OgreFrustum.h (revision 8525)
++++ OgreMain/include/OgreFrustum.h (working copy)
+@@ -64,6 +64,9 @@
+ */
+ class _OgreExport Frustum : public MovableObject, public Renderable
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Frustum);
++
+ protected:
+ /// Orthographic or perspective?
+ ProjectionType mProjType;
+Index: OgreMain/include/OgreGpuProgram.h
+===================================================================
+--- OgreMain/include/OgreGpuProgram.h (revision 8525)
++++ OgreMain/include/OgreGpuProgram.h (working copy)
+@@ -268,6 +268,8 @@
+ class _OgreExport GpuProgramParameters : public GpuParamsAlloc
+ {
+ public:
++ DECLARE_CLRHANDLE;
++
+ /** Defines the types of automatically updated values that may be bound to GpuProgram
+ parameters, or used to modify parameters on a per-object basis.
+ */
+@@ -1406,6 +1408,9 @@
+ */
+ class _OgreExport GpuProgram : public Resource
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(GpuProgram);
++
+ protected:
+ /// Command object - see ParamCommand
+ class _OgreExport CmdType : public ParamCommand
+Index: OgreMain/include/OgreHardwareBuffer.h
+===================================================================
+--- OgreMain/include/OgreHardwareBuffer.h (revision 8525)
++++ OgreMain/include/OgreHardwareBuffer.h (working copy)
+@@ -65,10 +65,12 @@
+ You should look for the 'useShadowBuffer' parameter on the creation methods used to create
+ the buffer of the type you require (see HardwareBufferManager) to enable this feature.
+ */
+- class _OgreExport HardwareBuffer : public BufferAlloc
++ class _OgreExport HardwareBuffer : public BufferAlloc, public CLRObject
+ {
+
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(HardwareBuffer);
++
+ /// Enums describing buffer usage; not mutually exclusive
+ enum Usage
+ {
+Index: OgreMain/include/OgreHardwareIndexBuffer.h
+===================================================================
+--- OgreMain/include/OgreHardwareIndexBuffer.h (revision 8525)
++++ OgreMain/include/OgreHardwareIndexBuffer.h (working copy)
+@@ -40,6 +40,8 @@
+ class _OgreExport HardwareIndexBuffer : public HardwareBuffer
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(HardwareIndexBuffer);
++
+ enum IndexType {
+ IT_16BIT,
+ IT_32BIT
+Index: OgreMain/include/OgreHardwareOcclusionQuery.h
+===================================================================
+--- OgreMain/include/OgreHardwareOcclusionQuery.h (revision 8525)
++++ OgreMain/include/OgreHardwareOcclusionQuery.h (working copy)
+@@ -43,12 +43,14 @@
+ * @author Lee Sandberg
+ * Updated on 13/8/2005 by Tuan Kuranes email: tua...@fr...
+ */
+- class _OgreExport HardwareOcclusionQuery : public RenderSysAlloc
++ class _OgreExport HardwareOcclusionQuery : public RenderSysAlloc, public CLRObject
+ {
+ //----------------------------------------------------------------------
+ // Public methods
+ //--
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(HardwareOcclusionQuery);
++
+ /**
+ * Object public member functions
+ */
+Index: OgreMain/include/OgreHardwarePixelBuffer.h
+===================================================================
+--- OgreMain/include/OgreHardwarePixelBuffer.h (revision 8525)
++++ OgreMain/include/OgreHardwarePixelBuffer.h (working copy)
+@@ -46,6 +46,9 @@
+ */
+ class _OgreExport HardwarePixelBuffer : public HardwareBuffer
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(HardwarePixelBuffer);
++
+ protected:
+ // Extents
+ size_t mWidth, mHeight, mDepth;
+Index: OgreMain/include/OgreHardwareVertexBuffer.h
+===================================================================
+--- OgreMain/include/OgreHardwareVertexBuffer.h (revision 8525)
++++ OgreMain/include/OgreHardwareVertexBuffer.h (working copy)
+@@ -39,6 +39,9 @@
+ /** Specialisation of HardwareBuffer for a vertex buffer. */
+ class _OgreExport HardwareVertexBuffer : public HardwareBuffer
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(HardwareVertexBuffer);
++
+ protected:
+
+ size_t mNumVertices;
+@@ -288,9 +291,11 @@
+ Like the other classes in this functional area, these declarations should be created and
+ destroyed using the HardwareBufferManager.
+ */
+- class _OgreExport VertexDeclaration : public VertexDataAlloc
++ class _OgreExport VertexDeclaration : public VertexDataAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(VertexDeclaration);
++
+ /// Defines the list of vertex elements that makes up this declaration
+ typedef std::list<VertexElement> VertexElementList;
+ /// Sort routine for vertex elements
+@@ -463,9 +468,11 @@
+ Like the other classes in this functional area, these binding maps should be created and
+ destroyed using the HardwareBufferManager.
+ */
+- class _OgreExport VertexBufferBinding : public VertexDataAlloc
++ class _OgreExport VertexBufferBinding : public VertexDataAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(VertexBufferBinding);
++
+ /// Defines the vertex buffer bindings used as source for vertex declarations
+ typedef std::map<unsigned short, HardwareVertexBufferSharedPtr> VertexBufferBindingMap;
+ protected:
+Index: OgreMain/include/OgreHighLevelGpuProgram.h
+===================================================================
+--- OgreMain/include/OgreHighLevelGpuProgram.h (revision 8525)
++++ OgreMain/include/OgreHighLevelGpuProgram.h (working copy)
+@@ -57,6 +57,9 @@
+ */
+ class _OgreExport HighLevelGpuProgram : public GpuProgram
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(HighLevelGpuProgram);
++
+ protected:
+ /// Whether the high-level program (and it's parameter defs) is loaded
+ bool mHighLevelLoaded;
+Index: OgreMain/include/OgreImage.h
+===================================================================
+--- OgreMain/include/OgreImage.h (revision 8525)
++++ OgreMain/include/OgreImage.h (working copy)
+@@ -56,6 +56,8 @@
+ class _OgreExport Image : public ImageAlloc
+ {
+ public:
++ DECLARE_CLRHANDLE;
++
+ typedef Ogre::Box Box;
+ typedef Ogre::Rect Rect;
+ public:
+Index: OgreMain/include/OgreImageCodec.h
+===================================================================
+--- OgreMain/include/OgreImageCodec.h (revision 8525)
++++ OgreMain/include/OgreImageCodec.h (working copy)
+@@ -42,12 +42,16 @@
+ class _OgreExport ImageCodec : public Codec
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ImageCodec);
++
+ virtual ~ImageCodec();
+ /** Codec return class for images. Has information about the size and the
+ pixel format of the image. */
+ class _OgrePrivate ImageData : public Codec::CodecData
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ImageCodec_ImageData);
++
+ ImageData():
+ height(0), width(0), depth(1), size(0),
+ num_mipmaps(0), flags(0), format(PF_UNKNOWN)
+Index: OgreMain/include/OgreInstancedGeometry.h
+===================================================================
+--- OgreMain/include/OgreInstancedGeometry.h (revision 8525)
++++ OgreMain/include/OgreInstancedGeometry.h (working copy)
+@@ -95,9 +95,11 @@
+ @note
+ Warning: this class only works with indexed triangle lists at the moment, do not pass it triangle strips, fans or lines / points, or unindexed geometry.
+ */
+- class _OgreExport InstancedGeometry : public BatchedGeometryAlloc
++ class _OgreExport InstancedGeometry : public BatchedGeometryAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(InstancedGeometry);
++
+ /** Struct holding geometry optimised per SubMesh / lod level, ready
+ for copying to instances.
+ @remarks
+@@ -246,6 +248,9 @@
+ };
+ class _OgreExport InstancedObject : public BatchedGeometryAlloc
+ {
++ public:
++ DECLARE_CLRHANDLE;
++
+ friend class GeometryBucket;
+ public:
+ enum TransformSpace
+Index: OgreMain/include/OgreKeyFrame.h
+===================================================================
+--- OgreMain/include/OgreKeyFrame.h (revision 8525)
++++ OgreMain/include/OgreKeyFrame.h (working copy)
+@@ -47,9 +47,10 @@
+ animation sequence, with the exact state of the animation being an
+ interpolation between these key frames.
+ */
+- class _OgreExport KeyFrame : public AnimationAlloc
++ class _OgreExport KeyFrame : public AnimationAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(KeyFrame);
+
+ /** Default constructor, you should not call this but use AnimationTrack::createKeyFrame instead. */
+ KeyFrame(const AnimationTrack* parent, Real time);
+@@ -74,6 +75,8 @@
+ class _OgreExport NumericKeyFrame : public KeyFrame
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(NumericKeyFrame);
++
+ /** Default constructor, you should not call this but use AnimationTrack::createKeyFrame instead. */
+ NumericKeyFrame(const AnimationTrack* parent, Real time);
+ ~NumericKeyFrame() {}
+@@ -97,6 +100,8 @@
+ class _OgreExport TransformKeyFrame : public KeyFrame
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(TransformKeyFrame);
++
+ /** Default constructor, you should not call this but use AnimationTrack::createKeyFrame instead. */
+ TransformKeyFrame(const AnimationTrack* parent, Real time);
+ ~TransformKeyFrame() {}
+@@ -148,6 +153,8 @@
+ class _OgreExport VertexMorphKeyFrame : public KeyFrame
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(VertexMorphKeyFrame);
++
+ /** Default constructor, you should not call this but use AnimationTrack::createKeyFrame instead. */
+ VertexMorphKeyFrame(const AnimationTrack* parent, Real time);
+ ~VertexMorphKeyFrame() {}
+@@ -178,6 +185,8 @@
+ class _OgreExport VertexPoseKeyFrame : public KeyFrame
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(VertexPoseKeyFrame);
++
+ /** Default constructor, you should not call this but use AnimationTrack::createKeyFrame instead. */
+ VertexPoseKeyFrame(const AnimationTrack* parent, Real time);
+ ~VertexPoseKeyFrame() {}
+Index: OgreMain/include/OgreLight.h
+===================================================================
+--- OgreMain/include/OgreLight.h (revision 8525)
++++ OgreMain/include/OgreLight.h (working copy)
+@@ -67,6 +67,8 @@
+ class _OgreExport Light : public MovableObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Light);
++
+ /// Temp tag used for sorting
+ Real tempSquareDist;
+ /// internal method for calculating current squared distance from some world position
+@@ -468,6 +470,9 @@
+ /** Factory object for creating Light instances */
+ class _OgreExport LightFactory : public MovableObjectFactory
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(LightFactory);
++
+ protected:
+ MovableObject* createInstanceImpl( const String& name, const NameValuePairList* params);
+ public:
+Index: OgreMain/include/OgreLog.h
+===================================================================
+--- OgreMain/include/OgreLog.h (revision 8525)
++++ OgreMain/include/OgreLog.h (working copy)
+@@ -86,6 +86,9 @@
+ */
+ class _OgreExport Log : public LogAlloc
+ {
++ public:
++ DECLARE_CLRHANDLE;
++
+ protected:
+ std::ofstream mfpLog;
+ LoggingLevel mLogLevel;
+@@ -177,6 +180,9 @@
+ */
+ class Stream
+ {
++ public:
++ DECLARE_CLRHANDLE;
++
+ protected:
+ Log* mTarget;
+ LogMessageLevel mLevel;
+Index: OgreMain/include/OgreManualObject.h
+===================================================================
+--- OgreMain/include/OgreManualObject.h (revision 8525)
++++ OgreMain/include/OgreManualObject.h (working copy)
+@@ -101,6 +101,8 @@
+ class _OgreExport ManualObject : public MovableObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ManualObject);
++
+ ManualObject(const String& name);
+ virtual ~ManualObject();
+
+@@ -377,8 +379,11 @@
+
+
+ /// Built, renderable section of geometry
+- class _OgreExport ManualObjectSection : public Renderable, public MovableAlloc
++ class _OgreExport ManualObjectSection : public Renderable, public MovableAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ManualObject_ManualObjectSection);
++
+ protected:
+ ManualObject* mParent;
+ String mMaterialName;
+@@ -421,6 +426,9 @@
+ /** Nested class to allow shadows. */
+ class _OgreExport ManualObjectSectionShadowRenderable : public ShadowRenderable
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ManualObject_ManualObjectSectionShadowRenderable);
++
+ protected:
+ ManualObject* mParent;
+ // Shared link to position buffer
+@@ -521,6 +529,9 @@
+ /** Factory object for creating ManualObject instances */
+ class _OgreExport ManualObjectFactory : public MovableObjectFactory
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ManualObjectFactory);
++
+ protected:
+ MovableObject* createInstanceImpl( const String& name, const NameValuePairList* params);
+ public:
+Index: OgreMain/include/OgreMaterial.h
+===================================================================
+--- OgreMain/include/OgreMaterial.h (revision 8525)
++++ OgreMain/include/OgreMaterial.h (working copy)
+@@ -82,6 +82,9 @@
+ */
+ class _OgreExport Material : public Resource
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Material);
++
+ friend class SceneManager;
+ friend class MaterialManager;
+
+Index: OgreMain/include/OgreMesh.h
+===================================================================
+--- OgreMain/include/OgreMesh.h (revision 8525)
++++ OgreMain/include/OgreMesh.h (working copy)
+@@ -85,6 +85,9 @@
+
+ class _OgreExport Mesh: public Resource
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Mesh);
++
+ friend class SubMesh;
+ friend class MeshSerializerImpl;
+ friend class MeshSerializerImpl_v1_2;
+Index: OgreMain/include/OgreMeshSerializer.h
+===================================================================
+--- OgreMain/include/OgreMeshSerializer.h (revision 8525)
++++ OgreMain/include/OgreMeshSerializer.h (working copy)
+@@ -64,6 +64,8 @@
+ class _OgreExport MeshSerializer : public Serializer
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(MeshSerializer);
++
+ MeshSerializer();
+ virtual ~MeshSerializer();
+
+Index: OgreMain/include/OgreMovableObject.h
+===================================================================
+--- OgreMain/include/OgreMovableObject.h (revision 8525)
++++ OgreMain/include/OgreMovableObject.h (working copy)
+@@ -54,6 +54,8 @@
+ class _OgreExport MovableObject : public ShadowCaster, public AnimableObject, public MovableAlloc
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(MovableObject);
++
+ /** Listener which gets called back on MovableObject events.
+ */
+ class _OgreExport Listener
+@@ -507,8 +509,11 @@
+ to allow all clients to produce new instances of this object, integrated
+ with the standard Ogre processing.
+ */
+- class _OgreExport MovableObjectFactory : public MovableAlloc
++ class _OgreExport MovableObjectFactory : public MovableAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(MovableObjectFactory);
++
+ protected:
+ /// Type flag, allocated if requested
+ unsigned long mTypeFlag;
+Index: OgreMain/include/OgreMovablePlane.h
+===================================================================
+--- OgreMain/include/OgreMovablePlane.h (revision 8525)
++++ OgreMain/include/OgreMovablePlane.h (working copy)
+@@ -52,6 +52,9 @@
+ */
+ class _OgreExport MovablePlane : public Plane, public MovableObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(MovablePlane);
++
+ protected:
+ mutable Plane mDerivedPlane;
+ mutable Vector3 mLastTranslate;
+Index: OgreMain/include/OgreNode.h
+===================================================================
+--- OgreMain/include/OgreNode.h (revision 8525)
++++ OgreMain/include/OgreNode.h (working copy)
+@@ -51,9 +51,11 @@
+ This is an abstract class - concrete classes are based on this for specific purposes,
+ e.g. SceneNode, Bone
+ */
+- class _OgreExport Node : public Renderable, public NodeAlloc
++ class _OgreExport Node : public Renderable, public NodeAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Node);
++
+ /** Enumeration denoting the spaces which a transform can be relative to.
+ */
+ enum TransformSpace
+Index: OgreMain/include/OgreOverlay.h
+===================================================================
+--- OgreMain/include/OgreOverlay.h (revision 8525)
++++ OgreMain/include/OgreOverlay.h (working copy)
+@@ -62,10 +62,12 @@
+ don't want the overlay displayed in the smaller viewports. You turn this off for
+ a specific viewport by calling the Viewport::setDisplayOverlays method.
+ */
+- class _OgreExport Overlay : public OverlayAlloc
++ class _OgreExport Overlay : public OverlayAlloc, public CLRObject
+ {
+
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(Overlay);
++
+ typedef std::list<OverlayContainer*> OverlayContainerList;
+ protected:
+ String mName;
+Index: OgreMain/include/OgreOverlayContainer.h
+===================================================================
+--- OgreMain/include/OgreOverlayContainer.h (revision 8525)
++++ OgreMain/include/OgreOverlayContainer.h (working copy)
+@@ -51,6 +51,8 @@
+ class _OgreExport OverlayContainer : public OverlayElement
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(OverlayContainer);
++
+ typedef std::map<String, OverlayElement*> ChildMap;
+ typedef MapIterator<ChildMap> ChildIterator;
+ typedef std::map<String, OverlayContainer*> ChildContainerMap;
+Index: OgreMain/include/OgreOverlayElement.h
+===================================================================
+--- OgreMain/include/OgreOverlayElement.h (revision 8525)
++++ OgreMain/include/OgreOverlayElement.h (working copy)
+@@ -101,9 +101,10 @@
+ Because this class is designed to be extensible, it subclasses from StringInterface
+ so its parameters can be set in a generic way.
+ */
+- class _OgreExport OverlayElement : public StringInterface, public Renderable, public OverlayAlloc
++ class _OgreExport OverlayElement : public StringInterface, public Renderable, public OverlayAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(OverlayElement);
+
+ protected:
+ // Command object for setting / getting parameters
+Index: OgreMain/include/OgreOverlayElementFactory.h
+===================================================================
+--- OgreMain/include/OgreOverlayElementFactory.h (revision 8525)
++++ OgreMain/include/OgreOverlayElementFactory.h (working copy)
+@@ -49,9 +49,11 @@
+ Each OverlayElementFactory creates a single type of OverlayElement,
+ identified by a 'type name' which must be unique.
+ */
+- class _OgreExport OverlayElementFactory : public OverlayAlloc
++ class _OgreExport OverlayElementFactory : public OverlayAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(OverlayElementFactory);
++
+ /** Destroy the overlay element factory */
+ virtual ~OverlayElementFactory () {}
+ /** Creates a new OverlayElement instance with the name supplied. */
+@@ -67,6 +69,8 @@
+ class _OgreExport PanelOverlayElementFactory: public OverlayElementFactory
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(PanelOverlayElementFactory);
++
+ /** See OverlayElementFactory */
+ OverlayElement* createOverlayElement(const String& instanceName)
+ {
+@@ -84,6 +88,8 @@
+ class _OgreExport BorderPanelOverlayElementFactory: public OverlayElementFactory
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(BorderPanelOverlayElementFactory);
++
+ /** See OverlayElementFactory */
+ OverlayElement* createOverlayElement(const String& instanceName)
+ {
+@@ -101,6 +107,8 @@
+ class _OgreExport TextAreaOverlayElementFactory: public OverlayElementFactory
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(TextAreaOverlayElementFactory);
++
+ /** See OverlayElementFactory */
+ OverlayElement* createOverlayElement(const String& instanceName)
+ {
+Index: OgreMain/include/OgrePanelOverlayElement.h
+===================================================================
+--- OgreMain/include/OgrePanelOverlayElement.h (revision 8525)
++++ OgreMain/include/OgrePanelOverlayElement.h (working copy)
+@@ -53,6 +53,8 @@
+ class _OgreExport PanelOverlayElement : public OverlayContainer
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(PanelOverlayElement);
++
+ /** Constructor. */
+ PanelOverlayElement(const String& name);
+ virtual ~PanelOverlayElement();
+Index: OgreMain/include/OgreParticle.h
+===================================================================
+--- OgreMain/include/OgreParticle.h (revision 8525)
++++ OgreMain/include/OgreParticle.h (working copy)
+@@ -54,6 +54,9 @@
+ /** Class representing a single particle instance. */
+ class _OgreExport Particle : public FXAlloc
+ {
++ public:
++ DECLARE_CLRHANDLE;
++
+ protected:
+ /// Parent ParticleSystem
+ ParticleSystem* mParentSystem;
+Index: OgreMain/include/OgreParticleAffector.h
+===================================================================
+--- OgreMain/include/OgreParticleAffector.h (revision 8525)
++++ OgreMain/include/OgreParticleAffector.h (working copy)
+@@ -55,8 +55,11 @@
+ with literally infinite combinations of affector and affector types, and parameters within those
+ types.
+ */
+- class _OgreExport ParticleAffector : public StringInterface, public FXAlloc
++ class _OgreExport ParticleAffector : public StringInterface, public FXAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ParticleAffector);
++
+ protected:
+ /// Name of the type of affector, MUST be initialised by subclasses
+ String mType;
+Index: OgreMain/include/OgreParticleAffectorFactory.h
+===================================================================
+--- OgreMain/include/OgreParticleAffectorFactory.h (revision 8525)
++++ OgreMain/include/OgreParticleAffectorFactory.h (working copy)
+@@ -46,8 +46,11 @@
+ a name which identifies them, examples might be 'force_vector', 'attractor', or 'fader', and these can be
+ also be used from particle system scripts.
+ */
+- class _OgreExport ParticleAffectorFactory : public FXAlloc
++ class _OgreExport ParticleAffectorFactory : public FXAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ParticleAffectorFactory);
++
+ protected:
+ std::vector<ParticleAffector*> mAffectors;
+ public:
+Index: OgreMain/include/OgreParticleEmitter.h
+===================================================================
+--- OgreMain/include/OgreParticleEmitter.h (revision 8525)
++++ OgreMain/include/OgreParticleEmitter.h (working copy)
+@@ -63,8 +63,11 @@
+ with literally infinite combinations of emitter and affector types, and paramters within those
+ types.
+ */
+- class _OgreExport ParticleEmitter : public StringInterface, public Particle
++ class _OgreExport ParticleEmitter : public StringInterface, public Particle, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ParticleEmitter);
++
+ protected:
+
+ // Command object for setting / getting parameters
+Index: OgreMain/include/OgreParticleEmitterFactory.h
+===================================================================
+--- OgreMain/include/OgreParticleEmitterFactory.h (revision 8525)
++++ OgreMain/include/OgreParticleEmitterFactory.h (working copy)
+@@ -47,8 +47,11 @@
+ a name which identifies them, examples might be 'point', 'cone', or 'box', and these can be
+ also be used from particle system scripts.
+ */
+- class _OgreExport ParticleEmitterFactory : public FXAlloc
++ class _OgreExport ParticleEmitterFactory : public FXAlloc, public CLRObject
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ParticleEmitterFactory);
++
+ protected:
+ std::vector<ParticleEmitter*> mEmitters;
+ public:
+Index: OgreMain/include/OgreParticleSystem.h
+===================================================================
+--- OgreMain/include/OgreParticleSystem.h (revision 8525)
++++ OgreMain/include/OgreParticleSystem.h (working copy)
+@@ -60,6 +60,7 @@
+ class _OgreExport ParticleSystem : public StringInterface, public MovableObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ParticleSystem);
+
+ /** Command object for quota (see ParamCommand).*/
+ class _OgrePrivate CmdQuota : public ParamCommand
+Index: OgreMain/include/OgreParticleSystemManager.h
+===================================================================
+--- OgreMain/include/OgreParticleSystemManager.h (revision 8525)
++++ OgreMain/include/OgreParticleSystemManager.h (working copy)
+@@ -371,6 +371,9 @@
+ /** Factory object for creating ParticleSystem instances */
+ class _OgreExport ParticleSystemFactory : public MovableObjectFactory
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ParticleSystemFactory);
++
+ protected:
+ MovableObject* createInstanceImpl(const String& name, const NameValuePairList* params);
+ public:
+Index: OgreMain/include/OgreParticleSystemRenderer.h
+===================================================================
+--- OgreMain/include/OgreParticleSystemRenderer.h (revision 8525)
++++ OgreMain/include/OgreParticleSystemRenderer.h (working copy)
+@@ -41,9 +41,11 @@
+ /** Abstract class defining the interface required to be implemented
+ by classes which provide rendering capability to ParticleSystem instances.
+ */
+- class _OgreExport ParticleSystemRenderer : public StringInterface, public FXAlloc
++ class _OgreExport ParticleSystemRenderer : public StringInterface, public FXAlloc, public CLRObject
+ {
+ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(ParticleSystemRenderer);
++
+ /// Constructor
+ ParticleSystemRenderer() {}
+ /// Destructor
+Index: OgreMain/include/OgrePass.h
+===================================================================
+--- OgreMain/include/OgrePass.h (revision 8525)
++++ OgreMain/include/OgrePass.h (working copy)
+@@ -74,6 +74,8 @@
+ class _OgreExport Pass : public PassAlloc
+ {
+ public:
++ DECLARE_CLRHANDLE;
++
+ /** Definition of a functor for calculating the hashcode of a Pass.
+ @remarks
+ The hashcode of a Pass is used to sort Passes for rendering, in order
+Index: OgreMain/include/OgrePatchMesh.h
+===================================================================
+--- OgreMain/include/OgrePatchMesh.h (revision 8525)
++++ OgreMain/include/OgrePatchMesh.h (working copy)
+@@ -41,6 +41,9 @@
+ */
+ class _OgreExport PatchMesh : public Mesh
+ {
++ public:
++ DECLARE_INIT_CLROBJECT_METHOD_OVERRIDE(PatchMesh);
++
+ protected:
+ /// Internal surface definition
+ PatchSurface mSurface;
+Index: OgreMain/include/OgrePatchSurface.h
+===================================================================
+--- OgreMain/include/OgrePatchSurface.h (revision 8525)
++++ OgreMain/include/OgrePatchSurface.h (working copy)
+@@ -47,6 +47,8 @@
+ class _OgreExport PatchSurface : public PatchAlloc
+ {
+ public:
++ DECLARE_CLRHANDLE;
++
+ PatchSurface();
+ ~PatchSurface();
+
+Index: OgreMain/include/OgrePlaneBoundedVolume.h
+===================================================================
+--- OgreMain/include/OgrePlaneBoundedVolume.h (revision 8525)
++++ OgreMain/include/OgrePlaneBoundedVolume.h (working copy)
+@@ -43,6 +43,8 @@
+ class _OgreExport PlaneBoundedVolume
+ {
+ public:
++ DECLARE_CLRHANDLE;
++
+ typedef std::vector<Plane> PlaneList;
+ /// Publicly accessible plane list, you can modify this direct
+ PlaneList planes;
+Index: OgreMain/include/OgrePose.h
+===================================================================
+--- OgreMain/include/OgrePose.h (revision 8525)
++++ OgreMain/include/OgrePose.h (working copy)
+@@ -46,9 +46,11 @@
+ Pose instances can be referred to by keyframes in VertexAnimationTrack in
+ order to animate based on blen...
[truncated message content] |
|
From: <mog...@li...> - 2009-04-21 04:23:42
|
Revision: 263
http://mogre.svn.sourceforge.net/mogre/?rev=263&view=rev
Author: bekas
Date: 2009-04-21 04:23:36 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
Update Autowrap for Mogre 1.6
Modified Paths:
--------------
trunk/Mogre/AutoWrap/Attributes.xml
trunk/Mogre/AutoWrap/Meta/CppClassProducer.cs
trunk/Mogre/AutoWrap/Meta/Wrapper.cs
trunk/Mogre/AutoWrap/Program.cs
Added Paths:
-----------
trunk/Mogre/AutoWrap/AutoWrap.sln
Modified: trunk/Mogre/AutoWrap/Attributes.xml
===================================================================
--- trunk/Mogre/AutoWrap/Attributes.xml 2009-04-20 21:03:43 UTC (rev 262)
+++ trunk/Mogre/AutoWrap/Attributes.xml 2009-04-21 04:23:36 UTC (rev 263)
@@ -23,7 +23,11 @@
<class name="ScriptToken" Ignore="" />
<class name="ScriptTokenPtr" Ignore="" />
<class name="ScriptCompiler" Ignore="" />
+ <class name="ScriptCompilerManager" Ignore="" />
+ <class name="ScriptCompilerListener" Ignore="" />
<class name="ScriptLexer" Ignore="" />
+ <class name="ConcreteNode" Ignore="" />
+ <class name="AbstractNode" Ignore="" />
<class name="MeshSerializerListener" WrapType="Interface" />
<class name="PSSMShadowCameraSetup">
@@ -64,7 +68,17 @@
<function name="addListener" Ignore=""/>
<function name="removeListener" Ignore=""/>
</class>
-
+
+ <!-- Arggh! I hate Microsoft's defines. Texture's LoadImage was becoming in some object File
+ LoadImageA, and there were stupid linker errors everywhere. -->
+ <class name="Texture">
+ <_CustomIncDeclaration>
+ #ifdef LoadImage
+ #undef LoadImage
+ #endif
+ </_CustomIncDeclaration>
+ </class>
+
<class name="AnimationTrack">
<class name="Listener" WrapType="Interface">
<!--<function name="getInterpolatedKeyFrame" DefaultReturnValue="false" />-->
@@ -84,6 +98,9 @@
</class>
<class name="DriverVersion" WrapType="ValueType" SequentialLayout="">
+ <!-- Currently, functions of ValueTypes do not get a cpp definition. -->
+ <function name="fromString" Ignore="" />
+ <!-- Replaced by the custom declaration below. -->
<function name="toString" Ignore="" />
<_CustomIncDeclaration>
public:
@@ -135,6 +152,8 @@
<class name="TempBlendedBufferInfo" Ignore=""/>
<class name="HardwareBufferLicensee" Ignore=""/>
<class name="FreeImageCodec" Ignore=""/>
+ <!-- ILImageCodec is not used any more -->
+ <class name="ILImageCodec" Ignore=""/>
<class name="Font">
<struct name="GlyphInfo" WrapType="ValueType"/>
</class>
@@ -154,6 +173,11 @@
<class name="DefaultSceneManager" Ignore=""/>
<class name="ResourceGroupManager">
+
+ <!-- These functions are leftovers, without implementation. Should be removed eventually... -->
+ <function name="_notifyWorldGeometryPrepareStageStarted" Ignore=""/>
+ <function name="_notifyWorldGeometryPrepareStageEnded" Ignore=""/>
+
<struct name="ResourceDeclaration" WrapType="NativePtrValueType"/>
<typedef name="ResourceDeclarationList" STLListNoRemoveAndUnique=""/>
<!--= It's protected -->
@@ -212,23 +236,12 @@
<!-- class name="Profiler" Ignore=""/ -->
<class name="AutoParamDataSource" Ignore=""/>
<class name="Renderable" WrapType="Interface">
- <class name="Visitor" WrapType="Interface" />
+ <class name="Visitor" WrapType="Interface" Ignore="" />
<class name="RenderSystemData" Ignore="" />
<function name="getRenderSystemData" Ignore="" />
<function name="setRenderSystemData" Ignore="" />
<function name="getUserAny" Ignore="" />
<function name="setUserAny" Ignore="" />
- <_CustomCppDeclaration>
- #define STLDECL_MANAGEDKEY size_t
- #define STLDECL_MANAGEDVALUE Mogre::Vector4
- #define STLDECL_NATIVEKEY size_t
- #define STLDECL_NATIVEVALUE Ogre::Vector4
- CPP_DECLARE_STLMAP( Renderable::, CustomParameterMap, STLDECL_MANAGEDKEY, STLDECL_MANAGEDVALUE, STLDECL_NATIVEKEY, STLDECL_NATIVEVALUE )
- #undef STLDECL_MANAGEDKEY
- #undef STLDECL_MANAGEDVALUE
- #undef STLDECL_NATIVEKEY
- #undef STLDECL_NATIVEVALUE
- </_CustomCppDeclaration>
</class>
<class name="RenderQueue">
<class name="RenderableListener" WrapType="Interface"/>
@@ -498,19 +511,7 @@
</_CustomDisposing>
</class>
- <class name="AnimableObject" WrapType="Interface">
- <_CustomCppDeclaration>
- #define STLDECL_MANAGEDKEY String^
- #define STLDECL_MANAGEDVALUE Mogre::StringVector^
- #define STLDECL_NATIVEKEY Ogre::String
- #define STLDECL_NATIVEVALUE Ogre::StringVector
- CPP_DECLARE_STLMAP( AnimableObject::, AnimableDictionaryMap, STLDECL_MANAGEDKEY, STLDECL_MANAGEDVALUE, STLDECL_NATIVEKEY, STLDECL_NATIVEVALUE )
- #undef STLDECL_MANAGEDKEY
- #undef STLDECL_MANAGEDVALUE
- #undef STLDECL_NATIVEKEY
- #undef STLDECL_NATIVEVALUE
- </_CustomCppDeclaration>
- </class>
+ <class name="AnimableObject" WrapType="Interface"/>
<class name="RenderTarget">
<function name="setActive" property="" Rename="setIsActive"/>
Added: trunk/Mogre/AutoWrap/AutoWrap.sln
===================================================================
--- trunk/Mogre/AutoWrap/AutoWrap.sln (rev 0)
+++ trunk/Mogre/AutoWrap/AutoWrap.sln 2009-04-21 04:23:36 UTC (rev 263)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoWrap", "AutoWrap.csproj", "{22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: trunk/Mogre/AutoWrap/Meta/CppClassProducer.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/CppClassProducer.cs 2009-04-20 21:03:43 UTC (rev 262)
+++ trunk/Mogre/AutoWrap/Meta/CppClassProducer.cs 2009-04-21 04:23:36 UTC (rev 263)
@@ -63,16 +63,21 @@
{
base.AddPostBody();
_sb.AppendLine();
+
+ if (_t.HasAttribute<CLRObjectAttribute>(true)) {
+ _sb.AppendLine("__declspec(dllexport) " + _wrapper.GetInitCLRObjectFuncSignature(_t));
+ _sb.AppendLine("{");
+ _sb.AppendLine("\t*pClrObj = gcnew " + _t.FullCLRName + "(pClrObj);");
+ _sb.AppendLine("}");
+ }
+
+ _sb.AppendLine();
}
protected override void AddInternalDeclarations()
{
base.AddInternalDeclarations();
- if(_t.IsNested && _t.IsInterface) {
- return;
- }
-
foreach (DefClass cls in _interfaces)
{
_sb.AppendLine(cls.FullNativeName + "* " + GetClassName() + "::_" + cls.CLRName + "_GetNativePtr()");
Modified: trunk/Mogre/AutoWrap/Meta/Wrapper.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/Wrapper.cs 2009-04-20 21:03:43 UTC (rev 262)
+++ trunk/Mogre/AutoWrap/Meta/Wrapper.cs 2009-04-21 04:23:36 UTC (rev 263)
@@ -322,11 +322,10 @@
using (StreamWriter write = new StreamWriter(new MemoryStream()))
{
List<DefType> typesForMakePublic = new List<DefType>();
- List<string> includesForTypes = new List<string>();
foreach (DefType t in PragmaMakePublicTypes)
{
- if (t is DefClass && !t.IsNested)
+ if (t is DefClass && !t.IsNested && !t.IsIgnored)
{
DefType type = t.FindType<DefType>(t.Name);
@@ -334,11 +333,7 @@
&& type is DefClass && !type.IsTemplate)
{
if (!typesForMakePublic.Contains(type))
- {
typesForMakePublic.Add(type);
- if (!includesForTypes.Contains(type.IncludeFile))
- includesForTypes.Add(type.IncludeFile);
- }
}
}
}
@@ -346,23 +341,89 @@
write.WriteLine("#pragma once");
write.WriteLine();
- foreach (string inc in includesForTypes)
+ write.WriteLine("namespace " + NativeNamespace);
+ write.WriteLine("{");
+
+ foreach (DefType type in typesForMakePublic)
{
- write.WriteLine("#include \"" + inc + "\"");
+ if (type is DefStruct)
+ write.Write("struct ");
+ else
+ write.Write("class ");
+ write.WriteLine(type.Name + ";");
}
+
+ write.WriteLine("}");
write.WriteLine();
foreach (DefType type in typesForMakePublic)
{
- if (!type.IsIgnored)
- write.WriteLine("#pragma make_public( " + type.FullNativeName + " )");
+ write.WriteLine("#pragma make_public( " + type.FullNativeName + " )");
}
write.Flush();
WriteToFile(write.BaseStream as MemoryStream, _includePath + "\\MakePublicDeclarations.h");
}
+
+ // Create CLRObjects.inc
+
+ using (StreamWriter write = new StreamWriter(new MemoryStream()))
+ {
+ List<DefClass> clrObjs = new List<DefClass>();
+
+ foreach (string include in IncludeFiles.Keys)
+ {
+ foreach (DefType t in IncludeFiles[include])
+ AddCLRObjects(t, clrObjs);
+ }
+
+ foreach (DefClass cls in clrObjs)
+ {
+ string name = cls.Name;
+ DefClass parent = cls;
+ while (parent.ParentClass != null)
+ {
+ parent = parent.ParentClass;
+ name = parent.Name + "_" + name;
+ }
+
+ write.WriteLine("CLROBJECT( " + name + " )");
+ }
+
+ write.Flush();
+ WriteToFile(write.BaseStream as MemoryStream, _includePath + "\\CLRObjects.inc");
+ }
}
+ public string GetInitCLRObjectFuncSignature(DefClass cls) {
+ if (!cls.HasAttribute<CLRObjectAttribute>(true))
+ throw new Exception("class is not subclass of CLRObject");
+
+ string name = cls.Name;
+ DefClass parent = cls;
+ while (parent.ParentClass != null)
+ {
+ parent = parent.ParentClass;
+ name = parent.Name + "_" + name;
+ }
+
+ return "void _Init_CLRObject_" + name + "(CLRObject* pClrObj)";
+ }
+
+ void AddCLRObjects(DefType t, List<DefClass> clrObjs) {
+ DefClass cls = t as DefClass;
+ if (cls == null)
+ return;
+ if (cls.IsIgnored || cls.ProtectionType != ProtectionType.Public)
+ return;
+
+ if (cls.HasAttribute<CLRObjectAttribute>(true))
+ clrObjs.Add(cls);
+
+ foreach (DefType nested in cls.NestedTypes)
+ AddCLRObjects(nested, clrObjs);
+ }
+
public void ProduceSubclassCodeFiles(System.Windows.Forms.ProgressBar bar)
{
bar.Minimum = 0;
@@ -565,7 +626,7 @@
{
IndentStringBuilder sb = new IndentStringBuilder();
- sb.AppendLine("#include \"stdafx.h\"");
+ sb.AppendLine("#include \"MogreStableHeaders.h\"");
sb.AppendLine("#include \"Subclass" + type.Name + ".h\"\n");
sb.AppendFormat("namespace {0}\n{{\n", ManagedNamespace);
@@ -1335,7 +1396,7 @@
private void CppAddIncludeFiles(string include, List<DefType> usedTypes, IndentStringBuilder sb)
{
- sb.AppendLine("#include \"stdafx.h\"\n");
+ sb.AppendLine("#include \"MogreStableHeaders.h\"\n");
sb.AppendFormat("#include \"{0}\"\n", GetManagedIncludeFileName(include));
List<string> added = new List<string>();
Modified: trunk/Mogre/AutoWrap/Program.cs
===================================================================
--- trunk/Mogre/AutoWrap/Program.cs 2009-04-20 21:03:43 UTC (rev 262)
+++ trunk/Mogre/AutoWrap/Program.cs 2009-04-21 04:23:36 UTC (rev 263)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
+using System.IO;
using AutoWrap.Meta;
namespace AutoWrap
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-04-20 21:03:54
|
Revision: 262
http://mogre.svn.sourceforge.net/mogre/?rev=262&view=rev
Author: bekas
Date: 2009-04-20 21:03:43 +0000 (Mon, 20 Apr 2009)
Log Message:
-----------
Delete contents of Mogre dir
Removed Paths:
-------------
trunk/Mogre/Mogre/AssemblyInfo.cpp
trunk/Mogre/Mogre/Mogre.vcproj
trunk/Mogre/Mogre/Mogre_vc9.vcproj
trunk/Mogre/Mogre/include/
trunk/Mogre/Mogre/src/
Deleted: trunk/Mogre/Mogre/AssemblyInfo.cpp
===================================================================
--- trunk/Mogre/Mogre/AssemblyInfo.cpp 2009-04-20 19:00:15 UTC (rev 261)
+++ trunk/Mogre/Mogre/AssemblyInfo.cpp 2009-04-20 21:03:43 UTC (rev 262)
@@ -1,43 +0,0 @@
-#include "stdafx.h"
-
-using namespace System;
-using namespace System::Reflection;
-using namespace System::Runtime::CompilerServices;
-using namespace System::Runtime::InteropServices;
-using namespace System::Security::Permissions;
-
-[assembly:InternalsVisibleTo("OgreMain")];
-[assembly:InternalsVisibleTo("OgreMain_d")];
-
-//
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly:AssemblyTitleAttribute("MOGRE")];
-[assembly:AssemblyDescriptionAttribute("OGRE 3D .NET Wrapper")];
-[assembly:AssemblyConfigurationAttribute("")];
-[assembly:AssemblyCompanyAttribute("")];
-[assembly:AssemblyProductAttribute("Mogre")];
-[assembly:AssemblyCopyrightAttribute("")];
-[assembly:AssemblyTrademarkAttribute("")];
-[assembly:AssemblyCultureAttribute("")];
-
-//
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the value or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly:AssemblyVersionAttribute("1.4.8")];
-
-[assembly:ComVisible(false)];
-
-[assembly:CLSCompliantAttribute(true)];
-
-[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];
Deleted: trunk/Mogre/Mogre/Mogre.vcproj
===================================================================
--- trunk/Mogre/Mogre/Mogre.vcproj 2009-04-20 19:00:15 UTC (rev 261)
+++ trunk/Mogre/Mogre/Mogre.vcproj 2009-04-20 21:03:43 UTC (rev 262)
@@ -1,1862 +0,0 @@
-<?xml version="1.0" encoding="windows-1253"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="Mogre"
- ProjectGUID="{F75E973B-C1A0-43EB-8560-C43EF6D57812}"
- RootNamespace="Mogre"
- Keyword="ManagedCProj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- ManagedExtensions="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="-Zm119"
- Optimization="0"
- AdditionalIncludeDirectories=".\include;.\include\auto;..\ogrenew\OgreMain\include"
- PreprocessorDefinitions="WIN32;_DEBUG"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="OgreMain_d.lib $(NOINHERIT)"
- LinkIncremental="2"
- AdditionalLibraryDirectories="..\ogrenew\lib"
- GenerateDebugInformation="true"
- AssemblyDebug="1"
- OptimizeForWindows98="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)" ..\ogrenew\Samples\Common\bin\$(ConfigurationName)"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- ManagedExtensions="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="-Zm113"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- EnableFiberSafeOptimizations="true"
- AdditionalIncludeDirectories=".\include;.\include\auto;..\ogrenew\OgreMain\include"
- PreprocessorDefinitions="WIN32;NDEBUG"
- StringPooling="true"
- MinimalRebuild="false"
- ExceptionHandling="2"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- GenerateXMLDocumentationFiles="false"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="OgreMain.lib $(NOINHERIT)"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\ogrenew\lib"
- GenerateDebugInformation="true"
- OptimizeReferences="0"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)" ..\ogrenew\Samples\Common\bin\$(ConfigurationName)"
- />
- </Configuration>
- </Configurations>
- <References>
- <AssemblyReference
- RelativePath="System.dll"
- AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
- />
- <AssemblyReference
- RelativePath="System.Data.dll"
- AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
- />
- <AssemblyReference
- RelativePath="System.XML.dll"
- AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
- />
- <AssemblyReference
- RelativePath="System.Drawing.dll"
- AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
- />
- <AssemblyReference
- RelativePath="System.Windows.Forms.dll"
- AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
- />
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\AssemblyInfo.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\ManagedDataStream.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\Marshalling.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\auto\Mogre-WIN32_OgreTimerImp.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreAnimable.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreAnimation.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreAnimationState.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreAnimationTrack.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreArchive.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreArchiveManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBillboard.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBillboardChain.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBillboardParticleRenderer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBillboardSet.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBlendMode.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBone.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBorderPanelOverlayElement.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreBox.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCamera.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCodec.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreColourValue.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\auto\MogreCommon.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositionPass.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositionTargetPass.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositionTechnique.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositor.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositorChain.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositorInstance.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositorManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositorSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreConfigFile.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreConfigOptionMap.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreDataStream.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreDDSCodec.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreEdgeListBuilder.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreEntity.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreException.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreExternalTextureSource.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreExternalTextureSourceManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFileSystem.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFont.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFontManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFrameListener.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFrustum.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreGpuProgram.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreGpuProgramManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareBuffer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareBufferManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareIndexBuffer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareOcclusionQuery.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwarePixelBuffer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareVertexBuffer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHighLevelGpuProgram.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHighLevelGpuProgramManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreImage.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreImageCodec.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreInstancedGeometry.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreKeyFrame.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreLight.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreLog.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreLogManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreManualObject.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMaterial.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMaterialManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMaterialSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreMath.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\Custom\MogreMatrix3.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\Custom\MogreMatrix4.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\auto\MogreMesh.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMeshManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMeshSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMovableObject.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMovablePlane.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreNode.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlay.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlayContainer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlayElement.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlayElementFactory.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlayManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePanelOverlayElement.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreParamCommand.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticle.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleAffector.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleAffectorFactory.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleEmitter.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleEmitterFactory.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleIterator.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleSystem.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleSystemManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleSystemRenderer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePass.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePatchMesh.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePatchSurface.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePixelFormat.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePlane.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\Custom\MogrePlane.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\auto\MogrePlaneBoundedVolume.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePlugin.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePose.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreProfiler.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreProgressiveMesh.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreQuaternion.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\auto\MogreRectangle2D.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderable.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderOperation.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderQueue.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderQueueInvocation.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderQueueListener.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderQueueSortingGrouping.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderSystem.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderSystemCapabilities.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderTarget.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderTargetListener.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderTexture.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderWindow.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreResource.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreResourceBackgroundQueue.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreResourceGroupManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreResourceManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRibbonTrail.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRoot.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRotationalSpline.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSceneManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSceneManagerEnumerator.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSceneNode.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSceneQuery.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCameraSetup.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCameraSetupFocused.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCameraSetupLiSPSM.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCameraSetupPlaneOptimal.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCaster.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowTextureManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSimpleRenderable.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSimpleSpline.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSkeleton.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSkeletonInstance.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSkeletonManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSkeletonSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreStaticGeometry.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreStringConverter.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreStringInterface.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreStringVector.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSubEntity.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSubMesh.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreTagPoint.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreTechnique.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreTextAreaOverlayElement.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreTexture.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreTextureManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreTextureUnitState.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreUnifiedHighLevelGpuProgram.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreVector3.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\Custom\MogreVertexElement.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\auto\MogreVertexIndexData.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreViewport.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreWindowEventUtilities.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreWireBoundingBox.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreZip.cpp"
- >
- </File>
- <File
- RelativePath=".\src\NestedClassesCreations.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Stdafx.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\SubclassingManager.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\include\CLRHelp.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MakePublicDeclarations.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\ManagedDataStream.h"
- >
- </File>
- <File
- RelativePath=".\include\Marshalling.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\Mogre-WIN32_OgreTimerImp.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreAnimable.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreAnimation.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreAnimationState.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreAnimationTrack.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreArchive.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreArchiveManager.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreAxisAlignedBox.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreBillboard.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreBillboardChain.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreBillboardParticleRenderer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreBillboardSet.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreBlendMode.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreBone.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreBorderPanelOverlayElement.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreBox.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCamera.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCodec.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreColourValue.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCommon.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCompositionPass.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCompositionTargetPass.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCompositionTechnique.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCompositor.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCompositorChain.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCompositorInstance.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCompositorManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreCompositorSerializer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreConfigFile.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreConfigOptionMap.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreDataStream.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreDDSCodec.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreEdgeListBuilder.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreEntity.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreException.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreExternalTextureSource.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreExternalTextureSourceManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreFileSystem.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreFont.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreFontManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreFrameListener.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreFrustum.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreGpuProgram.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreGpuProgramManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreHardwareBuffer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreHardwareBufferManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreHardwareIndexBuffer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreHardwareOcclusionQuery.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreHardwarePixelBuffer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreHardwareVertexBuffer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreHighLevelGpuProgram.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreHighLevelGpuProgramManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreImage.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreImageCodec.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreInstancedGeometry.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreIteratorWrapper.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreKeyFrame.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreLight.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreLog.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreLogManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreManualObject.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreMaterial.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreMaterialManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreMaterialSerializer.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreMath.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreMatrix3.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreMatrix4.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreMesh.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreMeshManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreMeshSerializer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreMovableObject.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreMovablePlane.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreNode.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreNumerics.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreOverlay.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreOverlayContainer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreOverlayElement.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreOverlayElementFactory.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreOverlayManager.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogrePair.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePanelOverlayElement.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreParamCommand.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreParticle.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreParticleAffector.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreParticleAffectorFactory.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreParticleEmitter.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreParticleEmitterFactory.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreParticleIterator.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreParticleSystem.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreParticleSystemManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreParticleSystemRenderer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePass.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePatchMesh.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePatchSurface.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePixelFormat.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogrePlane.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePlane.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePlaneBoundedVolume.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePlatform.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePlugin.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePose.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogrePrerequisites.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreProfiler.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreProgressiveMesh.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreQuaternion.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreRay.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreRect.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreRectangle.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRectangle2D.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderable.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderOperation.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderQueue.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderQueueInvocation.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderQueueListener.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderQueueSortingGrouping.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderSystem.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderSystemCapabilities.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderTarget.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderTargetListener.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderTexture.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRenderWindow.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreResource.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreResourceBackgroundQueue.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreResourceGroupManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreResourceManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRibbonTrail.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRoot.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreRotationalSpline.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSceneManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSceneManagerEnumerator.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSceneNode.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSceneQuery.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSerializer.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreShadowCameraSetup.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreShadowCameraSetupFocused.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreShadowCameraSetupLiSPSM.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreShadowCameraSetupPlaneOptimal.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreShadowCaster.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreShadowTextureManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSimpleRenderable.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSimpleSpline.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSkeleton.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSkeletonInstance.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSkeletonManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSkeletonSerializer.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreSphere.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreStaticGeometry.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreString.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreStringConverter.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreStringInterface.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreStringVector.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSubEntity.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreSubMesh.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreTagPoint.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreTechnique.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreTextAreaOverlayElement.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreTexture.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreTextureManager.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreTextureUnitState.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreUnifiedHighLevelGpuProgram.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreVector2.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreVector3.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreVector4.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreVertexBoneAssignment.h"
- >
- </File>
- <File
- RelativePath=".\include\Custom\MogreVertexElement.i"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreVertexIndexData.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreViewport.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreWindowEventUtilities.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreWireBoundingBox.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\MogreZip.h"
- >
- </File>
- <File
- RelativePath=".\include\NativeArrayWrappers.h"
- >
- </File>
- <File
- RelativePath=".\include\PortedClasses.h"
- >
- </File>
- <File
- RelativePath=".\include\auto\PreDeclarations.h"
- >
- </File>
- <File
- RelativePath=".\include\Prerequisites.h"
- >
- </File>
- <File
- RelativePath=".\include\Stdafx.h"
- >
- </File>
- <File
- RelativePath=".\include\STLContainerWrappers.h"
- >
- </File>
- <File
- RelativePath=".\include\STLDeque.h"
- >
- </File>
- <File
- RelativePath=".\include\STLHashMap.h"
- >
- </File>
- <File
- RelativePath=".\include\STLList.h"
- >
- </File>
- <File
- RelativePath=".\include\STLMap.h"
- >
- </File>
- <File
- RelativePath=".\include\STLMultiMap.h"
- >
- </File>
- <File
- RelativePath=".\include\STLMultiSet.h"
- >
- </File>
- <File
- RelativePath=".\include\STLSet.h"
- >
- </File>
- <File
- RelativePath=".\include\STLVector.h"
- >
- </File>
- <File
- RelativePath=".\include\SubclassingManager.h"
- >
- </File>
- <File
- RelativePath=".\include\Wrapper.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- <File
- RelativePath="..\ChangeLog.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: trunk/Mogre/Mogre/Mogre_vc9.vcproj
===================================================================
--- trunk/Mogre/Mogre/Mogre_vc9.vcproj 2009-04-20 19:00:15 UTC (rev 261)
+++ trunk/Mogre/Mogre/Mogre_vc9.vcproj 2009-04-20 21:03:43 UTC (rev 262)
@@ -1,1713 +0,0 @@
-<?xml version="1.0" encoding="windows-1253"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="Mogre"
- ProjectGUID="{F75E973B-C1A0-43EB-8560-C43EF6D57812}"
- RootNamespace="Mogre"
- Keyword="ManagedCProj"
- TargetFrameworkVersion="0"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- ManagedExtensions="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="-Zm119"
- Optimization="0"
- AdditionalIncludeDirectories=".\include;.\include\auto;..\ogre\OgreMain\include"
- PreprocessorDefinitions="WIN32;_DEBUG"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="OgreMain_d.lib $(NOINHERIT)"
- OutputFile="$(OutDir)\$(ProjectName).dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="..\ogre\lib"
- GenerateDebugInformation="true"
- AssemblyDebug="1"
- OptimizeForWindows98="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- ManagedExtensions="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="-Zm113"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- EnableFiberSafeOptimizations="true"
- AdditionalIncludeDirectories=".\include;.\include\auto;..\ogre\OgreMain\include"
- PreprocessorDefinitions="WIN32;NDEBUG"
- StringPooling="true"
- MinimalRebuild="false"
- ExceptionHandling="2"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- GenerateXMLDocumentationFiles="false"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="OgreMain.lib $(NOINHERIT)"
- LinkIncremental="1"
- AdditionalLibraryDirectories="..\ogre\lib"
- GenerateDebugInformation="true"
- OptimizeReferences="0"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- </Configurations>
- <References>
- <AssemblyReference
- RelativePath="System.dll"
- AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
- MinFrameworkVersion="0"
- />
- <AssemblyReference
- RelativePath="System.Data.dll"
- AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
- MinFrameworkVersion="0"
- />
- <AssemblyReference
- RelativePath="System.XML.dll"
- AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
- MinFrameworkVersion="0"
- />
- <AssemblyReference
- RelativePath="System.Drawing.dll"
- AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
- MinFrameworkVersion="0"
- />
- <AssemblyReference
- RelativePath="System.Windows.Forms.dll"
- AssemblyName="System.Windows.Forms, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
- MinFrameworkVersion="0"
- />
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\src\Custom\ManagedDataStream.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Marshalling.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\Mogre-WIN32_OgreTimerImp.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreAnimable.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreAnimation.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreAnimationState.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreAnimationTrack.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreArchive.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreArchiveManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBillboard.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBillboardChain.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBillboardParticleRenderer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBillboardSet.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBlendMode.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBone.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreBorderPanelOverlayElement.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreBox.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCamera.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCodec.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreColourValue.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCommon.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositionPass.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositionTargetPass.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositionTechnique.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositor.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositorChain.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositorInstance.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositorManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreCompositorSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreConfigFile.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreConfigOptionMap.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreDataStream.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreDDSCodec.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreEdgeListBuilder.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreEntity.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreException.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreExternalTextureSource.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreExternalTextureSourceManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFileSystem.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFont.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFontManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFrameListener.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreFrustum.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreGpuProgram.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreGpuProgramManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareBuffer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareBufferManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareIndexBuffer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareOcclusionQuery.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwarePixelBuffer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHardwareVertexBuffer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHighLevelGpuProgram.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreHighLevelGpuProgramManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreILImageCodec.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreImage.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreImageCodec.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreInstancedGeometry.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreKeyFrame.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreLight.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreLog.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreLogManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreManualObject.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMaterial.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMaterialManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMaterialSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreMath.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreMatrix3.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreMatrix4.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMesh.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMeshManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMeshSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMovableObject.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreMovablePlane.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreNode.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlay.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlayContainer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlayElement.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlayElementFactory.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreOverlayManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePanelOverlayElement.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreParamCommand.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticle.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleAffector.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleAffectorFactory.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleEmitter.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleEmitterFactory.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleIterator.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleSystem.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleSystemManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreParticleSystemRenderer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePass.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePatchMesh.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePatchSurface.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePixelFormat.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogrePlane.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePlane.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\src\auto\MogrePlaneBoundedVolume.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePlugin.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogrePose.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreProfiler.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreProgressiveMesh.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Custom\MogreQuaternion.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRectangle2D.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderable.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderOperation.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderQueue.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderQueueInvocation.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderQueueListener.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderQueueSortingGrouping.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderSystem.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderSystemCapabilities.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderSystemCapabilitiesManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderTarget.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderTargetListener.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderTexture.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderToVertexBuffer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRenderWindow.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreResource.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreResourceBackgroundQueue.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreResourceGroupManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreResourceManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRibbonTrail.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRoot.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreRotationalSpline.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSceneManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSceneManagerEnumerator.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSceneNode.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSceneQuery.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCameraSetup.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCameraSetupFocused.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCameraSetupLiSPSM.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCameraSetupPlaneOptimal.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCameraSetupPSSM.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowCaster.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreShadowTextureManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSimpleRenderable.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSimpleSpline.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSkeleton.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSkeletonInstance.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSkeletonManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreSkeletonSerializer.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreStaticGeometry.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreStringConverter.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreStringInterface.cpp"
- >
- </File>
- <File
- RelativePath=".\src\auto\MogreStringVector.cpp"
- >
- </File>
...
[truncated message content] |
|
From: <mog...@li...> - 2009-04-20 19:00:19
|
Revision: 261
http://mogre.svn.sourceforge.net/mogre/?rev=261&view=rev
Author: bekas
Date: 2009-04-20 19:00:15 +0000 (Mon, 20 Apr 2009)
Log Message:
-----------
Update MOIS
Modified Paths:
--------------
trunk/MOIS/ConsoleTest/Program.cs
trunk/MOIS/MOIS/MOIS.sln
trunk/MOIS/MOIS/include/auto/MOISException.h
trunk/MOIS/MOIS/include/auto/MOISInputManager.h
trunk/MOIS/MOIS/src/auto/MOISException.cpp
trunk/MOIS/MOIS/src/auto/MOISInputManager.cpp
trunk/MOIS/MOIS/src/auto/MOISJoyStick.cpp
trunk/MOIS/MOIS/src/auto/MOISKeyboard.cpp
trunk/MOIS/MOIS/src/auto/MOISObject.cpp
trunk/MOIS/ois/Win32/OIS_vc9.vcproj
trunk/MOIS/ois/includes/OISException.h
trunk/MOIS/ois/src/OISException.cpp
Added Paths:
-----------
trunk/MOIS/ConsoleTest/ConsoleTest_vc9.csproj
trunk/MOIS/MOIS/MOIS_vc9.sln
trunk/MOIS/MOIS/MOIS_vc9.vcproj
Added: trunk/MOIS/ConsoleTest/ConsoleTest_vc9.csproj
===================================================================
--- trunk/MOIS/ConsoleTest/ConsoleTest_vc9.csproj (rev 0)
+++ trunk/MOIS/ConsoleTest/ConsoleTest_vc9.csproj 2009-04-20 19:00:15 UTC (rev 261)
@@ -0,0 +1,72 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{2739FD59-0B85-4F2F-8840-8A14C1D422D0}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>ConsoleTest</RootNamespace>
+ <AssemblyName>ConsoleTest</AssemblyName>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Form1.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Form1.Designer.cs">
+ <DependentUpon>Form1.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Program.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Form1.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>Form1.cs</DependentUpon>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\MOIS\MOIS_vc9.vcproj">
+ <Project>{1B307434-E03F-4B55-8FBF-DD2CEF84B552}</Project>
+ <Name>MOIS</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Modified: trunk/MOIS/ConsoleTest/Program.cs
===================================================================
--- trunk/MOIS/ConsoleTest/Program.cs 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/ConsoleTest/Program.cs 2009-04-20 19:00:15 UTC (rev 261)
@@ -202,9 +202,9 @@
}
}
}
- catch (System.Runtime.InteropServices.SEHException e)
+ catch (System.Runtime.InteropServices.SEHException)
{
- if (MOIS.OISException.IsThrown)
+ if (MOIS.OISException.LastException != null)
System.Windows.Forms.MessageBox.Show(MOIS.OISException.LastException.eText, "An exception has occured!", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
else
throw;
Modified: trunk/MOIS/MOIS/MOIS.sln
===================================================================
--- trunk/MOIS/MOIS/MOIS.sln 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/MOIS/MOIS.sln 2009-04-20 19:00:15 UTC (rev 261)
@@ -5,8 +5,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTest", "..\ConsoleTest\ConsoleTest.csproj", "{2739FD59-0B85-4F2F-8840-8A14C1D422D0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoWrap", "CodeGen\AutoWrap\AutoWrap.csproj", "{22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Mixed|Any CPU = Debug Mixed|Any CPU
Added: trunk/MOIS/MOIS/MOIS_vc9.sln
===================================================================
--- trunk/MOIS/MOIS/MOIS_vc9.sln (rev 0)
+++ trunk/MOIS/MOIS/MOIS_vc9.sln 2009-04-20 19:00:15 UTC (rev 261)
@@ -0,0 +1,111 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOIS", "MOIS_vc9.vcproj", "{1B307434-E03F-4B55-8FBF-DD2CEF84B552}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTest_vc9", "..\ConsoleTest\ConsoleTest_vc9.csproj", "{2739FD59-0B85-4F2F-8840-8A14C1D422D0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OIS", "..\ois\Win32\OIS_vc9.vcproj", "{9CC704CB-4956-4479-BDEC-57CBC03F700E}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug Mixed|Any CPU = Debug Mixed|Any CPU
+ Debug Mixed|Mixed Platforms = Debug Mixed|Mixed Platforms
+ Debug Mixed|Win32 = Debug Mixed|Win32
+ Debug|Any CPU = Debug|Any CPU
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|Win32 = Debug|Win32
+ OIS_DebugDll|Any CPU = OIS_DebugDll|Any CPU
+ OIS_DebugDll|Mixed Platforms = OIS_DebugDll|Mixed Platforms
+ OIS_DebugDll|Win32 = OIS_DebugDll|Win32
+ OIS_ReleaseDll|Any CPU = OIS_ReleaseDll|Any CPU
+ OIS_ReleaseDll|Mixed Platforms = OIS_ReleaseDll|Mixed Platforms
+ OIS_ReleaseDll|Win32 = OIS_ReleaseDll|Win32
+ Release|Any CPU = Release|Any CPU
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug Mixed|Any CPU.ActiveCfg = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug Mixed|Mixed Platforms.ActiveCfg = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug Mixed|Mixed Platforms.Build.0 = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug Mixed|Win32.ActiveCfg = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug Mixed|Win32.Build.0 = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Debug|Win32.Build.0 = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_DebugDll|Any CPU.ActiveCfg = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_DebugDll|Mixed Platforms.ActiveCfg = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_DebugDll|Mixed Platforms.Build.0 = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_DebugDll|Win32.ActiveCfg = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_DebugDll|Win32.Build.0 = Debug|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_ReleaseDll|Any CPU.ActiveCfg = Release|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_ReleaseDll|Mixed Platforms.ActiveCfg = Release|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_ReleaseDll|Mixed Platforms.Build.0 = Release|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_ReleaseDll|Win32.ActiveCfg = Release|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.OIS_ReleaseDll|Win32.Build.0 = Release|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Release|Any CPU.ActiveCfg = Release|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Release|Win32.ActiveCfg = Release|Win32
+ {1B307434-E03F-4B55-8FBF-DD2CEF84B552}.Release|Win32.Build.0 = Release|Win32
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug Mixed|Any CPU.ActiveCfg = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug Mixed|Any CPU.Build.0 = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug Mixed|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug Mixed|Mixed Platforms.Build.0 = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug Mixed|Win32.ActiveCfg = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_DebugDll|Any CPU.ActiveCfg = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_DebugDll|Any CPU.Build.0 = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_DebugDll|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_DebugDll|Mixed Platforms.Build.0 = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_DebugDll|Win32.ActiveCfg = Debug|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_ReleaseDll|Any CPU.ActiveCfg = Release|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_ReleaseDll|Any CPU.Build.0 = Release|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_ReleaseDll|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_ReleaseDll|Mixed Platforms.Build.0 = Release|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.OIS_ReleaseDll|Win32.ActiveCfg = Release|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {2739FD59-0B85-4F2F-8840-8A14C1D422D0}.Release|Win32.ActiveCfg = Release|Any CPU
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug Mixed|Any CPU.ActiveCfg = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug Mixed|Mixed Platforms.ActiveCfg = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug Mixed|Mixed Platforms.Build.0 = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug Mixed|Win32.ActiveCfg = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug Mixed|Win32.Build.0 = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.Build.0 = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_DebugDll|Any CPU.ActiveCfg = OIS_DebugDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_DebugDll|Mixed Platforms.ActiveCfg = OIS_DebugDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_DebugDll|Mixed Platforms.Build.0 = OIS_DebugDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_DebugDll|Win32.ActiveCfg = OIS_DebugDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_DebugDll|Win32.Build.0 = OIS_DebugDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_ReleaseDll|Any CPU.ActiveCfg = OIS_ReleaseDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_ReleaseDll|Mixed Platforms.ActiveCfg = OIS_ReleaseDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_ReleaseDll|Mixed Platforms.Build.0 = OIS_ReleaseDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_ReleaseDll|Win32.ActiveCfg = OIS_ReleaseDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_ReleaseDll|Win32.Build.0 = OIS_ReleaseDll|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Any CPU.ActiveCfg = Release|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.ActiveCfg = Release|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: trunk/MOIS/MOIS/MOIS_vc9.vcproj
===================================================================
--- trunk/MOIS/MOIS/MOIS_vc9.vcproj (rev 0)
+++ trunk/MOIS/MOIS/MOIS_vc9.vcproj 2009-04-20 19:00:15 UTC (rev 261)
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="windows-1253"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="MOIS"
+ ProjectGUID="{1B307434-E03F-4B55-8FBF-DD2CEF84B552}"
+ RootNamespace="MOIS"
+ Keyword="ManagedCProj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ ManagedExtensions="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=".\include;.\include\auto;..\ois\includes;..\ois\includes\win32;"C:\Program Files\Microsoft DirectX 9.0 SDK (December 2004)\Include""
+ PreprocessorDefinitions="WIN32;_DEBUG"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_static_d.lib"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\ois\lib"
+ GenerateDebugInformation="true"
+ AssemblyDebug="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ ManagedExtensions="1"
+ WholeProgramOptimization="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=".\include;.\include\auto;..\ois\includes;..\ois\includes\win32;"C:\Program Files\Microsoft DirectX 9.0 SDK (December 2004)\Include""
+ PreprocessorDefinitions="WIN32;NDEBUG"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="OIS_static.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\ois\lib"
+ GenerateDebugInformation="true"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ <AssemblyReference
+ RelativePath="System.dll"
+ AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+ MinFrameworkVersion="131072"
+ />
+ <AssemblyReference
+ RelativePath="System.Data.dll"
+ AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+ MinFrameworkVersion="131072"
+ />
+ <AssemblyReference
+ RelativePath="System.XML.dll"
+ AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+ MinFrameworkVersion="131072"
+ />
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\AssemblyInfo.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Marshalling.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISEffect.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISEvents.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISException.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISForceFeedback.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISInputManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISInterface.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISJoyStick.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISKeyboard.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISMouse.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISObject.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\auto\MOISPrereqs.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Stdafx.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\include\CLRHelp.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MakePublicDeclarations.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Marshalling.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISEffect.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISEvents.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISException.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISForceFeedback.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISInputManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISInterface.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISJoyStick.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISKeyboard.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISMouse.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISObject.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Custom\MOISPair.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\MOISPrereqs.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\auto\PreDeclarations.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Prerequisites.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Stdafx.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLContainerWrappers.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLDeque.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLHashMap.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLList.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLMap.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLMultiMap.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLMultiSet.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLSet.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\STLVector.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Wrapper.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: trunk/MOIS/MOIS/include/auto/MOISException.h
===================================================================
--- trunk/MOIS/MOIS/include/auto/MOISException.h 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/MOIS/include/auto/MOISException.h 2009-04-20 19:00:15 UTC (rev 261)
@@ -81,18 +81,24 @@
String^ get();
}
- property bool IsThrown
+ property MOIS::OISException^ LastException
{
public:
- static bool get();
+ static MOIS::OISException^ get();
}
- property MOIS::OISException^ LastException
+ void CopyTo(OISException^ dest)
{
- public:
- static MOIS::OISException^ get();
+ if (_native == NULL) throw gcnew Exception("The underlying native object for the caller is null.");
+ if (dest->_native == NULL) throw gcnew ArgumentException("The underlying native object for parameter 'dest' is null.");
+
+ *(dest->_native) = *_native;
}
+ const char* What( );
+
+ static void ClearLastException( );
+
DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_PLAINWRAPPER_EXPLICIT( OISException, Exception )
//Protected Declarations
Modified: trunk/MOIS/MOIS/include/auto/MOISInputManager.h
===================================================================
--- trunk/MOIS/MOIS/include/auto/MOISInputManager.h 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/MOIS/include/auto/MOISInputManager.h 2009-04-20 19:00:15 UTC (rev 261)
@@ -55,7 +55,7 @@
property String^ VersionName
{
public:
- static String^ get();
+ String^ get();
}
property unsigned int VersionNumber
Modified: trunk/MOIS/MOIS/src/auto/MOISException.cpp
===================================================================
--- trunk/MOIS/MOIS/src/auto/MOISException.cpp 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/MOIS/src/auto/MOISException.cpp 2009-04-20 19:00:15 UTC (rev 261)
@@ -37,17 +37,23 @@
return TO_CLR_STRING( static_cast<OIS::Exception*>(_native)->eText );
}
- bool OISException::IsThrown::get()
+ MOIS::OISException^ OISException::LastException::get()
{
- return OIS::Exception::getIsThrown( );
+ return OIS::Exception::getLastException( );
}
- MOIS::OISException^ OISException::LastException::get()
+
+ const char* OISException::What( )
{
- return OIS::Exception::getLastException( );
+ return static_cast<const OIS::Exception*>(_native)->what( );
}
+ void OISException::ClearLastException( )
+ {
+ OIS::Exception::clearLastException( );
+ }
+
//Protected Declarations
Modified: trunk/MOIS/MOIS/src/auto/MOISInputManager.cpp
===================================================================
--- trunk/MOIS/MOIS/src/auto/MOISInputManager.cpp 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/MOIS/src/auto/MOISInputManager.cpp 2009-04-20 19:00:15 UTC (rev 261)
@@ -21,7 +21,7 @@
//Public Declarations
String^ InputManager::VersionName::get()
{
- return TO_CLR_STRING( OIS::InputManager::getVersionName( ) );
+ return TO_CLR_STRING( static_cast<OIS::InputManager*>(_native)->getVersionName( ) );
}
unsigned int InputManager::VersionNumber::get()
Modified: trunk/MOIS/MOIS/src/auto/MOISJoyStick.cpp
===================================================================
--- trunk/MOIS/MOIS/src/auto/MOISJoyStick.cpp 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/MOIS/src/auto/MOISJoyStick.cpp 2009-04-20 19:00:15 UTC (rev 261)
@@ -284,7 +284,7 @@
float JoyStick::Vector3Sensitivity::get()
{
- return static_cast<OIS::JoyStick*>(_native)->getVector3Sensitivity( );
+ return static_cast<const OIS::JoyStick*>(_native)->getVector3Sensitivity( );
}
void JoyStick::Vector3Sensitivity::set( float degrees )
{
@@ -293,7 +293,7 @@
int JoyStick::GetNumberOfComponents( MOIS::ComponentType cType )
{
- return static_cast<OIS::JoyStick*>(_native)->getNumberOfComponents( (OIS::ComponentType)cType );
+ return static_cast<const OIS::JoyStick*>(_native)->getNumberOfComponents( (OIS::ComponentType)cType );
}
Modified: trunk/MOIS/MOIS/src/auto/MOISKeyboard.cpp
===================================================================
--- trunk/MOIS/MOIS/src/auto/MOISKeyboard.cpp 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/MOIS/src/auto/MOISKeyboard.cpp 2009-04-20 19:00:15 UTC (rev 261)
@@ -83,7 +83,7 @@
//Public Declarations
MOIS::Keyboard::TextTranslationMode Keyboard::TextTranslation::get()
{
- return (MOIS::Keyboard::TextTranslationMode)static_cast<OIS::Keyboard*>(_native)->getTextTranslation( );
+ return (MOIS::Keyboard::TextTranslationMode)static_cast<const OIS::Keyboard*>(_native)->getTextTranslation( );
}
void Keyboard::TextTranslation::set( MOIS::Keyboard::TextTranslationMode mode )
{
@@ -92,7 +92,7 @@
bool Keyboard::IsKeyDown( MOIS::KeyCode key )
{
- return static_cast<OIS::Keyboard*>(_native)->isKeyDown( (OIS::KeyCode)key );
+ return static_cast<const OIS::Keyboard*>(_native)->isKeyDown( (OIS::KeyCode)key );
}
String^ Keyboard::GetAsString( MOIS::KeyCode kc )
@@ -102,7 +102,7 @@
bool Keyboard::IsModifierDown( MOIS::Keyboard::Modifier mod )
{
- return static_cast<OIS::Keyboard*>(_native)->isModifierDown( (OIS::Keyboard::Modifier)mod );
+ return static_cast<const OIS::Keyboard*>(_native)->isModifierDown( (OIS::Keyboard::Modifier)mod );
}
Modified: trunk/MOIS/MOIS/src/auto/MOISObject.cpp
===================================================================
--- trunk/MOIS/MOIS/src/auto/MOISObject.cpp 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/MOIS/src/auto/MOISObject.cpp 2009-04-20 19:00:15 UTC (rev 261)
@@ -24,7 +24,7 @@
//Public Declarations
MOIS::InputManager^ OISObject::Creator::get()
{
- return static_cast<OIS::Object*>(_native)->getCreator( );
+ return static_cast<const OIS::Object*>(_native)->getCreator( );
}
int OISObject::ID::get()
Modified: trunk/MOIS/ois/Win32/OIS_vc9.vcproj
===================================================================
--- trunk/MOIS/ois/Win32/OIS_vc9.vcproj 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/ois/Win32/OIS_vc9.vcproj 2009-04-20 19:00:15 UTC (rev 261)
@@ -118,7 +118,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\includes;..\src;"C:\Program Files\Microsoft DirectX 9.0 SDK (December 2004)\Include""
+ AdditionalIncludeDirectories="..\includes;..\src;"C:\Program Files\Microsoft DirectX SDK (November 2008)\Include""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="true"
ExceptionHandling="2"
@@ -146,7 +146,7 @@
Name="VCLibrarianTool"
AdditionalDependencies="dxguid.lib dinput8.lib"
OutputFile="$(OutDir)/OIS_static.lib"
- AdditionalLibraryDirectories="..\src\win32\extras\WiiMote;"C:\Program Files\Microsoft DirectX 9.0 SDK (December 2004)\Lib\x86""
+ AdditionalLibraryDirectories="..\src\win32\extras\WiiMote;"C:\Program Files\Microsoft DirectX SDK (November 2008)\Lib\x86""
/>
<Tool
Name="VCALinkTool"
@@ -192,7 +192,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\includes; ..\src"
+ AdditionalIncludeDirectories="..\includes; ..\src;"C:\Program Files\Microsoft DirectX SDK (November 2008)\Include""
PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
StringPooling="true"
RuntimeLibrary="2"
@@ -218,7 +218,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dinput8.lib"
- AdditionalLibraryDirectories="..\src\win32\extras\WiiMote\"
+ AdditionalLibraryDirectories="..\src\win32\extras\WiiMote\;"C:\Program Files\Microsoft DirectX SDK (November 2008)\Lib\x86""
GenerateDebugInformation="false"
OptimizeReferences="2"
EnableCOMDATFolding="2"
Modified: trunk/MOIS/ois/includes/OISException.h
===================================================================
--- trunk/MOIS/ois/includes/OISException.h 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/ois/includes/OISException.h 2009-04-20 19:00:15 UTC (rev 261)
@@ -54,22 +54,29 @@
Exception() : eType(E_General), eLine(0), eFile(0) {}
public:
//! Creates exception object
- Exception( OIS_ERROR err, const char* str, int line, const char *file )
- : eType(err), eLine(line), eFile(file), eText(str) {}
+ Exception( OIS_ERROR err, const char* str, int line, const char *file );
+ void operator = (const Exception& rhs);
+
~Exception() throw() {}
virtual const char* what() const throw();
//! The type of exception raised
- const OIS_ERROR eType;
+ OIS_ERROR eType;
//! The line number it occurred on
- const int eLine;
+ int eLine;
//! The source file
- const char* eFile;
+ std::string eFile;
//! A message passed along when the exception was raised
- const char* eText;
- };
+ std::string eText;
+
+ //Additions for Mogre
+ /** Retrieves a pointer to the last exception created.
+ */
+ static Exception* getLastException() throw();
+ static void clearLastException() throw();
+ };
}
//! Use this macro to handle exceptions easily
Modified: trunk/MOIS/ois/src/OISException.cpp
===================================================================
--- trunk/MOIS/ois/src/OISException.cpp 2009-04-20 18:57:16 UTC (rev 260)
+++ trunk/MOIS/ois/src/OISException.cpp 2009-04-20 19:00:15 UTC (rev 261)
@@ -24,9 +24,38 @@
using namespace OIS;
+//Additions for Mogre
+Exception LastExceptionThrown((OIS_ERROR)-1, "", 0, "");
+
+Exception* Exception::getLastException(void) throw()
+{
+ if (LastExceptionThrown.eType == (OIS_ERROR)-1)
+ return 0;
+ return &LastExceptionThrown;
+}
+
+void Exception::clearLastException() throw()
+{
+ LastExceptionThrown = Exception((OIS_ERROR)-1, "", 0, "");
+}
+
+Exception::Exception( OIS_ERROR err, const char* str, int line, const char *file )
+ : eType(err), eLine(line), eFile(file), eText(str)
+{
+ LastExceptionThrown = *this;
+}
+
+void Exception::operator = ( const Exception& rhs )
+{
+ eType = rhs.eType;
+ eLine = rhs.eLine;
+ eFile = rhs.eFile;
+ eText = rhs.eText;
+}
+
//----------------------------------------------------------------------------//
const char* Exception::what() const throw()
{
- return eText;
+ return eText.c_str();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-04-20 18:57:19
|
Revision: 260
http://mogre.svn.sourceforge.net/mogre/?rev=260&view=rev
Author: bekas
Date: 2009-04-20 18:57:16 +0000 (Mon, 20 Apr 2009)
Log Message:
-----------
Update MOIS/Codegen
Modified Paths:
--------------
trunk/MOIS/MOIS/CodeGen/AutoWrap/AutoWrap.csproj
trunk/MOIS/MOIS/CodeGen/AutoWrap/Form1.cs
trunk/MOIS/MOIS/CodeGen/AutoWrap/Properties/Resources.Designer.cs
trunk/MOIS/MOIS/CodeGen/AutoWrap/Properties/Settings.Designer.cs
Added Paths:
-----------
trunk/MOIS/MOIS/CodeGen/AutoWrap/AutoWrap.sln
trunk/MOIS/MOIS/CodeGen/cpp2java/bin/
trunk/MOIS/MOIS/CodeGen/cpp2java/bin/doxygen.exe
trunk/MOIS/MOIS/CodeGen/cpp2java/bin/saxon8_2.jar
Removed Paths:
-------------
trunk/MOIS/MOIS/CodeGen/cpp2java/build/all.xml
trunk/MOIS/MOIS/CodeGen/cpp2java/build/doxyxml/
trunk/MOIS/MOIS/CodeGen/cpp2java/build/meta.xml
Modified: trunk/MOIS/MOIS/CodeGen/AutoWrap/AutoWrap.csproj
===================================================================
--- trunk/MOIS/MOIS/CodeGen/AutoWrap/AutoWrap.csproj 2009-04-20 12:53:17 UTC (rev 259)
+++ trunk/MOIS/MOIS/CodeGen/AutoWrap/AutoWrap.csproj 2009-04-20 18:57:16 UTC (rev 260)
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AutoWrap</RootNamespace>
<AssemblyName>AutoWrap</AssemblyName>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Added: trunk/MOIS/MOIS/CodeGen/AutoWrap/AutoWrap.sln
===================================================================
--- trunk/MOIS/MOIS/CodeGen/AutoWrap/AutoWrap.sln (rev 0)
+++ trunk/MOIS/MOIS/CodeGen/AutoWrap/AutoWrap.sln 2009-04-20 18:57:16 UTC (rev 260)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoWrap", "AutoWrap.csproj", "{22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {22E11F06-1C1E-41D1-B2E9-5D6B2372DE35}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: trunk/MOIS/MOIS/CodeGen/AutoWrap/Form1.cs
===================================================================
--- trunk/MOIS/MOIS/CodeGen/AutoWrap/Form1.cs 2009-04-20 12:53:17 UTC (rev 259)
+++ trunk/MOIS/MOIS/CodeGen/AutoWrap/Form1.cs 2009-04-20 18:57:16 UTC (rev 260)
@@ -21,10 +21,10 @@
Globals.NativeNamespace = "OIS";
Globals.ManagedNamespace = "MOIS";
- MetaDefinition meta = new MetaDefinition(@"E:\Projects\MOIS\MOIS\CodeGen\cpp2java\build\meta.xml", "MOIS");
- meta.AddAttributes(@"..\..\Attributes.xml");
+ MetaDefinition meta = new MetaDefinition("../../../cpp2java/build/meta.xml", "MOIS");
+ meta.AddAttributes("../../Attributes.xml");
- _wrapper = new Wrapper(meta, @"E:\Projects\MOIS\MOIS\include\auto", @"E:\Projects\MOIS\MOIS\src\auto", "MOIS", "OIS");
+ _wrapper = new Wrapper(meta, "../../../../include/auto", "../../../../src/auto", "MOIS", "OIS");
for (int i = 0; i < _wrapper.IncludeFiles.Count; i++)
{
Modified: trunk/MOIS/MOIS/CodeGen/AutoWrap/Properties/Resources.Designer.cs
===================================================================
--- trunk/MOIS/MOIS/CodeGen/AutoWrap/Properties/Resources.Designer.cs 2009-04-20 12:53:17 UTC (rev 259)
+++ trunk/MOIS/MOIS/CodeGen/AutoWrap/Properties/Resources.Designer.cs 2009-04-20 18:57:16 UTC (rev 260)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
+// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/MOIS/MOIS/CodeGen/AutoWrap/Properties/Settings.Designer.cs
===================================================================
--- trunk/MOIS/MOIS/CodeGen/AutoWrap/Properties/Settings.Designer.cs 2009-04-20 12:53:17 UTC (rev 259)
+++ trunk/MOIS/MOIS/CodeGen/AutoWrap/Properties/Settings.Designer.cs 2009-04-20 18:57:16 UTC (rev 260)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
+// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Added: trunk/MOIS/MOIS/CodeGen/cpp2java/bin/doxygen.exe
===================================================================
(Binary files differ)
Property changes on: trunk/MOIS/MOIS/CodeGen/cpp2java/bin/doxygen.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/MOIS/MOIS/CodeGen/cpp2java/bin/saxon8_2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/MOIS/MOIS/CodeGen/cpp2java/bin/saxon8_2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/MOIS/MOIS/CodeGen/cpp2java/build/all.xml
===================================================================
--- trunk/MOIS/MOIS/CodeGen/cpp2java/build/all.xml 2009-04-20 12:53:17 UTC (rev 259)
+++ trunk/MOIS/MOIS/CodeGen/cpp2java/build/all.xml 2009-04-20 18:57:16 UTC (rev 260)
@@ -1,8767 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<doxygen version="1.4.6-NO">
- <compounddef xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="classOIS_1_1Axis" kind="class" prot="public">
- <compoundname>OIS::Axis</compoundname>
- <basecompoundref refid="classOIS_1_1Component" prot="private" virt="non-virtual">OIS::Component</basecompoundref>
- <includes local="no">OISPrereqs.h</includes>
- <sectiondef kind="public-func">
- <memberdef kind="function" id="classOIS_1_1Axis_14fdc79ae6152950eb6deca24b997db2c" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
- <type/>
- <definition>OIS::Axis::Axis</definition>
- <argsstring>()</argsstring>
- <name>Axis</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="184" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="184" bodyend="184"/>
- </memberdef>
- <memberdef kind="function" id="classOIS_1_1Axis_1e8ff87bd7435d4d46765393ef750d167" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
- <type>void</type>
- <definition>void OIS::Axis::clear</definition>
- <argsstring>()</argsstring>
- <name>clear</name>
- <briefdescription>
- <para>Used internally by <ref refid="namespaceOIS" kindref="compound">OIS</ref>. </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="194" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="193" bodyend="196"/>
- </memberdef>
- </sectiondef>
- <sectiondef kind="public-attrib">
- <memberdef kind="variable" id="classOIS_1_1Axis_170d71650448494bfd09a71558b28cb92" prot="public" static="no" mutable="no">
- <type>int</type>
- <definition>int OIS::Axis::abs</definition>
- <argsstring/>
- <name>abs</name>
- <briefdescription>
- <para>Absoulte and Relative value components. </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="187" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="184" bodyend="-1"/>
- </memberdef>
- <memberdef kind="variable" id="classOIS_1_1Axis_1debca3b7b0e1d99d0f1c058e08d2638f" prot="public" static="no" mutable="no">
- <type>int</type>
- <definition>int OIS::Axis::rel</definition>
- <argsstring/>
- <name>rel</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="187" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="184" bodyend="-1"/>
- </memberdef>
- <memberdef kind="variable" id="classOIS_1_1Axis_1b58b0cab82f8b1165d25dc3d9d2f0075" prot="public" static="no" mutable="no">
- <type>bool</type>
- <definition>bool OIS::Axis::absOnly</definition>
- <argsstring/>
- <name>absOnly</name>
- <briefdescription>
- <para>Indicates if this <ref refid="classOIS_1_1Axis" kindref="compound">Axis</ref> only supports Absoulte (ie <ref refid="classOIS_1_1JoyStick" kindref="compound">JoyStick</ref>). </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="190" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="190" bodyend="-1"/>
- </memberdef>
- </sectiondef>
- <briefdescription>
- <para>
- <ref refid="classOIS_1_1Axis" kindref="compound">Axis</ref> component. </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inheritancegraph>
- <node id="0">
- <label>OIS::Axis</label>
- <link refid="classOIS_1_1Axis"/>
- <childnode refid="1" relation="private-inheritance">
- </childnode>
- </node>
- <node id="1">
- <label>OIS::Component</label>
- <link refid="classOIS_1_1Component"/>
- </node>
- </inheritancegraph>
- <collaborationgraph>
- <node id="2">
- <label>OIS::Axis</label>
- <link refid="classOIS_1_1Axis"/>
- <childnode refid="3" relation="private-inheritance">
- </childnode>
- </node>
- <node id="3">
- <label>OIS::Component</label>
- <link refid="classOIS_1_1Component"/>
- </node>
- </collaborationgraph>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="182" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="181" bodyend="197"/>
- <listofallmembers>
- <member refid="classOIS_1_1Axis_170d71650448494bfd09a71558b28cb92" prot="public" virt="non-virtual">
- <scope>OIS::Axis</scope>
- <name>abs</name>
- </member>
- <member refid="classOIS_1_1Axis_1b58b0cab82f8b1165d25dc3d9d2f0075" prot="public" virt="non-virtual">
- <scope>OIS::Axis</scope>
- <name>absOnly</name>
- </member>
- <member refid="classOIS_1_1Axis_14fdc79ae6152950eb6deca24b997db2c" prot="public" virt="non-virtual">
- <scope>OIS::Axis</scope>
- <name>Axis</name>
- </member>
- <member refid="classOIS_1_1Axis_1e8ff87bd7435d4d46765393ef750d167" prot="public" virt="non-virtual">
- <scope>OIS::Axis</scope>
- <name>clear</name>
- </member>
- <member refid="classOIS_1_1Component_11f541722f59d33123a3eb29e803297cd" prot="private" virt="non-virtual">
- <scope>OIS::Axis</scope>
- <name>Component</name>
- </member>
- <member refid="classOIS_1_1Component_13d716b7227c8787df1e59b9f6d18ebd7" prot="private" virt="non-virtual">
- <scope>OIS::Axis</scope>
- <name>Component</name>
- </member>
- <member refid="classOIS_1_1Component_1031efa5f4fd77e7c033a35e847c39faa" prot="private" virt="non-virtual">
- <scope>OIS::Axis</scope>
- <name>cType</name>
- </member>
- <member refid="classOIS_1_1Axis_1debca3b7b0e1d99d0f1c058e08d2638f" prot="public" virt="non-virtual">
- <scope>OIS::Axis</scope>
- <name>rel</name>
- </member>
- </listofallmembers>
- </compounddef>
- <compounddef xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="classOIS_1_1Button" kind="class" prot="public">
- <compoundname>OIS::Button</compoundname>
- <basecompoundref refid="classOIS_1_1Component" prot="private" virt="non-virtual">OIS::Component</basecompoundref>
- <includes local="no">OISPrereqs.h</includes>
- <sectiondef kind="public-func">
- <memberdef kind="function" id="classOIS_1_1Button_1e4dc670a86fda8050d4a14c28aa94f61" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
- <type/>
- <definition>OIS::Button::Button</definition>
- <argsstring>()</argsstring>
- <name>Button</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="174" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="174" bodyend="174"/>
- </memberdef>
- <memberdef kind="function" id="classOIS_1_1Button_15cf050cdfcdeca2cf251b390a0f0ccce" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
- <type/>
- <definition>OIS::Button::Button</definition>
- <argsstring>(bool bPushed)</argsstring>
- <name>Button</name>
- <param>
- <type>bool</type>
- <declname>bPushed</declname>
- </param>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="175" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="175" bodyend="175"/>
- </memberdef>
- </sectiondef>
- <sectiondef kind="public-attrib">
- <memberdef kind="variable" id="classOIS_1_1Button_15523255b398a7af610266f5b78f7ec75" prot="public" static="no" mutable="no">
- <type>bool</type>
- <definition>bool OIS::Button::pushed</definition>
- <argsstring/>
- <name>pushed</name>
- <briefdescription>
- <para>true if pushed, false otherwise </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="177" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="175" bodyend="-1"/>
- </memberdef>
- </sectiondef>
- <briefdescription>
- <para>
- <ref refid="classOIS_1_1Button" kindref="compound">Button</ref> can be a keyboard key, mouse button, etc. </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inheritancegraph>
- <node id="4">
- <label>OIS::Button</label>
- <link refid="classOIS_1_1Button"/>
- <childnode refid="5" relation="private-inheritance">
- </childnode>
- </node>
- <node id="5">
- <label>OIS::Component</label>
- <link refid="classOIS_1_1Component"/>
- </node>
- </inheritancegraph>
- <collaborationgraph>
- <node id="6">
- <label>OIS::Button</label>
- <link refid="classOIS_1_1Button"/>
- <childnode refid="7" relation="private-inheritance">
- </childnode>
- </node>
- <node id="7">
- <label>OIS::Component</label>
- <link refid="classOIS_1_1Component"/>
- </node>
- </collaborationgraph>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="172" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="171" bodyend="178"/>
- <listofallmembers>
- <member refid="classOIS_1_1Button_1e4dc670a86fda8050d4a14c28aa94f61" prot="public" virt="non-virtual">
- <scope>OIS::Button</scope>
- <name>Button</name>
- </member>
- <member refid="classOIS_1_1Button_15cf050cdfcdeca2cf251b390a0f0ccce" prot="public" virt="non-virtual">
- <scope>OIS::Button</scope>
- <name>Button</name>
- </member>
- <member refid="classOIS_1_1Component_11f541722f59d33123a3eb29e803297cd" prot="private" virt="non-virtual">
- <scope>OIS::Button</scope>
- <name>Component</name>
- </member>
- <member refid="classOIS_1_1Component_13d716b7227c8787df1e59b9f6d18ebd7" prot="private" virt="non-virtual">
- <scope>OIS::Button</scope>
- <name>Component</name>
- </member>
- <member refid="classOIS_1_1Component_1031efa5f4fd77e7c033a35e847c39faa" prot="private" virt="non-virtual">
- <scope>OIS::Button</scope>
- <name>cType</name>
- </member>
- <member refid="classOIS_1_1Button_15523255b398a7af610266f5b78f7ec75" prot="public" virt="non-virtual">
- <scope>OIS::Button</scope>
- <name>pushed</name>
- </member>
- </listofallmembers>
- </compounddef>
- <compounddef xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="classOIS_1_1Component" kind="class" prot="public">
- <compoundname>OIS::Component</compoundname>
- <derivedcompoundref refid="classOIS_1_1Axis" prot="private" virt="non-virtual">OIS::Axis</derivedcompoundref>
- <derivedcompoundref refid="classOIS_1_1Button" prot="private" virt="non-virtual">OIS::Button</derivedcompoundref>
- <derivedcompoundref refid="classOIS_1_1Pov" prot="private" virt="non-virtual">OIS::Pov</derivedcompoundref>
- <derivedcompoundref refid="classOIS_1_1Slider" prot="private" virt="non-virtual">OIS::Slider</derivedcompoundref>
- <derivedcompoundref refid="classOIS_1_1Vector3" prot="private" virt="non-virtual">OIS::Vector3</derivedcompoundref>
- <includes local="no">OISPrereqs.h</includes>
- <sectiondef kind="public-func">
- <memberdef kind="function" id="classOIS_1_1Component_11f541722f59d33123a3eb29e803297cd" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
- <type/>
- <definition>OIS::Component::Component</definition>
- <argsstring>()</argsstring>
- <name>Component</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="164" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="164" bodyend="164"/>
- </memberdef>
- <memberdef kind="function" id="classOIS_1_1Component_13d716b7227c8787df1e59b9f6d18ebd7" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
- <type/>
- <definition>OIS::Component::Component</definition>
- <argsstring>(ComponentType type)</argsstring>
- <name>Component</name>
- <param>
- <type>
- <ref refid="namespaceOIS_16630d2a503b480b90321f868e2dc1837" kindref="member">ComponentType</ref>
- </type>
- <declname>type</declname>
- </param>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="165" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="165" bodyend="165"/>
- </memberdef>
- </sectiondef>
- <sectiondef kind="public-attrib">
- <memberdef kind="variable" id="classOIS_1_1Component_1031efa5f4fd77e7c033a35e847c39faa" prot="public" static="no" mutable="no">
- <type>
- <ref refid="namespaceOIS_16630d2a503b480b90321f868e2dc1837" kindref="member">ComponentType</ref>
- </type>
- <definition>ComponentType OIS::Component::cType</definition>
- <argsstring/>
- <name>cType</name>
- <briefdescription>
- <para>Indicates what type of coponent this is. </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="167" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="165" bodyend="-1"/>
- </memberdef>
- </sectiondef>
- <briefdescription>
- <para>Base of all device components (button, axis, etc). </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inheritancegraph>
- <node id="9">
- <label>OIS::Axis</label>
- <link refid="classOIS_1_1Axis"/>
- <childnode refid="8" relation="private-inheritance">
- </childnode>
- </node>
- <node id="13">
- <label>OIS::Vector3</label>
- <link refid="classOIS_1_1Vector3"/>
- <childnode refid="8" relation="private-inheritance">
- </childnode>
- </node>
- <node id="12">
- <label>OIS::Slider</label>
- <link refid="classOIS_1_1Slider"/>
- <childnode refid="8" relation="private-inheritance">
- </childnode>
- </node>
- <node id="10">
- <label>OIS::Button</label>
- <link refid="classOIS_1_1Button"/>
- <childnode refid="8" relation="private-inheritance">
- </childnode>
- </node>
- <node id="11">
- <label>OIS::Pov</label>
- <link refid="classOIS_1_1Pov"/>
- <childnode refid="8" relation="private-inheritance">
- </childnode>
- </node>
- <node id="8">
- <label>OIS::Component</label>
- <link refid="classOIS_1_1Component"/>
- </node>
- </inheritancegraph>
- <location file="E:/Projects/MOIS/ois/includes/OISPrereqs.h" line="162" bodyfile="E:/Projects/MOIS/ois/includes/OISPrereqs.h" bodystart="161" bodyend="168"/>
- <listofallmembers>
- <member refid="classOIS_1_1Component_11f541722f59d33123a3eb29e803297cd" prot="public" virt="non-virtual">
- <scope>OIS::Component</scope>
- <name>Component</name>
- </member>
- <member refid="classOIS_1_1Component_13d716b7227c8787df1e59b9f6d18ebd7" prot="public" virt="non-virtual">
- <scope>OIS::Component</scope>
- <name>Component</name>
- </member>
- <member refid="classOIS_1_1Component_1031efa5f4fd77e7c033a35e847c39faa" prot="public" virt="non-virtual">
- <scope>OIS::Component</scope>
- <name>cType</name>
- </member>
- </listofallmembers>
- </compounddef>
- <compounddef xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="classOIS_1_1ConditionalEffect" kind="class" prot="public">
- <compoundname>OIS::ConditionalEffect</compoundname>
- <basecompoundref refid="classOIS_1_1ForceEffect" prot="public" virt="non-virtual">OIS::ForceEffect</basecompoundref>
- <includes local="no">OISEffect.h</includes>
- <sectiondef kind="public-func">
- <memberdef kind="function" id="classOIS_1_1ConditionalEffect_1a5b903efb909b6b69111ab98397a6876" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
- <type/>
- <definition>OIS::ConditionalEffect::ConditionalEffect</definition>
- <argsstring>()</argsstring>
- <name>ConditionalEffect</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="244" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="242" bodyend="244"/>
- </memberdef>
- </sectiondef>
- <sectiondef kind="public-attrib">
- <memberdef kind="variable" id="classOIS_1_1ConditionalEffect_1cf6efb7bb040a3716a09faae7f2e3c58" prot="public" static="no" mutable="no">
- <type>signed short</type>
- <definition>signed short OIS::ConditionalEffect::rightCoeff</definition>
- <argsstring/>
- <name>rightCoeff</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="246" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="246" bodyend="-1"/>
- </memberdef>
- <memberdef kind="variable" id="classOIS_1_1ConditionalEffect_144e15ae8a7397a1fa2ebb5733250cdcc" prot="public" static="no" mutable="no">
- <type>signed short</type>
- <definition>signed short OIS::ConditionalEffect::leftCoeff</definition>
- <argsstring/>
- <name>leftCoeff</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="247" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="247" bodyend="-1"/>
- </memberdef>
- <memberdef kind="variable" id="classOIS_1_1ConditionalEffect_1642d95f2d28313a4e7b53cd40b84de74" prot="public" static="no" mutable="no">
- <type>unsigned short</type>
- <definition>unsigned short OIS::ConditionalEffect::rightSaturation</definition>
- <argsstring/>
- <name>rightSaturation</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="249" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="249" bodyend="-1"/>
- </memberdef>
- <memberdef kind="variable" id="classOIS_1_1ConditionalEffect_1e28e8e36831abac7a7150ae4f3509db3" prot="public" static="no" mutable="no">
- <type>unsigned short</type>
- <definition>unsigned short OIS::ConditionalEffect::leftSaturation</definition>
- <argsstring/>
- <name>leftSaturation</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="250" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="250" bodyend="-1"/>
- </memberdef>
- <memberdef kind="variable" id="classOIS_1_1ConditionalEffect_133b96fa0e6039dddea5b1de555fd0dcd" prot="public" static="no" mutable="no">
- <type>unsigned short</type>
- <definition>unsigned short OIS::ConditionalEffect::deadband</definition>
- <argsstring/>
- <name>deadband</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="254" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="254" bodyend="-1"/>
- </memberdef>
- <memberdef kind="variable" id="classOIS_1_1ConditionalEffect_1ad57f6f9740bf3030491db397a05d013" prot="public" static="no" mutable="no">
- <type>signed short</type>
- <definition>signed short OIS::ConditionalEffect::center</definition>
- <argsstring/>
- <name>center</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="257" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="257" bodyend="-1"/>
- </memberdef>
- </sectiondef>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- <para>Use this class when dealing with Force type of Condional </para>
- </detaileddescription>
- <inheritancegraph>
- <node id="16">
- <label>OIS::ForceEffect</label>
- <link refid="classOIS_1_1ForceEffect"/>
- </node>
- <node id="15">
- <label>OIS::ConditionalEffect</label>
- <link refid="classOIS_1_1ConditionalEffect"/>
- <childnode refid="16" relation="public-inheritance">
- </childnode>
- </node>
- </inheritancegraph>
- <collaborationgraph>
- <node id="18">
- <label>OIS::ForceEffect</label>
- <link refid="classOIS_1_1ForceEffect"/>
- </node>
- <node id="17">
- <label>OIS::ConditionalEffect</label>
- <link refid="classOIS_1_1ConditionalEffect"/>
- <childnode refid="18" relation="public-inheritance">
- </childnode>
- </node>
- </collaborationgraph>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="240" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="239" bodyend="258"/>
- <listofallmembers>
- <member refid="classOIS_1_1ConditionalEffect_1ad57f6f9740bf3030491db397a05d013" prot="public" virt="non-virtual">
- <scope>OIS::ConditionalEffect</scope>
- <name>center</name>
- </member>
- <member refid="classOIS_1_1ConditionalEffect_1a5b903efb909b6b69111ab98397a6876" prot="public" virt="non-virtual">
- <scope>OIS::ConditionalEffect</scope>
- <name>ConditionalEffect</name>
- </member>
- <member refid="classOIS_1_1ConditionalEffect_133b96fa0e6039dddea5b1de555fd0dcd" prot="public" virt="non-virtual">
- <scope>OIS::ConditionalEffect</scope>
- <name>deadband</name>
- </member>
- <member refid="classOIS_1_1ConditionalEffect_144e15ae8a7397a1fa2ebb5733250cdcc" prot="public" virt="non-virtual">
- <scope>OIS::ConditionalEffect</scope>
- <name>leftCoeff</name>
- </member>
- <member refid="classOIS_1_1ConditionalEffect_1e28e8e36831abac7a7150ae4f3509db3" prot="public" virt="non-virtual">
- <scope>OIS::ConditionalEffect</scope>
- <name>leftSaturation</name>
- </member>
- <member refid="classOIS_1_1ConditionalEffect_1cf6efb7bb040a3716a09faae7f2e3c58" prot="public" virt="non-virtual">
- <scope>OIS::ConditionalEffect</scope>
- <name>rightCoeff</name>
- </member>
- <member refid="classOIS_1_1ConditionalEffect_1642d95f2d28313a4e7b53cd40b84de74" prot="public" virt="non-virtual">
- <scope>OIS::ConditionalEffect</scope>
- <name>rightSaturation</name>
- </member>
- <member refid="classOIS_1_1ForceEffect_1ba17b76c531db0a976bafb5f60c244ca" prot="public" virt="virtual">
- <scope>OIS::ConditionalEffect</scope>
- <name>~ForceEffect</name>
- </member>
- </listofallmembers>
- </compounddef>
- <compounddef xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="classOIS_1_1ConstantEffect" kind="class" prot="public">
- <compoundname>OIS::ConstantEffect</compoundname>
- <basecompoundref refid="classOIS_1_1ForceEffect" prot="public" virt="non-virtual">OIS::ForceEffect</basecompoundref>
- <includes local="no">OISEffect.h</includes>
- <sectiondef kind="public-func">
- <memberdef kind="function" id="classOIS_1_1ConstantEffect_1aadc64796abf5eeead572ccca2778ba6" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
- <type/>
- <definition>OIS::ConstantEffect::ConstantEffect</definition>
- <argsstring>()</argsstring>
- <name>ConstantEffect</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="198" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="198" bodyend="198"/>
- </memberdef>
- </sectiondef>
- <sectiondef kind="public-attrib">
- <memberdef kind="variable" id="classOIS_1_1ConstantEffect_1f73adce9069a71d88ecc41af03287ac7" prot="public" static="no" mutable="no">
- <type>
- <ref refid="classOIS_1_1Envelope" kindref="compound">Envelope</ref>
- </type>
- <definition>class Envelope OIS::ConstantEffect::envelope</definition>
- <argsstring/>
- <name>envelope</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="200" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="200" bodyend="-1"/>
- </memberdef>
- <memberdef kind="variable" id="classOIS_1_1ConstantEffect_10d7cc3b62c4330da644e7bd6b3946dc7" prot="public" static="no" mutable="no">
- <type>signed short</type>
- <definition>signed short OIS::ConstantEffect::level</definition>
- <argsstring/>
- <name>level</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="201" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="201" bodyend="-1"/>
- </memberdef>
- </sectiondef>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- <para>Use this class when dealing with Force type of Constant </para>
- </detaileddescription>
- <inheritancegraph>
- <node id="20">
- <label>OIS::ForceEffect</label>
- <link refid="classOIS_1_1ForceEffect"/>
- </node>
- <node id="19">
- <label>OIS::ConstantEffect</label>
- <link refid="classOIS_1_1ConstantEffect"/>
- <childnode refid="20" relation="public-inheritance">
- </childnode>
- </node>
- </inheritancegraph>
- <collaborationgraph>
- <node id="22">
- <label>OIS::ForceEffect</label>
- <link refid="classOIS_1_1ForceEffect"/>
- </node>
- <node id="23">
- <label>OIS::Envelope</label>
- <link refid="classOIS_1_1Envelope"/>
- <childnode refid="22" relation="public-inheritance">
- </childnode>
- </node>
- <node id="21">
- <label>OIS::ConstantEffect</label>
- <link refid="classOIS_1_1ConstantEffect"/>
- <childnode refid="22" relation="public-inheritance">
- </childnode>
- <childnode refid="23" relation="usage">
- <edgelabel>envelope</edgelabel>
- </childnode>
- </node>
- </collaborationgraph>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="196" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="195" bodyend="202"/>
- <listofallmembers>
- <member refid="classOIS_1_1ConstantEffect_1aadc64796abf5eeead572ccca2778ba6" prot="public" virt="non-virtual">
- <scope>OIS::ConstantEffect</scope>
- <name>ConstantEffect</name>
- </member>
- <member refid="classOIS_1_1ConstantEffect_1f73adce9069a71d88ecc41af03287ac7" prot="public" virt="non-virtual">
- <scope>OIS::ConstantEffect</scope>
- <name>envelope</name>
- </member>
- <member refid="classOIS_1_1ConstantEffect_10d7cc3b62c4330da644e7bd6b3946dc7" prot="public" virt="non-virtual">
- <scope>OIS::ConstantEffect</scope>
- <name>level</name>
- </member>
- <member refid="classOIS_1_1ForceEffect_1ba17b76c531db0a976bafb5f60c244ca" prot="public" virt="virtual">
- <scope>OIS::ConstantEffect</scope>
- <name>~ForceEffect</name>
- </member>
- </listofallmembers>
- </compounddef>
- <compounddef xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="classOIS_1_1Effect" kind="class" prot="public">
- <compoundname>OIS::Effect</compoundname>
- <includes local="no">OISEffect.h</includes>
- <sectiondef kind="public-type">
- <memberdef kind="enum" id="classOIS_1_1Effect_13a00691c0fe08bcbac5c6e76c85c8370" prot="public" static="no">
- <name>EForce</name>
- <enumvalue id="classOIS_1_1Effect_13a00691c0fe08bcbac5c6e76c85c837044837bd7b4d4c281b7fb019815cf25ca" prot="public">
- <name>UnknownForce</name>
- <initializer> 0</initializer>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_13a00691c0fe08bcbac5c6e76c85c8370e10cf5e0ce6930e98c09f2bb3029765c" prot="public">
- <name>ConstantForce</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_13a00691c0fe08bcbac5c6e76c85c83700bb8d12e14615040e87f33cce35f390f" prot="public">
- <name>RampForce</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_13a00691c0fe08bcbac5c6e76c85c8370a7454ef260242b75565d16770c04c802" prot="public">
- <name>PeriodicForce</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_13a00691c0fe08bcbac5c6e76c85c83708759d2b3792ed57b67219577f82736a3" prot="public">
- <name>ConditionalForce</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_13a00691c0fe08bcbac5c6e76c85c837018b3b8645d1412e90d6bcace4374f519" prot="public">
- <name>CustomForce</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <briefdescription>
- <para>Type of force. </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="56" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="55" bodyend="63"/>
- </memberdef>
- <memberdef kind="enum" id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc" prot="public" static="no">
- <name>EType</name>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc00d2b7172ab1c96184a587190971207f" prot="public">
- <name>Unknown</name>
- <initializer> 0</initializer>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc9b612614c2c29fbe5e7263cea31269aa" prot="public">
- <name>Constant</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc3b29b9746b192a3875aace4220003acf" prot="public">
- <name>Ramp</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc9bf1889244a728d86380719eea03abbf" prot="public">
- <name>Square</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc50f6d3332cbbbaaa44eca246ca6bcc65" prot="public">
- <name>Triangle</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bcaf2fec90a1410f905d199f39eb5b9b4e" prot="public">
- <name>Sine</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc14f8501f63925a574581a738e904edb4" prot="public">
- <name>SawToothUp</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bcd16edfdc2db94eb5eea15d54bf43c9c7" prot="public">
- <name>SawToothDown</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc22a7360ace2657413602573e9e8c75d4" prot="public">
- <name>Friction</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bcaf0300fd6c42f8e9b46631864c91d9e9" prot="public">
- <name>Damper</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bca3b3057e93897e64411eb4438bf9bc59" prot="public">
- <name>Inertia</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc9f4d80ec1cb9e4207b680110d329299f" prot="public">
- <name>Spring</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc2566b1a025fd6d254d3a11ded3903830" prot="public">
- <name>Custom</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <briefdescription>
- <para>Type of effect. </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="67" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="66" bodyend="82"/>
- </memberdef>
- <memberdef kind="enum" id="classOIS_1_1Effect_154821434fb139849f63e573cfc70c766" prot="public" static="no">
- <name>EDirection</name>
- <enumvalue id="classOIS_1_1Effect_154821434fb139849f63e573cfc70c766677b7968797ae9dcba5fc13b0e78bb17" prot="public">
- <name>NorthWest</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_154821434fb139849f63e573cfc70c766ced74caa53e29ec9ac81a8876f3d4b93" prot="public">
- <name>North</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_154821434fb139849f63e573cfc70c766eb96950131d5a2ca556da21ad4e1ae1e" prot="public">
- <name>NorthEast</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_154821434fb139849f63e573cfc70c766d920474e6578327d282509f23e8b4e13" prot="public">
- <name>East</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_154821434fb139849f63e573cfc70c7661ccd99a06a7055c8ad56391c17c02c54" prot="public">
- <name>SouthEast</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_154821434fb139849f63e573cfc70c766921224ff4a8d3fd33eec810ab07a3b03" prot="public">
- <name>South</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_154821434fb139849f63e573cfc70c766095762103ce9fb5f50afbb4db6c9ff95" prot="public">
- <name>SouthWest</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <enumvalue id="classOIS_1_1Effect_154821434fb139849f63e573cfc70c766db4a95ccc753f4a855a7b286c83d8991" prot="public">
- <name>West</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- </enumvalue>
- <briefdescription>
- <para>Direction of the Force. </para>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="86" bodyfile="E:/Projects/MOIS/ois/includes/OISEffect.h" bodystart="85" bodyend="95"/>
- </memberdef>
- </sectiondef>
- <sectiondef kind="public-func">
- <memberdef kind="function" id="classOIS_1_1Effect_19aa8b91d1a6a567a389f456d4bf18baf" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
- <type/>
- <definition>OIS::Effect::Effect</definition>
- <argsstring>(EForce ef, EType et)</argsstring>
- <name>Effect</name>
- <param>
- <type>
- <ref refid="classOIS_1_1Effect_13a00691c0fe08bcbac5c6e76c85c8370" kindref="member">EForce</ref>
- </type>
- <declname>ef</declname>
- </param>
- <param>
- <type>
- <ref refid="classOIS_1_1Effect_18dba2f0065c557d6618109f808df37bc" kindref="member">EType</ref>
- </type>
- <declname>et</declname>
- </param>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- <para>This constructor allows you to set the force type and effect. </para>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="100"/>
- </memberdef>
- <memberdef kind="function" id="classOIS_1_1Effect_1297cab7bdae7d803919fe70c39213990" prot="public" static="no" const="no" explicit="no" inline="no" virt="virtual">
- <type>virtual</type>
- <definition>virtual OIS::Effect::~Effect</definition>
- <argsstring>()</argsstring>
- <name>~Effect</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="101"/>
- </memberdef>
- <memberdef kind="function" id="classOIS_1_1Effect_139b763e3495d58b355ea4728511e9830" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
- <type>
- <ref refid="classOIS_1_1ForceEffect" kindref="compound">ForceEffect</ref> *</type>
- <definition>ForceEffect* OIS::Effect::getForceEffect</definition>
- <argsstring>() const </argsstring>
- <name>getForceEffect</name>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- </detaileddescription>
- <inbodydescription>
- </inbodydescription>
- <location file="E:/Projects/MOIS/ois/includes/OISEffect.h" line="128"/>
- </memberdef>
- <memberdef kind="function" id="classOIS_1_1Effect_12ce26c2b3af8c74c18288d05c875f4f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
- <type>void</type>
- <definition>void OIS::Effect::setNumAxes</definition>
- <argsstring>(short nAxes)</argsstring>
- <name>setNumAxes</name>
- <param>
- <type>short</type>
- <declname>nAxes</declname>
- </param>
- ...
[truncated message content] |
|
From: <mog...@li...> - 2009-04-20 12:53:26
|
Revision: 259
http://mogre.svn.sourceforge.net/mogre/?rev=259&view=rev
Author: bekas
Date: 2009-04-20 12:53:17 +0000 (Mon, 20 Apr 2009)
Log Message:
-----------
Delete MogreSamples.suo
Removed Paths:
-------------
trunk/Mogre/MogreSamples.suo
Deleted: trunk/Mogre/MogreSamples.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-04-18 11:49:14
|
Revision: 258
http://mogre.svn.sourceforge.net/mogre/?rev=258&view=rev
Author: bekas
Date: 2009-04-18 11:49:10 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
Remove memory_manager.xml, MemoryManager doesn't exist.
Removed Paths:
-------------
trunk/Mogre/cpp2java/fixedDoxygen/memory_manager.xml
Deleted: trunk/Mogre/cpp2java/fixedDoxygen/memory_manager.xml
===================================================================
--- trunk/Mogre/cpp2java/fixedDoxygen/memory_manager.xml 2009-04-18 07:59:11 UTC (rev 257)
+++ trunk/Mogre/cpp2java/fixedDoxygen/memory_manager.xml 2009-04-18 11:49:10 UTC (rev 258)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1' standalone='no'?>
-<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.4.6-NO">
- <compounddef id="memory_manager" kind="page">
- <compoundname>memory_manager</compoundname>
- <title>The memory manager information page</title>
- <detaileddescription>
-<para>The memory manager is a class that handles memory (de)allocation requests. <simplesect kind="par"><title></title><para>This class works like a wrapper between the actual C memory allocation functions (*alloc, free) and the memory (de)allocation requests of the application. </para></simplesect>
-<simplesect kind="par"><title></title><para>Why would such a class be needed? First of all, because we had some major issues with memory getting misued (read: deleted) over DLL boundaries. One thing this memory manager does is solve the problem by allocating all the memory in the OgreMain.dll/so process. </para></simplesect>
-<simplesect kind="par"><title></title><para>Another use would be leak detection and memory misuse detection. With a custom memory manager, calls to new/delete and *alloc/free could be overseed and logged. </para></simplesect>
-<simplesect kind="par"><title></title><para>Yet another use is the optimization of memory allocation for certain object types. One of the most common examples is a small object allocator. </para></simplesect>
-</para><para>There actually are two classes, one is the standard memory manager which only addresses memory allocation problems when deallocating across processes. <simplesect kind="par"><title></title><para>The other is a modified version of the debugging memory manager written by Paul 'MidNight' Nettle (aka. the Fluid Studios Memory Manager). Obviously, the second one should be used only when debugging your application as it adds some visible overhead. </para></simplesect>
-<simplesect kind="par"><title></title><para>You can switch between the two memory managers by setting the value of the OGRE_DEBUG_MEMORY_MANAGER macro in <ref refid="OgreConfig_8h" kindref="compound">OgreConfig.h</ref> </para></simplesect>
-</para><para>The class contains a static member of type <ref refid="classOgre_1_1MemoryManager" kindref="compound">MemoryManager</ref>. That is because we want the memory manager to be created even before we override the new([])/delete([]) operators. </para><para><ulink url="http://www.flipcode.com/cgi-bin/msg.cgi">Paul Nettle's Memory Manager page at flipCode</ulink> - you can get the original source form here. </para> </detaileddescription>
- </compounddef>
-</doxygen>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-04-18 07:59:21
|
Revision: 257
http://mogre.svn.sourceforge.net/mogre/?rev=257&view=rev
Author: bekas
Date: 2009-04-18 07:59:11 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
Remove 'bin' and 'Media' directory from Mogre directory.
Removed Paths:
-------------
trunk/Mogre/Media/
trunk/Mogre/bin/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-03-27 12:31:08
|
Revision: 256
http://mogre.svn.sourceforge.net/mogre/?rev=256&view=rev
Author: realgantz
Date: 2009-03-27 12:30:57 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
- remove warning message of the joint destructor
- add using Beauty/Bekas source the files contactjoint contactmaterial and material
- modify the contact callback to use contactjoint instead contactiterator
- remove contactiterator class
- add tolerance parameter to convexhull class
- remove (comment) function showcontacts in debugger because of deletion of ContactIterator class, change will be made soon on the debugger class
TODO : a lot of change have occured in the debugger class of ogrenewt, this class need to be remade
- add in body class property ContactJoints from Beauty/Bekas source
- add in world class property Bodies from Beauty/Bekas source
- add BodiesEnumerable in world class
- add ContactJointEnumerator in body class
Modified Paths:
--------------
trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionPrimitives.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Joint.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Body.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_ContactCallback.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Debugger.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_MaterialPair.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_World.cpp
Added Paths:
-----------
trunk/MogreNewt/MogreNewt_Main/inc/ContactJoint.h
trunk/MogreNewt/MogreNewt_Main/inc/ContactMaterial.h
trunk/MogreNewt/MogreNewt_Main/inc/Material.h
trunk/MogreNewt/MogreNewt_Main/src/ContactJoint.cpp
trunk/MogreNewt/MogreNewt_Main/src/ContactMaterial.cpp
trunk/MogreNewt/MogreNewt_Main/src/Material.cpp
Modified: trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj 2009-03-27 12:30:57 UTC (rev 256)
@@ -189,6 +189,18 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath=".\src\ContactJoint.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\ContactMaterial.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Material.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\OgreNewt_BasicJoints.cpp"
>
</File>
@@ -251,6 +263,18 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
+ RelativePath=".\inc\ContactJoint.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\ContactMaterial.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\Material.h"
+ >
+ </File>
+ <File
RelativePath=".\inc\OgreNewt.h"
>
</File>
Added: trunk/MogreNewt/MogreNewt_Main/inc/ContactJoint.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/ContactJoint.h (rev 0)
+++ trunk/MogreNewt/MogreNewt_Main/inc/ContactJoint.h 2009-03-27 12:30:57 UTC (rev 256)
@@ -0,0 +1,90 @@
+#pragma once
+
+#include <Newton.h>
+#include "ContactMaterial.h"
+
+// OgreNewt namespace. all functions and classes use this namespace.
+namespace MogreNewt
+{
+
+ref class Body;
+
+public value class ContactJoint
+{
+ NewtonJoint *_joint;
+
+internal:
+ ContactJoint(NewtonJoint *joint);
+
+public:
+ property Body^ Body0
+ {
+ Body^ get();
+ }
+
+ property Body^ Body1
+ {
+ Body^ get();
+ }
+
+ value class ContactEnumerator sealed : System::Collections::Generic::IEnumerator<ContactMaterial>
+ {
+ const ::NewtonJoint* _joint;
+ void* _current;
+
+ internal:
+ ContactEnumerator(NewtonJoint *joint) : _joint(joint) {
+ Reset();
+ }
+ public:
+ ContactEnumerator(ContactJoint joint);
+
+ virtual bool MoveNext();
+
+ property ContactMaterial Current
+ {
+ virtual ContactMaterial get();
+ }
+ property Object^ NonGenericCurrent
+ {
+ private: virtual Object^ get() sealed = System::Collections::IEnumerator::Current::get
+ {
+ return Current;
+ }
+ }
+
+ virtual void Reset() {
+ _current = (void*)-1;
+ }
+ };
+
+
+ value class ContactsEnumerable : Collections::Generic::IEnumerable<ContactMaterial>
+ {
+ NewtonJoint *_joint;
+
+ public:
+ ContactsEnumerable(ContactJoint joint);
+
+ private: virtual Collections::IEnumerator^ NonGenericGetEnumerator() sealed = Collections::IEnumerable::GetEnumerator
+ {
+ return ContactEnumerator(_joint);
+ }
+ public: virtual Collections::Generic::IEnumerator<ContactMaterial>^ GetEnumerator()
+ {
+ return ContactEnumerator(_joint);
+ }
+ };
+
+
+ property ContactsEnumerable ContactMaterials {
+ ContactsEnumerable get() {
+ return ContactsEnumerable(*this);
+ }
+ }
+
+};
+
+
+} // end namespace MogreNewt
+
Added: trunk/MogreNewt/MogreNewt_Main/inc/ContactMaterial.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/ContactMaterial.h (rev 0)
+++ trunk/MogreNewt/MogreNewt_Main/inc/ContactMaterial.h 2009-03-27 12:30:57 UTC (rev 256)
@@ -0,0 +1,70 @@
+#pragma once
+
+#include <Newton.h>
+#include <Ogre.h>
+#include "OgreNewt_Prerequisites.h"
+
+// OgreNewt namespace. all functions and classes use this namespace.
+namespace MogreNewt
+{
+
+ ref class Body;
+
+public value class ContactMaterial
+{
+ NewtonMaterial *_mat;
+
+internal:
+ ContactMaterial(NewtonMaterial *material);
+
+public:
+ property unsigned ContactFaceAttribute
+ {
+ unsigned get();
+ }
+
+ unsigned GetBodyCollisionID( MogreNewt::Body^ body );
+
+ property dFloat ContactNormalSpeed
+ {
+ dFloat get();
+ }
+
+ property Mogre::Vector3 ContactForce { Mogre::Vector3 get(); }
+
+ property Mogre::Vector3 ContactPosition { Mogre::Vector3 get(); }
+
+ property Mogre::Vector3 ContactNormal { Mogre::Vector3 get(); }
+
+ property Mogre::Vector3 ContactFirstTangent { Mogre::Vector3 get(); }
+
+ property Mogre::Vector3 ContactSecondTangent { Mogre::Vector3 get(); }
+
+ void GetContactPositionAndNormal([Out] Mogre::Vector3 %position, [Out] Mogre::Vector3 %normal);
+ void GetContactTangentDirections([Out] Mogre::Vector3 %dir0, [Out] Mogre::Vector3 %dir1);
+ dFloat GetContactTangentSpeed(int index);
+
+ ////! set softness of the current contact
+ //void SetContactSoftness( Mogre::Real softness ) { NewtonMaterialSetContactSoftness( _mat, (float)softness ); }
+
+ ////! set elasticity of the current contact
+ //void SetContactElasticity( Mogre::Real elasticity ) { NewtonMaterialSetContactElasticity( _mat, (float)elasticity ); }
+
+ ////! set friction state of current contact
+ //void SetContactFrictionState( int state, int index ) { NewtonMaterialSetContactFrictionState( _mat, state, index ); }
+
+ ////! set tangent acceleration for contact
+ //void SetContactTangentAcceleration( Mogre::Real accel, int index ) { NewtonMaterialSetContactTangentAcceleration( _mat, (float)accel, index ); }
+
+ ////! align tangent vectors with a user supplied direction
+ //void RotateTangentDirections( Mogre::Vector3 dir ) { NewtonMaterialContactRotateTangentDirections( _mat, &dir.x ); }
+
+ ////! manually set the normal for the collision.
+ //void SetContactNormalDirection( Mogre::Vector3 dir ) { NewtonMaterialSetContactNormalDirection( _mat, &dir.x ); }
+
+ ////! manually set the acceleration along the collision normal.
+ //void SetContactNormalAcceleration( Mogre::Real accel ) { NewtonMaterialSetContactNormalAcceleration( _mat, accel ); }
+};
+
+
+} // end namespace MogreNewt
Added: trunk/MogreNewt/MogreNewt_Main/inc/Material.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/Material.h (rev 0)
+++ trunk/MogreNewt/MogreNewt_Main/inc/Material.h 2009-03-27 12:30:57 UTC (rev 256)
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <Newton.h>
+#include <Ogre.h>
+#include "OgreNewt_Prerequisites.h"
+
+// OgreNewt namespace. all functions and classes use this namespace.
+namespace MogreNewt
+{
+
+public value class Material
+{
+ NewtonMaterial *_mat;
+
+internal:
+ Material(NewtonMaterial *material);
+
+public:
+ property unsigned ContactFaceAttribute
+ {
+ unsigned get();
+ }
+
+ property dFloat ContactNormalSpeed
+ {
+ dFloat get();
+ }
+
+ property Mogre::Vector3 ContactForce
+ {
+ Mogre::Vector3 get();
+ }
+
+ void GetContactPositionAndNormal([Out] Mogre::Vector3 %position, [Out] Mogre::Vector3 %normal);
+ void GetContactTangentDirections([Out] Mogre::Vector3 %dir0, [Out] Mogre::Vector3 %dir1);
+ dFloat GetContactTangentSpeed(int index);
+};
+
+
+} // end namespace MogreNewt
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h 2009-03-27 12:30:57 UTC (rev 256)
@@ -22,6 +22,7 @@
#include "OgreNewt_World.h"
#include "OgreNewt_Collision.h"
#include "OgreNewt_MaterialID.h"
+#include "ContactJoint.h"
#include <gcroot.h>
@@ -396,7 +397,61 @@
static void ApplyGravityForce( Body^ body );
+
+
+ value class ContactJointEnumerator sealed : Collections::Generic::IEnumerator<ContactJoint>
+ {
+ const ::NewtonBody* _body;
+ NewtonJoint* _current;
+
+ public:
+ ContactJointEnumerator(Body^ body);
+
+ virtual bool MoveNext();
+
+ property ContactJoint Current
+ {
+ virtual ContactJoint get();
+ }
+ property Object^ NonGenericCurrent
+ {
+ private: virtual Object^ get() sealed = Collections::IEnumerator::Current::get
+ {
+ return Current;
+ }
+ }
+
+ virtual void Reset() {
+ _current = (NewtonJoint*)-1;
+ }
+ };
+
+
+ value class ContactJointsEnumerable : Collections::Generic::IEnumerable<ContactJoint>
+ {
+ Body^ m_body;
+
+ public:
+ ContactJointsEnumerable(Body^ body) : m_body(body) {}
+
+ private: virtual Collections::IEnumerator^ NonGenericGetEnumerator() sealed = Collections::IEnumerable::GetEnumerator
+ {
+ return ContactJointEnumerator(m_body);
+ }
+ public: virtual Collections::Generic::IEnumerator<ContactJoint>^ GetEnumerator()
+ {
+ return ContactJointEnumerator(m_body);
+ }
+ };
+
+
+ property ContactJointsEnumerable ContactJoints {
+ ContactJointsEnumerable get() {
+ return ContactJointsEnumerable(this);
+ }
+ }
+
protected:
void SetupForceCallback();
@@ -410,7 +465,7 @@
MogreNewt::MaterialID^ m_matid;
MogreNewt::World^ m_world;
-
+
Object^ m_userdata;
int m_type;
@@ -475,6 +530,8 @@
};
+
+
#pragma managed(push, off)
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionPrimitives.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionPrimitives.h 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionPrimitives.h 2009-03-27 12:30:57 UTC (rev 256)
@@ -251,21 +251,21 @@
\param orient orientation offset of the primitive
\param pos position offset of the primitive
*/
- ConvexHull( MogreNewt::World^ world, Mogre::SceneNode^ node, Mogre::Quaternion orient, Mogre::Vector3 pos) : ConvexCollision( world )
+ ConvexHull( MogreNewt::World^ world, Mogre::SceneNode^ node, Mogre::Quaternion orient, Mogre::Vector3 pos,dFloat tolerance) : ConvexCollision( world )
{
- _ctor(node, orient, pos);
+ _ctor(node, orient, pos,tolerance);
}
- ConvexHull( MogreNewt::World^ world, Mogre::SceneNode^ node, Mogre::Quaternion orient) : ConvexCollision( world )
+ ConvexHull( MogreNewt::World^ world, Mogre::SceneNode^ node, Mogre::Quaternion orient,dFloat tolerance) : ConvexCollision( world )
{
- _ctor(node, orient, Mogre::Vector3::ZERO);
+ _ctor(node, orient, Mogre::Vector3::ZERO,tolerance);
}
- ConvexHull( MogreNewt::World^ world, Mogre::SceneNode^ node, Mogre::Vector3 pos) : ConvexCollision( world )
+ ConvexHull( MogreNewt::World^ world, Mogre::SceneNode^ node, Mogre::Vector3 pos,dFloat tolerance) : ConvexCollision( world )
{
- _ctor(node, Mogre::Quaternion::IDENTITY, pos);
+ _ctor(node, Mogre::Quaternion::IDENTITY, pos,tolerance);
}
- ConvexHull( MogreNewt::World^ world, Mogre::SceneNode^ node) : ConvexCollision( world )
+ ConvexHull( MogreNewt::World^ world, Mogre::SceneNode^ node,dFloat tolerance) : ConvexCollision( world )
{
- _ctor(node, Mogre::Quaternion::IDENTITY, Mogre::Vector3::ZERO);
+ _ctor(node, Mogre::Quaternion::IDENTITY, Mogre::Vector3::ZERO,tolerance);
}
/*!
@@ -276,26 +276,26 @@
\param orient orientation offset of the primitive
\param pos position offset of the primitive
*/
- ConvexHull( MogreNewt::World^ world, array<Mogre::Vector3>^ verts, Mogre::Quaternion orient, Mogre::Vector3 pos) : ConvexCollision( world )
+ ConvexHull( MogreNewt::World^ world, array<Mogre::Vector3>^ verts, Mogre::Quaternion orient, Mogre::Vector3 pos,dFloat tolerance) : ConvexCollision( world )
{
- _ctor(verts, orient, pos);
+ _ctor(verts, orient, pos,tolerance);
}
- ConvexHull( MogreNewt::World^ world, array<Mogre::Vector3>^ verts, Mogre::Quaternion orient) : ConvexCollision( world )
+ ConvexHull( MogreNewt::World^ world, array<Mogre::Vector3>^ verts, Mogre::Quaternion orient,dFloat tolerance) : ConvexCollision( world )
{
- _ctor(verts, orient, Mogre::Vector3::ZERO);
+ _ctor(verts, orient, Mogre::Vector3::ZERO,tolerance);
}
- ConvexHull( MogreNewt::World^ world, array<Mogre::Vector3>^ verts, Mogre::Vector3 pos) : ConvexCollision( world )
+ ConvexHull( MogreNewt::World^ world, array<Mogre::Vector3>^ verts, Mogre::Vector3 pos,dFloat tolerance) : ConvexCollision( world )
{
- _ctor(verts, Mogre::Quaternion::IDENTITY, pos);
+ _ctor(verts, Mogre::Quaternion::IDENTITY, pos,tolerance);
}
- ConvexHull( MogreNewt::World^ world, array<Mogre::Vector3>^ verts) : ConvexCollision( world )
+ ConvexHull( MogreNewt::World^ world, array<Mogre::Vector3>^ verts,dFloat tolerance) : ConvexCollision( world )
{
- _ctor(verts, Mogre::Quaternion::IDENTITY, Mogre::Vector3::ZERO);
+ _ctor(verts, Mogre::Quaternion::IDENTITY, Mogre::Vector3::ZERO,tolerance);
}
private:
- void _ctor( Mogre::SceneNode^ node, Mogre::Quaternion orient, Mogre::Vector3 pos );
- void _ctor( array<Mogre::Vector3>^ verts, Mogre::Quaternion orient, Mogre::Vector3 pos );
+ void _ctor( Mogre::SceneNode^ node, Mogre::Quaternion orient, Mogre::Vector3 pos ,dFloat tolerance);
+ void _ctor( array<Mogre::Vector3>^ verts, Mogre::Quaternion orient, Mogre::Vector3 pos ,dFloat tolerance);
};
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h 2009-03-27 12:30:57 UTC (rev 256)
@@ -18,111 +18,7 @@
namespace MogreNewt
{
-
-
-public ref class Contact
-{
- public:
- //! user should never call constructor directly, always use the provided ContactIterator class.
- Contact( NewtonJoint* contactjoint, void* contact);
-
- //! disable the current contact.
- void RemoveContact() { NewtonContactJointRemoveContact( m_contactjoint, m_contact ); }
-
- //! get the face ID of a TreeCollision object
- property unsigned ContactFaceAttribute { unsigned get() { return NewtonMaterialGetContactFaceAttribute( m_material ); } }
-
- //! get the Collision ID of a body currently colliding
- unsigned GetBodyCollisionID( MogreNewt::Body^ body ) { return NewtonMaterialGetBodyCollisionID( m_material, body->NewtonBody ); }
-
- //! speed of the collision
- property Mogre::Real ContactNormalSpeed { Mogre::Real get() { return (Mogre::Real)NewtonMaterialGetContactNormalSpeed( m_material ); } }
-
-
- //! force of the collision
- /*!
- only valid for objects in a stable state (sitting on top of each other, etc)
- */
- property Mogre::Vector3 ContactForce { Mogre::Vector3 get(); }
-
- property Mogre::Vector3 ContactPosition { Mogre::Vector3 get(); }
-
- property Mogre::Vector3 ContactNormal { Mogre::Vector3 get(); }
-
- property Mogre::Vector3 ContactFirstTangent { Mogre::Vector3 get(); }
-
- property Mogre::Vector3 ContactSecondTangent { Mogre::Vector3 get(); }
-
- //! get the tangent vectors of the collision
- void GetContactTangentDirections( [Out] Mogre::Vector3% dir0, [Out] Mogre::Vector3% dir1 );
-
- //! get tangent speed of the collision
- Mogre::Real GetContactTangentSpeed( int index ) { return (Mogre::Real)NewtonMaterialGetContactTangentSpeed( m_material, index ); }
-
-
- //! set softness of the current contact
- void SetContactSoftness( Mogre::Real softness ) { NewtonMaterialSetContactSoftness( m_material, (float)softness ); }
-
- //! set elasticity of the current contact
- void SetContactElasticity( Mogre::Real elasticity ) { NewtonMaterialSetContactElasticity( m_material, (float)elasticity ); }
-
-
- //! set friction state of current contact
- void SetContactFrictionState( int state, int index ) { NewtonMaterialSetContactFrictionState( m_material, state, index ); }
-
- //! set static friction for current contact
- void SetContactFrictionCoef( Mogre::Real stat, Mogre::Real kinetic, int index ) { NewtonMaterialSetContactFrictionCoef( m_material, (float)stat, (float)kinetic, index ); }
-
- //! set tangent acceleration for contact
- void SetContactTangentAcceleration( Mogre::Real accel, int index ) { NewtonMaterialSetContactTangentAcceleration( m_material, (float)accel, index ); }
-
- //! align tangent vectors with a user supplied direction
- void RotateTangentDirections( const Mogre::Vector3 dir ) { NewtonMaterialContactRotateTangentDirections( m_material, &dir.x ); }
-
- //! manually set the normal for the collision.
- void SetContactNormalDirection( const Mogre::Vector3 dir ) { NewtonMaterialSetContactNormalDirection( m_material, &dir.x ); }
-
- //! manually set the acceleration along the collision normal.
- void SetContactNormalAcceleration( Mogre::Real accel ) { NewtonMaterialSetContactNormalAcceleration( m_material, accel ); }
-
- //! get positoin and normal of the collision
- void GetContactPositionAndNormal( [Out] Mogre::Vector3% pos, [Out] Mogre::Vector3% norm );
-
-
-private:
- void* m_contact;
- NewtonJoint* m_contactjoint;
- NewtonMaterial* m_material;
-
-};
-
-public ref class ContactIterator
-{
- public:
- //! user should never call constructor, it is provided in the userProcess() function directly.
- ContactIterator( NewtonJoint* contactjoint );
-
- //! get the current contact.
- Contact^ GetCurrent();
-
- //! move to the next contact in the list. returns true if another contact is available, false if no more contacts exist.
- bool MoveNext();
-
- //! returns to the first contact in the list.
- void Reset();
-
- //! if the contact has more elements.
- bool HasMoreElements();
-
- //! returns the total amount of contacts in the list.
- int GetContactCount() { return NewtonContactJointGetContactCount( m_contactjoint ); }
-
-private:
- NewtonJoint* m_contactjoint;
- void* m_currentcontact;
-};
-
-//! custom contact behavior
+ //! custom contact behavior
/*!
this class is for creating custom behavior between material GroupIDs.
this class must be inherited, and the user functions created, and then
@@ -131,11 +27,9 @@
public ref class ContactCallback
{
public:
-
//! constructor
ContactCallback();
-
// user-defined callback function.
//! user defined Begin function
@@ -145,47 +39,33 @@
can be called yet. they must be called from the userProcess() function.
return 0 to ignore the collision, 1 to allow it.
*/
- virtual int UserBegin( int threadIndex ) { return 1; }
+ virtual int UserAABBOverlap(ContactMaterial material, Body^ body0, Body^ body1, int threadIndex) { return 1; }
//! user-defined Process function
/*!
user process function. is called for each contact between the 2 bodies. all member functions are valid from
within this function, and will affect the current contact. return 0 to ignore the collision, 1 to allow it.
*/
- virtual void UserProcess( ContactIterator^ contactIterator, Mogre::Real timeStep, int threadIndex ) { }
+ virtual void UserProcess(ContactJoint contact, dFloat timestep, int threadIndex) {}
-
- // basic contact control commands...
-
-
internal:
- //! internal function.
- int ContactBegin( const NewtonMaterial* material, const NewtonBody* body0, const NewtonBody* body1 ,int threadIndex );
- //! internal function.
- void ContactProcess(const NewtonJoint* contact,float timestep, int threadIndex);
+ int AABBOverlap (const NewtonMaterial* material, const NewtonBody* body0, const NewtonBody* body1, int threadIndex);
+ void ContactProcess (const NewtonJoint* contact, dFloat timestep, int threadIndex);
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate int NewtonContactBeginDelegate( const NewtonMaterial* material, const NewtonBody* body0, const NewtonBody* body1,int threadIndex );
+ delegate int NewtonOnAABBOverlapDelegate (const NewtonMaterial* material, const NewtonBody* body0, const NewtonBody* body1, int threadIndex);
- [UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate void NewtonContactProcessDelegate( const NewtonJoint* contact, float timestep, int threadIndex);
+ [UnmanagedFunctionPointer(CallingConvention::Cdecl)]
+ delegate void NewtonContactProcessDelegate (const NewtonJoint* contact, dFloat timestep, int threadIndex);
- NewtonContactBeginDelegate^ m_NewtonContactBeginDelegate;
- NewtonContactProcessDelegate^ m_NewtonContactProcessDelegate;
+ NewtonOnAABBOverlapDelegate^ m_NewtonOnAABBOverlapDelegate;
+ NewtonContactProcessDelegate^ m_NewtonContactProcessDelegate;
- NewtonOnAABBOverlap m_funcptr_contactBegin;
- NewtonContactsProcess m_funcptr_contactProcess;
+ NewtonOnAABBOverlap m_funcptr_AABBOverlap;
+ NewtonContactsProcess m_funcptr_contactProcess;
-
-
-
-protected:
- MogreNewt::Body^ m_body0;
- MogreNewt::Body^ m_body1;
};
-
-
} // end namespace MogreNewt
#endif
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h 2009-03-27 12:30:57 UTC (rev 256)
@@ -58,8 +58,8 @@
void ShowLines( MogreNewt::World^ world ){ ShowLines(world,true);}
void ShowLines( MogreNewt::World^ world ,bool clearPrevious);
- void ShowContacts( MogreNewt::World^ world) { ShowContacts(world,false); }
- void ShowContacts( MogreNewt::World^ world, bool clearPrevious );
+ //void ShowContacts( MogreNewt::World^ world) { ShowContacts(world,false); }
+ //void ShowContacts( MogreNewt::World^ world, bool clearPrevious );
//! remove lines drawn.
void HideLines();
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Joint.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Joint.h 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Joint.h 2009-03-27 12:30:57 UTC (rev 256)
@@ -65,6 +65,26 @@
void set(Object^ ptr) { m_userdata = ptr; }
}
+ property ::MogreNewt::Body^ GetBody0
+ {
+ ::MogreNewt::Body^ get()
+ {
+ return static_cast<BodyNativeInfo*>(
+ NewtonBodyGetUserData( NewtonJointGetBody0(m_joint) )
+ )->managedBody;
+ }
+ }
+
+ property ::MogreNewt::Body^ GetBody1
+ {
+ ::MogreNewt::Body^ get()
+ {
+ return static_cast<BodyNativeInfo*>(
+ NewtonBodyGetUserData( NewtonJointGetBody1(m_joint) )
+ )->managedBody;
+ }
+ }
+
protected:
NewtonJoint* m_joint;
@@ -76,9 +96,12 @@
void Destructor( const NewtonJoint* me );
+//MOD now declared as public (because of a strange compiler error since Newton 2 dll)
+public:
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
delegate void NewtonJointDestructorDelegate( const NewtonJoint* me );
+protected:
NewtonJointDestructorDelegate^ m_NewtonJointDestructorDelegate;
NewtonConstraintDestructor m_funcptr_destructor;
@@ -157,6 +180,8 @@
MogreNewt::Body^ m_body0;
MogreNewt::Body^ m_body1;
+
+
private:
//! newton callback. used internally.
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h 2009-03-27 12:30:57 UTC (rev 256)
@@ -117,6 +117,63 @@
*/
void Update( Mogre::Real t_step );
+ //adding body enumerator for the world, TODO : move it to a specific class like ogrenewt
+ value class BodyEnumerator : Collections::Generic::IEnumerator<Body^>
+ {
+ const ::NewtonWorld* _world;
+ NewtonBody* _current;
+
+ internal:
+ BodyEnumerator(const NewtonWorld* world) : _world(world) {
+ Reset();
+ }
+
+ public:
+ BodyEnumerator(World^ world);
+
+ virtual bool MoveNext();
+
+ property Body^ Current
+ {
+ virtual Body^ get();
+ }
+ property Object^ NonGenericCurrent
+ {
+ private: virtual Object^ get() sealed = Collections::IEnumerator::Current::get
+ {
+ return Current;
+ }
+ }
+
+ virtual void Reset() {
+ _current = (NewtonBody*)-1;
+ }
+ };
+
+ value class BodiesEnumerable : Collections::Generic::IEnumerable<Body^>
+ {
+ World^ m_World;
+
+ public:
+ BodiesEnumerable(World^ world) : m_World(world) {}
+
+ private: virtual Collections::IEnumerator^ NonGenericGetEnumerator() sealed = Collections::IEnumerable::GetEnumerator
+ {
+ return BodyEnumerator(m_World);
+ }
+ public: virtual Collections::Generic::IEnumerator<Body^>^ GetEnumerator()
+ {
+ return BodyEnumerator(m_World);
+ }
+ };
+
+
+ property BodiesEnumerable Bodies {
+ BodiesEnumerable get() {
+ return BodiesEnumerable(this);
+ }
+ }
+
void InvalidateCache() { NewtonInvalidateCache( m_world ); }
//! retrieves a pointer to the NewtonWorld
Added: trunk/MogreNewt/MogreNewt_Main/src/ContactJoint.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/ContactJoint.cpp (rev 0)
+++ trunk/MogreNewt/MogreNewt_Main/src/ContactJoint.cpp 2009-03-27 12:30:57 UTC (rev 256)
@@ -0,0 +1,52 @@
+#include <ContactJoint.h>
+#include "OgreNewt_Body.h"
+
+namespace MogreNewt
+{
+
+ContactJoint::ContactJoint(NewtonJoint *joint) {
+ if (joint == NULL)
+ throw gcnew Exception("Cannot create a ContactJoint from a null NewtonJoint");
+ _joint = joint;
+}
+
+Body^ ContactJoint::Body0::get() {
+ return static_cast<BodyNativeInfo*>(
+ NewtonBodyGetUserData( NewtonJointGetBody0(_joint) )
+ )->managedBody;
+}
+
+
+Body^ ContactJoint::Body1::get() {
+ return static_cast<BodyNativeInfo*>(
+ NewtonBodyGetUserData( NewtonJointGetBody1(_joint) )
+ )->managedBody;
+}
+
+ContactJoint::ContactEnumerator::ContactEnumerator(ContactJoint joint) {
+ _joint = joint._joint;
+ Reset();
+}
+
+bool ContactJoint::ContactEnumerator::MoveNext() {
+ if (_current == (void*)-1) {
+ _current = NewtonContactJointGetFirstContact(_joint);
+ }
+ else {
+ if (_current != NULL)
+ _current = NewtonContactJointGetNextContact( _joint, _current);
+ }
+
+ return (_current != NULL);
+}
+
+ContactMaterial ContactJoint::ContactEnumerator::Current::get()
+{
+ return ContactMaterial(NewtonContactGetMaterial(_current));
+}
+
+ContactJoint::ContactsEnumerable::ContactsEnumerable(ContactJoint joint) {
+ _joint = joint._joint;
+}
+
+} // end namespace MogreNewt
Added: trunk/MogreNewt/MogreNewt_Main/src/ContactMaterial.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/ContactMaterial.cpp (rev 0)
+++ trunk/MogreNewt/MogreNewt_Main/src/ContactMaterial.cpp 2009-03-27 12:30:57 UTC (rev 256)
@@ -0,0 +1,85 @@
+#include <ContactMaterial.h>
+#include "OgreNewt_Body.h"
+
+namespace MogreNewt
+{
+
+ContactMaterial::ContactMaterial(NewtonMaterial *material) {
+ if (material == NULL)
+ throw gcnew Exception("Cannot create a Material from a null NewtonMaterial");
+ _mat = material;
+}
+
+unsigned ContactMaterial::GetBodyCollisionID( MogreNewt::Body^ body )
+{
+ return NewtonMaterialGetBodyCollisionID( _mat, body->NewtonBody );
+}
+
+unsigned ContactMaterial::ContactFaceAttribute::get()
+{
+ return NewtonMaterialGetContactFaceAttribute(_mat);
+}
+
+dFloat ContactMaterial::ContactNormalSpeed::get()
+{
+ return NewtonMaterialGetContactNormalSpeed(_mat);
+}
+
+
+Mogre::Vector3 ContactMaterial::ContactForce::get()
+{
+ Mogre::Vector3 force;
+ NewtonMaterialGetContactForce( _mat, &force.x );
+ return force;
+}
+
+Mogre::Vector3 ContactMaterial::ContactPosition::get()
+{
+ Mogre::Vector3 pos, norm;
+ GetContactPositionAndNormal(pos, norm);
+ return pos;
+}
+
+Mogre::Vector3 ContactMaterial::ContactNormal::get()
+{
+ Mogre::Vector3 pos, norm;
+ GetContactPositionAndNormal(pos, norm);
+ return norm;
+}
+
+Mogre::Vector3 ContactMaterial::ContactFirstTangent::get()
+{
+ Mogre::Vector3 t1, t2;
+ GetContactTangentDirections(t1, t1);
+ return t1;
+}
+
+Mogre::Vector3 ContactMaterial::ContactSecondTangent::get()
+{
+ Mogre::Vector3 t1, t2;
+ GetContactTangentDirections(t1, t1);
+ return t2;
+}
+
+void ContactMaterial::GetContactPositionAndNormal( Mogre::Vector3% pos, Mogre::Vector3% norm )
+{
+ pin_ptr<Mogre::Vector3> p_pos = &pos;
+ pin_ptr<Mogre::Vector3> p_norm = &norm;
+ NewtonMaterialGetContactPositionAndNormal( _mat, &p_pos->x, &p_norm->x );
+}
+
+
+void ContactMaterial::GetContactTangentDirections( Mogre::Vector3% dir0, Mogre::Vector3% dir1 )
+{
+ pin_ptr<Mogre::Vector3> p_dir0 = &dir0;
+ pin_ptr<Mogre::Vector3> p_dir1 = &dir1;
+ NewtonMaterialGetContactTangentDirections( _mat, &p_dir0->x, &p_dir1->x );
+}
+
+dFloat ContactMaterial::GetContactTangentSpeed(int index) {
+ return NewtonMaterialGetContactTangentSpeed(_mat, index);
+}
+
+} // end namespace MogreNewt
+
+
Added: trunk/MogreNewt/MogreNewt_Main/src/Material.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/Material.cpp (rev 0)
+++ trunk/MogreNewt/MogreNewt_Main/src/Material.cpp 2009-03-27 12:30:57 UTC (rev 256)
@@ -0,0 +1,58 @@
+#include <Material.h>
+#include "OgreNewt_Body.h"
+
+namespace MogreNewt
+{
+
+Material::Material(NewtonMaterial *material) {
+ if (material == NULL)
+ throw gcnew Exception("Cannot create a Material from a null NewtonMaterial");
+ _mat = material;
+}
+
+unsigned Material::ContactFaceAttribute::get()
+{
+ return NewtonMaterialGetContactFaceAttribute(_mat);
+}
+
+dFloat Material::ContactNormalSpeed::get()
+{
+ return NewtonMaterialGetContactNormalSpeed(_mat);
+}
+
+Mogre::Vector3 Material::ContactForce::get()
+{
+ dFloat force[3];
+ NewtonMaterialGetContactForce(_mat, force);
+ return Mogre::Vector3(force);
+}
+
+void Material::GetContactPositionAndNormal([Out] Mogre::Vector3 %position, [Out] Mogre::Vector3 %normal) {
+ dFloat pos[3], norm[3];
+ NewtonMaterialGetContactPositionAndNormal(_mat, pos, norm);
+ position.x = pos[0];
+ position.y = pos[1];
+ position.z = pos[2];
+ normal.x = norm[0];
+ normal.y = norm[1];
+ normal.z = norm[2];
+}
+
+void Material::GetContactTangentDirections([Out] Mogre::Vector3 %dir0, [Out] Mogre::Vector3 %dir1) {
+ dFloat ndir0[3], ndir1[3];
+ NewtonMaterialGetContactTangentDirections(_mat, ndir0, ndir1);
+ dir0.x = ndir0[0];
+ dir0.y = ndir0[1];
+ dir0.z = ndir0[2];
+ dir1.x = ndir1[0];
+ dir1.y = ndir1[1];
+ dir1.z = ndir1[2];
+}
+
+dFloat Material::GetContactTangentSpeed(int index) {
+ return NewtonMaterialGetContactTangentSpeed(_mat, index);
+}
+
+} // end namespace MogreNewt
+
+
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Body.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Body.cpp 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Body.cpp 2009-03-27 12:30:57 UTC (rev 256)
@@ -473,6 +473,30 @@
}
+
+Body::ContactJointEnumerator::ContactJointEnumerator(Body^ body) {
+ _body = body->NewtonBody;
+ Reset();
+}
+
+bool Body::ContactJointEnumerator::MoveNext() {
+ if (_current == (NewtonJoint*)-1) {
+ _current = NewtonBodyGetFirstContactJoint(_body);
+ }
+ else {
+ if (_current != NULL)
+ _current = NewtonBodyGetNextContactJoint( _body, _current);
+ }
+
+ return (_current != NULL);
+}
+
+ContactJoint Body::ContactJointEnumerator::Current::get()
+{
+ return ContactJoint(_current);
+}
+
+
// --------------------------------------------------------------------------------------
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp 2009-03-27 12:30:57 UTC (rev 256)
@@ -84,7 +84,7 @@
// MogreNewt::CollisionPrimitives::ConvexHull
- void ConvexHull::_ctor( Mogre::SceneNode^ mnode, Mogre::Quaternion orient, Mogre::Vector3 pos )
+ void ConvexHull::_ctor( Mogre::SceneNode^ mnode, Mogre::Quaternion orient, Mogre::Vector3 pos ,dFloat tolerance)
{
Ogre::SceneNode* node = mnode;
@@ -199,7 +199,7 @@
MogreNewt::Converter::QuatPosToMatrix( orient, pos, &matrix[0] );
//okay, let's try making the ConvexHull!
- m_col = NewtonCreateConvexHull( m_world->NewtonWorld, (int)total_verts, (float*)&vertices[0].x, sizeof(Ogre::Vector3),0.001f, &matrix[0] );
+ m_col = NewtonCreateConvexHull( m_world->NewtonWorld, (int)total_verts, (float*)&vertices[0].x, sizeof(Ogre::Vector3),tolerance, &matrix[0] );
delete []vertices;
@@ -207,7 +207,7 @@
// MogreNewt::CollisionPrimitives::ConvexHull
- void ConvexHull::_ctor( array<Mogre::Vector3>^ verts, Mogre::Quaternion orient, Mogre::Vector3 pos )
+ void ConvexHull::_ctor( array<Mogre::Vector3>^ verts, Mogre::Quaternion orient, Mogre::Vector3 pos ,dFloat tolerance)
{
float matrix[16];
MogreNewt::Converter::QuatPosToMatrix( orient, pos, &matrix[0] );
@@ -215,7 +215,7 @@
pin_ptr<Mogre::Real> ptr = &verts[0].x;
//make the collision primitive.
- m_col = NewtonCreateConvexHull( m_world->NewtonWorld, verts->Length, ptr, sizeof(Ogre::Vector3),0.001f, &matrix[0]);
+ m_col = NewtonCreateConvexHull( m_world->NewtonWorld, verts->Length, ptr, sizeof(Ogre::Vector3),tolerance, &matrix[0]);
}
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_ContactCallback.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_ContactCallback.cpp 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_ContactCallback.cpp 2009-03-27 12:30:57 UTC (rev 256)
@@ -4,157 +4,42 @@
namespace MogreNewt
{
-//-----------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------
-Contact::Contact(NewtonJoint *contactjoint, void *contact)
-{
- m_contactjoint = contactjoint;
- m_contact = contact;
- m_material = NewtonContactGetMaterial( m_contact );
-}
-Mogre::Vector3 Contact::ContactForce::get()
+ContactCallback::ContactCallback()
{
- Mogre::Vector3 force;
- NewtonMaterialGetContactForce( m_material, &force.x );
- return force;
-}
+ m_funcptr_AABBOverlap = NULL;
+ m_funcptr_contactProcess = NULL;
+ System::Type^ thisType = this->GetType();
+ if (thisType == ContactCallback::typeid)
+ return;
+ System::Reflection::MethodInfo^ method_AABBOverlap = thisType->GetMethod("UserAABBOverlap",
+ gcnew array<Type^>{ContactMaterial::typeid, Body::typeid, Body::typeid, int::typeid});
+ System::Reflection::MethodInfo^ method_contactProcess = thisType->GetMethod("UserProcess",
+ gcnew array<Type^>{ContactJoint::typeid, dFloat::typeid, int::typeid});
-Mogre::Vector3 Contact::ContactPosition::get()
-{
- Mogre::Vector3 pos, norm;
- GetContactPositionAndNormal(pos, norm);
- return pos;
-}
+ if (method_AABBOverlap->DeclaringType != ContactCallback::typeid) {
+ m_NewtonOnAABBOverlapDelegate = gcnew NewtonOnAABBOverlapDelegate( this, &ContactCallback::AABBOverlap );
+ m_funcptr_AABBOverlap = (NewtonOnAABBOverlap) Marshal::GetFunctionPointerForDelegate( m_NewtonOnAABBOverlapDelegate ).ToPointer();
+ }
-Mogre::Vector3 Contact::ContactNormal::get()
-{
- Mogre::Vector3 pos, norm;
- GetContactPositionAndNormal(pos, norm);
- return norm;
-}
-
-
-ContactIterator::ContactIterator(NewtonJoint *contactjoint)
-{
- m_contactjoint = contactjoint;
- m_currentcontact = NewtonContactJointGetFirstContact( m_contactjoint );
-}
-
-
-Contact^ ContactIterator::GetCurrent()
-{
- return gcnew Contact( m_contactjoint, m_currentcontact );
-}
-
-bool ContactIterator::MoveNext()
-{
- m_currentcontact = NewtonContactJointGetNextContact( m_contactjoint, m_currentcontact );
-
- if (m_currentcontact)
- return true;
- else
- return false;
-}
-
-void ContactIterator::Reset()
-{
- m_currentcontact = NewtonContactJointGetFirstContact( m_contactjoint );
-}
-
-bool ContactIterator::HasMoreElements()
-{
- void* next = NewtonContactJointGetNextContact( m_contactjoint, m_currentcontact );
- if (next)
- return true;
- else
- return false;
-}
-
-ContactCallback::ContactCallback()
-{
- m_NewtonContactBeginDelegate = gcnew NewtonContactBeginDelegate( this, &ContactCallback::ContactBegin );
- m_funcptr_contactBegin = (NewtonOnAABBOverlap) Marshal::GetFunctionPointerForDelegate( m_NewtonContactBeginDelegate ).ToPointer();
-
+ if (method_contactProcess->DeclaringType != ContactCallback::typeid) {
m_NewtonContactProcessDelegate = gcnew NewtonContactProcessDelegate( this, &ContactCallback::ContactProcess );
m_funcptr_contactProcess = (NewtonContactsProcess) Marshal::GetFunctionPointerForDelegate( m_NewtonContactProcessDelegate ).ToPointer();
-
- //m_NewtonContactEndDelegate = gcnew NewtonContactEndDelegate( this, &ContactCallback::ContactEnd );
- //m_funcptr_contactEnd = (NewtonContactEnd) Marshal::GetFunctionPointerForDelegate( m_NewtonContactEndDelegate ).ToPointer();
+ }
}
-int ContactCallback::ContactBegin( const NewtonMaterial* material, const ::NewtonBody* body0, const NewtonBody* body1 ,int threadIndex )
+int ContactCallback::AABBOverlap(const NewtonMaterial* material, const NewtonBody* body0, const NewtonBody* body1, int threadIndex)
{
- //m_material = (NewtonMaterial*)material;
-
- //save the bodies...
- m_body0 = static_cast<BodyNativeInfo*>( NewtonBodyGetUserData( body0 ) )->managedBody;
- m_body1 = static_cast<BodyNativeInfo*>( NewtonBodyGetUserData( body1 ) )->managedBody;
-
- return UserBegin( threadIndex );
+ return UserAABBOverlap(ContactMaterial(const_cast<NewtonMaterial*>(material)),
+ static_cast<BodyNativeInfo*>( NewtonBodyGetUserData( body0 ) )->managedBody,
+ static_cast<BodyNativeInfo*>( NewtonBodyGetUserData( body1 ) )->managedBody,
+ threadIndex);
}
-void ContactCallback::ContactProcess( const NewtonJoint* contact,float timestep,int threadIndex )
+void ContactCallback::ContactProcess(const NewtonJoint* contact, dFloat timestep, int threadIndex)
{
- //m_material = (NewtonMaterial*)material;
- //m_contact = (NewtonContact*)contact;
- void* first_c = NewtonContactJointGetFirstContact(contact);
- NewtonMaterial* mat = NewtonContactGetMaterial( first_c );
-
- m_body0 = static_cast<BodyNativeInfo*>( NewtonBodyGetUserData( NewtonJointGetBody0(contact) ) )->managedBody;
- m_body1 = static_cast<BodyNativeInfo*>( NewtonBodyGetUserData( NewtonJointGetBody1(contact) ) )->managedBody;
-
-
- // call the user-defined callback function!
- UserProcess( gcnew ContactIterator((NewtonJoint*)contact) , (Mogre::Real)timestep, threadIndex);
-
+ UserProcess(ContactJoint(const_cast<NewtonJoint*>(contact)), timestep, threadIndex);
}
-/*
-void ContactCallback::ContactEnd( const NewtonMaterial* material )
-{
- m_material = (NewtonMaterial*)material;
-
- UserEnd();
}
-*/
-
-
-
-Mogre::Vector3 Contact::ContactFirstTangent::get()
-{
- Mogre::Vector3 t1, t2;
- GetContactTangentDirections(t1, t1);
- return t1;
-}
-
-Mogre::Vector3 Contact::ContactSecondTangent::get()
-{
- Mogre::Vector3 t1, t2;
- GetContactTangentDirections(t1, t1);
- return t2;
-}
-
-void Contact::GetContactPositionAndNormal( Mogre::Vector3% pos, Mogre::Vector3% norm )
-{
- pin_ptr<Mogre::Vector3> p_pos = &pos;
- pin_ptr<Mogre::Vector3> p_norm = &norm;
- NewtonMaterialGetContactPositionAndNormal( m_material, &p_pos->x, &p_norm->x );
-}
-
-void Contact::GetContactTangentDirections( Mogre::Vector3% dir0, Mogre::Vector3% dir1 )
-{
- pin_ptr<Mogre::Vector3> p_dir0 = &dir0;
- pin_ptr<Mogre::Vector3> p_dir1 = &dir1;
- NewtonMaterialGetContactTangentDirections( m_material, &p_dir0->x, &p_dir1->x );
-}
-
-
-
-
-
-
-
-}
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Debugger.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Debugger.cpp 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Debugger.cpp 2009-03-27 12:30:57 UTC (rev 256)
@@ -88,7 +88,7 @@
m_debugger_debuglines->end();
}
-
+/*
void Debugger::ShowContacts( MogreNewt::World^ world, bool clearPrevious )
{
if (clearPrevious)
@@ -144,7 +144,7 @@
m_debugger_debuglines->end();
}
-
+*/
void Debugger::HideLines()
{
// erase any existing lines!
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_MaterialPair.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_MaterialPair.cpp 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_MaterialPair.cpp 2009-03-27 12:30:57 UTC (rev 256)
@@ -22,7 +22,7 @@
{
// set the material callbacks to the functions inside the ContactCallback class.
NewtonMaterialSetCollisionCallback( m_world->NewtonWorld, id0->ID, id1->ID, NULL,
- callback->m_funcptr_contactBegin,
+ callback->m_funcptr_AABBOverlap,
callback->m_funcptr_contactProcess );
}
else
Modified: trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_World.cpp
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_World.cpp 2009-03-26 11:08:42 UTC (rev 255)
+++ trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_World.cpp 2009-03-27 12:30:57 UTC (rev 256)
@@ -79,6 +79,32 @@
MogreNewt::Body^ b = static_cast<BodyNativeInfo*>( NewtonBodyGetUserData( body ) )->managedBody;
LeaveWorld(b ,threadIndex);
}
+
+ World::BodyEnumerator::BodyEnumerator(World^ world)
+ {
+ _world = world->NewtonWorld;
+ Reset();
+ }
+
+ bool World::BodyEnumerator::MoveNext()
+ {
+ if (_current == (NewtonBody*)-1) {
+ _current = NewtonWorldGetFirstBody(_world);
+ }
+ else {
+ if (_current != NULL)
+ _current = NewtonWorldGetNextBody( _world, _current);
+ }
+
+ return (_current != NULL);
+ }
+
+ Body^ World::BodyEnumerator::Current::get()
+ {
+ if (_current == NULL)
+ return nullptr;
+ return static_cast<BodyNativeInfo*>( NewtonBodyGetUserData( _current ) )->managedBody;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2009-03-26 11:08:53
|
Revision: 255
http://mogre.svn.sourceforge.net/mogre/?rev=255&view=rev
Author: realgantz
Date: 2009-03-26 11:08:42 +0000 (Thu, 26 Mar 2009)
Log Message:
-----------
- upgrade to newton 2.0
- still a warning at compilation time on jointdestructor function: http://msdn.microsoft.com/en-us/library/0wb44ssy.aspx
- vehicule and tire class not working atm due to change on newton
- adding files OgreNewt_CollisionSerializer.h and .cpp
- removing treecollision serializer files due to deletion of the associated newton functions
- Body class : removing freeze() UnFreeze() function with a boolean property IsAsleep to reflect change on newton
Modified Paths:
--------------
trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_BasicJoints.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_BodyIterator.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Collision.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionPrimitives.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Joint.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_MaterialPair.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_RayCast.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Tools.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Vehicle.h
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_BasicJoints.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Body.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Collision.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionPrimitives.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_ContactCallback.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Debugger.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Joint.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_MaterialPair.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_RayCast.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Tools.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_Vehicle.cpp
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_World.cpp
trunk/MogreNewt/Samples/Basics/Basics.cs
Added Paths:
-----------
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionSerializer.h
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_CollisionSerializer.cpp
Removed Paths:
-------------
trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_TreeCollisionSerializer.h
trunk/MogreNewt/MogreNewt_Main/src/OgreNewt_TreeCollisionSerializer.cpp
Modified: trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/MogreNewt_Main.vcproj 2009-03-26 11:08:42 UTC (rev 255)
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".\inc;"C:\Program Files (x86)\NewtonSDK\sdk";..\..\Mogre\ogrenew\OgreMain\include"
+ AdditionalIncludeDirectories=".\inc;"C:\devel\Gamedevel (x86)\NewtonWin-2.00\sdk";..\..\Mogre\ogrenew\OgreMain\include"
AdditionalUsingDirectories="..\..\Mogre\bin\$(ConfigurationName)"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_OGRENEWT_DYNAMIC;_OGRENEWT_EXPORTS"
BasicRuntimeChecks="0"
@@ -66,7 +66,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="OgreMain.lib newton.lib"
- AdditionalLibraryDirectories="..\..\Mogre\ogrenew\lib;"C:\Program Files (x86)\NewtonSDK\sdk\dll""
+ AdditionalLibraryDirectories="..\..\Mogre\ogrenew\lib;"C:\devel\Gamedevel (x86)\NewtonWin-2.00\sdk\dll""
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
@@ -176,6 +176,11 @@
</Configuration>
</Configurations>
<References>
+ <AssemblyReference
+ RelativePath="..\..\Mogre\bin\Release\Mogre.dll"
+ AssemblyName="Mogre, Version=1.4.8.0, processorArchitecture=x86"
+ MinFrameworkVersion="131072"
+ />
</References>
<Files>
<Filter
@@ -200,6 +205,10 @@
>
</File>
<File
+ RelativePath=".\src\OgreNewt_CollisionSerializer.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\OgreNewt_ContactCallback.cpp"
>
</File>
@@ -228,10 +237,6 @@
>
</File>
<File
- RelativePath=".\src\OgreNewt_TreeCollisionSerializer.cpp"
- >
- </File>
- <File
RelativePath=".\src\OgreNewt_Vehicle.cpp"
>
</File>
@@ -270,6 +275,10 @@
>
</File>
<File
+ RelativePath=".\inc\OgreNewt_CollisionSerializer.h"
+ >
+ </File>
+ <File
RelativePath=".\inc\OgreNewt_ContactCallback.h"
>
</File>
@@ -306,10 +315,6 @@
>
</File>
<File
- RelativePath=".\inc\OgreNewt_TreeCollisionSerializer.h"
- >
- </File>
- <File
RelativePath=".\inc\OgreNewt_Vehicle.h"
>
</File>
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -9,9 +9,9 @@
main header file.
- current version: 0.10
+ current version: 0.30
- Newton version: 1.53
+ Newton version: 2.0
Ogre version: Eihort (1.4.x)
@@ -25,7 +25,6 @@
#include "OgreNewt_Collision.h"
#include "OgreNewt_Body.h"
#include "OgreNewt_CollisionPrimitives.h"
-#include "OgreNewt_TreeCollisionSerializer.h"
#include "OgreNewt_MaterialID.h"
#include "OgreNewt_MaterialPair.h"
#include "OgreNewt_ContactCallback.h"
@@ -41,22 +40,33 @@
#include "OgreNewt_BasicFrameListener.h"
-/*! \mainpage OgreNewt Library version 0.11
+/*! \mainpage OgreNewt Library version 0.3
- \section into_sec Introduction
+ \section intro_sec Introduction
OgreNewt is an OOP wrapper for integrating the Newton Dynamics Physics SDK with OGRE.
\section new New in this Version
New in this version!
+ - updated to Newton version 2.0!! Many big improvements and changes to the library, and OgreNewt now supports it.
+ - several interface-breaking changes:
+ - ContactCallback interface has changed greatly, see contact demo (03) for implementation details.
+ - updated to support multithreading support now native to Newton.
+ - Debugger now draws objects color coded based on mass (grey = static, bright blue = dynamic and awake, dull blue = dynamic and asleep)
+ - Debugger class can now also draw all contacts between bodies as well.
+ - MomentOfInertia namespace and helper functions removed entirely. Newton can now calculate inertia and center of
+ mass automatically, use ConvexCollision::calculateInertialMatrix, and multiply by objects Mass.
+ - Body::attachToNode has been renamed to attachNode, better implying the relationship between the body and the Ogre::Node.
+ - BodyIterator class has been upgraded to use boost::function, allowing the same callback flexibility as other callbacks.
+ - demos updated.
+
+ previous changes...
- bug fix - fixed problem with TreeCollisionSceneParser that wasn't adjusting to different scales properly.
- optimization - fixed several classes to only write debug data to the LOG when compiled in DEBUG mode:
- Custom2DJonit
- BasicFrameListener
- added the concept of "face-winding" to all TreeCollision classes. should not cause any breaking changes to code, but allows more flexibility to change the "direction" of a face in treecollisions.
-
- previous changes...
- OgreNewt and it's demos are now fully compatible with Ogre 1.4.x (Eihort).
- Addition of script files for compiling under linux (Scons)
- slight modification to the ContactCallback class to allow access to Newton structures from the outside.
@@ -78,7 +88,7 @@
- added several prebuilt custom joints, including pulleys and gears, and a general 2D joint.
- added calculateInertialMatrix to ConvexCollision class.
- added set/getCenterOfMass to Body class
- - changed angle-related functions in BasicJoint classes to use Ogre::Radian instead of Mogre::Real.
+ - changed angle-related functions in BasicJoint classes to use Ogre::Radian instead of Ogre::Real.
- added ConvexModifierCollision class, which allows for arbitrarily scaled collision primitives.
- added several low-level collision functions, see the CollisionTools namespace.
- fixed errors causing run-time crash on Slider and Universal joints.
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_BasicJoints.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_BasicJoints.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_BasicJoints.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -404,7 +404,7 @@
~Custom2DJoint() {}
//! overloaded function that applies the actual constraint.
- virtual void SubmitConstraint() override;
+ virtual void SubmitConstraint(Mogre::Real timeStep, int threadIndex) override;
//! get the current angle of the joint.
property Mogre::Radian Angle { Mogre::Radian get() { return mAngle; } }
@@ -455,7 +455,7 @@
CustomRigidJoint( MogreNewt::Body^ child, MogreNewt::Body^ parent, Mogre::Vector3 dir, Mogre::Vector3 pos);
~CustomRigidJoint();
- virtual void SubmitConstraint() override;
+ virtual void SubmitConstraint(Mogre::Real timeStep, int threadIndex) override;
private:
Mogre::Vector3 mLocalPos0;
@@ -470,62 +470,64 @@
/*!
This joint implements a pulley system. note that this joint only works with 2 bodies attached!
*/
- public ref class CustomPulleyJoint : public MogreNewt::CustomJoint
- {
- public:
- //! constructor
- /*!
- \param gearRatio float value representing the ratio of movement between parent and child.
- \param parent pointer to MogreNewt::Body to be the parent body.
- \param child pointer to the MogreNewt::Body to be the child body.
- \param parentPin direction vector for movement of parent.
- \param childPin direction vector for movement of child.
- */
- CustomPulleyJoint( Mogre::Real gearRatio, Body^ parent, Body^ child, const Mogre::Vector3 parentPin, const Mogre::Vector3 childPin );
- ~CustomPulleyJoint() {}
- //! overloaded function to submit the constraint.
- virtual void SubmitConstraint() override;
+ //
+ //public ref class CustomPulleyJoint : public MogreNewt::CustomJoint
+ //{
+ //public:
+ // //! constructor
+ // /*!
+ // \param gearRatio float value representing the ratio of movement between parent and child.
+ // \param parent pointer to MogreNewt::Body to be the parent body.
+ // \param child pointer to the MogreNewt::Body to be the child body.
+ // \param parentPin direction vector for movement of parent.
+ // \param childPin direction vector for movement of child.
+ // */
+ // CustomPulleyJoint( Mogre::Real gearRatio, Body^ parent, Body^ child, const Mogre::Vector3 parentPin, const Mogre::Vector3 childPin );
+ // ~CustomPulleyJoint() {}
- private:
- Mogre::Real mGearRatio;
+ // //! overloaded function to submit the constraint.
+ // virtual void SubmitConstraint(Mogre::Real timeStep, int threadIndex) override;
- Mogre::Vector3 mLocalPos0, mLocalPos1;
- Mogre::Quaternion mLocalOrient0, mLocalOrient1;
- };
+ //private:
+ // Mogre::Real mGearRatio;
+ // Mogre::Vector3 mLocalPos0, mLocalPos1;
+ // Mogre::Quaternion mLocalOrient0, mLocalOrient1;
+ //};
- //! CustomGearJoint
- /*!
- This class works like 2 gears that mesh, retaining a specific ration between the rotational velocity of the bodies.
- The gears don't have to rotate around the same axis, that is why 2 pins are supplied.
- */
- public ref class CustomGearJoint : public MogreNewt::CustomJoint
- {
- public:
- /*!
- \param gearRatio float value representing the ratio of movement between parent and child.
- \param parent pointer to MogreNewt::Body to be the parent body.
- \param child pointer to the MogreNewt::Body to be the child body.
- \param parentPin pin around which the parent's rotation should be tracked.
- \param childPin pin around which the child's rotation should be tracked.
- */
- CustomGearJoint( Mogre::Real gearRatio, Body^ parent, Body^ child, const Mogre::Vector3 parentPin, const Mogre::Vector3 childPin );
- ~CustomGearJoint() {}
- //! overloaded function to submit the constraint.
- virtual void SubmitConstraint() override;
+ ////! CustomGearJoint
+ ///*!
+ // This class works like 2 gears that mesh, retaining a specific ration between the rotational velocity of the bodies.
+ // The gears don't have to rotate around the same axis, that is why 2 pins are supplied.
+ //*/
+ //public ref class CustomGearJoint : public MogreNewt::CustomJoint
+ //{
+ //public:
+ // /*!
+ // \param gearRatio float value representing the ratio of movement between parent and child.
+ // \param parent pointer to MogreNewt::Body to be the parent body.
+ // \param child pointer to the MogreNewt::Body to be the child body.
+ // \param parentPin pin around which the parent's rotation should be tracked.
+ // \param childPin pin around which the child's rotation should be tracked.
+ // */
+ // CustomGearJoint( Mogre::Real gearRatio, Body^ parent, Body^ child, const Mogre::Vector3 parentPin, const Mogre::Vector3 childPin );
+ // ~CustomGearJoint() {}
- private:
- Mogre::Real mGearRatio;
+ // //! overloaded function to submit the constraint.
+ // virtual void SubmitConstraint(Mogre::Real timeStep, int threadIndex) override;
- Mogre::Vector3 mLocalPos0, mLocalPos1;
- Mogre::Quaternion mLocalOrient0, mLocalOrient1;
- };
+ //private:
+ // Mogre::Real mGearRatio;
+ // Mogre::Vector3 mLocalPos0, mLocalPos1;
+ // Mogre::Quaternion mLocalOrient0, mLocalOrient1;
+ //};
+
} // end NAMESPACE PrebuiltCustomJoints
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Body.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -33,9 +33,9 @@
ref class Body;
class BodyNativeInfo;
-public delegate void ForceCallbackHandler( MogreNewt::Body^ body );
-public delegate void TransformEventHandler( MogreNewt::Body^ sender, Mogre::Quaternion orientation, Mogre::Vector3 position );
-public delegate bool BuoyancyPlaneCallbackHandler( int collistionID, MogreNewt::Body^ body, Mogre::Quaternion orientation, Mogre::Vector3 position, Mogre::Plane% retPlane );
+public delegate void ForceCallbackHandler( MogreNewt::Body^ body ,float timeStep, int threadIndex);
+public delegate void TransformEventHandler( MogreNewt::Body^ sender, Mogre::Quaternion orientation, Mogre::Vector3 position ,int threadIndex);
+public delegate bool BuoyancyPlaneCallbackHandler( int collisionID, MogreNewt::Body^ body, Mogre::Quaternion orientation, Mogre::Vector3 position, Mogre::Plane% retPlane );
public delegate void AutoactivateEventHandler( MogreNewt::Body^ sender, unsigned int state );
@@ -65,10 +65,10 @@
void remove(ForceCallbackHandler^ hnd);
private:
- void raise( MogreNewt::Body^ body )
+ void raise( MogreNewt::Body^ body ,float timeStep, int threadIndex)
{
if (m_forceCallback)
- m_forceCallback->Invoke( body );
+ m_forceCallback->Invoke( body,timeStep,threadIndex );
}
}
@@ -86,10 +86,10 @@
void remove(TransformEventHandler^ hnd);
private:
- void raise( MogreNewt::Body^ sender, Mogre::Quaternion orientation, Mogre::Vector3 position )
+ void raise( MogreNewt::Body^ sender, Mogre::Quaternion orientation, Mogre::Vector3 position ,int threadIndex)
{
if (m_transformed)
- m_transformed->Invoke( sender, orientation, position );
+ m_transformed->Invoke( sender, orientation, position,threadIndex );
}
}
@@ -105,24 +105,6 @@
*/
- //! auto activate / deactivate callback
- /*!
- This function is called whenever Newton automatically activates or deactivates an object. the unsigned int passed is to
- inform you if the object is about to "fall asleep", or "wake up".
- */
- event AutoactivateEventHandler^ Autoactivated
- {
- void add(AutoactivateEventHandler^ hnd);
- void remove(AutoactivateEventHandler^ hnd);
-
- private:
- void raise( MogreNewt::Body^ sender, unsigned int state )
- {
- if (m_autoactivated)
- m_autoactivated->Invoke( sender, state );
- }
- }
-
property bool IsGravityEnabled
{
bool get() { return m_gravityEnabled; }
@@ -187,7 +169,7 @@
/*!
This is an easy way to connect a Rigid Body with an Ogre::Node. this automatically sets up a standard Transform callback when you call this. after calling this, the Ogre::Node will have its position orientation updated to that of the Rigid Body each time you call World::update(), and the body has moved during the update.
*/
- void AttachToNode( Mogre::Node^ node );
+ void AttachNode( Mogre::Node^ node );
//! position and orient the body arbitrarily.
/*!
@@ -210,25 +192,12 @@
Set a new center of mass for the body that is different than the current, without offsetting the body.
You can use this to adjust the center of mass of a body at runtime.
*/
- property Mogre::Vector3 CenterOfMass
- {
- Mogre::Vector3 get();
- void set(const Mogre::Vector3 centerOfMass) { NewtonBodySetCentreOfMass( m_body, ¢erOfMass.x ); }
- }
+ property Mogre::Vector3 CenterOfMass
+ {
+ Mogre::Vector3 get();
+ void set(const Mogre::Vector3 centerOfMass) { NewtonBodySetCentreOfMass( m_body, ¢erOfMass.x ); }
+ }
- //! freeze the rigid body.
- /*!
- this command "freezes" the Rigid Body, removing it from the active simulation list. it will "unfreeze" if another body comes in contact with it, or you "unfreeze" it.
- \sa unFreeze()
- */
- void Freeze() { NewtonWorldFreezeBody( m_world->NewtonWorld, m_body ); }
-
- //! unfreeze the rigid body.
- /*!
- \sa freeze()
- */
- void UnFreeze() { NewtonWorldUnfreezeBody( m_world->NewtonWorld, m_body ); }
-
//! get/set the material for the body
/*!
Materials are an extremely powerful way to control body behavior. first create a new MaterialID object, and then pass a pointer
@@ -236,11 +205,11 @@
\param ID pointer to an MogreNewt::MaterialID object to use as the material for the body.
*/
property MaterialID^ MaterialGroupID
- {
- MaterialID^ get() { return m_matid; }
- void set( MaterialID^ ID ) { m_matid = ID; NewtonBodySetMaterialGroupID( m_body, m_matid->ID ); }
- }
-
+ {
+ MaterialID^ get() { return m_matid; }
+ void set( MaterialID^ ID ) { m_matid = ID; NewtonBodySetMaterialGroupID( m_body, m_matid->ID ); }
+ }
+
//! prevents fast moving bodies from "tunneling" through other bodies.
/*!
continuous collision is an advanced feature that prevents fast moving bodies from "tunneling" (missing collision) with other bodies. there
@@ -305,49 +274,53 @@
//! get/set the angular damping for the body.
property Mogre::Vector3 AngularDamping
{
- Mogre::Vector3 get();
- void set( const Mogre::Vector3 damp ) { NewtonBodySetAngularDamping( m_body, &damp.x ); }
+ Mogre::Vector3 get();
+ void set( const Mogre::Vector3 damp ) { NewtonBodySetAngularDamping( m_body, &damp.x ); }
}
- //! set the Coriolos Forces mode for the body.
- void SetCoriolisForcesMode( int mode ) { NewtonBodyCoriolisForcesMode( m_body, mode ); }
//! get/set the collision that represents the shape of the body
/*!
This can be used to change the collision shape of a body mid-simulation. for example making the collision for a character smaller when crouching, etc.
\param col pointer to the new MogreNewt::Collision shape.
*/
- property MogreNewt::Collision^ Collision
- {
- MogreNewt::Collision^ get();
- void set( MogreNewt::Collision^ col );
- }
+ property MogreNewt::Collision^ Collision
+ {
+ MogreNewt::Collision^ get();
+ void set( MogreNewt::Collision^ col );
+ }
- //! set whether the body should "freeze" when equilibruim is reached.
- /*!
- user-controlled bodies should disable freezing, because frozen bodies' callbacks are not called... so a callback that implements motion based on user input will not be called!
- */
- property bool AutoFreeze
- {
- bool get() { return NewtonBodyGetAutoFreeze(m_body) == 1; }
- void set( bool flag ) { NewtonBodySetAutoFreeze ( m_body, flag ? 1 : 0 ); }
- }
+ //! set whether the body should "freeze" when equilibruim is reached.
+ /*!
+ user-controlled bodies should disable freezing, because frozen bodies' callbacks are not called... so a callback that implements motion based on user input will not be called!
+ */
+ property bool AutoSleep
+ {
+ bool get() { return NewtonBodyGetAutoSleep(m_body) == 1; }
+ void set( bool flag ) { NewtonBodySetAutoSleep ( m_body, flag ? 1 : 0 ); }
+ }
+
+ property bool IsAsleep
+ {
+ bool get() { return NewtonBodyGetFreezeState( m_body ) == 1;}
+ void set(bool flag) { NewtonBodySetFreezeState(m_body, flag ? 1:0); }
+ }
- //! set the factors that cause a body to "freeze" when equilibrium reached.
- void SetFreezeThreshold( Mogre::Real speed, Mogre::Real omega, int framecount ) { NewtonBodySetFreezeTreshold( m_body, (float)speed, (float)omega, framecount ); }
- property Mogre::Vector3 Position { Mogre::Vector3 get(); }
+ property Mogre::Vector3 Position { Mogre::Vector3 get(); }
- property Mogre::Quaternion Orientation { Mogre::Quaternion get(); }
+ property Mogre::Quaternion Orientation { Mogre::Quaternion get(); }
- property Mogre::Real Mass { Mogre::Real get(); }
+ property Mogre::AxisAlignedBox^ BoundingBox { Mogre::AxisAlignedBox^ get(); }
- property Mogre::Vector3 Intertia { Mogre::Vector3 get(); }
+ property Mogre::Real Mass { Mogre::Real get(); }
- property Mogre::Real InvertMass { Mogre::Real get(); }
+ property Mogre::Vector3 Intertia { Mogre::Vector3 get(); }
- property Mogre::Vector3 InvertIntertia { Mogre::Vector3 get(); }
+ property Mogre::Real InvertMass { Mogre::Real get(); }
+ property Mogre::Vector3 InvertIntertia { Mogre::Vector3 get(); }
+
//! get position and orientation in form of an Ogre::Vector(position) and Ogre::Quaternion(orientation)
void GetPositionOrientation( [Out] Mogre::Vector3% pos, [Out] Mogre::Quaternion% orient );
@@ -357,26 +330,8 @@
//! get invert mass + inertia for the body.
void GetInvMass( [Out] Mogre::Real% mass, [Out] Mogre::Vector3% inertia );
- //! get whether the body is frozen or not
- /*!
- returns a value of 0 if the body is frozen.
- returns a value of 1 if the body is active.
- */
- property bool SleepingState
- {
- bool get() { return NewtonBodyGetSleepingState( m_body ) == 0; }
- }
-
- //! get the freeze threshold
- void GetFreezeThreshold( [Out] Mogre::Real% speed, [Out] Mogre::Real% omega )
- {
- pin_ptr<Mogre::Real> p_speed = &speed;
- pin_ptr<Mogre::Real> p_omega = ω
- NewtonBodyGetFreezeTreshold( m_body, p_speed, p_omega );
- }
-
//! add an impulse (relative change in velocity) to a body. values are in world coordinates.
- void AddImpulse( const Mogre::Vector3 deltav, const Mogre::Vector3 posit ) { NewtonAddBodyImpulse( m_body, &deltav.x, &posit.x ); }
+ void AddImpulse( const Mogre::Vector3 deltav, const Mogre::Vector3 posit ) { NewtonBodyAddImpulse( m_body, &deltav.x, &posit.x ); }
//! add force to the body.
/*!
@@ -390,19 +345,25 @@
*/
void AddTorque( const Mogre::Vector3 torque ) { NewtonBodyAddTorque( m_body, &torque.x ); }
- ////! set the force for a body.
- ///*!
- // this function is only valid inside a ForceCallback function!
- //*/
- //void SetForce( const Mogre::Vector3 force ) { NewtonBodySetForce( m_body, &force.x ); }
+ //! get the force acting on the body.
+ property Mogre::Vector3 ForceAcceleration { Mogre::Vector3 get(); }
+ property Mogre::Vector3 TorqueAcceleration { Mogre::Vector3 get(); }
- ////! set the torque for a body.
- ///*!
- // this function is only valid inside a ForceCallback function!
- //*/
- //void SetTorque( const Mogre::Vector3 torque ) { NewtonBodySetTorque( m_body, &torque.x ); }
+ //! set the force for a body.
+ /*!
+ this function is only valid inside a ForceCallback function!
+ */
+ void SetForce( const Mogre::Vector3 force ) { NewtonBodySetForce( m_body, &force.x ); }
+
+ //! set the torque for a body.
+ /*!
+ this function is only valid inside a ForceCallback function!
+ */
+ void SetTorque( const Mogre::Vector3 torque ) { NewtonBodySetTorque( m_body, &torque.x ); }
+
+
//! apply a buoyancy force to the body.
/*!
buoyancy is one of the more powerful and overlooked features of the Newton physics system. you can of course
@@ -435,7 +396,6 @@
static void ApplyGravityForce( Body^ body );
-
protected:
@@ -445,8 +405,8 @@
BodyNativeInfo* m_nativeInfo;
bool m_gravityEnabled;
- ::NewtonBody* m_body;
- MogreNewt::Collision^ m_collision;
+ ::NewtonBody* m_body;
+ MogreNewt::Collision^ m_collision;
MogreNewt::MaterialID^ m_matid;
MogreNewt::World^ m_world;
@@ -468,39 +428,33 @@
delegate void NewtonBodyDestructorDelegate( const ::NewtonBody* body );
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate void NewtonForceCallbackDelegate( const ::NewtonBody* body );
+ delegate void NewtonForceCallbackDelegate( const ::NewtonBody* body , float timeStep, int threadIndex);
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate void NewtonTransformCallbackDelegate( const ::NewtonBody* body, const float* matrix );
+ delegate void NewtonTransformCallbackDelegate( const ::NewtonBody* body, const float* matrix ,int threadIndex);
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
delegate int NewtonBuoyancyPlaneCallbackDelegate( const int collisionID, void* context, const float* globalSpaceMatrix, float* globalSpacePlane );
- [UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate void NewtonAutoactiveCallbackDelegate( const ::NewtonBody* body, unsigned state );
NewtonBodyDestructorDelegate^ m_NewtonBodyDestructorDelegate;
NewtonForceCallbackDelegate^ m_NewtonForceCallbackDelegate;
NewtonTransformCallbackDelegate^ m_NewtonTransformCallbackDelegate;
NewtonBuoyancyPlaneCallbackDelegate^ m_NewtonBuoyancyPlaneCallbackDelegate;
- NewtonAutoactiveCallbackDelegate^ m_NewtonAutoactiveCallbackDelegate;
NewtonBodyDestructor m_funcptr_destructor;
NewtonApplyForceAndTorque m_funcptr_forcecallback;
NewtonSetTransform m_funcptr_transformcallback;
NewtonGetBuoyancyPlane m_funcptr_buoyancycallback;
- NewtonBodyActivationState m_funcptr_autoactivecallback;
void _ctor(MogreNewt::World^ W, MogreNewt::Collision^ col, int bodytype, bool enableGravity);
void NewtonDestructor( const ::NewtonBody* body );
- void NewtonTransformCallback( const ::NewtonBody* body, const float* matrix );
- void NewtonForceTorqueCallback( const ::NewtonBody* body );
+ void NewtonTransformCallback( const ::NewtonBody* body, const float* matrix,int threadIndex );
+ void NewtonForceTorqueCallback( const ::NewtonBody* body,float timeStep, int threadIndex );
int NewtonBuoyancyCallback( const int collisionID, void* context, const float* globalSpaceMatrix, float* globalSpacePlane );
-
- void NewtonAutoactiveCallback(const ::NewtonBody* body, unsigned state);
};
@@ -527,10 +481,10 @@
//Add standard callbacks as native code for better performance
// standard gravity force callback.
-void _CDECL Body_standardForceCallback( const NewtonBody* body );
+void _CDECL Body_standardForceCallback( const NewtonBody* body ,float timestep, int threadIndex);
// standard transform callback.
-void _CDECL Body_standardTransformCallback( const NewtonBody* body, const float* matrix );
+void _CDECL Body_standardTransformCallback( const NewtonBody* body, const float* matrix , int threadIndex );
#pragma managed(pop)
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_BodyIterator.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_BodyIterator.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_BodyIterator.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -25,11 +25,41 @@
//! function to be called for all bodies
/*!
- This function will be called for every body in the world. you can put any functionality you might want inside this function.
+ This function will be called for every body iterated. you can put any functionality you might want inside this function.
*/
-public delegate void IteratorCallback( Body^ body );
+public delegate void IteratorCallbackHandler( MogreNewt::Body^ body );
+public delegate void GoEventHandler( MogreNewt::World^ sender, MogreNewt::Body^ body );
+event IteratorCallbackHandler^ IteratorCallback
+ {
+ void add(IteratorCallbackHandler^ hnd);
+ void remove(IteratorCallbackHandler^ hnd);
+
+ private:
+ void raise(MogreNewt::Body^ body )
+ {
+ if (m_callback)
+ m_callback->Invoke(body );
+ }
+ }
+
+event GoEventHandler^ Go
+ {
+ void add(GoEventHandler^ hnd);
+ void remove(GoEventHandler^ hnd);
+
+ private:
+ void raise( World^ sender, MogreNewt::Body^ body )
+ {
+ if (m_callbackgo)
+ m_callbackgo->Invoke( sender, body );
+ }
+ }
+
+
+
+
//! Iterate through all bodies in the world.
/*!
this class is an easy way to loop through all bodies in the world, performing some kind of action.
@@ -42,18 +72,24 @@
This function must be called before any iterator functions are called!
\param world pointer to the MogreNewt::World.
*/
- void Init( MogreNewt::World^ world ) { m_world = world; }
+ //void Init( MogreNewt::World^ world ) { m_world = world; }
//! perform an iteration
/*!
will call the provided function for all bodies in the world.
\param callback pointer to a function to be used
*/
- void Go( IteratorCallback^ callback )
+ void Go( World* w, IteratorCallback^ callback )
{
- m_callback = callback;
+ //m_callback = callback;
+ for (NewtonBody* b = NewtonWorldGetFirstBody( w->getNewtonWorld() );
+ b ;
+ b = NewtonWorldGetNextBody( w->getNewtonWorld(), b ) )
+ {
+ Body* body = (Body*)NewtonBodyGetUserData(b);
+ callback( static_cast<BodyNativeInfo*>( body )->managedBody );
+ }
- NewtonWorldForEachBodyDo( m_world->getNewtonWorld(), BodyIterator_newtonIterator );
}
//! get the singleton.
@@ -77,22 +113,23 @@
m_callback = nullptr;
}
- MogreNewt::World^ m_world;
- IteratorCallback^ m_callback;
+ MogreNewt::World^ m_world;
+ IteratorCallbackHandler^ m_callback;
+ GoEventHandler^ m_callbackgo;
BodyIterator^ instance = gcnew BodyIterator;
};
-
+/*
void _CDECL BodyIterator_newtonIterator( const NewtonBody* body )
{
MogreNewt::Body^ bod = static_cast<BodyNativeInfo*>( NewtonBodyGetUserData( body ) )->managedBody;
BodyIterator::instance::.m_callback( bod );
}
+*/
-
} // end namespace MogreNewt
#endif // _INCLUDE_OGRENEWT_BODYITERATOR
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Collision.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Collision.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Collision.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -13,11 +13,28 @@
#include <Newton.h>
#include "OgreNewt_World.h"
+#include "OgreNewt_CollisionSerializer.h"
// OgreNewt namespace. all functions and classes use this namespace.
namespace MogreNewt
{
+ enum class CollisionPrimitive
+ {
+ BoxPrimitive = SERIALIZE_ID_BOX,
+ ConePrimitive = SERIALIZE_ID_CONE,
+ EllipsoidPrimitive = SERIALIZE_ID_SPHERE,
+ CapsulePrimitive = SERIALIZE_ID_CAPSULE,
+ CylinderPrimitive = SERIALIZE_ID_CYLINDER,
+ CompoundCollisionPrimitive = SERIALIZE_ID_COMPOUND,
+ ConvexHullPrimitive = SERIALIZE_ID_CONVEXHULL,
+ ConvexHullModifierPrimitive = SERIALIZE_ID_CONVEXMODIFIER,
+ ChamferCylinderPrimitive = SERIALIZE_ID_CHAMFERCYLINDER,
+ TreeCollisionPrimitive = SERIALIZE_ID_TREE,
+ NullPrimitive = SERIALIZE_ID_NULL,
+ HeighFieldPrimitive = SERIALIZE_ID_HEIGHTFIELD,
+ ScenePrimitive = SERIALIZE_ID_SCENE
+ };
/*
CLASS DEFINITION:
@@ -65,10 +82,13 @@
*/
property unsigned UserID
{
- unsigned get() { return NewtonConvexCollisionGetUserID( m_col ); }
- void set( unsigned id ) { NewtonConvexCollisionSetUserID( m_col, id); }
+ unsigned get() { return NewtonCollisionGetUserID( m_col ); }
+ void set( unsigned id ) { NewtonCollisionSetUserID( m_col, id); }
}
+ //! make unique
+ void MakeUnique() { NewtonCollisionMakeUnique( m_world->NewtonWorld, m_col ); }
+
//! get user ID, for collision callback identification
@@ -87,6 +107,19 @@
Mogre::AxisAlignedBox^ get() { return GetAABB( Mogre::Quaternion::IDENTITY, Mogre::Vector3::ZERO ); }
}
+ property CollisionPrimitive CollisionPrimitiveType
+ {
+ CollisionPrimitive get() { return GetCollisionPrimitiveType(this);}
+ }
+
+ //! Returns the Collisiontype for the given Newton-Collision
+ CollisionPrimitive GetCollisionPrimitiveType(Collision^ col);
+
+ //! friend functions for the Serializer
+ //friend void CollisionSerializer::exportCollision(Collision^ collision, const Ogre::String& filename);
+ //friend void CollisionSerializer::importCollision(Ogre::DataStreamPtr& stream, Collision* pDest);
+
+
protected public:
::NewtonCollision* m_col;
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionPrimitives.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionPrimitives.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionPrimitives.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -14,7 +14,6 @@
#include <Newton.h>
#include "OgreNewt_World.h"
#include "OgreNewt_Collision.h"
-#include "OgreNewt_TreeCollisionSerializer.h"
// OgreNewt namespace. all functions and classes use this namespace.
namespace MogreNewt
Added: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionSerializer.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionSerializer.h (rev 0)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_CollisionSerializer.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -0,0 +1,77 @@
+/*
+OgreNewt Library
+
+Ogre implementation of Newton Game Dynamics SDK
+
+OgreNewt basically has no license, you may use any or all of the library however you desire... I hope it can help you in any way.
+
+by Walaber
+
+*/
+#ifndef _INCLUDE_OGRENEWT_COLLISIONSERIALIZER
+#define _INCLUDE_OGRENEWT_COLLISIONSERIALIZER
+
+#include <Newton.h>
+#include "OgreNewt_World.h"
+#include "OgreSerializer.h"
+#include "OgreString.h"
+
+// OgreNewt namespace. all functions and classes use this namespace.
+namespace MogreNewt
+{
+ ref class Collision;
+
+ /*!
+ This class can be used to (de)serialize a TreeCollision. Pre-building a TreeCollision and serializing from a tool,
+ then deserializing it at runtime may be more efficient than building the TreeCollision on the fly, especially for complex objects.
+ */
+ public ref class CollisionSerializer
+ {
+ public:
+
+ //! constructor
+ CollisionSerializer();
+
+ /*!
+ Serialize the TreeCollision to a Stream.
+ */
+ void ExportCollision(Collision^ collision, IO::Stream^ stream);
+
+ /*!
+ Deserialize the TreeCollision from a Stream.
+ */
+ void ImportCollision(IO::Stream^ stream, Collision^ pDest);
+
+ private:
+
+ IO::Stream^ m_stream;
+
+ [UnmanagedFunctionPointer(CallingConvention::Cdecl)]
+ delegate void NewtonSerializeDelegate( void* handle, void* buffer, size_t size );
+
+ NewtonSerializeDelegate^ m_SerializeDelegate;
+ NewtonSerializeDelegate^ m_DeserializeDelegate;
+
+ NewtonSerialize m_funcptr_newtonSerialize;
+ NewtonDeserialize m_funcptr_newtonDeserialize;
+
+ /*!
+ Callback function for Newton. It should never be called directly, but will be called by Newton to save the TreeCollision to a stream.
+ (Newton calls this function several times for each serialization, once for each chunk of its file format apparently)
+ */
+ void _newtonSerializeCallback(void* serializeHandle, void* buffer, size_t size);
+
+ /*!
+ Callback function for Newton. It should never be called directly, but will be called by Newton to load the TreeCollision from a stream.
+ (Newton calls this function several times for each deserialization, once for each chunk of its file format apparently)
+ */
+ void _newtonDeserializeCallback(void* deserializeHandle, void* buffer, size_t size);
+ };
+
+
+} // end namespace MogreNewt
+
+#endif
+// _INCLUDE_OGRENEWT_TREECOLLISIONSERIALIZER
+
+
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_ContactCallback.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -19,74 +19,60 @@
{
-//! custom contact behavior
-/*!
- this class is for creating custom behavior between material GroupIDs.
- this class must be inherited, and the user functions created, and then
- added to a MaterialPair class.
-*/
-public ref class ContactCallback
+
+public ref class Contact
{
-public:
+ public:
+ //! user should never call constructor directly, always use the provided ContactIterator class.
+ Contact( NewtonJoint* contactjoint, void* contact);
+
+ //! disable the current contact.
+ void RemoveContact() { NewtonContactJointRemoveContact( m_contactjoint, m_contact ); }
- //! constructor
- ContactCallback();
-
- // basic contact control commands...
-
- //! disable the current contact.
- void DisableContact() { NewtonMaterialDisableContact( m_material ); }
-
- //! get the current physics timestep
- property Mogre::Real CurrentTimestep { Mogre::Real get() { return (Mogre::Real)NewtonMaterialGetCurrentTimestep( m_material ); } }
-
//! get the face ID of a TreeCollision object
- property unsigned ContactFaceAttribute { unsigned get() { return NewtonMaterialGetContactFaceAttribute( m_material ); } }
+ property unsigned ContactFaceAttribute { unsigned get() { return NewtonMaterialGetContactFaceAttribute( m_material ); } }
//! get the Collision ID of a body currently colliding
unsigned GetBodyCollisionID( MogreNewt::Body^ body ) { return NewtonMaterialGetBodyCollisionID( m_material, body->NewtonBody ); }
//! speed of the collision
- property Mogre::Real ContactNormalSpeed { Mogre::Real get() { return (Mogre::Real)NewtonMaterialGetContactNormalSpeed( m_material, m_contact ); } }
+ property Mogre::Real ContactNormalSpeed { Mogre::Real get() { return (Mogre::Real)NewtonMaterialGetContactNormalSpeed( m_material ); } }
+
//! force of the collision
/*!
only valid for objects in a stable state (sitting on top of each other, etc)
*/
- property Mogre::Vector3 ContactForce { Mogre::Vector3 get(); }
+ property Mogre::Vector3 ContactForce { Mogre::Vector3 get(); }
- property Mogre::Vector3 ContactPosition { Mogre::Vector3 get(); }
+ property Mogre::Vector3 ContactPosition { Mogre::Vector3 get(); }
- property Mogre::Vector3 ContactNormal { Mogre::Vector3 get(); }
+ property Mogre::Vector3 ContactNormal { Mogre::Vector3 get(); }
- property Mogre::Vector3 ContactFirstTangent { Mogre::Vector3 get(); }
+ property Mogre::Vector3 ContactFirstTangent { Mogre::Vector3 get(); }
- property Mogre::Vector3 ContactSecondTangent { Mogre::Vector3 get(); }
+ property Mogre::Vector3 ContactSecondTangent { Mogre::Vector3 get(); }
- //! get positoin and normal of the collision
- void GetContactPositionAndNormal( [Out] Mogre::Vector3% pos, [Out] Mogre::Vector3% norm );
+ //! get the tangent vectors of the collision
+ void GetContactTangentDirections( [Out] Mogre::Vector3% dir0, [Out] Mogre::Vector3% dir1 );
- //! get the tangent vectors of the collision
- void GetContactTangentDirections( [Out] Mogre::Vector3% dir0, [Out] Mogre::Vector3% dir1 );
+ //! get tangent speed of the collision
+ Mogre::Real GetContactTangentSpeed( int index ) { return (Mogre::Real)NewtonMaterialGetContactTangentSpeed( m_material, index ); }
- //! get tangent speed of the collision
- Mogre::Real GetContactTangentSpeed( int index ) { return (Mogre::Real)NewtonMaterialGetContactTangentSpeed( m_material, m_contact, index ); }
- //! set softness of the current contact
+ //! set softness of the current contact
void SetContactSoftness( Mogre::Real softness ) { NewtonMaterialSetContactSoftness( m_material, (float)softness ); }
//! set elasticity of the current contact
void SetContactElasticity( Mogre::Real elasticity ) { NewtonMaterialSetContactElasticity( m_material, (float)elasticity ); }
+
//! set friction state of current contact
void SetContactFrictionState( int state, int index ) { NewtonMaterialSetContactFrictionState( m_material, state, index ); }
//! set static friction for current contact
- void SetContactStaticFrictionCoef( Mogre::Real coef, int index ) { NewtonMaterialSetContactStaticFrictionCoef( m_material, (float)coef, index ); }
+ void SetContactFrictionCoef( Mogre::Real stat, Mogre::Real kinetic, int index ) { NewtonMaterialSetContactFrictionCoef( m_material, (float)stat, (float)kinetic, index ); }
- //! set kinetic friction for current contact
- void SetContactKineticFrictionCoef( Mogre::Real coef, int index ) { NewtonMaterialSetContactKineticFrictionCoef( m_material, (float)coef, index ); }
-
//! set tangent acceleration for contact
void SetContactTangentAcceleration( Mogre::Real accel, int index ) { NewtonMaterialSetContactTangentAcceleration( m_material, (float)accel, index ); }
@@ -99,8 +85,57 @@
//! manually set the acceleration along the collision normal.
void SetContactNormalAcceleration( Mogre::Real accel ) { NewtonMaterialSetContactNormalAcceleration( m_material, accel ); }
+ //! get positoin and normal of the collision
+ void GetContactPositionAndNormal( [Out] Mogre::Vector3% pos, [Out] Mogre::Vector3% norm );
+private:
+ void* m_contact;
+ NewtonJoint* m_contactjoint;
+ NewtonMaterial* m_material;
+
+};
+
+public ref class ContactIterator
+{
+ public:
+ //! user should never call constructor, it is provided in the userProcess() function directly.
+ ContactIterator( NewtonJoint* contactjoint );
+
+ //! get the current contact.
+ Contact^ GetCurrent();
+
+ //! move to the next contact in the list. returns true if another contact is available, false if no more contacts exist.
+ bool MoveNext();
+
+ //! returns to the first contact in the list.
+ void Reset();
+
+ //! if the contact has more elements.
+ bool HasMoreElements();
+
+ //! returns the total amount of contacts in the list.
+ int GetContactCount() { return NewtonContactJointGetContactCount( m_contactjoint ); }
+
+private:
+ NewtonJoint* m_contactjoint;
+ void* m_currentcontact;
+};
+
+//! custom contact behavior
+/*!
+ this class is for creating custom behavior between material GroupIDs.
+ this class must be inherited, and the user functions created, and then
+ added to a MaterialPair class.
+*/
+public ref class ContactCallback
+{
+public:
+
+ //! constructor
+ ContactCallback();
+
+
// user-defined callback function.
//! user defined Begin function
@@ -110,65 +145,42 @@
can be called yet. they must be called from the userProcess() function.
return 0 to ignore the collision, 1 to allow it.
*/
- virtual int UserBegin() { return 1; }
+ virtual int UserBegin( int threadIndex ) { return 1; }
//! user-defined Process function
/*!
user process function. is called for each contact between the 2 bodies. all member functions are valid from
within this function, and will affect the current contact. return 0 to ignore the collision, 1 to allow it.
*/
- virtual int UserProcess() { return 1; }
+ virtual void UserProcess( ContactIterator^ contactIterator, Mogre::Real timeStep, int threadIndex ) { }
- //! user-defined End function
- /*!
- called after all contacts between the 2 bodies have been processed. no member functions should be called from within this
- function either, as all contacts have been processed at this point.
- */
- virtual void UserEnd() { }
- //! get the NewtonMaterial from this callback.
- NewtonMaterial* _GetNewtonMaterial() { return m_material; }
-
- property NewtonMaterial* _NewtonMaterial { NewtonMaterial* get() { return m_material;} }
+ // basic contact control commands...
- //! get the NewtonContact from this callback.
- NewtonContact* _GetNewtonContact() { return m_contact; }
-
- property NewtonContact* _NewtonContact { NewtonContact* get() { return m_contact;} }
internal:
//! internal function.
- int ContactBegin( const NewtonMaterial* material, const NewtonBody* body0, const NewtonBody* body1 );
+ int ContactBegin( const NewtonMaterial* material, const NewtonBody* body0, const NewtonBody* body1 ,int threadIndex );
//! internal function.
- int ContactProcess( const NewtonMaterial* material, const NewtonContact* contact );
- //! internal function.
- void ContactEnd( const NewtonMaterial* material );
+ void ContactProcess(const NewtonJoint* contact,float timestep, int threadIndex);
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate int NewtonContactBeginDelegate( const NewtonMaterial* material, const NewtonBody* body0, const NewtonBody* body1 );
+ delegate int NewtonContactBeginDelegate( const NewtonMaterial* material, const NewtonBody* body0, const NewtonBody* body1,int threadIndex );
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate int NewtonContactProcessDelegate( const NewtonMaterial* material, const NewtonContact* contact );
+ delegate void NewtonContactProcessDelegate( const NewtonJoint* contact, float timestep, int threadIndex);
- [UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate void NewtonContactEndDelegate( const NewtonMaterial* material );
-
NewtonContactBeginDelegate^ m_NewtonContactBeginDelegate;
NewtonContactProcessDelegate^ m_NewtonContactProcessDelegate;
- NewtonContactEndDelegate^ m_NewtonContactEndDelegate;
- NewtonContactBegin m_funcptr_contactBegin;
- NewtonContactProcess m_funcptr_contactProcess;
- NewtonContactEnd m_funcptr_contactEnd;
+ NewtonOnAABBOverlap m_funcptr_contactBegin;
+ NewtonContactsProcess m_funcptr_contactProcess;
+
protected:
-
- NewtonMaterial* m_material;
- NewtonContact* m_contact;
-
MogreNewt::Body^ m_body0;
MogreNewt::Body^ m_body1;
};
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Debugger.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -55,8 +55,12 @@
Draws the Newton world as 3D lines.
\param world pointer to the MogreNewt::World
*/
- void ShowLines( MogreNewt::World^ world );
+ void ShowLines( MogreNewt::World^ world ){ ShowLines(world,true);}
+ void ShowLines( MogreNewt::World^ world ,bool clearPrevious);
+ void ShowContacts( MogreNewt::World^ world) { ShowContacts(world,false); }
+ void ShowContacts( MogreNewt::World^ world, bool clearPrevious );
+
//! remove lines drawn.
void HideLines();
@@ -64,10 +68,19 @@
Debugger();
private:
+ Ogre::SceneManager* m_smgr;
Ogre::SceneNode* m_debugnode;
- Mogre::MaterialPtr^ m_green;
- Mogre::MaterialPtr^ m_red;
+ Mogre::MaterialPtr^ m_green;
+ Mogre::MaterialPtr^ m_red;
+ Mogre::Real m_contactscale;
+
+ Mogre::ColourValue m_colorstatic;
+ Mogre::ColourValue m_coloractiveawake;
+ Mogre::ColourValue m_coloractiveasleep;
+
+ static Mogre::ColourValue m_currentcolor;
+
static Debugger^ instance = gcnew Debugger;
@@ -79,9 +92,10 @@
Ogre::ManualObject* m_debugger_debuglines;
+Ogre::ColourValue um_currentcolor;
-void _CDECL Debugger_newtonPerBody( const NewtonBody* body );
-void _CDECL Debugger_newtonPerPoly( const NewtonBody* body, int vertexCount, const float* faceVertec, int id );
+void Debugger_newtonPerBody( const NewtonBody* body ,Ogre::ColourValue colorvalue);
+void _CDECL Debugger_newtonPerPoly(void* userData, int vertexCount, const float* faceVertec, int id );
#pragma managed(pop)
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Joint.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Joint.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Joint.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -77,7 +77,7 @@
void Destructor( const NewtonJoint* me );
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate void NewtonJointDestructorDelegate( const ::NewtonJoint* me );
+ delegate void NewtonJointDestructorDelegate( const NewtonJoint* me );
NewtonJointDestructorDelegate^ m_NewtonJointDestructorDelegate;
@@ -103,7 +103,7 @@
CustomJoint( unsigned int maxDOF, Body^ body0, Body^ body1 );
//! must be over-written for a functioning joint.
- virtual void SubmitConstraint() = 0;
+ virtual void SubmitConstraint( Mogre::Real timeStep, int threadIndex ) = 0;
//! find the local orientation and position of the joint with regards to the 2 bodies in the joint.
@@ -160,14 +160,21 @@
private:
//! newton callback. used internally.
- void newtonSubmitConstraint( const NewtonJoint* me );
+ void newtonSubmitConstraint( const NewtonJoint* me,float timeStep, int threadIndex );
+ void newtonGetInfo(const NewtonJoint* me, NewtonJointRecord* info );
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate void NewtonSubmitConstraintDelegate( const NewtonJoint* me );
+ delegate void NewtonSubmitConstraintDelegate( const NewtonJoint* me,float timeStep, int threadIndex );
NewtonSubmitConstraintDelegate^ m_NewtonSubmitConstraintDelegate;
NewtonUserBilateralCallBack m_funcptr_submitConstraint;
+ NewtonUserBilateralGetInfoCallBack m_funcptr_getInfo;
+
+ [UnmanagedFunctionPointer(CallingConvention::Cdecl)]
+ delegate void NewtonGetInfoDelegate( const NewtonJoint* me, NewtonJointRecord* info );
+
+ NewtonGetInfoDelegate^ m_NewtonGetInfoDelegate;
};
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_MaterialPair.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_MaterialPair.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_MaterialPair.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -51,6 +51,10 @@
//! set default collision for the material pair.
void SetDefaultCollidable( int state ) { NewtonMaterialSetDefaultCollidable( m_world->NewtonWorld, id0->ID, id1->ID, state ); }
+ //! set the default thickness for this material pair
+ void SetDefaultSurfaceThickness( float thickness ) { NewtonMaterialSetSurfaceThickness( m_world->NewtonWorld, id0->ID, id1->ID, thickness ); }
+
+
//! set default friction for the material pair.
void SetDefaultFriction( Mogre::Real stat, Mogre::Real kinetic ) { NewtonMaterialSetDefaultFriction( m_world->NewtonWorld, id0->ID, id1->ID, (float)stat, (float)kinetic ); }
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_RayCast.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_RayCast.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_RayCast.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -17,6 +17,7 @@
#include <Newton.h>
#include "OgreNewt_World.h"
#include "OgreNewt_Body.h"
+#include "OgreNewt_CollisionPrimitives.h"
// OgreNewt namespace. all functions and classes use this namespace.
@@ -59,7 +60,13 @@
*/
virtual bool UserCallback( MogreNewt::Body^ body, Mogre::Real distance, const Mogre::Vector3 normal, int collisionID ) = 0;
+protected:
+ //! save the last OgreNewt::Body from the newtonRaycastPreFilter to use this for example the TreeCollisionRayCallback
+ MogreNewt::Body^ m_lastbody;
+ //! save if this body was already added by RayCastCallback from TreeCollision
+ bool bodyalreadyadded;
+
private:
[UnmanagedFunctionPointer(CallingConvention::Cdecl)]
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Tools.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Tools.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Tools.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -78,7 +78,7 @@
*/
static int CollisionPointDistance( MogreNewt::World^ world, const Mogre::Vector3 globalpt,
MogreNewt::Collision^ col, const Mogre::Quaternion colorient, const Mogre::Vector3 colpos,
- [Out] Mogre::Vector3% retpt, [Out] Mogre::Vector3% retnormal );
+ [Out] Mogre::Vector3% retpt, [Out] Mogre::Vector3% retnormal ,int threadindex);
@@ -97,7 +97,7 @@
*/
static int CollisionClosestPoint( MogreNewt::World^ world, MogreNewt::Collision^ colA, const Mogre::Quaternion colOrientA, const Mogre::Vector3 colPosA,
MogreNewt::Collision^ colB, const Mogre::Quaternion colOrientB, const Mogre::Vector3 colPosB,
- [Out] Mogre::Vector3% retPosA, [Out] Mogre::Vector3% retPosB, [Out] Mogre::Vector3% retNorm );
+ [Out] Mogre::Vector3% retPosA, [Out] Mogre::Vector3% retPosB, [Out] Mogre::Vector3% retNorm ,int threadindex);
//! manual collision between collision primitives.
@@ -119,7 +119,7 @@
static int CollisionCollide( MogreNewt::World^ world, int maxSize,
MogreNewt::Collision^ colA, const Mogre::Quaternion colOrientA, const Mogre::Vector3 colPosA,
MogreNewt::Collision^ colB, const Mogre::Quaternion colOrientB, const Mogre::Vector3 colPosB,
- [Out] array<Mogre::Vector3>^% retContactPts, [Out] array<Mogre::Vector3>^% retNormals, [Out] array<Mogre::Real>^% retPenetrations );
+ [Out] array<Mogre::Vector3>^% retContactPts, [Out] array<Mogre::Vector3>^% retNormals, [Out] array<Mogre::Real>^% retPenetrations ,int threadindex);
//! manual collision between moving primitives.
@@ -146,7 +146,7 @@
static int CollisionCollideContinue( MogreNewt::World^ world, int maxSize, Mogre::Real timeStep,
MogreNewt::Collision^ colA, const Mogre::Quaternion colOrientA, const Mogre::Vector3 colPosA, const Mogre::Vector3 colVelA, const Mogre::Vector3 colOmegaA,
MogreNewt::Collision^ colB, const Mogre::Quaternion colOrientB, const Mogre::Vector3 colPosB, const Mogre::Vector3 colVelB, const Mogre::Vector3 colOmegaB,
- [Out] Mogre::Real% retTimeOfImpact, [Out] array<Mogre::Vector3>^% retContactPts, [Out] array<Mogre::Vector3>^% retNormals, [Out] array<Mogre::Real>^% retPenetrations );
+ [Out] Mogre::Real% retTimeOfImpact, [Out] array<Mogre::Vector3>^% retContactPts, [Out] array<Mogre::Vector3>^% retNormals, [Out] array<Mogre::Real>^% retPenetrations ,int threadindex);
//! local raycast on a collision object.
@@ -175,28 +175,7 @@
};
- //! calculators of MomentOfInertia
- public ref class MomentOfInertia
- {
- public:
- //! calculate moment of inertia for a solid ellipsoid
- static Mogre::Vector3 CalcEllipsoidSolid( Mogre::Real mass, Mogre::Vector3 size );
-
- //! calculate moment of inertia for a solid sphere
- static Mogre::Vector3 CalcSphereSolid( Mogre::Real mass, Mogre::Real radius );
-
- //! calculate moment of inertia for a hollow sphere
- static Mogre::Vector3 CalcSphereHollow(Mogre::Real mass, Mogre::Real radius );
-
- //! calculate moment of inertia for a solid box
- static Mogre::Vector3 CalcBoxSolid(Mogre::Real mass, Mogre::Vector3 size );
-
- //! calculate moment of inertia for a solid cylinder
- static Mogre::Vector3 CalcCylinderSolid(Mogre::Real mass, Mogre::Real radius, Mogre::Real height );
-
- };
-
} // end namespace MogreNewt
#endif
Deleted: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_TreeCollisionSerializer.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_TreeCollisionSerializer.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_TreeCollisionSerializer.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -1,80 +0,0 @@
-/*
-OgreNewt Library
-
-Ogre implementation of Newton Game Dynamics SDK
-
-OgreNewt basically has no license, you may use any or all of the library however you desire... I hope it can help you in any way.
-
-by Walaber
-
-*/
-#ifndef _INCLUDE_OGRENEWT_TREECOLLISIONSERIALIZER
-#define _INCLUDE_OGRENEWT_TREECOLLISIONSERIALIZER
-
-#include <Newton.h>
-#include "OgreNewt_World.h"
-#include "OgreSerializer.h"
-#include "OgreString.h"
-
-// OgreNewt namespace. all functions and classes use this namespace.
-namespace MogreNewt
-{
- namespace CollisionPrimitives
- {
- ref class TreeCollision;
- }
-
- /*!
- This class can be used to (de)serialize a TreeCollision. Pre-building a TreeCollision and serializing from a tool,
- then deserializing it at runtime may be more efficient than building the TreeCollision on the fly, especially for complex objects.
- */
- public ref class TreeCollisionSerializer
- {
- public:
-
- //! constructor
- TreeCollisionSerializer();
-
- /*!
- Serialize the TreeCollision to a Stream.
- */
- void ExportTreeCollision(CollisionPrimitives::TreeCollision^ collision, IO::Stream^ stream);
-
- /*!
- Deserialize the TreeCollision from a Stream.
- */
- void ImportTreeCollision(IO::Stream^ stream, CollisionPrimitives::TreeCollision^ pDest);
-
- private:
-
- IO::Stream^ m_stream;
-
- [UnmanagedFunctionPointer(CallingConvention::Cdecl)]
- delegate void NewtonSerializeDelegate( void* handle, void* buffer, size_t size );
-
- NewtonSerializeDelegate^ m_SerializeDelegate;
- NewtonSerializeDelegate^ m_DeserializeDelegate;
-
- NewtonSerialize m_funcptr_newtonSerialize;
- NewtonDeserialize m_funcptr_newtonDeserialize;
-
- /*!
- Callback function for Newton. It should never be called directly, but will be called by Newton to save the TreeCollision to a stream.
- (Newton calls this function several times for each serialization, once for each chunk of its file format apparently)
- */
- void _newtonSerializeCallback(void* serializeHandle, void* buffer, size_t size);
-
- /*!
- Callback function for Newton. It should never be called directly, but will be called by Newton to load the TreeCollision from a stream.
- (Newton calls this function several times for each deserialization, once for each chunk of its file format apparently)
- */
- void _newtonDeserializeCallback(void* deserializeHandle, void* buffer, size_t size);
- };
-
-
-} // end namespace MogreNewt
-
-#endif
-// _INCLUDE_OGRENEWT_TREECOLLISIONSERIALIZER
-
-
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Vehicle.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Vehicle.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_Vehicle.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -18,7 +18,7 @@
namespace MogreNewt
{
-
+#ifdef INCLUDE_VEHICLE
ref class Vehicle;
public ref class TireEventArgs : EventArgs
@@ -388,6 +388,7 @@
};
+#endif
} // end namespace MogreNewt
Modified: trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h
===================================================================
--- trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h 2009-03-26 10:34:28 UTC (rev 254)
+++ trunk/MogreNewt/MogreNewt_Main/inc/OgreNewt_World.h 2009-03-26 11:08:42 UTC (rev 255)
@@ -28,7 +28,7 @@
ref class World;
-public delegate void LeaveWorldEventHandler( MogreNewt::World^ sender, MogreNewt::Body^ body );
+public delegate void LeaveWorldEventHandler(MogreNewt::Body^ body,int threadIndex );
//! represents a physics world.
/*!
@@ -47,15 +47,15 @@
{
SM_EXACT = 0, /*!< the most accurate simulation. */
SM_ADAPTIVE = 1, /*!< still accurate, but faster. */
- SM_2_PASS = 2,
- SM_3_PASS = 3,
- SM_4_PASS = 4,
- SM_5_PASS = 5,
- SM_6_PASS = 6,
- SM_7_PASS = 7,
- SM_8_PASS = 8,
- ...
[truncated message content] |
|
From: <mog...@li...> - 2009-03-26 10:34:47
|
Revision: 254
http://mogre.svn.sourceforge.net/mogre/?rev=254&view=rev
Author: realgantz
Date: 2009-03-26 10:34:28 +0000 (Thu, 26 Mar 2009)
Log Message:
-----------
version of mogrenewt using newton 1.53
Added Paths:
-----------
tags/MogreNewt-1.53/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2008-12-14 06:19:36
|
Revision: 253
http://mogre.svn.sourceforge.net/mogre/?rev=253&view=rev
Author: gnometank
Date: 2008-12-14 06:19:27 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
Ogre 1.6 code is no in the directory Ogre, this directory is no longer needed.
Removed Paths:
-------------
trunk/Mogre/ogrenew/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2008-12-14 05:09:11
|
Revision: 252
http://mogre.svn.sourceforge.net/mogre/?rev=252&view=rev
Author: gnometank
Date: 2008-12-14 05:09:02 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
Initial check-in of 1.6 WIP code. ** CURRENTLY DOES NOT COMPILE **
Modified Paths:
--------------
trunk/Mogre/AutoWrap/Attributes.xml
trunk/Mogre/AutoWrap/Meta/Attributes.cs
trunk/Mogre/AutoWrap/Meta/ClassProducer.cs
trunk/Mogre/AutoWrap/Meta/CppClassProducer.cs
trunk/Mogre/AutoWrap/Meta/DefExplicitTypes.cs
trunk/Mogre/AutoWrap/Meta/DefNameSpace.cs
trunk/Mogre/AutoWrap/Meta/DefType.cs
trunk/Mogre/AutoWrap/Meta/IncClassProducer.cs
trunk/Mogre/AutoWrap/Meta/IncValueClassProducer.cs
trunk/Mogre/AutoWrap/Meta/Wrapper.cs
trunk/Mogre/Mogre/Mogre_vc9.vcproj
trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h
trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h
trunk/Mogre/Mogre/include/Custom/MogreRect.h
trunk/Mogre/Mogre/include/Custom/MogreVector3.h
trunk/Mogre/Mogre/include/Marshalling.h
trunk/Mogre/Mogre/include/Prerequisites.h
trunk/Mogre/Mogre/include/STLMultiMap.h
trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h
trunk/Mogre/Mogre/include/auto/MogreAnimable.h
trunk/Mogre/Mogre/include/auto/MogreAnimation.h
trunk/Mogre/Mogre/include/auto/MogreAnimationState.h
trunk/Mogre/Mogre/include/auto/MogreAnimationTrack.h
trunk/Mogre/Mogre/include/auto/MogreArchive.h
trunk/Mogre/Mogre/include/auto/MogreArchiveManager.h
trunk/Mogre/Mogre/include/auto/MogreBillboardChain.h
trunk/Mogre/Mogre/include/auto/MogreBillboardParticleRenderer.h
trunk/Mogre/Mogre/include/auto/MogreBillboardSet.h
trunk/Mogre/Mogre/include/auto/MogreBorderPanelOverlayElement.h
trunk/Mogre/Mogre/include/auto/MogreCamera.h
trunk/Mogre/Mogre/include/auto/MogreCodec.h
trunk/Mogre/Mogre/include/auto/MogreCommon.h
trunk/Mogre/Mogre/include/auto/MogreCompositionPass.h
trunk/Mogre/Mogre/include/auto/MogreCompositionTechnique.h
trunk/Mogre/Mogre/include/auto/MogreCompositorInstance.h
trunk/Mogre/Mogre/include/auto/MogreConfigFile.h
trunk/Mogre/Mogre/include/auto/MogreDDSCodec.h
trunk/Mogre/Mogre/include/auto/MogreEntity.h
trunk/Mogre/Mogre/include/auto/MogreException.h
trunk/Mogre/Mogre/include/auto/MogreFileSystem.h
trunk/Mogre/Mogre/include/auto/MogreFont.h
trunk/Mogre/Mogre/include/auto/MogreFrameListener.h
trunk/Mogre/Mogre/include/auto/MogreFrustum.h
trunk/Mogre/Mogre/include/auto/MogreGpuProgram.h
trunk/Mogre/Mogre/include/auto/MogreGpuProgramManager.h
trunk/Mogre/Mogre/include/auto/MogreHardwareBufferManager.h
trunk/Mogre/Mogre/include/auto/MogreHighLevelGpuProgram.h
trunk/Mogre/Mogre/include/auto/MogreILImageCodec.h
trunk/Mogre/Mogre/include/auto/MogreImage.h
trunk/Mogre/Mogre/include/auto/MogreInstancedGeometry.h
trunk/Mogre/Mogre/include/auto/MogreLight.h
trunk/Mogre/Mogre/include/auto/MogreLog.h
trunk/Mogre/Mogre/include/auto/MogreLogManager.h
trunk/Mogre/Mogre/include/auto/MogreManualObject.h
trunk/Mogre/Mogre/include/auto/MogreMaterial.h
trunk/Mogre/Mogre/include/auto/MogreMaterialManager.h
trunk/Mogre/Mogre/include/auto/MogreMesh.h
trunk/Mogre/Mogre/include/auto/MogreMeshManager.h
trunk/Mogre/Mogre/include/auto/MogreMeshSerializer.h
trunk/Mogre/Mogre/include/auto/MogreMovableObject.h
trunk/Mogre/Mogre/include/auto/MogreMovablePlane.h
trunk/Mogre/Mogre/include/auto/MogreNode.h
trunk/Mogre/Mogre/include/auto/MogreOverlay.h
trunk/Mogre/Mogre/include/auto/MogreOverlayContainer.h
trunk/Mogre/Mogre/include/auto/MogreOverlayElement.h
trunk/Mogre/Mogre/include/auto/MogreParticleSystem.h
trunk/Mogre/Mogre/include/auto/MogreParticleSystemRenderer.h
trunk/Mogre/Mogre/include/auto/MogrePass.h
trunk/Mogre/Mogre/include/auto/MogrePixelFormat.h
trunk/Mogre/Mogre/include/auto/MogrePlatform.h
trunk/Mogre/Mogre/include/auto/MogreRenderQueue.h
trunk/Mogre/Mogre/include/auto/MogreRenderQueueSortingGrouping.h
trunk/Mogre/Mogre/include/auto/MogreRenderSystem.h
trunk/Mogre/Mogre/include/auto/MogreRenderSystemCapabilities.h
trunk/Mogre/Mogre/include/auto/MogreRenderTarget.h
trunk/Mogre/Mogre/include/auto/MogreRenderTexture.h
trunk/Mogre/Mogre/include/auto/MogreRenderWindow.h
trunk/Mogre/Mogre/include/auto/MogreRenderable.h
trunk/Mogre/Mogre/include/auto/MogreResource.h
trunk/Mogre/Mogre/include/auto/MogreResourceBackgroundQueue.h
trunk/Mogre/Mogre/include/auto/MogreResourceGroupManager.h
trunk/Mogre/Mogre/include/auto/MogreResourceManager.h
trunk/Mogre/Mogre/include/auto/MogreRoot.h
trunk/Mogre/Mogre/include/auto/MogreSceneManager.h
trunk/Mogre/Mogre/include/auto/MogreSceneNode.h
trunk/Mogre/Mogre/include/auto/MogreShadowCameraSetup.h
trunk/Mogre/Mogre/include/auto/MogreShadowCameraSetupFocused.h
trunk/Mogre/Mogre/include/auto/MogreShadowCameraSetupLiSPSM.h
trunk/Mogre/Mogre/include/auto/MogreShadowCameraSetupPlaneOptimal.h
trunk/Mogre/Mogre/include/auto/MogreShadowCaster.h
trunk/Mogre/Mogre/include/auto/MogreSimpleRenderable.h
trunk/Mogre/Mogre/include/auto/MogreSkeleton.h
trunk/Mogre/Mogre/include/auto/MogreStaticGeometry.h
trunk/Mogre/Mogre/include/auto/MogreStringConverter.h
trunk/Mogre/Mogre/include/auto/MogreSubEntity.h
trunk/Mogre/Mogre/include/auto/MogreSubMesh.h
trunk/Mogre/Mogre/include/auto/MogreTechnique.h
trunk/Mogre/Mogre/include/auto/MogreTexture.h
trunk/Mogre/Mogre/include/auto/MogreTextureManager.h
trunk/Mogre/Mogre/include/auto/MogreTextureUnitState.h
trunk/Mogre/Mogre/include/auto/MogreUnifiedHighLevelGpuProgram.h
trunk/Mogre/Mogre/include/auto/MogreWindowEventUtilities.h
trunk/Mogre/Mogre/include/auto/MogreZip.h
trunk/Mogre/Mogre/include/auto/PreDeclarations.h
trunk/Mogre/Mogre/src/Marshalling.cpp
trunk/Mogre/Mogre/src/SubclassingManager.cpp
trunk/Mogre/Mogre/src/auto/MogreAnimable.cpp
trunk/Mogre/Mogre/src/auto/MogreAnimation.cpp
trunk/Mogre/Mogre/src/auto/MogreAnimationState.cpp
trunk/Mogre/Mogre/src/auto/MogreAnimationTrack.cpp
trunk/Mogre/Mogre/src/auto/MogreArchive.cpp
trunk/Mogre/Mogre/src/auto/MogreArchiveManager.cpp
trunk/Mogre/Mogre/src/auto/MogreBillboardChain.cpp
trunk/Mogre/Mogre/src/auto/MogreBillboardParticleRenderer.cpp
trunk/Mogre/Mogre/src/auto/MogreBillboardSet.cpp
trunk/Mogre/Mogre/src/auto/MogreBorderPanelOverlayElement.cpp
trunk/Mogre/Mogre/src/auto/MogreCamera.cpp
trunk/Mogre/Mogre/src/auto/MogreCodec.cpp
trunk/Mogre/Mogre/src/auto/MogreCompositionPass.cpp
trunk/Mogre/Mogre/src/auto/MogreCompositionTechnique.cpp
trunk/Mogre/Mogre/src/auto/MogreCompositorInstance.cpp
trunk/Mogre/Mogre/src/auto/MogreConfigFile.cpp
trunk/Mogre/Mogre/src/auto/MogreDDSCodec.cpp
trunk/Mogre/Mogre/src/auto/MogreEntity.cpp
trunk/Mogre/Mogre/src/auto/MogreException.cpp
trunk/Mogre/Mogre/src/auto/MogreFileSystem.cpp
trunk/Mogre/Mogre/src/auto/MogreFont.cpp
trunk/Mogre/Mogre/src/auto/MogreFrameListener.cpp
trunk/Mogre/Mogre/src/auto/MogreFrustum.cpp
trunk/Mogre/Mogre/src/auto/MogreGpuProgram.cpp
trunk/Mogre/Mogre/src/auto/MogreGpuProgramManager.cpp
trunk/Mogre/Mogre/src/auto/MogreHardwareBufferManager.cpp
trunk/Mogre/Mogre/src/auto/MogreHighLevelGpuProgram.cpp
trunk/Mogre/Mogre/src/auto/MogreILImageCodec.cpp
trunk/Mogre/Mogre/src/auto/MogreImage.cpp
trunk/Mogre/Mogre/src/auto/MogreInstancedGeometry.cpp
trunk/Mogre/Mogre/src/auto/MogreLight.cpp
trunk/Mogre/Mogre/src/auto/MogreLog.cpp
trunk/Mogre/Mogre/src/auto/MogreLogManager.cpp
trunk/Mogre/Mogre/src/auto/MogreManualObject.cpp
trunk/Mogre/Mogre/src/auto/MogreMaterial.cpp
trunk/Mogre/Mogre/src/auto/MogreMaterialManager.cpp
trunk/Mogre/Mogre/src/auto/MogreMesh.cpp
trunk/Mogre/Mogre/src/auto/MogreMeshManager.cpp
trunk/Mogre/Mogre/src/auto/MogreMeshSerializer.cpp
trunk/Mogre/Mogre/src/auto/MogreMovableObject.cpp
trunk/Mogre/Mogre/src/auto/MogreMovablePlane.cpp
trunk/Mogre/Mogre/src/auto/MogreNode.cpp
trunk/Mogre/Mogre/src/auto/MogreOverlay.cpp
trunk/Mogre/Mogre/src/auto/MogreOverlayContainer.cpp
trunk/Mogre/Mogre/src/auto/MogreOverlayElement.cpp
trunk/Mogre/Mogre/src/auto/MogreParticleSystem.cpp
trunk/Mogre/Mogre/src/auto/MogreParticleSystemRenderer.cpp
trunk/Mogre/Mogre/src/auto/MogrePass.cpp
trunk/Mogre/Mogre/src/auto/MogrePixelFormat.cpp
trunk/Mogre/Mogre/src/auto/MogreRenderQueue.cpp
trunk/Mogre/Mogre/src/auto/MogreRenderQueueSortingGrouping.cpp
trunk/Mogre/Mogre/src/auto/MogreRenderSystem.cpp
trunk/Mogre/Mogre/src/auto/MogreRenderSystemCapabilities.cpp
trunk/Mogre/Mogre/src/auto/MogreRenderTarget.cpp
trunk/Mogre/Mogre/src/auto/MogreRenderTexture.cpp
trunk/Mogre/Mogre/src/auto/MogreRenderWindow.cpp
trunk/Mogre/Mogre/src/auto/MogreRenderable.cpp
trunk/Mogre/Mogre/src/auto/MogreResource.cpp
trunk/Mogre/Mogre/src/auto/MogreResourceBackgroundQueue.cpp
trunk/Mogre/Mogre/src/auto/MogreResourceGroupManager.cpp
trunk/Mogre/Mogre/src/auto/MogreResourceManager.cpp
trunk/Mogre/Mogre/src/auto/MogreRoot.cpp
trunk/Mogre/Mogre/src/auto/MogreSceneManager.cpp
trunk/Mogre/Mogre/src/auto/MogreSceneNode.cpp
trunk/Mogre/Mogre/src/auto/MogreShadowCameraSetup.cpp
trunk/Mogre/Mogre/src/auto/MogreShadowCameraSetupFocused.cpp
trunk/Mogre/Mogre/src/auto/MogreShadowCameraSetupLiSPSM.cpp
trunk/Mogre/Mogre/src/auto/MogreShadowCameraSetupPlaneOptimal.cpp
trunk/Mogre/Mogre/src/auto/MogreShadowCaster.cpp
trunk/Mogre/Mogre/src/auto/MogreSimpleRenderable.cpp
trunk/Mogre/Mogre/src/auto/MogreSkeleton.cpp
trunk/Mogre/Mogre/src/auto/MogreStaticGeometry.cpp
trunk/Mogre/Mogre/src/auto/MogreStringConverter.cpp
trunk/Mogre/Mogre/src/auto/MogreSubEntity.cpp
trunk/Mogre/Mogre/src/auto/MogreSubMesh.cpp
trunk/Mogre/Mogre/src/auto/MogreTechnique.cpp
trunk/Mogre/Mogre/src/auto/MogreTextAreaOverlayElement.cpp
trunk/Mogre/Mogre/src/auto/MogreTexture.cpp
trunk/Mogre/Mogre/src/auto/MogreTextureManager.cpp
trunk/Mogre/Mogre/src/auto/MogreTextureUnitState.cpp
trunk/Mogre/Mogre/src/auto/MogreUnifiedHighLevelGpuProgram.cpp
trunk/Mogre/Mogre/src/auto/MogreWindowEventUtilities.cpp
trunk/Mogre/Mogre/src/auto/MogreZip.cpp
trunk/Mogre/Mogre_vc9.sln
trunk/Mogre/cpp2java/ogre4j.doxygen
Added Paths:
-----------
trunk/Mogre/Mogre/include/auto/MogreRenderSystemCapabilitiesManager.h
trunk/Mogre/Mogre/include/auto/MogreRenderToVertexBuffer.h
trunk/Mogre/Mogre/include/auto/MogreShadowCameraSetupPSSM.h
trunk/Mogre/Mogre/src/auto/MogreRenderSystemCapabilitiesManager.cpp
trunk/Mogre/Mogre/src/auto/MogreRenderToVertexBuffer.cpp
trunk/Mogre/Mogre/src/auto/MogreShadowCameraSetupPSSM.cpp
Modified: trunk/Mogre/AutoWrap/Attributes.xml
===================================================================
--- trunk/Mogre/AutoWrap/Attributes.xml 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Attributes.xml 2008-12-14 05:09:02 UTC (rev 252)
@@ -8,19 +8,67 @@
<class name="Node" Overridable=""/>
-->
+ <!-- Ignore the new type allocator classes -->
+ <class name="CategorisedAllocPolicy" Ignore="" />
+ <typedef name="GeneralAllocPolicy" Ignore="" />
+ <typedef name="GeometryAllocPolicy" Ignore="" />
+ <typedef name="AnimationAllocPolicy" Ignore="" />
+ <typedef name="SceneCtlAllocPolicy" Ignore="" />
+ <typedef name="SceneObjAllocPolicy" Ignore="" />
+ <typedef name="ResourceAllocPolicy" Ignore="" />
+ <typedef name="ScriptingAllocPolicy" Ignore="" />
+ <typedef name="RenderSysAllocPolicy" Ignore="" />
+
+ <!-- Ignore the script compiler classes for now -->
+ <class name="ScriptToken" Ignore="" />
+ <class name="ScriptTokenPtr" Ignore="" />
+ <class name="ScriptCompiler" Ignore="" />
+ <class name="ScriptLexer" Ignore="" />
+
+ <class name="MeshSerializerListener" WrapType="Interface" />
+ <class name="PSSMShadowCameraSetup">
+ <function name="getOptimalAdjustFactor" Ignore="" />
+ <function name="setOptimalAdjustFactor" Ignore="" />
+ <_CustomIncDeclaration>
+public:
+ property Mogre::Real OptimalAdjustFactor {
+ public:
+ Mogre::Real get() {
+ return static_cast<Ogre::PSSMShadowCameraSetup*>(_native)->getOptimalAdjustFactor();
+ }
+ }
+ void SetOptimalAdjustFactor(int idx, Mogre::Real factor) {
+ static_cast<Ogre::PSSMShadowCameraSetup*>(_native)->setOptimalAdjustFactor(idx, factor);
+ }
+ </_CustomIncDeclaration>
+ </class>
+
+ <class name="MaterialManager">
+ <class name="Listener" WrapType="Interface" />
+ </class>
+
+ <class name="BackgroundProcessResult" WrapType="CLRHandle">
+ <variable name="error" Rename="Error" />
+ <variable name="message" Rename="Message" />
+ </class>
+
<!-- Wrap this class is not necesary for Unicode Support-->
<class name="UTFString" Ignore=""/>
<class name="Pass">
<!-- Must handle "operator()" function first -->
- <class name="HashFunc" Ignore=""/>
+ <!-- For some reason, this is no longer in the meta for 1.6? It still exists, but I believe it was made private -->
+ <!--<class name="HashFunc" Ignore=""/>-->
</class>
<class name="UnifiedHighLevelGpuProgram">
<!-- There are conflicts with addListener/removeListener from the base Resource class -->
<function name="addListener" Ignore=""/>
<function name="removeListener" Ignore=""/>
</class>
-
+
<class name="AnimationTrack">
+ <class name="Listener" WrapType="Interface">
+ <!--<function name="getInterpolatedKeyFrame" DefaultReturnValue="false" />-->
+ </class>
<!-- They are internal methods, and std::vector<Real> as parameter isn't getting wrapped properly at the moment -->
<function name="_collectKeyFrameTimes" Ignore=""/>
<function name="_buildKeyFrameIndexMap" Ignore=""/>
@@ -35,6 +83,15 @@
<function name="softwareVertexBlend" Ignore=""/>
</class>
+ <class name="DriverVersion" WrapType="ValueType" SequentialLayout="">
+ <function name="toString" Ignore="" />
+ <_CustomIncDeclaration>
+ public:
+ virtual System::String^ ToString() override {
+ return System::String::Format("{0}.{1}.{2}.{3}", major, minor, release, build);
+ }
+ </_CustomIncDeclaration>
+ </class>
<class name="TimeIndex" WrapType="CLRHandle"/>
<class name="VisibleObjectsBoundsInfo" WrapType="NativePtrValueType"/>
<class name="ShadowTextureConfig" WrapType="ValueType"/>
@@ -49,7 +106,8 @@
<class name="SubMeshLodGeometryLink" Ignore=""/>
<class name="InstancedObject" WrapType="CLRHandle"/>
<class name="BatchInstance">
- <function name="getObjectsAsArray" Ignore=""/>
+ <!-- Removed in 1.6
+ <function name="getObjectsAsArray" Ignore=""/>-->
</class>
</class>
<class name="EdgeData">
@@ -153,7 +211,25 @@
</class>
<!-- class name="Profiler" Ignore=""/ -->
<class name="AutoParamDataSource" Ignore=""/>
- <class name="Renderable" WrapType="Interface"/>
+ <class name="Renderable" WrapType="Interface">
+ <class name="Visitor" WrapType="Interface" />
+ <class name="RenderSystemData" Ignore="" />
+ <function name="getRenderSystemData" Ignore="" />
+ <function name="setRenderSystemData" Ignore="" />
+ <function name="getUserAny" Ignore="" />
+ <function name="setUserAny" Ignore="" />
+ <_CustomCppDeclaration>
+ #define STLDECL_MANAGEDKEY size_t
+ #define STLDECL_MANAGEDVALUE Mogre::Vector4
+ #define STLDECL_NATIVEKEY size_t
+ #define STLDECL_NATIVEVALUE Ogre::Vector4
+ CPP_DECLARE_STLMAP( Renderable::, CustomParameterMap, STLDECL_MANAGEDKEY, STLDECL_MANAGEDVALUE, STLDECL_NATIVEKEY, STLDECL_NATIVEVALUE )
+ #undef STLDECL_MANAGEDKEY
+ #undef STLDECL_MANAGEDVALUE
+ #undef STLDECL_NATIVEKEY
+ #undef STLDECL_NATIVEVALUE
+ </_CustomCppDeclaration>
+ </class>
<class name="RenderQueue">
<class name="RenderableListener" WrapType="Interface"/>
</class>
@@ -256,6 +332,7 @@
<class name="FrameListener">
<function name="frameStarted" DefaultReturnValue="true"/>
<function name="frameEnded" DefaultReturnValue="true"/>
+ <function name="frameRenderingQueued" DefaultReturnValue="true" />
</class>
<typedef name="SceneTypeMask" ReplaceBy="SceneType"/>
@@ -288,7 +365,33 @@
</class>
<class name="VertexData" WrapType="CLRHandle"/>
<class name="TextureUnitState" WrapType="CLRHandle"/>
- <class name="Technique" WrapType="CLRHandle"/>
+ <class name="Technique" WrapType="CLRHandle">
+ <function name="checkGPURules" Ignore="" />
+ <function name="checkHardwareSupport" Ignore="" />
+ <class name="GPUVendorRule" WrapType="CLRHandle">
+ <variable name="vendor" Rename="Vendor" />
+ <variable name="includeOrExclude" Rename="IncludeOrExclude" />
+ </class>
+ <class name="GPUDeviceNameRule" WrapType="CLRHandle">
+ <variable name="devicePattern" Ignore="" />
+ <variable name="includeOrExclude" Rename="IncludeOrExclude" />
+ <variable name="caseSensitive" Rename="CaseSensitive" />
+ <_CustomIncDeclaration>
+ public:
+ property String^ DevicePattern {
+ public:
+ String^ get() {
+ return TO_CLR_STRING(_native->devicePattern);
+ }
+ public:
+ void set(String^ dp) {
+ DECLARE_NATIVE_STRING(odp, dp);
+ _native->devicePattern = odp;
+ }
+ }
+ </_CustomIncDeclaration>
+ </class>
+ </class>
<class name="SubMesh" WrapType="CLRHandle"/>
<class name="SimpleSpline" WrapType="CLRHandle"/>
<class name="RotationalSpline" WrapType="CLRHandle"/>
@@ -296,14 +399,23 @@
<class name="RenderQueueGroup" WrapType="CLRHandle"/>
<class name="RenderPriorityGroup" WrapType="CLRHandle"/>
<class name="PatchSurface" WrapType="CLRHandle"/>
- <class name="Pass" WrapType="CLRHandle"/>
+ <class name="Pass" WrapType="CLRHandle">
+ <function name="setHashFunction" Ignore="" />
+ <function name="getHashFunction" Ignore="" />
+ </class>
<class name="CompositionTargetPass" WrapType="CLRHandle"/>
- <class name="CompositionPass" WrapType="CLRHandle"/>
+ <class name="CompositionPass" WrapType="CLRHandle">
+ <class name="InputTex" WrapType="CLRHandle" />
+ </class>
<class name="Billboard" WrapType="CLRHandle"/>
<class name="AnimationStateSet" WrapType="CLRHandle"/>
<class name="IndexData" WrapType="CLRHandle"/>
<class name="PlaneBoundedVolume" WrapType="CLRHandle" DoCleanupInFinalizer=""/>
- <class name="Log" WrapType="CLRHandle"/>
+ <class name="Log" WrapType="CLRHandle">
+ <class name="Stream" WrapType="CLRHandle">
+ </class>
+ <function name="stream" Rename="GetStream" />
+ </class>
<class name="ColourValue" ValueType=""/>
<class name="Plane" ValueType=""/>
@@ -357,6 +469,8 @@
<class name="Listener" WrapType="Interface"/>
<!-- If isVisible is property it gets hidden by the Frustum::isVisible method -->
<function name="isVisible" Method=""/>
+ <function name="setUserAny" Ignore="" />
+ <function name="getUserAny" Ignore="" />
<_CustomIncDeclaration>
protected:
Object^ _userObject;
@@ -385,6 +499,17 @@
</class>
<class name="AnimableObject" WrapType="Interface">
+ <_CustomCppDeclaration>
+ #define STLDECL_MANAGEDKEY String^
+ #define STLDECL_MANAGEDVALUE Mogre::StringVector^
+ #define STLDECL_NATIVEKEY Ogre::String
+ #define STLDECL_NATIVEVALUE Ogre::StringVector
+ CPP_DECLARE_STLMAP( AnimableObject::, AnimableDictionaryMap, STLDECL_MANAGEDKEY, STLDECL_MANAGEDVALUE, STLDECL_NATIVEKEY, STLDECL_NATIVEVALUE )
+ #undef STLDECL_MANAGEDKEY
+ #undef STLDECL_MANAGEDVALUE
+ #undef STLDECL_NATIVEKEY
+ #undef STLDECL_NATIVEVALUE
+ </_CustomCppDeclaration>
</class>
<class name="RenderTarget">
@@ -404,14 +529,16 @@
<function name="getName" Cached=""/>
<function name="getRenderQueue" Cached=""/>
<function name="showBoundingBoxes" Rename="setShowBoundingBoxes"/>
+ <class name="Listener" WrapType="Interface" />
</class>
<class name="LogListener" WrapType="NativeDirector"/>
- <class name="ShadowListener" WrapType="NativeDirector">
+ <!--<class name="ShadowListener" WrapType="NativeDirector">
<function name="sortLightsAffectingFrustum" DefaultReturnValue="false"/>
- </class>
+ </class>-->
<class name="RenderQueueListener" WrapType="NativeDirector"/>
<class name="ResourceGroupListener" WrapType="NativeDirector"/>
+ <class name="ResourceLoadingListener" WrapType="Interface" />
<class name="FrameListener" WrapType="NativeDirector" StopDelegationForReturn="false"/>
<class name="RenderTargetListener" WrapType="NativeDirector"/>
<class name="CompositorInstance">
Modified: trunk/Mogre/AutoWrap/Meta/Attributes.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/Attributes.cs 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Meta/Attributes.cs 2008-12-14 05:09:02 UTC (rev 252)
@@ -554,4 +554,16 @@
return new CustomClassAttribute();
}
}
+
+ public class SequentialLayoutAttribute : AutoWrapAttribute {
+ public static SequentialLayoutAttribute FromElement(XmlElement elem) {
+ return new SequentialLayoutAttribute ();
+ }
+ }
+
+ public class GlobalScopeAttribute : AutoWrapAttribute {
+ public static GlobalScopeAttribute FromElement(XmlElement elem) {
+ return new GlobalScopeAttribute ();
+ }
+ }
}
Modified: trunk/Mogre/AutoWrap/Meta/ClassProducer.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/ClassProducer.cs 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Meta/ClassProducer.cs 2008-12-14 05:09:02 UTC (rev 252)
@@ -616,8 +616,11 @@
List<DefType> rest = new List<DefType>();
List<DefType> typedefs = new List<DefType>();
+ // Only output nested types on interfaces if we are the abstract class
+ if(_t.IsInterface && !((this is IncOverridableClassProducer) || (this is CppOverridableClassProducer))) {
+ return;
+ }
-
foreach (DefType nested in _t.NestedTypes)
{
if (nested.ProtectionType == ProtectionType.Public
@@ -677,6 +680,11 @@
foreach (DefType nested in iterators)
AddNestedType(nested);
+ // Exit out here if this is CPP
+ if((this is CppOverridableClassProducer)) {
+ return;
+ }
+
//Add STL wrappers for fields that doesn't have proper typedefs
List<string> stls = new List<string>();
Modified: trunk/Mogre/AutoWrap/Meta/CppClassProducer.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/CppClassProducer.cs 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Meta/CppClassProducer.cs 2008-12-14 05:09:02 UTC (rev 252)
@@ -69,6 +69,10 @@
{
base.AddInternalDeclarations();
+ if(_t.IsNested && _t.IsInterface) {
+ return;
+ }
+
foreach (DefClass cls in _interfaces)
{
_sb.AppendLine(cls.FullNativeName + "* " + GetClassName() + "::_" + cls.CLRName + "_GetNativePtr()");
@@ -570,7 +574,7 @@
protected override void AddPropertyField(DefField field)
{
string ptype = GetCLRTypeName(field);
- string pname = GetClassName() + "::" + field.Name;
+ string pname = GetClassName () + "::" + (field.HasAttribute<RenameAttribute>() ? field.GetAttribute<RenameAttribute> ().Name : field.Name);
if (field.IsNativeArray)
{
Modified: trunk/Mogre/AutoWrap/Meta/DefExplicitTypes.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/DefExplicitTypes.cs 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Meta/DefExplicitTypes.cs 2008-12-14 05:09:02 UTC (rev 252)
@@ -1336,6 +1336,7 @@
case PassedByType.Reference:
return "TO_CLR_STRING( " + expr + " )";
case PassedByType.Pointer:
+ return "gcnew array<String^> { (" + expr + " ? TO_CLR_STRING( *" + expr + " ) : String::Empty) }";
case PassedByType.PointerPointer:
default:
throw new Exception("Unexpected");
@@ -1483,6 +1484,121 @@
}
}
+ class DefUtfString : DefType, IDefString {
+ public override string FullNativeName {
+ get {
+ return "DisplayString";
+ }
+ }
+
+ public override bool IsValueType {
+ get {
+ return true;
+ }
+ }
+
+ public override void GetDefaultParamValueConversion (DefParam param, out string preConversion, out string conversion, out string postConversion, out DefType dependancyType) {
+ preConversion = postConversion = "";
+ dependancyType = null;
+ switch (param.PassedByType) {
+ case PassedByType.Reference:
+ case PassedByType.Value:
+ conversion = param.DefaultValue.Trim ();
+ if (!conversion.StartsWith ("\"")
+ && conversion.Contains ("::")) {
+ //It's a static string of a class
+
+ if (conversion == "StringUtil::BLANK") {
+ //Manually translate "StringUtil::BLANK" so that there's no need to wrap the StringUtil class
+ conversion = "String::Empty";
+ return;
+ }
+
+ string name = conversion.Substring (0, conversion.LastIndexOf ("::"));
+ dependancyType = FindType<DefType> (name);
+ }
+ break;
+ default:
+ throw new Exception ("Unexpected");
+
+ }
+ }
+
+ public override string GetCLRParamTypeName (DefParam param) {
+ switch (param.PassedByType) {
+ case PassedByType.Value:
+ case PassedByType.Reference:
+ return "String^";
+ case PassedByType.Pointer:
+ return "array<String^>^";
+ case PassedByType.PointerPointer:
+ default:
+ throw new Exception ("Unexpected");
+ }
+ }
+
+ public override string GetPreCallParamConversion (DefParam param, out string newname) {
+ string name = param.Name;
+ switch (param.PassedByType) {
+ case PassedByType.Value:
+ case PassedByType.Reference:
+ newname = "o_" + name;
+ return "DECLARE_NATIVE_STRING( o_" + name + ", " + name + " )\n";
+ case PassedByType.Pointer:
+ string expr = FullNativeName + "* arr_" + name + " = new " + FullNativeName + "[" + name + "->Length];\n";
+ expr += "for (int i=0; i < " + name + "->Length; i++)\n";
+ expr += "{\n";
+ expr += "\tSET_NATIVE_UTFSTRING( arr_" + name + "[i], " + name + "[i] )\n";
+ expr += "}\n";
+ newname = "arr_" + name;
+ return expr;
+ case PassedByType.PointerPointer:
+ default:
+ throw new Exception ("Unexpected");
+ }
+ }
+
+ public override string GetPostCallParamConversionCleanup (DefParam param) {
+ switch (param.PassedByType) {
+ case PassedByType.Value:
+ case PassedByType.Reference:
+ return "";
+ case PassedByType.Pointer:
+ return "delete[] arr_" + param.Name + ";\n";
+ case PassedByType.PointerPointer:
+ default:
+ throw new Exception ("Unexpected");
+ }
+ }
+
+ public override string GetCLRTypeName (ITypeMember m) {
+ switch (m.PassedByType) {
+ case PassedByType.Value:
+ case PassedByType.Reference:
+ return "String^";
+ case PassedByType.Pointer:
+ case PassedByType.PointerPointer:
+ default:
+ throw new Exception ("Unexpected");
+ }
+ }
+
+ public override string GetNativeCallConversion (string expr, ITypeMember m) {
+ switch (m.PassedByType) {
+ case PassedByType.Value:
+ case PassedByType.Reference:
+ return "UTF_TO_CLR_STRING( " + expr + " )";
+ case PassedByType.Pointer:
+ case PassedByType.PointerPointer:
+ default:
+ throw new Exception ("Unexpected");
+ }
+ }
+
+ public DefUtfString () {
+ }
+ }
+
class DefInternal : DefType
{
public override void GetNativeParamConversion(DefParam param, out string preConversion, out string conversion, out string postConversion)
Modified: trunk/Mogre/AutoWrap/Meta/DefNameSpace.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/DefNameSpace.cs 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Meta/DefNameSpace.cs 2008-12-14 05:09:02 UTC (rev 252)
@@ -60,9 +60,12 @@
if (name.EndsWith(" std::string"))
name = "std::string";
- if (name == "std::string" || name=="DisplayString")
+ if (name == "std::string")
return (T)(object)new DefString();
+ if (name == "DisplayString")
+ return (T)(object)new DefUtfString ();
+
if (name.StartsWith(Globals.NativeNamespace + "::"))
name = name.Substring(name.IndexOf("::") + 2);
@@ -80,6 +83,13 @@
return ParentNameSpace.FindType<T>(name, raiseException);
}
+ if(type is DefType) {
+ // Short circuit out to handle OGRE 1.6 memory allocator types
+ if(((DefType)(object)type).IsIgnored) {
+ return (T)(object)type;
+ }
+ }
+
return (T)(object)DefType.CreateExplicitType((DefType)(object)type);
}
Modified: trunk/Mogre/AutoWrap/Meta/DefType.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/DefType.cs 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Meta/DefType.cs 2008-12-14 05:09:02 UTC (rev 252)
@@ -1190,7 +1190,7 @@
foreach (DefFunction f in this.Functions)
{
- if (f.IsProperty)
+ if (f.IsProperty && !f.IsIgnored)
{
DefProperty p = null;
Modified: trunk/Mogre/AutoWrap/Meta/IncClassProducer.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/IncClassProducer.cs 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Meta/IncClassProducer.cs 2008-12-14 05:09:02 UTC (rev 252)
@@ -831,7 +831,12 @@
ptype = GetCLRTypeName(field);
_sb.AppendIndent("");
if (field.IsStatic) _sb.Append("static ");
- _sb.AppendFormat("property {0} {1}\n", ptype, field.Name);
+ if (field.HasAttribute<RenameAttribute> ()) {
+ _sb.AppendFormat ("property {0} {1}\n", ptype, field.GetAttribute<RenameAttribute> ().Name);
+ }
+ else {
+ _sb.AppendFormat ("property {0} {1}\n", ptype, field.Name);
+ }
_sb.AppendLine("{");
_sb.AppendLine(GetProtectionString(field.ProtectionType) + ":");
Modified: trunk/Mogre/AutoWrap/Meta/IncValueClassProducer.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/IncValueClassProducer.cs 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Meta/IncValueClassProducer.cs 2008-12-14 05:09:02 UTC (rev 252)
@@ -36,6 +36,11 @@
protected override void AddDefinition()
{
+ if (_t.HasAttribute<SequentialLayoutAttribute> ()) {
+ _sb.AppendIndent ("");
+ _sb.Append ("[StructLayout(LayoutKind::Sequential)]\n");
+ }
+
_sb.AppendIndent("");
if (!_t.IsNested)
_sb.Append("public ");
Modified: trunk/Mogre/AutoWrap/Meta/Wrapper.cs
===================================================================
--- trunk/Mogre/AutoWrap/Meta/Wrapper.cs 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/AutoWrap/Meta/Wrapper.cs 2008-12-14 05:09:02 UTC (rev 252)
@@ -178,6 +178,11 @@
//It's DLL function pointers of OgrePlatformManager.h
return false;
}
+
+ // For now, ignore un-named enums in the namespace
+ if(type.Name.StartsWith("@")) {
+ return false;
+ }
// Get explicit type or a new type if type has ReplaceBy attribute
type = (type.IsNested) ? type.ParentClass.FindType<DefType>(type.Name) : type.NameSpace.FindType<DefType>(type.Name);
Modified: trunk/Mogre/Mogre/Mogre_vc9.vcproj
===================================================================
--- trunk/Mogre/Mogre/Mogre_vc9.vcproj 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/Mogre/Mogre_vc9.vcproj 2008-12-14 05:09:02 UTC (rev 252)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1253"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="Mogre"
ProjectGUID="{F75E973B-C1A0-43EB-8560-C43EF6D57812}"
RootNamespace="Mogre"
@@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="-Zm119"
Optimization="0"
- AdditionalIncludeDirectories=".\include;.\include\auto;..\ogrenew\OgreMain\include"
+ AdditionalIncludeDirectories=".\include;.\include\auto;..\ogre\OgreMain\include"
PreprocessorDefinitions="WIN32;_DEBUG"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
@@ -64,7 +64,7 @@
AdditionalDependencies="OgreMain_d.lib $(NOINHERIT)"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\ogrenew\lib"
+ AdditionalLibraryDirectories="..\ogre\lib"
GenerateDebugInformation="true"
AssemblyDebug="1"
OptimizeForWindows98="1"
@@ -126,7 +126,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="true"
- AdditionalIncludeDirectories=".\include;.\include\auto;..\ogrenew\OgreMain\include"
+ AdditionalIncludeDirectories=".\include;.\include\auto;..\ogre\OgreMain\include"
PreprocessorDefinitions="WIN32;NDEBUG"
StringPooling="true"
MinimalRebuild="false"
@@ -154,7 +154,7 @@
Name="VCLinkerTool"
AdditionalDependencies="OgreMain.lib $(NOINHERIT)"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\ogrenew\lib"
+ AdditionalLibraryDirectories="..\ogre\lib"
GenerateDebugInformation="true"
OptimizeReferences="0"
EnableCOMDATFolding="2"
@@ -219,48 +219,12 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\AssemblyInfo.cpp"
- >
- </File>
- <File
RelativePath=".\src\Custom\ManagedDataStream.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\Marshalling.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\auto\Mogre-WIN32_OgreTimerImp.cpp"
@@ -333,22 +297,6 @@
<File
RelativePath=".\src\Custom\MogreColourValue.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\auto\MogreCommon.cpp"
@@ -483,6 +431,10 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogreILImageCodec.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\auto\MogreImage.cpp"
>
</File>
@@ -529,62 +481,14 @@
<File
RelativePath=".\src\Custom\MogreMath.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\Custom\MogreMatrix3.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\Custom\MogreMatrix4.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\auto\MogreMesh.cpp"
@@ -693,22 +597,6 @@
<File
RelativePath=".\src\Custom\MogrePlane.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\auto\MogrePlane.cpp"
@@ -719,7 +607,6 @@
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -728,7 +615,6 @@
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
@@ -755,22 +641,6 @@
<File
RelativePath=".\src\Custom\MogreQuaternion.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\auto\MogreRectangle2D.cpp"
@@ -809,6 +679,10 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogreRenderSystemCapabilitiesManager.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\auto\MogreRenderTarget.cpp"
>
</File>
@@ -821,6 +695,10 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogreRenderToVertexBuffer.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\auto\MogreRenderWindow.cpp"
>
</File>
@@ -889,6 +767,10 @@
>
</File>
<File
+ RelativePath=".\src\auto\MogreShadowCameraSetupPSSM.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\auto\MogreShadowCaster.cpp"
>
</File>
@@ -975,42 +857,10 @@
<File
RelativePath=".\src\Custom\MogreVector3.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\Custom\MogreVertexElement.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="2"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\src\auto\MogreVertexIndexData.cpp"
@@ -1045,8 +895,6 @@
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1055,30 +903,12 @@
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\SubclassingManager.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
</Filter>
<Filter
@@ -1179,6 +1009,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreColourValue.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogreCommon.h"
>
</File>
@@ -1311,6 +1145,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreILImageCodec.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogreImage.h"
>
</File>
@@ -1571,6 +1409,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreRenderSystemCapabilitiesManager.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogreRenderTarget.h"
>
</File>
@@ -1583,6 +1425,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreRenderToVertexBuffer.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogreRenderWindow.h"
>
</File>
@@ -1651,6 +1497,10 @@
>
</File>
<File
+ RelativePath=".\include\auto\MogreShadowCameraSetupPSSM.h"
+ >
+ </File>
+ <File
RelativePath=".\include\auto\MogreShadowCaster.h"
>
</File>
Modified: trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/Mogre/include/Custom/MogreMatrix3.h 2008-12-14 05:09:02 UTC (rev 252)
@@ -232,7 +232,7 @@
inline void ToAxisAngle ([Out] Vector3% rkAxis, [Out] Real% rfRadians) {
Radian r;
ToAxisAngle ( rkAxis, r );
- rfRadians = r.ValueRadians();
+ rfRadians = r.ValueRadians;
}
inline void FromAxisAngle (Vector3 rkAxis, Real fRadians) {
FromAxisAngle ( rkAxis, Radian(fRadians) );
@@ -265,54 +265,54 @@
[Out] float% rfRAngle) {
Radian y, p, r;
bool b = ToEulerAnglesXYZ(y,p,r);
- rfYAngle = y.ValueRadians();
- rfPAngle = p.ValueRadians();
- rfRAngle = r.ValueRadians();
+ rfYAngle = y.ValueRadians;
+ rfPAngle = p.ValueRadians;
+ rfRAngle = r.ValueRadians;
return b;
}
inline bool ToEulerAnglesXZY ([Out] float% rfYAngle, [Out] float% rfPAngle,
[Out] float% rfRAngle) {
Radian y, p, r;
bool b = ToEulerAnglesXZY(y,p,r);
- rfYAngle = y.ValueRadians();
- rfPAngle = p.ValueRadians();
- rfRAngle = r.ValueRadians();
+ rfYAngle = y.ValueRadians;
+ rfPAngle = p.ValueRadians;
+ rfRAngle = r.ValueRadians;
return b;
}
inline bool ToEulerAnglesYXZ ([Out] float% rfYAngle, [Out] float% rfPAngle,
[Out] float% rfRAngle) {
Radian y, p, r;
bool b = ToEulerAnglesYXZ(y,p,r);
- rfYAngle = y.ValueRadians();
- rfPAngle = p.ValueRadians();
- rfRAngle = r.ValueRadians();
+ rfYAngle = y.ValueRadians;
+ rfPAngle = p.ValueRadians;
+ rfRAngle = r.ValueRadians;
return b;
}
inline bool ToEulerAnglesYZX ([Out] float% rfYAngle, [Out] float% rfPAngle,
[Out] float% rfRAngle) {
Radian y, p, r;
bool b = ToEulerAnglesYZX(y,p,r);
- rfYAngle = y.ValueRadians();
- rfPAngle = p.ValueRadians();
- rfRAngle = r.ValueRadians();
+ rfYAngle = y.ValueRadians;
+ rfPAngle = p.ValueRadians;
+ rfRAngle = r.ValueRadians;
return b;
}
inline bool ToEulerAnglesZXY ([Out] float% rfYAngle, [Out] float% rfPAngle,
[Out] float% rfRAngle) {
Radian y, p, r;
bool b = ToEulerAnglesZXY(y,p,r);
- rfYAngle = y.ValueRadians();
- rfPAngle = p.ValueRadians();
- rfRAngle = r.ValueRadians();
+ rfYAngle = y.ValueRadians;
+ rfPAngle = p.ValueRadians;
+ rfRAngle = r.ValueRadians;
return b;
}
inline bool ToEulerAnglesZYX ([Out] float% rfYAngle, [Out] float% rfPAngle,
[Out] float% rfRAngle) {
Radian y, p, r;
bool b = ToEulerAnglesZYX(y,p,r);
- rfYAngle = y.ValueRadians();
- rfPAngle = p.ValueRadians();
- rfRAngle = r.ValueRadians();
+ rfYAngle = y.ValueRadians;
+ rfPAngle = p.ValueRadians;
+ rfRAngle = r.ValueRadians;
return b;
}
inline void FromEulerAnglesXYZ (float fYAngle, float fPAngle, float fRAngle) {
Modified: trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/Mogre/include/Custom/MogreQuaternion.h 2008-12-14 05:09:02 UTC (rev 252)
@@ -122,7 +122,7 @@
inline void ToAngleAxis ([Out] Real% rfAngle, [Out] Vector3% rkAxis) {
Radian r;
ToAngleAxis ( r, rkAxis );
- rfAngle = r.ValueAngleUnits();
+ rfAngle = r.ValueAngleUnits;
}
#endif//OGRE_FORCE_ANGLE_TYPES
void FromAxes (array<Vector3>^ akAxis);
Modified: trunk/Mogre/Mogre/include/Custom/MogreRect.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreRect.h 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/Mogre/include/Custom/MogreRect.h 2008-12-14 05:09:02 UTC (rev 252)
@@ -4,6 +4,7 @@
namespace Mogre
{
+
[Serializable]
public value class FloatRect
{
@@ -32,7 +33,34 @@
}
};
+ [Serializable]
+ public value class RealRect
+ {
+ public:
+ DEFINE_MANAGED_NATIVE_CONVERSIONS_FOR_VALUECLASS( RealRect )
+ Mogre::Real left, top, right, bottom;
+
+ RealRect( float l, float t, float r, float b )
+ : left( l ), top( t ), right( r ), bottom( b )
+ {
+ }
+ property Mogre::Real Width
+ {
+ Mogre::Real get()
+ {
+ return right - left;
+ }
+ }
+ property Mogre::Real Height
+ {
+ Mogre::Real get()
+ {
+ return bottom - top;
+ }
+ }
+ };
+
[Serializable]
public value class Rect
{
Modified: trunk/Mogre/Mogre/include/Custom/MogreVector3.h
===================================================================
--- trunk/Mogre/Mogre/include/Custom/MogreVector3.h 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/Mogre/include/Custom/MogreVector3.h 2008-12-14 05:09:02 UTC (rev 252)
@@ -454,7 +454,7 @@
#ifndef OGRE_FORCE_ANGLE_TYPES
inline Vector3 RandomDeviant(
Real angle,
- Vector3 up ) const
+ Vector3 up )
{
return RandomDeviant ( Radian(angle), up );
}
Modified: trunk/Mogre/Mogre/include/Marshalling.h
===================================================================
--- trunk/Mogre/Mogre/include/Marshalling.h 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/Mogre/include/Marshalling.h 2008-12-14 05:09:02 UTC (rev 252)
@@ -26,6 +26,7 @@
InitNativeUTFStringWithCLRString(utfnvar,m_str);
#define SET_NATIVE_STRING(nvar,mstr) InitNativeStringWithCLRString(nvar,mstr);
+ #define SET_NATIVE_UTFSTRING(nvar, mstr) InitNativeUTFStringWithCLRString(nvar, mstr);
#define TO_CLR_STRING(ogrestr) gcnew System::String((ogrestr).c_str())
#define UTF_TO_CLR_STRING(ogrestr) gcnew System::String((ogrestr).asWStr_c_str())
Modified: trunk/Mogre/Mogre/include/Prerequisites.h
===================================================================
--- trunk/Mogre/Mogre/include/Prerequisites.h 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/Mogre/include/Prerequisites.h 2008-12-14 05:09:02 UTC (rev 252)
@@ -4,6 +4,9 @@
// is used for forward class declarations
#pragma warning( disable : 4240 )
+// Disable "overflow in constant arithmetic" warning
+#pragma warning( disable : 4756 )
+
#define STATIC_ASSERT(A) typedef int __assertchecker##__COUNTER__[(A) ? +1 : -1];
#include "CLRHelp.h"
Modified: trunk/Mogre/Mogre/include/STLMultiMap.h
===================================================================
--- trunk/Mogre/Mogre/include/STLMultiMap.h 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/Mogre/include/STLMultiMap.h 2008-12-14 05:09:02 UTC (rev 252)
@@ -96,13 +96,13 @@
\
virtual bool Equals(Object^ obj) override \
{ \
- Iterator^ clr = dynamic_cast<Iterator^>(obj); \
- if (clr == CLR_NULL) \
- { \
- return false; \
- } \
- \
- return (this == clr); \
+ Iterator^ clr = dynamic_cast<Iterator^>(obj); \
+ if (clr == CLR_NULL) \
+ { \
+ return false; \
+ } \
+ \
+ return (this == clr); \
} \
\
inline static bool operator ==(Iterator^ it1, Iterator^ it2) \
@@ -380,13 +380,13 @@
\
virtual bool Equals(Object^ obj) override \
{ \
- ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj); \
- if (clr == CLR_NULL) \
- { \
- return false; \
- } \
- \
- return (this == clr); \
+ ConstIterator^ clr = dynamic_cast<ConstIterator^>(obj); \
+ if (clr == CLR_NULL) \
+ { \
+ return false; \
+ } \
+ \
+ return (this == clr); \
} \
\
inline static bool operator ==(ConstIterator^ it1, ConstIterator^ it2) \
Modified: trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h
===================================================================
--- trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h 2008-12-06 04:42:38 UTC (rev 251)
+++ trunk/Mogre/Mogre/include/auto/MakePublicDeclarations.h 2008-12-14 05:09:02 UTC (rev 252)
@@ -6,6 +6,7 @@
#include "OgreVector4.h"
#include "OgreQuaternion.h"
#include "OgreColourValue.h"
+#include "OgreMath.h"
#include "OgreAnimation.h"
#include "OgreAnimationTrack.h"
#include "OgreNode.h"
@@ -18,7 +19,6 @@
#include "OgreArchiveManager.h"
#include "OgreBillboard.h"
#include "OgreBillboardSet.h"
-#include "OgreMath.h"
#include "OgreBillboardChain.h"
#include "OgreAxisAlignedBox.h"
#include "OgreCamera.h"
@@ -27,6 +27,8 @@
#include "OgreRenderOperation.h"
#include "OgreMatrix4.h"
#include "OgreTechnique.h"
+#include "OgreSceneManager.h"
+#include "OgreRenderSystem.h"
#include "OgreGpuProgram.h"
#include "OgreMovableObject.h"
#include "OgreBillboardParticleRenderer.h"
@@ -34,11 +36,11 @@
#include "OgreBone.h"
#include "OgreBorderPanelOverlayElement.h"
#include "OgrePlane.h"
-#include "OgreSceneManager.h"
#include "OgreSceneNode.h"
#include "OgreFrustum.h"
#include "OgreViewport.h"
#include "OgreRay.h"
+#include "OgrePlaneBoundedVolume.h"
#include "OgreSphere.h"
#include "OgreCodec.h"
#include "OgreLight.h"
@@ -51,6 +53,7 @@
#include "OgreResourceManager.h"
#include "OgreResource.h"
#include "OgreRenderTargetListener.h"
+#include "OgreRenderTarget.h"
#include "OgreCompositorManager.h"
#include "OgreRenderable.h"
#include "OgreCompositorSerializer.h"
@@ -89,7 +92,6 @@
#include "OgreImageCodec.h"
#include "OgreInstancedGeometry.h"
#include "OgreMatrix3.h"
-#include "OgrePlaneBoundedVolume.h"
#include "OgreLogManager.h"
#include "OgreManualObject.h"
#include "OgreMaterialManager.h"
@@ -97,8 +99,8 @@
#include "OgreSubMesh.h"
#include "OgrePose.h"
#include "OgreMeshManager.h"
+#include "OgreMeshSerializer.h"
#include "OgrePatchMesh.h"
-#include "OgreMeshSerializer.h"
#include "OgreOverlay.h"
#include "OgreOverlayContainer.h"
#include "OgreOverlayElement.h"
@@ -126,11 +128,11 @@
#include "OgreRenderQueueSortingGrouping.h"
#include "OgreRenderQueueInvocation.h"
#include "OgreRenderQueueListener.h"
-#include "OgreRenderSystem.h"
-#include "OgreRenderTarget.h"
#include "OgreRenderSystemCapabilities.h"
#include "OgreRenderWindow.h"
#include "OgreTexture.h"
+#include "OgreRenderSystemCapabilitiesManager.h"
+#include "OgreRenderToVertexBuffer.h"
#include "OgreResourceBackgroundQueue.h"
#include "OgreResourceGroupManager.h"
#include "OgreRibbonTrail.h"
@@ -140,11 +142,14 @@
#include "OgreShadowTextureManager.h"
#include "OgreStaticGeometry.h"
#include "OgreSceneManagerEnumerator.h"
+#include "OgreScriptCompiler.h"
+#include "OgreScriptTranslator.h"
#include "OgreSerializer.h"
#include "OgreShadowCameraSetup.h"
#include "OgreShadowCameraSetupFocused.h"
#include "OgreShadowCameraSetupLiSPSM.h"
#include "OgreShadowCameraSetupPlaneOptimal.h"
+#include "OgreShadowCameraSetupPSSM.h"
#include "OgreShadowCaster.h"
#include "OgreSimpleRenderable.h"
#include "OgreSimpleSpline.h"
@@ -165,6 +170,8 @@
#pragma make_public( Ogre::Vector4 )
#pragma make_public( Ogre::Quaternion )
#pragma make_public( Ogre::ColourValue )
+#pragma make_public( Ogre::Radian )
+#pragma make_public( Ogre::Degree )
#pragma make_public( Ogre::AnimableObject )
#pragma make_public( Ogre::Animation )
#pragma make_public( Ogre::NodeAnimationTrack )
@@ -188,7 +195,6 @@
#pragma make_public( Ogre::ArchiveManager )
#pragma make_public( Ogre::Billboard )
#pragma make_public( Ogre::BillboardSet )
-#pragma make_public( Ogre::Radian )
#pragma make_public( Ogre::BillboardChain )
#pragma make_public( Ogre::AxisAlignedBox )
#pragma make_public( Ogre::Camera )
@@ -197,6 +203,8 @@
#pragma make_public( Ogre::RenderOperation )
#pragma make_public( Ogre::Matrix4 )
#pragma make_public( Ogre::Technique )
+#pragma make_public( Ogre::SceneManager )
+#pragma make_public( Ogre::RenderSystem )
#pragma make_public( Ogre::GpuProgramParameters )
#pragma make_public( Ogre::BillboardChainFactory )
#pragma make_public( Ogre::MovableObject )
@@ -207,11 +215,11 @@
#pragma make_public( Ogre::BorderPanelOverlayElement )
#pragma make_public( Ogre::BorderRenderable )
#pragma make_public( Ogre::Plane )
-#pragma make_public( Ogre::SceneManager )
#pragma make_public( Ogre::SceneNode )
#pragma make_public( Ogre::Frustum )
#pragma make_public( Ogre::Viewport )
#pragma make_public( Ogre::Ray )
+#pragma make_public( Ogre::PlaneBoundedVolume )
#pragma make_public( Ogre::Sphere )
#pragma make_public( Ogre::Codec )
#pragma make_public( Ogre::Light )
@@ -226,6 +234,7 @@
#pragma make_public( Ogre::CompositorPtr )
#pragma make_public( Ogre::RenderTargetEvent )
#pragma make_public( Ogre::RenderTargetViewportEvent )
+#pragma make_public( Ogre::RenderTarget )
#pragma make_public( Ogre::CompositorManager )
#pragma make_public( Ogre::Renderable )
#pragma make_public( Ogre::CompositorSerializer )
@@ -258,6 +267,7 @@
#pragma make_public( Ogre::GpuLogicalBufferStruct )
#pragma make_public( Ogre::GpuNamedConstants )
#pragma make_public( Ogre::GpuConstantDefinition )
+#pragma make_public( Ogre::GpuNamedConstantsSerializer )
#pragma make_public( Ogre::GpuProgram )
#pragma make_public( Ogre::GpuProgramManager )
#pragma make_public( Ogre::GpuProgramPtr )
@@ -282,7 +292,6 @@
#pragma make_public( Ogre::InstancedGeometry )
#pragma make_public( Ogre::Matrix3 )
#pragma make_public( Ogre::SkeletonPtr )
-#pragma make_public( Ogre::PlaneBoundedVolume )
#pragma make_public( Ogre::LightFactory )
#pragma make_public( Ogre::LogListener )
#pragma make_public( Ogre::LogManager )
@@ -297,6 +306,7 @@
#pragma make_public( Ogre::MeshLodUsage )
#pragma make_public( Ogre::IndexData )
#pragma make_public( Ogre::MeshManager )
+#pragma make_public( Ogre::MeshSerializerListener )
#pragma make_public( Ogre::PatchMeshPtr )
#pragma make_public( Ogre::MeshSerializer )
#pragma make_public( Ogre::MovableObjectFactory )
@@ -339,15 +349,18 @@
#pragma make_public( Ogre::QueuedRenderableVisitor )
#pragma make_public( Ogre::QueuedRenderableCollection )
#pragma make_public( Ogre::RenderPriorityGroup )
-#pragma make_public( Ogre::RenderSystem )
-#pragma make_public( Ogre::RenderTarget )
#pragma make_public( Ogre::RenderSystemCapabilities )
+#pragma make_public( Ogre::DriverVersion )
#pragma make_public( Ogre::RenderWindow )
#pragma make_public( Ogre::MultiRenderTarget )
#pragma make_public( Ogre::TexturePtr )
+#pragma make_public( Ogre::RenderSystemCapabilitiesManager )
#pragma make_public( Ogre::RenderTargetListener )
+#pragma make_public( Ogre::RenderToVertexBuffer )
+#pragma make_public( Ogre::BackgroundProcessResult )
#pragma make_public( Ogre::ResourceBackgroundQueue )
#pragma make_public( Ogre::ResourceGroupListener )
+#pragma make_public( Ogre::ResourceLoadingListener )
#pragma make_public( Ogre::ResourceGroupManager )
#pragma make_public( Ogre::RibbonTrail )
#pragma make_public( Ogre::RibbonTrailFactory )
@@ -357,7 +370,6 @@
#pragma make_public( Ogre::RotationalSpline )
#pragma make_public( Ogre::VisibleObjectsBoundsInfo )
#pragma make_public( Ogre::ViewPoint )
-#pragma make_public( Ogre::ShadowListener )
#pragma make_public( Ogre::AxisAlignedBoxSceneQuery )
#pragma make_public( Ogre::SphereSceneQuery )
#pragma make_public( Ogre::PlaneBoundedVolumeListSceneQuery )
@@ -380,12 +392,17 @@
#pragma make_public( Ogre::RegionSceneQuery )
#pragma make_public( Ogre::RaySceneQueryResultEntry )
#pragma make_public( Ogre::IntersectionSceneQueryResult )
+#pragma make_public( Ogre::ScriptCompilerManager )
+#pragma make_public( Ogre::ScriptCompilerListener )
+#pragma make_public( Ogre::ScriptTranslatorManager )
+#pragma make_public( Ogre::ScriptTranslator )
#pragma make_public( Ogre::Serializer )
#pragma make_public( Ogre::ShadowCameraSetup )
#pragma make_public( Ogre::DefaultShadowCameraSetup )
#pragma make_public( Ogre::FocusedShadowCameraSetup )
#pragma make_public( Ogre::LiSPSMShadowCameraSetup )
#pragma make_public( Ogre::PlaneOptimalShadowCameraSetup )
+#pragma make_public( ...
[truncated message content] |
|
From: <mog...@li...> - 2008-12-06 04:42:45
|
Revision: 251
http://mogre.svn.sourceforge.net/mogre/?rev=251&view=rev
Author: gnometank
Date: 2008-12-06 04:42:38 +0000 (Sat, 06 Dec 2008)
Log Message:
-----------
MOGRE 1.4 branch.
Added Paths:
-----------
branches/1.4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2008-12-06 04:41:59
|
Revision: 250
http://mogre.svn.sourceforge.net/mogre/?rev=250&view=rev
Author: gnometank
Date: 2008-12-06 04:41:56 +0000 (Sat, 06 Dec 2008)
Log Message:
-----------
The branch tool will create this.
Removed Paths:
-------------
branches/1.4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2008-12-06 04:39:32
|
Revision: 249
http://mogre.svn.sourceforge.net/mogre/?rev=249&view=rev
Author: gnometank
Date: 2008-12-06 04:39:29 +0000 (Sat, 06 Dec 2008)
Log Message:
-----------
1.4 branch folder.
Added Paths:
-----------
branches/1.4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2008-08-29 01:53:16
|
Revision: 248
http://mogre.svn.sourceforge.net/mogre/?rev=248&view=rev
Author: Marioko
Date: 2008-08-29 01:53:14 +0000 (Fri, 29 Aug 2008)
Log Message:
-----------
MOGRE v1.6.0 Working Tag
Added Paths:
-----------
tags/1.6.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2008-07-03 10:46:43
|
Revision: 247
http://mogre.svn.sourceforge.net/mogre/?rev=247&view=rev
Author: bekas
Date: 2008-07-03 03:46:40 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
-Add Visual C++ 2008 solution and projects.
-Set the OIS project to compile with SEH exceptions (/EHa).
Added Paths:
-----------
trunk/MOIS/ois/Win32/CommandLine/CommandLine_vc9.vcproj
trunk/MOIS/ois/Win32/DemoFFTest/DemoFFTest_vc9.vcproj
trunk/MOIS/ois/Win32/OIS_vc9.vcproj
trunk/MOIS/ois/Win32/ois_vc9.sln
Added: trunk/MOIS/ois/Win32/CommandLine/CommandLine_vc9.vcproj
===================================================================
--- trunk/MOIS/ois/Win32/CommandLine/CommandLine_vc9.vcproj (rev 0)
+++ trunk/MOIS/ois/Win32/CommandLine/CommandLine_vc9.vcproj 2008-07-03 10:46:40 UTC (rev 247)
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="Demo_Console"
+ ProjectGUID="{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_static_d.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\lib;..\..\src\win32\extras\WiiMote"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/CommandLine.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_static.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\lib;..\..\src\win32\extras\WiiMote"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_d.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\lib64"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/CommandLine.pdb"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\lib64"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="CommandLine.rc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\demos\OISConsole.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/MOIS/ois/Win32/DemoFFTest/DemoFFTest_vc9.vcproj
===================================================================
--- trunk/MOIS/ois/Win32/DemoFFTest/DemoFFTest_vc9.vcproj (rev 0)
+++ trunk/MOIS/ois/Win32/DemoFFTest/DemoFFTest_vc9.vcproj 2008-07-03 10:46:40 UTC (rev 247)
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="Demo_FFTest"
+ ProjectGUID="{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_d.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\dll;..\..\src\win32\extras\WiiMote"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\dll;..\..\src\win32\extras\WiiMote"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_d.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\lib64"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\lib64"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="FF.rc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\demos\FFConsoleDemo.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/MOIS/ois/Win32/OIS_vc9.vcproj
===================================================================
--- trunk/MOIS/ois/Win32/OIS_vc9.vcproj (rev 0)
+++ trunk/MOIS/ois/Win32/OIS_vc9.vcproj 2008-07-03 10:46:40 UTC (rev 247)
@@ -0,0 +1,888 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="OIS"
+ ProjectGUID="{9CC704CB-4956-4479-BDEC-57CBC03F700E}"
+ RootNamespace="OIS"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\lib"
+ IntermediateDirectory="..\lib\obj\debug"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\includes;..\src;"C:\Program Files\Microsoft DirectX 9.0 SDK (December 2004)\Include""
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_STLP_DEBUG"
+ MinimalRebuild="true"
+ ExceptionHandling="2"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough="StdAfx.h"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ OutputFile="$(OutDir)/OIS_static_d.lib"
+ AdditionalLibraryDirectories="..\src\win32\extras\WiiMote;"C:\Program Files\Microsoft DirectX 9.0 SDK (December 2004)\Lib\x86""
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\lib"
+ IntermediateDirectory="..\lib\obj\release"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\includes;..\src;"C:\Program Files\Microsoft DirectX 9.0 SDK (December 2004)\Include""
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ StringPooling="true"
+ ExceptionHandling="2"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ OutputFile="$(OutDir)/OIS_static.lib"
+ AdditionalLibraryDirectories="..\src\win32\extras\WiiMote;"C:\Program Files\Microsoft DirectX 9.0 SDK (December 2004)\Lib\x86""
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="OIS_ReleaseDll|Win32"
+ OutputDirectory="..\dll"
+ IntermediateDirectory="..\dll\release"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\includes; ..\src"
+ PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ AdditionalLibraryDirectories="..\src\win32\extras\WiiMote\"
+ GenerateDebugInformation="false"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
+ LinkTimeCodeGeneration="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="OIS_DebugDll|Win32"
+ OutputDirectory="..\dll"
+ IntermediateDirectory="..\dll\debug"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\includes; ..\src"
+ PreprocessorDefinitions="WIN32;_DEBUG;_STLP_DEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough="StdAfx.h"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ OutputFile="$(OutDir)/OIS_d.dll"
+ AdditionalLibraryDirectories="..\src\win32\extras\WiiMote\"
+ GenerateDebugInformation="true"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\lib64\"
+ IntermediateDirectory="..\lib64\obj\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\includes"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_STLP_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough="StdAfx.h"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ OutputFile="$(OutDir)/OIS_d.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\lib64\"
+ IntermediateDirectory="..\lib64\obj\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ EnableFiberSafeOptimizations="true"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="..\includes"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ OutputFile="$(OutDir)/OIS.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="OIS_ReleaseDll|x64"
+ OutputDirectory="..\dll64"
+ IntermediateDirectory="..\dll64\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ EnableFiberSafeOptimizations="true"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="..\includes"
+ PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ GenerateDebugInformation="true"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="OIS_DebugDll|x64"
+ OutputDirectory="..\dll64"
+ IntermediateDirectory="..\dll64\$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\includes"
+ PreprocessorDefinitions="WIN32;_DEBUG;_STLP_DEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough="StdAfx.h"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ OutputFile="$(OutDir)/OIS_d.dll"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+ >
+ <File
+ RelativePath="..\src\OISEffect.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\OISException.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\OISForceFeedback.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\OISInputManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\OISJoyStick.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\OISKeyboard.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\OISObject.cpp"
+ >
+ </File>
+ <Filter
+ Name="Win32"
+ >
+ <File
+ RelativePath="..\src\win32\Win32ForceFeedback.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\Win32InputManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\Win32JoyStick.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\Win32KeyBoard.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\Win32Mouse.cpp"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc"
+ >
+ <File
+ RelativePath="..\includes\OIS.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISConfig.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISEvents.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISException.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISFactoryCreator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISInputManager.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISJoystick.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISKeyboard.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISMouse.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISObject.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISPrereqs.h"
+ >
+ </File>
+ <Filter
+ Name="Win32"
+ >
+ <File
+ RelativePath="..\includes\win32\Win32ForceFeedback.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\win32\Win32InputManager.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\win32\Win32JoyStick.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\win32\Win32KeyBoard.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\win32\Win32Mouse.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\win32\Win32Prereqs.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Interface"
+ >
+ <File
+ RelativePath="..\includes\OISEffect.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISForceFeedback.h"
+ >
+ </File>
+ <File
+ RelativePath="..\includes\OISInterface.h"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="Extras"
+ >
+ <Filter
+ Name="WiiMote"
+ >
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\hiddevice.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\hiddevice.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\OISWiiMote.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\OISWiiMote.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\OISWiiMoteFactoryCreator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\OISWiiMoteFactoryCreator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\OISWiiMoteForceFeedback.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\OISWiiMoteForceFeedback.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\OISWiiMoteRingBuffer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\OISWiiMoteRingBuffer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\wiimote.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\win32\extras\WiiMote\wiimote.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="LIRC"
+ >
+ <File
+ RelativePath="..\src\extras\LIRC\OISLIRC.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\extras\LIRC\OISLIRC.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\extras\LIRC\OISLIRCFactoryCreator.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\extras\LIRC\OISLIRCFactoryCreator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\extras\LIRC\OISLIRCRingBuffer.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="XInput"
+ >
+ </Filter>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/MOIS/ois/Win32/ois_vc9.sln
===================================================================
--- trunk/MOIS/ois/Win32/ois_vc9.sln (rev 0)
+++ trunk/MOIS/ois/Win32/ois_vc9.sln 2008-07-03 10:46:40 UTC (rev 247)
@@ -0,0 +1,51 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OIS", "OIS_vc9.vcproj", "{9CC704CB-4956-4479-BDEC-57CBC03F700E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_Console", "CommandLine\CommandLine_vc9.vcproj", "{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_FFTest", "DemoFFTest\DemoFFTest_vc9.vcproj", "{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.Build.0 = Debug|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|x64.ActiveCfg = Debug|x64
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|x64.Build.0 = Debug|x64
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.ActiveCfg = Release|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.Build.0 = Release|Win32
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|x64.ActiveCfg = Release|x64
+ {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|x64.Build.0 = Release|x64
+ {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|Win32.Build.0 = Debug|Win32
+ {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|x64.ActiveCfg = Debug|x64
+ {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|x64.Build.0 = Debug|x64
+ {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|Win32.ActiveCfg = Release|Win32
+ {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|Win32.Build.0 = Release|Win32
+ {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|x64.ActiveCfg = Release|x64
+ {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|x64.Build.0 = Release|x64
+ {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|Win32.Build.0 = Debug|Win32
+ {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|x64.ActiveCfg = Debug|x64
+ {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|x64.Build.0 = Debug|x64
+ {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|Win32.ActiveCfg = Release|Win32
+ {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|Win32.Build.0 = Release|Win32
+ {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|x64.ActiveCfg = Release|x64
+ {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mog...@li...> - 2008-07-03 10:24:23
|
Revision: 246
http://mogre.svn.sourceforge.net/mogre/?rev=246&view=rev
Author: bekas
Date: 2008-07-03 03:24:08 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
Add OIS 1.2 version.
Added Paths:
-----------
trunk/MOIS/ois/
trunk/MOIS/ois/CVS/
trunk/MOIS/ois/CVS/Entries
trunk/MOIS/ois/CVS/Entries.Extra
trunk/MOIS/ois/CVS/Entries.Extra.Old
trunk/MOIS/ois/CVS/Entries.Log
trunk/MOIS/ois/CVS/Entries.Old
trunk/MOIS/ois/CVS/Repository
trunk/MOIS/ois/CVS/Root
trunk/MOIS/ois/CVS/Tag
trunk/MOIS/ois/LinuxCB/
trunk/MOIS/ois/LinuxCB/ActionMapOgreDemo.cbp
trunk/MOIS/ois/LinuxCB/CVS/
trunk/MOIS/ois/LinuxCB/CVS/Entries
trunk/MOIS/ois/LinuxCB/CVS/Entries.Extra
trunk/MOIS/ois/LinuxCB/CVS/Entries.Extra.Old
trunk/MOIS/ois/LinuxCB/CVS/Entries.Old
trunk/MOIS/ois/LinuxCB/CVS/Repository
trunk/MOIS/ois/LinuxCB/CVS/Root
trunk/MOIS/ois/LinuxCB/CVS/Tag
trunk/MOIS/ois/LinuxCB/ConsoleDemo.cbp
trunk/MOIS/ois/LinuxCB/LinuxOIS.workspace
trunk/MOIS/ois/LinuxCB/OIS.cbp
trunk/MOIS/ois/Mac/
trunk/MOIS/ois/Mac/CVS/
trunk/MOIS/ois/Mac/CVS/Entries
trunk/MOIS/ois/Mac/CVS/Entries.Extra
trunk/MOIS/ois/Mac/CVS/Entries.Extra.Old
trunk/MOIS/ois/Mac/CVS/Entries.Old
trunk/MOIS/ois/Mac/CVS/Repository
trunk/MOIS/ois/Mac/CVS/Root
trunk/MOIS/ois/Mac/CVS/Tag
trunk/MOIS/ois/Mac/SDL/
trunk/MOIS/ois/Mac/SDL/CVS/
trunk/MOIS/ois/Mac/SDL/CVS/Entries
trunk/MOIS/ois/Mac/SDL/CVS/Entries.Extra
trunk/MOIS/ois/Mac/SDL/CVS/Entries.Extra.Old
trunk/MOIS/ois/Mac/SDL/CVS/Entries.Old
trunk/MOIS/ois/Mac/SDL/CVS/Repository
trunk/MOIS/ois/Mac/SDL/CVS/Root
trunk/MOIS/ois/Mac/SDL/CVS/Tag
trunk/MOIS/ois/Mac/SDL/blank.keepme
trunk/MOIS/ois/Mac/XCode-1.5/
trunk/MOIS/ois/Mac/XCode-1.5/CVS/
trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries
trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Extra
trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Extra.Old
trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Old
trunk/MOIS/ois/Mac/XCode-1.5/CVS/Repository
trunk/MOIS/ois/Mac/XCode-1.5/CVS/Root
trunk/MOIS/ois/Mac/XCode-1.5/CVS/Tag
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries.Extra
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries.Extra.Old
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries.Old
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Repository
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Root
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Tag
trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/project.pbxproj
trunk/MOIS/ois/Mac/XCode-2.2/
trunk/MOIS/ois/Mac/XCode-2.2/CVS/
trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries
trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Extra
trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Extra.Old
trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Old
trunk/MOIS/ois/Mac/XCode-2.2/CVS/Repository
trunk/MOIS/ois/Mac/XCode-2.2/CVS/Root
trunk/MOIS/ois/Mac/XCode-2.2/CVS/Tag
trunk/MOIS/ois/Mac/XCode-2.2/ConsoleTest-Info.plist
trunk/MOIS/ois/Mac/XCode-2.2/OIS-Info.plist
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/CVS/
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/CVS/Entries
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/CVS/Entries.Extra
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/CVS/Entries.Extra.Old
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/CVS/Entries.Old
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/CVS/Repository
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/CVS/Root
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/CVS/Tag
trunk/MOIS/ois/Mac/XCode-2.2/OIS.xcodeproj/project.pbxproj
trunk/MOIS/ois/Makefile.am
trunk/MOIS/ois/OIS.pc.in
trunk/MOIS/ois/ReadMe.txt
trunk/MOIS/ois/Win32/
trunk/MOIS/ois/Win32/CVS/
trunk/MOIS/ois/Win32/CVS/Entries
trunk/MOIS/ois/Win32/CVS/Entries.Extra
trunk/MOIS/ois/Win32/CVS/Entries.Extra.Old
trunk/MOIS/ois/Win32/CVS/Entries.Old
trunk/MOIS/ois/Win32/CVS/Repository
trunk/MOIS/ois/Win32/CVS/Root
trunk/MOIS/ois/Win32/CVS/Tag
trunk/MOIS/ois/Win32/CommandLine/
trunk/MOIS/ois/Win32/CommandLine/CVS/
trunk/MOIS/ois/Win32/CommandLine/CVS/Entries
trunk/MOIS/ois/Win32/CommandLine/CVS/Entries.Extra
trunk/MOIS/ois/Win32/CommandLine/CVS/Entries.Extra.Old
trunk/MOIS/ois/Win32/CommandLine/CVS/Entries.Old
trunk/MOIS/ois/Win32/CommandLine/CVS/Repository
trunk/MOIS/ois/Win32/CommandLine/CVS/Root
trunk/MOIS/ois/Win32/CommandLine/CVS/Tag
trunk/MOIS/ois/Win32/CommandLine/CommandLine.cbp
trunk/MOIS/ois/Win32/CommandLine/CommandLine.rc
trunk/MOIS/ois/Win32/CommandLine/CommandLine.vcproj
trunk/MOIS/ois/Win32/CommandLine/CommandLine_vc8.vcproj
trunk/MOIS/ois/Win32/CommandLine/resource.h
trunk/MOIS/ois/Win32/DemoFFTest/
trunk/MOIS/ois/Win32/DemoFFTest/CVS/
trunk/MOIS/ois/Win32/DemoFFTest/CVS/Entries
trunk/MOIS/ois/Win32/DemoFFTest/CVS/Entries.Extra
trunk/MOIS/ois/Win32/DemoFFTest/CVS/Entries.Extra.Old
trunk/MOIS/ois/Win32/DemoFFTest/CVS/Entries.Old
trunk/MOIS/ois/Win32/DemoFFTest/CVS/Repository
trunk/MOIS/ois/Win32/DemoFFTest/CVS/Root
trunk/MOIS/ois/Win32/DemoFFTest/CVS/Tag
trunk/MOIS/ois/Win32/DemoFFTest/DemoFFTest.cbp
trunk/MOIS/ois/Win32/DemoFFTest/DemoFFTest.vcproj
trunk/MOIS/ois/Win32/DemoFFTest/DemoFFTest_vc8.vcproj
trunk/MOIS/ois/Win32/DemoFFTest/FF.rc
trunk/MOIS/ois/Win32/DemoFFTest/resource.h
trunk/MOIS/ois/Win32/OIS.vcproj
trunk/MOIS/ois/Win32/OIS.workspace
trunk/MOIS/ois/Win32/OIS_vc8.vcproj
trunk/MOIS/ois/Win32/SDL/
trunk/MOIS/ois/Win32/SDL/CVS/
trunk/MOIS/ois/Win32/SDL/CVS/Entries
trunk/MOIS/ois/Win32/SDL/CVS/Entries.Extra
trunk/MOIS/ois/Win32/SDL/CVS/Entries.Extra.Old
trunk/MOIS/ois/Win32/SDL/CVS/Entries.Old
trunk/MOIS/ois/Win32/SDL/CVS/Repository
trunk/MOIS/ois/Win32/SDL/CVS/Root
trunk/MOIS/ois/Win32/SDL/CVS/Tag
trunk/MOIS/ois/Win32/SDL/OIS_sdl_vc8.vcproj
trunk/MOIS/ois/Win32/SDL/SdlDemo/
trunk/MOIS/ois/Win32/SDL/SdlDemo/CVS/
trunk/MOIS/ois/Win32/SDL/SdlDemo/CVS/Entries
trunk/MOIS/ois/Win32/SDL/SdlDemo/CVS/Entries.Extra
trunk/MOIS/ois/Win32/SDL/SdlDemo/CVS/Entries.Extra.Old
trunk/MOIS/ois/Win32/SDL/SdlDemo/CVS/Entries.Old
trunk/MOIS/ois/Win32/SDL/SdlDemo/CVS/Repository
trunk/MOIS/ois/Win32/SDL/SdlDemo/CVS/Root
trunk/MOIS/ois/Win32/SDL/SdlDemo/CVS/Tag
trunk/MOIS/ois/Win32/SDL/SdlDemo/SdlDemo.cpp
trunk/MOIS/ois/Win32/SDL/SdlDemo/SdlDemo.rc
trunk/MOIS/ois/Win32/SDL/SdlDemo/SdlDemo.vcproj
trunk/MOIS/ois/Win32/SDL/SdlDemo/resource.h
trunk/MOIS/ois/Win32/SDL/ois_sdl_vc8.sln
trunk/MOIS/ois/Win32/ois.cbp
trunk/MOIS/ois/Win32/ois.sln
trunk/MOIS/ois/Win32/ois_vc8.sln
trunk/MOIS/ois/acinclude.m4
trunk/MOIS/ois/bootstrap
trunk/MOIS/ois/configure.ac
trunk/MOIS/ois/demos/
trunk/MOIS/ois/demos/CVS/
trunk/MOIS/ois/demos/CVS/Entries
trunk/MOIS/ois/demos/CVS/Entries.Extra
trunk/MOIS/ois/demos/CVS/Entries.Extra.Old
trunk/MOIS/ois/demos/CVS/Entries.Old
trunk/MOIS/ois/demos/CVS/Repository
trunk/MOIS/ois/demos/CVS/Root
trunk/MOIS/ois/demos/CVS/Tag
trunk/MOIS/ois/demos/FFConsoleDemo.cpp
trunk/MOIS/ois/demos/Makefile.am
trunk/MOIS/ois/demos/OISConsole.cpp
trunk/MOIS/ois/includes/
trunk/MOIS/ois/includes/CVS/
trunk/MOIS/ois/includes/CVS/Entries
trunk/MOIS/ois/includes/CVS/Entries.Extra
trunk/MOIS/ois/includes/CVS/Entries.Extra.Old
trunk/MOIS/ois/includes/CVS/Entries.Old
trunk/MOIS/ois/includes/CVS/Repository
trunk/MOIS/ois/includes/CVS/Root
trunk/MOIS/ois/includes/CVS/Tag
trunk/MOIS/ois/includes/Makefile.am
trunk/MOIS/ois/includes/OIS.h
trunk/MOIS/ois/includes/OISConfig.h
trunk/MOIS/ois/includes/OISEffect.h
trunk/MOIS/ois/includes/OISEvents.h
trunk/MOIS/ois/includes/OISException.h
trunk/MOIS/ois/includes/OISFactoryCreator.h
trunk/MOIS/ois/includes/OISForceFeedback.h
trunk/MOIS/ois/includes/OISInputManager.h
trunk/MOIS/ois/includes/OISInterface.h
trunk/MOIS/ois/includes/OISJoyStick.h
trunk/MOIS/ois/includes/OISKeyboard.h
trunk/MOIS/ois/includes/OISMouse.h
trunk/MOIS/ois/includes/OISObject.h
trunk/MOIS/ois/includes/OISPrereqs.h
trunk/MOIS/ois/includes/SDL/
trunk/MOIS/ois/includes/SDL/CVS/
trunk/MOIS/ois/includes/SDL/CVS/Entries
trunk/MOIS/ois/includes/SDL/CVS/Entries.Extra
trunk/MOIS/ois/includes/SDL/CVS/Entries.Extra.Old
trunk/MOIS/ois/includes/SDL/CVS/Entries.Old
trunk/MOIS/ois/includes/SDL/CVS/Repository
trunk/MOIS/ois/includes/SDL/CVS/Root
trunk/MOIS/ois/includes/SDL/CVS/Tag
trunk/MOIS/ois/includes/SDL/SDLInputManager.h
trunk/MOIS/ois/includes/SDL/SDLJoyStick.h
trunk/MOIS/ois/includes/SDL/SDLKeyboard.h
trunk/MOIS/ois/includes/SDL/SDLMouse.h
trunk/MOIS/ois/includes/SDL/SDLPrereqs.h
trunk/MOIS/ois/includes/linux/
trunk/MOIS/ois/includes/linux/CVS/
trunk/MOIS/ois/includes/linux/CVS/Entries
trunk/MOIS/ois/includes/linux/CVS/Entries.Extra
trunk/MOIS/ois/includes/linux/CVS/Entries.Extra.Old
trunk/MOIS/ois/includes/linux/CVS/Entries.Old
trunk/MOIS/ois/includes/linux/CVS/Repository
trunk/MOIS/ois/includes/linux/CVS/Root
trunk/MOIS/ois/includes/linux/CVS/Tag
trunk/MOIS/ois/includes/linux/EventHelpers.h
trunk/MOIS/ois/includes/linux/LinuxForceFeedback.h
trunk/MOIS/ois/includes/linux/LinuxInputManager.h
trunk/MOIS/ois/includes/linux/LinuxJoyStickEvents.h
trunk/MOIS/ois/includes/linux/LinuxKeyboard.h
trunk/MOIS/ois/includes/linux/LinuxMouse.h
trunk/MOIS/ois/includes/linux/LinuxPrereqs.h
trunk/MOIS/ois/includes/mac/
trunk/MOIS/ois/includes/mac/CVS/
trunk/MOIS/ois/includes/mac/CVS/Entries
trunk/MOIS/ois/includes/mac/CVS/Entries.Extra
trunk/MOIS/ois/includes/mac/CVS/Entries.Extra.Old
trunk/MOIS/ois/includes/mac/CVS/Entries.Old
trunk/MOIS/ois/includes/mac/CVS/Repository
trunk/MOIS/ois/includes/mac/CVS/Root
trunk/MOIS/ois/includes/mac/CVS/Tag
trunk/MOIS/ois/includes/mac/MacHIDManager.h
trunk/MOIS/ois/includes/mac/MacHelpers.h
trunk/MOIS/ois/includes/mac/MacInputManager.h
trunk/MOIS/ois/includes/mac/MacKeyboard.h
trunk/MOIS/ois/includes/mac/MacMouse.h
trunk/MOIS/ois/includes/mac/MacPrereqs.h
trunk/MOIS/ois/includes/win32/
trunk/MOIS/ois/includes/win32/CVS/
trunk/MOIS/ois/includes/win32/CVS/Entries
trunk/MOIS/ois/includes/win32/CVS/Entries.Extra
trunk/MOIS/ois/includes/win32/CVS/Entries.Extra.Old
trunk/MOIS/ois/includes/win32/CVS/Entries.Old
trunk/MOIS/ois/includes/win32/CVS/Repository
trunk/MOIS/ois/includes/win32/CVS/Root
trunk/MOIS/ois/includes/win32/CVS/Tag
trunk/MOIS/ois/includes/win32/Win32ForceFeedback.h
trunk/MOIS/ois/includes/win32/Win32InputManager.h
trunk/MOIS/ois/includes/win32/Win32JoyStick.h
trunk/MOIS/ois/includes/win32/Win32KeyBoard.h
trunk/MOIS/ois/includes/win32/Win32Mouse.h
trunk/MOIS/ois/includes/win32/Win32Prereqs.h
trunk/MOIS/ois/lib/
trunk/MOIS/ois/lib/.keepme
trunk/MOIS/ois/lib/CVS/
trunk/MOIS/ois/lib/CVS/Entries
trunk/MOIS/ois/lib/CVS/Entries.Extra
trunk/MOIS/ois/lib/CVS/Entries.Extra.Old
trunk/MOIS/ois/lib/CVS/Entries.Old
trunk/MOIS/ois/lib/CVS/Repository
trunk/MOIS/ois/lib/CVS/Root
trunk/MOIS/ois/lib/CVS/Tag
trunk/MOIS/ois/src/
trunk/MOIS/ois/src/CVS/
trunk/MOIS/ois/src/CVS/Entries
trunk/MOIS/ois/src/CVS/Entries.Extra
trunk/MOIS/ois/src/CVS/Entries.Extra.Old
trunk/MOIS/ois/src/CVS/Entries.Old
trunk/MOIS/ois/src/CVS/Repository
trunk/MOIS/ois/src/CVS/Root
trunk/MOIS/ois/src/CVS/Tag
trunk/MOIS/ois/src/Makefile.am
trunk/MOIS/ois/src/OISEffect.cpp
trunk/MOIS/ois/src/OISException.cpp
trunk/MOIS/ois/src/OISForceFeedback.cpp
trunk/MOIS/ois/src/OISInputManager.cpp
trunk/MOIS/ois/src/OISJoyStick.cpp
trunk/MOIS/ois/src/OISKeyboard.cpp
trunk/MOIS/ois/src/OISObject.cpp
trunk/MOIS/ois/src/SDL/
trunk/MOIS/ois/src/SDL/CVS/
trunk/MOIS/ois/src/SDL/CVS/Entries
trunk/MOIS/ois/src/SDL/CVS/Entries.Extra
trunk/MOIS/ois/src/SDL/CVS/Entries.Extra.Old
trunk/MOIS/ois/src/SDL/CVS/Entries.Old
trunk/MOIS/ois/src/SDL/CVS/Repository
trunk/MOIS/ois/src/SDL/CVS/Root
trunk/MOIS/ois/src/SDL/CVS/Tag
trunk/MOIS/ois/src/SDL/SDLInputManager.cpp
trunk/MOIS/ois/src/SDL/SDLJoyStick.cpp
trunk/MOIS/ois/src/SDL/SDLKeyboard.cpp
trunk/MOIS/ois/src/SDL/SDLMouse.cpp
trunk/MOIS/ois/src/extras/
trunk/MOIS/ois/src/extras/CVS/
trunk/MOIS/ois/src/extras/CVS/Entries
trunk/MOIS/ois/src/extras/CVS/Entries.Extra
trunk/MOIS/ois/src/extras/CVS/Entries.Extra.Old
trunk/MOIS/ois/src/extras/CVS/Entries.Old
trunk/MOIS/ois/src/extras/CVS/Repository
trunk/MOIS/ois/src/extras/CVS/Root
trunk/MOIS/ois/src/extras/CVS/Tag
trunk/MOIS/ois/src/extras/LIRC/
trunk/MOIS/ois/src/extras/LIRC/CVS/
trunk/MOIS/ois/src/extras/LIRC/CVS/Entries
trunk/MOIS/ois/src/extras/LIRC/CVS/Entries.Extra
trunk/MOIS/ois/src/extras/LIRC/CVS/Entries.Extra.Old
trunk/MOIS/ois/src/extras/LIRC/CVS/Entries.Old
trunk/MOIS/ois/src/extras/LIRC/CVS/Repository
trunk/MOIS/ois/src/extras/LIRC/CVS/Root
trunk/MOIS/ois/src/extras/LIRC/CVS/Tag
trunk/MOIS/ois/src/extras/LIRC/OISLIRC.cpp
trunk/MOIS/ois/src/extras/LIRC/OISLIRC.h
trunk/MOIS/ois/src/extras/LIRC/OISLIRCFactoryCreator.cpp
trunk/MOIS/ois/src/extras/LIRC/OISLIRCFactoryCreator.h
trunk/MOIS/ois/src/extras/LIRC/OISLIRCRingBuffer.h
trunk/MOIS/ois/src/linux/
trunk/MOIS/ois/src/linux/CVS/
trunk/MOIS/ois/src/linux/CVS/Entries
trunk/MOIS/ois/src/linux/CVS/Entries.Extra
trunk/MOIS/ois/src/linux/CVS/Entries.Extra.Old
trunk/MOIS/ois/src/linux/CVS/Entries.Old
trunk/MOIS/ois/src/linux/CVS/Repository
trunk/MOIS/ois/src/linux/CVS/Root
trunk/MOIS/ois/src/linux/CVS/Tag
trunk/MOIS/ois/src/linux/EventHelpers.cpp
trunk/MOIS/ois/src/linux/LinuxForceFeedback.cpp
trunk/MOIS/ois/src/linux/LinuxInputManager.cpp
trunk/MOIS/ois/src/linux/LinuxJoyStickEvents.cpp
trunk/MOIS/ois/src/linux/LinuxKeyboard.cpp
trunk/MOIS/ois/src/linux/LinuxMouse.cpp
trunk/MOIS/ois/src/mac/
trunk/MOIS/ois/src/mac/CVS/
trunk/MOIS/ois/src/mac/CVS/Entries
trunk/MOIS/ois/src/mac/CVS/Entries.Extra
trunk/MOIS/ois/src/mac/CVS/Entries.Extra.Old
trunk/MOIS/ois/src/mac/CVS/Entries.Old
trunk/MOIS/ois/src/mac/CVS/Repository
trunk/MOIS/ois/src/mac/CVS/Root
trunk/MOIS/ois/src/mac/CVS/Tag
trunk/MOIS/ois/src/mac/MacHIDManager.cpp
trunk/MOIS/ois/src/mac/MacHelpers.cpp
trunk/MOIS/ois/src/mac/MacInputManager.cpp
trunk/MOIS/ois/src/mac/MacKeyboard.cpp
trunk/MOIS/ois/src/mac/MacMouse.cpp
trunk/MOIS/ois/src/win32/
trunk/MOIS/ois/src/win32/CVS/
trunk/MOIS/ois/src/win32/CVS/Entries
trunk/MOIS/ois/src/win32/CVS/Entries.Extra
trunk/MOIS/ois/src/win32/CVS/Entries.Extra.Old
trunk/MOIS/ois/src/win32/CVS/Entries.Old
trunk/MOIS/ois/src/win32/CVS/Repository
trunk/MOIS/ois/src/win32/CVS/Root
trunk/MOIS/ois/src/win32/CVS/Tag
trunk/MOIS/ois/src/win32/Win32ForceFeedback.cpp
trunk/MOIS/ois/src/win32/Win32InputManager.cpp
trunk/MOIS/ois/src/win32/Win32JoyStick.cpp
trunk/MOIS/ois/src/win32/Win32KeyBoard.cpp
trunk/MOIS/ois/src/win32/Win32Mouse.cpp
trunk/MOIS/ois/src/win32/extras/
trunk/MOIS/ois/src/win32/extras/CVS/
trunk/MOIS/ois/src/win32/extras/CVS/Entries
trunk/MOIS/ois/src/win32/extras/CVS/Entries.Extra
trunk/MOIS/ois/src/win32/extras/CVS/Entries.Extra.Old
trunk/MOIS/ois/src/win32/extras/CVS/Entries.Old
trunk/MOIS/ois/src/win32/extras/CVS/Repository
trunk/MOIS/ois/src/win32/extras/CVS/Root
trunk/MOIS/ois/src/win32/extras/CVS/Tag
trunk/MOIS/ois/src/win32/extras/WiiMote/
trunk/MOIS/ois/src/win32/extras/WiiMote/CVS/
trunk/MOIS/ois/src/win32/extras/WiiMote/CVS/Entries
trunk/MOIS/ois/src/win32/extras/WiiMote/CVS/Entries.Extra
trunk/MOIS/ois/src/win32/extras/WiiMote/CVS/Entries.Extra.Old
trunk/MOIS/ois/src/win32/extras/WiiMote/CVS/Entries.Old
trunk/MOIS/ois/src/win32/extras/WiiMote/CVS/Repository
trunk/MOIS/ois/src/win32/extras/WiiMote/CVS/Root
trunk/MOIS/ois/src/win32/extras/WiiMote/CVS/Tag
trunk/MOIS/ois/src/win32/extras/WiiMote/OISWiiMote.cpp
trunk/MOIS/ois/src/win32/extras/WiiMote/OISWiiMote.h
trunk/MOIS/ois/src/win32/extras/WiiMote/OISWiiMoteFactoryCreator.cpp
trunk/MOIS/ois/src/win32/extras/WiiMote/OISWiiMoteFactoryCreator.h
trunk/MOIS/ois/src/win32/extras/WiiMote/OISWiiMoteForceFeedback.cpp
trunk/MOIS/ois/src/win32/extras/WiiMote/OISWiiMoteForceFeedback.h
trunk/MOIS/ois/src/win32/extras/WiiMote/OISWiiMoteRingBuffer.cpp
trunk/MOIS/ois/src/win32/extras/WiiMote/OISWiiMoteRingBuffer.h
trunk/MOIS/ois/src/win32/extras/WiiMote/hiddevice.cpp
trunk/MOIS/ois/src/win32/extras/WiiMote/hiddevice.h
trunk/MOIS/ois/src/win32/extras/WiiMote/main.cpp
trunk/MOIS/ois/src/win32/extras/WiiMote/wiimote.cpp
trunk/MOIS/ois/src/win32/extras/WiiMote/wiimote.h
Added: trunk/MOIS/ois/CVS/Entries
===================================================================
--- trunk/MOIS/ois/CVS/Entries (rev 0)
+++ trunk/MOIS/ois/CVS/Entries 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,7 @@
+/Makefile.am/1.1.1.1/Tue Oct 4 22:36:10 2005//Tv1_2
+/OIS.pc.in/1.2/Sat Jul 15 16:21:58 2006//Tv1_2
+/ReadMe.txt/1.9/Thu Jan 4 19:37:43 2007//Tv1_2
+/acinclude.m4/1.8/Thu Aug 31 21:51:56 2006//Tv1_2
+/bootstrap/1.4/Thu Nov 15 06:25:53 2007//Tv1_2
+/configure.ac/1.15.2.1/Thu Feb 14 03:33:36 2008//Tv1_2
+D
Added: trunk/MOIS/ois/CVS/Entries.Extra
===================================================================
--- trunk/MOIS/ois/CVS/Entries.Extra (rev 0)
+++ trunk/MOIS/ois/CVS/Entries.Extra 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,6 @@
+/Makefile.am////*///
+/OIS.pc.in////*///
+/ReadMe.txt////*///
+/acinclude.m4////*///
+/bootstrap////*///
+/configure.ac////*///
Added: trunk/MOIS/ois/CVS/Entries.Extra.Old
===================================================================
Added: trunk/MOIS/ois/CVS/Entries.Log
===================================================================
--- trunk/MOIS/ois/CVS/Entries.Log (rev 0)
+++ trunk/MOIS/ois/CVS/Entries.Log 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,7 @@
+A D/LinuxCB////
+A D/Mac////
+A D/Win32////
+A D/demos////
+A D/includes////
+A D/lib////
+A D/src////
Added: trunk/MOIS/ois/CVS/Entries.Old
===================================================================
Added: trunk/MOIS/ois/CVS/Repository
===================================================================
--- trunk/MOIS/ois/CVS/Repository (rev 0)
+++ trunk/MOIS/ois/CVS/Repository 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+ois
Added: trunk/MOIS/ois/CVS/Root
===================================================================
--- trunk/MOIS/ois/CVS/Root (rev 0)
+++ trunk/MOIS/ois/CVS/Root 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+:pserver:ano...@wg...:/cvsroot/wgois
Added: trunk/MOIS/ois/CVS/Tag
===================================================================
--- trunk/MOIS/ois/CVS/Tag (rev 0)
+++ trunk/MOIS/ois/CVS/Tag 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+Tv1_2
Added: trunk/MOIS/ois/LinuxCB/ActionMapOgreDemo.cbp
===================================================================
--- trunk/MOIS/ois/LinuxCB/ActionMapOgreDemo.cbp (rev 0)
+++ trunk/MOIS/ois/LinuxCB/ActionMapOgreDemo.cbp 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="4" />
+ <Project>
+ <Option title="Demo_OgreActionMap" />
+ <Option compiler="gcc" />
+ <Build>
+ <Target title="Release">
+ <Option output="../demos/ogre/common/ActionMapping" />
+ <Option working_dir="../demos/ogre/common" />
+ <Option object_output="../demos/ogre/obj/release" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Option includeInTargetAll="1" />
+ <Option projectResourceIncludeDirsRelation="2" />
+ <Compiler>
+ <Add option="-O3" />
+ <Add directory="../demos/ogre" />
+ <Add directory="../includes" />
+ <Add directory="/usr/local/include/CEGUI" />
+ <Add directory="/usr/local/include/OGRE" />
+ <Add directory="/usr/local/include/CEGUI/elements" />
+ </Compiler>
+ <Linker>
+ <Add library="/usr/local/lib/libCEGUIBase.so" />
+ <Add library="/usr/local/lib/libCEGUIOgreRenderer.so" />
+ <Add library="/usr/local/lib/libOgreMain.so" />
+ <Add library="~/libs/OIS.so" />
+ </Linker>
+ </Target>
+ </Build>
+ <Unit filename="../demos/ogre/ActionConfig.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ActionConfig.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ActionMap.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ActionMap.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ExampleApplication.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ExampleFrameListener.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/gui.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Release" />
+ </Unit>
+ </Project>
+</CodeBlocks_project_file>
\ No newline at end of file
Added: trunk/MOIS/ois/LinuxCB/CVS/Entries
===================================================================
--- trunk/MOIS/ois/LinuxCB/CVS/Entries (rev 0)
+++ trunk/MOIS/ois/LinuxCB/CVS/Entries 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,5 @@
+/ActionMapOgreDemo.cbp/1.1/Thu May 4 18:06:52 2006//Tv1_2
+/ConsoleDemo.cbp/1.4/Fri May 5 07:35:23 2006//Tv1_2
+/LinuxOIS.workspace/1.3/Thu May 4 18:06:52 2006//Tv1_2
+/OIS.cbp/1.4/Fri May 5 07:35:23 2006//Tv1_2
+D
Added: trunk/MOIS/ois/LinuxCB/CVS/Entries.Extra
===================================================================
--- trunk/MOIS/ois/LinuxCB/CVS/Entries.Extra (rev 0)
+++ trunk/MOIS/ois/LinuxCB/CVS/Entries.Extra 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,4 @@
+/ActionMapOgreDemo.cbp////*///
+/ConsoleDemo.cbp////*///
+/LinuxOIS.workspace////*///
+/OIS.cbp////*///
Added: trunk/MOIS/ois/LinuxCB/CVS/Entries.Extra.Old
===================================================================
Added: trunk/MOIS/ois/LinuxCB/CVS/Entries.Old
===================================================================
Added: trunk/MOIS/ois/LinuxCB/CVS/Repository
===================================================================
--- trunk/MOIS/ois/LinuxCB/CVS/Repository (rev 0)
+++ trunk/MOIS/ois/LinuxCB/CVS/Repository 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+ois/LinuxCB
Added: trunk/MOIS/ois/LinuxCB/CVS/Root
===================================================================
--- trunk/MOIS/ois/LinuxCB/CVS/Root (rev 0)
+++ trunk/MOIS/ois/LinuxCB/CVS/Root 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+:pserver:ano...@wg...:/cvsroot/wgois
Added: trunk/MOIS/ois/LinuxCB/CVS/Tag
===================================================================
--- trunk/MOIS/ois/LinuxCB/CVS/Tag (rev 0)
+++ trunk/MOIS/ois/LinuxCB/CVS/Tag 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+Tv1_2
Added: trunk/MOIS/ois/LinuxCB/ConsoleDemo.cbp
===================================================================
--- trunk/MOIS/ois/LinuxCB/ConsoleDemo.cbp (rev 0)
+++ trunk/MOIS/ois/LinuxCB/ConsoleDemo.cbp 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="4" />
+ <Project>
+ <Option title="Demo_Console" />
+ <Option pch_mode="0" />
+ <Option compiler="gcc" />
+ <Build>
+ <Target title="Release">
+ <Option output="../demos/Console" />
+ <Option working_dir="../demos" />
+ <Option object_output="../demos/obj/release" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Option includeInTargetAll="1" />
+ <Option projectResourceIncludeDirsRelation="2" />
+ <Compiler>
+ <Add directory="../includes" />
+ </Compiler>
+ </Target>
+ </Build>
+ <Linker>
+ <Add library="~/libs/OIS.so" />
+ </Linker>
+ <Unit filename="../demos/OISConsole.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Release" />
+ </Unit>
+ </Project>
+</CodeBlocks_project_file>
\ No newline at end of file
Added: trunk/MOIS/ois/LinuxCB/LinuxOIS.workspace
===================================================================
--- trunk/MOIS/ois/LinuxCB/LinuxOIS.workspace (rev 0)
+++ trunk/MOIS/ois/LinuxCB/LinuxOIS.workspace 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_workspace_file>
+ <Workspace title="OIS Project">
+ <Project filename="OIS.cbp" />
+ <Project filename="ConsoleDemo.cbp">
+ <Depends filename="OIS.cbp" />
+ </Project>
+ <Project filename="ActionMapOgreDemo.cbp" active="1">
+ <Depends filename="OIS.cbp" />
+ </Project>
+ </Workspace>
+</CodeBlocks_workspace_file>
\ No newline at end of file
Added: trunk/MOIS/ois/LinuxCB/OIS.cbp
===================================================================
--- trunk/MOIS/ois/LinuxCB/OIS.cbp (rev 0)
+++ trunk/MOIS/ois/LinuxCB/OIS.cbp 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="4" />
+ <Project>
+ <Option title="OIS" />
+ <Option pch_mode="0" />
+ <Option default_target="-1" />
+ <Option compiler="gcc" />
+ <Build>
+ <Target title="Debug">
+ <Option output="~/libs/OIS_d.so" />
+ <Option working_dir="~/libs" />
+ <Option object_output="../lib/obj/debug" />
+ <Option type="3" />
+ <Option compiler="gcc" />
+ <Option includeInTargetAll="1" />
+ <Option createDefFile="1" />
+ <Option projectResourceIncludeDirsRelation="2" />
+ <Compiler>
+ <Add option="-Wfatal-errors" />
+ <Add option="-W" />
+ <Add option="-Wall" />
+ <Add option="-pg" />
+ <Add option="-g" />
+ <Add option="-D_DEBUG" />
+ <Add option="-DOIS_JOYEVENTS" />
+ <Add directory="../includes" />
+ </Compiler>
+ <Linker>
+ <Add option="-pg" />
+ <Add library="libXaw" />
+ <Add library="libX11" />
+ <Add directory="/usr/lib" />
+ <Add directory="/usr/lib/X11R6" />
+ </Linker>
+ </Target>
+ <Target title="Release">
+ <Option output="~/libs/OIS.so" />
+ <Option working_dir="~/libs" />
+ <Option object_output="../lib/obj/release" />
+ <Option type="3" />
+ <Option compiler="gcc" />
+ <Option includeInTargetAll="1" />
+ <Option createDefFile="1" />
+ <Option projectResourceIncludeDirsRelation="2" />
+ <Compiler>
+ <Add option="-O3" />
+ <Add option="-DOIS_JOYEVENTS" />
+ <Add directory="../includes" />
+ </Compiler>
+ <Linker>
+ <Add option="-s" />
+ <Add library="libXaw" />
+ <Add library="libX11" />
+ <Add directory="/usr/lib" />
+ <Add directory="/usr/lib/X11R6" />
+ </Linker>
+ </Target>
+ </Build>
+ <Unit filename="../includes/OIS.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISConfig.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISEffect.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISEvents.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISException.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISForceFeedback.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISInputManager.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISInterface.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISJoyStick.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISKeyboard.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISMouse.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISObject.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISPrereqs.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISEffect.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISForceFeedback.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISInputManager.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISJoyStick.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISKeyboard.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISObject.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/EventHelpers.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxForceFeedback.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxInputManager.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxJoyStickEvents.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxKeyboard.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxMouse.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ </Project>
+</CodeBlocks_project_file>
\ No newline at end of file
Added: trunk/MOIS/ois/Mac/CVS/Entries
===================================================================
--- trunk/MOIS/ois/Mac/CVS/Entries (rev 0)
+++ trunk/MOIS/ois/Mac/CVS/Entries 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,3 @@
+D/SDL////
+D/XCode-1.5////
+D/XCode-2.2////
Added: trunk/MOIS/ois/Mac/CVS/Entries.Extra
===================================================================
--- trunk/MOIS/ois/Mac/CVS/Entries.Extra (rev 0)
+++ trunk/MOIS/ois/Mac/CVS/Entries.Extra 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,3 @@
+D/SDL///////
+D/XCode-1.5///////
+D/XCode-2.2///////
Added: trunk/MOIS/ois/Mac/CVS/Entries.Extra.Old
===================================================================
Added: trunk/MOIS/ois/Mac/CVS/Entries.Old
===================================================================
--- trunk/MOIS/ois/Mac/CVS/Entries.Old (rev 0)
+++ trunk/MOIS/ois/Mac/CVS/Entries.Old 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+D
Added: trunk/MOIS/ois/Mac/CVS/Repository
===================================================================
--- trunk/MOIS/ois/Mac/CVS/Repository (rev 0)
+++ trunk/MOIS/ois/Mac/CVS/Repository 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+ois/Mac
Added: trunk/MOIS/ois/Mac/CVS/Root
===================================================================
--- trunk/MOIS/ois/Mac/CVS/Root (rev 0)
+++ trunk/MOIS/ois/Mac/CVS/Root 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+:pserver:ano...@wg...:/cvsroot/wgois
Added: trunk/MOIS/ois/Mac/CVS/Tag
===================================================================
--- trunk/MOIS/ois/Mac/CVS/Tag (rev 0)
+++ trunk/MOIS/ois/Mac/CVS/Tag 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+Tv1_2
Added: trunk/MOIS/ois/Mac/SDL/CVS/Entries
===================================================================
--- trunk/MOIS/ois/Mac/SDL/CVS/Entries (rev 0)
+++ trunk/MOIS/ois/Mac/SDL/CVS/Entries 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,2 @@
+/blank.keepme/1.2/Sat Jul 15 16:21:58 2006//Tv1_2
+D
Added: trunk/MOIS/ois/Mac/SDL/CVS/Entries.Extra
===================================================================
--- trunk/MOIS/ois/Mac/SDL/CVS/Entries.Extra (rev 0)
+++ trunk/MOIS/ois/Mac/SDL/CVS/Entries.Extra 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+/blank.keepme////*///
Added: trunk/MOIS/ois/Mac/SDL/CVS/Entries.Extra.Old
===================================================================
Added: trunk/MOIS/ois/Mac/SDL/CVS/Entries.Old
===================================================================
Added: trunk/MOIS/ois/Mac/SDL/CVS/Repository
===================================================================
--- trunk/MOIS/ois/Mac/SDL/CVS/Repository (rev 0)
+++ trunk/MOIS/ois/Mac/SDL/CVS/Repository 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+ois/Mac/SDL
Added: trunk/MOIS/ois/Mac/SDL/CVS/Root
===================================================================
--- trunk/MOIS/ois/Mac/SDL/CVS/Root (rev 0)
+++ trunk/MOIS/ois/Mac/SDL/CVS/Root 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+:pserver:ano...@wg...:/cvsroot/wgois
Added: trunk/MOIS/ois/Mac/SDL/CVS/Tag
===================================================================
--- trunk/MOIS/ois/Mac/SDL/CVS/Tag (rev 0)
+++ trunk/MOIS/ois/Mac/SDL/CVS/Tag 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+Tv1_2
Added: trunk/MOIS/ois/Mac/SDL/blank.keepme
===================================================================
Added: trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+D/oisStatic.xcode////
Added: trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Extra
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Extra (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Extra 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+D/oisStatic.xcode///////
Added: trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Extra.Old
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Extra.Old (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Extra.Old 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,2 @@
+D/oisStatic.xcode///////
+D/oisStatic.xcodeproj///////
Added: trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Old
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Old (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/CVS/Entries.Old 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,2 @@
+D/oisStatic.xcode////
+D/oisStatic.xcodeproj////
Added: trunk/MOIS/ois/Mac/XCode-1.5/CVS/Repository
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/CVS/Repository (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/CVS/Repository 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+ois/Mac/XCode-1.5
Added: trunk/MOIS/ois/Mac/XCode-1.5/CVS/Root
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/CVS/Root (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/CVS/Root 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+:pserver:ano...@wg...:/cvsroot/wgois
Added: trunk/MOIS/ois/Mac/XCode-1.5/CVS/Tag
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/CVS/Tag (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/CVS/Tag 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+Tv1_2
Added: trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,2 @@
+/project.pbxproj/1.2.6.1/Thu Feb 14 03:33:36 2008//Tv1_2
+D
Added: trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries.Extra
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries.Extra (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries.Extra 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+/project.pbxproj////*///
Added: trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries.Extra.Old
===================================================================
Added: trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Entries.Old
===================================================================
Added: trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Repository
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Repository (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Repository 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+ois/Mac/XCode-1.5/oisStatic.xcode
Added: trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Root
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Root (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Root 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+:pserver:ano...@wg...:/cvsroot/wgois
Added: trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Tag
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Tag (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/CVS/Tag 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+Tv1_2
Added: trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/project.pbxproj
===================================================================
--- trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/project.pbxproj (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-1.5/oisStatic.xcode/project.pbxproj 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,655 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 39;
+ objects = {
+ 034768DDFF38A45A11DB9C8B = {
+ children = (
+ D2AAC06F0554671400DB518D,
+ );
+ isa = PBXGroup;
+ name = Products;
+ path = "";
+ refType = 4;
+ sourceTree = "<group>";
+ };
+//030
+//031
+//032
+//033
+//034
+//080
+//081
+//082
+//083
+//084
+ 0867D690FE84028FC02AAC07 = {
+ buildSettings = {
+ };
+ buildStyles = (
+ 4F0BB7EC011F40E904CA0E50,
+ 4F0BB7ED011F40E904CA0E50,
+ );
+ hasScannedForEncodings = 1;
+ isa = PBXProject;
+ mainGroup = 0867D691FE84028FC02AAC07;
+ productRefGroup = 034768DDFF38A45A11DB9C8B;
+ projectDirPath = "";
+ targets = (
+ D2AAC06E0554671400DB518D,
+ );
+ };
+ 0867D691FE84028FC02AAC07 = {
+ children = (
+ DFC6D5A909A05F7D00FA2ACC,
+ 08FB77ACFE841707C02AAC07,
+ DF279D9809A303DB00D6B6E6,
+ 0867D69AFE84028FC02AAC07,
+ 034768DDFF38A45A11DB9C8B,
+ );
+ isa = PBXGroup;
+ name = oisStatic;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 0867D69AFE84028FC02AAC07 = {
+ children = (
+ 08FB77AAFE841565C02AAC07,
+ );
+ isa = PBXGroup;
+ name = "External Frameworks and Libraries";
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 08FB77AAFE841565C02AAC07 = {
+ isa = PBXFileReference;
+ lastKnownFileType = wrapper.framework;
+ name = Carbon.framework;
+ path = /System/Library/Frameworks/Carbon.framework;
+ refType = 0;
+ sourceTree = "<absolute>";
+ };
+ 08FB77ACFE841707C02AAC07 = {
+ children = (
+ DFC6D5A609A05F7600FA2ACC,
+ DFC6D5A309A05F6C00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Source;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+//080
+//081
+//082
+//083
+//084
+//4F0
+//4F1
+//4F2
+//4F3
+//4F4
+ 4F0BB7EC011F40E904CA0E50 = {
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ ZERO_LINK = YES;
+ };
+ isa = PBXBuildStyle;
+ name = Development;
+ };
+ 4F0BB7ED011F40E904CA0E50 = {
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ ZERO_LINK = NO;
+ };
+ isa = PBXBuildStyle;
+ name = Deployment;
+ };
+//4F0
+//4F1
+//4F2
+//4F3
+//4F4
+//D20
+//D21
+//D22
+//D23
+//D24
+ D2AAC06B0554671400DB518D = {
+ buildActionMask = 2147483647;
+ files = (
+ DFC6D65009A060CF00FA2ACC,
+ DFC6D65109A060CF00FA2ACC,
+ DFC6D65209A060CF00FA2ACC,
+ DFC6D65309A060CF00FA2ACC,
+ DFC6D65409A060CF00FA2ACC,
+ DFC6D65509A060CF00FA2ACC,
+ DFC6D65609A060CF00FA2ACC,
+ DFC6D65709A060CF00FA2ACC,
+ DFC6D65809A060CF00FA2ACC,
+ DFC6D65909A060CF00FA2ACC,
+ DFC6D65A09A060CF00FA2ACC,
+ DFC6D65B09A060CF00FA2ACC,
+ DFC6D66209A060E900FA2ACC,
+ DFC6D66309A060E900FA2ACC,
+ DFC6D66409A060E900FA2ACC,
+ DFC6D66509A060E900FA2ACC,
+ );
+ isa = PBXHeadersBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ D2AAC06C0554671400DB518D = {
+ buildActionMask = 2147483647;
+ files = (
+ DFC6D66D09A0615A00FA2ACC,
+ DFC6D66E09A0615A00FA2ACC,
+ DFC6D66F09A0615A00FA2ACC,
+ DFC6D67009A0615A00FA2ACC,
+ DFC6D67109A0615A00FA2ACC,
+ DFC6D67709A0617F00FA2ACC,
+ DFC6D67809A0617F00FA2ACC,
+ DFC6D67909A0617F00FA2ACC,
+ );
+ isa = PBXSourcesBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ D2AAC06D0554671400DB518D = {
+ buildActionMask = 2147483647;
+ files = (
+ D2AAC0700554677100DB518D,
+ );
+ isa = PBXFrameworksBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ D2AAC06E0554671400DB518D = {
+ buildPhases = (
+ D2AAC06B0554671400DB518D,
+ D2AAC06C0554671400DB518D,
+ D2AAC06D0554671400DB518D,
+ );
+ buildRules = (
+ );
+ buildSettings = {
+ GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ HEADER_SEARCH_PATHS = ../../includes;
+ INSTALL_PATH = /usr/local/lib;
+ LIBRARY_STYLE = STATIC;
+ PRODUCT_NAME = ois;
+ };
+ dependencies = (
+ );
+ isa = PBXNativeTarget;
+ name = oisStatic;
+ productName = oisStatic;
+ productReference = D2AAC06F0554671400DB518D;
+ productType = "com.apple.product-type.library.static";
+ };
+ D2AAC06F0554671400DB518D = {
+ explicitFileType = archive.ar;
+ includeInIndex = 0;
+ isa = PBXFileReference;
+ path = libois.a;
+ refType = 3;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ D2AAC0700554677100DB518D = {
+ fileRef = 08FB77AAFE841565C02AAC07;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+//D20
+//D21
+//D22
+//D23
+//D24
+//DF0
+//DF1
+//DF2
+//DF3
+//DF4
+ DF279D9809A303DB00D6B6E6 = {
+ children = (
+ );
+ isa = PBXGroup;
+ name = Resources;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5A309A05F6C00FA2ACC = {
+ children = (
+ DFC6D67409A0617F00FA2ACC,
+ DFC6D67509A0617F00FA2ACC,
+ DFC6D67609A0617F00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Mac;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5A609A05F7600FA2ACC = {
+ children = (
+ DFC6D66809A0615A00FA2ACC,
+ DFC6D66909A0615A00FA2ACC,
+ DFC6D66A09A0615A00FA2ACC,
+ DFC6D66B09A0615A00FA2ACC,
+ DFC6D66C09A0615A00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Base;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5A909A05F7D00FA2ACC = {
+ children = (
+ DFC6D5AC09A05F8700FA2ACC,
+ DFC6D5AF09A05F8D00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Include;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5AC09A05F8700FA2ACC = {
+ children = (
+ DFC6D64409A060CF00FA2ACC,
+ DFC6D64509A060CF00FA2ACC,
+ DFC6D64609A060CF00FA2ACC,
+ DFC6D64709A060CF00FA2ACC,
+ DFC6D64809A060CF00FA2ACC,
+ DFC6D64909A060CF00FA2ACC,
+ DFC6D64A09A060CF00FA2ACC,
+ DFC6D64B09A060CF00FA2ACC,
+ DFC6D64C09A060CF00FA2ACC,
+ DFC6D64D09A060CF00FA2ACC,
+ DFC6D64E09A060CF00FA2ACC,
+ DFC6D64F09A060CF00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Base;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5AF09A05F8D00FA2ACC = {
+ children = (
+ DFC6D65E09A060E900FA2ACC,
+ DFC6D65F09A060E900FA2ACC,
+ DFC6D66009A060E900FA2ACC,
+ DFC6D66109A060E900FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Mac;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D64409A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISConfig.h;
+ path = ../../includes/OISConfig.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64509A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISEffect.h;
+ path = ../../includes/OISEffect.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64609A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISEvents.h;
+ path = ../../includes/OISEvents.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64709A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISException.h;
+ path = ../../includes/OISException.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64809A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISForceFeedback.h;
+ path = ../../includes/OISForceFeedback.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64909A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISInputManager.h;
+ path = ../../includes/OISInputManager.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64A09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISInterface.h;
+ path = ../../includes/OISInterface.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64B09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISJoyStick.h;
+ path = ../../includes/OISJoyStick.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64C09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISKeyboard.h;
+ path = ../../includes/OISKeyboard.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64D09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISMouse.h;
+ path = ../../includes/OISMouse.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64E09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISObject.h;
+ path = ../../includes/OISObject.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64F09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISPrereqs.h;
+ path = ../../includes/OISPrereqs.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D65009A060CF00FA2ACC = {
+ fileRef = DFC6D64409A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65109A060CF00FA2ACC = {
+ fileRef = DFC6D64509A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65209A060CF00FA2ACC = {
+ fileRef = DFC6D64609A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65309A060CF00FA2ACC = {
+ fileRef = DFC6D64709A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65409A060CF00FA2ACC = {
+ fileRef = DFC6D64809A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65509A060CF00FA2ACC = {
+ fileRef = DFC6D64909A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65609A060CF00FA2ACC = {
+ fileRef = DFC6D64A09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65709A060CF00FA2ACC = {
+ fileRef = DFC6D64B09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65809A060CF00FA2ACC = {
+ fileRef = DFC6D64C09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65909A060CF00FA2ACC = {
+ fileRef = DFC6D64D09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65A09A060CF00FA2ACC = {
+ fileRef = DFC6D64E09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65B09A060CF00FA2ACC = {
+ fileRef = DFC6D64F09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65E09A060E900FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = MacHelpers.h;
+ path = ../../includes/Mac/MacHelpers.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D65F09A060E900FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = MacInputManager.h;
+ path = ../../includes/Mac/MacInputManager.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66009A060E900FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = MacKeyboard.h;
+ path = ../../includes/Mac/MacKeyboard.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66109A060E900FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = MacPrereqs.h;
+ path = ../../includes/Mac/MacPrereqs.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66209A060E900FA2ACC = {
+ fileRef = DFC6D65E09A060E900FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66309A060E900FA2ACC = {
+ fileRef = DFC6D65F09A060E900FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66409A060E900FA2ACC = {
+ fileRef = DFC6D66009A060E900FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66509A060E900FA2ACC = {
+ fileRef = DFC6D66109A060E900FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66809A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISEffect.cpp;
+ path = ../../src/OISEffect.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66909A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISForceFeedback.cpp;
+ path = ../../src/OISForceFeedback.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66A09A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISInputManager.cpp;
+ path = ../../src/OISInputManager.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66B09A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISKeyboard.cpp;
+ path = ../../src/OISKeyboard.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66C09A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISObject.cpp;
+ path = ../../src/OISObject.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66D09A0615A00FA2ACC = {
+ fileRef = DFC6D66809A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66E09A0615A00FA2ACC = {
+ fileRef = DFC6D66909A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66F09A0615A00FA2ACC = {
+ fileRef = DFC6D66A09A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67009A0615A00FA2ACC = {
+ fileRef = DFC6D66B09A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67109A0615A00FA2ACC = {
+ fileRef = DFC6D66C09A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67409A0617F00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = MacHelpers.cpp;
+ path = ../../src/Mac/MacHelpers.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D67509A0617F00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = MacInputManager.cpp;
+ path = ../../src/Mac/MacInputManager.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D67609A0617F00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = MacKeyboard.cpp;
+ path = ../../src/Mac/MacKeyboard.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D67709A0617F00FA2ACC = {
+ fileRef = DFC6D67409A0617F00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67809A0617F00FA2ACC = {
+ fileRef = DFC6D67509A0617F00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67909A0617F00FA2ACC = {
+ fileRef = DFC6D67609A0617F00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ };
+ rootObject = 0867D690FE84028FC02AAC07;
+}
Added: trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries
===================================================================
--- trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,3 @@
+/ConsoleTest-Info.plist/1.1.2.1/Tue Feb 26 05:46:45 2008//Tv1_2
+/OIS-Info.plist/1.1/Wed Aug 29 03:11:06 2007/-ko/Tv1_2
+D/OIS.xcodeproj////
Added: trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Extra
===================================================================
--- trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Extra (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Extra 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,3 @@
+/ConsoleTest-Info.plist////*///
+/OIS-Info.plist////*///
+D/OIS.xcodeproj///////
Added: trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Extra.Old
===================================================================
--- trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Extra.Old (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Extra.Old 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,4 @@
+/ConsoleTest-Info.plist////*///
+/OIS-Info.plist////*///
+D/OIS.xcodeproj///////
+D/oisStatic.xcodeproj///////
Added: trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Old
===================================================================
--- trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Old (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-2.2/CVS/Entries.Old 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,4 @@
+/ConsoleTest-Info.plist/1.1.2.1/Tue Feb 26 05:46:45 2008//Tv1_2
+/OIS-Info.plist/1.1/Wed Aug 29 03:11:06 2007/-ko/Tv1_2
+D/OIS.xcodeproj////
+D/oisStatic.xcodeproj////
Added: trunk/MOIS/ois/Mac/XCode-2.2/CVS/Repository
===================================================================
--- trunk/MOIS/ois/Mac/XCode-2.2/CVS/Repository (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-2.2/CVS/Repository 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+ois/Mac/XCode-2.2
Added: trunk/MOIS/ois/Mac/XCode-2.2/CVS/Root
===================================================================
--- trunk/MOIS/ois/Mac/XCode-2.2/CVS/Root (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-2.2/CVS/Root 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+:pserver:ano...@wg...:/cvsroot/wgois
Added: trunk/MOIS/ois/Mac/XCode-2.2/CVS/Tag
===================================================================
--- trunk/MOIS/ois/Mac/XCode-2.2/CVS/Tag (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-2.2/CVS/Tag 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1 @@
+Tv1_2
Added: trunk/MOIS/ois/Mac/XCode-2.2/ConsoleTest-Info.plist
===================================================================
--- trunk/MOIS/ois/Mac/XCode-2.2/ConsoleTest-Info.plist (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-2.2/ConsoleTest-Info.plist 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.yourcompany.ConsoleTest</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+</dict>
+</plist>
Added: trunk/MOIS/ois/Mac/XCode-2.2/OIS-Info.plist
===================================================================
--- trunk/MOIS/ois/Mac/XCode-2.2/OIS-Info.plist (rev 0)
+++ trunk/MOIS/ois/Mac/XCode-2.2/OIS-Info.plist 2008-07-03 10:24:08 UTC (rev 246)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBL...
[truncated message content] |
