remove some unused function args
authorCampbell Barton <ideasman42@gmail.com>
Thu, 30 Jul 2009 21:42:29 +0000 (21:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 30 Jul 2009 21:42:29 +0000 (21:42 +0000)
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_BlenderDataConversion.h
source/gameengine/Converter/BL_SkinMeshObject.cpp
source/gameengine/Converter/BL_SkinMeshObject.h
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Ketsji/KX_ISceneConverter.h
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Rasterizer/RAS_MeshObject.cpp
source/gameengine/Rasterizer/RAS_MeshObject.h

index ec751376d4afe80a447e5462b30864d8e5d0490a..d1b362557adcd96ff594e6a884c5ac9cd1b1a4b9 100644 (file)
@@ -383,7 +383,6 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
                        {
                                // convert and add scene
                                sceneconverter->ConvertScene(
                        {
                                // convert and add scene
                                sceneconverter->ConvertScene(
-                                       startscenename,
                                        startscene,
                                        dictionaryobject,
                                        keyboarddevice,
                                        startscene,
                                        dictionaryobject,
                                        keyboarddevice,
@@ -682,7 +681,6 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
                        {
                                // convert and add scene
                                sceneconverter->ConvertScene(
                        {
                                // convert and add scene
                                sceneconverter->ConvertScene(
-                                       startscenename,
                                        startscene,
                                        dictionaryobject,
                                        keyboarddevice,
                                        startscene,
                                        dictionaryobject,
                                        keyboarddevice,
index caa76263b2501076e275fefdcea8c11d8a610313..7cae1ee8c2899dc6867411a47a79d571808049a1 100644 (file)
@@ -326,7 +326,6 @@ bool ConvertMaterial(
        MFace* mface, 
        MCol* mmcol, 
        int lightlayer, 
        MFace* mface, 
        MCol* mmcol, 
        int lightlayer, 
-       Object* blenderobj,
        MTF_localLayer *layers,
        bool glslmat)
 {
        MTF_localLayer *layers,
        bool glslmat)
 {
@@ -752,11 +751,11 @@ 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))
        {
        // Determine if we need to make a skinned mesh
        if (mesh->dvert || mesh->key || ((blenderobj->gameflag & OB_SOFT_BODY) != 0) || BL_ModifierDeformer::HasCompatibleDeformer(blenderobj))
        {
-               meshobj = new BL_SkinMeshObject(mesh, lightlayer);
+               meshobj = new BL_SkinMeshObject(mesh);
                skinMesh = true;
        }
        else
                skinMesh = true;
        }
        else
-               meshobj = new RAS_MeshObject(mesh, lightlayer);
+               meshobj = new RAS_MeshObject(mesh);
 
        // Extract avaiable layers
        MTF_localLayer *layers =  new MTF_localLayer[MAX_MTFACE];
 
        // Extract avaiable layers
        MTF_localLayer *layers =  new MTF_localLayer[MAX_MTFACE];
@@ -861,7 +860,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,
                                if (!bl_mat)
                                        bl_mat = new BL_Material();
                                ConvertMaterial(bl_mat, ma, tface, tfaceName, mface, mcol,
-                                       lightlayer, blenderobj, layers, converter->GetGLSLMaterials());
+                                       lightlayer, layers, converter->GetGLSLMaterials());
 
                                visible = ((bl_mat->ras_mode & POLY_VIS)!=0);
                                collider = ((bl_mat->ras_mode & COLLIDER)!=0);
 
                                visible = ((bl_mat->ras_mode & POLY_VIS)!=0);
                                collider = ((bl_mat->ras_mode & COLLIDER)!=0);
@@ -1699,8 +1698,7 @@ static KX_GameObject *gameobject_from_blenderobject(
                                                                Object *ob, 
                                                                KX_Scene *kxscene, 
                                                                RAS_IRenderTools *rendertools, 
                                                                Object *ob, 
                                                                KX_Scene *kxscene, 
                                                                RAS_IRenderTools *rendertools, 
-                                                               KX_BlenderSceneConverter *converter,
-                                                               Scene *blenderscene) 
+                                                               KX_BlenderSceneConverter *converter) 
 {
        KX_GameObject *gameobj = NULL;
        
 {
        KX_GameObject *gameobj = NULL;
        
@@ -1912,7 +1910,6 @@ KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist){
 
 // convert blender objects into ketsji gameobjects
 void BL_ConvertBlenderObjects(struct Main* maggie,
 
 // convert blender objects into ketsji gameobjects
 void BL_ConvertBlenderObjects(struct Main* maggie,
-                                                         const STR_String& scenename,
                                                          KX_Scene* kxscene,
                                                          KX_KetsjiEngine* ketsjiEngine,
                                                          e_PhysicsEngine       physics_engine,
                                                          KX_Scene* kxscene,
                                                          KX_KetsjiEngine* ketsjiEngine,
                                                          e_PhysicsEngine       physics_engine,
@@ -1925,7 +1922,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                                                          )
 {      
 
                                                          )
 {      
 
-       Scene *blenderscene = converter->GetBlenderSceneForName(scenename);
+       Scene *blenderscene = kxscene->GetBlenderScene();
        // for SETLOOPER
        Scene *sce;
        Base *base;
        // for SETLOOPER
        Scene *sce;
        Base *base;
@@ -2021,8 +2018,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                                                                                base->object, 
                                                                                kxscene, 
                                                                                rendertools, 
                                                                                base->object, 
                                                                                kxscene, 
                                                                                rendertools, 
-                                                                               converter,
-                                                                               blenderscene);
+                                                                               converter);
                                                                                
                bool isInActiveLayer = (blenderobject->lay & activeLayerBitInfo) !=0;
                bool addobj=true;
                                                                                
                bool isInActiveLayer = (blenderobject->lay & activeLayerBitInfo) !=0;
                bool addobj=true;
@@ -2211,8 +2207,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                                                                                                                blenderobject, 
                                                                                                                kxscene, 
                                                                                                                rendertools, 
                                                                                                                blenderobject, 
                                                                                                                kxscene, 
                                                                                                                rendertools, 
-                                                                                                               converter,
-                                                                                                               blenderscene);
+                                                                                                               converter);
                                                                                
                                                // this code is copied from above except that
                                                // object from groups are never in active layer
                                                                                
                                                // this code is copied from above except that
                                                // object from groups are never in active layer
index 48f08fb357b0df94b52129f82c1e62b807577bba..bf733b748e2a77d9eb4ad7dbe39fa5c5352247a1 100644 (file)
@@ -37,7 +37,6 @@
 class RAS_MeshObject* BL_ConvertMesh(struct Mesh* mesh,struct Object* lightobj,class RAS_IRenderTools* rendertools,class KX_Scene* scene, class KX_BlenderSceneConverter *converter);
 
 void BL_ConvertBlenderObjects(struct Main* maggie,
 class RAS_MeshObject* BL_ConvertMesh(struct Mesh* mesh,struct Object* lightobj,class RAS_IRenderTools* rendertools,class KX_Scene* scene, class KX_BlenderSceneConverter *converter);
 
 void BL_ConvertBlenderObjects(struct Main* maggie,
-                                                         const STR_String& scenename,
                                                          class KX_Scene* kxscene,
                                                          class KX_KetsjiEngine* ketsjiEngine,
                                                          e_PhysicsEngine       physics_engine,
                                                          class KX_Scene* kxscene,
                                                          class KX_KetsjiEngine* ketsjiEngine,
                                                          e_PhysicsEngine       physics_engine,
index 0a18296f2611bdb110f2a3607dc917c67fdf1e08..4eb01df410bdf4dbcac505080e5b941dc9451bc8 100644 (file)
@@ -46,8 +46,8 @@
 #include "BL_SkinMeshObject.h"
 #include "BL_DeformableGameObject.h"
 
 #include "BL_SkinMeshObject.h"
 #include "BL_DeformableGameObject.h"
 
-BL_SkinMeshObject::BL_SkinMeshObject(Mesh* mesh, int lightlayer)
- : RAS_MeshObject (mesh, lightlayer)
+BL_SkinMeshObject::BL_SkinMeshObject(Mesh* mesh)
+ : RAS_MeshObject (mesh)
 { 
        m_bDeformed = true;
 
 { 
        m_bDeformed = true;
 
index 8544a2b958c26ce35584668fd697a14412ea9014..e2d0e37664da169fd907ddc7acc163815384c46d 100644 (file)
@@ -46,7 +46,7 @@ protected:
        vector<int>                              m_cacheWeightIndex;
 
 public:
        vector<int>                              m_cacheWeightIndex;
 
 public:
-       BL_SkinMeshObject(Mesh* mesh, int lightlayer);
+       BL_SkinMeshObject(Mesh* mesh);
        ~BL_SkinMeshObject();
 
        void UpdateBuckets(void* clientobj, double* oglmatrix,
        ~BL_SkinMeshObject();
 
        void UpdateBuckets(void* clientobj, double* oglmatrix,
index 42b96d65622c77a061531f68b45038e39d32afc5..4031b48847b85c3e4fc5669c1064478ff7db7bcb 100644 (file)
@@ -255,15 +255,14 @@ struct    BlenderDebugDraw : public btIDebugDraw
 
 #endif
 
 
 #endif
 
-void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
-                                                                                       class KX_Scene* destinationscene,
+void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene,
                                                                                        PyObject* dictobj,
                                                                                        class SCA_IInputDevice* keyinputdev,
                                                                                        class RAS_IRenderTools* rendertools,
                                                                                        class RAS_ICanvas* canvas)
 {
        //find out which physics engine
                                                                                        PyObject* dictobj,
                                                                                        class SCA_IInputDevice* keyinputdev,
                                                                                        class RAS_IRenderTools* rendertools,
                                                                                        class RAS_ICanvas* canvas)
 {
        //find out which physics engine
-       Scene *blenderscene = GetBlenderSceneForName(scenename);
+       Scene *blenderscene = destinationscene->GetBlenderScene();
 
        e_PhysicsEngine physics_engine = UseBullet;
        bool useDbvtCulling = false;
 
        e_PhysicsEngine physics_engine = UseBullet;
        bool useDbvtCulling = false;
@@ -357,7 +356,6 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
        }
 
        BL_ConvertBlenderObjects(m_maggie,
        }
 
        BL_ConvertBlenderObjects(m_maggie,
-               scenename,
                destinationscene,
                m_ketsjiEngine,
                physics_engine,
                destinationscene,
                m_ketsjiEngine,
                physics_engine,
index cf8dd5b339ab900605f28c580f3994617515be29..820f608509f2c4a7bb8883fe64895377a621d6c7 100644 (file)
@@ -92,7 +92,6 @@ public:
         * dictobj: python dictionary (for pythoncontrollers)
         */
        virtual void    ConvertScene(
         * dictobj: python dictionary (for pythoncontrollers)
         */
        virtual void    ConvertScene(
-                                               const STR_String& scenename,
                                                class KX_Scene* destinationscene,
                                                PyObject* dictobj,
                                                class SCA_IInputDevice* keyinputdev,
                                                class KX_Scene* destinationscene,
                                                PyObject* dictobj,
                                                class SCA_IInputDevice* keyinputdev,
index 3709fa8c784e2f50a55dedd582533c0bcc85c395..5c2c0bc0ad20655b1ef6191eb38e367f0aa168c5 100644 (file)
@@ -47,7 +47,7 @@ public:
        destinationscene: pass an empty scene, everything goes into this
        dictobj: python dictionary (for pythoncontrollers)
        */
        destinationscene: pass an empty scene, everything goes into this
        dictobj: python dictionary (for pythoncontrollers)
        */
-       virtual void ConvertScene(const STR_String& scenename,
+       virtual void ConvertScene(
                class KX_Scene* destinationscene,
                PyObject* dictobj,
                class SCA_IInputDevice* keyinputdev,
                class KX_Scene* destinationscene,
                PyObject* dictobj,
                class SCA_IInputDevice* keyinputdev,
index a43ea59220b3d736550e44c1d88c9b60e165943e..20600be81fcdc952860a1a4f0a6616c3f78d4f39 100644 (file)
@@ -1603,8 +1603,7 @@ KX_Scene* KX_KetsjiEngine::CreateScene(const STR_String& scenename)
                                                                          scenename,
                                                                          scene);
 
                                                                          scenename,
                                                                          scene);
 
-       m_sceneconverter->ConvertScene(scenename,
-                                                         tmpscene,
+       m_sceneconverter->ConvertScene(tmpscene,
                                                          m_pythondictionary,
                                                          m_keyboarddevice,
                                                          m_rendertools,
                                                          m_pythondictionary,
                                                          m_keyboarddevice,
                                                          m_rendertools,
index 0ae6ad9d7eae292052445afd8de8ecdffa4f8e4f..0995d5acdd5d69f7dfe9cb88566c4a8bb98b2f12 100644 (file)
@@ -90,9 +90,8 @@ struct RAS_MeshObject::fronttoback
 
 STR_String RAS_MeshObject::s_emptyname = "";
 
 
 STR_String RAS_MeshObject::s_emptyname = "";
 
-RAS_MeshObject::RAS_MeshObject(Mesh* mesh, int lightlayer)
-       : //m_lightlayer(lightlayer),
-       m_bModified(true),
+RAS_MeshObject::RAS_MeshObject(Mesh* mesh)
+       : m_bModified(true),
        m_bMeshModified(true),
        m_mesh(mesh),
        m_bDeformed(false)
        m_bMeshModified(true),
        m_mesh(mesh),
        m_bDeformed(false)
index bf9c0f7b682d7b652153a1f61292dd58f2422e3c..f34546a8ff7d744766ba88a12d4425f5ebf9dbb8 100644 (file)
@@ -55,7 +55,6 @@ class RAS_MeshObject
 {
 private:
        unsigned int                            m_debugcolor;
 {
 private:
        unsigned int                            m_debugcolor;
-       //int                                                   m_lightlayer;
 
        bool                                            m_bModified;
        bool                                            m_bMeshModified;
 
        bool                                            m_bModified;
        bool                                            m_bMeshModified;
@@ -77,7 +76,7 @@ protected:
 
 public:
        // for now, meshes need to be in a certain layer (to avoid sorting on lights in realtime)
 
 public:
        // for now, meshes need to be in a certain layer (to avoid sorting on lights in realtime)
-       RAS_MeshObject(Mesh* mesh, int lightlayer);
+       RAS_MeshObject(Mesh* mesh);
        virtual ~RAS_MeshObject();
 
 
        virtual ~RAS_MeshObject();