Changeset 2840

Timestamp:

07/16/08 11:28:52 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (2 diffs)
• src/Geometry.h (modified) (1 diff)
• src/RenderQueue.cpp (modified) (5 diffs)
• src/ResourceManager.cpp (modified) (3 diffs)
• src/ResourceManager.h (modified) (3 diffs)
• src/SceneEntity.cpp (modified) (7 diffs)
• src/SceneEntity.h (modified) (4 diffs)
• src/Shape.cpp (modified) (2 diffs)
• src/Shape.h (modified) (1 diff)
• src/Transform3.cpp (moved) (moved from GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Transform.cpp) (3 diffs)
• src/Transform3.h (moved) (moved from GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Transform.h) (4 diffs)
• src/Visualization.h (modified) (1 diff)
• src/chcdemo.cpp (modified) (3 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -547 +547 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\Transform.h"
+                                        RelativePath=".\src\Transform3.h"
                                         >
                                 </File>
@@ -717 +717 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\Transform.cpp"
+                                        RelativePath=".\src\Transform3.cpp"
                                         >
                                 </File>

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Geometry.h

@@ -1 @@
-#ifndef GEOMETRY_H
-#define GEOMETRY_H
+#ifndef __GEOMETRY_H
+#define __GEOMETRY_H
 
 #include "common.h"

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderQueue.cpp

@@ -5 +5 @@
 #include "Material.h"
 #include "Camera.h"
+#include "Shape.h"
 
 
@@ -138 +139 @@
                 entity->mRenderQueueBucket = bucket;
         }
+
+        bucket->mEntities.push_back(entity);
 #endif
-        bucket->mEntities.push_back(entity);
+
 }
 
@@ -146 +149 @@
 {
         for (size_t i = 0; i < mBuckets.size(); ++ i)
-                mBuckets[i]->mEntities.clear();
+                mBuckets[i]->mShapes.clear();
 
         mSize = 0;
@@ -165 +168 @@
         for (size_t i = 0; i < mBuckets.size(); ++ i)
         {
-                SceneEntityContainer::const_iterator sit, sit_end = mBuckets[i]->mEntities.end();
-                for (sit = mBuckets[i]->mEntities.begin(); sit != sit_end; ++ sit)
-                {
-                        SceneEntity *ent = *sit;
-                        ent->Render(mState);
+                ShapeContainer::const_iterator sit, sit_end = mBuckets[i]->mShapes.end();
+
+                for (sit = mBuckets[i]->mShapes.begin(); sit != sit_end; ++ sit)
+                {
+                        Shape *shape = *sit;
+                        shape->Render(mState);
                 }
         }
@@ -183 +187 @@
                 Debug << "\n******\nbucket " << (int)i << endl;
 
-                SceneEntityContainer::const_iterator sit, sit_end = mBuckets[i]->mEntities.end();
-
-                for (sit = mBuckets[i]->mEntities.begin(); sit != sit_end; ++ sit)
-                {
-                        SceneEntity *ent = *sit;
-        #ifdef TODO
-                        Material *mat = ent->GetMaterial();
+                ShapeContainer::const_iterator sit, sit_end = mBuckets[i]->mShapes.end();
+
+                for (sit = mBuckets[i]->mShapes.begin(); sit != sit_end; ++ sit)
+                {
+                        Shape *shape = *sit;
+                        
+                        Material *mat = shape->GetMaterial();
                         int tsize = mat->GetTexture() ? mat->GetTexture()->GetByteSize() : 0;
-                        float dist = SqrMagnitude(ent->GetBoundingBox().Center() - mCamera->GetPosition());
-                        Debug << "e: " << ent << " a: " << mat->IsAlphaTestEnabled() << " s: " << tsize << " d: " << dist << " " << endl;
+#ifdef TODO
+                        float dist = SqrMagnitude(shape->GetBoundingBox().Center() - mCamera->GetPosition());
+#else
+                        float dist = -1;
 #endif
+                        Debug << "e: " << shape << " a: " << mat->IsAlphaTestEnabled() << " s: " << tsize << " d: " << dist << " " << endl;
                 }
         }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.cpp

@@ -8 +8 @@
 #include "Matrix4x4.h"
 #include "Vector3.h"
+#include "Transform3.h"
 
 
@@ -41 +42 @@
         str.read(reinterpret_cast<char *>(&hasTrafo), sizeof(bool));
 
-        Matrix4x4 *trafo;
+        Matrix4x4 *m;
         
         SceneEntity *sceneGeom;
@@ -47 +48 @@
         if (!hasTrafo)
         {
-                trafo = NULL;
+                m = NULL;
         }
         else
         {
-                trafo = new Matrix4x4();
-                str.read(reinterpret_cast<char *>(trafo->x), sizeof(Matrix4x4));
-                mTrafos.push_back(trafo);
-        }
-
+                m = new Matrix4x4();
+                str.read(reinterpret_cast<char *>(m->x), sizeof(Matrix4x4));
+        }
+
+        Transform3 *trafo = new Transform3(m);
+        mTrafos.push_back(trafo);
+        
         // use instancing
         sceneGeom = new SceneEntity(trafo);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.h

@@ -7 +7 @@
 #include <fstream>
 #include <map>
+#include "common.h"
 
-#include "common.h"
 
 class igzstream;
@@ -21 +21 @@
 class Texture;
 class Matrix4x4;
+class Transform3;
+
 
 /** Loads a scene and also handles the cleanup
@@ -52 +54 @@
         std::vector<Geometry *> mGeometry;
         std::vector<SceneEntity *> mSceneEntities;
-        std::vector<Matrix4x4 *> mTrafos;
+        std::vector<Transform3 *> mTrafos;
 };
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SceneEntity.cpp

@@ -4 +4 @@
 #include "Material.h"
 #include "RenderState.h"
+#include "Shape.h"
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
@@ -11 +12 @@
 {
 
-CGparameter SceneEntity::sModelMatrixParam;
-
-SceneEntity::SceneEntity(Matrix4x4 *trafo): mTransform(trafo)
+SceneEntity::SceneEntity(Transform3 *trafo): mTransform(trafo)
 {
 }
@@ -25 +24 @@
 ShapeContainer *SceneEntity::GetCurrentLOD()
 {
-        if (mLODInfos.empty())
+/*      if (mLODInfos->empty())
                 return &mShapes;
 
@@ -32 +31 @@
         int i = 0;
 
-        for (int i = 0; i < mLODInfos.size(); ++ i)
+        for (int i = 0; i < mLODInfos->size(); ++ i)
         {
-                if (mLODInfos[i].mDistance > mDistance)
-                        return mShapes[i];
+                if ((mLODInfos*)[i].mDistance > mDistance)
+                        return &(mLODInfos*)[i].mShapes;
         }
 
-        return mShapes.last();
+        return &(mLODInfos->last().mShapes);
+        */
+        return NULL;
 }
 
@@ -49 +50 @@
         ShapeContainer *shapes;
 
-        shspes = GetCurrentLOD(mDistance);
+        shapes = GetCurrentLOD();
 
         for (int i = 0; i < shapes->size(); ++ i)
         {
-                (shapes*)[i]->Render(state);
+                (*shapes)[i]->Render(state);
         }
 }
@@ -64 +65 @@
 
 
-void SceneEntity::SetTransformation(Matrix4x4 *trafo)
+void SceneEntity::SetTransform(Transform3 *trafo)
 {
         mTransform = trafo;
@@ -86 +87 @@
 #ifdef TODO
         AxisAlignedBox3 box = mGeometry->GetBoundingBox();
+        if (mTransform) Transform(box, *mTransform);
 #else
         AxisAlignedBox3 box;
 #endif
-        if (mTransform) Transform(box, *mTransform);
+        
 
         return box;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SceneEntity.h

@@ -17 +17 @@
 class Geometry;
 class RenderState;
-struct RenderQueueBucket;
+class Transform3;
+
 
 /** Class representing a scene entity.
@@ -30 +31 @@
         /** Creates a scene entity.
         */
-        SceneEntity(Transformation *trafo);
+        SceneEntity(Transform3 *trafo);
 
         ~SceneEntity();
@@ -47 +48 @@
         /** Set pointer to the geometry
         */
-        void SetTransformation(Transformation *trafo);
+        void SetTransform(Transform3 *trafo);
         /** Returns the transformed bounding box.
         */
@@ -59 +60 @@
         /** Returns the trafo of this scene entity.
         */
-        inline Transformation *GetTransformation() const  { return mTransform; }
+        inline Transform3 *GetTransform() const  { return mTransform; }
+
 
 protected:
 
+        ShapeContainer *GetCurrentLOD();
+
         /// transform matrix 
-        Transformation *mTransform;
-
+        Transform3 *mTransform;
+        /// Stores information about the LOD levels
         LODInfoContainer mLODInfos;
-
+        /// the renderable shapes
         ShapeContainer mShapes;
-                
+        /// when this entity was last rendered
         int mLastRendered;
 };

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Shape.cpp

@@ -1 @@
-#include "glInterface.h"
 #include "Shape.h"
 #include "Material.h"
 #include "RenderState.h"
 #include "Geometry.h"
+#include "SceneEntity.h"
+
+#include "glInterface.h"
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
@@ -11 +13 @@
 {
 
-Shape::Shape(Geometry *geometry, 
-                         Material *mat):
-mGeometry(geometry), mMaterial(mat), mRenderQueueBucket(NULL)
+Shape::Shape(Geometry *geometry, Material *mat, SceneEntity *parent):
+mGeometry(geometry), 
+mMaterial(mat), 
+mParent(parent), 
+mRenderQueueBucket(NULL)
 {
 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Shape.h

@@ -50 +50 @@
         Geometry *mGeometry;
         Material *mMaterial;
-        
+        SceneEntity *mParent;
+
         /// pointer to the renderqueue bucket this entity belongs to
         RenderQueueBucket *mRenderQueueBucket;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Transform3.cpp

@@ -1 @@
-#include "Transformation.h"
-
+#include "Transform3.h"
+#include "Matrix4x4.h"
+#include "RenderState.h"
 
 
@@ -6 +7 @@
 {
 
-CGparameter Transformation::sModelMatrixParam;
+CGparameter Transform3::sModelMatrixParam;
 
-Transformation::Transformation(Matrix4x4 *trafo): mMatrix(trafo)
+Transform3::Transform3(Matrix4x4 *trafo): mMatrix(trafo)
 {
 }
 
 
-Transformation::~Transformation
+Transform3::~Transform3()
 {
+        DEL_PTR(mMatrix);
 }
 
 
-void Transformation::Load(RenderState *state)
+void Transform3::Load(RenderState *state)
 {
         if (!mMatrix) return;
@@ -24 +26 @@
         if (state->GetRenderType() == RenderState::DEFERRED)
         {
-                cgGLSetMatrixParameterfc(sModelMatrixParam, (const float *)mTransform->x);
+                cgGLSetMatrixParameterfc(sModelMatrixParam, (const float *)mMatrix->x);
         }
         else
         {
                 glPushMatrix();
-                glMultMatrixf((float *)mTransform->x);
+                glMultMatrixf((float *)mMatrix->x);
         }
 }
 
 
-void Transformation::Unload(RenderState *state)
+void Transform3::Unload(RenderState *state)
 {
         if (!mMatrix) return;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Transform3.h

@@ -1 @@
-#ifndef __SCENEENTITY_H
-#define __SCENEENTITY_H
+#ifndef __TRANSFORM3_H
+#define __TRANSFORM3_H
 
 #include "glInterface.h"
@@ -11 +11 @@
 
 class RenderState;
+class Matrix4x4;
 
 
 /** Class representing a transformation
 */
-class Transformation
+class Transform3
 {
 public:
         
-        static CGparameter sModelMatrixParam;
-
         /** Creates a scene entity.
         */
-        Transformation(Matrix4x4 *trafo);
+        Transform3(Matrix4x4 *trafo);
 
-        ~Transformation();
+        ~Transform3();
         /** Loads this transformation.
         */
@@ -36 +35 @@
         inline Matrix4x4 *GetMatrix() const  { return mMatrix; }
 
+        static CGparameter sModelMatrixParam;
+
+
 protected:
 
@@ -45 +47 @@
 }
 
-#endif // __SCENEENTITY_H
+#endif // __TRANSFORM_H

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Visualization.h

@@ -23 +23 @@
             as parameters
         */
-        Visualization(Bvh *bvh, Camera *camera, Camera *vizCamera, RenderState *renderState);
+        Visualization(Bvh *bvh, Camera *camera, Camera *vizCamera, RenderState *state);
 
         ~Visualization();

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -30 +30 @@
 #include "Environment.h"
 #include "Halton.h"
+#include "Transform3.h"
 
 
@@ -499 +500 @@
                 cgGLLoadProgram(sCgMrtVertexProgram);
 
-                SceneEntity::sModelMatrixParam = cgGetNamedParameter(sCgMrtVertexProgram, "ModelMatrix");
+                Transform3::sModelMatrixParam = cgGetNamedParameter(sCgMrtVertexProgram, "ModelMatrix");
                 sModelViewProjMatrixParam = cgGetNamedParameter(sCgMrtVertexProgram, "ModelViewProj");
         }
@@ -1066 +1067 @@
 
                 static Matrix4x4 identity = IdentityMatrix();
-                cgGLSetMatrixParameterfc(SceneEntity::sModelMatrixParam, (const float *)identity.x);
+                cgGLSetMatrixParameterfc(Transform3::sModelMatrixParam, (const float *)identity.x);
         }               
 }