Changeset 16 for trunk

Timestamp:

03/15/05 15:21:22 (19 years ago)

Author:

gametools

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager

Files:

• TestCulling/TestCulling.vcproj (modified) (3 diffs)
• TestCulling/TestCullingApplication.cpp (modified) (1 diff)
• TestCulling/TestCullingApplication.h (modified) (1 diff)
• scripts/Ogre.log (deleted)
• scripts/OgreLeaks.log (deleted)
• scripts/OgreMemory.log (deleted)
• scripts/Plugin_OcclusionCullingSceneManager.dsw (deleted)
• scripts/Plugin_OcclusionCullingSceneManager.sln (modified) (1 diff)
• scripts/Plugin_OcclusionCullingSceneManager.suo (deleted)
• scripts/Plugin_OcclusionCullingSceneManager.vcproj (modified) (6 diffs)
• scripts/Plugin_OcclusionCullingSceneManager.vcproj.old (deleted)
• scripts/Plugins.cfg (deleted)
• scripts/media.cfg (deleted)
• scripts/ogre.cfg (deleted)
• scripts/quake3settings.cfg (deleted)
• scripts/resources.cfg (deleted)
• scripts/terrain.cfg (deleted)
• scripts/world.cfg (deleted)
• src/Makefile.am (modified) (1 diff)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (3 diffs)
• src/OgreOcclusionCullingSceneManagerDll.cpp (modified) (2 diffs)

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCulling.vcproj

@@ -13 +13 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="Debug"
-                        IntermediateDirectory="Debug"
+                        OutputDirectory="..\bin\$(ConfigurationName)"
+                        IntermediateDirectory="..\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="2"
@@ -35 +35 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="OGREMain_d.LIB"
-                                OutputFile="$(OGRE_PATH)\Common\Bin\Debug\TestCulling.exe"
+                                OutputFile="$(OGRE_PATH)\Samples\Common\Bin\Debug\TestCulling.exe"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="$(OGRE_PATH)\OgreMain\Lib\Debug"
@@ -120 +120 @@
                         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-                        <File
-                                RelativePath=".\TestCullingApplication.cpp">
-                        </File>
                 </Filter>
                 <Filter

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.cpp

@@ -30 +30 @@
     TestCullingApplication app;
 
-    try {
+        try {
         app.go();
     } catch( Ogre::Exception& e ) {
         MessageBox( NULL, e.getFullDescription().c_str(), "An exception has occured!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-    }
+    }   
 
     return 0;

trunk/VUT/OcclusionCullingSceneManager/TestCulling/TestCullingApplication.h

@@ -86 +86 @@
     void chooseSceneManager(void)
     {
-        mSceneMgr = mRoot->getSceneManager(ST_INTERIOR);
+    //    mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
+                mSceneMgr = mRoot->getSceneManager(ST_INTERIOR);
     }
         /*

trunk/VUT/OcclusionCullingSceneManager/scripts/Plugin_OcclusionCullingSceneManager.sln

@@ -6 +6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCulling", "..\TestCulling\TestCulling.vcproj", "{248F19A6-2FE0-4F5D-8928-E0EA10609887}"
         ProjectSection(ProjectDependencies) = postProject
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} = {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}
         EndProjectSection
 EndProject

trunk/VUT/OcclusionCullingSceneManager/scripts/Plugin_OcclusionCullingSceneManager.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\include;$(OGRE_PATH)\OgreMain\include"
+                                AdditionalIncludeDirectories="..\include; $(OGRE_PATH)\OgreMain\include"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_OCCLUSIONCULLINGSCENEMANAGER_EXPORTS"
                                 MinimalRebuild="TRUE"
@@ -51 +51 @@
                         <Tool
                                 Name="VCPostBuildEventTool"
-                                CommandLine="copy $(OutDir)\$(TargetFileName) ..\..\..\Samples\Common\bin\$(ConfigurationName)"/>
+                                CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)"/>
                         <Tool
                                 Name="VCPreBuildEventTool"/>
@@ -87 +87 @@
                                 EnableFiberSafeOptimizations="TRUE"
                                 OptimizeForProcessor="2"
-                                AdditionalIncludeDirectories="..\include;..\..\..\OgreMain\include"
+                                AdditionalIncludeDirectories="..\include;$(OGRE_PATH)\OgreMain\include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_OCCLUSIONCULLINGSCENEMANAGER_EXPORTS"
                                 StringPooling="TRUE"
@@ -107 +107 @@
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-                                AdditionalLibraryDirectories="&quot;..\..\..\OgreMain\lib\$(ConfigurationName)&quot;;&quot;..\..\..\Dependencies\lib\$(ConfigurationName)&quot;"
+                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)&quot;;&quot;..\..\..\Dependencies\lib\$(ConfigurationName)&quot;"
                                 ModuleDefinitionFile="..\misc\OgreOcclusionCullingSceneManager.def"
                                 GenerateDebugInformation="TRUE"
@@ -119 +119 @@
                         <Tool
                                 Name="VCPostBuildEventTool"
-                                CommandLine="copy $(OutDir)\$(TargetFileName) ..\..\..\Samples\Common\bin\$(ConfigurationName)"/>
+                                CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)"/>
                         <Tool
                                 Name="VCPreBuildEventTool"/>
@@ -153 +153 @@
                                 RelativePath="..\src\OgreOcclusionCullingSceneManagerDll.cpp">
                         </File>
+                        <File
+                                RelativePath="..\TestCulling\TestCullingApplication.cpp">
+                        </File>
                 </Filter>
                 <Filter

trunk/VUT/OcclusionCullingSceneManager/src/Makefile.am

@@ -1 @@
-INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/BSPSceneManager/include -I$(top_srcdir)/OgreMain/include
+INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/OcclusionCullingSceneManager/include -I$(top_srcdir)/OgreMain/include
 
 pkglib_PROGRAMS = Plugin_BSPSceneManager.so
 
-Plugin_BSPSceneManager_so_SOURCES = OgreBspLevel.cpp \
-                             OgreBspNode.cpp \
-                             OgreBspResourceManager.cpp \
-                             OgreBspSceneManager.cpp \
-                             OgreBspSceneManagerDll.cpp \
-                                                         OgreBspSceneNode.cpp \
-                             OgreQuake3ShaderManager.cpp \
-                             OgreQuake3Shader.cpp \
-                             OgreQuake3Level.cpp
-
-
-Plugin_BSPSceneManager_so_LDFLAGS = $(SHARED_FLAGS) -L$(top_srcdir)/OgreMain/src
-Plugin_BSPSceneManager_so_LDADD = -lOgreMain
+Plugin_OcclusionCullingSceneManager_so_SOURCES = OgreBspLevel.cpp \
+                             OcclusionCullingResourceManager.cpp \
+                             OcclusionCullingSceneManager.cpp \
+                             OcclusionCullingSceneManagerDll.cpp
+                                        
+Plugin_OcclusionCullingSceneManager_so_LDFLAGS = $(SHARED_FLAGS) -L$(top_srcdir)/OgreMain/src
+Plugin_OcclusionCullingSceneManager_so_LDADD = -lOgreMain

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManager.cpp

@@ -2 +2 @@
 #include "OgreMath.h"
 #include "OgreIteratorWrappers.h"
+#include <windows.h>
 
 namespace Ogre {
@@ -8 +9 @@
         OcclusionCullingSceneManager::OcclusionCullingSceneManager(): 
         mFrameID(1)
-        {
+        {               
         }
 
@@ -17 +18 @@
                 //mDistanceQueue.push(mSceneRoot);
                 //Preprocess();
-
+                //printf("registered my plugin!!\n");
+                //MessageBox( NULL, "myplugin", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
                 renderCullFrustum();
 

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManagerDll.cpp

@@ -26 +26 @@
 #include "OgreOcclusionCullingSceneManager.h"
 #include "OgreRoot.h"
-//#include "windows.h"
+#include <windows.h>
 
 namespace Ogre {
@@ -36 +36 @@
         // Create new scene manager
         occlusionPlugin = new OcclusionCullingSceneManager();
+                
+                // Register
+        Root::getSingleton().setSceneManager(ST_INTERIOR, occlusionPlugin);
+                //Root::getSingleton().setSceneManager(ST_GENERIC, occlusionPlugin);
 
-        // Register
-        Root::getSingleton().setSceneManager(ST_INTERIOR, occlusionPlugin);
-                //Root::getSingleton().setSceneManager(ST_GENERIC, bspPlugin);
-                //printf("registered my plugin!!\n");
-                //MessageBox( NULL, "myplugin", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+                MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
     }
     extern "C" void dllStopPlugin(void)