Changeset 2164

Timestamp:

02/26/07 14:52:48 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk

Files:

• App/Demos/Illum/Ogre/bin/Release/resources.cfg (modified) (2 diffs)
• App/Demos/Illum/Ogre/src/GameToolsRaytraceDemo/scripts/GameToolsRaytraceDemo.7.10.vcproj (modified) (1 diff)
• Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h (modified) (1 diff)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (2 diffs)
• Lib/Vis/Preprocessing/src/HashPvs.h (modified) (6 diffs)
• Lib/Vis/Preprocessing/src/Intersectable.h (modified) (1 diff)
• Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (1 diff)
• Lib/Vis/Preprocessing/src/Preprocessor.vcproj (modified) (2 diffs)
• Lib/Vis/Preprocessing/src/RayCaster.h (modified) (1 diff)
• Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (1 diff)
• Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (2 diffs)

GTP/trunk/App/Demos/Illum/Ogre/bin/Release/resources.cfg

@@ -48 +48 @@
 FileSystem=../../Media/materials/GTPAdvancedEnvMap/multibounce/multipleRefraction
 
-[GTP_MultipleCausticRefraction]
-FileSystem=../../Media/materials/GTPAdvancedEnvMap/multibounce/multipleCausticRefraction
+#[GTP_MultipleCausticRefraction]
+#FileSystem=../../Media/materials/GTPAdvancedEnvMap/multibounce/multipleCausticRefraction
 
 [GTP_MultipleReflection_MinMax]
@@ -57 +57 @@
 FileSystem=../../Media/materials/GTPAdvancedEnvMap/multibounce/multipleRefractionMinMax
 
-[GTP_MultipleCausticRefraction_MinMax]
-FileSystem=../../Media/materials/GTPAdvancedEnvMap/multibounce/multipleCausticRefractionMinMax
+#[GTP_MultipleCausticRefraction_MinMax]
+#FileSystem=../../Media/materials/GTPAdvancedEnvMap/multibounce/multipleCausticRefractionMinMax

GTP/trunk/App/Demos/Illum/Ogre/src/GameToolsRaytraceDemo/scripts/GameToolsRaytraceDemo.7.10.vcproj

@@ -164 +164 @@
                         </File>
                 </Filter>
+                <File
+                        RelativePath="..\..\..\..\..\..\..\..\..\Ogre\trunk\ogrenew\Samples\Common\bin\Release\resources.cfg">
+                </File>
         </Files>
         <Globals>

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

@@ -36 +36 @@
 
         void _renderVisibleObjects();
-        void _findVisibleObjects(Camera* cam, bool onlyShadowCasters);
+        void myFindVisibleObjects(Camera* cam, bool onlyShadowCasters);
         void _updateSceneGraph(Camera* cam);
 

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

@@ -678 +678 @@
 }
 //-----------------------------------------------------------------------
-void OcclusionCullingSceneManager::_findVisibleObjects(Camera* cam,
+void OcclusionCullingSceneManager::myFindVisibleObjects(Camera* cam,
                                                                                                                 bool onlyShadowCasters)
 {
@@ -2033 +2033 @@
     {
         // Parse the scene and tag visibles
-        _findVisibleObjects(camera, 
+        myFindVisibleObjects(camera, 
             mIlluminationStage == IRS_RENDER_TO_TEXTURE? true : false);
     }

GTP/trunk/Lib/Vis/Preprocessing/src/HashPvs.h

@@ -25 +25 @@
    };
 
-   /*int operator()(T a) const
-   {
-           if (!a)
-                   return -2;
-           return (size_t)(a->GetId());
-   }*/
-
    int operator()(int a) const
    {
@@ -103 +96 @@
 public:
 
-        //HashPvs(): mEntries((Intersectable *)100) {};
-        HashPvs() 
+        HashPvs()//: mEntries(1009)
         {
                  mEntries.set_deleted_key(-1);
                  mEntries.set_empty_key(-2);
-                 //mEntries.Reset();
         };
         //virtual ~HashPvs() {};
@@ -141 +132 @@
         bool IsDirty() const;
 
-        bool RequiresResort() const;
+        inline bool RequiresResort() const;
 
         /** Finds sample in PVS.
@@ -273 +264 @@
                                                                                 const float pdf)
 {
+        static pair<HASH_ITERATOR, bool> result;
+        result = mEntries.insert(pair<int, T>(sample->GetId(), sample));
+        return result.second;
+
+        /*
         static CONST_HASH_ITERATOR it;
 
@@ -280 +276 @@
         const bool found = (it != mEntries.end());
 
+        //return false;
         // already in map
         if (found)
@@ -287 +284 @@
         mEntries.insert(pair<int, T>(sample->GetId(), sample));
         
-        return true;
+        return true;*/
 }
 

GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h

@@ -63 +63 @@
   virtual ~Intersectable();
 
-  void SetId(const int id) { mId = id; }
-  int GetId() { return mId; }
+  inline void SetId(const int id) { mId = id; }
+  inline int GetId() { return mId; }
   
   /////////////

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

@@ -1660 +1660 @@
         if (pvsObjects.empty())
         {
-                Debug << "here81 no objects" << endl;
+                Debug << "no objects" << endl;
                 pvsObjects = preprocessorObjects;
         }

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj

@@ -221 +221 @@
                                 OptimizeForProcessor="3"
                                 OptimizeForWindowsApplication="TRUE"
-                                AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";"$(CG_INC_PATH)";Timer;..\src\ootl\src\;..\src\ootl\src\cpp;..\src\ootl\src\include\ootl\sandbox;..\src\ootl\;..\src\ootl\src\include\ootl;..\src\sparsehash\src\google\sparsehash;..\src\sparsehash\src\windows;..\src\sparsehash\src\google;..\src\sparsehash\src"
+                                AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\MultiLevelRayTracing;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";"$(CG_INC_PATH)";Timer;..\src\ootl\src\;..\src\ootl\src\cpp;..\src\ootl\src\include\ootl\sandbox;..\src\ootl\src;..\src\ootl\src\include\ootl;..\src\sparsehash\src\google\sparsehash;..\src\sparsehash\src\windows;..\src\sparsehash\src\google;..\src\sparsehash\src;..\src\ootl\"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_HASH_PVS"
                                 ExceptionHandling="TRUE"
@@ -1160 +1160 @@
                         </File>
                         <File
+                                RelativePath=".\sparsehash\src\windows\hash_fun.h">
+                        </File>
+                        <File
                                 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h">
-                        </File>
-                        <File
-                                RelativePath=".\sparsehash\src\windows\hash_fun.h">
                         </File>
                         <File

GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.h

@@ -88 +88 @@
         
         void Reserve(const int number) {
-                cout<<"here3"<<endl;
-        DEL_PTR(mRays);
-        cout<<"here44"<<endl;
-          mRays = new VssRay[number];
-          mNumber = number;
+                DEL_PTR(mRays);
+                mRays = new VssRay[number];
+                mNumber = number;
         }
         

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

@@ -1996 +1996 @@
         default:
                 // pvs is stored consistently in the tree up
-                //to the root just return pvs size 
+                // to the root just return pvs size 
                 pvsCost = vc->GetPvs().EvalPvsCost();   
                 break;

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -2657 +2657 @@
         if (addSamplesToPvs) 
         {
-                hasAbsContribution = viewCell->GetPvs().
-                        AddSampleDirtyCheck(obj, ray.mPdf);
+                hasAbsContribution = viewCell->GetPvs().AddSampleDirtyCheck(obj, ray.mPdf);
                 //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf);
         }
@@ -2664 +2663 @@
         {
                 hasAbsContribution = 
-                        viewCell->GetPvs().GetSampleContribution(obj,
-                        ray.mPdf,
-                        relContribution);
+                        viewCell->GetPvs().GetSampleContribution(obj, ray.mPdf, relContribution);
         }