Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2007-01-07 07:39:39 +0300
committerErwin Coumans <blender@erwincoumans.com>2007-01-07 07:39:39 +0300
commit4a70681ce21d254f3bf7033380ec33732be2825d (patch)
treeb8941422557cc09eca7bde70ffed04d90e9e2b77 /source/gameengine/Ketsji/BL_Material.cpp
parentcf4d6278972046914764367f9b1b747dac012b00 (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.cpp')
-rw-r--r--source/gameengine/Ketsji/BL_Material.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/BL_Material.cpp b/source/gameengine/Ketsji/BL_Material.cpp
index 63ba0924b1c..a8d80ef6224 100644
--- a/source/gameengine/Ketsji/BL_Material.cpp
+++ b/source/gameengine/Ketsji/BL_Material.cpp
@@ -59,7 +59,10 @@ BL_Material::BL_Material()
int i;
for(i=0; i<4; i++)
+ {
uv[i] = MT_Point2(0.f,1.f);
+ uv2[i] = MT_Point2(0.f, 1.f);
+ }
for(i=0; i<MAXTEX; i++) // :(
{
@@ -114,6 +117,19 @@ void BL_Material::GetConversionUV(MT_Point2 *nuv){
*nuv++ = uv[2];
*nuv = uv[3];
}
+void BL_Material::SetConversionUV2(MT_Point2 *nuv) {
+ uv2[0] = *nuv++;
+ uv2[1] = *nuv++;
+ uv2[2] = *nuv++;
+ uv2[3] = *nuv;
+}
+
+void BL_Material::GetConversionUV2(MT_Point2 *nuv){
+ *nuv++ = uv2[0];
+ *nuv++ = uv2[1];
+ *nuv++ = uv2[2];
+ *nuv = uv2[3];
+}
void BL_Material::SetSharedMaterial(bool v)