diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2006-01-06 06:46:54 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2006-01-06 06:46:54 +0300 |
commit | 2e6d57618232b8b4ce8e5afe84fd278041cbbbfe (patch) | |
tree | c0f05e6b59aada420dd600f1138e9149b97d9e9d /source/gameengine/Rasterizer/RAS_TexVert.cpp | |
parent | ef520a8cc9e863aa234be0ee60d1038e7ec8fc44 (diff) |
Sorry to break the cvs-closed status, so if you really need to make a new 2.40 build, just disable the game engine if it doesn't compile for a platform. Again, sorry if this breaks non-windows platforms, but I hope people help to get this amazing fix working for all platforms. Armature-fixing contribution from Snailrose. Also lots of cool things from Snailrose and Lagan.
Armatures are back
Split screen
Double sided lightning
Ambient lighting
Alpha test
Material IPO support (one per object atm)
Blender materials
GLSL shaders - Python access
Up to three texture samplers from the material panel ( 2D & Cube map )
Python access to a second set of uv coordinates
See http://www.elysiun.com/forum/viewtopic.php?t=58057
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_TexVert.cpp')
-rw-r--r-- | source/gameengine/Rasterizer/RAS_TexVert.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp index c68806d500c..9e9b5725b6b 100644 --- a/source/gameengine/Rasterizer/RAS_TexVert.cpp +++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp @@ -45,9 +45,11 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz, { xyz.getValue(m_localxyz); uv.getValue(m_uv1); + uv.getValue(m_uv2); // ..py access SetRGBA(rgba); SetNormal(normal); m_flag = flag; + m_unit = 2; } const MT_Point3& RAS_TexVert::xyz() @@ -78,6 +80,10 @@ void RAS_TexVert::SetUV(const MT_Point2& uv) uv.getValue(m_uv1); } +void RAS_TexVert::SetUV2(const MT_Point2& uv) +{ + uv.getValue(m_uv2); +} void RAS_TexVert::SetRGBA(const unsigned int rgba) @@ -90,6 +96,12 @@ void RAS_TexVert::SetFlag(const short flag) { m_flag = flag; } + +void RAS_TexVert::SetUnit(const unsigned int u) +{ + m_unit = u<=TV_MAX?u:TV_MAX; +} + void RAS_TexVert::SetNormal(const MT_Vector3& normal) { normal.getValue(m_normal); @@ -103,6 +115,12 @@ const float* RAS_TexVert::getUV1 () const return m_uv1; } +const float* RAS_TexVert::getUV2 () const +{ + return m_uv2; +} + + const float* RAS_TexVert::getNormal() const { @@ -137,6 +155,13 @@ short RAS_TexVert::getFlag() const return m_flag; } + +unsigned int RAS_TexVert::getUnit() const +{ + return m_unit; +} + + void RAS_TexVert::getOffsets(void* &xyz, void* &uv1, void* &rgba, void* &normal) const { xyz = (void *) m_localxyz; |