Changeset 2846 for GTP

Timestamp:

07/17/08 23:23:47 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• data/city/model/env.dem (modified) (previous)
• default.env (modified) (1 diff)
• src/ResourceManager.cpp (modified) (1 diff)
• src/Texture.cpp (modified) (3 diffs)
• src/Texture.h (modified) (3 diffs)
• src/chcdemo.cpp (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -10 +10 @@
 winHeight=768
 camPosition=483.398f 242.364f 186.078f
-camDirection=1 1 0
+camDirection=1 0 0
 useFullScreen=0
+#modelPath=data/city/model/
+
 
 ############
 # shader stuff
+
 expFactor=0.1f
 #numSsaoSamples=8
-#0699/11384251

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

@@ -121 +121 @@
                 Texture *tex = new Texture(model_path + texname);
 
+                int boundS, boundT;
+
+                str.read(reinterpret_cast<char *>(&boundS), sizeof(int));
+                str.read(reinterpret_cast<char *>(&boundT), sizeof(int));
+
+                tex->SetBoundaryModeS(boundS);
+                tex->SetBoundaryModeT(boundT);
+
+                //tex->SetBoundaryModeS(Texture::CLAMP);
+                //tex->SetBoundaryModeT(Texture::CLAMP);
+
+                tex->Create();
+
                 mTextureTable[i] = tex;
                 mTextures.push_back(tex);

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

@@ -29 +29 @@
 
 Texture::Texture(const std::string &filename):
-mWidth(0), mHeight(0), mFormat(0), mImage(NULL), mTexId(-1), mName(filename)
+mWidth(0), 
+mHeight(0), 
+mFormat(0), 
+mImage(NULL), 
+mTexId(-1), 
+mName(filename),
+mBoundaryModeS(REPEAT),
+mBoundaryModeT(REPEAT)
 {
         startil();
@@ -53 +60 @@
         
         stopil();
-
-        Create();
 }
 
@@ -73 +78 @@
         //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 
-        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 4);
 
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+        int glWrapModeS = (mBoundaryModeS == REPEAT) ?  GL_REPEAT : GL_CLAMP_TO_EDGE;
+        int glWrapModeT = (mBoundaryModeT == REPEAT) ?  GL_REPEAT : GL_CLAMP_TO_EDGE;
+
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapModeS);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapModeT);
 
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, mWidth, mHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, mImage);

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

@@ -27 +27 @@
         enum { FORMAT_INVALID, FORMAT_RGB, FORMAT_RGBA };
         
+        enum { CLAMP, REPEAT };
+
         /** Returns width of texture.
         */
@@ -49 +51 @@
         void Bind() const;
 
+        void SetBoundaryModeS(int mode) { mBoundaryModeS = mode; }
+        void SetBoundaryModeT(int mode) { mBoundaryModeT = mode; }
+
+        int GetBoundaryModeS() const { return mBoundaryModeS; }
+        int GetBoundaryModeT() const { return mBoundaryModeT; }
+
+        /** Creates the texture from the image
+        */
+        void Create();
 
 
 protected:
-
-        void Create();
 
         int mFormat;
@@ -60 +69 @@
 
         unsigned int mTexId;
+
+        int mBoundaryModeS;
+        int mBoundaryModeT;
 
         std::string mName;

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

@@ -342 +342 @@
                 env.GetVectorParam(string("camDirection"), camDir);
 
+                //env.GetStringParam(string("modelPath"), model_path);
                 //env.GetIntParam(string("numSssaoSamples"), numSsaoSamples);
 
@@ -355 +356 @@
                 cout << "camPosition: " << camPos << endl;
                 cout << "expFactor: " << expFactor << endl;
+                //cout << "model path: " << model_path << endl;
         }