BGE: Removing the source files for the PHY interfaces since they just contained virtu...
authorMitchell Stokes <mogurijin@gmail.com>
Sun, 24 Feb 2013 07:09:39 +0000 (07:09 +0000)
committerMitchell Stokes <mogurijin@gmail.com>
Sun, 24 Feb 2013 07:09:39 +0000 (07:09 +0000)
18 files changed:
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/CMakeLists.txt
source/gameengine/Physics/common/CMakeLists.txt [deleted file]
source/gameengine/Physics/common/PHY_IController.cpp [deleted file]
source/gameengine/Physics/common/PHY_IController.h
source/gameengine/Physics/common/PHY_IGraphicController.cpp [deleted file]
source/gameengine/Physics/common/PHY_IGraphicController.h
source/gameengine/Physics/common/PHY_IMotionState.cpp [deleted file]
source/gameengine/Physics/common/PHY_IMotionState.h
source/gameengine/Physics/common/PHY_IPhysicsController.cpp [deleted file]
source/gameengine/Physics/common/PHY_IPhysicsController.h
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp [deleted file]
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
source/gameengine/Physics/common/PHY_IVehicle.cpp [deleted file]
source/gameengine/Physics/common/PHY_IVehicle.h
source/gameengine/Physics/common/SConscript [deleted file]
source/gameengine/SConscript

index fb06c5e44775b01ea4bdf1dedb0f1ced1ffac7e7..5e65324d893a95561c9a2e2f722067556ffa0e3f 100644 (file)
@@ -103,7 +103,6 @@ endif()
                ge_logic_ketsji 
                ge_phys_bullet 
                ge_phys_dummy
-               ge_phys_common 
                ge_logic 
                ge_rasterizer 
                ge_oglrasterizer 
index 69bad2b8cce3d14dff84565a073ac1273c2ca06c..7409e23a1f4c8697dd08056f579b1f92e83d5ef1 100644 (file)
@@ -884,7 +884,6 @@ endif()
                extern_colamd
                ge_logic_ketsji
                extern_recastnavigation
-               ge_phys_common
                ge_logic
                ge_rasterizer
                ge_oglrasterizer
index aae7e93cc91061f5b022202368086aa396f4f1b1..cf7895e98ea5056685f89ee25c57c1bff20f6b52 100644 (file)
@@ -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 (file)
index 5e0e596..0000000
+++ /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 (file)
index 8568ffa..0000000
+++ /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()
-{
-
-}
-
index 77864b740bd548cce108404d0ac4e101364aa2fd..ae1b2d9ad5325f438e5695ef3a4b398f6ca86fa7 100644 (file)
@@ -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 (file)
index 0b8f89c..0000000
+++ /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()
-{
-
-}
-
index 8c38eebe2839448b06a524fb6bd337b8e32b4c6f..5f64e7ccc80904a80c6dbc2fe963705cada29b05 100644 (file)
@@ -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 (file)
index 1953e74..0000000
+++ /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()
-{
-
-}
index 61ed87362c03f9109ac1ccfa25e0f0ec6e9d7f71..be5b2b54907ef4e529651e9e97360ac215a375a7 100644 (file)
@@ -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 (file)
index 58b94df..0000000
+++ /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()
-{
-
-}
-
index e6f26bc5b1b0db90bd92976062c4ef406fe750b2..0bb6ca7fc775d45d4d38db6cef5fd7f95f004eb4 100644 (file)
@@ -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 (file)
index 110ffc7..0000000
+++ /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()
-{
-
-}
index e7560ea02cca820b5bf88f3340b83c7841ab7bd7..14904a70553cdc205b0d743fa980e0c98dd272f6 100644 (file)
@@ -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 (file)
index a60bb3e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/** \file gameengine/Physics/common/PHY_IVehicle.cpp
- *  \ingroup phys
- */
-
-#include "PHY_IVehicle.h"
-
-PHY_IVehicle::~PHY_IVehicle()
-{
-
-}
index 624f435c9f0b04ab5fb129a2c9d09732be03446e..1dcec69a335971b4aac8c7daa6951d0291fa63ca 100644 (file)
@@ -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 (file)
index aee5e44..0000000
+++ /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'])
index 3db973d9406b7b5795377d194ee266321df409e3..ae1bb756f8eaaa9ef9ce181355714136789f4298 100644 (file)
@@ -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',