Changeset 1103 for GTP/trunk

Timestamp:

07/07/06 17:01:43 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule

Files:

• IllumModule/include/SharedRuns.h (modified) (1 diff)
• OgreIllumModule/include/OgreIlluminationManager.h (modified) (2 diffs)
• OgreIllumModule/include/RenderingRuns/OgreDepthShadowMapRenderingRun.h (modified) (2 diffs)
• OgreIllumModule/include/RenderingRuns/OgreFocusingMapRenderingRun.h (added)
• OgreIllumModule/scripts/OgreIllumModule.vcproj (modified) (2 diffs)
• OgreIllumModule/src/OgreIlluminationManager.cpp (modified) (2 diffs)
• OgreIllumModule/src/RenderTechniques/OgreDepthShadowRecieverRenderTechnique.cpp (modified) (1 diff)
• OgreIllumModule/src/RenderingRuns/OgreDepthShadowMapRenderingRun.cpp (modified) (5 diffs)
• OgreIllumModule/src/RenderingRuns/OgreFocusingMapRenderingRun.cpp (added)

GTP/trunk/Lib/Illum/IllumModule/IllumModule/include/SharedRuns.h

@@ -21 +21 @@
         ILLUMRUN_DEPTH_SHADOWMAP,
         ILLUMRUN_SCENE_CAMERA_DEPTH,
-        ILLUMRUN_HPP_IMPOSTOR
+        ILLUMRUN_HPP_IMPOSTOR,
+        ILLUMRUN_FOCUSING_MAP
 };
 

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/OgreIlluminationManager.h

@@ -67 +67 @@
         */
         float maxRad;
+        unsigned int focusingMapSize;
         std::map<RenderingRunType,float> maxRads;
         /**
@@ -149 +150 @@
         }
         void setMaxJoinRadius(RenderingRunType type, float rad){maxRads[type] = rad;}
+        void setFocusingMapSize(unsigned int size){focusingMapSize = size;}
         /**
                 @brief Returns the one and only OgreIlluminationManager instance.

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/RenderingRuns/OgreDepthShadowMapRenderingRun.h

@@ -11 +11 @@
 #include "DepthShadowMapRenderingRun.h"
 #include "OgreSharedRuns.h"
+#include "OgreFocusingMapRenderingRun.h"
 
 
@@ -45 +46 @@
                 @brief Refreshes light camera matrices, called in each update.
         */
-        void refreshLight();
+        void refreshLight(unsigned long frameNum);
         /**
                 @brief retuns the view matrix of the camera from which the depth shadow map was created

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/scripts/OgreIllumModule.vcproj

@@ -187 +187 @@
                                 </File>
                                 <File
+                                        RelativePath="..\src\RenderingRuns\OgreFocusingMapRenderingRun.cpp">
+                                </File>
+                                <File
                                         RelativePath="..\src\RenderingRuns\OgrePhotonMapRenderingRun.cpp">
                                 </File>
@@ -272 +275 @@
                                 </File>
                                 <File
+                                        RelativePath="..\include\RenderingRuns\OgreFocusingMapRenderingRun.h">
+                                </File>
+                                <File
                                         RelativePath="..\include\RenderingRuns\OgrePhotonMapRenderingRun.h">
                                 </File>

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreIlluminationManager.cpp

@@ -79 +79 @@
         visitor = new VisibleFinderVisitor(&visibleObjects);
         maxRad = 400;
+        focusingMapSize = 32;
         
         for(int i = 0; i < RUN_TYPE_COUNT; i++)
@@ -571 +572 @@
                         
                 }
+                case ILLUMRUN_FOCUSING_MAP:
+                if(runs->getRun(ILLUMRUN_FOCUSING_MAP) == 0)
+                {
+                        SceneManager* sm = Root::getSingleton()._getCurrentSceneManager();
+                        Light* light = sm->getLight(lightName);
+                        Vector3 position = light->getPosition();
+                        Vector3 direction = light->getDirection();
+                        Matrix4 transMatrix;
+                        Camera cam("tempCamera", sm);
+                        cam.setPosition(position);
+                        cam.setDirection(direction);
+                        transMatrix = cam.getViewMatrix();
+
+                        if(light->getType() == Light::LT_SPOTLIGHT)
+                        {
+                                Radian fov = light->getSpotlightOuterAngle();
+                                float far = light->getAttenuationRange();
+                                cam.setNearClipDistance(0.1);
+                                cam.setFarClipDistance(far);
+                                cam.setFOVy(fov);
+                                Matrix4 proj = cam.getProjectionMatrix();
+                                transMatrix = transMatrix * proj;
+                        }                       
+                        sm->destroyCamera("tempCamera");
+
+                        OgreFocusingMapRenderingRun* run  = new OgreFocusingMapRenderingRun(
+                                lightName + "FOCUSING_MAP",
+                                mainViewport,
+                                transMatrix,
+                                focusingMapSize
+                                );
+                        runs->addRun(ILLUMRUN_FOCUSING_MAP, run);
+                        
+                }
                 break;
         }       

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgreDepthShadowRecieverRenderTechnique.cpp

@@ -103 +103 @@
                         fpParams->setNamedConstant("lightView", depthRun->getLightViewMatrix(0)); 
                         fpParams->setNamedConstant("lightViewProj", depthRun->getLightViewProjMatrix(0)); 
-                        fpParams->setNamedConstant("lightView2", depthRun->getLightViewMatrix(1)); 
-                        fpParams->setNamedConstant("lightViewProj2", depthRun->getLightViewProjMatrix(1)); 
+                //      fpParams->setNamedConstant("lightView2", depthRun->getLightViewMatrix(1)); 
+                //      fpParams->setNamedConstant("lightViewProj2", depthRun->getLightViewProjMatrix(1)); 
                         
                         passes.at(i)->setActive(true);

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderingRuns/OgreDepthShadowMapRenderingRun.cpp

@@ -25 +25 @@
 void OgreDepthShadowMapRenderingRun::createDepthMap()
 {
-        for(int i = 0; i < 2; i++)
+        for(int i = 0; i < 1; i++)
         {
                 TexturePtr texPtr = Ogre::TextureManager::getSingleton().createManual(names[i], 
@@ -49 +49 @@
 void OgreDepthShadowMapRenderingRun::updateFrame(unsigned long frameNum)
 {
-        refreshLight();
+        refreshLight(frameNum);
 
         if(light->getType() == Light::LT_POINT)
@@ -69 +69 @@
 void OgreDepthShadowMapRenderingRun::updateDepthMap()
 {
-        setMaterialForVisibles(materialName, depthMapCameras[0], true); 
+        setMaterialForVisibles(materialName, depthMapCameras[0], false);        
         RenderTarget* rt = depthMapTextures[0]->getBuffer().getPointer()->getRenderTarget();    
         rt->update();
-        //restoreMaterials();
+        restoreMaterials();
         //rt->writeContentsToFile("shadowmap1.dds");
-        
-        //setMaterialForVisibles(materialName, depthMapCameras[1], true);       
-        RenderTarget* rt2 = depthMapTextures[1]->getBuffer().getPointer()->getRenderTarget();
-        rt2->update();
-        restoreMaterials();
-        //rt2->writeContentsToFile("shadowmap2.dds");
-
-        
 }
 
@@ -89 +81 @@
 }
 
-void OgreDepthShadowMapRenderingRun::refreshLight()
+void OgreDepthShadowMapRenderingRun::refreshLight(unsigned long frameNum)
 {
         
@@ -96 +88 @@
                 if(light->getType() == Light::LT_DIRECTIONAL)
                 {
-                        //Vector3 dir = light->getDirection();
-                        Vector3 dir = Vector3(0,-1,-1);
-                        Vector3 pos;
-                        float size;
-                        
                         Camera* viewcam = OgreIlluminationManager::getSingleton().getMainCamera();
                         
-                        //Matrix4 camView = viewcam->getViewMatrix();
-                        //Matrix4 camViewI = camView.inverse();
-                        //const AxisAlignedBox bt = viewcam->getWorldBoundingBox(true);
-                        //AxisAlignedBox b = bt;
-                        //b.transform(camView);
-                        //SceneManager* sm = Root::getSingleton()._getCurrentSceneManager();
-                        //SceneNode* node = sm->getRootSceneNode();
-                        //const AxisAlignedBox bs(-35,-5 ,-75, 35, 15, 75);// = node->_getWorldAABB();
-                        //AxisAlignedBox intersection = b.intersection(bs);
-                        //pos = intersection.getCenter();                       
-                        //size = (intersection.getMaximum() - pos).length();
+                        OgreIlluminationManager::getSingleton().updatePerLightRun(light->getName(),
+                                                                                                                                                ILLUMRUN_FOCUSING_MAP,
+                                                                                                                                                frameNum);
+
+                        OgreFocusingMapRenderingRun* frun = (OgreFocusingMapRenderingRun*)
+                                OgreIlluminationManager::getSingleton().getPerLightRun(light->getName(), ILLUMRUN_FOCUSING_MAP)->asOgreRenderingRun();
                         
-                        //TODO: where to put light
-                        size = 30;
-                        pos = Vector3(0,0,0);
+                        Vector3 min;
+                        Vector3 max;
+                        frun->getMinMax(min, max);
+
+                        Vector3 lightpos = light->getPosition();
+                        Vector3 lightdir = light->getDirection();
                         
-                        depthMapCameras[0]->setDirection( dir );
-                        pos = pos - size * dir;                 
-                        depthMapCameras[0]->setPosition( pos );
-                        depthMapCameras[0]->setProjectionType(PT_ORTHOGRAPHIC);         
-                        Matrix4 fproj;
-                        fproj = depthMapCameras[0]->getProjectionMatrix();
-                        fproj = Matrix4::IDENTITY;
-                        fproj.setScale(Vector3(1.0/20, 1.0/25, -1.0/100));
-                        //fproj.setTrans(Vector3(0,0,-50));
-                        depthMapCameras[0]->setCustomProjectionMatrix(true,fproj);
+                        Vector3 center = (min + max) / 2.0;
+                        Vector3 scale = max - min;
+                        scale.x = 2.0 / scale.x;
+                        scale.y = 2.0 / scale.y;
+                        scale.z = 2.0 / scale.z;
+                        center.x *= scale.x;
+                        center.y *= scale.y;
+                        center.z *= scale.z;
 
 
-                        //camera2
-                        dir.normalise();
-                        size = abs(dir.crossProduct(Vector3(0,0,1)).length() * 2);
-                        Vector3 viewDir = viewcam->getDirection();
-                        float y = viewDir.y;
-                        viewDir.y = std::min(0.0f, y);
-                        viewDir.normalise();
-                        Vector3 down(0,-1,0);
-                        float cosA = viewDir.dotProduct(down);
-                        Vector3 newDir = viewDir + down * 0.4; 
-                        newDir.normalise();
-                        pos = viewcam->getPosition();
-                        size *= pos.y * 0.5 + 1;
-                        pos += newDir * viewcam->getPosition().y 
-                                                                                        / newDir.dotProduct(down);
-                        //pos.y = 0;
-                        
-                        
-                        
-                        depthMapCameras[1]->setDirection( dir );
-                        pos = pos - 30 * dir;                   
-                        depthMapCameras[1]->setPosition( pos );
-                        depthMapCameras[1]->setProjectionType(PT_ORTHOGRAPHIC);         
-                        Matrix4 fproj2;
-                        fproj2 = depthMapCameras[1]->getProjectionMatrix();
-                        fproj2 = Matrix4::IDENTITY;
-                        fproj2.setScale(Vector3(1.0/size, 1.0/size, -1.0/100));
-                        //fproj.setTrans(Vector3(0,0,-50));
-                        depthMapCameras[1]->setCustomProjectionMatrix(true,fproj2);
-                        
-                        
-/*LISPSM
-                        Vector3 viewdir = viewcam->getDirection();
-                        Vector3 lightdir = dir;
+                        depthMapCameras[0]->setDirection( lightdir );
+                        depthMapCameras[0]->setPosition( lightpos );
 
-                        float dotProd = viewdir.dotProduct(lightdir);
-                        float sinGamma;
-                        sinGamma = sqrt(1.0-dotProd*dotProd);
-                        g_fsinGamma = sinGamma;
-
-                        Vector3 newVdir = viewdir;
-                        Matrix4 proj;*/
+                        Matrix4 projection = Matrix4::IDENTITY;
+                        projection.setTrans(center);
+                        projection.setScale(scale);
+                        depthMapCameras[0]->setCustomProjectionMatrix(true, projection);        
+/*
+                        projection = Matrix4::IDENTITY;
+                        projection.setScale(Vector3(1.0 / 100.0, 1.0 / 100.0, -1.0 / 100.0));
+                        depthMapCameras[0]->setCustomProjectionMatrix(true, projection);
+                        depthMapCameras[0]->setPosition( Vector3(50,50,50) );*/
 
                 }