Amatsugu/black-hole
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I have no idea what i'm doing

Browse Source
This commit is contained in:
Amatsugu
2025-09-14 12:35:20 -04:00
parent a160d4d068
commit faa18bbd8c
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
assets/trace.wgsl
View File

@@ -39,16 +39,22 @@ fn update(@builtin(global_invocation_id) invocation_id: vec3<u32>) {
let loc = vec2<f32>(f32(invocation_id.x), f32(invocation_id.y)) / vec2<f32>(size.xy); let loc = vec2<f32>(f32(invocation_id.x), f32(invocation_id.y)) / vec2<f32>(size.xy);
let ndc = loc * 2.0f - 1.0f; let ndc = loc * 2.0f - 1.0f;
var ray = createCameraRay(ndc); var ray = createCameraRay2(ndc);
var result = vec3<f32>(0.0, 0.0, 0.0); var result = vec3<f32>(0.0);
var hit = trace(ray); for (var i: i32 = 0; i < 8; i++){
result += ray.energy * shade(&ray, hit); var hit = trace(ray);
result += ray.energy * shade(&ray, hit);
if !any(ray.energy != vec3<f32>(0.0))
{
break;
}
}
let clip = vec4<f32>(ndc, 0.0, 1.0); // let clip = vec4<f32>(ndc, 0.0, 1.0);
let world = config.world_from_clip * clip; // let world = config.world_from_clip * clip;
let world_pos = world.xyz / world.w; // let world_pos = world.xyz / world.w;
let dir = normalize(world_pos - config.world_position); // let dir = normalize(world_pos - config.world_position);
// let color = vec4<f32>((ray.direction * 0.5) + vec3<f32>(0.5), 1.0); // let color = vec4<f32>((ray.direction * 0.5) + vec3<f32>(0.5), 1.0);
@@ -84,7 +90,7 @@ struct Sphere
fn createRayHit() -> RayHit { fn createRayHit() -> RayHit {
var hit: RayHit; var hit: RayHit;
hit.position = vec3<f32>(0.0, 0.0, 0.0); hit.position = vec3<f32>(0.0, 0.0, 0.0);
hit.distance = 9999999.0f; hit.distance = 999999999999.0f;
hit.normal = vec3<f32>(0.0, 0.0, 0.0); hit.normal = vec3<f32>(0.0, 0.0, 0.0);
hit.albedo = vec3<f32>(0.0, 0.0, 0.0); hit.albedo = vec3<f32>(0.0, 0.0, 0.0);
hit.specular = vec3<f32>(0.0, 0.0, 0.0); hit.specular = vec3<f32>(0.0, 0.0, 0.0);
@@ -141,7 +147,7 @@ fn createSphere(position: vec3<f32>, radius: f32) -> Sphere
fn intersectSphere(ray: Ray, bestHit: ptr<function, RayHit>, sphereIndex: u32) fn intersectSphere(ray: Ray, bestHit: ptr<function, RayHit>, sphereIndex: u32)
{ {
//Sphere sphere = _Spheres[sphereIndex]; //Sphere sphere = _Spheres[sphereIndex];
var sphere = createSphere(vec3<f32>(0.0f, 0.0f, 0.0f), 2.0f); var sphere = createSphere(vec3<f32>(0.0f, 0.0f, 0.0f), 1.0f);
var d = ray.origin - sphere.position; var d = ray.origin - sphere.position;
@@ -184,15 +190,15 @@ fn intersectGroundPlane(ray: Ray, bestHit: ptr<function,RayHit>)
fn trace(ray: Ray) -> RayHit fn trace(ray: Ray) -> RayHit
{ {
var bestHit = createRayHit(); var bestHit = createRayHit();
intersectGroundPlane(ray, &bestHit);
intersectSphere(ray, &bestHit, 0); intersectSphere(ray, &bestHit, 0);
intersectGroundPlane(ray, &bestHit);
return bestHit; return bestHit;
} }
fn shade(ray: ptr<function, Ray>, hit: RayHit) -> vec3<f32> fn shade(ray: ptr<function, Ray>, hit: RayHit) -> vec3<f32>
{ {
if hit.distance < 9999999.0f if hit.distance < 999999999999.0f
{ {
(*ray).origin = hit.position + hit.normal * 0.001f; (*ray).origin = hit.position + hit.normal * 0.001f;
(*ray).direction = reflect((*ray).direction, hit.normal); (*ray).direction = reflect((*ray).direction, hit.normal);

13
src/app.rs
View File

@@ -83,13 +83,14 @@ fn setup(mut commands: Commands, mut images: ResMut<Assets<Image>>, window: Sing
commands.spawn(Camera2d); commands.spawn(Camera2d);
commands.spawn(( commands.spawn((
// Camera3d::default(), Camera3d::default(),
Projection::Perspective(PerspectiveProjection { Camera { order: -1, ..default() },
aspect_ratio: size.x as f32 / size.y as f32, // Projection::Perspective(PerspectiveProjection {
..default() // aspect_ratio: size.x as f32 / size.y as f32,
}), // ..default()
// }),
RTCamera, RTCamera,
Transform::from_xyz(0.0, 0.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y), Transform::from_xyz(0.0, 5.0, 20.0).looking_at(Vec3::ZERO, Vec3::Y),
Name::new("RT Camera"), Name::new("RT Camera"),
)); ));

18
src/render/pipeline.rs
View File

@@ -174,21 +174,19 @@ pub struct TracerImageBindGroups(pub [BindGroup; 2]);
fn update_tracer_uniforms( fn update_tracer_uniforms(
mut tracer_uniforms: ResMut<TracerUniforms>, mut tracer_uniforms: ResMut<TracerUniforms>,
rt_camera: Single<(&GlobalTransform, &Projection, &Camera), With<RTCamera>>, rt_camera: Single<(&GlobalTransform, &Camera), With<RTCamera>>,
) { ) {
let (transform, projection, cam) = rt_camera.into_inner(); let (transform, cam) = rt_camera.into_inner();
let view = transform.compute_matrix().inverse(); let view = transform.compute_matrix().inverse();
let clip_from_view = match projection { let clip_from_view = cam.clip_from_view();
Projection::Perspective(perspective_projection) => perspective_projection.get_clip_from_view(), let world_from_clip = view * clip_from_view.inverse();
_ => unreachable!("This should never happen: Invalid projection type on RT Camera"),
};
let clip_from_world = clip_from_view * view;
let world_from_clip = clip_from_world.inverse();
// info!("clip_from_view = {:?}", clip_from_view);
// info!("world_from_clip = {:?}", world_from_clip);
tracer_uniforms.world_from_clip = world_from_clip; tracer_uniforms.world_from_clip = world_from_clip;
tracer_uniforms.world_position = transform.translation(); tracer_uniforms.world_position = transform.translation();
// info!("clip_from_view = {:?}", clip_from_view);
// info!("world_from_clip = {:?}", world_from_clip);
} }
fn prepare_bind_groups( fn prepare_bind_groups(