Changeset 657 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Timestamp:

02/20/06 19:06:03 (19 years ago)

Author:

mattausch

Message:

added ogre dependencies and patched ogre sources

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• scripts/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• src/OgreVisibilitySceneManagerDll.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\GtpVisibility\include"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\GtpVisibility\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_OCCLUSIONCULLINGSCENEMANAGER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
                                 MinimalRebuild="TRUE"
@@ -36 +36 @@
                                 Name="VCLinkerTool"
                                 IgnoreImportLibrary="TRUE"
-                                AdditionalDependencies="OgreMain_d.lib CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_OctreeSceneManager.lib Plugin_DotSceneManager.lib GtpVisibility.lib"
+                                AdditionalDependencies="OgreMain_d.lib CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib"
                                 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll"
                                 Version="0.99"
-                                LinkIncremental="2"
+                                LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\..\GtpVisibility\lib\$(ConfigurationName)""

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp

@@ -74 +74 @@
 extern "C" void __declspec(dllexport) dllStopPlugin()
 {
-        delete heightmapTerrainPageSource;
+        //delete heightmapTerrainPageSource;
 
-        delete visibilityOctreePlugin;
-        delete visibilityTerrainPlugin;
+        // (HACK: crashes on delete!!!! FIX this 
+        //delete visibilityOctreePlugin;
+        //delete visibilityTerrainPlugin;
         //delete occlusionDotPlugin;