Changeset 2768 for GTP/trunk/App

Timestamp:

06/17/08 23:08:39 (16 years ago)

Author:

mattausch

Message:

debug version

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• Material.h (modified) (1 diff)
• RenderQueue.cpp (modified) (4 diffs)
• RenderTraverser.cpp (modified) (1 diff)
• SceneEntity.h (modified) (1 diff)
• Texture.cpp (modified) (5 diffs)
• Texture.h (modified) (2 diffs)
• chc_revisited.vcproj (modified) (1 diff)
• chcdemo.cpp (modified) (1 diff)

GTP/trunk/App/Demos/Vis/CHC_revisited/Material.h

@@ -62 +62 @@
   friend Material RandomMaterial();
 
-  Texture *GetTexture() const { return mTexture; }
+  inline Texture *GetTexture() const { return mTexture; }
 
   void SetTexture(Texture *texture) { mTexture = texture; }

GTP/trunk/App/Demos/Vis/CHC_revisited/RenderQueue.cpp

@@ -5 +5 @@
 #include "Material.h"
 
+
+using namespace std;
 
 
@@ -13 +15 @@
 inline static bool IsLower(SceneEntity *ent1, SceneEntity *ent2)
 {
-        if (ent1->GetGeometry()->HasTexture() && ent2->GetGeometry()->HasTexture())
-        {
-                Texture *t1 = ent1->GetMaterial()->GetTexture();
-                Texture *t2 = ent1->GetMaterial()->GetTexture();
+        Texture *t1 = ent1->GetMaterial()->GetTexture();
+        Texture *t2 = ent2->GetMaterial()->GetTexture();
 
-                return t1->GetByteSize() < t2->GetByteSize();
-        }
-        else if (ent2->GetGeometry()->HasTexture())
-        {
-                return true;
-        }
+        int tsize1 = t1 ? t1->GetByteSize() : 0;
+        int tsize2 = t2 ? t2->GetByteSize() : 0;
 
-        return false;
+        if (tsize1 == tsize2)
+                return ent1->GetMaterial() < ent2->GetMaterial();
+
+        return tsize1 < tsize2;
 }
-
 
 
@@ -65 +63 @@
 {
         Sort();
-
+        
+        //if (!mEntities.empty()) Debug << "rendering render queue" << endl;
         SceneEntityContainer::const_iterator sit, sit_end = mEntities.end();
 
@@ -72 +71 @@
                 SceneEntity *ent = *sit;
                 ent->Render(mState);
+
+                /*if (ent->GetMaterial()->GetTexture())
+                        Debug << " " << ent->GetMaterial()->GetTexture()->GetWidth();
+                else
+                        Debug << " 0";*/
         }
 }
-
         
 
 void RenderQueue::Sort()
 {
-        sort(mEntities.begin(), mEntities.end());
+        //InitTiming();
+        //long t1, t2;
+        //t1 = GetTime();
+
+        sort(mEntities.begin(), mEntities.end(), IsLower);
+
+        //t2 = GetTime();
+        //cout << "sort: " << TimeDiff(t1, t2) << endl;
 }
 

GTP/trunk/App/Demos/Vis/CHC_revisited/RenderTraverser.cpp

@@ -35 +35 @@
 mIsQueryMode(false),
 mUseOptimization(true),
-mFrameId(-1)
+mFrameId(-1),
+mUseRenderQueue(false)
 {
 }

GTP/trunk/App/Demos/Vis/CHC_revisited/SceneEntity.h

@@ -58 +58 @@
         int GetLastRendered() const;
 
-        Material *GetMaterial() const  { return mMaterial; }
+        inline Material *GetMaterial() const  { return mMaterial; }
 
 protected:

GTP/trunk/App/Demos/Vis/CHC_revisited/Texture.cpp

@@ -1 +1 @@
 #include "Texture.h"
+#include "glInterface.h"
+#include "common.h"
+
+
 #include <IL/il.h>
-#include "glInterface.h"
 #include <assert.h>
 #include <iostream>
@@ -30 +33 @@
 {
         startil();
-        
-        if (!ilLoadImage(ILstring(filename.c_str())))
+        string dummy=filename;
+         
+        string::size_type posOfSpace = filename.find("bmp");
+
+  if (posOfSpace < filename.size()) 
+                dummy=string("../textures/trees/bark8.png");
+
+        if (!ilLoadImage(ILstring(dummy.c_str())))
         {
-                cerr << "Image load error " << ilGetError() << ": " << filename << endl;
+                cerr << "Image load error " << ilGetError() << ": " << dummy << endl;
         }
         else
@@ -41 +50 @@
 
                 mFormat = FORMAT_RGBA;
+                mByteSize = mHeight * GetRowLength();
                 mImage = malloc(GetByteSize());
 
-                cout << "successfully loaded texture " << filename << endl;
+                Debug << "successfully loaded texture " << filename << " w " << mWidth << " h " << mHeight << endl;
+
                 ilCopyPixels(0, 0, 0, mWidth, mHeight, 1, IL_RGBA, IL_UNSIGNED_BYTE, mImage);
                 assert(ilGetError() == IL_NO_ERROR);
@@ -62 +73 @@
         //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
         //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND);
+        
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR);
+
+        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
         //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR);
+
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-        gluBuild2DMipmaps(GL_TEXTURE_2D, 3, mWidth, mHeight,
-                                          GL_RGBA, GL_UNSIGNED_BYTE, mImage);
-
+        gluBuild2DMipmaps(GL_TEXTURE_2D, 3, mWidth, mHeight, GL_RGBA, GL_UNSIGNED_BYTE, mImage);
         //glTexImage2D(GL_TEXTURE_2D, 0, 3, mWidth, mHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, mImage);
 }
@@ -129 +142 @@
 
 
-int Texture::GetByteSize() const
-{
-        return mHeight * GetRowLength();
-}
-
-
 void Texture::Bind() const
 {

GTP/trunk/App/Demos/Vis/CHC_revisited/Texture.h

@@ -44 +44 @@
         int GetPixelSize() const;
         
-        int GetByteSize() const;
+        inline int GetByteSize() const;
         /** Bind the texture.
         */
         void Bind() const;
+
+
 
 protected:
@@ -61 +63 @@
         std::string mName;
 
+        int mByteSize;
         void *mImage;
 };
+
+
+inline int Texture::GetByteSize() const
+{
+        return mByteSize;
+}
 
 }

GTP/trunk/App/Demos/Vis/CHC_revisited/chc_revisited.vcproj

@@ -253 +253 @@
                         </File>
                         <File
-                                RelativePath=".\Timers.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\Timers.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath=".\Triangle3.cpp"
                                 >

GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp

@@ -852 +852 @@
         static long renderTime = traverser->GetStats().mRenderTime;
 
-        const float expFactor = 0.9f;
-
-        renderTime = renderTime * expFactor + (1.0f - expFactor) * traverser->GetStats().mRenderTime;
+        const float expFactor = 0.5f;
+
+        renderTime = traverser->GetStats().mRenderTime * expFactor + (1.0f - expFactor) * renderTime;
 
         if (renderTime) fps /= (float)renderTime;