Menu
▾
▴
[Ogreaddons-svnmail] SF.net SVN: ogreaddons:[2767] branches/ogrenewt/newton20
|
From: <kal...@us...> - 2009-12-26 10:50:30
|
Revision: 2767
http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2767&view=rev
Author: kallaspriit
Date: 2009-12-26 10:50:16 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Changes by Julio Jerez
- support for the NGD joint-library
- player controller uses the joint-library
- updated picking, now uses kinematic controller and convex cast for exact placement
- many more smaller updates
Modified Paths:
--------------
branches/ogrenewt/newton20/OgreNewt.sln
branches/ogrenewt/newton20/OgreNewt.suo
branches/ogrenewt/newton20/OgreNewt.vcproj
branches/ogrenewt/newton20/demos/Demo01_TheBasics/Demo01_TheBasics.vcproj
branches/ogrenewt/newton20/demos/Demo01_TheBasics/demo01.cpp
branches/ogrenewt/newton20/demos/Demo02_Joints/Demo02_Joints.vcproj
branches/ogrenewt/newton20/demos/Demo02_Joints/OgreNewtonApplication.cpp
branches/ogrenewt/newton20/demos/Demo02_Joints/OgreNewtonApplication.h
branches/ogrenewt/newton20/demos/Demo02_Joints/OgreNewtonFrameListener.cpp
branches/ogrenewt/newton20/demos/Demo02_Joints/OgreNewtonFrameListener.h
branches/ogrenewt/newton20/demos/Demo03_CollisionCallbacks/Demo03_CollisionCallbacks.vcproj
branches/ogrenewt/newton20/demos/Demo03_CollisionCallbacks/OgreNewtonApplication.cpp
branches/ogrenewt/newton20/demos/Demo03_CollisionCallbacks/OgreNewtonFrameListener.cpp
branches/ogrenewt/newton20/demos/Demo04_Raycasting/Demo04_Raycasting.vcproj
branches/ogrenewt/newton20/demos/Demo04_Raycasting/OgreNewtonApplication.cpp
branches/ogrenewt/newton20/demos/Demo04_Raycasting/OgreNewtonApplication.h
branches/ogrenewt/newton20/demos/Demo04_Raycasting/OgreNewtonFrameListener.cpp
branches/ogrenewt/newton20/demos/Demo04_Raycasting/OgreNewtonFrameListener.h
branches/ogrenewt/newton20/demos/Demo06_SimpleBuoyancy/Demo06_SimpleBuoyancy.vcproj
branches/ogrenewt/newton20/demos/Demo06_SimpleBuoyancy/OgreNewtonApplication.cpp
branches/ogrenewt/newton20/demos/Demo07_CustomJoints/Demo07_CustomJoints.vcproj
branches/ogrenewt/newton20/demos/Demo07_CustomJoints/MyCustomBallSocket.cpp
branches/ogrenewt/newton20/demos/Demo07_CustomJoints/MyCustomBallSocket.h
branches/ogrenewt/newton20/demos/Demo07_CustomJoints/OgreNewtonApplication.cpp
branches/ogrenewt/newton20/demos/Demo09_PlayerController/Demo09_PlayerController.vcproj
branches/ogrenewt/newton20/demos/Demo09_PlayerController/OgreNewtonApplication.cpp
branches/ogrenewt/newton20/demos/bin/Debug/resources.cfg
branches/ogrenewt/newton20/demos/bin/Release/resources.cfg
branches/ogrenewt/newton20/demos/media/materials/scripts/example.material
branches/ogrenewt/newton20/inc/OgreNewt.h
branches/ogrenewt/newton20/inc/OgreNewt_BasicJoints.h
branches/ogrenewt/newton20/inc/OgreNewt_BodyInAABBIterator.h
branches/ogrenewt/newton20/inc/OgreNewt_Collision.h
branches/ogrenewt/newton20/inc/OgreNewt_Joint.h
branches/ogrenewt/newton20/inc/OgreNewt_PlayerController.h
branches/ogrenewt/newton20/inc/OgreNewt_RayCast.h
branches/ogrenewt/newton20/inc/OgreNewt_Tools.h
branches/ogrenewt/newton20/inc/OgreNewt_World.h
branches/ogrenewt/newton20/src/OgreNewt_BasicFrameListener.cpp
branches/ogrenewt/newton20/src/OgreNewt_BasicJoints.cpp
branches/ogrenewt/newton20/src/OgreNewt_Body.cpp
branches/ogrenewt/newton20/src/OgreNewt_BodyInAABBIterator.cpp
branches/ogrenewt/newton20/src/OgreNewt_Collision.cpp
branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp
branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp
branches/ogrenewt/newton20/src/OgreNewt_ContactCallback.cpp
branches/ogrenewt/newton20/src/OgreNewt_ContactJoint.cpp
branches/ogrenewt/newton20/src/OgreNewt_Debugger.cpp
branches/ogrenewt/newton20/src/OgreNewt_Joint.cpp
branches/ogrenewt/newton20/src/OgreNewt_MaterialID.cpp
branches/ogrenewt/newton20/src/OgreNewt_MaterialPair.cpp
branches/ogrenewt/newton20/src/OgreNewt_PlayerController.cpp
branches/ogrenewt/newton20/src/OgreNewt_RayCast.cpp
branches/ogrenewt/newton20/src/OgreNewt_Tools.cpp
branches/ogrenewt/newton20/src/OgreNewt_Vehicle.cpp
branches/ogrenewt/newton20/src/OgreNewt_World.cpp
Added Paths:
-----------
branches/ogrenewt/newton20/demos/Demo01_TheBasics/Ogre.log
branches/ogrenewt/newton20/demos/media/materials/textures/newtonLogo.tga
branches/ogrenewt/newton20/demos/media/primitives/castle.material
branches/ogrenewt/newton20/demos/media/primitives/castle.mesh
branches/ogrenewt/newton20/demos/media/primitives/playground.material
branches/ogrenewt/newton20/demos/media/primitives/playground.mesh
branches/ogrenewt/newton20/demos/media/primitives/textures/
branches/ogrenewt/newton20/demos/media/primitives/textures/032-01a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/032-01b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/032-03a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/032-03b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/032-04c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/032-04d.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/064-01b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/064-01c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/064-02b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/064-02c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/064-03b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/064-04b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/096-01c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/128-01a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/128-03a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/128-comb1.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/256-03a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/GrassAndDirt.tga
branches/ogrenewt/newton20/demos/media/primitives/textures/block01a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/block01b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/block01c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/block01d.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/block02a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/block02b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/block02c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/block02d.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/block06a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/block06b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/brickwall.tga
branches/ogrenewt/newton20/demos/media/primitives/textures/grate1a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/grate1a.tga
branches/ogrenewt/newton20/demos/media/primitives/textures/jumppad1ab.TGA
branches/ogrenewt/newton20/demos/media/primitives/textures/jumppad1ab.blend.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/jumppad1ab.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/jumppadsmall_b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_064-02b.blend.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_064-02b1.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_064-02w.blend.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_064-02w1.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_b064-01a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_b064-01b.blend.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_b064-01b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_b064-01c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_b064-01y.blend.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_v192-01b.blend.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/lig_v192-01ba.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/nnk05stone.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/npoolorange.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/nunuktelep.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/nunuktelep2.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/s128-02a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/s128-02b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/sand1b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/stone03a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/stone03c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/stone03d.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/stone04a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/stone04d.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/stone05a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v064-01a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v064-01c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v064-01d.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v064-02a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v064-02b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v064-02c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v064-02d.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v064-03b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v064-03e.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v096-01c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v128-01a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v128-02a.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v128-02b.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v128-02d.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v128-03c.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/v128-04d.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/wood.tga
branches/ogrenewt/newton20/demos/media/primitives/textures/zbatcula-logo.jpg
branches/ogrenewt/newton20/demos/media/primitives/textures/zbighouse-logo.jpg
branches/ogrenewt/newton20/inc/OgreNewt_ConvexCast.h
branches/ogrenewt/newton20/inc/OgreNewt_Stdafx.h
branches/ogrenewt/newton20/src/OgreNewt_ConvexCast.cpp
branches/ogrenewt/newton20/src/OgreNewt_Stdafx.cpp
Modified: branches/ogrenewt/newton20/OgreNewt.sln
===================================================================
--- branches/ogrenewt/newton20/OgreNewt.sln 2009-12-10 10:22:07 UTC (rev 2766)
+++ branches/ogrenewt/newton20/OgreNewt.sln 2009-12-26 10:50:16 UTC (rev 2767)
@@ -2,12 +2,12 @@
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OgreNewt", "OgreNewt.vcproj", "{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo01_TheBasics", "demos\Demo01_TheBasics\Demo01_TheBasics.vcproj", "{59D5ADD4-9669-468E-B687-F461BB7F4112}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo02_Joints", "demos\Demo02_Joints\Demo02_Joints.vcproj", "{5BAB7340-BEDB-408A-96B1-296785399531}"
ProjectSection(ProjectDependencies) = postProject
{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64} = {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo02_Joints", "demos\Demo02_Joints\Demo02_Joints.vcproj", "{5BAB7340-BEDB-408A-96B1-296785399531}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo01_TheBasics", "demos\Demo01_TheBasics\Demo01_TheBasics.vcproj", "{59D5ADD4-9669-468E-B687-F461BB7F4112}"
ProjectSection(ProjectDependencies) = postProject
{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64} = {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}
EndProjectSection
@@ -37,53 +37,62 @@
{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64} = {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo08_RagdollExample", "demos\Demo08_RagdollExample\Demo08_RagdollExample.vcproj", "{9559CC7B-8F04-47BC-9A66-97084B4F1CC6}"
- ProjectSection(ProjectDependencies) = postProject
- {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64} = {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}
- 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
{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Debug|Win32.ActiveCfg = Debug|Win32
{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Debug|Win32.Build.0 = Debug|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Debug|x64.ActiveCfg = Debug|Win32
{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Release|Win32.ActiveCfg = Release|Win32
{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Release|Win32.Build.0 = Release|Win32
+ {C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}.Release|x64.ActiveCfg = Release|Win32
+ {5BAB7340-BEDB-408A-96B1-296785399531}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5BAB7340-BEDB-408A-96B1-296785399531}.Debug|Win32.Build.0 = Debug|Win32
+ {5BAB7340-BEDB-408A-96B1-296785399531}.Debug|x64.ActiveCfg = Debug|Win32
+ {5BAB7340-BEDB-408A-96B1-296785399531}.Release|Win32.ActiveCfg = Release|Win32
+ {5BAB7340-BEDB-408A-96B1-296785399531}.Release|Win32.Build.0 = Release|Win32
+ {5BAB7340-BEDB-408A-96B1-296785399531}.Release|x64.ActiveCfg = Release|Win32
{59D5ADD4-9669-468E-B687-F461BB7F4112}.Debug|Win32.ActiveCfg = Debug|Win32
{59D5ADD4-9669-468E-B687-F461BB7F4112}.Debug|Win32.Build.0 = Debug|Win32
+ {59D5ADD4-9669-468E-B687-F461BB7F4112}.Debug|x64.ActiveCfg = Debug|Win32
{59D5ADD4-9669-468E-B687-F461BB7F4112}.Release|Win32.ActiveCfg = Release|Win32
{59D5ADD4-9669-468E-B687-F461BB7F4112}.Release|Win32.Build.0 = Release|Win32
- {5BAB7340-BEDB-408A-96B1-296785399531}.Debug|Win32.ActiveCfg = Debug|Win32
- {5BAB7340-BEDB-408A-96B1-296785399531}.Debug|Win32.Build.0 = Debug|Win32
- {5BAB7340-BEDB-408A-96B1-296785399531}.Release|Win32.ActiveCfg = Release|Win32
- {5BAB7340-BEDB-408A-96B1-296785399531}.Release|Win32.Build.0 = Release|Win32
+ {59D5ADD4-9669-468E-B687-F461BB7F4112}.Release|x64.ActiveCfg = Release|Win32
{E575CBC2-5A60-45CC-B2F8-74E2719A8114}.Debug|Win32.ActiveCfg = Debug|Win32
{E575CBC2-5A60-45CC-B2F8-74E2719A8114}.Debug|Win32.Build.0 = Debug|Win32
+ {E575CBC2-5A60-45CC-B2F8-74E2719A8114}.Debug|x64.ActiveCfg = Debug|Win32
{E575CBC2-5A60-45CC-B2F8-74E2719A8114}.Release|Win32.ActiveCfg = Release|Win32
{E575CBC2-5A60-45CC-B2F8-74E2719A8114}.Release|Win32.Build.0 = Release|Win32
+ {E575CBC2-5A60-45CC-B2F8-74E2719A8114}.Release|x64.ActiveCfg = Release|Win32
{8A31E25D-CC48-401E-9936-748453D06D3C}.Debug|Win32.ActiveCfg = Debug|Win32
{8A31E25D-CC48-401E-9936-748453D06D3C}.Debug|Win32.Build.0 = Debug|Win32
+ {8A31E25D-CC48-401E-9936-748453D06D3C}.Debug|x64.ActiveCfg = Debug|Win32
{8A31E25D-CC48-401E-9936-748453D06D3C}.Release|Win32.ActiveCfg = Release|Win32
{8A31E25D-CC48-401E-9936-748453D06D3C}.Release|Win32.Build.0 = Release|Win32
+ {8A31E25D-CC48-401E-9936-748453D06D3C}.Release|x64.ActiveCfg = Release|Win32
{118B989E-1929-4173-99F5-B3C214879241}.Debug|Win32.ActiveCfg = Debug|Win32
{118B989E-1929-4173-99F5-B3C214879241}.Debug|Win32.Build.0 = Debug|Win32
+ {118B989E-1929-4173-99F5-B3C214879241}.Debug|x64.ActiveCfg = Debug|Win32
{118B989E-1929-4173-99F5-B3C214879241}.Release|Win32.ActiveCfg = Release|Win32
{118B989E-1929-4173-99F5-B3C214879241}.Release|Win32.Build.0 = Release|Win32
+ {118B989E-1929-4173-99F5-B3C214879241}.Release|x64.ActiveCfg = Release|Win32
{730565C2-A2C2-4D8B-89D4-ED062FD22B8C}.Debug|Win32.ActiveCfg = Debug|Win32
{730565C2-A2C2-4D8B-89D4-ED062FD22B8C}.Debug|Win32.Build.0 = Debug|Win32
+ {730565C2-A2C2-4D8B-89D4-ED062FD22B8C}.Debug|x64.ActiveCfg = Debug|Win32
{730565C2-A2C2-4D8B-89D4-ED062FD22B8C}.Release|Win32.ActiveCfg = Release|Win32
{730565C2-A2C2-4D8B-89D4-ED062FD22B8C}.Release|Win32.Build.0 = Release|Win32
+ {730565C2-A2C2-4D8B-89D4-ED062FD22B8C}.Release|x64.ActiveCfg = Release|Win32
{2C1C0690-C7DD-4800-9E3F-52E3C3FF7F33}.Debug|Win32.ActiveCfg = Debug|Win32
{2C1C0690-C7DD-4800-9E3F-52E3C3FF7F33}.Debug|Win32.Build.0 = Debug|Win32
+ {2C1C0690-C7DD-4800-9E3F-52E3C3FF7F33}.Debug|x64.ActiveCfg = Debug|Win32
{2C1C0690-C7DD-4800-9E3F-52E3C3FF7F33}.Release|Win32.ActiveCfg = Release|Win32
{2C1C0690-C7DD-4800-9E3F-52E3C3FF7F33}.Release|Win32.Build.0 = Release|Win32
- {9559CC7B-8F04-47BC-9A66-97084B4F1CC6}.Debug|Win32.ActiveCfg = Debug|Win32
- {9559CC7B-8F04-47BC-9A66-97084B4F1CC6}.Debug|Win32.Build.0 = Debug|Win32
- {9559CC7B-8F04-47BC-9A66-97084B4F1CC6}.Release|Win32.ActiveCfg = Release|Win32
- {9559CC7B-8F04-47BC-9A66-97084B4F1CC6}.Release|Win32.Build.0 = Release|Win32
+ {2C1C0690-C7DD-4800-9E3F-52E3C3FF7F33}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: branches/ogrenewt/newton20/OgreNewt.suo
===================================================================
(Binary files differ)
Modified: branches/ogrenewt/newton20/OgreNewt.vcproj
===================================================================
--- branches/ogrenewt/newton20/OgreNewt.vcproj 2009-12-10 10:22:07 UTC (rev 2766)
+++ branches/ogrenewt/newton20/OgreNewt.vcproj 2009-12-26 10:50:16 UTC (rev 2767)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="OgreNewt"
ProjectGUID="{C28C7710-76B1-4FFD-A85A-9AEFDA25EE64}"
RootNamespace="OgreNewt"
@@ -52,16 +52,18 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /Zm1000 -O0 -g3 -fno-inline"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\OgreMain\include";"$(BOOST_HOME)";.\inc"
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(NEWTON_HOME)\sdk\dMath";"$(NEWTON_HOME)\sdk\dCustomJoints";"$(OGRE_HOME)\include";"$(OGRE_HOME)\OgreMain\include";"$(BOOST_HOME)";.\inc"
PreprocessorDefinitions="_OGRENEWT_EXPORTS;_OGRENEWT_DYNAMIC;WIN32"
ExceptionHandling="1"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="OgreNewt_Stdafx.h"
AssemblerListingLocation="Debug"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName=".\lib\OgreNewt_d.pdb"
WarningLevel="3"
+ DebugInformationFormat="3"
CompileAs="2"
/>
<Tool
@@ -78,12 +80,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386 /debug"
- AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib newton.lib OgreMain_d.lib"
+ AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib newton.lib dMath_d.lib JointLibrary_d.lib OgreMain_d.lib $(NOINHERIT)"
OutputFile="./lib/OgreNewt_d.dll"
Version="2.0"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""$(OGRE_HOME)/lib";"$(BOOST_HOME)/libs";"$(NEWTON_HOME)/sdk/x32/dll_vs9""
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""$(OGRE_HOME)/lib";"$(BOOST_HOME)/libs";"$(NEWTON_HOME)/sdk/x32";"$(NEWTON_HOME)/sdk/x32/dll_vs9""
GenerateManifest="true"
+ GenerateDebugInformation="true"
ProgramDatabaseFile=".\lib\OgreNewt_d.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -109,7 +112,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy $(OutDir)\OgreNewt_d.dll demos\bin\Debug\OgreNewt_d.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" "demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" "demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" "demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "demos\bin\Debug\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Debug\newton.dll
"
+ CommandLine="copy $(OutDir)\OgreNewt_d.dll demos\bin\Debug\OgreNewt_d.dll


if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" "demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" "demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" "demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "demos\bin\Debug\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Debug\newton.dll
copy $(NEWTON_HOME)\sdk\x32\JointLibrary_d.dll demos\bin\Debug\JointLibrary_d.dll

"
/>
</Configuration>
<Configuration
@@ -151,15 +154,18 @@
AdditionalOptions=" /Zm1000"
Optimization="2"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(OGRE_HOME)\include";"$(OGRE_HOME)\OgreMain\include";"$(BOOST_HOME)";.\inc"
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(NEWTON_HOME)\sdk\dMath";"$(NEWTON_HOME)\sdk\dCustomJoints";"$(OGRE_HOME)\include";"$(OGRE_HOME)\OgreMain\include";"$(BOOST_HOME)";.\inc"
PreprocessorDefinitions="_OGRENEWT_EXPORTS;_OGRENEWT_DYNAMIC;WIN32"
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="OgreNewt_Stdafx.h"
AssemblerListingLocation="Release"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName=".\lib\OgreNewt.pdb"
WarningLevel="3"
+ DebugInformationFormat="3"
CompileAs="2"
/>
<Tool
@@ -176,12 +182,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386"
- AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib newton.lib OgreMain.lib"
+ AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib newton.lib dMath.lib JointLibrary.lib OgreMain.lib $(NOINHERIT)"
OutputFile="./lib/OgreNewt.dll"
Version="2.0"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OGRE_HOME)/lib";"$(BOOST_HOME)/libs";"$(NEWTON_HOME)/sdk/x32/dll_vs9""
+ AdditionalLibraryDirectories=""$(OGRE_HOME)/lib";"$(BOOST_HOME)/libs";"$(NEWTON_HOME)/sdk/x32";"$(NEWTON_HOME)/sdk/x32/dll_vs9""
GenerateManifest="true"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="lib\OgreNewt.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -207,7 +214,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy $(OutDir)\OgreNewt.dll demos\bin\Release\OgreNewt.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" "demos\bin\Release\cg.dll"

if exist "$(OGRE_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_HOME)\bin\release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\bin\release\OIS.dll" copy "$(OGRE_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIBase.dll" copy "$(OGRE_HOME)\bin\release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\bin\release\cg.dll" copy "$(OGRE_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Release\newton.dll
"
+ CommandLine="copy $(OutDir)\OgreNewt.dll demos\bin\Release\OgreNewt.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" "demos\bin\Release\cg.dll"

if exist "$(OGRE_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_HOME)\bin\release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\bin\release\OIS.dll" copy "$(OGRE_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIBase.dll" copy "$(OGRE_HOME)\bin\release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\bin\release\cg.dll" copy "$(OGRE_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Release\newton.dll
copy $(NEWTON_HOME)\sdk\x32\JointLibrary.dll demos\bin\Release\JointLibrary.dll
"
/>
</Configuration>
</Configurations>
@@ -254,6 +261,10 @@
>
</File>
<File
+ RelativePath=".\src\OgreNewt_ConvexCast.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\OgreNewt_Debugger.cpp"
>
</File>
@@ -278,6 +289,26 @@
>
</File>
<File
+ RelativePath=".\src\OgreNewt_Stdafx.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\OgreNewt_Tools.cpp"
>
</File>
@@ -334,6 +365,10 @@
>
</File>
<File
+ RelativePath=".\inc\OgreNewt_ConvexCast.h"
+ >
+ </File>
+ <File
RelativePath=".\inc\OgreNewt_Debugger.h"
>
</File>
@@ -362,6 +397,10 @@
>
</File>
<File
+ RelativePath=".\inc\OgreNewt_Stdafx.h"
+ >
+ </File>
+ <File
RelativePath=".\inc\OgreNewt_Tools.h"
>
</File>
Modified: branches/ogrenewt/newton20/demos/Demo01_TheBasics/Demo01_TheBasics.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo01_TheBasics/Demo01_TheBasics.vcproj 2009-12-10 10:22:07 UTC (rev 2766)
+++ branches/ogrenewt/newton20/demos/Demo01_TheBasics/Demo01_TheBasics.vcproj 2009-12-26 10:50:16 UTC (rev 2767)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1257"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="Demo01_TheBasics"
ProjectGUID="{59D5ADD4-9669-468E-B687-F461BB7F4112}"
RootNamespace="Demo01_TheBasics"
@@ -41,14 +41,14 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\include\OIS";"$(OGRENEWT_HOME)\inc";."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -62,8 +62,8 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Debug";"$(OGRENEWT_HOME)\lib";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\include\OIS";"$(OGRENEWT_HOME)\inc";."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(OGRENEWT_HOME)\lib";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Added: branches/ogrenewt/newton20/demos/Demo01_TheBasics/Ogre.log
===================================================================
--- branches/ogrenewt/newton20/demos/Demo01_TheBasics/Ogre.log (rev 0)
+++ branches/ogrenewt/newton20/demos/Demo01_TheBasics/Ogre.log 2009-12-26 10:50:16 UTC (rev 2767)
@@ -0,0 +1,31 @@
+18:05:12: Creating resource group General
+18:05:12: Creating resource group Internal
+18:05:12: Creating resource group Autodetect
+18:05:12: SceneManagerFactory for type 'DefaultSceneManager' registered.
+18:05:12: Registering ResourceManager for type Material
+18:05:12: Registering ResourceManager for type Mesh
+18:05:12: Registering ResourceManager for type Skeleton
+18:05:12: MovableObjectFactory for type 'ParticleSystem' registered.
+18:05:12: OverlayElementFactory for type Panel registered.
+18:05:12: OverlayElementFactory for type BorderPanel registered.
+18:05:12: OverlayElementFactory for type TextArea registered.
+18:05:12: Registering ResourceManager for type Font
+18:05:12: ArchiveFactory for archive type FileSystem registered.
+18:05:12: ArchiveFactory for archive type Zip registered.
+18:05:12: FreeImage version: 3.10.0
+18:05:12: This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details
+18:05:12: Supported formats: bmp,ico,jpg,jif,jpeg,jpe,jng,koa,iff,lbm,mng,pbm,pbm,pcd,pcx,pgm,pgm,png,ppm,ppm,ras,tga,targa,tif,tiff,wap,wbmp,wbm,psd,cut,xbm,xpm,gif,hdr,g3,sgi,exr,j2k,j2c,jp2
+18:05:12: DDS codec registering
+18:05:12: Registering ResourceManager for type HighLevelGpuProgram
+18:05:12: Registering ResourceManager for type Compositor
+18:05:12: MovableObjectFactory for type 'Entity' registered.
+18:05:12: MovableObjectFactory for type 'Light' registered.
+18:05:12: MovableObjectFactory for type 'BillboardSet' registered.
+18:05:12: MovableObjectFactory for type 'ManualObject' registered.
+18:05:12: MovableObjectFactory for type 'BillboardChain' registered.
+18:05:12: MovableObjectFactory for type 'RibbonTrail' registered.
+18:05:12: OGRE EXCEPTION(6:FileNotFoundException): 'plugins.cfg' file not found! in ConfigFile::load at c:\ogre\ogremain\src\ogreconfigfile.cpp (line 84)
+18:05:12: plugins.cfg not found, automatic plugin loading disabled.
+18:05:12: *-*-* OGRE Initialising
+18:05:12: *-*-* Version 1.6.4 (Shoggoth)
+18:05:12: OGRE EXCEPTION(6:FileNotFoundException): 'resources.cfg' file not found! in ConfigFile::load at c:\ogre\ogremain\src\ogreconfigfile.cpp (line 84)
Modified: branches/ogrenewt/newton20/demos/Demo01_TheBasics/demo01.cpp
===================================================================
--- branches/ogrenewt/newton20/demos/Demo01_TheBasics/demo01.cpp 2009-12-10 10:22:07 UTC (rev 2766)
+++ branches/ogrenewt/newton20/demos/Demo01_TheBasics/demo01.cpp 2009-12-26 10:50:16 UTC (rev 2767)
@@ -22,7 +22,7 @@
#endif
{
// Create application object
- OgreNewtonApplication app;
+ OgreNewtonApplication app;
try {
app.go();
Modified: branches/ogrenewt/newton20/demos/Demo02_Joints/Demo02_Joints.vcproj
===================================================================
--- branches/ogrenewt/newton20/demos/Demo02_Joints/Demo02_Joints.vcproj 2009-12-10 10:22:07 UTC (rev 2766)
+++ branches/ogrenewt/newton20/demos/Demo02_Joints/Demo02_Joints.vcproj 2009-12-26 10:50:16 UTC (rev 2767)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1257"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="Demo02_Joints"
ProjectGUID="{5BAB7340-BEDB-408A-96B1-296785399531}"
RootNamespace="Demo02_Joints"
@@ -41,14 +41,14 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\include\OIS";"$(OGRENEWT_HOME)\inc";."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -62,8 +62,8 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain_d.lib OIS_d.lib OgreNewt_d.lib"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Debug";"$(OGRENEWT_HOME)\lib";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Debug";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -117,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\include\OIS";"$(OGRENEWT_HOME)\inc";."
+ AdditionalIncludeDirectories=""$(NEWTON_HOME)\sdk";"$(BOOST_HOME)\";"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\CEGUIRenderer\include";"$(OGRE_HOME)\Samples\Common\include";"$(OGRE_HOME)\samples\include";"$(OGRE_HOME)\Dependencies\include";"$(OGRE_HOME)\Dependencies\include\ois";"$(OGRE_HOME)\Dependencies\include\CEGUI";"$(OGRE_HOME)\include\OIS";..\..\inc;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -138,7 +138,7 @@
Name="VCLinkerTool"
AdditionalDependencies="newton.lib OgreMain.lib OIS.lib OgreNewt.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(OGRENEWT_HOME)\lib";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
+ AdditionalLibraryDirectories="..\..\lib;"$(OGRE_HOME)\lib";"$(OGRE_HOME)\Dependencies\lib\Release";"$(NEWTON_HOME)\sdk\x32\dll_vs9""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: branches/ogrenewt/newton20/demos/Demo02_Joints/OgreNewtonApplication.cpp
===================================================================
--- branches/ogrenewt/newton20/demos/Demo02_Joints/OgreNewtonApplication.cpp 2009-12-10 10:22:07 UTC (rev 2766)
+++ branches/ogrenewt/newton20/demos/Demo02_Joints/OgreNewtonApplication.cpp 2009-12-26 10:50:16 UTC (rev 2767)
@@ -1,191 +1,353 @@
-/*
- OgreNewt library - connecting Ogre and Newton!
-
- Demo02_Joints - basic demo that shows how to connect rigid bodies via joints.
-*/
-
-#include "OgreNewtonApplication.h"
-#include "OgreNewtonFrameListener.h"
-
-#include <OgreNewt.h>
-#include <OgreNewt_BasicFrameListener.h>
-
-
-
-OgreNewtonApplication::OgreNewtonApplication(void)
-{
- // create OgreNewt world.
- m_World = new OgreNewt::World();
-
- mEntityCount = 0;
-
-}
-
-OgreNewtonApplication::~OgreNewtonApplication(void)
-{
- // destroy world.
- delete m_World;
-}
-
-
-
-void OgreNewtonApplication::createScene()
-{
- // sky box.
- mSceneMgr->setSkyBox(true, "Examples/CloudyNoonSkyBox");
-
- // shadows on!
- mSceneMgr->setShadowTechnique( Ogre::SHADOWTYPE_STENCIL_ADDITIVE );
-
-
- // floor object!
- Entity* floor;
- SceneNode* floornode;
- floor = mSceneMgr->createEntity("Floor", "simple_terrain.mesh" );
- floornode = mSceneMgr->getRootSceneNode()->createChildSceneNode( "FloorNode" );
- floornode->attachObject( floor );
- floor->setMaterialName( "Simple/BeachStones" );
-
- floor->setCastShadows( false );
-
- //-------------------------------------------------------------
- // add some other objects.
- Entity* floor2;
- SceneNode* floornode2;
- floor2 = mSceneMgr->createEntity("Floor2", "simple_terrain.mesh" );
- floornode2 = floornode->createChildSceneNode( "FloorNode2" );
- floornode2->attachObject( floor2 );
- floor2->setMaterialName( "Simple/BeachStones" );
- floor2->setCastShadows( false );
- floornode2->setPosition( Ogre::Vector3(80.0f, 0.0f, 0.0f) );
-
- Entity* floor3;
- SceneNode* floornode3;
- floor3 = mSceneMgr->createEntity("Floor3", "simple_terrain.mesh" );
- floornode3 = floornode->createChildSceneNode( "FloorNode3" );
- floornode3->attachObject( floor3 );
- floor3->setMaterialName( "Simple/BeachStones" );
- floor3->setCastShadows( false );
- floornode3->setPosition( Ogre::Vector3(-80.0f, -5.0f, 0.0f) );
- floornode3->setOrientation( Ogre::Quaternion( Ogre::Degree(15.0f), Ogre::Vector3::UNIT_Z ) );
- //-------------------------------------------------------------
-
- // using the new "SceneParser" TreeCollision primitive. this will automatically parse an entire tree of
- // SceneNodes (parsing all children), and add collision for all meshes in the tree.
- OgreNewt::CollisionPrimitives::TreeCollisionSceneParser* stat_col = new OgreNewt::CollisionPrimitives::TreeCollisionSceneParser( m_World );
- stat_col->parseScene( floornode, true, 0 );
- OgreNewt::Body* bod = new OgreNewt::Body( m_World, OgreNewt::CollisionPtr(stat_col) );
-#ifdef OGRENEWT_NO_COLLISION_SHAREDPTR
- delete stat_col;
-#endif
-
- bod->attachNode( floornode );
- bod->setPositionOrientation( Ogre::Vector3(0.0,-20.0,0.0), Ogre::Quaternion::IDENTITY );
-
-
-
- // make a simple rope.
- Ogre::Vector3 size(3,1.5,1.5);
- Ogre::Vector3 pos(0,3,0);
- Ogre::Quaternion orient = Ogre::Quaternion::IDENTITY;
-
- // loop through, making bodies and connecting them.
- OgreNewt::Body* parent = NULL;
- OgreNewt::Body* child = NULL;
-
- for (int x=0;x<5;x++)
- {
- // make the next box.
- child = makeSimpleBox(size, pos, orient);
-
- // now make a new joint connecting this to the last box.
- OgreNewt::Joint* joint;
-
- // make the joint right between the bodies...
-
-
- if (parent)
- {
- joint = new OgreNewt::BasicJoints::BallAndSocket( m_World, child, parent, pos-Ogre::Vector3(size.x/2,0,0) );
- }
- else
- {
- // no parent, this is the first joint, so just pass NULL as the parent, to stick it to the "world"
- joint = new OgreNewt::BasicJoints::BallAndSocket( m_World, child, NULL, pos-Ogre::Vector3(size.x/2,0,0) );
- }
-
- // offset pos a little more.
- pos += Ogre::Vector3(size.x,0,0);
-
- // save the last body for the next loop!
- parent = child;
- }
-
-
-
-
-
-
- // position camera
- mCamera->setPosition(0.0, -3.0, 0.0);
-
- //make a light
- Ogre::Light* light;
-
- light = mSceneMgr->createLight( "Light1" );
- light->setType( Ogre::Light::LT_POINT );
- light->setPosition( Ogre::Vector3(0.0, 100.0, 100.0) );
-
-
-
-}
-
-
-void OgreNewtonApplication::createFrameListener()
-{
- mFrameListener = new OgreNewtonFrameListener( mWindow, mCamera, mSceneMgr, m_World);
- mRoot->addFrameListener(mFrameListener);
-
- mNewtonListener = new OgreNewt::BasicFrameListener( mWindow, m_World, 60 );
- mRoot->addFrameListener(mNewtonListener);
-}
-
-
-OgreNewt::Body* OgreNewtonApplication::makeSimpleBox( Ogre::Vector3& size, Ogre::Vector3& pos, Ogre::Quaternion& orient )
-{
- Entity* box1;
- SceneNode* box1node;
-
- box1 = mSceneMgr->createEntity( "Entity"+Ogre::StringConverter::toString(mEntityCount++), "box.mesh" );
- box1node = mSceneMgr->getRootSceneNode()->createChildSceneNode();
- box1node->attachObject( box1 );
- box1node->setScale( size );
-// box1->setNormaliseNormals(true);
-
- OgreNewt::ConvexCollisionPtr col = OgreNewt::ConvexCollisionPtr(new OgreNewt::CollisionPrimitives::Box( m_World, size, 0 ));
- OgreNewt::Body* bod = new OgreNewt::Body( m_World, col );
-
-
- // base mass on the size of the object.
- Ogre::Real mass = size.x * size.y * size.z * 2.5;
-
- // calculate the inertia based on box formula and mass
- Ogre::Vector3 inertia, offset;
- col->calculateInertialMatrix(inertia, offset);
-
-#ifdef OGRENEWT_NO_COLLISION_SHAREDPTR
- delete col;
-#endif
-
- bod->attachNode( box1node );
- bod->setMassMatrix( mass, mass*inertia );
- bod->setCenterOfMass(offset);
- bod->setStandardForceCallback();
-
- box1->setMaterialName( "Simple/BumpyMetal" );
-
-
- bod->setPositionOrientation( pos, orient );
-
- return bod;
-}
+/*
+ OgreNewt library - connecting Ogre and Newton!
+
+ Demo02_Joints - basic demo that shows how to connect rigid bodies via joints.
+*/
+
+#include "OgreNewtonApplication.h"
+#include "OgreNewtonFrameListener.h"
+
+#include <OgreNewt.h>
+#include <OgreNewt_BasicFrameListener.h>
+
+
+
+OgreNewtonApplication::OgreNewtonApplication(void)
+{
+ // create OgreNewt world.
+ m_World = new OgreNewt::World();
+
+ mEntityCount = 0;
+
+}
+
+OgreNewtonApplication::~OgreNewtonApplication(void)
+{
+ // destroy world.
+ delete m_World;
+}
+
+
+
+
+
+void OgreNewtonApplication::createFrameListener()
+{
+ mFrameListener = new OgreNewtonFrameListener( mWindow, mCamera, mSceneMgr, m_World);
+ mRoot->addFrameListener(mFrameListener);
+
+ mNewtonListener = new OgreNewt::BasicFrameListener( mWindow, m_World, 60 );
+ mRoot->addFrameListener(mNewtonListener);
+}
+
+
+OgreNewt::Body* OgreNewtonApplication::makeSimpleBox( Ogre::Vector3& size, Ogre::Vector3& pos, Ogre::Quaternion& orient )
+{
+ Entity* box1;
+ SceneNode* box1node;
+
+ box1 = mSceneMgr->createEntity( "Entity"+Ogre::StringConverter::toString(mEntityCount++), "box.mesh" );
+ box1node = mSceneMgr->getRootSceneNode()->createChildSceneNode();
+ box1node->attachObject( box1 );
+ box1node->setScale( size );
+// box1->setNormaliseNormals(true);
+
+ OgreNewt::ConvexCollisionPtr col = OgreNewt::ConvexCollisionPtr(new OgreNewt::CollisionPrimitives::Box( m_World, size, 0 ));
+ OgreNewt::Body* bod = new OgreNewt::Body( m_World, col );
+
+
+ // base mass on the size of the object.
+ Ogre::Real mass = size.x * size.y * size.z * 2.5;
+
+ // calculate the inertia based on box formula and mass
+ Ogre::Vector3 inertia, offset;
+ col->calculateInertialMatrix(inertia, offset);
+
+#ifdef OGRENEWT_NO_COLLISION_SHAREDPTR
+ delete col;
+#endif
+
+ bod->attachNode( box1node );
+ bod->setMassMatrix( mass, mass*inertia );
+ bod->setCenterOfMass(offset);
+ bod->setStandardForceCallback();
+
+ box1->setMaterialName( "Simple/BumpyMetal" );
+
+
+ bod->setPositionOrientation( pos, orient );
+
+ return bod;
+}
+
+
+OgreNewt::Body* OgreNewtonApplication::makeSimpleShere( Ogre::Vector3& size, Ogre::Vector3& pos, Ogre::Quaternion& orient )
+{
+ Entity* box1;
+ SceneNode* box1node;
+
+ box1 = mSceneMgr->createEntity( "Entity"+Ogre::StringConverter::toString(mEntityCount++), "ellipsoid.mesh" );
+ box1node = mSceneMgr->getRootSceneNode()->createChildSceneNode();
+ box1node->attachObject( box1 );
+ box1node->setScale( size );
+
+ OgreNewt::ConvexCollisionPtr col = OgreNewt::ConvexCollisionPtr(new OgreNewt::CollisionPrimitives::Ellipsoid( m_World, size, 0 ));
+ OgreNewt::Body* bod = new OgreNewt::Body( m_World, col );
+
+ // base mass on the size of the object.
+ Ogre::Real mass = size.x * size.y * size.z * 2.5;
+
+ // calculate the inertia based on box formula and mass
+ Ogre::Vector3 inertia, offset;
+ col->calculateInertialMatrix(inertia, offset);
+
+#ifdef OGRENEWT_NO_COLLISION_SHAREDPTR
+ delete col;
+#endif
+
+ bod->attachNode( box1node );
+ bod->setMassMatrix( mass, mass*inertia );
+ bod->setCenterOfMass(offset);
+ bod->setStandardForceCallback();
+
+ box1->setMaterialName( "Simple/BumpyMetal" );
+
+
+ bod->setPositionOrientation( pos, orient );
+
+ return bod;
+}
+
+
+
+//static void AddSimpleRobot (dVector position, SceneManager* scene, NewtonWorld* nWorld)
+void OgreNewtonApplication::SimpleRobot (Ogre::Vector3 pos, Ogre::Vector3 size)
+{
+ Ogre::Real radius;
+ OgreNewt::Body* robotBody;
+ OgreNewt::Body* leftWheel;
+ OgreNewt::Body* rightWheel;
+ OgreNewt::Body* frontWheel;
+ OgreNewt::Joint* joint;
+
+ radius = 0.25f;
+ Ogre::Quaternion orient (Ogre::Quaternion::IDENTITY);
+
+ // find location above the ground
+ Ogre::Vector3 start(pos.x, 1000.0f, pos.z);
+ Ogre::Vector3 end(pos.x, -1000.0f, pos.z);
+ OgreNewt::BasicRaycast castRay (m_World, start, end, true);
+ OgreNewt::BasicRaycast::BasicRaycastInfo info = castRay.getFirstHit();
+
+ // place contraction at some location in above the floor
+ pos.y = 2 * size.y + start.y + (end.y - start.y) * info.mDistance;
+
+ // create the robot body
+ robotBo...
[truncated message content] |