[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58100] branches/ge_dev/source/gameengine/ GamePlayer: BGE cleanup: GPC_System was an empty class, so I' m dropping it and having GPG_System inherit directly from KX_ISystem.

[Mitchell Stokes]

Revision: 58100
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58100
Author:   moguri
Date:     2013-07-09 01:18:48 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
BGE cleanup: GPC_System was an empty class, so I'm dropping it and having GPG_System inherit directly from KX_ISystem.

Modified Paths:
--------------
    branches/ge_dev/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/ge_dev/source/gameengine/GamePlayer/ghost/GPG_System.h

Removed Paths:
-------------
    branches/ge_dev/source/gameengine/GamePlayer/common/GPC_System.cpp
    branches/ge_dev/source/gameengine/GamePlayer/common/GPC_System.h

Modified: branches/ge_dev/source/gameengine/GamePlayer/common/CMakeLists.txt
===================================================================
--- branches/ge_dev/source/gameengine/GamePlayer/common/CMakeLists.txt	2013-07-09 01:18:15 UTC (rev 58099)
+++ branches/ge_dev/source/gameengine/GamePlayer/common/CMakeLists.txt	2013-07-09 01:18:48 UTC (rev 58100)
@@ -64,13 +64,11 @@
 	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)

Deleted: branches/ge_dev/source/gameengine/GamePlayer/common/GPC_System.cpp
===================================================================
--- branches/ge_dev/source/gameengine/GamePlayer/common/GPC_System.cpp	2013-07-09 01:18:15 UTC (rev 58099)
+++ branches/ge_dev/source/gameengine/GamePlayer/common/GPC_System.cpp	2013-07-09 01:18:48 UTC (rev 58100)
@@ -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;
-}
-*/

Deleted: branches/ge_dev/source/gameengine/GamePlayer/common/GPC_System.h
===================================================================
--- branches/ge_dev/source/gameengine/GamePlayer/common/GPC_System.h	2013-07-09 01:18:15 UTC (rev 58099)
+++ branches/ge_dev/source/gameengine/GamePlayer/common/GPC_System.h	2013-07-09 01:18:48 UTC (rev 58100)
@@ -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__ */

Modified: branches/ge_dev/source/gameengine/GamePlayer/ghost/GPG_System.h
===================================================================
--- branches/ge_dev/source/gameengine/GamePlayer/ghost/GPG_System.h	2013-07-09 01:18:15 UTC (rev 58099)
+++ branches/ge_dev/source/gameengine/GamePlayer/ghost/GPG_System.h	2013-07-09 01:18:48 UTC (rev 58100)
@@ -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;