Changeset 2164 for GTP/trunk/Lib/Vis
- Timestamp:
- 02/26/07 14:52:48 (18 years ago)
- Location:
- GTP/trunk/Lib/Vis
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h
r2160 r2164 36 36 37 37 void _renderVisibleObjects(); 38 void _findVisibleObjects(Camera* cam, bool onlyShadowCasters);38 void myFindVisibleObjects(Camera* cam, bool onlyShadowCasters); 39 39 void _updateSceneGraph(Camera* cam); 40 40 -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp
r2161 r2164 678 678 } 679 679 //----------------------------------------------------------------------- 680 void OcclusionCullingSceneManager:: _findVisibleObjects(Camera* cam,680 void OcclusionCullingSceneManager::myFindVisibleObjects(Camera* cam, 681 681 bool onlyShadowCasters) 682 682 { … … 2033 2033 { 2034 2034 // Parse the scene and tag visibles 2035 _findVisibleObjects(camera,2035 myFindVisibleObjects(camera, 2036 2036 mIlluminationStage == IRS_RENDER_TO_TEXTURE? true : false); 2037 2037 } -
GTP/trunk/Lib/Vis/Preprocessing/src/HashPvs.h
r2162 r2164 25 25 }; 26 26 27 /*int operator()(T a) const28 {29 if (!a)30 return -2;31 return (size_t)(a->GetId());32 }*/33 34 27 int operator()(int a) const 35 28 { … … 103 96 public: 104 97 105 //HashPvs(): mEntries((Intersectable *)100) {}; 106 HashPvs() 98 HashPvs()//: mEntries(1009) 107 99 { 108 100 mEntries.set_deleted_key(-1); 109 101 mEntries.set_empty_key(-2); 110 //mEntries.Reset();111 102 }; 112 103 //virtual ~HashPvs() {}; … … 141 132 bool IsDirty() const; 142 133 143 bool RequiresResort() const;134 inline bool RequiresResort() const; 144 135 145 136 /** Finds sample in PVS. … … 273 264 const float pdf) 274 265 { 266 static pair<HASH_ITERATOR, bool> result; 267 result = mEntries.insert(pair<int, T>(sample->GetId(), sample)); 268 return result.second; 269 270 /* 275 271 static CONST_HASH_ITERATOR it; 276 272 … … 280 276 const bool found = (it != mEntries.end()); 281 277 278 //return false; 282 279 // already in map 283 280 if (found) … … 287 284 mEntries.insert(pair<int, T>(sample->GetId(), sample)); 288 285 289 return true; 286 return true;*/ 290 287 } 291 288 -
GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h
r2116 r2164 63 63 virtual ~Intersectable(); 64 64 65 void SetId(const int id) { mId = id; }66 in t GetId() { return mId; }65 inline void SetId(const int id) { mId = id; } 66 inline int GetId() { return mId; } 67 67 68 68 ///////////// -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp
r2124 r2164 1660 1660 if (pvsObjects.empty()) 1661 1661 { 1662 Debug << " here81no objects" << endl;1662 Debug << "no objects" << endl; 1663 1663 pvsObjects = preprocessorObjects; 1664 1664 } -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj
r2162 r2164 221 221 OptimizeForProcessor="3" 222 222 OptimizeForWindowsApplication="TRUE" 223 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"223 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\" 224 224 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_HASH_PVS" 225 225 ExceptionHandling="TRUE" … … 1160 1160 </File> 1161 1161 <File 1162 RelativePath=".\sparsehash\src\windows\hash_fun.h"> 1163 </File> 1164 <File 1162 1165 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h"> 1163 </File>1164 <File1165 RelativePath=".\sparsehash\src\windows\hash_fun.h">1166 1166 </File> 1167 1167 <File -
GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.h
r2162 r2164 88 88 89 89 void Reserve(const int number) { 90 cout<<"here3"<<endl; 91 DEL_PTR(mRays); 92 cout<<"here44"<<endl; 93 mRays = new VssRay[number]; 94 mNumber = number; 90 DEL_PTR(mRays); 91 mRays = new VssRay[number]; 92 mNumber = number; 95 93 } 96 94 -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp
r2124 r2164 1996 1996 default: 1997 1997 // pvs is stored consistently in the tree up 1998 // to the root just return pvs size1998 // to the root just return pvs size 1999 1999 pvsCost = vc->GetPvs().EvalPvsCost(); 2000 2000 break; -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp
r2161 r2164 2657 2657 if (addSamplesToPvs) 2658 2658 { 2659 hasAbsContribution = viewCell->GetPvs(). 2660 AddSampleDirtyCheck(obj, ray.mPdf); 2659 hasAbsContribution = viewCell->GetPvs().AddSampleDirtyCheck(obj, ray.mPdf); 2661 2660 //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf); 2662 2661 } … … 2664 2663 { 2665 2664 hasAbsContribution = 2666 viewCell->GetPvs().GetSampleContribution(obj, 2667 ray.mPdf, 2668 relContribution); 2665 viewCell->GetPvs().GetSampleContribution(obj, ray.mPdf, relContribution); 2669 2666 } 2670 2667
Note: See TracChangeset
for help on using the changeset viewer.