diff --git a/Code/OysterGraphics/Render/GuiRenderer.cpp b/Code/OysterGraphics/Render/GuiRenderer.cpp index 86f6fe0e..8eda0bf5 100644 --- a/Code/OysterGraphics/Render/GuiRenderer.cpp +++ b/Code/OysterGraphics/Render/GuiRenderer.cpp @@ -92,7 +92,7 @@ namespace Oyster tmpInst.coff=(1.0f/TEXT_NR_LETTERS); tmpInst.offset=text[i]-32; tmpInst.pos=i*(FontSize * 0.7f * TEXT_SPACING); - if(tmpInst.pos > size.x) + if(tmpInst.pos > size.x*2) { text = text.substr(0,i-1); break; diff --git a/Code/OysterGraphics/Shader/Passes/Post/PostPass.hlsl b/Code/OysterGraphics/Shader/Passes/Post/PostPass.hlsl index ba835e18..26c9e941 100644 --- a/Code/OysterGraphics/Shader/Passes/Post/PostPass.hlsl +++ b/Code/OysterGraphics/Shader/Passes/Post/PostPass.hlsl @@ -21,12 +21,6 @@ float4 SuperSample(float4 Glow, uint3 DTid) index = index / Output.Length; Glow = Ambient.SampleLevel(S1, index,1); Glow = Glow * Glow.w*10; - //Line Y+1 - //Glow += Ambient[DTid.xy/2 + uint2(1,(Output.Length.y/2)+1)] + Ambient[DTid.xy/2 + uint2(0,(Output.Length.y/2)+1)] + Ambient[DTid.xy/2 + uint2(-1,(Output.Length.y/2)+1)]; - //Line Y-1 - //Glow += Ambient[DTid.xy/2 + uint2(1,(Output.Length.y/2)-1)] + Ambient[DTid.xy/2 + uint2(0,(Output.Length.y/2)-1)] + Ambient[DTid.xy/2 + uint2(-1,(Output.Length.y/2)-1)]; - - //Glow = Glow/9; return Glow; } diff --git a/Code/Tester/MainTest.cpp b/Code/Tester/MainTest.cpp index c3d19f29..e854e1f9 100644 --- a/Code/Tester/MainTest.cpp +++ b/Code/Tester/MainTest.cpp @@ -213,9 +213,10 @@ HRESULT InitDirect3D() return S_OK; } float angle = 0; +float z=0; HRESULT Update(float deltaTime) { - m->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(0,1,0) * angle,Oyster::Math::Float3(0,0,0),Oyster::Math::Float3::null); + m->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(0,1,0) * angle,Oyster::Math::Float3(0,0,z),Oyster::Math::Float3::null); m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(0,1,0) * angle,Oyster::Math::Float3(4,0,0),Oyster::Math::Float3::null); m3->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(0,1,0) * -angle,Oyster::Math::Float3(-4,0,0),Oyster::Math::Float3::null); Oyster::Graphics::API::Update(deltaTime); @@ -285,6 +286,20 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam case 0x58: angle -= Oyster::Math::pi / 16; break; + //A + case 0x41: + break; + //D + case 0x44: + break; + //W + case 0x57: + z-=0.5f; + break; + //S + case 0x53: + z+=0.5f; + break; } break;