diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-23 01:02:18 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-23 01:02:18 +0300 |
| commit | 00291b5cf4a0f16ddca425b74ed30e8ac35d40e2 (patch) | |
| tree | 952bb1c2f6fd8c2f34b950597ed0fa73a4ea7594 /source/gameengine/Rasterizer/RAS_TexVert.cpp | |
| parent | 5b90aafbd6815e29343f8e9aba9e3e20f85b3cc0 (diff) | |
[GameEngine] Commit all Kester's changes made to the gameengine to restore 2.25 like physics.
[SCons] Build with Solid as default when enabling the gameengine in the build process
[SCons] Build solid and qhull from the extern directory and link statically against them
That was about it.
There are a few things that needs double checking:
* Makefiles
* Projectfiles
* All the other systems than Linux and Windows on which the build (with scons) has been successfully tested.
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_TexVert.cpp')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_TexVert.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp index c29a16c71d8..c5b193cc941 100644 --- a/source/gameengine/Rasterizer/RAS_TexVert.cpp +++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp @@ -52,11 +52,6 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz, -const float* RAS_TexVert::getUV1 () const -{ - return m_uv1; -} - const MT_Point3& RAS_TexVert::xyz() @@ -97,8 +92,14 @@ void RAS_TexVert::SetNormal(const MT_Vector3& normal) } - +#ifndef RAS_TexVert_INLINE // leave multiline for debugging +const float* RAS_TexVert::getUV1 () const +{ + return m_uv1; +} + + const short* RAS_TexVert::getNormal() const { return m_normal; @@ -118,7 +119,7 @@ const unsigned int& RAS_TexVert::getRGBA() const return m_rgba; } - +#endif // compare two vertices, and return TRUE if both are almost identical (they can be shared) bool RAS_TexVert::closeTo(const RAS_TexVert* other) @@ -153,3 +154,11 @@ short RAS_TexVert::getFlag() const { return m_flag; } + +void RAS_TexVert::getOffsets(void* &xyz, void* &uv1, void* &rgba, void* &normal) const +{ + xyz = (void *) m_localxyz; + uv1 = (void *) m_uv1; + rgba = (void *) m_rgba; + normal = (void *) m_normal; +} |