diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2007-01-07 07:39:39 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2007-01-07 07:39:39 +0300 |
| commit | 4a70681ce21d254f3bf7033380ec33732be2825d (patch) | |
| tree | b8941422557cc09eca7bde70ffed04d90e9e2b77 /source/gameengine/Ketsji/BL_Material.h | |
| parent | cf4d6278972046914764367f9b1b747dac012b00 (diff) | |
patch by Charlie, related to recent changes of multi-uv/lightmap generation. This fix makes it possible to use lightmaps in the game engine.
Diffstat (limited to 'source/gameengine/Ketsji/BL_Material.h')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Material.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h index 2656f0d688a..8be91316237 100644 --- a/source/gameengine/Ketsji/BL_Material.h +++ b/source/gameengine/Ketsji/BL_Material.h @@ -31,6 +31,7 @@ public: float offsets[3]; int projplane[3]; STR_String objconame; + STR_String uvCoName; }; // base material struct @@ -79,13 +80,17 @@ public: unsigned int rgb[4]; MT_Point2 uv[4]; - + MT_Point2 uv2[4]; + void SetConversionRGB(unsigned int *rgb); void GetConversionRGB(unsigned int *rgb); void SetConversionUV(MT_Point2 *uv); void GetConversionUV(MT_Point2 *uv); + void SetConversionUV2(MT_Point2 *uv); + void GetConversionUV2(MT_Point2 *uv); + void SetSharedMaterial(bool v); bool IsShared(); void SetUsers(int num); @@ -148,7 +153,8 @@ enum BL_MappingFlag USEORCO =16, USEUV =32, USETANG =64, - DISABLE =128 + DISABLE =128, + USECUSTOMUV=256 }; // BL_Material::BL_Mapping::projplane |