diff --git a/Debug/Tester.ilk b/Debug/Tester.ilk deleted file mode 100644 index f31d3420..00000000 Binary files a/Debug/Tester.ilk and /dev/null differ diff --git a/Debug/Tester.pdb b/Debug/Tester.pdb index 6486784a..30fdfb14 100644 Binary files a/Debug/Tester.pdb and b/Debug/Tester.pdb differ diff --git a/OysterGraphics/Engine.cpp b/OysterGraphics/Engine.cpp index 8a22d659..2e8accb9 100644 --- a/OysterGraphics/Engine.cpp +++ b/OysterGraphics/Engine.cpp @@ -74,7 +74,7 @@ bool Oyster::Engine::Init::FullInit(const Setup& setup) { if(!Oyster::Engine::Init::Instance(setup.SingleThreaded,setup.Reference,setup.ForceDX11)) return false; - if(!Oyster::Engine::Init::CreateSwapChain(NULL,setup.NrOfBuffers,setup.MSAA_Quality,setup.Fullscreen)) + if(!Oyster::Engine::Init::CreateSwapChain(setup.window,setup.NrOfBuffers,setup.MSAA_Quality,setup.Fullscreen)) return false; /// \todo Add Init Shaders to full Init Process if(setup.GenerateDepthStencil) diff --git a/OysterGraphics/Engine.h b/OysterGraphics/Engine.h index 78f9d74b..bf335d05 100644 --- a/OysterGraphics/Engine.h +++ b/OysterGraphics/Engine.h @@ -29,6 +29,7 @@ namespace Oyster bool ForceDX11; bool GenerateDepthStencil; bool BindDefault; + HWND window; //all but Window params have Default Values Setup() { diff --git a/OysterGraphics/OysterGraphics.vcxproj b/OysterGraphics/OysterGraphics.vcxproj index e1f48fc6..3d452903 100644 --- a/OysterGraphics/OysterGraphics.vcxproj +++ b/OysterGraphics/OysterGraphics.vcxproj @@ -174,6 +174,26 @@ {f10cbc03-9809-4cba-95d8-327c287b18ee} + + + Pixel + Pixel + Pixel + Pixel + true + 5.0 + ShaderMain + + + Vertex + Vertex + Vertex + Vertex + true + 5.0 + ShaderMain + + diff --git a/OysterGraphics/OysterGraphics.vcxproj.filters b/OysterGraphics/OysterGraphics.vcxproj.filters index 398d6739..412e083a 100644 --- a/OysterGraphics/OysterGraphics.vcxproj.filters +++ b/OysterGraphics/OysterGraphics.vcxproj.filters @@ -93,4 +93,8 @@ Header Files + + + + \ No newline at end of file diff --git a/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl b/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl new file mode 100644 index 00000000..412bf9a5 --- /dev/null +++ b/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl @@ -0,0 +1,4 @@ +float4 ShaderMain() : SV_TARGET +{ + return float4(1.0f, 0.0f, 0.0f, 1.0f); +} \ No newline at end of file diff --git a/OysterGraphics/Shader/HLSL/SimpleDebug/DebugVertex.hlsl b/OysterGraphics/Shader/HLSL/SimpleDebug/DebugVertex.hlsl new file mode 100644 index 00000000..a3a5c4aa --- /dev/null +++ b/OysterGraphics/Shader/HLSL/SimpleDebug/DebugVertex.hlsl @@ -0,0 +1,4 @@ +float4 ShaderMain( float4 pos : POSITION ) : SV_POSITION +{ + return pos; +} \ No newline at end of file diff --git a/Tester/Debug/CL.read.1.tlog b/Tester/Debug/CL.read.1.tlog index 61235f9c..f673f687 100644 Binary files a/Tester/Debug/CL.read.1.tlog and b/Tester/Debug/CL.read.1.tlog differ diff --git a/Tester/Debug/MainTest.obj b/Tester/Debug/MainTest.obj index 36590338..6612ee11 100644 Binary files a/Tester/Debug/MainTest.obj and b/Tester/Debug/MainTest.obj differ diff --git a/Tester/Debug/Tester.log b/Tester/Debug/Tester.log index b00ace4d..1187c892 100644 --- a/Tester/Debug/Tester.log +++ b/Tester/Debug/Tester.log @@ -1,5 +1,5 @@ -Build started 11/13/2013 10:26:50 AM. - 1>Project "C:\DanBias\Danbias\Tester\Tester.vcxproj" on node 4 (Build target(s)). +Build started 11/15/2013 8:31:58 AM. + 1>Project "C:\DanBias\Danbias\Tester\Tester.vcxproj" on node 2 (Build target(s)). 1>ClCompile: C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\CL.exe /c /I..\OysterGraphics /I..\OysterMath /I..\Misc /ZI /nologo /W3 /WX- /sdl /Od /Oy- /D WIN32 /D _DEBUG /D _WINDOWS /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc110.pdb" /Gd /TP /analyze- /errorReport:prompt MainTest.cpp MainTest.cpp @@ -8,9 +8,10 @@ C:\DanBias\External\Lib\Misc\Misc_x86D.lib C:\DanBias\External\Lib\OysterMath\OysterMath_x86D.lib C:\DanBias\External\Lib\OysterGraphics\OysterGraphics_x86D.lib + 1>MainTest.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/OPT:LBR' specification Tester.vcxproj -> C:\DanBias\Danbias\Debug\Tester.exe 1>Done Building Project "C:\DanBias\Danbias\Tester\Tester.vcxproj" (Build target(s)). Build succeeded. -Time Elapsed 00:00:02.51 +Time Elapsed 00:00:05.17 diff --git a/Tester/Debug/Tester.vcxprojResolveAssemblyReference.cache b/Tester/Debug/Tester.vcxprojResolveAssemblyReference.cache index 98d62a36..7a891077 100644 Binary files a/Tester/Debug/Tester.vcxprojResolveAssemblyReference.cache and b/Tester/Debug/Tester.vcxprojResolveAssemblyReference.cache differ diff --git a/Tester/Debug/link-cvtres.read.1.tlog b/Tester/Debug/link-cvtres.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link-cvtres.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link-cvtres.write.1.tlog b/Tester/Debug/link-cvtres.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link-cvtres.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link-rc.read.1.tlog b/Tester/Debug/link-rc.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link-rc.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link-rc.write.1.tlog b/Tester/Debug/link-rc.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link-rc.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5376-cvtres.read.1.tlog b/Tester/Debug/link.5376-cvtres.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5376-cvtres.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5376-cvtres.write.1.tlog b/Tester/Debug/link.5376-cvtres.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5376-cvtres.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5376-rc.read.1.tlog b/Tester/Debug/link.5376-rc.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5376-rc.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5376-rc.write.1.tlog b/Tester/Debug/link.5376-rc.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5376-rc.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5376.read.1.tlog b/Tester/Debug/link.5376.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5376.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5376.write.1.tlog b/Tester/Debug/link.5376.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5376.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5848-cvtres.read.1.tlog b/Tester/Debug/link.5848-cvtres.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5848-cvtres.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5848-cvtres.write.1.tlog b/Tester/Debug/link.5848-cvtres.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5848-cvtres.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5848-rc.read.1.tlog b/Tester/Debug/link.5848-rc.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5848-rc.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5848-rc.write.1.tlog b/Tester/Debug/link.5848-rc.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5848-rc.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5848.read.1.tlog b/Tester/Debug/link.5848.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5848.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.5848.write.1.tlog b/Tester/Debug/link.5848.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.5848.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6292-cvtres.read.1.tlog b/Tester/Debug/link.6292-cvtres.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6292-cvtres.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6292-cvtres.write.1.tlog b/Tester/Debug/link.6292-cvtres.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6292-cvtres.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6292-rc.read.1.tlog b/Tester/Debug/link.6292-rc.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6292-rc.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6292-rc.write.1.tlog b/Tester/Debug/link.6292-rc.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6292-rc.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6292.read.1.tlog b/Tester/Debug/link.6292.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6292.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.6292.write.1.tlog b/Tester/Debug/link.6292.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/Tester/Debug/link.6292.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Tester/Debug/link.read.1.tlog b/Tester/Debug/link.read.1.tlog index a6faf923..548904c1 100644 Binary files a/Tester/Debug/link.read.1.tlog and b/Tester/Debug/link.read.1.tlog differ diff --git a/Tester/Debug/link.write.1.tlog b/Tester/Debug/link.write.1.tlog index e18501b8..3f42e49f 100644 Binary files a/Tester/Debug/link.write.1.tlog and b/Tester/Debug/link.write.1.tlog differ diff --git a/Tester/Debug/vc110.idb b/Tester/Debug/vc110.idb index 2c11da5b..d47848fa 100644 Binary files a/Tester/Debug/vc110.idb and b/Tester/Debug/vc110.idb differ diff --git a/Tester/Debug/vc110.pdb b/Tester/Debug/vc110.pdb index b83bd244..cbed4c20 100644 Binary files a/Tester/Debug/vc110.pdb and b/Tester/Debug/vc110.pdb differ diff --git a/Tester/MainTest.cpp b/Tester/MainTest.cpp index 4713ff2f..be8b433f 100644 --- a/Tester/MainTest.cpp +++ b/Tester/MainTest.cpp @@ -134,9 +134,57 @@ HRESULT InitDirect3D() Oyster::Engine::Init::Setup setup; setup.Fullscreen = false; setup.ForceDX11 = true; + setup.SingleThreaded = true; + setup.window = g_hWnd; Oyster::Engine::Init::FullInit( setup ); + std::wstring ShaderPath = L"..\\OysterGraphics\\Shader\\HLSL\\"; + std::wstring EffectPath = L"SimpleDebug\\"; + + Oyster::Core::ShaderManager::Init(ShaderPath + EffectPath + L"DebugPixel.hlsl",Oyster::Core::ShaderManager::ShaderType::Pixel,L"Debug",false); + Oyster::Core::ShaderManager::Init(ShaderPath + EffectPath + L"DebugVertex.hlsl",Oyster::Core::ShaderManager::ShaderType::Vertex,L"Debug",false); + + Oyster::Core::ShaderManager::Set::Vertex(Oyster::Core::ShaderManager::Get::Vertex(L"Debug")); + Oyster::Core::ShaderManager::Set::Pixel(Oyster::Core::ShaderManager::Get::Pixel(L"Debug")); + + D3D11_INPUT_ELEMENT_DESC inputDesc[] = + { + { "POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 } + }; + + ID3D11InputLayout* layout; + + Oyster::Core::ShaderManager::CreateInputLayout( inputDesc, 1, Oyster::Core::ShaderManager::Get::Vertex(L"Debug"), layout); + + Oyster::Core::DeviceContext->IASetInputLayout(layout); + Oyster::Core::DeviceContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + + Oyster::Engine::PrepareForRendering::BindBackBuffer(); + + struct float4 + { + float x,y,z,w; + }; + + float4 mesh[] = + { + {-1.0f,1.0f,0.0f,1.0f}, + {1.0f,1.0f,0.0f,1.0f}, + {1.0f,-1.0f,0.0f,1.0f}, + }; + + Oyster::Buffer::BUFFER_INIT_DESC desc; + desc.ElementSize= sizeof(float4); + desc.NumElements = 3; + desc.InitData=mesh; + desc.Type = Oyster::Buffer::BUFFER_TYPE::VERTEX_BUFFER; + desc.Usage = Oyster::Buffer::BUFFER_USAGE::BUFFER_USAGE_IMMUTABLE; + + Oyster::Buffer b; + b.Init(desc); + b.Apply(0); + return S_OK; } @@ -147,7 +195,11 @@ HRESULT Update(float deltaTime) HRESULT Render(float deltaTime) { - + Oyster::Engine::PrepareForRendering::ClearBackBuffer(Oyster::Math::Float4(0,0,1,1)); + + Oyster::Core::DeviceContext->Draw(3,0); + + Oyster::Core::SwapChain->Present(0,0); return S_OK; }