lost code fix

This commit is contained in:
Dander7BD 2014-02-27 13:07:31 +01:00
parent 74a833baf8
commit 5970b23d3c
4 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ShowAllFiles>true</ShowAllFiles> <ShowAllFiles>false</ShowAllFiles>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory> <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>

View File

@ -211,7 +211,6 @@ void GamingUI::OnMouseMoveVelocity ( Input::Struct::SAIPointInt2D coordinate, In
//send delta mouse movement //send delta mouse movement
{ {
this->camera->PitchDown( (-coordinate.y) * this->sharedData->mouseSensitivity ); this->camera->PitchDown( (-coordinate.y) * this->sharedData->mouseSensitivity );
//this->camera->YawLeft( (-coordinate.x) * this->sharedData->mouseSensitivity );
//if( deltaPos.x != 0.0f ) //This made the camera reset to a specific rotation. Why? //if( deltaPos.x != 0.0f ) //This made the camera reset to a specific rotation. Why?
{ {
this->sharedData->network->Send( Protocol_PlayerLeftTurn((coordinate.x) * this->sharedData->mouseSensitivity, this->camera->GetLook()) ); this->sharedData->network->Send( Protocol_PlayerLeftTurn((coordinate.x) * this->sharedData->mouseSensitivity, this->camera->GetLook()) );

View File

@ -83,9 +83,10 @@ void Player::BeginFrame()
// Rotate player accordingly // Rotate player accordingly
this->rigidBody->AddRotationAroundY(this->rotationUp); this->rigidBody->AddRotationAroundY(this->rotationUp);
this->rigidBody->SetUp( this->rigidBody->GetState().centerPos.GetNormalized() ); this->rigidBody->SetUp( this->rigidBody->GetState().centerPos.GetNormalized() );
this->rotationUp = 0.0f;
// Direction data // Direction data
Oyster::Math::Float4x4 orientation; Float4x4 orientation;
orientation = this->rigidBody->GetState().GetOrientation(); orientation = this->rigidBody->GetState().GetOrientation();
Float3 &forwardDir = orientation.v[2].xyz; Float3 &forwardDir = orientation.v[2].xyz;

View File

@ -10,7 +10,7 @@
#include "DynamicArray.h" #include "DynamicArray.h"
const float MAX_HP = 100.0f; const float MAX_HP = 100.0f;
const float BASIC_SPEED = 10.0f; const float BASIC_SPEED = 20.0f;
namespace GameLogic namespace GameLogic
{ {