diff options
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index f6ab9af261e..652ed2ab2dd 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -769,13 +769,6 @@ void KX_Scene::DupliGroupRecurse(CValue* obj, int level) // we can now add the graphic controller to the physic engine replica->ActivateGraphicController(true); - // set references for dupli-group - // groupobj holds a list of all objects, that belongs to this group - groupobj->AddInstanceObjects(replica); - - // every object gets the reference to its dupli-group object - replica->SetDupliGroupObject(groupobj); - // done with replica replica->Release(); } @@ -1024,20 +1017,6 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj) m_timemgr->RemoveTimeProperty(propval); } } - - // if the object is the dupligroup proxy, you have to cleanup all m_pDupliGroupObject's in all - // instances refering to this group - if(newobj->GetInstanceObjects()) { - for (int i = 0; i < newobj->GetInstanceObjects()->GetCount(); i++) { - KX_GameObject* instance = (KX_GameObject*)newobj->GetInstanceObjects()->GetValue(i); - instance->RemoveDupliGroupObject(); - } - } - - // if this object was part of a group, make sure to remove it from that group's instance list - KX_GameObject* group = newobj->GetDupliGroupObject(); - if (group) - group->RemoveInstanceObject(newobj); newobj->RemoveMeshes(); ret = 1; @@ -1502,15 +1481,7 @@ void KX_Scene::CalculateVisibleMeshes(RAS_IRasterizer* rasty,KX_Camera* cam, int planes[4].setValue(cplanes[2].getValue()); // top planes[5].setValue(cplanes[3].getValue()); // bottom CullingInfo info(layer); - - double mvmat[16] = {0}; - cam->GetModelviewMatrix().getValue(mvmat); - double pmat[16] = {0}; - cam->GetProjectionMatrix().getValue(pmat); - - dbvt_culling = m_physicsEnvironment->cullingTest(PhysicsCullingCallback,&info,planes,5,m_dbvt_occlusion_res, - KX_GetActiveEngine()->GetCanvas()->GetViewPort(), - mvmat, pmat); + dbvt_culling = m_physicsEnvironment->cullingTest(PhysicsCullingCallback,&info,planes,5,m_dbvt_occlusion_res); } if (!dbvt_culling) { // the physics engine couldn't help us, do it the hard way |