From ed1d215cea840048cd023d9640c4bcc94db2eaa7 Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Sun, 24 Feb 2013 07:09:39 +0000 Subject: BGE: Removing the source files for the PHY interfaces since they just contained virtual destructors. This means we had license and doc blocks for 3 lines of code, which seemed silly. This also means that ge_phys_common no longer needs to be built as a library. I tested this with CMake and SCons using GCC; hopefully this doesn't break other systems. --- source/blenderplayer/CMakeLists.txt | 1 - source/creator/CMakeLists.txt | 1 - source/gameengine/CMakeLists.txt | 1 - source/gameengine/Physics/common/CMakeLists.txt | 55 ---------------------- .../gameengine/Physics/common/PHY_IController.cpp | 38 --------------- source/gameengine/Physics/common/PHY_IController.h | 2 +- .../Physics/common/PHY_IGraphicController.cpp | 38 --------------- .../Physics/common/PHY_IGraphicController.h | 1 - .../gameengine/Physics/common/PHY_IMotionState.cpp | 37 --------------- .../gameengine/Physics/common/PHY_IMotionState.h | 2 +- .../Physics/common/PHY_IPhysicsController.cpp | 38 --------------- .../Physics/common/PHY_IPhysicsController.h | 1 - .../Physics/common/PHY_IPhysicsEnvironment.cpp | 46 ------------------ .../Physics/common/PHY_IPhysicsEnvironment.h | 2 +- source/gameengine/Physics/common/PHY_IVehicle.cpp | 10 ---- source/gameengine/Physics/common/PHY_IVehicle.h | 2 +- source/gameengine/Physics/common/SConscript | 40 ---------------- source/gameengine/SConscript | 1 - 18 files changed, 4 insertions(+), 312 deletions(-) delete mode 100644 source/gameengine/Physics/common/CMakeLists.txt delete mode 100644 source/gameengine/Physics/common/PHY_IController.cpp delete mode 100644 source/gameengine/Physics/common/PHY_IGraphicController.cpp delete mode 100644 source/gameengine/Physics/common/PHY_IMotionState.cpp delete mode 100644 source/gameengine/Physics/common/PHY_IPhysicsController.cpp delete mode 100644 source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp delete mode 100644 source/gameengine/Physics/common/PHY_IVehicle.cpp delete mode 100644 source/gameengine/Physics/common/SConscript diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index fb06c5e4477..5e65324d893 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -103,7 +103,6 @@ endif() ge_logic_ketsji ge_phys_bullet ge_phys_dummy - ge_phys_common ge_logic ge_rasterizer ge_oglrasterizer diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 69bad2b8cce..7409e23a1f4 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -884,7 +884,6 @@ endif() extern_colamd ge_logic_ketsji extern_recastnavigation - ge_phys_common ge_logic ge_rasterizer ge_oglrasterizer diff --git a/source/gameengine/CMakeLists.txt b/source/gameengine/CMakeLists.txt index aae7e93cc91..cf7895e98ea 100644 --- a/source/gameengine/CMakeLists.txt +++ b/source/gameengine/CMakeLists.txt @@ -37,7 +37,6 @@ add_subdirectory(Ketsji) add_subdirectory(Ketsji/KXNetwork) add_subdirectory(Network) add_subdirectory(Network/LoopBackNetwork) -add_subdirectory(Physics/common) add_subdirectory(Physics/Dummy) add_subdirectory(Rasterizer) add_subdirectory(Rasterizer/RAS_OpenGLRasterizer) diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt deleted file mode 100644 index 5e0e5964ca0..00000000000 --- a/source/gameengine/Physics/common/CMakeLists.txt +++ /dev/null @@ -1,55 +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) 2006, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# -# ***** END GPL LICENSE BLOCK ***** - -set(INC - . - ../Dummy - ../../../../intern/moto/include -) - -set(INC_SYS - -) - -set(SRC - PHY_IMotionState.cpp - PHY_IController.cpp - PHY_IPhysicsController.cpp - PHY_IGraphicController.cpp - PHY_IPhysicsEnvironment.cpp - PHY_IVehicle.cpp - - PHY_DynamicTypes.h - PHY_ICharacter.h - PHY_IController.h - PHY_IGraphicController.h - PHY_IMotionState.h - PHY_IPhysicsController.h - PHY_IPhysicsEnvironment.h - PHY_IVehicle.h - PHY_Pro.h -) - -blender_add_lib(ge_phys_common "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/gameengine/Physics/common/PHY_IController.cpp b/source/gameengine/Physics/common/PHY_IController.cpp deleted file mode 100644 index 8568ffa74e6..00000000000 --- a/source/gameengine/Physics/common/PHY_IController.cpp +++ /dev/null @@ -1,38 +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/Physics/common/PHY_IController.cpp - * \ingroup phys - */ - -#include "PHY_IController.h" - -PHY_IController::~PHY_IController() -{ - -} - diff --git a/source/gameengine/Physics/common/PHY_IController.h b/source/gameengine/Physics/common/PHY_IController.h index 77864b740bd..ae1b2d9ad53 100644 --- a/source/gameengine/Physics/common/PHY_IController.h +++ b/source/gameengine/Physics/common/PHY_IController.h @@ -48,7 +48,7 @@ class PHY_IPhysicsEnvironment; class PHY_IController { public: - virtual ~PHY_IController(); + virtual ~PHY_IController(){}; // clientinfo for raycasts for example virtual void* getNewClientInfo()=0; virtual void setNewClientInfo(void* clientinfo)=0; diff --git a/source/gameengine/Physics/common/PHY_IGraphicController.cpp b/source/gameengine/Physics/common/PHY_IGraphicController.cpp deleted file mode 100644 index 0b8f89ceed2..00000000000 --- a/source/gameengine/Physics/common/PHY_IGraphicController.cpp +++ /dev/null @@ -1,38 +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/Physics/common/PHY_IGraphicController.cpp - * \ingroup phys - */ - -#include "PHY_IGraphicController.h" - -PHY_IGraphicController::~PHY_IGraphicController() -{ - -} - diff --git a/source/gameengine/Physics/common/PHY_IGraphicController.h b/source/gameengine/Physics/common/PHY_IGraphicController.h index 8c38eebe283..5f64e7ccc80 100644 --- a/source/gameengine/Physics/common/PHY_IGraphicController.h +++ b/source/gameengine/Physics/common/PHY_IGraphicController.h @@ -42,7 +42,6 @@ class PHY_IGraphicController : public PHY_IController { public: - virtual ~PHY_IGraphicController(); /** * SynchronizeMotionStates ynchronizes dynas, kinematic and deformable entities (and do 'late binding') */ diff --git a/source/gameengine/Physics/common/PHY_IMotionState.cpp b/source/gameengine/Physics/common/PHY_IMotionState.cpp deleted file mode 100644 index 1953e748bc0..00000000000 --- a/source/gameengine/Physics/common/PHY_IMotionState.cpp +++ /dev/null @@ -1,37 +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/Physics/common/PHY_IMotionState.cpp - * \ingroup phys - */ - -#include "PHY_IMotionState.h" - -PHY_IMotionState::~PHY_IMotionState() -{ - -} diff --git a/source/gameengine/Physics/common/PHY_IMotionState.h b/source/gameengine/Physics/common/PHY_IMotionState.h index 61ed87362c0..be5b2b54907 100644 --- a/source/gameengine/Physics/common/PHY_IMotionState.h +++ b/source/gameengine/Physics/common/PHY_IMotionState.h @@ -44,7 +44,7 @@ class PHY_IMotionState { public: - virtual ~PHY_IMotionState(); + virtual ~PHY_IMotionState(){}; virtual void getWorldPosition(float& posX,float& posY,float& posZ)=0; virtual void getWorldScaling(float& scaleX,float& scaleY,float& scaleZ)=0; diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.cpp b/source/gameengine/Physics/common/PHY_IPhysicsController.cpp deleted file mode 100644 index 58b94df6221..00000000000 --- a/source/gameengine/Physics/common/PHY_IPhysicsController.cpp +++ /dev/null @@ -1,38 +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/Physics/common/PHY_IPhysicsController.cpp - * \ingroup phys - */ - -#include "PHY_IPhysicsController.h" - -PHY_IPhysicsController::~PHY_IPhysicsController() -{ - -} - diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h index e6f26bc5b1b..0bb6ca7fc77 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsController.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h @@ -45,7 +45,6 @@ class PHY_IPhysicsController : public PHY_IController { public: - virtual ~PHY_IPhysicsController(); /** * SynchronizeMotionStates ynchronizes dynas, kinematic and deformable entities (and do 'late binding') */ diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp deleted file mode 100644 index 110ffc705fe..00000000000 --- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp +++ /dev/null @@ -1,46 +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/Physics/common/PHY_IPhysicsEnvironment.cpp - * \ingroup phys - */ - - -#include "PHY_IPhysicsEnvironment.h" - -/** - * Physics Environment takes care of stepping the simulation and is a container for physics entities - * (rigidbodies,constraints, materials etc.) - * A derived class may be able to 'construct' entities by loading and/or converting - */ - - - -PHY_IPhysicsEnvironment::~PHY_IPhysicsEnvironment() -{ - -} diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h index e7560ea02cc..14904a70553 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h @@ -105,7 +105,7 @@ public: class PHY_IPhysicsEnvironment { public: - virtual ~PHY_IPhysicsEnvironment(); + virtual ~PHY_IPhysicsEnvironment(){}; virtual void beginFrame() = 0; virtual void endFrame() = 0; /// Perform an integration step of duration 'timeStep'. diff --git a/source/gameengine/Physics/common/PHY_IVehicle.cpp b/source/gameengine/Physics/common/PHY_IVehicle.cpp deleted file mode 100644 index a60bb3e596d..00000000000 --- a/source/gameengine/Physics/common/PHY_IVehicle.cpp +++ /dev/null @@ -1,10 +0,0 @@ -/** \file gameengine/Physics/common/PHY_IVehicle.cpp - * \ingroup phys - */ - -#include "PHY_IVehicle.h" - -PHY_IVehicle::~PHY_IVehicle() -{ - -} diff --git a/source/gameengine/Physics/common/PHY_IVehicle.h b/source/gameengine/Physics/common/PHY_IVehicle.h index 624f435c9f0..1dcec69a335 100644 --- a/source/gameengine/Physics/common/PHY_IVehicle.h +++ b/source/gameengine/Physics/common/PHY_IVehicle.h @@ -18,7 +18,7 @@ class PHY_IMotionState; class PHY_IVehicle { public: - virtual ~PHY_IVehicle(); + virtual ~PHY_IVehicle(){}; virtual void AddWheel( PHY_IMotionState* motionState, diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript deleted file mode 100644 index aee5e444079..00000000000 --- a/source/gameengine/Physics/common/SConscript +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python -# -# ***** 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) 2006, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Nathan Letwory. -# -# ***** END GPL LICENSE BLOCK ***** - -Import ('env') - -sources = 'PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp PHY_IGraphicController.cpp PHY_IPhysicsEnvironment.cpp PHY_IVehicle.cpp' - -incs = '. ../Dummy #intern/moto/include' - -defs = [] - -if env['WITH_BF_CXX_GUARDEDALLOC']: - defs.append('WITH_CXX_GUARDEDALLOC') - incs += ' #intern/guardedalloc' - -env.BlenderLib ( 'ge_phys_common', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[360,55], cxx_compileflags=env['BGE_CXXFLAGS']) diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript index 3db973d9406..ae1bb756f8e 100644 --- a/source/gameengine/SConscript +++ b/source/gameengine/SConscript @@ -35,7 +35,6 @@ SConscript(['BlenderRoutines/SConscript', 'Ketsji/KXNetwork/SConscript', 'Network/SConscript', 'Network/LoopBackNetwork/SConscript', - 'Physics/common/SConscript', 'Physics/Dummy/SConscript', 'Rasterizer/SConscript', 'Rasterizer/RAS_OpenGLRasterizer/SConscript', -- cgit v1.2.3