Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2013-07-09 05:18:48 +0400
committerMitchell Stokes <mogurijin@gmail.com>2013-07-09 05:18:48 +0400
commita6d26cb6655064b0f58a233799fead3943c9c301 (patch)
tree2cd6ec7a8ca93da7101467533a54d45fff265788 /source/gameengine/GamePlayer/common
parent7b8453b164944e4b71e07a5a41b659e405611236 (diff)
BGE cleanup: GPC_System was an empty class, so I'm dropping it and having GPG_System inherit directly from KX_ISystem.
Diffstat (limited to 'source/gameengine/GamePlayer/common')
-rw-r--r--source/gameengine/GamePlayer/common/CMakeLists.txt2
-rw-r--r--source/gameengine/GamePlayer/common/GPC_System.cpp89
-rw-r--r--source/gameengine/GamePlayer/common/GPC_System.h62
3 files changed, 0 insertions, 153 deletions
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index 956a6560a72..72f3e60b4a2 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -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)
diff --git a/source/gameengine/GamePlayer/common/GPC_System.cpp b/source/gameengine/GamePlayer/common/GPC_System.cpp
deleted file mode 100644
index 2c99c99114e..00000000000
--- a/source/gameengine/GamePlayer/common/GPC_System.cpp
+++ /dev/null
@@ -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;
-}
-*/
diff --git a/source/gameengine/GamePlayer/common/GPC_System.h b/source/gameengine/GamePlayer/common/GPC_System.h
deleted file mode 100644
index 4169064179e..00000000000
--- a/source/gameengine/GamePlayer/common/GPC_System.h
+++ /dev/null
@@ -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__ */