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

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

This commit is contained in:
lindaandersson 2014-02-18 15:54:17 +01:00
parent 611e75b505 02312c53a4
commit 95c70fe0b2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
View File

@ -24,6 +24,8 @@ namespace Oyster
Model::Model* sphere; Model::Model* sphere;
ID3D11RasterizerState* wire; ID3D11RasterizerState* wire;
ID3D11ShaderResourceView* debugSRV;
#endif #endif
} }
@ -50,8 +52,15 @@ namespace Oyster
Render::Preparations::Basic::SetViewPort(); Render::Preparations::Basic::SetViewPort();
#ifdef _DEBUG #ifdef _DEBUG
//fix load model //fix load model
cube = CreateModel(L"debug_cube.dan");
sphere = CreateModel(L"debug_sphere.dan"); debugSRV = (ID3D11ShaderResourceView*)API::CreateTexture(L"color_white.png");
debugSRV = (ID3D11ShaderResourceView*)API::CreateTexture(L"color_white.png");
cube = CreateModel(L"generic_cube.dan");
cube->Tint = Math::Float3(0.0f,0.0f,1.0f);
sphere = CreateModel(L"generic_sphere.dan");
sphere->Tint = Math::Float3(1.0f,0.5f,182/255.0f);
D3D11_RASTERIZER_DESC desc; D3D11_RASTERIZER_DESC desc;
desc.CullMode = D3D11_CULL_BACK; desc.CullMode = D3D11_CULL_BACK;
@ -196,6 +205,7 @@ namespace Oyster
void API::StartRenderWireFrame() void API::StartRenderWireFrame()
{ {
Core::deviceContext->OMSetRenderTargets(Render::Resources::Gather::Pass.RTV.size(),&Render::Resources::Gather::Pass.RTV[0],NULL);
Core::deviceContext->RSSetState(wire); Core::deviceContext->RSSetState(wire);
Core::deviceContext->OMSetRenderTargets(Render::Resources::Gather::Pass.RTV.size(),&Render::Resources::Gather::Pass.RTV[0],NULL); Core::deviceContext->OMSetRenderTargets(Render::Resources::Gather::Pass.RTV.size(),&Render::Resources::Gather::Pass.RTV[0],NULL);
} }