From d537bd679122d104e0f5b82985fa04ed7115d452 Mon Sep 17 00:00:00 2001 From: lanariel Date: Thu, 20 Feb 2014 09:23:09 +0100 Subject: [PATCH 1/3] Last release gfx fix --- Code/OysterGraphics/DllInterfaces/GFXAPI.cpp | 2 +- Code/OysterGraphics/DllInterfaces/GFXAPI.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp index 36cbfd54..23827e1d 100644 --- a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp +++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp @@ -224,7 +224,7 @@ namespace Oyster #else API::State API::ReloadShaders() { - + return API::State::Sucsess; } void API::StartRenderWireFrame() diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.h b/Code/OysterGraphics/DllInterfaces/GFXAPI.h index 71e12662..827f639f 100644 --- a/Code/OysterGraphics/DllInterfaces/GFXAPI.h +++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.h @@ -38,7 +38,7 @@ namespace Oyster typedef void* Texture; static State Init(HWND Window, bool MSAA_Quality, bool Fullscreen, Option options); -#ifdef _DEBUG + static State ReloadShaders(); //should be called after rendered normal models, before GUI or Text rendering @@ -51,7 +51,6 @@ namespace Oyster static void RenderDebugSphere(Math::Matrix world); static void StartRenderFullModel(); -#endif //! @todo Memory Leaks From 263eba782bb292d2fad6a6b71e11096e0ebbd45b Mon Sep 17 00:00:00 2001 From: Dander7BD Date: Thu, 20 Feb 2014 10:04:38 +0100 Subject: [PATCH 2/3] Found unmarked debug hack Naughty collegues --- Code/Game/GameClient/GameClientState/MainState.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Code/Game/GameClient/GameClientState/MainState.cpp b/Code/Game/GameClient/GameClientState/MainState.cpp index f34b9ad6..5b96b385 100644 --- a/Code/Game/GameClient/GameClientState/MainState.cpp +++ b/Code/Game/GameClient/GameClientState/MainState.cpp @@ -79,9 +79,10 @@ GameClientState::ClientState MainState::Update( float deltaTime ) { bool test = this->privData->input->IsMousePressed(); if(test) - { + { // HACK: debug trap still in use? int i = 0; }; + this->privData->input->GetMousePos( mouseState.x, mouseState.y ); mouseState.mouseButtonPressed = this->privData->input->IsMousePressed(); } From a78a4f70f16f531b3266f4d286490276c0bcc7c3 Mon Sep 17 00:00:00 2001 From: Dander7BD Date: Thu, 20 Feb 2014 11:12:53 +0100 Subject: [PATCH 3/3] Dan doing stuff --- Code/Game/GameClient/DanBiasGame_Impl.cpp | 3 ++- Code/Misc/Input/Include/ApplicationKeyboard.h | 22 +++++++++++++++++ .../Include/Win32/Win32ApplicationKeyboard.h | 24 +++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 Code/Misc/Input/Include/ApplicationKeyboard.h create mode 100644 Code/Misc/Input/Include/Win32/Win32ApplicationKeyboard.h diff --git a/Code/Game/GameClient/DanBiasGame_Impl.cpp b/Code/Game/GameClient/DanBiasGame_Impl.cpp index b0107a17..2a46b8d6 100644 --- a/Code/Game/GameClient/DanBiasGame_Impl.cpp +++ b/Code/Game/GameClient/DanBiasGame_Impl.cpp @@ -166,6 +166,7 @@ namespace DanBias DanBiasGame::Result DanBiasGame::Update(float deltaTime) { { // updating mouse input + // TODO: Is obosolete when Dennis's input system is wired in POINT mousePos; GetCursorPos( &mousePos ); @@ -179,7 +180,7 @@ namespace DanBias mouseNormalisedY /= (float)(windowVertex.bottom - windowVertex.top); data.inputObj.Update( mouseNormalisedX, mouseNormalisedY ); - } + } if( data.serverOwner ) { diff --git a/Code/Misc/Input/Include/ApplicationKeyboard.h b/Code/Misc/Input/Include/ApplicationKeyboard.h new file mode 100644 index 00000000..3e506e22 --- /dev/null +++ b/Code/Misc/Input/Include/ApplicationKeyboard.h @@ -0,0 +1,22 @@ +///////////////////////////////////////////////////////////////////// +// Created by [Dan Andersson] [2014] +///////////////////////////////////////////////////////////////////// +#ifndef INPUT_APPLICATION_KEBOARD_H +#define INPUT_APPLICATION_KEBOARD_H + +#include "InputObject.h" +#include + +namespace Input +{ + class AplicationKeyboard : public InputObject + { + public: + + protected: + AplicationKeyboard(); + ~AplicationKeyboard(); + }; +} + +#endif // !INPUT_KEBOARD_H diff --git a/Code/Misc/Input/Include/Win32/Win32ApplicationKeyboard.h b/Code/Misc/Input/Include/Win32/Win32ApplicationKeyboard.h new file mode 100644 index 00000000..f19f5940 --- /dev/null +++ b/Code/Misc/Input/Include/Win32/Win32ApplicationKeyboard.h @@ -0,0 +1,24 @@ +///////////////////////////////////////////////////////////////////// +// Created by [Dan Andersson] [2014] +///////////////////////////////////////////////////////////////////// +#ifndef INPUT_WIN32_APPLICATION_KEBOARD_H +#define INPUT_WIN32_APPLICATION_KEBOARD_H + +#include "..\ApplicationKeyboard.h" +//#include + +namespace Input +{ + class Win32ApplicationKeyboard :public AplicationKeyboard + { + public: + Win32ApplicationKeyboard(); + ~Win32ApplicationKeyboard(); + + + private: + + }; +} + +#endif // !INPUT_WIN32_APPLICATION_KEBOARD_H