Fixed handedness of view and proj.
This commit is contained in:
parent
e0e4a6a766
commit
1a9fac5e21
|
|
@ -122,7 +122,7 @@
|
||||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
</Link>
|
</Link>
|
||||||
<CustomBuild>
|
<CustomBuild>
|
||||||
<Command>slangc %(FullPath) -profile sm_6_6 -target spirv -o %(Filename).spv</Command>
|
<Command>slangc %(FullPath) -profile sm_6_6 -target spirv -matrix-layout-column-major -o %(Filename).spv</Command>
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<CustomBuild>
|
<CustomBuild>
|
||||||
<Message>Compiling %(Filename)</Message>
|
<Message>Compiling %(Filename)</Message>
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ SDL_AppResult SDL_AppInit( void** appstate, int, char** )
|
||||||
|
|
||||||
Blaze::MiscData::DirectionalLight dir_light[] = {
|
Blaze::MiscData::DirectionalLight dir_light[] = {
|
||||||
{
|
{
|
||||||
.direction = { 1.0f, -1.0f, 0.0f },
|
.direction = { -1.0f, -1.0f, -1.0f },
|
||||||
.color = { 12.0f, 10.0f, 5.0f },
|
.color = { 12.0f, 10.0f, 5.0f },
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
@ -143,7 +143,7 @@ SDL_AppResult SDL_AppIterate( void* appstate )
|
||||||
VK_CHECK( vkAcquireNextImageKHR(
|
VK_CHECK( vkAcquireNextImageKHR(
|
||||||
render_device.device,
|
render_device.device,
|
||||||
render_device.swapchain,
|
render_device.swapchain,
|
||||||
std::numeric_limits<uint32_t>::max(),
|
UINT32_MAX,
|
||||||
current_frame.imageAcquiredSemaphore,
|
current_frame.imageAcquiredSemaphore,
|
||||||
nullptr,
|
nullptr,
|
||||||
¤t_image_index ) );
|
¤t_image_index ) );
|
||||||
|
|
|
||||||
|
|
@ -161,7 +161,7 @@ bool MiscData::Init( RenderDevice const& render_device )
|
||||||
.depthClampEnable = VK_TRUE,
|
.depthClampEnable = VK_TRUE,
|
||||||
.rasterizerDiscardEnable = VK_FALSE,
|
.rasterizerDiscardEnable = VK_FALSE,
|
||||||
.polygonMode = VK_POLYGON_MODE_FILL,
|
.polygonMode = VK_POLYGON_MODE_FILL,
|
||||||
.cullMode = VK_CULL_MODE_NONE,
|
.cullMode = VK_CULL_MODE_BACK_BIT,
|
||||||
.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE,
|
.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE,
|
||||||
.depthBiasEnable = VK_FALSE,
|
.depthBiasEnable = VK_FALSE,
|
||||||
.depthBiasConstantFactor = 0.0f,
|
.depthBiasConstantFactor = 0.0f,
|
||||||
|
|
@ -268,12 +268,12 @@ bool MiscData::Init( RenderDevice const& render_device )
|
||||||
|
|
||||||
// Camera
|
// Camera
|
||||||
{
|
{
|
||||||
cameraData.cameraPosition = DirectX::XMVectorSet( 0.0f, 2.0f, -2.0f, 1.0f );
|
cameraData.cameraPosition = DirectX::XMVectorSet( 0.0f, 1.0f, 2.0f, 1.0f );
|
||||||
cameraTarget = DirectX::XMVectorSet( 0.0f, 0.0f, 0.0f, 1.0f );
|
cameraTarget = DirectX::XMVectorSet( 0.0f, 0.0f, 0.0f, 1.0f );
|
||||||
cameraUp = DirectX::XMVectorSet( 0.0f, 1.0f, 0.0f, 1.0f );
|
cameraUp = DirectX::XMVectorSet( 0.0f, 1.0f, 0.0f, 1.0f );
|
||||||
cameraData.viewMatrix = DirectX::XMMatrixLookAtLH( cameraData.cameraPosition, cameraTarget, cameraUp );
|
cameraData.viewMatrix = DirectX::XMMatrixLookAtRH( cameraData.cameraPosition, cameraTarget, cameraUp );
|
||||||
cameraData.projectionMatrix =
|
cameraData.projectionMatrix =
|
||||||
DirectX::XMMatrixPerspectiveFovLH( DirectX::XMConvertToRadians( 70.0f ), 16.0f / 9.0f, 0.1f, 1000.0f );
|
DirectX::XMMatrixPerspectiveFovRH( DirectX::XMConvertToRadians( 70.0f ), 16.0f / 9.0f, 0.1f, 1000.0f );
|
||||||
|
|
||||||
cameraUniformBufferSize = sizeof( CameraData ) + sizeof( LightData );
|
cameraUniformBufferSize = sizeof( CameraData ) + sizeof( LightData );
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue