This commit is contained in:
H3XploR
2025-02-17 22:09:31 +01:00
parent 557de2b0a7
commit e36cfb5fde
27 changed files with 912 additions and 953 deletions
+9 -7
View File
@@ -6,33 +6,35 @@
/* By: yantoine <yantoine@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/15 19:46:16 by yantoine #+# #+# */
/* Updated: 2025/02/17 17:31:42 by yantoine ### ########.fr */
/* Updated: 2025/02/17 21:31:36 by yantoine ### ########.fr */
/* */
/* ************************************************************************** */
#include "miniRT.h"
t_scene parsing_sphere(const char *line, t_scene scene)
t_scene parsing_sphere(t_scene scene)
{
const char **tokens = get_tokens_secure(scene, scene.numSpheres, MAX_SPHERES, 4);
char **tokens;
tokens = get_tokens_secure(scene, scene.numSpheres, MAX_SPHERES, 4);
scene.token_if_exit = tokens;
scene.spheres[scene.numSpheres].center = parse_vector(tokens[1], scene);
scene.spheres[scene.numSpheres].radius = ft_atof(tokens[2], scene) / 2.0f;
scene.spheres[scene.numSpheres].radius = ft_atof(tokens[2]) / 2.0f;
scene.spheres[scene.numSpheres].color = parse_color(tokens[3], scene);
ft_free_array(tokens);
scene.numSpheres++;
return (scene);
}
float intersectSphere(Ray ray, Sphere s, t_vec3 *hitNormal)
float intersectSphere(t_ray ray, t_sphere s, t_vec3 *hitNormal)
{
t_calc calc;
calc.oc = vec3_sub(ray.origin, s.center);
calc.a = vec3_dot(ray.dir, ray.dir);
calc.b = 2.0f * vec3_dot(calc.oc, ray.dir);
c = vec3_dot(calc.oc, calc.oc) - s.radius * s.radius;
calc.disc = calc.b * calc.b - 4 * calc.a * c;
calc.c = vec3_dot(calc.oc, calc.oc) - s.radius * s.radius;
calc.disc = calc.b * calc.b - 4 * calc.a * calc.c;
if (calc.disc < 0)
return (-1);
calc.sqrtDisc = sqrtf(calc.disc);