Changeset 1425 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include

Timestamp:

09/21/06 08:49:20 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include

Files:

• OgreIlluminationManager.h (modified) (4 diffs)
• OgreRenderable.h (modified) (1 diff)
• OgreRenderingRun.h (modified) (2 diffs)
• OgreSharedRuns.h (modified) (1 diff)
• RenderTechniques/OgreHierarchicalParticleSystemTechnique.h (modified) (2 diffs)
• RenderTechniques/OgreIllumVolumeRenderTechnique.h (added)
• RenderingRuns/OgreLightVolumeRenderingRun.h (added)
• RenderingRuns/OgrePhaseTextureRenderingRun.h (added)

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

@@ -15 +15 @@
 #include "OgreFireRenderTechnique.h"
 #include "OgreHierarchicalParticleSystemTechnique.h"
-
+#include "OgreIllumVolumeRenderTechnique.h"
+#include "OgrePhaseTextureRenderingRun.h"
 
 
@@ -69 +70 @@
         unsigned int focusingMapSize;
         unsigned int shadowMapSize;
+        unsigned int phaseTextureSize;
         std::map<RenderingRunType,float> maxRads;
         /**
@@ -152 +154 @@
         void setMaxJoinRadius(RenderingRunType type, float rad){maxRads[type] = rad;}
         void setFocusingMapSize(unsigned int size){focusingMapSize = size;}
+        void setPhaseTextureSize(unsigned int size){phaseTextureSize = size;}
         void setShadowMapSize(unsigned int size){shadowMapSize = size;}
         /**
@@ -291 +294 @@
         */
         void updatePerLightRun(String lightName, RenderingRunType runType, unsigned long frameNum);
+
+        void savePhaseTextureToFile(String filename);
 
         bool frameStarted(const FrameEvent& evt)

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

@@ -64 +64 @@
                 @see ElementaryRenderable::setRenderGroup()
         */      
-        void  setRenderGroup (unsigned char groupID);
+        void setRenderGroup(unsigned char groupID);
+        /**
+                @brief Updates the given renderqueue for the wrapped renderable
+
+                @param rq pointer to the renderqueue to be updated
+        */      
+        void updateRenderQueue(RenderQueue* rq);
         /** 
                 @brief Retrieves if the renderable is hided or shown.

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

@@ -117 +117 @@
                 @param rq pointer to the filled Renderqueue instance to set material for
         */
-        void setMaterialForRenderables(String& materialName, RenderQueue* rq);
+        void setMaterialForRenderables(String& materialName, RenderQueue* rq, bool solidsonly = false);
         /**
                 @brief Sets the given material for each Renderable visible from a given camera.
@@ -132 +132 @@
                 @param shadowcastersonly flag to search for only shadow casters
         */
-        void setMaterialForVisibles(String& materialName, Camera* cam, bool shadowcastersonly = false);
+        void setMaterialForVisibles(String& materialName, Camera* cam, bool shadowcastersonly = false, bool solidsonly = false);
         /**
                 @brief Restores previously stored materials.

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

@@ -141 +141 @@
                 @param pointer to the RenderQueue to add the Renderables to
         */
-        void addRenderablesToQueue(RenderQueue* rq);
+        void addRenderablesToQueue(RenderQueue* rq, bool checkVisible = true);
         /**
                 @brief Calls notifyCamera() to all the Renderables connected to this node

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/RenderTechniques/OgreHierarchicalParticleSystemTechnique.h

@@ -41 +41 @@
         ~OgreHierarchicalParticleSystemTechnique();
 
-        //inherited
-        void update(unsigned long frameNum);
-        
+                
 protected:
         
@@ -58 +56 @@
         //inherited
         RenderingRun* createChildPSysRenderingRun();
+        RenderingRun* createLightVolumeRenderingRun();
         virtual void impostorChanged(RenderingRun* run);
+        virtual void impostorUpdated(RenderingRun* run);
 };