bilbo/vulkan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

collada: pass light node position to shader

Browse Source
This commit is contained in:
Zack Buhman 2026-04-14 19:25:31 -05:00
parent 2b0b29aeb9
commit c395b3e7bb
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/collada/scene/vulkan.h
View File

@ -143,6 +143,7 @@ namespace collada::scene {
void transfer_transforms(XMMATRIX const & projection, void transfer_transforms(XMMATRIX const & projection,
XMMATRIX const & view, XMMATRIX const & view,
XMVECTOR const & light_position_world,
int nodes_count, int nodes_count,
instance_types::node const * const node_instances); instance_types::node const * const node_instances);

4
shader/collada.hlsl
View File

@ -70,6 +70,8 @@ float4 PSMain(VSOutput input) : SV_TARGET
{ {
//float3 color = texture.Sample(samplers[0], input.Texture).bgr; //float3 color = texture.Sample(samplers[0], input.Texture).bgr;
float4 diffuseColor = MaterialColors[constants.MaterialIndex].Diffuse; float4 diffuseColor = MaterialColors[constants.MaterialIndex].Diffuse;
float4 specularColor = MaterialColors[constants.MaterialIndex].Specular;
float4 emissionColor = MaterialColors[constants.MaterialIndex].Emission;
float3 N = normalize(input.Normal); float3 N = normalize(input.Normal);
float3 L = normalize(input.LightDirection); float3 L = normalize(input.LightDirection);
@ -81,5 +83,5 @@ float4 PSMain(VSOutput input) : SV_TARGET
float3 specular = pow(max(dot(R, V), 0), a) * specularIntensity; float3 specular = pow(max(dot(R, V), 0), a) * specularIntensity;
float3 diffuse = max(dot(N, L), 0.001); float3 diffuse = max(dot(N, L), 0.001);
return float4(diffuse * diffuseColor.xyz + specular, 1.0); return float4(diffuse * diffuseColor.xyz + specular * specularColor.xyz + emissionColor.xyz, 1.0);
} }

5
src/collada/scene/vulkan.cpp
View File

@ -685,13 +685,14 @@ namespace collada::scene {
void vulkan::transfer_transforms(XMMATRIX const & projection, void vulkan::transfer_transforms(XMMATRIX const & projection,
XMMATRIX const & view, XMMATRIX const & view,
XMVECTOR const & light_position_world,
int nodes_count, int nodes_count,
instance_types::node const * const node_instances) instance_types::node const * const node_instances)
{ {
// store // store
XMStoreFloat4x4(&shaderData.scene.projection, projection); XMStoreFloat4x4(&shaderData.scene.projection, projection);
XMVECTOR lightPosition = XMVector3Transform(XMVectorSet(-42, -40, 156, 0), view); XMVECTOR lightPositionView = XMVector3Transform(light_position_world, view);
XMStoreFloat4(&shaderData.scene.lightPosition, lightPosition); XMStoreFloat4(&shaderData.scene.lightPosition, lightPositionView);
for (int i = 0; i < nodes_count; i++) { for (int i = 0; i < nodes_count; i++) {
XMMATRIX model_view = node_instances[i].world * view; XMMATRIX model_view = node_instances[i].world * view;

5
src/main.cpp
View File

@ -1206,6 +1206,7 @@ int main()
int cameraIndex = collada_state.find_node_index_by_name("Camera001"); int cameraIndex = collada_state.find_node_index_by_name("Camera001");
int cameraTargetIndex = collada_state.find_node_index_by_name("Camera001.Target"); int cameraTargetIndex = collada_state.find_node_index_by_name("Camera001.Target");
int lightIndex = collada_state.find_node_index_by_name("DirectLight");
while (quit == false) { while (quit == false) {
SDL_Event event; SDL_Event event;
@ -1387,8 +1388,12 @@ int main()
XMMATRIX view = currentView(collada_state.node_state.node_instances[cameraIndex], XMMATRIX view = currentView(collada_state.node_state.node_instances[cameraIndex],
collada_state.node_state.node_instances[cameraTargetIndex]); collada_state.node_state.node_instances[cameraTargetIndex]);
collada::instance_types::node const & lightNode = collada_state.node_state.node_instances[lightIndex];
XMVECTOR lightPositionWorld = XMVector3Transform(XMVectorZero(), lightNode.world);
collada_state.vulkan.transfer_transforms(projection, collada_state.vulkan.transfer_transforms(projection,
view, view,
lightPositionWorld,
collada_state.descriptor->nodes_count, collada_state.descriptor->nodes_count,
collada_state.node_state.node_instances); collada_state.node_state.node_instances);
collada_state.draw(); collada_state.draw();