networking i guess
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"mesh": "game/core/meshes/cube.fmesh_c",
|
||||
"material": "cube.fmat"
|
||||
"material": "game/core/materials/cube.fmat"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,12 @@
|
||||
#define PS namespace PixelShader_DO_NOT_USE
|
||||
#endif
|
||||
|
||||
#ifdef RAY_SHADER
|
||||
#define RAY using namespace RAYShader; namespace RAYShader
|
||||
#else
|
||||
#define RAY namespace RAYShader_DO_NOT_USE
|
||||
#endif
|
||||
|
||||
#ifdef BRDF_SHADER
|
||||
#define BRDF using namespace BRDFShader; namespace BRDFShader
|
||||
#else
|
||||
|
||||
@@ -1 +1,30 @@
|
||||
#include "macros.hlsl"
|
||||
#include "ray_trace.hlsl"
|
||||
|
||||
struct MeshPayload
|
||||
{
|
||||
float3 m_vColor;
|
||||
}
|
||||
|
||||
RAY
|
||||
{
|
||||
funnyAccelerationStructure g_asGlobal;
|
||||
Texture2D<float> g_tWorldSpaceCoords;
|
||||
RWTexture2D<float> g_tDirectImage;
|
||||
RWTexture2D<float> g_tIndirectImage;
|
||||
|
||||
|
||||
void rayMain()
|
||||
{
|
||||
/*
|
||||
uint2 pixel = DispatchRaysIndex().xy;
|
||||
MeshPayload p;
|
||||
RayDesc ray;
|
||||
ray.Origin = g_tWorldSpaceCoords[pixel];
|
||||
ray.Direction = float3(1,0,0);
|
||||
ray.TMin = 0.001;
|
||||
ray.TMax = 10000;
|
||||
funnyHitObject hit = funnyHitObject::TraceRay(g_asGlobal, RAY_FLAG_NONE, 0xFF, 0, 1, 0, ray, p);
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,15 +2,9 @@
|
||||
#define RAY_TRACE_H
|
||||
|
||||
#ifdef SOFTWARE_RAY_TRACING
|
||||
struct funnyAccelerationStructure
|
||||
{
|
||||
|
||||
}
|
||||
typedef Buffer<uint8_t> funnyAccelerationStructure
|
||||
#else
|
||||
struct funnyAccelerationStructure
|
||||
{
|
||||
RaytracingAccelerationStructure accel;
|
||||
}
|
||||
typedef RaytracingAccelerationStructure funnyAccelerationStructure
|
||||
#endif
|
||||
|
||||
struct funnyHitObject
|
||||
|
||||
Reference in New Issue
Block a user