+ Better camera and scene change

This commit is contained in:
TheRedShip
2025-01-02 17:10:09 +01:00
parent 5d92a82b66
commit 1c619b76d1
3 changed files with 11 additions and 10 deletions

View File

@ -45,8 +45,8 @@ class Camera
glm::vec3 _acceleration; glm::vec3 _acceleration;
float _maxSpeed = 8.0f; float _maxSpeed = 8.0f;
float _acceleration_rate = 40.0f; float _acceleration_rate = 100.0f;
float _deceleration_rate = 40.0f; float _deceleration_rate = 50.0f;
float _sensitivity = 0.2f; float _sensitivity = 0.2f;
}; };

View File

@ -2,15 +2,15 @@
MAT 255 255 255 0.0 0.0 0.0 MAT 255 255 255 0.0 0.0 0.0
MAT 255 255 255 2.0 0.0 0.0 MAT 255 255 255 2.0 0.0 0.0
MAT 255 0 0 0.0 0.0 0.0 MAT 255 100 100 0.0 0.0 0.0
MAT 0 150 255 0.0 0.0 0.0 MAT 100 100 255 0.0 0.0 0.0
MAT 150 255 150 0.0 0.0 0.0 MAT 100 255 100 0.0 0.0 0.0
MAT 255 255 255 0.0 1.0 0.0 MAT 255 255 255 0.0 1.0 0.0
sp 0 7.5 0 5 1 # sp 0 7.5 0 5 1
sp 0 1 0 0.5 5 sp 0 -1 0 0.5 5
sp 0 -2 -1 1 2 sp 0 -2 -1 1 2
sp -1 -2 0.8 1 3 sp -1 -2 0.8 1 3
@ -18,9 +18,9 @@ sp 1 -2 0.8 1 4
pl 0 -3 0 0 1 0 0 pl 0 -3 0 0 1 0 0
pl 3 0 0 -1 0 0 0 pl 3 0 0 -1 0 0 3
pl -3 0 0 1 0 0 0 pl -3 0 0 1 0 0 2
pl 0 3 0 0 -1 0 0 pl 0 3 0 0 -1 0 1
pl 0 0 -3 0 0 1 0 pl 0 0 -3 0 0 1 0
pl 0 0 3 0 0 -1 0 pl 0 0 3 0 0 -1 0

View File

@ -134,6 +134,7 @@ void main()
Ray ray = Ray(u_cameraPosition, ray_direction); Ray ray = Ray(u_cameraPosition, ray_direction);
vec3 color = pathtrace(ray, uv); vec3 color = pathtrace(ray, uv);
// color = vec3(sqrt(color.x), sqrt(color.y), sqrt(color.z));
float blend = 1.0 / float(u_frameCount + 1); float blend = 1.0 / float(u_frameCount + 1);
vec4 accum = imageLoad(accumulation_image, pixel_coords); vec4 accum = imageLoad(accumulation_image, pixel_coords);