Changeset 828 for GTP/trunk/Lib

Timestamp:

04/26/06 15:41:34 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h (modified) (3 diffs)
• OnlineCullingCHC/OGRE/include/OgreVisibilityOctreeSceneManager.h (modified) (1 diff)
• OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj (modified) (3 diffs)
• OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (2 diffs)
• shared/scripts/GtpVisibility.sln (modified) (1 diff)
• shared/scripts/GtpVisibility.suo (modified) (previous)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h

@@ -11 +11 @@
 #include "OgrePlatformQueryManager.h"
 #include "VisibilityManager.h"
+#include "ViewCellsManager.h"
 
 
@@ -98 +99 @@
         void setWorldGeometry( const String& filename );
 
+        /** Loads view cells for this particular scene.
+        */
+        void LoadViewCells(std::string filename);
+
 protected:
         
@@ -161 +166 @@
 
         bool mIsHierarchicalCulling;
+
+        ViewCellsManager *mViewCellsManager;
 };
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreVisibilityOctreeSceneManager.h

@@ -10 +10 @@
 #include "OgreOctreeHierarchyInterface.h"
 #include "VisibilityManager.h"
+
 
 namespace Ogre {

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

@@ -88 +88 @@
                                 EnableFiberSafeOptimizations="TRUE"
                                 OptimizeForProcessor="2"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\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;..\..\..\OnlineCullingCHC\include"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\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;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTP_VISIBILITY_MODIFIED_OGRE"
                                 StringPooling="TRUE"
@@ -94 +94 @@
                                 BufferSecurityCheck="FALSE"
                                 EnableFunctionLevelLinking="TRUE"
-                                RuntimeTypeInfo="FALSE"
+                                RuntimeTypeInfo="TRUE"
                                 UsePrecompiledHeader="0"
                                 WarningLevel="3"
@@ -104 +104 @@
                                 Name="VCLinkerTool"
                                 IgnoreImportLibrary="TRUE"
-                                AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib"
+                                AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib Preprocessor.lib xerces-c_2.lib"
                                 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll"
                                 Version="0.99"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-                                AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)""
+                                AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\GtpVisibility\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\support\xercesc\lib\;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib"
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
                                 GenerateDebugInformation="TRUE"

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

@@ -9 +9 @@
 #include <OgreEntity.h>
 #include <OgreSubEntity.h>
-
+#include "VspBspTree.h"
 
 namespace Ogre {
@@ -834 +834 @@
    }
 }
+
+void OcclusionCullingSceneManager::LoadViewCells(string filename)
+{
+        ObjectContainer objects;
+        mViewCellsManager->LoadViewCells(filename, &objects);
+}
+
 } // namespace Ogre

GTP/trunk/Lib/Vis/shared/scripts/GtpVisibility.sln

@@ -6 +6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GtpVisibility", "..\..\OnlineCullingCHC\scripts\GtpVisibility.vcproj", "{101A7691-74F3-48B4-96A3-CF35578F5900}"
         ProjectSection(ProjectDependencies) = postProject
+                {EABCE292-D598-4600-A1C9-2591E7D62FDA} = {EABCE292-D598-4600-A1C9-2591E7D62FDA}
         EndProjectSection
 EndProject