NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Camera' of https://github.com/dean11/Danbias into Camera

This commit is contained in:
lanariel 2014-02-12 15:02:57 +01:00
parent 20c4833126 9d9481b87a
commit 492205b24a
5 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
View File

@ -201,6 +201,7 @@ namespace DanBias
data.networkClient.Disconnect(); data.networkClient.Disconnect();
delete data.inputObj; delete data.inputObj;
Oyster::Event::EventHandler::Instance().Clean();
Oyster::Graphics::API::Clean(); Oyster::Graphics::API::Clean();
GameServerAPI::ServerStop(); GameServerAPI::ServerStop();

12
Code/Game/DanBiasGame/GameClientState/MainState.cpp
View File

@ -48,7 +48,6 @@ bool MainState::Init( NetworkClient* nwClient )
// load models // load models
LoadModels(L"UImodels.txt"); LoadModels(L"UImodels.txt");
InitCamera( Float3(0.0f, 0.0f, 5.4f) );
return true; return true;
} }
@ -82,17 +81,6 @@ bool MainState::LoadModels(std::wstring file)
return true; 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) GameClientState::ClientState MainState::Update(float deltaTime, InputClass* KeyInput)
{ {
// picking // picking

1
Code/Game/DanBiasGame/GameClientState/MainState.h
View File

@ -19,7 +19,6 @@ namespace DanBias
~MainState(void); ~MainState(void);
bool Init( Oyster::Network::NetworkClient* nwClient ); bool Init( Oyster::Network::NetworkClient* nwClient );
bool LoadModels(std::wstring file); bool LoadModels(std::wstring file);
bool InitCamera(Oyster::Math::Float3 startPos);
ClientState Update(float deltaTime, InputClass* KeyInput); ClientState Update(float deltaTime, InputClass* KeyInput);
bool Render(); bool Render();

2
Code/GamePhysics/GamePhysics.vcxproj
View File

@ -97,7 +97,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile> <ModuleDefinitionFile>
</ModuleDefinitionFile> </ModuleDefinitionFile>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>$(SolutionDir)Physics/lib/debug/BulletCollision_Debug.lib;$(SolutionDir)Physics/lib/debug/BulletDynamics_Debug.lib;$(SolutionDir)Physics/lib/debug/LinearMath_Debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

4
Code/Misc/EventHandler/EventHandler.cpp
View File

@ -23,7 +23,7 @@ EventHandler::~EventHandler()
for(int i = 0; i < size; i++) for(int i = 0; i < size; i++)
{ {
delete collections[i]; delete collections[i];
collections[i] = NULL; //collections[i] = NULL;
} }
} }
@ -33,7 +33,7 @@ void EventHandler::Clean()
for(int i = 0; i < size; i++) for(int i = 0; i < size; i++)
{ {
delete collections[i]; delete collections[i];
collections[i] = NULL; //collections[i] = NULL;
} }
collections.clear(); collections.clear();
} }