Changeset 1351 for GTP

Timestamp:

09/12/06 20:49:30 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule

Files:

• include/OgreRenderingRun.h (modified) (1 diff)
• include/RenderTechniques/OgreCausticCasterRenderTechnique.h (modified) (3 diffs)
• include/RenderingRuns/OgreCausticCubeMapRenderingRun.h (modified) (2 diffs)
• src/OgreRenderingRun.cpp (modified) (1 diff)
• src/RenderTechniques/OgreCausticCasterRenderTechnique.cpp (modified) (7 diffs)
• src/RenderingRuns/OgreCausticCubeMapRenderingRun.cpp (modified) (3 diffs)

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

@@ -23 +23 @@
         {
                 pixelSprites = 0;
+                fullscreenGrid = 0;
         }
         /**

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

@@ -44 +44 @@
                                                         bool useDistance,
                                                         float attenuation,
+                                                        bool useTriangles,
                                                         Pass* pass,
                                                         OgreRenderable* parentRenderable,
@@ -75 +76 @@
         unsigned char photonMapTexID;
         float attenuation;
+        bool useTriangles;
         
         //inherited
@@ -115 +117 @@
         bool updateAllFace;
         bool useDistance;
+        bool useTriangles;
         
 

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

@@ -41 +41 @@
                                                                  unsigned char photonMapTexId,
                                                                  bool updateAllFace,
-                                                                 float attenuation
+                                                                 float attenuation,
+                                                                 bool useTriangles
                                                                  );
         /**
@@ -82 +83 @@
         String materialName;
         float attenuation;
+        bool useTriangles;
         
         //inherited

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

@@ -208 +208 @@
 void OgreRenderingRun::renderFullscreenGrid(String& materialName, RenderTarget* rt, int width, int height)
 {
-        MeshPtr mesh = MeshManager::getSingleton().createManual("FullScreenGrid",ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-        SubMesh* sm = mesh->createSubMesh();
-        sm->
+        SceneManager* sm = Root::getSingleton()._getCurrentSceneManager();
+        
+        if(this->fullscreenGrid == NULL)
+        {
+                MeshPtr mesh = MeshManager::getSingleton().createManual("FullScreenGrid",ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+                SubMesh* subMesh = mesh->createSubMesh();
+                
+                mesh->sharedVertexData = new VertexData();
+                VertexData* vertexData = mesh->sharedVertexData;
+
+                // define the vertex format
+                VertexDeclaration* vertexDecl = vertexData->vertexDeclaration;
+                size_t currOffset = 0;
+                // positions
+                vertexDecl->addElement(0, currOffset, VET_FLOAT3, VES_POSITION);
+                currOffset += VertexElement::getTypeSize(VET_FLOAT3);
+                
+                // allocate the vertex buffer
+                vertexData->vertexCount = width * height;
+                HardwareVertexBufferSharedPtr vBuf = HardwareBufferManager::getSingleton().createVertexBuffer(vertexDecl->getVertexSize(0), vertexData->vertexCount, HardwareBuffer::HBU_STATIC_WRITE_ONLY, false);
+                VertexBufferBinding* binding = vertexData->vertexBufferBinding;
+                binding->setBinding(0, vBuf);
+                float* pVertex = static_cast<float*>(vBuf->lock(HardwareBuffer::HBL_DISCARD));
+
+                // allocate index buffer
+                subMesh->indexData->indexCount = 6 * (width - 1) * (height - 1);
+                subMesh->indexData->indexBuffer = HardwareBufferManager::getSingleton().createIndexBuffer(HardwareIndexBuffer::IT_16BIT, subMesh->indexData->indexCount, HardwareBuffer::HBU_STATIC_WRITE_ONLY, false);
+                HardwareIndexBufferSharedPtr iBuf = subMesh->indexData->indexBuffer;
+                unsigned short* pIndices = static_cast<unsigned short*>(iBuf->lock(HardwareBuffer::HBL_DISCARD));
+
+                unsigned short wVerticeIndex = 0 ;
+
+                
+                for( int j = 0; j < height; j++ )
+                {
+                 for( int i = 0; i < width; i++ )
+                 {       //positions
+                         float x = ((float)i + 0.5) / (float) width;
+                         float y = ((float)j + 0.5) / (float) height;
+                        *pVertex++ = x;
+                        *pVertex++ = y;
+                        *pVertex++ = 0;
+
+                        //indexes
+                        if( j < height - 1 && i < width -1 )
+                        {
+                                *pIndices++ = j * width + i;
+                                *pIndices++ = (j + 1) * width + i;
+                                *pIndices++ = j * width + i + 1;
+                                *pIndices++ = j * width + i + 1;
+                                *pIndices++ = (j + 1) * width + i;
+                                *pIndices++ = (j + 1) * width + i + 1;
+                        }
+                                  
+                 }
+                }       
+
+                // Unlock
+                vBuf->unlock();
+                iBuf->unlock();
+                // Generate face list
+                subMesh->useSharedVertices = true;
+
+                // this line makes clear the mesh is loaded (avoids memory leaks)
+                mesh->load();
+
+                fullscreenGrid = sm->createEntity("FullScreenGridEntity", "FullScreenGrid");
+                SceneNode* n = sm->getRootSceneNode()->createChildSceneNode("FullScreenGridNode");
+                n->attachObject(fullscreenGrid);
+                fullscreenGrid->setVisible(false);
+        }
+
+        fullscreenGrid->setMaterialName(materialName);
+
+        sm->getRenderQueue()->clear();
+        sm->getRenderQueue()->addRenderable(fullscreenGrid->getSubEntity(0));
+        sm->setFindVisibleObjects(false);
+        rt->update();
+        sm->setFindVisibleObjects(true);
+
 }
 

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

@@ -16 +16 @@
                                                                                                                                 bool useDistance,
                                                                                                                                 float attenuation,
+                                                                                                                                bool useTriangles,
                                                                                                                                 Pass* pass,
                                                                                                                                 OgreRenderable* parentRenderable,
@@ -24 +25 @@
 {       
         this->attenuation = attenuation;
+        this->useTriangles = useTriangles;
         this->photonMapMaterialName = photonMapMaterialName;
         
@@ -106 +108 @@
                                                                                                 photonMapTexID,
                                                                                                 updateAllFace,
-                                                                                                attenuation
+                                                                                                attenuation,
+                                                                                                useTriangles
                                                                                                 );
 
@@ -194 +197 @@
                 OgreCausticCasterRenderTechniqueFactory* f = (OgreCausticCasterRenderTechniqueFactory*) factory;
                 f->attenuation =  StringConverter::parseReal(params);
+        }
+
+        void parseUseTriangles(String& params, RenderTechniqueFactory* factory)
+        {
+                OgreCausticCasterRenderTechniqueFactory* f = (OgreCausticCasterRenderTechniqueFactory*) factory;
+                f->useTriangles =  StringConverter::parseBool(params);
         }
 }
@@ -216 +225 @@
         this->attributeParsers.insert(AttribParserList::value_type("update_all_face", (ILLUM_ATTRIBUTE_PARSER) parseUpdateAllFace));
         this->attributeParsers.insert(AttribParserList::value_type("attenuation", (ILLUM_ATTRIBUTE_PARSER) parseAttenuation));
+        this->attributeParsers.insert(AttribParserList::value_type("use_triangles", (ILLUM_ATTRIBUTE_PARSER) parseUseTriangles));
         
 }
@@ -236 +246 @@
         useDistance = true;
         updateAllFace = false;
+        useTriangles = false;
 
         parseParams(params);
@@ -250 +261 @@
                                                                                                 useDistance,
                                                                                                 attenuation,
+                                                                                                useTriangles,
                                                                                                 pass,
                                                                                                 parentRenderable,

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

@@ -13 +13 @@
                                                                                                                    unsigned char photonMapTexId,
                                                                                                                    bool updateAllFace,
-                                                                                                                   float attenuation)
+                                                                                                                   float attenuation,
+                                                                                                                   bool useTriangles)
                 :CausticCubeMapRenderingRun(startFrame, updateInterval, resolution, updateAllFace)
                 , OgreRenderingRun(startFrame, updateInterval)
@@ -19 +20 @@
 {
         this->attenuation = attenuation;
+        this->useTriangles = useTriangles;
         this->sharedRuns = sharedRuns;
         this->name = name;
@@ -64 +66 @@
         String photonMapName = ((OgrePhotonMapRenderingRun*) run->asOgreRenderingRun())->getPhotonMapTextureName();
         TexturePtr tex = TextureManager::getSingleton().getByName(photonMapName);
-        renderPixelSprites(materialName, rt, tex->getWidth(), tex->getHeight());
+        
+        if(!useTriangles)
+                renderPixelSprites(materialName, rt, tex->getWidth(), tex->getHeight());
+        else
+                renderFullscreenGrid(materialName, rt, tex->getWidth(), tex->getHeight());
 
         //rt->writeContentsToFile("caucube" + this->name + StringConverter::toString(facenum) + ".dds");