diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-09 04:59:57 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-09 04:59:57 +0400 |
commit | 5bcc621fbfc4c6ff5a2fb14c54216446824c8224 (patch) | |
tree | 79b6ea7cf33c5dbabf0cc0497503a4bab0e62594 /source/gameengine | |
parent | 615edbe57b67e898b8fe18ffd5621bee99a44a3d (diff) |
BGE cleanup: removing an unused KX_PhysicsPropertiesobsolute.h file.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h | 61 |
2 files changed, 1 insertions, 62 deletions
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 3baa72eb3c8..10d4f9e8cb5 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -185,7 +185,7 @@ set(SRC KX_OrientationInterpolator.h KX_ParentActuator.h KX_PhysicsEngineEnums.h - KX_PhysicsPropertiesobsolete.h + #KX_PhysicsPropertiesobsolete.h KX_PolyProxy.h KX_PolygonMaterial.h KX_PositionInterpolator.h diff --git a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h b/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h deleted file mode 100644 index ee685edb9c1..00000000000 --- a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h +++ /dev/null @@ -1,61 +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_PhysicsPropertiesobsolete.h - * \ingroup ketsji - * \todo check if this file is still needed - */ - -#ifndef __KX_PHYSICSPROPERTIESOBSOLETE_H__ -#define __KX_PHYSICSPROPERTIESOBSOLETE_H__ - -#include <MT_Scalar.h> - -// Properties of dynamic objects -struct KX_ShapeProps { - MT_Scalar m_mass; // Total mass - MT_Scalar m_inertia; // Inertia, should be a tensor some time - MT_Scalar m_lin_drag; // Linear drag (air, water) 0 = concrete, 1 = vacuum - MT_Scalar m_ang_drag; // Angular drag - MT_Scalar m_friction_scaling[3]; // Scaling for anisotropic friction. Component in range [0, 1] - bool m_do_anisotropic; // Should I do anisotropic friction? - bool m_do_fh; // Should the object have a linear Fh spring? - bool m_do_rot_fh; // Should the object have an angular Fh spring? -}; - - -// Properties of collidable objects (non-ghost objects) -struct KX_MaterialProps { - MT_Scalar m_restitution; // restitution of energie after a collision 0 = inelastic, 1 = elastic - MT_Scalar m_friction; // Coulomb friction (= ratio between the normal en maximum friction force) - MT_Scalar m_fh_spring; // Spring constant (both linear and angular) - MT_Scalar m_fh_damping; // Damping factor (linear and angular) in range [0, 1] - MT_Scalar m_fh_distance; // The range above the surface where Fh is active. - bool m_fh_normal; // Should the object slide off slopes? -}; - -#endif /* __KX_PHYSICSPROPERTIESOBSOLETE_H__ */ |