Commit 109d48f3 authored by chili's avatar chili
Browse files

fixing matrix layout hlsl

parent 7add7049
...@@ -127,7 +127,7 @@ void Graphics::DrawTestTriangle( float angle ) ...@@ -127,7 +127,7 @@ void Graphics::DrawTestTriangle( float angle )
{ -0.5f,-0.5f,0,0,255,0 }, { -0.5f,-0.5f,0,0,255,0 },
{ -0.3f,0.3f,0,255,0,0 }, { -0.3f,0.3f,0,255,0,0 },
{ 0.3f,0.3f,0,0,255,0 }, { 0.3f,0.3f,0,0,255,0 },
{ 0.0f,-0.8f,255,0,0,0 }, { 0.0f,-1.0f,255,0,0,0 },
}; };
vertices[0].color.g = 255; vertices[0].color.g = 255;
wrl::ComPtr<ID3D11Buffer> pVertexBuffer; wrl::ComPtr<ID3D11Buffer> pVertexBuffer;
...@@ -183,10 +183,10 @@ void Graphics::DrawTestTriangle( float angle ) ...@@ -183,10 +183,10 @@ void Graphics::DrawTestTriangle( float angle )
const ConstantBuffer cb = const ConstantBuffer cb =
{ {
{ {
std::cos( angle ), std::sin( angle ), 0.0f, 0.0f, (3.0f / 4.0f) * std::cos( angle ), std::sin( angle ), 0.0f, 0.0f,
-std::sin( angle ), std::cos( angle ), 0.0f, 0.0f, (3.0f / 4.0f) * -std::sin( angle ), std::cos( angle ), 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f,
} }
}; };
wrl::ComPtr<ID3D11Buffer> pConstantBuffer; wrl::ComPtr<ID3D11Buffer> pConstantBuffer;
......
...@@ -6,7 +6,7 @@ struct VSOut ...@@ -6,7 +6,7 @@ struct VSOut
cbuffer CBuf cbuffer CBuf
{ {
matrix transform; row_major matrix transform;
}; };
VSOut main( float2 pos : Position,float3 color : Color ) VSOut main( float2 pos : Position,float3 color : Color )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment