Changeset 2495 for GTP/trunk

Timestamp:

07/02/07 20:26:26 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src

Files:

• OgreRenderable.cpp (modified) (1 diff)
• RenderingRuns/OgrePhotonMapRenderingRun.cpp (modified) (3 diffs)

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

@@ -135 +135 @@
                  boundingBox = parentEntity->getWorldBoundingBox(true);
                  
-                 Vector3 center = (boundingBox.getMaximum() + boundingBox.getMaximum()) / 2.0;
+                 Vector3 center = (boundingBox.getMaximum() + boundingBox.getMinimum()) / 2.0;
                  float radius = (center - boundingBox.getMaximum()).length();
                  boundingSphere.setRadius(radius);
                  boundingSphere.setCenter(center);
-                 //boundingSphere = parentEntity->getWorldBoundingSphere(true); 
+                // boundingSphere = parentEntity->getWorldBoundingSphere(true); 
                  break;
          }

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

@@ -96 +96 @@
         light = *(list.begin());
 
+        sharedRuns->updateBounds();
+
         if(light!= 0)
         {
@@ -103 +105 @@
                         photonMapCamera->setDirection( dir );
                         Real r = sharedRuns->getRootBoundingSphere(ILLUMRUN_PHOTONMAP).getRadius();
-                        photonMapCamera->setPosition( sharedRuns->getRootPosition(ILLUMRUN_PHOTONMAP) - dir * r);
+                        Vector3 center = sharedRuns->getRootPosition(ILLUMRUN_PHOTONMAP);
+                        photonMapCamera->setPosition( center - dir * r);
                         photonMapCamera->setProjectionType(PT_ORTHOGRAPHIC);
                         Matrix4 proj;
@@ -114 +117 @@
                 {                       
                         Vector3 pos = light->getDerivedPosition();
-                        Vector3 dir = sharedRuns->getRootPosition(ILLUMRUN_PHOTONMAP) - pos;
+                        Vector3 center = sharedRuns->getRootPosition(ILLUMRUN_PHOTONMAP);
+                        Vector3 dir = center - pos;
                         Real r = sharedRuns->getRootBoundingSphere(ILLUMRUN_PHOTONMAP).getRadius();
                         Real d = dir.length();