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

Timestamp:

09/11/06 15:30:44 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• RenderTechniques/OgreHierarchicalParticleSystemTechnique.cpp (modified) (8 diffs)
• RenderingRuns/OgreChildParticlesystemRenderingRun.cpp (modified) (5 diffs)

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

@@ -14 +14 @@
                                                                                                                 bool useOwnMaterial,
                                                                                                                 String impostorMaterialName,
+                                                                                                                bool useVParam,
+                                                                                                                String VParamRadius,
+                                                                                                                bool useFParam,
+                                                                                                                String FParamRadius,
                                                                                                                 Pass* pass,
                                                                                                                 OgreRenderable* parentRenderable,
@@ -25 +29 @@
         this->impostorMaterialName = impostorMaterialName;
         this->useOwnMaterial = useOwnMaterial;
+        this->VParamRadius = VParamRadius;
+        this->FParamRadius = FParamRadius;
+        this->useVParam = useVParam;
+        this->useFParam = useFParam;
         
         //create the Particle system
@@ -36 +44 @@
                 sharedRuns->addRun(ILLUMRUN_HPP_IMPOSTOR, createChildPSysRenderingRun());       
 
+        ((OgreChildPSystemRenderingRun*) sharedRuns->getRun(ILLUMRUN_HPP_IMPOSTOR)->asOgreRenderingRun())->setNode(node);
         impostorChanged(sharedRuns->getRun(ILLUMRUN_HPP_IMPOSTOR));
 }
@@ -65 +74 @@
 }
 
+void OgreHierarchicalParticleSystemTechnique::update(unsigned long frameNum)
+{
+        HierarchicalParticleSystemTechnique::update(frameNum);
+
+        OgreChildPSystemRenderingRun* r = (OgreChildPSystemRenderingRun*) 
+                                                                                        sharedRuns->getRun(ILLUMRUN_HPP_IMPOSTOR)->asOgreRenderingRun();
+        float radius = r->getSmallSysRadius();
+        if(useVParam)
+                pass->getVertexProgramParameters()->setNamedConstant(VParamRadius, radius);
+        if(useFParam)
+                pass->getFragmentProgramParameters()->setNamedConstant(FParamRadius, radius);
+}
+
 ///Technique Parsers
 namespace HPSParsers
@@ -129 +151 @@
                 f->childPSysScriptName = params;
         }
+        void parseVparamRadius(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreHierarchicalParticleSystemTechniqueFactory* f = (OgreHierarchicalParticleSystemTechniqueFactory*) factory;
+                f->VParamRadius = params;
+        }
+        void parseFparamRadius(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreHierarchicalParticleSystemTechniqueFactory* f = (OgreHierarchicalParticleSystemTechniqueFactory*) factory;
+                f->FParamRadius = params;
+        }
 
         
@@ -148 +180 @@
         this->attributeParsers.insert(AttribParserList::value_type("particle_script", (ILLUM_ATTRIBUTE_PARSER) parseScriptName));
         this->attributeParsers.insert(AttribParserList::value_type("material", (ILLUM_ATTRIBUTE_PARSER) parseMaterialName));
+        this->attributeParsers.insert(AttribParserList::value_type("vparam_radius", (ILLUM_ATTRIBUTE_PARSER) parseFparamRadius));
+        this->attributeParsers.insert(AttribParserList::value_type("fparam_radius", (ILLUM_ATTRIBUTE_PARSER) parseVparamRadius));
         
 }
@@ -165 +199 @@
         impostorMaterialName = "";
         childPSysScriptName = "";
-        bool useOwnMaterial = true;
+        useOwnMaterial = true;
+        VParamRadius = "";
+        FParamRadius = "";
+        useVParam = false;
+        useFParam = false;
 
         parseParams(params);
@@ -179 +217 @@
                                                                                                 useOwnMaterial,
                                                                                                 impostorMaterialName,
+                                                                                                useVParam,
+                                                                                                VParamRadius,
+                                                                                                useFParam,
+                                                                                                FParamRadius,
                                                                                                 pass,
                                                                                                 parentRenderable,

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));
+         //Viewport* v = rt->addViewport(OgreIlluminationManager::getSingleton().getMainCamera());
+         v->setBackgroundColour(ColourValue(0,0,0,0));
          v->setOverlaysEnabled(false);
          rt->setAutoUpdated(false);
@@ -62 +63 @@
 
         sharedRuns->getRoot()->updateBounds();
-        Sphere boundSphere = ((OgreSharedRuns*)sharedRuns->getRoot(ILLUMRUN_HPP_IMPOSTOR))->getBoundingSphere();
+        Vector3 center = sharedRuns->getRootPosition(ILLUMRUN_HPP_IMPOSTOR);
         Camera* mainCam = OgreIlluminationManager::getSingleton().getMainCamera();
         impostorCamera->setPosition(mainCam->getPosition());
-        Vector3 dir = boundSphere.getCenter() - mainCam->getPosition();
-        float r = boundSphere.getRadius();
-        r = 200;
+        
+        psysNode->setPosition(center);
+        ParticleSystem* psys = Root::getSingleton()._getCurrentSceneManager()->getParticleSystem(childParticleSystemName);
+        psys->_notifyCurrentCamera(impostorCamera);
+        
+        psysNode->_updateBounds();
+        AxisAlignedBox bb = psysNode->_getWorldAABB();  
+        
+        float r = (bb.getMaximum() - bb.getMinimum()).length() / 2.0;
+        sysRad = r;
+        center = bb.getCenter();
+        Vector3 dir = center - mainCam->getPosition();
         float d = dir.normalise();
-        impostorCamera->setDirection(dir);
+        
+        if (d <= r * 1.2)//too close
+        {
+                d = r * 1.2;
+                impostorCamera->setPosition(center - dir * d);
+        }
 
+    impostorCamera->setDirection(dir);
+
+        //r = 200;
+        
         if(perspectiveRendering)
         {
@@ -76 +95 @@
                 impostorCamera->setAspectRatio(1.0);
                 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);              
+                impostorCamera->setFOVy( a );
+                impostorCamera->setNearClipDistance(d - r);
+                impostorCamera->setFarClipDistance(d + r);              
         }
         else
         {
-                impostorCamera->setPosition(boundSphere.getCenter());
+                impostorCamera->setPosition(center);
                 impostorCamera->setProjectionType(PT_ORTHOGRAPHIC);
                 Matrix4 m;
                 m = Matrix4::IDENTITY;
-                float scale = 1.0 / boundSphere.getRadius();
+                float scale = 1.0 / r;
                 m.setScale(Vector3(scale, scale, scale));
                 impostorCamera->setCustomProjectionMatrix(true, m);
         }       
 
-        ParticleSystem* psys = Root::getSingleton()._getCurrentSceneManager()->getParticleSystem(childParticleSystemName);
-        psys->getParentSceneNode()->setPosition(boundSphere.getCenter());
-        psys->_notifyCurrentCamera(impostorCamera);
+        //
         psys->_updateRenderQueue(rq);
         
@@ -100 +117 @@
         
         RenderTarget* rt = impostorTexture->getBuffer().getPointer()->getRenderTarget();
-         
+        sm->setFindVisibleObjects(false);
         rt->update();   
+        sm->setFindVisibleObjects(true);
         
         
@@ -109 +127 @@
         //filename.append(StringConverter::toString(framecount));
         filename.append(".dds");
-        rt->writeContentsToFile(filename);
+        //rt->writeContentsToFile(filename);
         framecount++;