overhauled physics engine

res/shaders/Debug.slang

@@ -0,0 +1,34 @@
+import Common;
+
+struct DebugVertex
+{
+    float3 position;
+    float3 color;
+};
+
+struct VertexStageOutput
+{
+    float3 color : VERTEX_COLOR;
+    float4 position : SV_Position;
+};
+
+[shader("vertex")]
+VertexStageOutput vertexMain(
+    DebugVertex input)
+{
+    VertexStageOutput output;
+    float4 viewpos = mul(gViewParams.viewMatrix, float4(input.position, 1.0f));
+    output.position = mul(gViewParams.projectionMatrix, viewpos);
+    output.color = input.color;
+    return output;
+}
+
+
+[shader("fragment")]
+float4 fragmentMain(
+    float3 color : VERTEX_COLOR,
+    float4 position : SV_Position
+    ) : SV_Target
+{
+    return float4(color, 1.0f);
+}

res/shaders/lib/PrimitiveSceneData.slang

@@ -6,4 +6,12 @@ struct PrimitiveSceneData
 };
 
 layout(set = INDEX_SCENE_DATA, binding = 0, std430)
-ConstantBuffer<PrimitiveSceneData> gSceneData;
+StructuredBuffer<PrimitiveSceneData> gSceneData;
+
+[[vk::push_constant]]
+ConstantBuffer<uint> gSceneDataIndex;
+
+PrimitiveSceneData getSceneData()
+{
+    return gSceneData[gSceneDataIndex];
+}

res/shaders/lib/StaticMeshVertexInput.slang

@@ -131,9 +131,10 @@ struct VertexShaderInput
     
     float3 getWorldPosition()
     {
-        float4x4 localToWorld = gSceneData.localToWorld;
+        float4x4 localToWorld = getSceneData().localToWorld;
         float3 rotatedPosition = localToWorld[0].xyz * position.xxx + localToWorld[1].xyz * position.yyy + localToWorld[2].xyz * position.zzz;
-        return rotatedPosition + localToWorld[3].xyz;
+        return mul(getSceneData().localToWorld, position).xyz;
+        //rotatedPosition + float3(localToWorld[0].w, localToWorld[1].w, localToWorld[2].w);
     }
 
     VertexValueCache getVertexCache()
@@ -152,9 +153,9 @@ struct VertexShaderInput
         cache.tangentToLocal[1] = tangentToLocal[1];
         cache.tangentToLocal[2] = tangentToLocal[2];
 
-        cache.tangentToWorld[0] = mul(gSceneData.localToWorld, float4(tangentToLocal[0], 0.0f)).xyz;
-        cache.tangentToWorld[1] = mul(gSceneData.localToWorld, float4(tangentToLocal[1], 0.0f)).xyz;
-        cache.tangentToWorld[2] = mul(gSceneData.localToWorld, float4(tangentToLocal[2], 0.0f)).xyz;
+        cache.tangentToWorld[0] = mul(getSceneData().localToWorld, float4(tangentToLocal[0], 0.0f)).xyz;
+        cache.tangentToWorld[1] = mul(getSceneData().localToWorld, float4(tangentToLocal[1], 0.0f)).xyz;
+        cache.tangentToWorld[2] = mul(getSceneData().localToWorld, float4(tangentToLocal[2], 0.0f)).xyz;
 
         return cache;
     }
@@ -183,9 +184,9 @@ struct VertexShaderInput
     {
         ShaderAttributeInterpolation result = (ShaderAttributeInterpolation)0;
         float3x3 tangentToWorld = cache.getTangentToWorld();
-        result.normal = mul(gSceneData.localToWorld, float4(normal, 0.0f)).xyz;
-        result.tangent = mul(gSceneData.localToWorld, float4(tangent, 0.0f)).xyz;
-        result.biTangent = mul(gSceneData.localToWorld, float4(biTangent, 0.0f)).xyz;
+        result.normal = mul(getSceneData().localToWorld, float4(normal, 0.0f)).xyz;
+        result.tangent = mul(getSceneData().localToWorld, float4(tangent, 0.0f)).xyz;
+        result.biTangent = mul(getSceneData().localToWorld, float4(biTangent, 0.0f)).xyz;
         result.color = color;
         result.worldPosition = vertexParams.worldPosition;
         result.viewPosition = vertexParams.viewPosition;
@@ -215,8 +216,9 @@ struct PositionOnlyVertexShaderInput
 #endif // USE_INSTANCING
     float3 getWorldPosition()
     {
-        float4x4 localToWorld = gSceneData.localToWorld;
+        float4x4 localToWorld = getSceneData().localToWorld;
         float3 rotatedPosition = localToWorld[0].xyz * position.xxx + localToWorld[1].xyz * position.yyy + localToWorld[2].xyz * position.zzz;
-        return rotatedPosition + localToWorld[3].xyz;
+        return mul(getSceneData().localToWorld, position).xyz;
+        //rotatedPosition + float3(localToWorld[0].w, localToWorld[1].w, localToWorld[2].w);
     }
 };