diff options
| author | Jason Maskell <[email protected]> | 2016-05-23 10:49:51 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-23 10:49:51 +0200 |
| commit | 0837eb3bd53eccc2c9c1f949e4031d758654c3f5 (patch) | |
| tree | 17bd2839b74f7f498b22b22370bb5b7afed6ea17 /sample | |
| parent | Sample now compiles cleanly, doesn't run yet due to media path issues. (diff) | |
| download | waveworks_archive-0837eb3bd53eccc2c9c1f949e4031d758654c3f5.tar.xz waveworks_archive-0837eb3bd53eccc2c9c1f949e4031d758654c3f5.zip | |
Moved media to a more central location.
Changed CMake to compile shaders to that new location.
Diffstat (limited to 'sample')
| -rw-r--r-- | sample/d3d11/Media/UI/DXUTShared.fx | 69 | ||||
| -rw-r--r-- | sample/d3d11/Media/UI/Font.dds | bin | 76128 -> 0 bytes | |||
| -rw-r--r-- | sample/d3d11/Media/UI/arrow.x | 1050 | ||||
| -rw-r--r-- | sample/d3d11/Media/UI/dxutcontrols.dds | bin | 262272 -> 0 bytes | |||
| -rw-r--r-- | sample/d3d11/Media/ocean_surface_d3d11.fxo | bin | 49887 -> 0 bytes | |||
| -rw-r--r-- | sample/d3d11/Media/sample_d3d11.fxo | bin | 82321 -> 0 bytes | |||
| -rw-r--r-- | sample/d3d11/sample_d3d11.cpp | 12 |
7 files changed, 12 insertions, 1119 deletions
diff --git a/sample/d3d11/Media/UI/DXUTShared.fx b/sample/d3d11/Media/UI/DXUTShared.fx deleted file mode 100644 index f6d590b..0000000 --- a/sample/d3d11/Media/UI/DXUTShared.fx +++ /dev/null @@ -1,69 +0,0 @@ -//-------------------------------------------------------------------------------------- -// File: DXUTShared.fx -// -// -// -// Copyright (c) Microsoft Corporation. All rights reserved. -//-------------------------------------------------------------------------------------- - - -//-------------------------------------------------------------------------------------- -// Global variables -//-------------------------------------------------------------------------------------- -float4 g_MaterialDiffuseColor; // Material's diffuse color -float3 g_LightDir; // Light's direction in world space -float4x4 g_mWorld; // World matrix for object -float4x4 g_mWorldViewProjection; // World * View * Projection matrix - - - -//-------------------------------------------------------------------------------------- -// Vertex shader output structure -//-------------------------------------------------------------------------------------- -struct VS_OUTPUT -{ - float4 Position : POSITION; // vertex position - float4 Diffuse : COLOR0; // vertex diffuse color -}; - - -//-------------------------------------------------------------------------------------- -// This shader computes standard transform and lighting -//-------------------------------------------------------------------------------------- -VS_OUTPUT RenderWith1LightNoTextureVS( float4 vPos : POSITION, - float3 vNormal : NORMAL ) -{ - VS_OUTPUT Output; - - // Transform the position from object space to homogeneous projection space - Output.Position = mul(vPos, g_mWorldViewProjection); - - // Transform the normal from object space to world space - float3 vNormalWorldSpace; - vNormalWorldSpace = normalize(mul(vNormal, (float3x3)g_mWorld)); // normal (world space) - - // Compute simple directional lighting equation - Output.Diffuse.rgb = g_MaterialDiffuseColor * max(0,dot(vNormalWorldSpace, g_LightDir)); - Output.Diffuse.a = 1.0f; - - return Output; -} - - -//-------------------------------------------------------------------------------------- -float4 RenderWith1LightNoTexturePS( float4 Diffuse : COLOR0 ) : COLOR0 -{ - return Diffuse; -} - - -//-------------------------------------------------------------------------------------- -technique RenderWith1LightNoTexture -{ - pass P0 - { - VertexShader = compile vs_1_1 RenderWith1LightNoTextureVS(); - PixelShader = compile ps_1_1 RenderWith1LightNoTexturePS(); - } -} - diff --git a/sample/d3d11/Media/UI/Font.dds b/sample/d3d11/Media/UI/Font.dds Binary files differdeleted file mode 100644 index 37514f5..0000000 --- a/sample/d3d11/Media/UI/Font.dds +++ /dev/null diff --git a/sample/d3d11/Media/UI/arrow.x b/sample/d3d11/Media/UI/arrow.x deleted file mode 100644 index da3c323..0000000 --- a/sample/d3d11/Media/UI/arrow.x +++ /dev/null @@ -1,1050 +0,0 @@ -xof 0303txt 0032 -template XSkinMeshHeader { - <3cf169ce-ff7c-44ab-93c0-f78f62d172e2> - WORD nMaxSkinWeightsPerVertex; - WORD nMaxSkinWeightsPerFace; - WORD nBones; -} - -template VertexDuplicationIndices { - <b8d65549-d7c9-4995-89cf-53a9a8b031e3> - DWORD nIndices; - DWORD nOriginalVertices; - array DWORD indices[nIndices]; -} - -template SkinWeights { - <6f0d123b-bad2-4167-a0d0-80224f25fabb> - STRING transformNodeName; - DWORD nWeights; - array DWORD vertexIndices[nWeights]; - array FLOAT weights[nWeights]; - Matrix4x4 matrixOffset; -} - - -Frame Scene_Root { - - - FrameTransformMatrix { - 1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000;; - } - - Frame Arrow { - - - FrameTransformMatrix { - 0.004058,0.000000,0.000000,0.000000,0.000000,0.000000,0.004058,0.000000,0.000000,-0.004058,0.000000,0.000000,0.000000,0.000000,0.000000,1.000000;; - } - - Frame Cylinder01 { - - - FrameTransformMatrix { - 1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,0.000002,116.363640,0.000002,1.000000;; - } - - Frame { - - - FrameTransformMatrix { - 1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,-0.000000,0.000000,0.000003,1.000000;; - } - - Mesh { - 58; - 0.000000;0.000000;0.000000;, - 24.461134;0.000000;0.000000;, - 22.038719;-10.613288;0.000000;, - 15.251267;-19.124485;0.000000;, - 5.443114;-23.847843;0.000000;, - -5.443115;-23.847841;0.000000;, - -15.251268;-19.124485;0.000000;, - -22.038721;-10.613288;0.000000;, - -24.461134;0.000001;0.000000;, - -22.038719;10.613289;0.000000;, - -15.251266;19.124485;0.000000;, - -5.443113;23.847843;0.000000;, - 5.443115;23.847841;0.000000;, - 15.251268;19.124483;0.000000;, - 22.038721;10.613287;0.000000;, - 24.461134;0.000000;-140.000000;, - 22.038719;-10.613288;-140.000000;, - 15.251267;-19.124485;-140.000000;, - 5.443114;-23.847843;-140.000000;, - -5.443115;-23.847841;-140.000000;, - -15.251268;-19.124485;-140.000000;, - -22.038721;-10.613288;-140.000000;, - -24.461134;0.000001;-140.000000;, - -22.038719;10.613289;-140.000000;, - -15.251266;19.124485;-140.000000;, - -5.443113;23.847843;-140.000000;, - 5.443115;23.847841;-140.000000;, - 15.251268;19.124483;-140.000000;, - 22.038721;10.613287;-140.000000;, - 0.000000;0.000000;-140.000000;, - 24.461134;0.000000;0.000000;, - 22.038719;-10.613288;0.000000;, - 15.251267;-19.124485;0.000000;, - 5.443114;-23.847843;0.000000;, - -5.443115;-23.847841;0.000000;, - -15.251268;-19.124485;0.000000;, - -22.038721;-10.613288;0.000000;, - -24.461134;0.000001;0.000000;, - -22.038719;10.613289;0.000000;, - -15.251266;19.124485;0.000000;, - -5.443113;23.847843;0.000000;, - 5.443115;23.847841;0.000000;, - 15.251268;19.124483;0.000000;, - 22.038721;10.613287;0.000000;, - 24.461134;0.000000;-140.000000;, - 22.038719;-10.613288;-140.000000;, - 15.251267;-19.124485;-140.000000;, - 5.443114;-23.847843;-140.000000;, - -5.443115;-23.847841;-140.000000;, - -15.251268;-19.124485;-140.000000;, - -22.038721;-10.613288;-140.000000;, - -24.461134;0.000001;-140.000000;, - -22.038719;10.613289;-140.000000;, - -15.251266;19.124485;-140.000000;, - -5.443113;23.847843;-140.000000;, - 5.443115;23.847841;-140.000000;, - 15.251268;19.124483;-140.000000;, - 22.038721;10.613287;-140.000000;; - 56; - 3;0,2,1;, - 3;0,3,2;, - 3;0,4,3;, - 3;0,5,4;, - 3;0,6,5;, - 3;0,7,6;, - 3;0,8,7;, - 3;0,9,8;, - 3;0,10,9;, - 3;0,11,10;, - 3;0,12,11;, - 3;0,13,12;, - 3;0,14,13;, - 3;0,1,14;, - 3;30,16,15;, - 3;30,31,16;, - 3;31,17,16;, - 3;31,32,17;, - 3;32,18,17;, - 3;32,33,18;, - 3;33,19,18;, - 3;33,34,19;, - 3;34,20,19;, - 3;34,35,20;, - 3;35,21,20;, - 3;35,36,21;, - 3;36,22,21;, - 3;36,37,22;, - 3;37,23,22;, - 3;37,38,23;, - 3;38,24,23;, - 3;38,39,24;, - 3;39,25,24;, - 3;39,40,25;, - 3;40,26,25;, - 3;40,41,26;, - 3;41,27,26;, - 3;41,42,27;, - 3;42,28,27;, - 3;42,43,28;, - 3;43,15,28;, - 3;43,30,15;, - 3;29,44,45;, - 3;29,45,46;, - 3;29,46,47;, - 3;29,47,48;, - 3;29,48,49;, - 3;29,49,50;, - 3;29,50,51;, - 3;29,51,52;, - 3;29,52,53;, - 3;29,53,54;, - 3;29,54,55;, - 3;29,55,56;, - 3;29,56,57;, - 3;29,57,44;; - - MeshNormals { - 58; - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.000000;0.000000;1.000000;, - 0.997118;0.075862;0.000000;, - 0.931288;-0.364284;0.000000;, - 0.681004;-0.732279;0.000000;, - 0.295840;-0.955238;0.000000;, - -0.147920;-0.988999;0.000000;, - -0.562382;-0.826878;0.000000;, - -0.865457;-0.500983;0.000000;, - -0.997118;-0.075862;0.000000;, - -0.931288;0.364284;0.000000;, - -0.681004;0.732279;0.000000;, - -0.295840;0.955238;0.000000;, - 0.147920;0.988999;0.000000;, - 0.562382;0.826878;0.000000;, - 0.865457;0.500983;0.000000;, - 0.000000;0.000000;-1.000000;, - 0.997118;-0.075862;0.000000;, - 0.865457;-0.500983;0.000000;, - 0.562382;-0.826878;0.000000;, - 0.147920;-0.988999;0.000000;, - -0.295840;-0.955238;0.000000;, - -0.681004;-0.732279;0.000000;, - -0.931288;-0.364284;0.000000;, - -0.997118;0.075862;0.000000;, - -0.865457;0.500983;0.000000;, - -0.562382;0.826878;0.000000;, - -0.147920;0.988999;0.000000;, - 0.295840;0.955238;0.000000;, - 0.681004;0.732279;0.000000;, - 0.931288;0.364284;0.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;; - 56; - 3;0,2,1;, - 3;0,3,2;, - 3;0,4,3;, - 3;0,5,4;, - 3;0,6,5;, - 3;0,7,6;, - 3;0,8,7;, - 3;0,9,8;, - 3;0,10,9;, - 3;0,11,10;, - 3;0,12,11;, - 3;0,13,12;, - 3;0,14,13;, - 3;0,1,14;, - 3;30,16,15;, - 3;30,31,16;, - 3;31,17,16;, - 3;31,32,17;, - 3;32,18,17;, - 3;32,33,18;, - 3;33,19,18;, - 3;33,34,19;, - 3;34,20,19;, - 3;34,35,20;, - 3;35,21,20;, - 3;35,36,21;, - 3;36,22,21;, - 3;36,37,22;, - 3;37,23,22;, - 3;37,38,23;, - 3;38,24,23;, - 3;38,39,24;, - 3;39,25,24;, - 3;39,40,25;, - 3;40,26,25;, - 3;40,41,26;, - 3;41,27,26;, - 3;41,42,27;, - 3;42,28,27;, - 3;42,43,28;, - 3;43,15,28;, - 3;43,30,15;, - 3;29,44,45;, - 3;29,45,46;, - 3;29,46,47;, - 3;29,47,48;, - 3;29,48,49;, - 3;29,49,50;, - 3;29,50,51;, - 3;29,51,52;, - 3;29,52,53;, - 3;29,53,54;, - 3;29,54,55;, - 3;29,55,56;, - 3;29,56,57;, - 3;29,57,44;; - } - - VertexDuplicationIndices { - 58; - 30; - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28; - } - - MeshMaterialList { - 1; - 56; - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0; - - Material { - 1.000000;1.000000;1.000000;1.000000;; - 0.000000; - 1.000000;1.000000;1.000000;; - 0.000000;0.000000;0.000000;; - } - } - } - } - } - - Frame Cone01 { - - - FrameTransformMatrix { - 1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,0.000000,116.363640,0.000000,1.000000;; - } - - Frame { - - - FrameTransformMatrix { - 1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000003,1.000000;; - } - - Mesh { - 98; - 0.000000;0.000000;0.000000;, - 58.922840;0.000000;0.000000;, - 56.915092;15.250354;0.000000;, - 51.028675;29.461420;0.000000;, - 41.664738;41.664742;0.000000;, - 29.461418;51.028679;0.000000;, - 15.250351;56.915092;0.000000;, - -0.000003;58.922840;0.000000;, - -15.250356;56.915092;0.000000;, - -29.461424;51.028675;0.000000;, - -41.664742;41.664738;0.000000;, - -51.028679;29.461416;0.000000;, - -56.915092;15.250349;0.000000;, - -58.922840;-0.000005;0.000000;, - -56.915092;-15.250359;0.000000;, - -51.028675;-29.461426;0.000000;, - -41.664734;-41.664745;0.000000;, - -29.461414;-51.028679;0.000000;, - -15.250346;-56.915096;0.000000;, - 0.000008;-58.922840;0.000000;, - 15.250361;-56.915092;0.000000;, - 29.461428;-51.028671;0.000000;, - 41.664745;-41.664734;0.000000;, - 51.028683;-29.461412;0.000000;, - 56.915096;-15.250343;0.000000;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 58.922840;0.000000;0.000000;, - 56.915092;15.250354;0.000000;, - 51.028675;29.461420;0.000000;, - 41.664738;41.664742;0.000000;, - 29.461418;51.028679;0.000000;, - 15.250351;56.915092;0.000000;, - -0.000003;58.922840;0.000000;, - -15.250356;56.915092;0.000000;, - -29.461424;51.028675;0.000000;, - -41.664742;41.664738;0.000000;, - -51.028679;29.461416;0.000000;, - -56.915092;15.250349;0.000000;, - -58.922840;-0.000005;0.000000;, - -56.915092;-15.250359;0.000000;, - -51.028675;-29.461426;0.000000;, - -41.664734;-41.664745;0.000000;, - -29.461414;-51.028679;0.000000;, - -15.250346;-56.915096;0.000000;, - 0.000008;-58.922840;0.000000;, - 15.250361;-56.915092;0.000000;, - 29.461428;-51.028671;0.000000;, - 41.664745;-41.664734;0.000000;, - 51.028683;-29.461412;0.000000;, - 56.915096;-15.250343;0.000000;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;, - 0.000000;0.000000;116.363632;; - 96; - 3;0,2,1;, - 3;0,3,2;, - 3;0,4,3;, - 3;0,5,4;, - 3;0,6,5;, - 3;0,7,6;, - 3;0,8,7;, - 3;0,9,8;, - 3;0,10,9;, - 3;0,11,10;, - 3;0,12,11;, - 3;0,13,12;, - 3;0,14,13;, - 3;0,15,14;, - 3;0,16,15;, - 3;0,17,16;, - 3;0,18,17;, - 3;0,19,18;, - 3;0,20,19;, - 3;0,21,20;, - 3;0,22,21;, - 3;0,23,22;, - 3;0,24,23;, - 3;0,1,24;, - 3;50,26,25;, - 3;50,51,26;, - 3;51,27,26;, - 3;51,52,27;, - 3;52,28,27;, - 3;52,53,28;, - 3;53,29,28;, - 3;53,54,29;, - 3;54,30,29;, - 3;54,55,30;, - 3;55,31,30;, - 3;55,56,31;, - 3;56,32,31;, - 3;56,57,32;, - 3;57,33,32;, - 3;57,58,33;, - 3;58,34,33;, - 3;58,59,34;, - 3;59,35,34;, - 3;59,60,35;, - 3;60,36,35;, - 3;60,61,36;, - 3;61,37,36;, - 3;61,62,37;, - 3;62,38,37;, - 3;62,63,38;, - 3;63,39,38;, - 3;63,64,39;, - 3;64,40,39;, - 3;64,65,40;, - 3;65,41,40;, - 3;65,66,41;, - 3;66,42,41;, - 3;66,67,42;, - 3;67,43,42;, - 3;67,68,43;, - 3;68,44,43;, - 3;68,69,44;, - 3;69,45,44;, - 3;69,70,45;, - 3;70,46,45;, - 3;70,71,46;, - 3;71,47,46;, - 3;71,72,47;, - 3;72,48,47;, - 3;72,73,48;, - 3;73,25,48;, - 3;73,50,25;, - 3;49,74,75;, - 3;49,75,76;, - 3;49,76,77;, - 3;49,77,78;, - 3;49,78,79;, - 3;49,79,80;, - 3;49,80,81;, - 3;49,81,82;, - 3;49,82,83;, - 3;49,83,84;, - 3;49,84,85;, - 3;49,85,86;, - 3;49,86,87;, - 3;49,87,88;, - 3;49,88,89;, - 3;49,89,90;, - 3;49,90,91;, - 3;49,91,92;, - 3;49,92,93;, - 3;49,93,94;, - 3;49,94,95;, - 3;49,95,96;, - 3;49,96,97;, - 3;49,97,74;; - - MeshNormals { - 98; - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.000000;0.000000;-1.000000;, - 0.886052;-0.116651;0.448669;, - 0.886052;0.116651;0.448669;, - 0.825669;0.342004;0.448669;, - 0.709018;0.544049;0.448669;, - 0.544049;0.709018;0.448669;, - 0.342003;0.825669;0.448669;, - 0.116651;0.886052;0.448669;, - -0.116651;0.886052;0.448669;, - -0.342003;0.825669;0.448669;, - -0.544049;0.709018;0.448669;, - -0.709018;0.544049;0.448669;, - -0.825669;0.342003;0.448669;, - -0.886052;0.116651;0.448669;, - -0.886052;-0.116651;0.448669;, - -0.825669;-0.342003;0.448669;, - -0.709018;-0.544049;0.448669;, - -0.544049;-0.709018;0.448669;, - -0.342003;-0.825669;0.448669;, - -0.116651;-0.886052;0.448669;, - 0.116651;-0.886052;0.448669;, - 0.342004;-0.825669;0.448669;, - 0.544049;-0.709018;0.448669;, - 0.709018;-0.544049;0.448669;, - 0.825669;-0.342003;0.448669;, - 1.000000;0.000000;0.000000;, - 0.892143;0.000000;0.451753;, - 0.861744;0.230904;0.451753;, - 0.772619;0.446072;0.451753;, - 0.630840;0.630840;0.451753;, - 0.446072;0.772619;0.451753;, - 0.230904;0.861744;0.451753;, - 0.000000;0.892143;0.451753;, - -0.230904;0.861744;0.451753;, - -0.446072;0.772619;0.451753;, - -0.630840;0.630840;0.451753;, - -0.772619;0.446071;0.451753;, - -0.861744;0.230904;0.451753;, - -0.892143;-0.000000;0.451753;, - -0.861744;-0.230904;0.451753;, - -0.772619;-0.446072;0.451753;, - -0.630840;-0.630841;0.451753;, - -0.446072;-0.772619;0.451753;, - -0.230904;-0.861744;0.451753;, - 0.000000;-0.892143;0.451753;, - 0.230904;-0.861744;0.451753;, - 0.446072;-0.772619;0.451753;, - 0.630840;-0.630840;0.451753;, - 0.772619;-0.446071;0.451753;, - 0.861744;-0.230903;0.451753;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;, - 1.000000;0.000000;0.000000;; - 96; - 3;0,2,1;, - 3;0,3,2;, - 3;0,4,3;, - 3;0,5,4;, - 3;0,6,5;, - 3;0,7,6;, - 3;0,8,7;, - 3;0,9,8;, - 3;0,10,9;, - 3;0,11,10;, - 3;0,12,11;, - 3;0,13,12;, - 3;0,14,13;, - 3;0,15,14;, - 3;0,16,15;, - 3;0,17,16;, - 3;0,18,17;, - 3;0,19,18;, - 3;0,20,19;, - 3;0,21,20;, - 3;0,22,21;, - 3;0,23,22;, - 3;0,24,23;, - 3;0,1,24;, - 3;50,26,25;, - 3;50,51,26;, - 3;51,27,26;, - 3;51,52,27;, - 3;52,28,27;, - 3;52,53,28;, - 3;53,29,28;, - 3;53,54,29;, - 3;54,30,29;, - 3;54,55,30;, - 3;55,31,30;, - 3;55,56,31;, - 3;56,32,31;, - 3;56,57,32;, - 3;57,33,32;, - 3;57,58,33;, - 3;58,34,33;, - 3;58,59,34;, - 3;59,35,34;, - 3;59,60,35;, - 3;60,36,35;, - 3;60,61,36;, - 3;61,37,36;, - 3;61,62,37;, - 3;62,38,37;, - 3;62,63,38;, - 3;63,39,38;, - 3;63,64,39;, - 3;64,40,39;, - 3;64,65,40;, - 3;65,41,40;, - 3;65,66,41;, - 3;66,42,41;, - 3;66,67,42;, - 3;67,43,42;, - 3;67,68,43;, - 3;68,44,43;, - 3;68,69,44;, - 3;69,45,44;, - 3;69,70,45;, - 3;70,46,45;, - 3;70,71,46;, - 3;71,47,46;, - 3;71,72,47;, - 3;72,48,47;, - 3;72,73,48;, - 3;73,25,48;, - 3;73,50,25;, - 3;49,74,75;, - 3;49,75,76;, - 3;49,76,77;, - 3;49,77,78;, - 3;49,78,79;, - 3;49,79,80;, - 3;49,80,81;, - 3;49,81,82;, - 3;49,82,83;, - 3;49,83,84;, - 3;49,84,85;, - 3;49,85,86;, - 3;49,86,87;, - 3;49,87,88;, - 3;49,88,89;, - 3;49,89,90;, - 3;49,90,91;, - 3;49,91,92;, - 3;49,92,93;, - 3;49,93,94;, - 3;49,94,95;, - 3;49,95,96;, - 3;49,96,97;, - 3;49,97,74;; - } - - VertexDuplicationIndices { - 98; - 50; - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47, - 48, - 49, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47, - 48; - } - - MeshMaterialList { - 1; - 96; - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0; - - Material { - 1.000000;1.000000;1.000000;1.000000;; - 0.000000; - 1.000000;1.000000;1.000000;; - 0.000000;0.000000;0.000000;; - } - } - } - } - } - } -}
\ No newline at end of file diff --git a/sample/d3d11/Media/UI/dxutcontrols.dds b/sample/d3d11/Media/UI/dxutcontrols.dds Binary files differdeleted file mode 100644 index b5f52e1..0000000 --- a/sample/d3d11/Media/UI/dxutcontrols.dds +++ /dev/null diff --git a/sample/d3d11/Media/ocean_surface_d3d11.fxo b/sample/d3d11/Media/ocean_surface_d3d11.fxo Binary files differdeleted file mode 100644 index 0f2430f..0000000 --- a/sample/d3d11/Media/ocean_surface_d3d11.fxo +++ /dev/null diff --git a/sample/d3d11/Media/sample_d3d11.fxo b/sample/d3d11/Media/sample_d3d11.fxo Binary files differdeleted file mode 100644 index 9040c57..0000000 --- a/sample/d3d11/Media/sample_d3d11.fxo +++ /dev/null diff --git a/sample/d3d11/sample_d3d11.cpp b/sample/d3d11/sample_d3d11.cpp index ff5a1f2..20c2a1c 100644 --- a/sample/d3d11/sample_d3d11.cpp +++ b/sample/d3d11/sample_d3d11.cpp @@ -43,6 +43,10 @@ #include "D3DX11Effect.h" #include "D3D9types.h" +#include <locale> +#include <codecvt> +#include <xlocbuf> + //#define DEBUG_VS // Uncomment this line to debug vertex shaders //#define DEBUG_PS // Uncomment this line to debug pixel shaders @@ -204,6 +208,14 @@ INT WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR cmdline, int ) #if defined(DEBUG) | defined(_DEBUG) _CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); #endif + + //TODO: Take from cmdline + auto mediaPath = "..\\..\\media\\sample"; + + std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter; + DXUTSetMediaSearchPath(converter.from_bytes(mediaPath).c_str()); + + // Set the callback functions. These functions allow DXUT to notify // the application about device changes, user input, and windows messages. The // callbacks are optional so you need only set callbacks for events you're interested |