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

Timestamp:

04/05/07 15:38:06 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• OgreIlluminationManager.h (modified) (1 diff)
• OgreRenderTechnique.h (modified) (1 diff)
• OgreRenderingRun.h (modified) (2 diffs)
• OgreSharedRuns.h (modified) (2 diffs)
• OgreTechniqueGroup.h (modified) (1 diff)
• RenderTechniques/OgreCausticCasterRenderTechnique.h (modified) (1 diff)
• RenderTechniques/OgreCausticReceiverRenderTechnique.h (modified) (1 diff)
• RenderTechniques/OgreColorCubeMapRenderTechnique.h (modified) (1 diff)
• RenderTechniques/OgreConvolvedCubeMapRenderTechnique.h (modified) (1 diff)
• RenderTechniques/OgreCubeMapRenderTechnique.h (modified) (1 diff)
• RenderTechniques/OgreDepthShadowReceiverRenderTechnique.h (modified) (1 diff)
• RenderTechniques/OgreDistanceCubeMapRenderTechnique.h (modified) (1 diff)
• RenderTechniques/OgreFireRenderTechnique.h (modified) (2 diffs)
• RenderTechniques/OgreHierarchicalParticleSystemTechnique.h (modified) (1 diff)
• RenderTechniques/OgreIllumVolumeRenderTechnique.h (modified) (1 diff)
• RenderTechniques/OgrePathMapRenderTechnique.h (modified) (1 diff)
• RenderTechniques/OgreSBBRenderTechnique.h (modified) (1 diff)
• RenderingRuns/OgreCausticCubeMapRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgreChildPSystemRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgreCubeMapRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgreDepthShadowMapRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgreFocusingMapRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgreLightVolumeRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgrePMEntryPointMapRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgrePMWeightComputeRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgrePhaseTextureRenderingRun.h (modified) (1 diff)
• RenderingRuns/OgrePhotonMapRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgreReducedCubeMapRenderingRun.h (modified) (2 diffs)
• RenderingRuns/OgreSceneCameraDepthRenderingRun.h (modified) (2 diffs)

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

@@ -549 +549 @@
         */
         void setFireRenderTargetSize(int size){FireRenderTarget::targetsize = size;}
+
+        void freeAllResources();
 };
 

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

@@ -42 +42 @@
                                                 OgreRenderable* parentRenderable,
                                                 OgreTechniqueGroup* parentTechniqueGroup);
-                ~OgreRenderTechnique( );
+                virtual ~OgreRenderTechnique( );
 
                 //inherited

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

@@ -25 +25 @@
                 fullscreenGrid = 0;
         }
+        
+        virtual ~OgreRenderingRun(){}
         /**
                 @brief Conversion to OgreRenderRun.
@@ -32 +34 @@
         OgreRenderingRun* asOgreRenderingRun(){return this;}
 
-        
 protected:
 

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

@@ -189 +189 @@
         void runChanged(RenderingRunType runType, RenderingRun* run);
         //inherited
-        virtual void addTechniqueGroup(TechniqueGroup* group){childTechniqueGroups.push_back(group);}
+        void addTechniqueGroup(TechniqueGroup* group){childTechniqueGroups.push_back(group);}
+        void removeTechniqueGroups()
+        {
+                std::vector<TechniqueGroup*>::iterator it = childTechniqueGroups.begin();
+                std::vector<TechniqueGroup*>::iterator itend = childTechniqueGroups.end();
+                while(it != itend)
+                {
+                        TechniqueGroup* tg = (*it);
+                        childTechniqueGroups.erase(it);
+                        delete tg;
+                        it++;
+                }
+                childTechniqueGroups.clear();
+        }
         /**
          @brief Sets the given material for all connected renderables.
@@ -202 +215 @@
         */
         void restoreMaterial();
+
+        void freeAllResources();
 
 protected:

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

@@ -14 +14 @@
 {
 public:
+        ~OgreTechniqueGroup();
         //inherited
         void addRenderTechnique(RenderTechnique* technique);

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

@@ -56 +56 @@
                 @brief Destructor.
         */
-        ~OgreCausticCasterRenderTechnique();    
+        virtual ~OgreCausticCasterRenderTechnique();    
         /**
                 @brief Returns the name of the created caustic cubemap.

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

@@ -57 +57 @@
                 @brief Destructor.
         */
-        ~OgreCausticReceiverRenderTechnique();
+        virtual ~OgreCausticReceiverRenderTechnique();
         
         //inherited

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

@@ -72 +72 @@
                 @brief Destructor.
         */
-        ~OgreColorCubeMapRenderTechnique();
+        virtual ~OgreColorCubeMapRenderTechnique();
         
         //inherited

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

@@ -72 +72 @@
                 @brief Destructor.
         */
-        ~OgreConvolvedCubeMapRenderTechnique();
+        virtual ~OgreConvolvedCubeMapRenderTechnique();
         
         //inherited

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

@@ -73 +73 @@
                 @brief Destructor.
         */
-        ~OgreCubeMapRenderTechnique();
+        virtual ~OgreCubeMapRenderTechnique();
         
                 

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

@@ -74 +74 @@
                 @brief Destructor.
         */
-        ~OgreDepthShadowReceiverRenderTechnique();
+        virtual ~OgreDepthShadowReceiverRenderTechnique();
         
         //inherited

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

@@ -72 +72 @@
                 @brief Destructor.
         */
-        ~OgreDistanceCubeMapRenderTechnique();
+        virtual ~OgreDistanceCubeMapRenderTechnique();
         
         //inherited

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

@@ -21 +21 @@
 
         FireRenderTarget();     
+        ~FireRenderTarget();    
 };
 
@@ -54 +55 @@
                                                         OgreTechniqueGroup* parentTechniqueGroup
                                                         );
-        ~OgreFireRenderTechnique();
+        virtual ~OgreFireRenderTechnique();
         
         //inherited

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

@@ -58 +58 @@
                 @brief Destructor.
         */
-        ~OgreHierarchicalParticleSystemTechnique();
+        virtual ~OgreHierarchicalParticleSystemTechnique();
 
                 

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

@@ -52 +52 @@
                 @brief Destructor.
         */
-        ~OgreIllumVolumeRenderTechnique();
+        virtual ~OgreIllumVolumeRenderTechnique();
         
 protected:

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

@@ -41 +41 @@
                 @brief Destructor.
         */
-        ~OgrePathMapRenderTechnique();
+        virtual ~OgrePathMapRenderTechnique();
         
         //inherited

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

@@ -38 +38 @@
                                                         OgreTechniqueGroup* parentTechniqueGroup
                                                         );
-        ~OgreSBBRenderTechnique();
+        virtual ~OgreSBBRenderTechnique();
         
         //inherited

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

@@ -48 +48 @@
                                                                  bool blurMap
                                                                  );
+
+        virtual ~OgreCausticCubeMapRenderingRun(){}
         /**
                 @brief returns the name of the resulting caustic cubemap texture
@@ -77 +79 @@
         */
         void setBlurMap(bool blur){blurMap = blur;}
+
+        void freeAllResources();
 
 protected:

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

@@ -46 +46 @@
                                                                 String materialName
                                                                 );
+
+        virtual ~OgreChildPSystemRenderingRun(){}
+
         /**
                 @brief returns the name of the resulting photon hit map
@@ -61 +64 @@
         */
         Real getSmallSysRadius(){return sysRad;}
+
+        void freeAllResources();
 
 protected:      

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

@@ -56 +56 @@
                                                                  bool getMinMax,
                                                                  RenderingRunType cubemapRunType);
+
+        virtual ~OgreCubeMapRenderingRun(){}
+
         /**
                 @brief returns the name of the resulting color cubemap texture
@@ -63 +66 @@
         Vector4 getMax(){return max;}
         Vector4 getMin(){return min;}
+
+        void freeAllResources();
         
 protected:

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

@@ -39 +39 @@
                                                                                 String materialName);
 
+        virtual ~OgreDepthShadowMapRenderingRun(){}
+
+
         /**
                 @brief returns the depth shadow map texture created by this run
@@ -60 +63 @@
         */
         Real getLightFarPlane(){return lightFarPlane;}
+
+        void freeAllResources();
 
 protected:      

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

@@ -30 +30 @@
                                                                 Matrix4 lightMatrix,
                                                                 unsigned int focusingMapSize);
+
+        virtual ~OgreFocusingMapRenderingRun(){}
         /**
                 @brief returns the name of the focusing texture
@@ -48 +50 @@
         */
         void setCameraMatrices(const Matrix4 &view, const Matrix4 &projection);
+
+        void freeAllResources();
         
 protected:

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

@@ -38 +38 @@
                                                                 unsigned int textureDepth,
                                                                 String materialName);
+
+        virtual ~OgreLightVolumeRenderingRun(){}
+
         /**
                 @brief returns the name of the resulting light volume texture
@@ -68 +71 @@
         }
         
+        void freeAllResources();
+
 protected:      
         /**

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

@@ -28 +28 @@
         */      
         OgrePMEntryPointMapRenderingRun(String name);
+
+        virtual ~OgrePMEntryPointMapRenderingRun(){}
+
         /**
                 @brief returns the name of the entry point texture
@@ -38 +41 @@
         */
         String getClusterLengthTextureName(){return clusterLengthTexture->getName();}
+
+        void freeAllResources();
         
 protected:

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

@@ -29 +29 @@
         */      
         OgrePMWeightComputeRenderingRun(String name, String LightName);
+
+        virtual ~OgrePMWeightComputeRenderingRun(){}
+
         /**
                 @brief returns the name of the weight texture
@@ -35 +38 @@
         //not used
         float* getWeights(){return weights;}
+
+        void freeAllResources();
         
 protected:

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

@@ -34 +34 @@
                                                                                 String materialName);
 
+        virtual ~OgrePhaseTextureRenderingRun(){}
+
         /**
                 @brief returns the name of thew phase texture created by this run
         */
         String getPhaseTextureName(){return name;}
+
+        void freeAllResources();
         
 protected:      

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

@@ -39 +39 @@
                                                                 String materialName,
                                                                 bool useDistance);
+
+        virtual ~OgrePhotonMapRenderingRun(){}
+
         /**
                 @brief returns the name of the resulting photon hit map texture
@@ -59 +62 @@
         //inherited     
         void distanceCubeMapUpdated(RenderingRun* run);
+
+        void freeAllResources();
         
 protected:      

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

@@ -46 +46 @@
                                                                  bool updateAllFace = false);
 
+        virtual ~OgreReducedCubeMapRenderingRun(){}
+
         /**
                 @brief returns the name of the resulting downsampled color cubemap texture
@@ -53 +55 @@
         //inherited
         void colorCubeMapChanged(String& newMapName);
+
+        void freeAllResources();
 
 protected:      

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

@@ -31 +31 @@
                                                                 String name,
                                                                 Viewport* playerView);
+
+        virtual ~OgreSceneCameraDepthRenderingRun(){}
+
         /**
                 @brief returns the name of the camera depth texture
@@ -36 +39 @@
         String getDepthTextureName(){return name;}
 
+        void freeAllResources();
         
 protected: