add cone

Author: smatsuodev

include/debug.h

@@ -22,6 +22,7 @@ void	print_rgb(t_rgb color, bool newline);
 void	print_sphere_conf(t_sphere_conf conf);
 void	print_plane_conf(t_plane_conf conf);
 void	print_cylinder_conf(t_cylinder_conf conf);
+void	print_cone_conf(t_cone_conf conf);
 void	print_material(t_material mat);
 
 #endif

include/scene.h

@@ -6,7 +6,7 @@
 /*   By: kemizuki <[email protected]>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/12/16 06:43:04 by kemizuki          #+#    #+#             */
-/*   Updated: 2023/12/19 02:57:11 by kemizuki         ###   ########.fr       */
+/*   Updated: 2023/12/27 20:46:16 by smatsuo          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -74,7 +74,7 @@ typedef struct s_cylinder_conf
 
 typedef struct s_cone_conf
 {
-	t_vec3			center;
+	t_vec3			apex;
 	t_vec3			axis;
 	double			radius;
 	double			height;

include/tracer.h

@@ -48,6 +48,8 @@ bool			hit_cylinder(t_object *cyl, t_ray ray, double tmin,
 					t_hit_record *rec);
 bool			hit_circle(t_object *circ, t_ray ray, double tmin,
 					t_hit_record *rec);
+bool			hit_cone(t_object *cone, t_ray ray, double tmin,
+					t_hit_record *rec);
 
 typedef struct s_quadratic
 {

scenes/cone_plane.rt

@@ -0,0 +1,5 @@
+A 0.2 255,255,255
+C 0,100,100 0,-0.707,-0.707 30
+L 200,200,200 0.8 255,255,255
+co 0,0,0 0,1,0 20 20 180,20,30
+pl 0,0,0 0,1,0 255,255,255

src/debug/print_config.c

@@ -49,6 +49,8 @@ static void	print_objects(t_list *objects, int indent)
 			print_sphere_conf(*(t_sphere_conf *)obj->conf);
 		else if (obj->type == OBJ_CYLINDER)
 			print_cylinder_conf(*(t_cylinder_conf *)obj->conf);
+		else if (obj->type == OBJ_CONE)
+			print_cone_conf(*(t_cone_conf *)obj->conf);
 		printf("%*s", indent + 2, "");
 		print_material(obj->material);
 		node = node->next;

src/debug/print_object.c

@@ -6,7 +6,7 @@
 /*   By: kemizuki <[email protected]>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/12/16 21:27:24 by kemizuki          #+#    #+#             */
-/*   Updated: 2023/12/26 07:07:20 by kemizuki         ###   ########.fr       */
+/*   Updated: 2023/12/27 22:40:31 by smatsuo          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -41,6 +41,17 @@ void	print_cylinder_conf(t_cylinder_conf conf)
 	print_rgb(conf.color, true);
 }
 
+void	print_cone_conf(t_cone_conf conf)
+{
+	printf("Cone: apex=");
+	print_vec(conf.apex, false);
+	printf(", axis=");
+	print_vec(conf.axis, false);
+	printf(", diameter=%.1lf, height=%.1lf, color=",
+		conf.radius * 2, conf.height);
+	print_rgb(conf.color, true);
+}
+
 void	print_material(t_material mat)
 {
 	printf("Material: diffuse=%.1lf, specular=%.1lf, "

src/scene/parse_line_each_object.c

@@ -91,7 +91,7 @@ t_cone_conf	parse_cone(const char *line)
 	if (array_size(split) != 6)
 		exit_with_error(EXIT_PARSE_ERROR, "cone: invalid format");
 	conf = (t_cone_conf){
-		.center = parse_vec3(split[1]),
+		.apex = parse_vec3(split[1]),
 		.axis = parse_vec3(split[2]),
 		.radius = parse_double(split[3]) / 2,
 		.height = parse_double(split[4]),

src/scene/parse_line_object.c

@@ -38,7 +38,7 @@ static void	parse_object_conf(t_object *object, const char *line)
 		init_object(object, OBJ_CYLINDER, sizeof(t_cylinder_conf));
 		*(t_cylinder_conf *)object->conf = parse_cylinder(line);
 	}
-	else if (ft_strncmp(line, "cy", 2) == 0)
+	else if (ft_strncmp(line, "co", 2) == 0)
 	{
 		init_object(object, OBJ_CONE, sizeof(t_cone_conf));
 		*(t_cone_conf *)object->conf = parse_cone(line);

src/tracer/hit_cone.c

@@ -0,0 +1,77 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   hit_cone.c                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: smatsuo <[email protected]>       +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/12/27 20:22:42 by smatsuo           #+#    #+#             */
+/*   Updated: 2023/12/27 22:40:01 by smatsuo          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "tracer.h"
+
+static bool	set_rec(t_object *cone, t_ray ray, double t, t_hit_record *rec)
+{
+	const t_cone_conf	conf = *(t_cone_conf *)cone->conf;
+	const t_vec3		pc = vec3_sub(ray_at(ray, t), conf.apex);
+
+	rec->t = t;
+	rec->point = ray_at(ray, t);
+	rec->normal = vec3_normalize(vec3_sub(pc, vec3_scale(conf.axis,
+					vec3_dot(pc, pc) / vec3_dot(conf.axis, pc))));
+	rec->material = cone->material;
+	rec->object_color = conf.color;
+	return (true);
+}
+
+static bool	is_hit_side(t_cone_conf conf, t_ray ray, double t)
+{
+	const t_vec3	co = vec3_sub(ray_at(ray, t), conf.apex);
+
+	return (vec3_dot(co, conf.axis) > 0
+		&& vec3_length(vec3_project(co, conf.axis)) <= conf.height);
+}
+
+static bool	hit_cone_cap(t_object *cone, t_ray ray, double tmin,
+								t_hit_record *rec)
+{
+	const t_cone_conf	conf = *(t_cone_conf *)cone->conf;
+	t_object			circle;
+
+	circle = (t_object){
+		.type = OBJ_CIRCLE,
+		.conf = &(t_circle_conf){
+		.center = vec3_add_scaled(conf.apex, conf.axis, conf.height),
+		.normal = conf.axis,
+		.radius = conf.radius,
+		.color = conf.color},
+		.material = cone->material};
+	return (hit_circle(&circle, ray, tmin, rec));
+}
+
+bool	hit_cone(t_object *cone, t_ray ray, double tmin, t_hit_record *rec)
+{
+	const t_cone_conf	conf = *(t_cone_conf *)cone->conf;
+	t_quadratic			q;
+	const double		cos_2 = pow(cos(atan2(conf.radius, conf.height)), 2);
+	const t_vec3		oc = vec3_sub(ray.origin, conf.apex);
+
+	q.a = pow(vec3_dot(ray.direction, conf.axis), 2)
+		- vec3_length_squared(ray.direction) * cos_2;
+	q.half_b = vec3_dot(ray.direction, conf.axis) * vec3_dot(oc, conf.axis)
+		- vec3_dot(ray.direction, vec3_scale(oc, cos_2));
+	q.c = pow(vec3_dot(oc, conf.axis), 2)
+		- vec3_dot(oc, vec3_scale(oc, cos_2));
+	solve_quadratic(&q);
+	if (!q.solved)
+		return (false);
+	if (q.t1 > tmin && is_hit_side(conf, ray, q.t1))
+		return (set_rec(cone, ray, q.t1, rec));
+	if (hit_cone_cap(cone, ray, tmin, rec))
+		return (true);
+	if (q.t2 > tmin && is_hit_side(conf, ray, q.t2))
+		return (set_rec(cone, ray, q.t2, rec));
+	return (false);
+}

src/tracer/hit_func.c

@@ -20,5 +20,7 @@ t_hit_func	get_hit_func(t_object *obj)
 		return (hit_plane);
 	else if (obj->type == OBJ_CYLINDER)
 		return (hit_cylinder);
+	else if (obj->type == OBJ_CONE)
+		return (hit_cone);
 	return (NULL);
 }

src/tracer/quadratic.c

@@ -24,6 +24,14 @@ void	solve_quadratic(t_quadratic *q)
 	if (discriminant < 0)
 		return ;
 	q->solved = true;
-	q->t1 = (-q->half_b - sqrt(discriminant)) / q->a;
-	q->t2 = (-q->half_b + sqrt(discriminant)) / q->a;
+	if (q->a < 0)
+	{
+		q->t1 = (-q->half_b + sqrt(discriminant)) / q->a;
+		q->t2 = (-q->half_b - sqrt(discriminant)) / q->a;
+	}
+	else
+	{
+		q->t1 = (-q->half_b - sqrt(discriminant)) / q->a;
+		q->t2 = (-q->half_b + sqrt(discriminant)) / q->a;
+	}
 }