Changeset 2769 for GTP/trunk/App/Demos/Vis/CHC_revisited/Material.h

Timestamp:

06/18/08 04:08:41 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/Material.h (modified) (3 diffs)

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

@@ -7 +7 @@
 
 class Texture;
+class RenderState;
 
-class RgbColor 
+
+class RgbaColor 
 {
 
 public:
 
-  float r, g, b;
+        float r, g, b, a;
 
-  RgbColor(): r(0.5f), g(0.5f), b(0.5f)
-  {
-  }
+        RgbaColor(): r(1), g(1), b(1), a(1)
+        {}
 
-  RgbColor(float _r, float _g, float _b): r(_r), g(_g), b(_b)
-  {
-  }
+        RgbaColor(float _r, float _g, float _b, float _a): r(_r), g(_g), b(_b), a(_a)
+        {}
 
-  friend RgbColor
-  RandomColor(float a = 0.0f, float b = 1.0f);
-
-  // Mapping from interval 0.0-1.0 to RGB using "rainbow" color map
-  // (range of hue from 0-240)
-
-  friend RgbColor RainbowColorMapping(float value);
-  
+        friend RgbaColor RandomColor(float a = 0.0f, float b = 1.0f);
 };
 
 
 // Forward declarations
-RgbColor RandomColor(const float a, const float b);
+RgbaColor RandomColor(float a, float b);
 
-// Mapping from interval 0.0-1.0 to RGB using "rainbow" color map
-// (range of hue from 0-240)
-RgbColor RainbowColorMapping(const float value);
 
-  
 
 class Material 
@@ -47 +36 @@
 public:
 
-  RgbColor mDiffuseColor;
-  RgbColor mSpecularColor;
-  RgbColor mAmbientColor;
-  
-  Material();
-  
-  Material(int id);
+        Material();
 
-  Material(const RgbColor &color);
-  /** Returns unique material id.
-  */
-  int GetId() const;
+        Material(int id);
 
-  friend Material RandomMaterial();
+        Material(const RgbaColor &color);
+        /** Returns unique material id.
+        */
+        int GetId() const;
 
-  inline Texture *GetTexture() const { return mTexture; }
+        friend Material RandomMaterial();
 
-  void SetTexture(Texture *texture) { mTexture = texture; }
-  /** Renders this material.
-  */
-  void Render();
+        inline Texture *GetTexture() const { return mTexture; }
+
+        void SetTexture(Texture *texture) { mTexture = texture; }
+        /** Renders this material.
+        */
+        void Render(RenderState *state);
+
+
+        ///////////
+
+        RgbaColor mDiffuseColor;
+        RgbaColor mSpecularColor;
+        RgbaColor mAmbientColor;
+
+        bool mAlphaTestEnabled;
 
 protected:
@@ -74 +68 @@
         */
         void InitMaterial();
+
+        ////////////////
 
         /// unique material id