Changeset 3047

Timestamp:

10/20/08 02:06:33 (16 years ago)

Author:

mattausch

Message:

adding special technique for depth pass (not working yet)

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• Material.cpp (modified) (4 diffs)
• Material.h (modified) (4 diffs)
• RenderState.cpp (modified) (1 diff)
• RenderState.h (modified) (1 diff)
• ResourceManager.cpp (modified) (1 diff)

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

@@ -18 +18 @@
 
 
-void Technique::InitMaterial()
+void Technique::Init()
 {
         mTexture = NULL;
@@ -29 +29 @@
         mVertexProgram = NULL;
         mFragmentProgram = NULL;
+
+        /// if this material can write colors
+        mColorWriteEnabled = true;
+        /// if lighting is used
+        bool mLightingEnabled = true;
 }
 
@@ -38 +43 @@
 mEmmisiveColor(RgbaColor(.0f, .0f, .0f, 1.0f))
 {
-        InitMaterial();
+        Init();
 }
 
@@ -48 +53 @@
 mTexture(NULL)
 {
-        InitMaterial();
+        Init();
 }
 
-
-Technique::Technique(const Technique &tech)
-{
-        mAmbientColor = tech.mAmbientColor;
-        mDiffuseColor = tech.mDiffuseColor;
-        mSpecularColor = tech.mSpecularColor;
-        mEmmisiveColor = tech.mEmmisiveColor;
-
-        mVertexProgram = tech.mVertexProgram;
-        mFragmentProgram = tech.mFragmentProgram;
-
-        mAlphaTestEnabled = tech.mAlphaTestEnabled;
-        mCullFaceEnabled =tech.mCullFaceEnabled;
-
-        mTexture = tech.mTexture;
-
-        mVertexProgramParameters = tech.mVertexProgramParameters;
-        mFragmentProgramParameters = tech.mFragmentProgramParameters;
-}
 
 

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

@@ -55 +55 @@
         Technique();
 
-        Technique(const Technique &tech);
-
         ~Technique();
         /** Sets ambient and diffuse color to color
         */
         Technique(const RgbaColor &color);
+        /** Renders this technique.
+        */
+        void Render(RenderState *state);
+        /** Initialize this technique material with default values
+        */
+        void Init();
 
         inline Texture *GetTexture() const { return mTexture; }
@@ -81 +85 @@
         inline bool IsAlphaTestEnabled() const { return mAlphaTestEnabled; } 
         inline bool IsCullFaceEnabled() const { return mCullFaceEnabled; } 
-        /** Renders this technique.
-        */
-        void Render(RenderState *state);
-        /** Initialize the material with default values
-        */
-        void InitMaterial();
+
+        inline void SetLightingEnabled(bool l) { mLightingEnabled = l; }
+        inline void SetColorWriteEnabled(bool c) { mColorWriteEnabled = c; }
+
+        inline bool IsLightingEnabled() const { return mLightingEnabled; } 
+        inline bool IsColorWriteEnabled() const { return mColorWriteEnabled; } 
 
         void SetFragmentProgram(ShaderProgram *p);
@@ -94 +98 @@
         ShaderProgram *GetVertexProgram() { return mVertexProgram; }
 
-        //void SetFragmentProgramParameters(const GPUProgramParameters &p) { mGPUFragmentParameters = p; }
-        //void SetVertexProgramParameters(const GPUProgramParameters &p) { mGPUVertexParameters = p; }
-
-        /** Each technique has a distict set of parameters.
+        /** Get the set of fragment parameters of this technique
         */
         GPUProgramParameters * const GetFragmentProgramParameters() { return &mFragmentProgramParameters; }
+        /**  Get the set of vertex parameters of this technique
+        */
         GPUProgramParameters * const GetVertexProgramParameters() { return &mVertexProgramParameters; }
 
@@ -122 +125 @@
         ShaderProgram *mFragmentProgram;
         ShaderProgram *mVertexProgram;
+        /// if this material can write colors
+        bool mColorWriteEnabled;
+        /// if lighting is used
+        bool mLightingEnabled;
 };
 

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

@@ -199 +199 @@
         }
 
-        //////////
+        ///////////////////
         //-- fragment and vertex programs
         

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

@@ -98 +98 @@
         bool mFragmentProgramEnabled;
         bool mVertexProgramEnabled;
+
+        bool mUseLighting;
+        bool mColorWriteEnabled;
 };
 

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

@@ -156 +156 @@
 
         ///////////
-        //-- hack: add tree animation
+        //-- hack: add tree animation (should be done per material script!)
 
         if (numLODs > 1)
         {
-                //for (int i = 0; i < min(numLODs, 2); ++ i)
-                for (int i = 0; i < numLODs; ++ i)
+                ShapeContainer::iterator sstart, send;
+
+                // only use shader for the first two lod levels (the non-billboards)
+                for (int i = 0; i < min(numLODs, 2); ++ i)
+                //for (int i = 0; i < numLODs; ++ i)
                 {
-                        ShapeContainer::iterator sstart, send;
                         sceneGeom->GetLODLevel(i, sstart, send);