[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52461] trunk/blender: BGE: KX_PhysicsObjectWrapper was not being used anywhere in the code base, but it was being maintained (style, docs, name changes, etc), so I' m removing it.
Mitchell Stokes
mogurijin at gmail.com
Thu Nov 22 08:08:03 CET 2012
Revision: 52461
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52461
Author: moguri
Date: 2012-11-22 07:08:02 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
BGE: KX_PhysicsObjectWrapper was not being used anywhere in the code base, but it was being maintained (style, docs, name changes, etc), so I'm removing it.
Modified Paths:
--------------
trunk/blender/doc/python_api/rst/bge.types.rst
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
Removed Paths:
-------------
trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
Modified: trunk/blender/doc/python_api/rst/bge.types.rst
===================================================================
--- trunk/blender/doc/python_api/rst/bge.types.rst 2012-11-22 06:11:05 UTC (rev 52460)
+++ trunk/blender/doc/python_api/rst/bge.types.rst 2012-11-22 07:08:02 UTC (rev 52461)
@@ -2373,49 +2373,6 @@
:type: boolean
-.. class:: KX_PhysicsObjectWrapper(PyObjectPlus)
-
- KX_PhysicsObjectWrapper
-
- .. method:: setActive(active)
-
- Set the object to be active.
-
- :arg active: set to True to be active
- :type active: boolean
-
- .. method:: setAngularVelocity(x, y, z, local)
-
- Set the angular velocity of the object.
-
- :arg x: angular velocity for the x-axis
- :type x: float
-
- :arg y: angular velocity for the y-axis
- :type y: float
-
- :arg z: angular velocity for the z-axis
- :type z: float
-
- :arg local: set to True for local axis
- :type local: boolean
-
- .. method:: setLinearVelocity(x, y, z, local)
-
- Set the linear velocity of the object.
-
- :arg x: linear velocity for the x-axis
- :type x: float
-
- :arg y: linear velocity for the y-axis
- :type y: float
-
- :arg z: linear velocity for the z-axis
- :type z: float
-
- :arg local: set to True for local axis
- :type local: boolean
-
.. class:: KX_PolyProxy(SCA_IObject)
A polygon holds the index of the vertex forming the poylgon.
Modified: trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2012-11-22 06:11:05 UTC (rev 52460)
+++ trunk/blender/source/gameengine/Ketsji/CMakeLists.txt 2012-11-22 07:08:02 UTC (rev 52461)
@@ -101,7 +101,6 @@
KX_ObstacleSimulation.cpp
KX_OrientationInterpolator.cpp
KX_ParentActuator.cpp
- KX_PhysicsObjectWrapper.cpp
KX_PolyProxy.cpp
KX_PolygonMaterial.cpp
KX_PositionInterpolator.cpp
@@ -184,7 +183,6 @@
KX_OrientationInterpolator.h
KX_ParentActuator.h
KX_PhysicsEngineEnums.h
- KX_PhysicsObjectWrapper.h
KX_PhysicsPropertiesobsolete.h
KX_PolyProxy.h
KX_PolygonMaterial.h
Deleted: trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp 2012-11-22 06:11:05 UTC (rev 52460)
+++ trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp 2012-11-22 07:08:02 UTC (rev 52461)
@@ -1,145 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
- * \ingroup ketsji
- */
-
-
-#include "PyObjectPlus.h"
-
-#include "KX_PhysicsObjectWrapper.h"
-#include "PHY_IPhysicsEnvironment.h"
-#include "PHY_IPhysicsController.h"
-
-KX_PhysicsObjectWrapper::KX_PhysicsObjectWrapper(
- PHY_IPhysicsController* ctrl,
- PHY_IPhysicsEnvironment* physenv) :
- PyObjectPlus(),
- m_ctrl(ctrl),
- m_physenv(physenv)
-{
-}
-
-KX_PhysicsObjectWrapper::~KX_PhysicsObjectWrapper()
-{
-}
-
-#ifdef WITH_PYTHON
-
-PyObject *KX_PhysicsObjectWrapper::PySetPosition(PyObject *args)
-{
- float x,y,z;
- if (PyArg_ParseTuple(args,"fff:setPosition",&x,&y,&z))
- {
- m_ctrl->setPosition(x,y,z);
- }
- else {
- return NULL;
- }
- Py_RETURN_NONE;
-}
-
-
-PyObject *KX_PhysicsObjectWrapper::PySetLinearVelocity(PyObject *args)
-{
- float x,y,z;
- int local;
- if (PyArg_ParseTuple(args,"fffi:setLinearVelocity",&x,&y,&z,&local))
- {
- m_ctrl->SetLinearVelocity(x,y,z,local != 0);
- }
- else {
- return NULL;
- }
- Py_RETURN_NONE;
-}
-
-PyObject *KX_PhysicsObjectWrapper::PySetAngularVelocity(PyObject *args)
-{
- float x,y,z;
- int local;
- if (PyArg_ParseTuple(args,"fffi:setAngularVelocity",&x,&y,&z,&local))
- {
- m_ctrl->SetAngularVelocity(x,y,z,local != 0);
- }
- else {
- return NULL;
- }
- Py_RETURN_NONE;
-}
-
-PyObject* KX_PhysicsObjectWrapper::PySetActive(PyObject *args)
-{
- int active;
- if (PyArg_ParseTuple(args,"i:setActive",&active))
- {
- m_ctrl->SetActive(active!=0);
- }
- else {
- return NULL;
- }
- Py_RETURN_NONE;
-}
-
-
-PyAttributeDef KX_PhysicsObjectWrapper::Attributes[] = {
- { NULL } //Sentinel
-};
-
-//python specific stuff
-PyTypeObject KX_PhysicsObjectWrapper::Type = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "KX_PhysicsObjectWrapper",
- sizeof(PyObjectPlus_Proxy),
- 0,
- py_base_dealloc,
- 0,
- 0,
- 0,
- 0,
- py_base_repr,
- 0,0,0,0,0,0,0,0,0,
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
- 0,0,0,0,0,0,0,
- Methods,
- 0,
- 0,
- &PyObjectPlus::Type,
- 0,0,0,0,0,0,
- py_base_new
-};
-
-PyMethodDef KX_PhysicsObjectWrapper::Methods[] = {
- {"setPosition",(PyCFunction) KX_PhysicsObjectWrapper::sPySetPosition, METH_VARARGS},
- {"setLinearVelocity",(PyCFunction) KX_PhysicsObjectWrapper::sPySetLinearVelocity, METH_VARARGS},
- {"setAngularVelocity",(PyCFunction) KX_PhysicsObjectWrapper::sPySetAngularVelocity, METH_VARARGS},
- {"setActive",(PyCFunction) KX_PhysicsObjectWrapper::sPySetActive, METH_VARARGS},
- {NULL,NULL} //Sentinel
-};
-
-#endif
Deleted: trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h 2012-11-22 06:11:05 UTC (rev 52460)
+++ trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h 2012-11-22 07:08:02 UTC (rev 52461)
@@ -1,59 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file KX_PhysicsObjectWrapper.h
- * \ingroup ketsji
- */
-
-#ifndef __KX_PHYSICSOBJECTWRAPPER_H__
-#define __KX_PHYSICSOBJECTWRAPPER_H__
-
-#include "Value.h"
-#include "PHY_DynamicTypes.h"
-
-class KX_PhysicsObjectWrapper : public PyObjectPlus
-{
- Py_Header
-public:
- KX_PhysicsObjectWrapper(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsEnvironment* physenv);
- virtual ~KX_PhysicsObjectWrapper();
-
-#ifdef WITH_PYTHON
-
- KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetPosition);
- KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetLinearVelocity);
- KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetAngularVelocity);
- KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetActive);
-
-#endif /* WITH_PYTHON */
-
-private:
- class PHY_IPhysicsController* m_ctrl;
- PHY_IPhysicsEnvironment* m_physenv;
-};
-
-#endif /* __KX_PHYSICSOBJECTWRAPPER_H__ */
Modified: trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp 2012-11-22 06:11:05 UTC (rev 52460)
+++ trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp 2012-11-22 07:08:02 UTC (rev 52461)
@@ -34,7 +34,6 @@
#include "KX_ConstraintWrapper.h"
#include "KX_VehicleWrapper.h"
#include "KX_CharacterWrapper.h"
-#include "KX_PhysicsObjectWrapper.h"
#include "PHY_IPhysicsController.h"
#include "PHY_IVehicle.h"
#include "PHY_DynamicTypes.h"
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp 2012-11-22 06:11:05 UTC (rev 52460)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp 2012-11-22 07:08:02 UTC (rev 52461)
@@ -55,7 +55,6 @@
#include "KX_NetworkMessageSensor.h"
#include "KX_ObjectActuator.h"
#include "KX_ParentActuator.h"
-#include "KX_PhysicsObjectWrapper.h"
#include "KX_PolyProxy.h"
#include "KX_PolygonMaterial.h"
#include "KX_PythonSeq.h"
@@ -208,7 +207,6 @@
PyType_Ready_Attr(dict, KX_NetworkMessageSensor, init_getset);
PyType_Ready_Attr(dict, KX_ObjectActuator, init_getset);
PyType_Ready_Attr(dict, KX_ParentActuator, init_getset);
- PyType_Ready_Attr(dict, KX_PhysicsObjectWrapper, init_getset);
PyType_Ready_Attr(dict, KX_PolyProxy, init_getset);
PyType_Ready_Attr(dict, KX_PolygonMaterial, init_getset);
PyType_Ready_Attr(dict, KX_RadarSensor, init_getset);
More information about the Bf-blender-cvs
mailing list