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

BGE cleanup: GPC_System was an empty class, so I'm dropping it and having GPG_System inherit directly from KX_ISystem.

Browse Source
This commit is contained in:
Mitchell Stokes
2013-07-09 01:18:48 +00:00
parent 7b8453b164
commit a6d26cb665
4 changed files with 2 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/gameengine/GamePlayer/common/CMakeLists.txt
View File

@@ -64,13 +64,11 @@ set(SRC
GPC_KeyboardDevice.cpp
GPC_MouseDevice.cpp
GPC_RenderTools.cpp
GPC_System.cpp
GPC_Canvas.h
GPC_KeyboardDevice.h
GPC_MouseDevice.h
GPC_RenderTools.h
GPC_System.h
)
add_definitions(-DGLEW_STATIC)

89
source/gameengine/GamePlayer/common/GPC_System.cpp
View File

@@ -1,89 +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/GamePlayer/common/GPC_System.cpp
* \ingroup player
*/
#include "GPC_System.h"
#include "GPC_KeyboardDevice.h"
#include "NG_NetworkDeviceInterface.h"
GPC_System::GPC_System()
// : m_ndi(0)
{
}
/*
void GPC_System::NextFrame()
{
// Have the imput devices proceed
std::vector<SCA_IInputDevice*>::iterator idev;
for (idev = m_inputDevices.begin(); !(idev == m_inputDevices.end()); idev++) {
(*idev)->NextFrame();
}
// Have the network device proceed
if (m_ndi) {
m_ndi->NextFrame();
}
}
void GPC_System::StartMainLoop()
{
}
void GPC_System::Sleep(int millisec)
{
// do nothing for now ;)
}
void GPC_System::AddKey(unsigned char key, bool down)
{
GPC_KeyboardDevice* keydev = (GPC_KeyboardDevice*) this->GetKeyboardDevice();
if (keydev) {
//SCA_IInputDevice::KX_EnumInputs inp = keydev->ToNative(key);
keydev->ConvertEvent(key, down);
}
}
void GPC_System::SetNetworkDevice(NG_NetworkDeviceInterface* ndi)
{
m_ndi = ndi;
}
NG_NetworkDeviceInterface* GPC_System::GetNetworkDevice() const
{
return m_ndi;
}
*/

62
source/gameengine/GamePlayer/common/GPC_System.h
View File

@@ -1,62 +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 GPC_System.h
* \ingroup player
*/
#ifndef __GPC_SYSTEM_H__
#define __GPC_SYSTEM_H__
#if defined(WIN32)
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#endif /* WIN32 */
#include "KX_ISystem.h"
//class NG_NetworkDeviceInterface;
class GPC_System : public KX_ISystem
{
public:
GPC_System();
// virtual void NextFrame();
// virtual void StartMainLoop();
virtual double GetTimeInSeconds() = 0;
// virtual void Sleep(int millisec);
//virtual bool IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode);
// void AddKey(unsigned char key, bool down);
// virtual void SetNetworkDevice(NG_NetworkDeviceInterface* ndi);
// virtual NG_NetworkDeviceInterface* GetNetworkDevice() const;
//protected:
// NG_NetworkDeviceInterface* m_ndi;
};
#endif /* __GPC_SYSTEM_H__ */

4
source/gameengine/GamePlayer/ghost/GPG_System.h
View File

@@ -37,11 +37,11 @@
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#endif /* WIN32 */
#include "GPC_System.h"
#include "KX_ISystem.h"
class GHOST_ISystem;
class GPG_System : public GPC_System
class GPG_System : public KX_ISystem
{
GHOST_ISystem* m_system;