diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 13:05:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 13:05:13 +0400 |
commit | 3eb8000eb429a97d20fb9d403eea43bffe04175f (patch) | |
tree | 3bfdc229bd505c540278f2eec1dc2cf32177f556 /source/gameengine/Ketsji | |
parent | 7301f33b26ccae263d0bfdde5f82d98a70790fd5 (diff) |
remove more unneeded args, also allow ipo to animate the ref value for KX_BlenderMaterial's
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 7 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.h | 3 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_ISceneConverter.h | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.h | 3 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PolygonMaterial.cpp | 3 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 3 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_RadarSensor.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_RadarSensor.h | 1 |
10 files changed, 9 insertions, 17 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index 30057fc039d..875f6ede452 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -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); } diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index b29f2df98db..9ca49c992eb 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -29,8 +29,7 @@ public: void Initialize( class KX_Scene* scene, BL_Material* mat, - bool skin, - int lightlayer + bool skin ); virtual ~KX_BlenderMaterial(); diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h index 5c2c0bc0ad2..45b3276e98c 100644 --- a/source/gameengine/Ketsji/KX_ISceneConverter.h +++ b/source/gameengine/Ketsji/KX_ISceneConverter.h @@ -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; diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index 20600be81fc..f485e2589f5 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -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); diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp index 44842b7f5b3..b71215645b4 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.cpp +++ b/source/gameengine/Ketsji/KX_NearSensor.cpp @@ -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) diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h index 63099e181a0..88292242a5d 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.h +++ b/source/gameengine/Ketsji/KX_NearSensor.h @@ -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); /* diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp index 506c167a905..63c1b17abc1 100644 --- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp +++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp @@ -88,8 +88,7 @@ void KX_PolygonMaterial::Initialize( mode, transp, alpha, - zsort, - lightlayer); + zsort); m_tface = tface; m_mcol = mcol; m_material = ma; diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 75b29481e54..fcada7bfce4 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -2139,3 +2139,6 @@ void resetGamePythonPath() { gp_GamePythonPathOrig[0] = '\0'; } + + + diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp index 064dc9126ac..76ecc235150 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.cpp +++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp @@ -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), diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h index 2e5a0e68bed..5eb57bdc3e0 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.h +++ b/source/gameengine/Ketsji/KX_RadarSensor.h @@ -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(); |