diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2005-01-16 09:02:06 +0300 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2005-01-16 09:02:06 +0300 |
| commit | 3b91ea4309f47d937799382d988a6348e3bb2d7f (patch) | |
| tree | d45b8087e755ae6b9781845d21898603c038f2a7 /source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp | |
| parent | 5fcf39d2a5db1d536e9fbfa52edb2bcdc40d8e29 (diff) | |
Unified KX_BlenderPolyMaterial & GPC_PolygonMaterial into KX_PolygonMaterial.
Make game engine materials use Zoffs in Materials.
Added Python material hooks.
Diffstat (limited to 'source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp')
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index 6ff91f480a7..b84239d1a65 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -57,6 +57,7 @@ #include "KX_GameObject.h" #include "KX_BlenderPolyMaterial.h" +#include "KX_PolygonMaterial.h" #include "Value.h" #include "KX_BlenderGL.h" // for text printing @@ -258,7 +259,7 @@ void KX_BlenderRenderTools::RenderText(int mode,RAS_IPolyMaterial* polymat,float STR_String mytext = ((CValue*)m_clientobject)->GetPropertyText("Text"); - KX_BlenderPolyMaterial* blenderpoly = (KX_BlenderPolyMaterial*)polymat; + KX_PolygonMaterial* blenderpoly = static_cast<KX_PolygonMaterial*>(polymat); struct TFace* tface = blenderpoly->GetTFace(); BL_RenderText( mode,mytext,mytext.Length(),tface,v1,v2,v3,v4); @@ -435,11 +436,12 @@ RAS_IPolyMaterial* KX_BlenderRenderTools::CreateBlenderPolyMaterial( bool ba,const STR_String& matname,int tile,int tilexrep,int tileyrep,int mode,bool transparant,bool zsort, int lightlayer ,bool bIsTriangle,void* clientobject,void* tface) { - return new KX_BlenderPolyMaterial( + assert(!"Deprecated"); +/* return new KX_BlenderPolyMaterial( texname, ba,matname,tile,tilexrep,tileyrep,mode,transparant,zsort, lightlayer - ,bIsTriangle,clientobject,(struct TFace*)tface); + ,bIsTriangle,clientobject,(struct TFace*)tface);*/ } unsigned int KX_BlenderRenderTools::m_numgllights; |