From: <ku...@us...> - 2008-05-01 14:43:15
|
Revision: 2431 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2431&view=rev Author: kuranes Date: 2008-05-01 07:43:04 -0700 (Thu, 01 May 2008) Log Message: ----------- - Fix infinite Ogre Ode debug ray length spotted by cloud9 Modified Paths: -------------- trunk/ogreode/demos/GranTurismOgre/scripts/VC8/Demo_GranTurismOgre_SDK.vcproj trunk/ogreode/demos/Landscape/scripts/VC8/Demo_Landscape_SDK.vcproj trunk/ogreode/demos/Landscape/src/Landscape.cpp trunk/ogreode/demos/SimpleScenes/include/SimpleScenes_Zombie.h trunk/ogreode/demos/SimpleScenes/scripts/VC8/Demo_SimpleScenes_SDK.vcproj trunk/ogreode/scripts/VC8/OgreOde_SDK.suo trunk/ogreode/src/OgreOdeDebugObject.cpp Modified: trunk/ogreode/demos/GranTurismOgre/scripts/VC8/Demo_GranTurismOgre_SDK.vcproj =================================================================== --- trunk/ogreode/demos/GranTurismOgre/scripts/VC8/Demo_GranTurismOgre_SDK.vcproj 2008-04-30 01:09:45 UTC (rev 2430) +++ trunk/ogreode/demos/GranTurismOgre/scripts/VC8/Demo_GranTurismOgre_SDK.vcproj 2008-05-01 14:43:04 UTC (rev 2431) @@ -1,220 +1,221 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="Demo_GranTurismOgre" - ProjectGUID="{292C4A04-E960-44A3-A6EA-83881C176135}" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\bin\$(ConfigurationName)" - IntermediateDirectory="..\..\obj\$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="OgreMain_d.lib ois_d.lib OgreOde_Core_d.lib OgreOde_Loader_d.lib OgreOde_Prefab_d.lib" - OutputFile="$(OutDir)/OgreOdeDemo_GranTurismOgre.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/OgreOdeDemo_GranTurismOgre.pdb" - SubSystem="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)" "$(OGRE_HOME)\bin\$(ConfigurationName)"" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\..\bin\$(ConfigurationName)" - IntermediateDirectory="..\..\obj\$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="true" - MinimalRebuild="true" - RuntimeLibrary="2" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="OgreMain.lib ois.lib OgreOde_Core.lib OgreOde_Loader.lib OgreOde_Prefab.lib" - OutputFile="$(OutDir)/OgreOdeDemo_GranTurismOgre.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - 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)" "$(OGRE_HOME)\bin\$(ConfigurationName)"" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\..\src\GranTurismOgre.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath="..\..\include\GranTurismOgre.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="Demo_GranTurismOgre" + ProjectGUID="{292C4A04-E960-44A3-A6EA-83881C176135}" + RootNamespace="Demo_GranTurismOgre" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=" $(OGRE_HOME)\bin\$(ConfigurationName)" + IntermediateDirectory="..\..\obj\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="OgreMain_d.lib ois_d.lib OgreOde_Core_d.lib OgreOde_Loader_d.lib OgreOde_Prefab_d.lib" + OutputFile="$(OutDir)\OgreOdeDemo_GranTurismOgre.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/OgreOdeDemo_GranTurismOgre.pdb" + SubSystem="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="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(OGRE_HOME)\bin\$(ConfigurationName)" + IntermediateDirectory="..\..\obj\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + StringPooling="true" + MinimalRebuild="true" + RuntimeLibrary="2" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="OgreMain.lib ois.lib OgreOde_Core.lib OgreOde_Loader.lib OgreOde_Prefab.lib" + OutputFile="$(OutDir)\OgreOdeDemo_GranTurismOgre.exe" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + 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="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\src\GranTurismOgre.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\include\GranTurismOgre.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: trunk/ogreode/demos/Landscape/scripts/VC8/Demo_Landscape_SDK.vcproj =================================================================== --- trunk/ogreode/demos/Landscape/scripts/VC8/Demo_Landscape_SDK.vcproj 2008-04-30 01:09:45 UTC (rev 2430) +++ trunk/ogreode/demos/Landscape/scripts/VC8/Demo_Landscape_SDK.vcproj 2008-05-01 14:43:04 UTC (rev 2431) @@ -1,219 +1,219 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="Demo_Landscape" - ProjectGUID="{938CDDEB-72ED-4902-B936-003D4D9F3EB7}" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\bin\$(ConfigurationName)" - IntermediateDirectory="..\..\obj\$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="OgreMain_d.lib ois_d.lib OgreOde_Core_d.lib OgreOde_Loader_d.lib OgreOde_Prefab_d.lib" - OutputFile="$(OutDir)/OgreOdeDemo_Landscape.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/OgreOdeDemo_Landscape.pdb" - SubSystem="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)" "$(OGRE_HOME)\bin\$(ConfigurationName)"" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\..\bin\$(ConfigurationName)" - IntermediateDirectory="..\..\obj\$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="true" - MinimalRebuild="true" - RuntimeLibrary="2" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="OgreMain.lib ois.lib OgreOde_Core.lib OgreOde_Loader.lib OgreOde_Prefab.lib" - OutputFile="$(OutDir)/OgreOdeDemo_Landscape.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - 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)" "$(OGRE_HOME)\bin\$(ConfigurationName)"" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\..\src\Landscape.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath="..\..\include\Landscape.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="Demo_Landscape" + ProjectGUID="{938CDDEB-72ED-4902-B936-003D4D9F3EB7}" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=" $(OGRE_HOME)\bin\$(ConfigurationName)" + IntermediateDirectory="..\..\obj\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="OgreMain_d.lib ois_d.lib OgreOde_Core_d.lib OgreOde_Loader_d.lib OgreOde_Prefab_d.lib" + OutputFile="$(OutDir)\OgreOdeDemo_Landscape.exe" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/OgreOdeDemo_Landscape.pdb" + SubSystem="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="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=" $(OGRE_HOME)\bin\$(ConfigurationName)" + IntermediateDirectory="..\..\obj\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + StringPooling="true" + MinimalRebuild="true" + RuntimeLibrary="2" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="OgreMain.lib ois.lib OgreOde_Core.lib OgreOde_Loader.lib OgreOde_Prefab.lib" + OutputFile="$(OutDir)\OgreOdeDemo_Landscape.exe" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + 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="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\src\Landscape.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\include\Landscape.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: trunk/ogreode/demos/Landscape/src/Landscape.cpp =================================================================== --- trunk/ogreode/demos/Landscape/src/Landscape.cpp 2008-04-30 01:09:45 UTC (rev 2430) +++ trunk/ogreode/demos/Landscape/src/Landscape.cpp 2008-05-01 14:43:04 UTC (rev 2431) @@ -18,7 +18,7 @@ //static String config_file("landscape6.cfg");// near flat #else //_PLSM2 static String config_file ("paginglandscape2.cfg"); -#endif //_PLSM2 +#endif //_PLSM2 #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 Modified: trunk/ogreode/demos/SimpleScenes/include/SimpleScenes_Zombie.h =================================================================== --- trunk/ogreode/demos/SimpleScenes/include/SimpleScenes_Zombie.h 2008-04-30 01:09:45 UTC (rev 2430) +++ trunk/ogreode/demos/SimpleScenes/include/SimpleScenes_Zombie.h 2008-05-01 14:43:04 UTC (rev 2431) @@ -12,11 +12,11 @@ "ninja", "robot", "GingerBreadMan" -}; +}; static const String meshZombieNames[] = { "zombie_small.mesh", "zombie_small.mesh", - "ninja.mesh", + "ninja.mesh", "robot.mesh", "GingerBreadMan.mesh" }; Modified: trunk/ogreode/demos/SimpleScenes/scripts/VC8/Demo_SimpleScenes_SDK.vcproj =================================================================== --- trunk/ogreode/demos/SimpleScenes/scripts/VC8/Demo_SimpleScenes_SDK.vcproj 2008-04-30 01:09:45 UTC (rev 2430) +++ trunk/ogreode/demos/SimpleScenes/scripts/VC8/Demo_SimpleScenes_SDK.vcproj 2008-05-01 14:43:04 UTC (rev 2431) @@ -1,255 +1,256 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="Demo_SimpleScenes" - ProjectGUID="{F3DE570A-4FA1-44AB-8C12-4369126F2C95}" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\bin\$(ConfigurationName)" - IntermediateDirectory="..\..\obj\$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="OgreMain_d.lib ois_d.lib OgreOde_Core_d.lib OgreOde_Loader_d.lib OgreOde_Prefab_d.lib" - OutputFile="$(OutDir)/OgreOdeDemo_SimpleScenes.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/OgreOdeDemo_SimpleScenes.pdb" - SubSystem="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)" "$(OGRE_HOME)\bin\$(ConfigurationName)"" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\..\bin\$(ConfigurationName)" - IntermediateDirectory="..\..\obj\$(ConfigurationName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="true" - MinimalRebuild="true" - RuntimeLibrary="2" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="OgreMain.lib ois.lib OgreOde_Core.lib OgreOde_Loader.lib OgreOde_Prefab.lib" - OutputFile="$(OutDir)/OgreOdeDemo_SimpleScenes.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - 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)" "$(OGRE_HOME)\bin\$(ConfigurationName)"" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\..\src\SimpleScenes.cpp" - > - </File> - <File - RelativePath="..\..\src\SimpleScenesApplication.cpp" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath="..\..\include\SimpleScenes.h" - > - </File> - <File - RelativePath="..\..\include\SimpleScenes_BoxStack.h" - > - </File> - <File - RelativePath="..\..\include\SimpleScenes_Buggy.h" - > - </File> - <File - RelativePath="..\..\include\SimpleScenes_Chain.h" - > - </File> - <File - RelativePath="..\..\include\SimpleScenes_Crash.h" - > - </File> - <File - RelativePath="..\..\include\SimpleScenes_Joints.h" - > - </File> - <File - RelativePath="..\..\include\SimpleScenes_TriMesh.h" - > - </File> - <File - RelativePath="..\..\include\SimpleScenes_Zombie.h" - > - </File> - <File - RelativePath="..\..\include\SimpleScenesApplication.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="Demo_SimpleScenes" + ProjectGUID="{F3DE570A-4FA1-44AB-8C12-4369126F2C95}" + RootNamespace="Demo_SimpleScenes" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(OGRE_HOME)\bin\$(ConfigurationName)" + IntermediateDirectory="..\..\obj\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="OgreMain_d.lib ois_d.lib OgreOde_Core_d.lib OgreOde_Loader_d.lib OgreOde_Prefab_d.lib" + OutputFile="$(OutDir)\OgreOdeDemo_SimpleScenes.exe" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/OgreOdeDemo_SimpleScenes.pdb" + SubSystem="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="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(OGRE_HOME)\bin\$(ConfigurationName)" + IntermediateDirectory="..\..\obj\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\loader\include;..\..\..\..\prefab\include;"$(ODE_HOME)\include";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + StringPooling="true" + MinimalRebuild="true" + RuntimeLibrary="2" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="OgreMain.lib ois.lib OgreOde_Core.lib OgreOde_Loader.lib OgreOde_Prefab.lib" + OutputFile="$(OutDir)\OgreOdeDemo_SimpleScenes.exe" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\";"..\..\..\..\lib\$(ConfigurationName)";"..\..\..\..\prefab\lib\$(ConfigurationName)";"..\..\..\..\loader\lib\$(ConfigurationName)"" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + 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="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\src\SimpleScenes.cpp" + > + </File> + <File + RelativePath="..\..\src\SimpleScenesApplication.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\include\SimpleScenes.h" + > + </File> + <File + RelativePath="..\..\include\SimpleScenes_BoxStack.h" + > + </File> + <File + RelativePath="..\..\include\SimpleScenes_Buggy.h" + > + </File> + <File + RelativePath="..\..\include\SimpleScenes_Chain.h" + > + </File> + <File + RelativePath="..\..\include\SimpleScenes_Crash.h" + > + </File> + <File + RelativePath="..\..\include\SimpleScenes_Joints.h" + > + </File> + <File + RelativePath="..\..\include\SimpleScenes_TriMesh.h" + > + </File> + <File + RelativePath="..\..\include\SimpleScenes_Zombie.h" + > + </File> + <File + RelativePath="..\..\include\SimpleScenesApplication.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: trunk/ogreode/scripts/VC8/OgreOde_SDK.suo =================================================================== (Binary files differ) Modified: trunk/ogreode/src/OgreOdeDebugObject.cpp =================================================================== --- trunk/ogreode/src/OgreOdeDebugObject.cpp 2008-04-30 01:09:45 UTC (rev 2430) +++ trunk/ogreode/src/OgreOdeDebugObject.cpp 2008-05-01 14:43:04 UTC (rev 2431) @@ -1,772 +1,792 @@ - -#include "OgreOdePrecompiledHeaders.h" - -#include "OgreOdeDebugObject.h" - -using namespace OgreOde; -using namespace Ogre; - -//------------------------------------------------------------------------------------------------ -bool DebugLines::_materials_created = false; -//------------------------------------------------------------------------------------------------ -DebugLines::DebugLines() : SimpleRenderable() -{ - mRenderOp.vertexData = new Ogre::VertexData(); - _drawn = false; - - if (!_materials_created) - { - MaterialPtr red = MaterialManager::getSingleton().create("OgreOdeDebugLines/Disabled","OgreOde"); - MaterialPtr green = MaterialManager::getSingleton().create("OgreOdeDebugLines/Enabled","OgreOde"); - MaterialPtr blue = MaterialManager::getSingleton().create("OgreOdeDebugLines/Static","OgreOde"); - - red->setReceiveShadows(false); - red->getTechnique(0)->setLightingEnabled(true); - red->getTechnique(0)->getPass(0)->setSelfIllumination(1,0,0); - - green->setReceiveShadows(false); - green->getTechnique(0)->setLightingEnabled(true); - green->getTechnique(0)->getPass(0)->setSelfIllumination(0,1,0); - - blue->setReceiveShadows(false); - blue->getTechnique(0)->setLightingEnabled(true); - blue->getTechnique(0)->getPass(0)->setSelfIllumination(0,0,1); - - _materials_created = true; - } - setCastShadows (false); - this->setMaterial("OgreOdeDebugLines/Enabled"); -} - - -//------------------------------------------------------------------------------------------------ -void DebugLines::clear() -{ - if (_drawn) - { - _drawn = false; - _points.clear(); - delete mRenderOp.vertexData; - - mRenderOp.vertexData = new Ogre::VertexData(); - } -} -//------------------------------------------------------------------------------------------------ -DebugLines::~DebugLines(void) -{ - clear(); - - delete mRenderOp.vertexData; -} -//------------------------------------------------------------------------------------------------ -void DebugLines::draw() -{ - if (_drawn) - return; - else - _drawn = true; - - // Initialization stuff - mRenderOp.indexData = 0; - mRenderOp.vertexData->vertexCount = _points.size(); - mRenderOp.vertexData->vertexStart = 0; - mRenderOp.operationType = RenderOperation::OT_LINE_LIST; - mRenderOp.useIndexes = false; - - Ogre::VertexDeclaration *decl = mRenderOp.vertexData->vertexDeclaration; - Ogre::VertexBufferBinding *bind = mRenderOp.vertexData->vertexBufferBinding; - - decl->addElement(0, 0, VET_FLOAT3, VES_POSITION); - - HardwareVertexBufferSharedPtr vbuf = - HardwareBufferManager::getSingleton().createVertexBuffer( - decl->getVertexSize(0), - mRenderOp.vertexData->vertexCount, - HardwareBuffer::HBU_STATIC_WRITE_ONLY); - - bind->setBinding(0, vbuf); - - // Drawing stuff - unsigned int size = (unsigned int)_points.size(); - Ogre::Vector3 vaabMin = _points[0]; - Ogre::Vector3 vaabMax = _points[0]; - - float *prPos = static_cast<float*>(vbuf->lock(HardwareBuffer::HBL_DISCARD)); - - for(unsigned int i = 0; i < size; i++) - { - *prPos++ = _points[i].x; - *prPos++ = _points[i].y; - *prPos++ = _points[i].z; - - if (_points[i].x < vaabMin.x) - vaabMin.x = _points[i].x; - if (_points[i].y < vaabMin.y) - vaabMin.y = _points[i].y; - if (_points[i].z < vaabMin.z) - vaabMin.z = _points[i].z; - - if (_points[i].x > vaabMax.x) - vaabMax.x = _points[i].x; - if (_points[i].y > vaabMax.y) - vaabMax.y = _points[i].y; - if (_points[i].z > vaabMax.z) - vaabMax.z = _points[i].z; - } - - vbuf->unlock(); - - mBox.setExtents(vaabMin, vaabMax); -} -//------------------------------------------------------------------------------------------------ -Real DebugLines::getSquaredViewDepth(const Camera *cam) const -{ - Vector3 vMin, vMax, vMid, vDist; - vMin = mBox.getMinimum(); - vMax = mBox.getMaximum(); - vMid = ((vMin - vMax) * 0.5) + vMin; - vDist = cam->getDerivedPosition() - vMid; - - return vDist.squaredLength(); -} -//------------------------------------------------------------------------------------------------ -Real DebugLines::getBoundingRadius() const -{ - return Math::Sqrt(std::max(mBox.getMaximum().squaredLength(), mBox.getMinimum().squaredLength())); -} -//------------------------------------------------------------------------------------------------ -DebugObject::DebugObject(DebugObject::Mode mode) -{ - _mode = DebugObject::Mode_Unknown; - setMode(mode); -} -//------------------------------------------------------------------------------------------------ -void DebugObject::setMode(DebugObject::Mode mode) -{ - if (mode != _mode) - { - _mode = mode; - switch(_mode) - { - case DebugObject::Mode_Enabled: - setMaterial("OgreOdeDebugLines/Enabled"); - break; - - case DebugObject::Mode_Disabled: - setMaterial("OgreOdeDebugLines/Disabled"); - - break; - - case DebugObject::Mode_Static: - setMaterial("OgreOdeDebugLines/Static"); - break; - } - } -} -//------------------------------------------------------------------------------------------------ -DebugObject::~DebugObject() -{ -} -//------------------------------------------------------------------------------------------------ -BoxDebugObject::BoxDebugObject(const Ogre::Vector3& size):DebugObject() -{ - AxisAlignedBox aabb(-size.x * 0.5,-size.y * 0.5,-size.z * 0.5, - size.x * 0.5,size.y * 0.5,size.z * 0.5); - - Vector3 vmax = aabb.getMaximum(); - Vector3 vmin = aabb.getMinimum(); - - addLine(vmin.x,vmin.y,vmin.z,vmax.x,vmin.y,vmin.z); - addLine(vmin.x,vmin.y,vmin.z,vmin.x,vmin.y,vmax.z); - addLine(vmin.x,vmin.y,vmin.z,vmin.x,vmax.y,vmin.z); - addLine(vmin.x,vmax.y,vmin.z,vmin.x,vmax.y,vmax.z); - addLine(vmin.x,vmax.y,vmin.z,vmax.x,vmax.y,vmin.z); - addLine(vmax.x,vmin.y,vmin.z,vmax.x,vmin.y,vmax.z); - addLine(vmax.x,vmin.y,vmin.z,vmax.x,vmax.y,vmin.z); - addLine(vmin.x,vmax.y,vmax.z,vmax.x,vmax.y,vmax.z); - addLine(vmin.x,vmax.y,vmax.z,vmin.x,vmin.y,vmax.z); - addLine(vmax.x,vmax.y,vmin.z,vmax.x,vmax.y,vmax.z); - addLine(vmax.x,vmin.y,vmax.z,vmax.x,vmax.y,vmax.z); - addLine(vmin.x,vmin.y,vmax.z,vmax.x,vmin.y,vmax.z); - - draw(); -} -//------------------------------------------------------------------------------------------------ -BoxDebugObject::~BoxDebugObject() -{ -} -//------------------------------------------------------------------------------------------------ -SphereDebugObject::SphereDebugObject(Real radius):DebugObject() -{ - // X/Y axis - - // NW quadrant - addLine(-radius, 0.0, 0.0, - -0.866 * radius, 0.5 * radius, 0.0); - - addLine(-0.866 * radius, 0.5 * radius, 0.0, - -0.5 * radius, 0.866 * radius, 0.0); - - addLine(-0.5 * radius, 0.866 * radius, 0.0, - 0.0, radius, 0.0); - - // NE quadrant - addLine(0.0, radius, 0.0, - 0.5 * radius, 0.866 * radius, 0.0); - - addLine(0.5 * radius, 0.866 * radius, 0.0, - 0.866 * radius, 0.5 * radius, 0.0); - - addLine(0.866 * radius, 0.5 * radius, 0.0, - radius, 0.0, 0.0); - - // SW quadrant - addLine(-radius, 0.0, 0.0, - -0.866 * radius, -0.5 * radius, 0.0); - - addLine(-0.866 * radius, -0.5 * radius, 0.0, - -0.5 * radius, -0.866 * radius, 0.0); - - addLine(-0.5 * radius, -0.866 * radius, 0.0, - 0.0, -radius, 0.0); - - // SE quadrant - addLine(0.0, -radius, 0.0, - 0.5 * radius, -0.866 * radius, 0.0); - - addLine(0.5 * radius, -0.866 * radius, 0.0, - 0.866 * radius, -0.5 * radius, 0.0); - - addLine(0.866 * radius, -0.5 * radius, 0.0, - radius, 0.0, 0.0); - - // X/Z axis - - // NW quadrant - addLine(-radius, 0.0, 0.0, - -0.866 * radius, 0.0, 0.5 * radius); - - addLine(-0.866 * radius, 0.0, 0.5 * radius, - -0.5 * radius, 0.0, 0.866 * radius); - - addLine(-0.5 * radius, 0.0, 0.866 * radius, - 0.0, 0.0, radius); - - // NE quadrant - addLine(0.0, 0.0, radius, - 0.5 * radius, 0.0, 0.866 * radius); - - addLine(0.5 * radius, 0.0, 0.866 * radius, - 0.866 * radius, 0.0, 0.5 * radius); - - addLine(0.866 * radius, 0.0, 0.5 * radius, - radius, 0.0, 0.0); - - // SW quadrant - addLine(-radius, 0.0, 0.0, - -0.866 * radius, 0.0, -0.5 * radius); - - addLine(-0.866 * radius, 0.0, -0.5 * radius, - -0.5 * radius, 0.0, -0.866 * radius); - - addLine(-0.5 * radius, 0.0, -0.866 * radius, - 0.0, 0.0, -radius); - - // SE quadrant - addLine(0.0, 0.0, -radius, - 0.5 * radius, 0.0, -0.866 * radius); - - addLine(0.5 * radius, 0.0, -0.866 * radius, - 0.866 * radius, 0.0, -0.5 * radius); - - addLine(0.866 * radius, 0.0, -0.5 * radius, - radius, 0.0, 0.0); - - // Y/Z axis - - // NW quadrant - addLine(0.0, -radius, 0.0, - 0.0, -0.866 * radius, 0.5 * radius); - - addLine(0.0, -0.866 * radius, 0.5 * radius, - 0.0, -0.5 * radius, 0.866 * radius); - - addLine(0.0, -0.5 * radius, 0.866 * radius, - 0.0, 0.0, radius); - - // NE quadrant - addLine(0.0, 0.0, radius, - 0.0, 0.5 * radius, 0.866 * radius); - - addLine(0.0, 0.5 * radius, 0.866 * radius, - 0.0, 0.866 * radius, 0.5 * radius); - - addLine(0.0, 0.866 * radius, 0.5 * radius, - 0.0, radius, 0.0); - - // SW quadrant - addLine(0.0, -radius, 0.0, - 0.0, -0.866 * radius, -0.5 * radius); - - addLine(0.0, -0.866 * radius, -0.5 * radius, - 0.0, -0.5 * radius, -0.866 * radius); - - addLine(0.0, -0.5 * radius, -0.866 * radius, - 0.0, 0.0, -radius); - - // SE quadrant - addLine(0.0, 0.0, -radius, - 0.0, 0.5 * radius, -0.866 * radius); - - addLine(0.0, 0.5 * radius, -0.866 * radius, - 0.0, 0.866 * radius, -0.5 * radius); - - addLine(0.0, 0.866 * radius, -0.5 * radius, - 0.0, radius, 0.0); - - draw(); -} -//------------------------------------------------------------------------------------------------ -SphereDebugObject::~SphereDebugObject() -{ -} -//------------------------------------------------------------------------------------------------ -CapsuleDebugObject::CapsuleDebugObject(Real radius,Real length):DebugObject() -{ - Real halflen = length * 0.5; - AxisAlignedBox aabb(-radius,-radius,-(halflen + radius),radius,radius,halflen + radius); - - // X/Y axis - Near - - // NW quadrant - addLine(-radius, 0.0, halflen, - -0.866 * radius, 0.5 * radius, halflen); - - addLine(-0.866 * radius, 0.5 * radius, halflen, - -0.5 * radius, 0.866 * radius, halflen); - - addLine(-0.5 * radius, 0.866 * radius, halflen, - 0.0, radius, halflen); - - // NE quadrant - addLine(0.0, radius, halflen, - 0.5 * radius, 0.866 * radius, halflen); - - addLine(0.5 * radius, 0.866 * radius, halflen, - 0.866 * radius, 0.5 * radius, halflen); - - addLine(0.866 * radius, 0.5 * radius, halflen, - radius, 0.0, halflen); - - // SW quadrant - addLine(-radius, 0.0, halflen, - -0.866 * radius, -0.5 * radius, halflen); - - addLine(-0.866 * radius, -0.5 * radius, halflen, - -0.5 * radius, -0.866 * radius, halflen); - - addLine(-0.5 * radius, -0.866 * radius, halflen, - 0.0, -radius, halflen); - - // SE quadrant - addLine(0.0, -radius, halflen, - 0.5 * radius, -0.866 * radius, halflen); - - addLine(0.5 * radius, -0.866 * radius, halflen, - 0.866 * radius, -0.5 * radius, halflen); - - addLine(0.866 * radius, -0.5 * radius, halflen, - radius, 0.0, halflen); - - // X/Y axis - Far - - // NW quadrant - addLine(-radius, 0.0, -halflen, - -0.866 * radius, 0.5 * radius, -halflen); - - addLine(-0.866 * radius, 0.5 * radius, -halflen, - -0.5 * radius, 0.866 * radius, -halflen); - - addLine(-0.5 * radius, 0.866 * radius, -halflen, - 0.0, radius, -halflen); - - // NE quadrant - addLine(0.0, radius, -halflen, - 0.5 * radius, 0.866 * radius, -halflen); - - addLine(0.5 * radius, 0.866 * radius, -halflen, - 0.866 * radius, 0.5 * radius, -halflen); - - addLine(0.866 * radius, 0.5 * radius, -halflen, - radius, 0.0, -halflen); - - // SW quadrant - addLine(-radius, 0.0, -halflen, - -0.866 * radius, -0.5 * radius, -halflen); - - addLine(-0.866 * radius, -0.5 * radius, -halflen, - -0.5 * radius, -0.866 * radius, -halflen); - - addLine(-0.5 * radius, -0.866 * radius, -halflen, - 0.0, -radius, -halflen); - - // SE quadrant - addLine(0.0, -radius, -halflen, - 0.5 * radius, -0.866 * radius, -halflen); - - addLine(0.5 * radius, -0.866 * radius, -halflen, - 0.866 * radius, -0.5 * radius, -halflen); - - addLine(0.866 * radius, -0.5 * radius, -halflen, - radius, 0.0, -halflen); - - // X/Z axis - - // NW quadrant - addLine(-radius, 0.0, halflen, - -0.866 * radius, 0.0, (0.5 * radius) + halflen); - - addLine(-0.866 * radius, 0.0, (0.5 * radius) + halflen, - -0.5 * radius, 0.0, (0.866 * radius) + halflen); - - addLine(-0.5 * radius, 0.0, (0.866 * radius) + halflen, - 0.0, 0.0, radius + halflen); - - // NE quadrant - addLine(0.0, 0.0, radius + halflen, - 0.5 * radius, 0.0, (0.866 * radius) + halflen); - - addLine(0.5 * radius, 0.0, (0.866 * radius) + halflen, - 0.866 * radius, 0.0, (0.5 * radius) + halflen); - - addLine(0.866 * radius, 0.0, (0.5 * radius) + halflen, - radius, 0.0, halflen); - - // SW quadrant - addLine(-radius, 0.0, -halflen, - -0.866 * radius, 0.0, (-0.5 * radius) - halflen); - - addLine(-0.866 * radius, 0.0, (-0.5 * radius) - halflen, - -0.5 * radius, 0.0, (-0.866 * radius) - halflen); - - addLine(-0.5 * radius, 0.0, (-0.866 * radius) - halflen, - 0.0, 0.0, -radius - halflen); - - // SE quadrant - addLine(0.0, 0.0, -radius - halflen, - 0.5 * radius, 0.0, (-0.866 * radius) - halflen); - - addLine(0.5 * radius, 0.0, (-0.866 * radius) - halflen, - 0.866 * radius, 0.0, (-0.5 * radius) - halflen); - - addLine(0.866 * radius, 0.0, (-0.5 * radius) - halflen, - radius, 0.0, - halflen); - - // Y/Z axis - - // NW quadrant - addLine(0.0, -radius, halflen, - 0.0, -0.866 * radius, (0.5 * radius) + halflen); - - addLine(0.0, -0.866 * radius, (0.5 * radius) + halflen, - 0.0, -0.5 * radius, (0.866 * radius) + halflen); - - addLine(0.0, -0.5 * radius, (0.866 * radius) + halflen, - 0.0, 0.0, radius + halflen); - - // NE quadrant - addLine(0.0, 0.0, radius + halflen, - 0.0, 0.5 * radius, (0.866 * radius) + halflen); - - addLine(0.0, 0.5 * radius, (0.866 * radius) + halflen, - 0.0, 0.866 * radius, (0.5 * radius) + halflen); - - addLine(0.0, 0.866 * radius, (0.5 * radius) + halflen, - 0.0, radius, halflen); - - // SW quadrant - addLine(0.0, -radius, -halflen, - 0.0, -0.866 * radius, (-0.5 * radius) - halflen); - - addLine(0.0, -0.866 * radius, (-0.5 * radius) - halflen, - 0.0, -0.5 * radius, (-0.866 * radius) - halflen); - - addLine(0.0, -0.5 * radius, (-0.866 * radius) - halflen, - 0.0, 0.0, -radius - halflen); - - // SE quadrant - addLine(0.0, 0.0, -radius - halflen, - 0.0, 0.5 * radius, (-0.866 * radius) - halflen); - - addLine(0.0, 0.5 * radius, (-0.866 * radius) - halflen, - 0.0, 0.866 * radius, (-0.5 * radius) - halflen); - - addLine(0.0, 0.866 * radius, (-0.5 * radius) - halflen, - 0.0, radius, -halflen); - - // Side lines - addLine(-radius, 0.0, -halflen, - -radius, 0.0, halflen); - - addLine(radius, 0.0, -halflen, - radius, 0.0, halflen); - - addLine(0.0, radius, -halflen, - 0.0, radius, halflen); - - addLine(0.0, -radius, -halflen, - 0.0, -radius, halflen); - - draw(); -} -//------------------------------------------------------------------------------------------------ -CapsuleDebugObject::~CapsuleDebugObject() -{ -} -//------------------------------------------------------------------------------------------------ -CylinderDebugObject::CylinderDebugObject(Real radius,Real length):DebugObject() -{ - Real halflen = length * 0.5; - AxisAlignedBox aabb(-radius,-radius,-(halflen + radius),radius,radius,halflen + radius); - - // X/Y axis - Near - - // NW quadrant - addLine(-radius, 0.0, halflen, - -0.866 * radius, 0.5 * radius, halflen); - - addLine(-0.866 * radius, 0.5 * radius, halflen, - -0.5 * radius, 0.866 * radius, halflen); - - addLine(-0.5 * radius, 0.866 * radius, halflen, - 0.0, radius, halflen); - - // NE quadrant - addLine(0.0, radius, halflen, - 0.5 * radius, 0.866 * radius, halflen); - - addLine(0.5 * radius, 0.866 * radius, halflen, - 0.866 * radius, 0.5 * radius, halflen); - - addLine(0.866 * radius, 0.5 * radius, halflen, - radius, 0.0, halflen); - - // SW quadrant - addLine(-radius, 0.0, halflen, - -0.866 * radius, -0.5 * radius, halflen); - - addLine(-0.866 * radius, -0.5 * radius, halflen, - -0.5 * radius, -0.866 * radius, halflen); - - addLine(-0.5 * radius, -0.866 * radius, halflen, - 0.0, -radius, halflen); - - // SE quadrant - addLine(0.0, -radius, halflen, - 0.5 * radius, -0.866 * radius, halflen); - - addLine(0.5 * radius, -0.866 * radius, halflen, - 0.866 * radius, -0.5 * radius, halflen); - - addLine(0.866 * radius, -0.5 * radius, halflen, - radius, 0.0, halflen); - - // X/Y axis - Far - - // NW quadrant - addLine(-radius, 0.0, -halflen, - -0.866 * radius, 0.5 * radius, -halflen); - - addLine(-0.866 * radius, 0.5 * radius, -halflen, - -0.5 * radius, 0.866 * radius, -halflen); - - addLine(-0.5 * radius, 0.866 * radius, -halflen, - 0.0, radius, -halflen); - - // NE quadrant - addLine(0.0, radius, -halflen, - 0.5 * radius, 0.866 * radius, -halflen); - - addLine(0.5 * radius, 0.866 * radius, -halflen, - 0.866 * radius, 0.5 * radius, -halflen); - - addLine(0.866 * radius, 0.5 * radius, -halflen, - radius, 0.0, -halflen); - - // SW quadrant - addLine(-radius, 0.0, -halflen, - -0.866 * radius, -0.5 * radius, -halflen); - - addLine(-0.866 * radius, -0.5 * radius, -halflen, - -0.5 * radius, -0.866 * radius, -halflen); - - addLine(-0.5 * radius, -0.866 * radius, -halflen, - 0.0, -radius, -halflen); - - // SE quadrant - addLine(0.0, -radius, -halflen, - 0.5 * radius, -0.866 * radius, -halflen); - - addLine(0.5 * radius, -0.866 * radius, -halflen, - 0.866 * radius, -0.5 * radius, -halflen); - - addLine(0.866 * radius, -0.5 * radius, -halflen, - radius, 0.0, -halflen); - - // X/Z axis - - // NW quadrant - addLine(-radius, 0.0, halflen, - -0.866 * radius, 0.0, (0.5 * radius) + halflen); - - addLine(-0.866 * radius, 0.0, (0.5 * radius) + halflen, - -0.5 * radius, 0.0, (0.866 * radius) + halflen); - - addLine(-0.5 * radius, 0.0, (0.866 * radius) + halflen, - 0.0, 0.0, radius + halflen); - - // NE quadrant - addLine(0.0, 0.0, radius + halflen, - 0.5 * radius, 0.0, (0.866 * radius) + halflen); - - addLine(0.5 * radius, 0.0, (0.866 * radius) + halflen, - 0.866 * radius, 0.0, (0.5 * radius) + halflen); - - addLine(0.866 * radius, 0.0, (0.5 * radius) + halflen, - radius, 0.0, halflen); - - // SW quadrant - addLine(-radius, 0.0, -halflen, - -0.866 * radius, 0.0, (-0.5 * radius) - halflen); - - addLine(-0.866 * radius, 0.0, (-0.5 * radius) - halflen, - -0.5 * radius, 0.0, (-0.866 * radius) - halflen); - - addLine(-0.5 * radius, 0.0, (-0.866 * radius) - halflen, - 0.0, 0.0, -radius - halflen); - - // SE quadrant - addLine(0.0, 0.0, -radius - halflen, - 0.5 * radius, 0.0, (-0.866 * radius) - halflen); - - addLine(0.5 * radius, 0.0, (-0.866 * radius) - halflen, - 0.866 * radius, 0.0, (-0.5 * radius) - halflen); - - addLine(0.866 * radius, 0.0, (-0.5 * radius) - halflen, - radius, 0.0, - halflen); - - // Y/Z axis - - // NW quadrant - addLine(0.0, -radius, halflen, - 0.0, -0.866 * radius, (0.5 * radius) + halflen); - - addLine(0.0, -0.866 * radius, (0.5 * radius) + halflen, - 0.0, -0.5 * radius, (0.866 * radius) + halflen); - - addLine(0.0, -0.5 * radius, (0.866 * radius) + halflen, - 0.0, 0.0, radius + halflen); - - // NE quadrant - addLine(0.0, 0.0, radius + halflen, - 0.0, 0.5 * radius, (0.866 * radius) + halflen); - - addLine(0.0, 0.5 * radius, (0.866 * radius) + halflen, - 0.0, 0.866 * radius, (0.5 * radius) + halflen); - - addLine(0.0, 0.866 * radius, (0.5 * radius) + halflen, - 0.0, radius, halflen); - - // SW quadrant - addLine(0.0, -radius, -halflen, - 0.0, -0.866 * radius, (-0.5 * radius) - halflen); - - addLine(0.0, -0.866 * radius, (-0.5 * radius) - halflen, - 0.0, -0.5 * radius, (-0.866 * radius) - halflen); - - addLine(0.0, -0.5 * radius, (-0.866 * radius) - halflen, - 0.0, 0.0, -radius - halflen); - - // SE quadrant - addLine(0.0, 0.0, -radius - halflen, - 0.0, 0.5 * radius, (-0.866 * radius) - ... [truncated message content] |