Master/RayTracer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

voir le parsing

Browse Source
This commit is contained in:
H3XploR
2025-02-17 23:12:16 +01:00
parent e36cfb5fde
commit 490c585c48
7 changed files with 67 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
render.c
+10 -10
View File
@@ -6,13 +6,13 @@
/* By: yantoine <yantoine@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/17 19:24:30 by yantoine #+# #+# */
/* Updated: 2025/02/17 21:54:39 by yantoine ### ########.fr */
/* Updated: 2025/02/17 23:08:52 by yantoine ### ########.fr */
/* */
/* ************************************************************************** */
#include "miniRT.h"
static void render_pixel(t_app *app, int x, int y, t_scene scene)
static void render_pixel(t_app *app, int x, int y)
{
t_calc calc;
unsigned char r;
@@ -22,23 +22,23 @@ static void render_pixel(t_app *app, int x, int y, t_scene scene)
calc.ndc_x = (x + 0.5f) / app->win_width;
calc.ndc_y = (y + 0.5f) / app->win_height;
calc.aspect = (float)app->win_width / app->win_height;
calc.scale = tanf((app->fov * 0.5f) * (M_PI / 180.0f));
calc.scale = tanf((app->scene.camera.fov * 0.5f) * (M_PI / 180.0f));
calc.screen_x = (2 * calc.ndc_x - 1) * calc.aspect * calc.scale;
calc.screen_y = (1 - 2 * calc.ndc_y) * calc.scale;
calc.ray_dir = vec3_add(app->cam_dir,
vec3_add(vec3_scale(app->right, calc.screen_x),
vec3_scale(app->cam_up, calc.screen_y)));
calc.ray_dir = vec3_add(app->scene.camera.camDir,
vec3_add(vec3_scale(app->scene.camera.right, calc.screen_x),
vec3_scale(app->scene.camera.up, calc.screen_y)));
calc.ray_dir = vec3_normalize(calc.ray_dir);
calc.ray.origin = app->cam_pos;
calc.ray.origin = app->scene.camera.camPos;
calc.ray.dir = calc.ray_dir;
calc.color = trace(calc.ray, scene);
calc.color = trace(calc.ray, app->scene);
r = (unsigned char)(fminf(calc.color.x, 1.0f) * 255);
g = (unsigned char)(fminf(calc.color.y, 1.0f) * 255);
b = (unsigned char)(fminf(calc.color.z, 1.0f) * 255);
app->pixels[y * app->win_width + x] = (255 << 24) | (r << 16) | (g << 8) | b;
}
void render_scene(t_app *app, t_scene scene)
void render_scene(t_app *app)
{
int y;
int x;
@@ -49,7 +49,7 @@ void render_scene(t_app *app, t_scene scene)
x = 0;
while (x < app->win_width)
{
render_pixel(app, x, y, scene);
render_pixel(app, x, y);
x++;
}
y++;