a bit of stuff, time to add spirv-link into this project

funnyassets/materials/cube.fmat

@@ -1,4 +1,4 @@
 {
-	"shader": "mesh_raster.shader",
-	"albedo": "bricks.png"
+	"shader": "funny_basic_pbr",
+	"AlbedoTexture": "game/core/textures/bricks.png"
 }

funnyassets/materials/error.fmat

@@ -0,0 +1,3 @@
+{
+	"shader": "funny_error",
+}

funnyassets/models/cube.fmdl

@@ -1,7 +1,4 @@
-[
 {
-	"model": "cube.fmesh",
-	"material": "cube.fmat",
-	"physics": "cube.fmesh"
+	"mesh": "cube.fmesh",
+	"material": "cube.fmat"
 }
-]

funnyassets/shaders/funny_error.shader

@@ -0,0 +1,9 @@
+#include "macros.hlsl"
+
+BRDF
+{
+	float4 brdfMain()
+	{
+		return float4(1);
+	}
+}

funnyassets/shaders/macros.hlsl

@@ -15,4 +15,10 @@
 #define PS namespace PixelShader_DO_NOT_USE
 #endif
 
+#ifdef BRDF_SHADER
+#define BRDF using namespace BRDFShader; namespace BRDFShader 
+#else
+#define BRDF namespace BRDFShader_DO_NOT_USE
+#endif
+
 #endif

funnyassets/shaders/mesh_trace.shader

@@ -0,0 +1 @@
+#include "macros.hlsl"

funnyassets/shaders/ray_trace.hlsl

@@ -0,0 +1,30 @@
+#ifndef RAY_TRACE_H
+#define RAY_TRACE_H
+
+#ifdef SOFTWARE_RAY_TRACING
+struct funnyAccelerationStructure
+{
+
+}
+#else
+struct funnyAccelerationStructure
+{
+	RaytracingAccelerationStructure accel;
+}
+#endif
+
+struct funnyHitObject
+{
+	static funnyHitObject TraceRay<T>(
+		funnyAccelerationStructure AccelerationStructure,
+		uint RayFlags,
+		uint InstanceInclusionMask,
+		uint RayContributionToHitGroupIndex,
+		uint MultiplierForGeometryContributionToHitGroupIndex,
+		uint MissShaderIndex,
+		RayDesc Ray,
+		inout T Payload
+	);
+};
+
+#endif