From 9d9481b87a572a15ac4255c93e6b5afa3a285b41 Mon Sep 17 00:00:00 2001 From: Dander7BD Date: Wed, 12 Feb 2014 14:52:31 +0100 Subject: [PATCH] stuff --- Code/Game/DanBiasGame/DanBiasGame_Impl.cpp | 1 + Code/Game/DanBiasGame/GameClientState/MainState.cpp | 12 ------------ Code/Game/DanBiasGame/GameClientState/MainState.h | 1 - Code/GamePhysics/GamePhysics.vcxproj | 2 +- Code/Misc/EventHandler/EventHandler.cpp | 4 ++-- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Code/Game/DanBiasGame/DanBiasGame_Impl.cpp b/Code/Game/DanBiasGame/DanBiasGame_Impl.cpp index cf0f049f..137ae934 100644 --- a/Code/Game/DanBiasGame/DanBiasGame_Impl.cpp +++ b/Code/Game/DanBiasGame/DanBiasGame_Impl.cpp @@ -199,6 +199,7 @@ namespace DanBias data.networkClient.Disconnect(); delete data.inputObj; + Oyster::Event::EventHandler::Instance().Clean(); Oyster::Graphics::API::Clean(); GameServerAPI::ServerStop(); diff --git a/Code/Game/DanBiasGame/GameClientState/MainState.cpp b/Code/Game/DanBiasGame/GameClientState/MainState.cpp index cc5aaa29..6caa5d15 100644 --- a/Code/Game/DanBiasGame/GameClientState/MainState.cpp +++ b/Code/Game/DanBiasGame/GameClientState/MainState.cpp @@ -48,7 +48,6 @@ bool MainState::Init( NetworkClient* nwClient ) // load models LoadModels(L"UImodels.txt"); - InitCamera( Float3(0.0f, 0.0f, 5.4f) ); return true; } @@ -82,17 +81,6 @@ bool MainState::LoadModels(std::wstring file) return true; } -bool MainState::InitCamera(Float3 startPos) -{ - privData->proj = ProjectionMatrix_Perspective(pi/2,1024.0f/768.0f,.1f,1000); - //privData->proj = ProjectionMatrix_Orthographic(1024, 768, 1, 1000); - Oyster::Graphics::API::SetProjection(privData->proj); - - privData->view = OrientationMatrix_LookAtDirection(Float3(0,0,-1),Float3(0,1,0),startPos); - privData->view = InverseOrientationMatrix(privData->view); - return true; -} - GameClientState::ClientState MainState::Update(float deltaTime, InputClass* KeyInput) { // picking diff --git a/Code/Game/DanBiasGame/GameClientState/MainState.h b/Code/Game/DanBiasGame/GameClientState/MainState.h index 27dcd772..187fa3f5 100644 --- a/Code/Game/DanBiasGame/GameClientState/MainState.h +++ b/Code/Game/DanBiasGame/GameClientState/MainState.h @@ -19,7 +19,6 @@ namespace DanBias ~MainState(void); bool Init( Oyster::Network::NetworkClient* nwClient ); bool LoadModels(std::wstring file); - bool InitCamera(Oyster::Math::Float3 startPos); ClientState Update(float deltaTime, InputClass* KeyInput); bool Render(); diff --git a/Code/GamePhysics/GamePhysics.vcxproj b/Code/GamePhysics/GamePhysics.vcxproj index 84b16812..9b883bb3 100644 --- a/Code/GamePhysics/GamePhysics.vcxproj +++ b/Code/GamePhysics/GamePhysics.vcxproj @@ -97,7 +97,7 @@ true - %(AdditionalDependencies) + $(SolutionDir)Physics/lib/debug/BulletCollision_Debug.lib;$(SolutionDir)Physics/lib/debug/BulletDynamics_Debug.lib;$(SolutionDir)Physics/lib/debug/LinearMath_Debug.lib;%(AdditionalDependencies) diff --git a/Code/Misc/EventHandler/EventHandler.cpp b/Code/Misc/EventHandler/EventHandler.cpp index 4b623714..8642588f 100644 --- a/Code/Misc/EventHandler/EventHandler.cpp +++ b/Code/Misc/EventHandler/EventHandler.cpp @@ -23,7 +23,7 @@ EventHandler::~EventHandler() for(int i = 0; i < size; i++) { delete collections[i]; - collections[i] = NULL; + //collections[i] = NULL; } } @@ -33,7 +33,7 @@ void EventHandler::Clean() for(int i = 0; i < size; i++) { delete collections[i]; - collections[i] = NULL; + //collections[i] = NULL; } collections.clear(); }