Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Mitchell Stokes
2013-02-24 07:09:39 +00:00
parent 630a31a900
commit ed1d215cea
18 changed files with 4 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blenderplayer/CMakeLists.txt
View File

@@ -103,7 +103,6 @@ endif()
ge_logic_ketsji
ge_phys_bullet
ge_phys_dummy
ge_phys_common
ge_logic
ge_rasterizer
ge_oglrasterizer

1
source/creator/CMakeLists.txt
View File

@@ -884,7 +884,6 @@ endif()
extern_colamd
ge_logic_ketsji
extern_recastnavigation
ge_phys_common
ge_logic
ge_rasterizer
ge_oglrasterizer

1
source/gameengine/CMakeLists.txt
View 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)

55
source/gameengine/Physics/common/CMakeLists.txt
View File

@@ -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}")

38
source/gameengine/Physics/common/PHY_IController.cpp
View File

@@ -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()
{
}

2
source/gameengine/Physics/common/PHY_IController.h
View 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;

38
source/gameengine/Physics/common/PHY_IGraphicController.cpp
View File

@@ -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()
{
}

1
source/gameengine/Physics/common/PHY_IGraphicController.h
View 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')
*/

37
source/gameengine/Physics/common/PHY_IMotionState.cpp
View File

@@ -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()
{
}

2
source/gameengine/Physics/common/PHY_IMotionState.h
View 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;

38
source/gameengine/Physics/common/PHY_IPhysicsController.cpp
View File

@@ -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()
{
}

1
source/gameengine/Physics/common/PHY_IPhysicsController.h
View 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')
*/

46
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp
View File

@@ -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()
{
}

2
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
View 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'.

10
source/gameengine/Physics/common/PHY_IVehicle.cpp
View File

@@ -1,10 +0,0 @@
/** \file gameengine/Physics/common/PHY_IVehicle.cpp
* \ingroup phys
*/
#include "PHY_IVehicle.h"
PHY_IVehicle::~PHY_IVehicle()
{
}

2
source/gameengine/Physics/common/PHY_IVehicle.h
View File

@@ -18,7 +18,7 @@ class PHY_IMotionState;
class PHY_IVehicle
{
public:
virtual ~PHY_IVehicle();
virtual ~PHY_IVehicle(){};
virtual void AddWheel(
PHY_IMotionState* motionState,

40
source/gameengine/Physics/common/SConscript
View File

@@ -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'])

1
source/gameengine/SConscript
View 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',