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

Small fix

This commit is contained in:
lanariel 2014-02-18 14:23:38 +01:00
parent c583543d36
commit 0971bc407e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Code/Game/GameClient/GameClientState/GameState.cpp
View File

@ -81,7 +81,7 @@ bool GameState::Init( SharedStateContent &shared )
Graphics::API::Option gfxOp = Graphics::API::GetOption(); Graphics::API::Option gfxOp = Graphics::API::GetOption();
Float aspectRatio = gfxOp.Resolution.x / gfxOp.Resolution.y; Float aspectRatio = gfxOp.Resolution.x / gfxOp.Resolution.y;
this->privData->camera.SetPerspectiveProjection( Radian(90.0f), aspectRatio, 0.1f, 1000.0f ); this->privData->camera.SetPerspectiveProjection( Math::pi/8, aspectRatio, 0.1f, 1000.0f );
Graphics::API::SetProjection( this->privData->camera.GetProjectionMatrix() ); Graphics::API::SetProjection( this->privData->camera.GetProjectionMatrix() );
//tell server ready //tell server ready
@ -108,7 +108,7 @@ void GameState::InitiatePlayer( int id, const std::string &modelName, const floa
RBInitData RBData; RBInitData RBData;
RBData.position = position; RBData.position = position;
RBData.rotation = ArrayToQuaternion( rotation ); RBData.rotation = ArrayToQuaternion( rotation );
RBData.scale = Float3( 3 ); RBData.scale = Float3( 1 );
if( isMyPlayer ) if( isMyPlayer )
{ {
@ -170,7 +170,7 @@ bool GameState::Render()
Oyster::Math3D::Float4x4 translation = Oyster::Math3D::TranslationMatrix(Float3( 0,132, 20)); Oyster::Math3D::Float4x4 translation = Oyster::Math3D::TranslationMatrix(Float3( 0,132, 20));
Oyster::Math3D::Float4x4 scale = Oyster::Math3D::ScalingMatrix(Float3( 2, 2, 2)); Oyster::Math3D::Float4x4 scale = Oyster::Math3D::ScalingMatrix(Float3( 0.5f, 0.5f, 0.5f));
Oyster::Math3D::Float4x4 world = translation * scale; Oyster::Math3D::Float4x4 world = translation * scale;
Oyster::Graphics::API::RenderDebugCube( world ); Oyster::Graphics::API::RenderDebugCube( world );
Oyster::Graphics::API::RenderDebugCube(this->privData->player.getRBWorld()); Oyster::Graphics::API::RenderDebugCube(this->privData->player.getRBWorld());

2
Code/OysterGraphics/FileLoader/ModelLoader.cpp
View File

@ -700,7 +700,7 @@ static HRESULT CreateTextureFromWIC( _In_ ID3D11Device* d3dDevice,
return hr; return hr;
} }
//todo check calc //todo check calc
int TexSize = twidth * theight * bpp; int TexSize = twidth * theight * (int)bpp;
Oyster::Graphics::Core::UsedMem += TexSize; Oyster::Graphics::Core::UsedMem += TexSize;
if ( autogen ) if ( autogen )