diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-02-13 08:45:32 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-02-13 08:45:32 +0300 |
| commit | e4790aef46f7ca0b4ab01c34f043be9e7b1fa7f1 (patch) | |
| tree | 0d83145e454cc7b5947ec657dbd9e415aac9d809 /source/gameengine/Ketsji/BL_Material.h | |
| parent | 6c325d74f534d259820c2b2d94d5b73b3acf0a35 (diff) | |
Improved OpenGL Shader Language support for game engine. The python interface is much simplified. Drawback is that scripts need to be updated next release. Testfiles:
http://www.continuousphysics.com/ftp/pub/test/index.php?dir=blender/&file=demos-2.42.zip
patch by Charlie Carley (snailrose @ elysiun.com)
Diffstat (limited to 'source/gameengine/Ketsji/BL_Material.h')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Material.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h index cf753414245..7a813cc6c72 100644 --- a/source/gameengine/Ketsji/BL_Material.h +++ b/source/gameengine/Ketsji/BL_Material.h @@ -20,7 +20,7 @@ struct EnvMap; although the more you add the slower the search time will be. we will go for three, which should be enough */ -#define MAXTEX 3//match in RAS_TexVert +#define MAXTEX 3//match in RAS_TexVert & RAS_OpenGLRasterizer // different mapping modes class BL_Mapping @@ -39,6 +39,10 @@ class BL_Material private: unsigned int rgb[4]; MT_Point2 uv[4]; + + int num_users; + bool share; + public: // ----------------------------------- BL_Material(); @@ -82,6 +86,9 @@ public: void SetConversionUV(MT_Point2 *uv); void GetConversionUV(MT_Point2 *uv); + void SetSharedMaterial(bool v); + bool IsShared(); + void SetUsers(int num); }; // BL_Material::IdMode @@ -132,9 +139,14 @@ enum BL_ras_mode // BL_Material::mapping[index]::mapping enum BL_MappingFlag { - USEREFL=1, - USEENV=2, - USEOBJ=4 + USEENV =1, + // -- + USEREFL =2, + USEOBJ =4, + USENORM =8, + USEORCO =16, + USEUV =32, + DISABLE =64 }; // BL_Material::BL_Mapping::projplane |