Changeset 2174 for GTP/trunk/Lib/Illum
- Timestamp:
- 02/28/07 18:17:34 (18 years ago)
- Location:
- GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/scripts/OgreIllumModule.7.10.vcproj
r2143 r2174 21 21 Optimization="0" 22 22 ImproveFloatingPointConsistency="TRUE" 23 AdditionalIncludeDirectories=""$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\include;..\include\RenderingRuns;..\include\RenderTechniques;..\..\IllumModule\include;..\..\IllumModule\include\RenderingRuns;..\..\IllumModule\include\RenderTechniques ;"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include\""23 AdditionalIncludeDirectories=""$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\include;..\include\RenderingRuns;..\include\RenderTechniques;..\..\IllumModule\include;..\..\IllumModule\include\RenderingRuns;..\..\IllumModule\include\RenderTechniques" 24 24 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;GAMETOOLS_ILLUMINATION_MODULE;GTP_VISIBILITY_MODIFIED_OGRE" 25 25 MinimalRebuild="TRUE" … … 36 36 <Tool 37 37 Name="VCLibrarianTool" 38 AdditionalDependencies="IllumModule.lib OgreMain_d.lib Plugin_OctreeSceneManager.lib"39 AdditionalLibraryDirectories="..\..\IllumModule\bin\Debug;"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)" ;"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)""/>38 AdditionalDependencies="IllumModule.lib OgreMain_d.lib" 39 AdditionalLibraryDirectories="..\..\IllumModule\bin\Debug;"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)""/> 40 40 <Tool 41 41 Name="VCMIDLTool"/> … … 75 75 OptimizeForProcessor="2" 76 76 OptimizeForWindowsApplication="TRUE" 77 AdditionalIncludeDirectories=""$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\include;..\include\RenderingRuns;..\include\RenderTechniques;..\..\IllumModule\include;..\..\IllumModule\include\RenderingRuns;..\..\IllumModule\include\RenderTechniques;"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include\" "77 AdditionalIncludeDirectories=""$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\include;..\include\RenderingRuns;..\include\RenderTechniques;..\..\IllumModule\include;..\..\IllumModule\include\RenderingRuns;..\..\IllumModule\include\RenderTechniques;"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include\";..\..\..\..\Vis\OnlineCullingCHC\OGRE\include" 78 78 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GAMETOOLS_ILLUMINATION_MODULE;GTP_VISIBILITY_MODIFIED_OGRE" 79 79 StringPooling="TRUE" … … 91 91 <Tool 92 92 Name="VCLibrarianTool" 93 AdditionalDependencies="IllumModule.lib OgreMain.lib Plugin_OctreeSceneManager.lib "94 AdditionalLibraryDirectories="..\..\IllumModule\bin\Release;"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)" "/>93 AdditionalDependencies="IllumModule.lib OgreMain.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib" 94 AdditionalLibraryDirectories="..\..\IllumModule\bin\Release;"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"..\..\..\..\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)""/> 95 95 <Tool 96 96 Name="VCMIDLTool"/> -
GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreIlluminationManager.cpp
r2166 r2174 3 3 #include "OgreBillboardParticleRenderer.h" 4 4 #include "SpriteParticleRenderer.h" 5 6 5 7 6 OgreIlluminationManager* OgreIlluminationManager::instance = NULL; … … 402 401 } 403 402 404 sceneManager->_findVisibleObjects(rt->getViewport(i)->getCamera(),false); 403 //sceneManager->_findVisibleObjectsOC(rt->getViewport(i)->getCamera(), rt->getViewport(i), false, true, false); 404 sceneManager->_findVisibleObjects(rt->getViewport(i)->getCamera(), false); 405 405 406 fillVisibleList(rq); 406 407 -
GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreRenderingRun.cpp
r1725 r2174 173 173 } 174 174 175 sm->_findVisibleObjects (cam, shadowcastersonly); 176 177 setMaterialForRenderables(materialName, rq, solidsonly); 175 //sm->_findVisibleObjectsOC(cam, cam->getViewport(), false, true, shadowcastersonly); 176 sm->_findVisibleObjects(cam, shadowcastersonly); 177 178 setMaterialForRenderables(materialName, sm->getRenderQueue(), solidsonly); 178 179 } 179 180 -
GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderingRuns/OgreCubeMapRenderingRun.cpp
r2055 r2174 69 69 Vector3 center = sharedRuns->getRootPosition(cubemapRunType); 70 70 cam->setPosition(center); 71 71 72 72 bool renderAllwithOwnColor = false; 73 73 … … 83 83 if(useEnvMaterial) 84 84 { 85 ///////////////////////////////////////////////////////////////// 86 //// DEBUG 87 ///////////////////////////////////////////////////////////////// 88 /* Camera* camm = new Camera("tempCAm", sm); 89 TexturePtr texPtr = Ogre::TextureManager::getSingleton().createManual( "tempRT", 90 "default", 91 TEX_TYPE_2D, 92 256, 93 256, 94 0, 95 0, 96 PF_FLOAT16_RGBA, 97 TU_RENDERTARGET); 98 camm->setPosition(0,50,0); 99 camm->setAspectRatio(1); 100 camm->setFOVy(Radian(Degree(90))); 101 camm->setNearClipDistance(0.1); 102 camm->setFarClipDistance(1000); 103 Texture* result = texPtr.getPointer(); 104 HardwarePixelBuffer* hpb = (result->getBuffer()).getPointer(); 105 RenderTarget* rt = hpb->getRenderTarget(0); 106 Viewport* v = rt->addViewport(camm); 107 v->setOverlaysEnabled(false); 108 rt->setAutoUpdated(false); 109 110 int cnt = sm->_findVisibleObjectsOC(camm, v, false, true, false); 111 int cnt2 = sm->_findVisibleObjectsOC(cam, v, false, true, false); 112 int cnt3 = sm->_findVisibleObjectsOC(camm, cam->getViewport(), false, true, false); 113 int cnt3 = sm->_findVisibleObjectsOC(cam, cam->getViewport(), false, true, false);*/ 114 /////////////////////////////////////////////////// 85 115 setMaterialForVisibles(environmentMaterial, cam); 86 116 //sm->_queueSkiesForRendering(cam); … … 88 118 else 89 119 { 120 //sm->_findVisibleObjectsOC(cam, rt->getViewport(0), false, true, false); 90 121 sm->_findVisibleObjects(cam, false); 91 122 sm->_queueSkiesForRendering(cam);
Note: See TracChangeset
for help on using the changeset viewer.