Changeset 1062 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src

Timestamp:

06/27/06 10:21:48 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• OgreIlluminationManager.cpp (modified) (1 diff)
• OgreRenderable.cpp (modified) (2 diffs)
• RenderTechniques/OgreHierarchicalParticleSystemTechnique.cpp (modified) (3 diffs)
• RenderingRuns/OgreChildParticlesystemRenderingRun.cpp (modified) (5 diffs)

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

@@ -102 +102 @@
         OgreFireRenderTechniqueFactory* fire = new OgreFireRenderTechniqueFactory();
                 addRenderTechniqueFactory(fire);
+        OgreHierarchicalParticleSystemTechniqueFactory* HPSF = new OgreHierarchicalParticleSystemTechniqueFactory();
+                addRenderTechniqueFactory(HPSF);
 }
 

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

@@ -35 +35 @@
         parentParticleSystem = sys;
         updateBounds();
-        name = billboardset->getName();
+        name = sys->getName();
 }
 
@@ -136 +136 @@
                  break;
          case OGRE_RENDERABLETYPE_BILLBOARDSET:
-                 billboardSetRenderable->getParentSceneNode()->_updateBounds();
+                /* billboardSetRenderable->getParentSceneNode()->_updateBounds();
                  boundingBox = billboardSetRenderable->getWorldBoundingBox(true);
-                 boundingSphere = billboardSetRenderable->getWorldBoundingSphere(true);
+                 boundingSphere = billboardSetRenderable->getWorldBoundingSphere(true);*/
+                 parentParticleSystem->getParentSceneNode()->_updateBounds();
+                 boundingBox = parentParticleSystem->getWorldBoundingBox(true);
+                 boundingSphere = parentParticleSystem->getWorldBoundingSphere(true);
                  break;
         default:

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

@@ -24 +24 @@
         this->childPSysScriptName = childPSysScriptName;
         this->impostorMaterialName = impostorMaterialName;
-                                                                                                                
+        this->useOwnMaterial = useOwnMaterial;
+        
+        //create the Particle system
+        childPSysName = parentOgreRenderable->getName() + "_small_PSYS";
+        ParticleSystem* psys = Root::getSingleton()._getCurrentSceneManager()->createParticleSystem(childPSysName, childPSysScriptName);
+        SceneNode* node = Root::getSingleton()._getCurrentSceneManager()->getRootSceneNode()->createChildSceneNode();
+        node->attachObject(psys);
+        psys->setVisible(false);
         
         if(sharedRuns->getRun(ILLUMRUN_HPP_IMPOSTOR) == 0)
                 sharedRuns->addRun(ILLUMRUN_HPP_IMPOSTOR, createChildPSysRenderingRun());       
 
-        //create the Particle system
-        String name = parentOgreRenderable->getName() + "_small_PSYS";
-        ParticleSystem* psys = Root::getSingleton()._getCurrentSceneManager()->createParticleSystem(name, childPSysScriptName);
-        SceneNode* node = Root::getSingleton()._getCurrentSceneManager()->getRootSceneNode()->createChildSceneNode();
-        node->attachObject(psys);
-        psys->setVisible(false);
+        impostorChanged(sharedRuns->getRun(ILLUMRUN_HPP_IMPOSTOR));
 }
 
@@ -41 +43 @@
 {
 
+}
+
+void OgreHierarchicalParticleSystemTechnique::impostorChanged(RenderingRun* run)
+{
+        OgreChildPSystemRenderingRun* r = (OgreChildPSystemRenderingRun*) run->asOgreRenderingRun();
+        pass->getTextureUnitState(impostorTexID)->setTextureName(r->getImpostorTextureName());
 }
 
@@ -178 +186 @@
 }
 
+

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

@@ -47 +47 @@
          RenderTarget* rt = hpb->getRenderTarget();
          Viewport* v = rt->addViewport(impostorCamera);
+         v->setBackgroundColour(ColourValue(0,1,0,0));
          v->setOverlaysEnabled(false);
          rt->setAutoUpdated(false);
@@ -60 +61 @@
         rq->clear();
 
+        sharedRuns->getRoot()->updateBounds();
         Sphere boundSphere = ((OgreSharedRuns*)sharedRuns->getRoot(ILLUMRUN_HPP_IMPOSTOR))->getBoundingSphere();
         Camera* mainCam = OgreIlluminationManager::getSingleton().getMainCamera();
@@ -65 +67 @@
         Vector3 dir = boundSphere.getCenter() - mainCam->getPosition();
         float r = boundSphere.getRadius();
+        r = 200;
         float d = dir.normalise();
         impostorCamera->setDirection(dir);
@@ -72 +75 @@
                 impostorCamera->setProjectionType(PT_PERSPECTIVE);
                 impostorCamera->setAspectRatio(1.0);
-                Radian a = Math::ASin(r / d);
-                impostorCamera->setFOVy(a * 2.0);
-                impostorCamera->setNearClipDistance(std::max(0.01f, d - r));
-                impostorCamera->setFarClipDistance(r + d);              
+                Radian a = Math::ASin(r / d) * 2.0;
+                impostorCamera->setFOVy(/*a*/ Radian(Degree(90)));
+                impostorCamera->setNearClipDistance(/*std::max(0.01f, d - r)*/0.1);
+                impostorCamera->setFarClipDistance(/*r + d*/1000);              
         }
         else
@@ -100 +103 @@
         rt->update();   
         
-        /*
-                static int framecount = 0;
-                String filename = "photon";
-                filename.append(this->name);
-                //filename.append(StringConverter::toString(framecount));
-                filename.append(".png");
-                rt->writeContentsToFile(filename);
-                framecount++;
-        */
+        
+        static int framecount = 0;
+        String filename = "impostor";
+        filename.append(this->name);
+        //filename.append(StringConverter::toString(framecount));
+        filename.append(".dds");
+        rt->writeContentsToFile(filename);
+        framecount++;   
         
         if(!useOwnMaterial)