remove more unneeded args, also allow ipo to animate the ref value for KX_BlenderMate...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 31 Jul 2009 09:05:13 +0000 (09:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 31 Jul 2009 09:05:13 +0000 (09:05 +0000)
22 files changed:
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_BlenderDataConversion.h
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/Converter/KX_ConvertSensors.h
source/gameengine/Expressions/Value.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_ISceneConverter.h
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_NearSensor.h
source/gameengine/Ketsji/KX_PolygonMaterial.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_RadarSensor.h
source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
source/gameengine/Rasterizer/RAS_IPolygonMaterial.h

index d1b362557adcd96ff594e6a884c5ac9cd1b1a4b9..0ed8682c092aa2aeda3b21a5ad03f3b2c4152cad 100644 (file)
@@ -385,7 +385,6 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
                                sceneconverter->ConvertScene(
                                        startscene,
                                        dictionaryobject,
-                                       keyboarddevice,
                                        rendertools,
                                        canvas);
                                ketsjiengine->AddScene(startscene);
@@ -683,7 +682,6 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
                                sceneconverter->ConvertScene(
                                        startscene,
                                        dictionaryobject,
-                                       keyboarddevice,
                                        rendertools,
                                        canvas);
                                ketsjiengine->AddScene(startscene);
index 7cae1ee8c2899dc6867411a47a79d571808049a1..7a902a727957636dd63ecddebe2af08be1171b80 100644 (file)
@@ -324,8 +324,7 @@ bool ConvertMaterial(
        MTFace* tface,  
        const char *tfaceName,
        MFace* mface, 
-       MCol* mmcol, 
-       int lightlayer, 
+       MCol* mmcol,
        MTF_localLayer *layers,
        bool glslmat)
 {
@@ -721,12 +720,12 @@ bool ConvertMaterial(
        return true;
 }
 
-
-RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools* rendertools, KX_Scene* scene, KX_BlenderSceneConverter *converter)
+/* blenderobj can be NULL, make sure its checked for */
+RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene* scene, KX_BlenderSceneConverter *converter)
 {
        RAS_MeshObject *meshobj;
        bool skinMesh = false;
-       int lightlayer = blenderobj->lay;
+       int lightlayer = blenderobj ? blenderobj->lay:(1<<20)-1; // all layers if no object.
 
        if ((meshobj = converter->FindGameMesh(mesh/*, ob->lay*/)) != NULL)
                return meshobj;
@@ -749,7 +748,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
        }
 
        // Determine if we need to make a skinned mesh
-       if (mesh->dvert || mesh->key || ((blenderobj->gameflag & OB_SOFT_BODY) != 0) || BL_ModifierDeformer::HasCompatibleDeformer(blenderobj))
+       if (blenderobj && (mesh->dvert || mesh->key || ((blenderobj->gameflag & OB_SOFT_BODY) != 0) || BL_ModifierDeformer::HasCompatibleDeformer(blenderobj)))
        {
                meshobj = new BL_SkinMeshObject(mesh);
                skinMesh = true;
@@ -844,9 +843,8 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
                                tan3 = tangent[f*4 + 3];
                }
 
-               /* get material */
-               ma = give_current_material(blenderobj, mface->mat_nr+1);
-       
+               ma = give_current_material(blenderobj, mface->mat_nr+1);
+
                {
                        bool visible = true;
                        bool twoside = false;
@@ -860,7 +858,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
                                if (!bl_mat)
                                        bl_mat = new BL_Material();
                                ConvertMaterial(bl_mat, ma, tface, tfaceName, mface, mcol,
-                                       lightlayer, layers, converter->GetGLSLMaterials());
+                                       layers, converter->GetGLSLMaterials());
 
                                visible = ((bl_mat->ras_mode & POLY_VIS)!=0);
                                collider = ((bl_mat->ras_mode & COLLIDER)!=0);
@@ -883,7 +881,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
                                if (kx_blmat == NULL)
                                        kx_blmat = new KX_BlenderMaterial();
 
-                               kx_blmat->Initialize(scene, bl_mat, skinMesh, lightlayer);
+                               kx_blmat->Initialize(scene, bl_mat, skinMesh);
                                polymat = static_cast<RAS_IPolyMaterial*>(kx_blmat);
                        }
                        else {
@@ -1067,8 +1065,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 
        
        
-static PHY_MaterialProps *CreateMaterialFromBlenderObject(struct Object* blenderobject,
-                                                                                                 KX_Scene *kxscene)
+static PHY_MaterialProps *CreateMaterialFromBlenderObject(struct Object* blenderobject)
 {
        PHY_MaterialProps *materialProps = new PHY_MaterialProps;
        
@@ -1101,8 +1098,7 @@ static PHY_MaterialProps *CreateMaterialFromBlenderObject(struct Object* blender
        return materialProps;
 }
 
-static PHY_ShapeProps *CreateShapePropsFromBlenderObject(struct Object* blenderobject,
-                                                                                                KX_Scene *kxscene)
+static PHY_ShapeProps *CreateShapePropsFromBlenderObject(struct Object* blenderobject)
 {
        PHY_ShapeProps *shapeProps = new PHY_ShapeProps;
        
@@ -1397,12 +1393,11 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
 
 
        PHY_ShapeProps* shapeprops =
-                       CreateShapePropsFromBlenderObject(blenderobject, 
-                       kxscene);
+                       CreateShapePropsFromBlenderObject(blenderobject);
 
        
        PHY_MaterialProps* smmaterial = 
-               CreateMaterialFromBlenderObject(blenderobject, kxscene);
+               CreateMaterialFromBlenderObject(blenderobject);
                                        
        KX_ObjectProperties objprop;
        objprop.m_lockXaxis = (blenderobject->gameflag2 & OB_LOCK_RIGID_BODY_X_AXIS) !=0;
@@ -1732,7 +1727,7 @@ static KX_GameObject *gameobject_from_blenderobject(
                Mesh* mesh = static_cast<Mesh*>(ob->data);
                float center[3], extents[3];
                float radius = my_boundbox_mesh((Mesh*) ob->data, center, extents);
-               RAS_MeshObject* meshobj = BL_ConvertMesh(mesh,ob,rendertools,kxscene,converter);
+               RAS_MeshObject* meshobj = BL_ConvertMesh(mesh,ob,kxscene,converter);
                
                // needed for python scripting
                kxscene->GetLogicManager()->RegisterMeshName(meshobj->GetName(),meshobj);
@@ -1914,7 +1909,6 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                                                          KX_KetsjiEngine* ketsjiEngine,
                                                          e_PhysicsEngine       physics_engine,
                                                          PyObject* pythondictionary,
-                                                         SCA_IInputDevice* keydev,
                                                          RAS_IRenderTools* rendertools,
                                                          RAS_ICanvas* canvas,
                                                          KX_BlenderSceneConverter* converter,
@@ -2687,7 +2681,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                struct Object* blenderobj = converter->FindBlenderObject(gameobj);
                int layerMask = (groupobj.find(blenderobj) == groupobj.end()) ? activeLayerBitInfo : 0;
                bool isInActiveLayer = (blenderobj->lay & layerMask)!=0;
-               BL_ConvertSensors(blenderobj,gameobj,logicmgr,kxscene,ketsjiEngine,keydev,layerMask,isInActiveLayer,canvas,converter);
+               BL_ConvertSensors(blenderobj,gameobj,logicmgr,kxscene,ketsjiEngine,layerMask,isInActiveLayer,canvas,converter);
                // set the init state to all objects
                gameobj->SetInitState((blenderobj->init_state)?blenderobj->init_state:blenderobj->state);
        }
@@ -2725,4 +2719,3 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
        RAS_BucketManager *bucketmanager = kxscene->GetBucketManager();
        bucketmanager->OptimizeBuckets(distance);
 }
-
index bf733b748e2a77d9eb4ad7dbe39fa5c5352247a1..b8f9d1ec4e6b954e298f22f01dbe4c9886e787d3 100644 (file)
 #include "KX_Python.h"
 #include "KX_PhysicsEngineEnums.h"
 
-class RAS_MeshObject* BL_ConvertMesh(struct Mesh* mesh,struct Object* lightobj,class RAS_IRenderTools* rendertools,class KX_Scene* scene, class KX_BlenderSceneConverter *converter);
+class RAS_MeshObject* BL_ConvertMesh(struct Mesh* mesh,struct Object* lightobj,class KX_Scene* scene, class KX_BlenderSceneConverter *converter);
 
 void BL_ConvertBlenderObjects(struct Main* maggie,
                                                          class KX_Scene* kxscene,
                                                          class KX_KetsjiEngine* ketsjiEngine,
                                                          e_PhysicsEngine       physics_engine,
                                                          PyObject* pythondictionary,
-                                                         class SCA_IInputDevice* keydev,
                                                          class RAS_IRenderTools* rendertools,
                                                          class RAS_ICanvas* canvas, 
                                                          class KX_BlenderSceneConverter* sceneconverter, 
index 4031b48847b85c3e4fc5669c1064478ff7db7bcb..d817999393c5faa40cb52ea110c8b396fb50d024 100644 (file)
@@ -257,7 +257,6 @@ struct      BlenderDebugDraw : public btIDebugDraw
 
 void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene,
                                                                                        PyObject* dictobj,
-                                                                                       class SCA_IInputDevice* keyinputdev,
                                                                                        class RAS_IRenderTools* rendertools,
                                                                                        class RAS_ICanvas* canvas)
 {
@@ -360,7 +359,6 @@ void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene,
                m_ketsjiEngine,
                physics_engine,
                dictobj,
-               keyinputdev,
                rendertools,
                canvas,
                this,
index 820f608509f2c4a7bb8883fe64895377a621d6c7..cc93a953533e7e0084b25ba297992251ff22aed3 100644 (file)
@@ -94,7 +94,6 @@ public:
        virtual void    ConvertScene(
                                                class KX_Scene* destinationscene,
                                                PyObject* dictobj,
-                                               class SCA_IInputDevice* keyinputdev,
                                                class RAS_IRenderTools* rendertools,
                                                class RAS_ICanvas* canvas
                                        );
@@ -149,6 +148,9 @@ public:
        virtual bool GetGLSLMaterials();
 
        struct Scene* GetBlenderSceneForName(const STR_String& name);
+
+       struct Main* GetMain() { return m_maggie; };
+
 };
 
 #endif //__KX_BLENDERSCENECONVERTER_H
index b6fc7f1dbbad437b9cd0bc6936575ceeab1a9b89..c18e4fce8a53e186a1a762729d386ed639637d26 100644 (file)
@@ -629,7 +629,6 @@ void BL_ConvertActuators(char* maggiename,
                                                        tmpmesh = BL_ConvertMesh(
                                                                editobact->me,
                                                                blenderobject,
-                                                               rendertools,
                                                                scene,
                                                                converter
                                                                );
index 37631a0523d439104d016e9ac014f7bf9243c8e9..31a3cfbd1acde1cfce14dc6489d3a53e5e2ed815 100644 (file)
@@ -28,6 +28,7 @@
  * Conversion of Blender data blocks to KX sensor system
  */
 
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -93,7 +94,6 @@ void BL_ConvertSensors(struct Object* blenderobject,
                                           SCA_LogicManager* logicmgr,
                                           KX_Scene* kxscene,
                                           KX_KetsjiEngine* kxengine,
-                                          SCA_IInputDevice* keydev,
                                           int activeLayerBitInfo,
                                           bool isInActiveLayer,
                                           RAS_ICanvas* canvas,
@@ -430,9 +430,8 @@ void BL_ConvertSensors(struct Object* blenderobject,
                                                blendernearsensor->dist,
                                                blendernearsensor->resetdist,
                                                bFindMaterial,
-                                               nearpropertyname,kxscene,
-                                               physCtrl
-                                               );
+                                               nearpropertyname,
+                                               physCtrl);
                                        
                                }
                                break;
@@ -634,8 +633,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
                                                smallmargin,
                                                largemargin,
                                                bFindMaterial,
-                                               radarpropertyname,
-                                               kxscene);
+                                               radarpropertyname);
                                                
                                }
                        
index 9162a866768468170ac6f548dd1768e3de4effa0..630323f30b485cabf513d502f122752e62699b45 100644 (file)
@@ -34,7 +34,6 @@ void BL_ConvertSensors(struct Object* blenderobject,
           class SCA_LogicManager* logicmgr,
           class KX_Scene* kxscene,
           class KX_KetsjiEngine* kxengine,
-          class SCA_IInputDevice* keydev,
           int activeLayerBitInfo,
           bool isInActiveLayer,
           class RAS_ICanvas* canvas, 
index 61dabff510b21bfbc786170dc2ae278c566c91ff..dc911e42acc7e0e2d299ce7fe5f0f16b49a43e99 100644 (file)
@@ -541,13 +541,6 @@ CValue*    CValue::FindIdentifier(const STR_String& identifiername)
 
 #ifndef NO_EXP_PYTHON_EMBEDDING
 
-
-static PyMethodDef     CValueMethods[] = 
-{
-       //{ "new", CValue::PyMake , METH_VARARGS},
-       { NULL,NULL}    // Sentinel
-};
-
 PyAttributeDef CValue::Attributes[] = {
        KX_PYATTRIBUTE_RO_FUNCTION("name",      CValue, pyattr_get_name),
        { NULL }        //Sentinel
index bd332e8bbd7c24ad38757c4885cc25fc06c3c239..f1b05c1292d2deb35578f14f3706c09dafb49b4e 100644 (file)
@@ -711,7 +711,6 @@ bool GPG_Application::startEngine(void)
                        startscenename,
                        startscene,
                        dictionaryobject,
-                       m_keyboard,
                        m_rendertools,
                        m_canvas);
                m_ketsjiengine->AddScene(startscene);
index 30057fc039d359b24bde63c2d9e4d8ca25d68107..875f6ede4523f3d112ffb972a4306ac274c98288 100644 (file)
@@ -61,8 +61,7 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 void KX_BlenderMaterial::Initialize(
     KX_Scene *scene,
        BL_Material *data,
-       bool skin,
-       int lightlayer)
+       bool skin)
 {
        RAS_IPolyMaterial::Initialize(
                data->texname[0],
@@ -74,8 +73,7 @@ void KX_BlenderMaterial::Initialize(
                data->mode,
                data->transp,
                ((data->ras_mode &ALPHA)!=0),
-               ((data->ras_mode &ZSORT)!=0),
-               lightlayer
+               ((data->ras_mode &ZSORT)!=0)
        );
        mMaterial = data;
        mShader = 0;
@@ -778,6 +776,7 @@ void KX_BlenderMaterial::UpdateIPO(
        mMaterial->hard                 = (float)(hard);
        mMaterial->emit                 = (float)(emit);
        mMaterial->spec_f               = (float)(spec);
+       mMaterial->ref                  = (float)(ref);
 }
 
 
index b29f2df98db920d8765fac0ceb8891f38c1ab105..9ca49c992eb8a106b32de26907e9217beb715b6e 100644 (file)
@@ -29,8 +29,7 @@ public:
        void Initialize(
                class KX_Scene* scene,
                BL_Material*    mat,
-               bool                    skin,
-               int                             lightlayer
+               bool                    skin
        );
 
        virtual ~KX_BlenderMaterial();
index 5c2c0bc0ad20655b1ef6191eb38e367f0aa168c5..45b3276e98ca547fc79c262a706ae9c96e58ef56 100644 (file)
@@ -50,7 +50,6 @@ public:
        virtual void ConvertScene(
                class KX_Scene* destinationscene,
                PyObject* dictobj,
-               class SCA_IInputDevice* keyinputdev,
                class RAS_IRenderTools* rendertools, 
                class RAS_ICanvas*  canvas)=0;
        
index 20600be81fcdc952860a1a4f0a6616c3f78d4f39..f485e2589f57364cf63be4b35f248f0211fbb61d 100644 (file)
@@ -1605,7 +1605,6 @@ KX_Scene* KX_KetsjiEngine::CreateScene(const STR_String& scenename)
 
        m_sceneconverter->ConvertScene(tmpscene,
                                                          m_pythondictionary,
-                                                         m_keyboarddevice,
                                                          m_rendertools,
                                                          m_canvas);
 
index 44842b7f5b3dacb2936455072b9ab4b80b69ce32..b71215645b4e3cbe4a362757ee9c5b11644f28a1 100644 (file)
@@ -47,7 +47,6 @@ KX_NearSensor::KX_NearSensor(SCA_EventManager* eventmgr,
                                                         float resetmargin,
                                                         bool bFindMaterial,
                                                         const STR_String& touchedpropname,
-                                                        class KX_Scene* scene,
                                                         PHY_IPhysicsController*        ctrl,
                                                         PyTypeObject* T)
                         :KX_TouchSensor(eventmgr,
@@ -55,7 +54,6 @@ KX_NearSensor::KX_NearSensor(SCA_EventManager* eventmgr,
                                                         bFindMaterial,
                                                         false,
                                                         touchedpropname,
-                                                        /* scene, */
                                                         T),
                         m_Margin(margin),
                         m_ResetMargin(resetmargin)
index 63099e181a0691cbbc8f2e90bcd9c3a2a9f91a36..88292242a5ddd335a1c7ed29ff1faf70f3efe4d4 100644 (file)
@@ -44,7 +44,7 @@ class KX_NearSensor : public KX_TouchSensor
 protected:
        float   m_Margin;
        float  m_ResetMargin;
-       KX_Scene*       m_scene;
+
        KX_ClientObjectInfo*    m_client_info;
 public:
        KX_NearSensor(class SCA_EventManager* eventmgr,
@@ -53,7 +53,6 @@ public:
                        float resetmargin,
                        bool bFindMaterial,
                        const STR_String& touchedpropname,
-                       class KX_Scene* scene,
                         PHY_IPhysicsController*        ctrl,
                        PyTypeObject* T=&Type);
 /*
index 506c167a9054489631fd472b8200fb62264a9e60..63c1b17abc1b10ad3511419566f51134f08baef0 100644 (file)
@@ -88,8 +88,7 @@ void KX_PolygonMaterial::Initialize(
                                                        mode,
                                                        transp,
                                                        alpha,
-                                                       zsort,
-                                                       lightlayer);
+                                                       zsort);
        m_tface = tface;
        m_mcol = mcol;
        m_material = ma;
index 75b29481e541722b2cba0911e6b67f3ac86b85e7..fcada7bfce48d8c9b8376399ef2255812bf6995b 100644 (file)
@@ -2139,3 +2139,6 @@ void resetGamePythonPath()
 {
        gp_GamePythonPathOrig[0] = '\0';
 }
+
+
+
index 064dc9126ac1c518ad7209937097e23d6f3ceb93..76ecc2351508a0830fc2e76b9d1eef6d91a52bf6 100644 (file)
@@ -49,7 +49,6 @@ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr,
                        double resetmargin,
                        bool bFindMaterial,
                        const STR_String& touchedpropname,
-                       class KX_Scene* kxscene,
                        PyTypeObject* T)
 
                        : KX_NearSensor(
@@ -60,7 +59,6 @@ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr,
                                resetmargin,
                                bFindMaterial,
                                touchedpropname,
-                               kxscene,
                                physCtrl,
                                T),
                                m_coneradius(coneradius),
index 2e5a0e68bedcb5cfa2a67447491749f030712659..5eb57bdc3e0dcfbfb2e8b4370f33e895c1f321c5 100644 (file)
@@ -70,7 +70,6 @@ public:
                        double resetmargin,
                        bool bFindMaterial,
                        const STR_String& touchedpropname,
-                       class KX_Scene* kxscene,
                        PyTypeObject* T = &Type);
        KX_RadarSensor();
        virtual ~KX_RadarSensor();
index 6af00d63c2dad98a0b35909e7db54706774c13e8..cb5c5a1239771e16071309d70428c66126de9d2b 100644 (file)
@@ -46,8 +46,7 @@ void  RAS_IPolyMaterial::Initialize(
                                int mode,
                                int transp,
                                bool alpha,
-                               bool zsort,
-                               int lightlayer)
+                               bool zsort)
 {
        m_texturename = texname;
        m_materialname = matname;
@@ -59,7 +58,6 @@ void  RAS_IPolyMaterial::Initialize(
        m_transp = transp;
        m_alpha = alpha;
        m_zsort = zsort;
-       //m_lightlayer = lightlayer;
        m_polymatid = m_newpolymatid++;
        m_flag = 0;
        m_multimode = 0;
@@ -80,7 +78,6 @@ RAS_IPolyMaterial::RAS_IPolyMaterial()
                m_transp(0),
                m_alpha(false),
                m_zsort(false),
-               //m_lightlayer(0),
                m_polymatid(0),
                m_flag(0),
                m_multimode(0)
@@ -100,8 +97,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
                                                                         int mode,
                                                                         int transp,
                                                                         bool alpha,
-                                                                        bool zsort,
-                                                                        int lightlayer)
+                                                                        bool zsort)
                : m_texturename(texname),
                m_materialname(matname),
                m_materialindex(materialindex),
@@ -112,7 +108,6 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
                m_transp(transp),
                m_alpha(alpha),
                m_zsort(zsort),
-               //m_lightlayer(lightlayer),
                m_polymatid(m_newpolymatid++),
                m_flag(0),
                m_multimode(0)
@@ -172,11 +167,6 @@ bool RAS_IPolyMaterial::Less(const RAS_IPolyMaterial& rhs) const
        return m_polymatid < rhs.m_polymatid;
 }
 
-//int RAS_IPolyMaterial::GetLightLayer() const
-//{
-//     return m_lightlayer;
-//}
-
 bool RAS_IPolyMaterial::IsAlpha() const
 {
        return m_alpha || m_zsort;
index e19db35ccb58413d14b52df40bc4df67d9ce3001..a01196ef30723309fea2b153fc47a742507525d8 100644 (file)
@@ -73,7 +73,6 @@ protected:
        int                                             m_transp;
        bool                                    m_alpha;
        bool                                    m_zsort;
-       //int                                           m_lightlayer;
        int                                             m_materialindex;
        
        unsigned int                    m_polymatid;
@@ -110,8 +109,7 @@ public:
                                          int mode,
                                          int transp,
                                          bool alpha,
-                                         bool zsort,
-                                         int lightlayer);
+                                         bool zsort);
        void Initialize(const STR_String& texname,
                                        const STR_String& matname,
                                        int materialindex,
@@ -121,8 +119,7 @@ public:
                                        int mode,
                                        int transp,
                                        bool alpha,
-                                       bool zsort,
-                                       int lightlayer);
+                                       bool zsort);
        virtual ~RAS_IPolyMaterial() {};
  
        /**