Dev (#12)

* pre render stage to uptate cube corner

* [skip travis] Update cmake

* Skybox implementation

* Add sample 8k skybox

* conditionnal brew depend on the branch push

* not update to reduce built time (bugged so revert)

* cache brew (Not seen the effect for now)

* no update but cache

* reactivate update of brew

Author: nihuynh

.travis.yml

@@ -2,10 +2,10 @@
 addons:
   homebrew:
     packages:
-      - doxygen
-      - graphviz
       - sdl2
       - sdl2_image
+      - doxygen
+      - graphviz
     update: true
 branches:
   except:
@@ -33,3 +33,8 @@ script:
   - make test
   - if [ $TRAVIS_BRANCH == "master" ]; then doxygen Doxyfile; fi
 sudo: required
+before_cache:
+  - brew cleanup
+cache:
+  directories:
+    - $HOME/Library/Caches/Homebrew

CMakeLists.txt

@@ -31,8 +31,6 @@ target_link_libraries(RT rt)
 target_link_libraries(RT cimgui)
 target_link_libraries(RT imgui_impl)
 
-target_include_directories(RT PRIVATE lib/cimgui)
-
 find_package(OpenGL REQUIRED)
 
 target_link_libraries(RT ${OPENGL_gl_LIBRARY})
@@ -45,29 +43,43 @@ set_target_properties(RT
             RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
 
 target_sources(RT PRIVATE
-        srcs/interface/fullscreen.c
+        srcs/interface/anim_reset.c
+        srcs/interface/anim_set.c
+        srcs/interface/anim_toolbox.c
+        srcs/interface/delete_obj.c
         srcs/interface/interface.c
-        srcs/interface/interface_lists.c
-        srcs/interface/interface_menu.c
-        srcs/interface/interface_objects.c
-        srcs/interface/interface_scene.c
-        srcs/interface/interface_tools.c
         srcs/interface/new_object.c
-        srcs/interface/delete_obj.c
         srcs/interface/new_object_tools.c
         srcs/interface/object_tools.c
+        srcs/interface/screen_manager.c
+        srcs/interface/ui_anim.c
+        srcs/interface/ui_anim_selector.c
+        srcs/interface/ui_anim_toolbox.c
+        srcs/interface/ui_cam_win.c
+        srcs/interface/ui_camera_tab.c
+        srcs/interface/ui_csg.c
         srcs/interface/ui_edit_win.c
         srcs/interface/ui_file_win.c
+        srcs/interface/ui_lists.c
+        srcs/interface/ui_menu.c
+        srcs/interface/ui_objects.c
         srcs/interface/ui_render.c
-        srcs/interface/ui_cam_win.c
+        srcs/interface/ui_render_settings.c
+        srcs/interface/ui_scene_editor.c
         srcs/interface/ui_selector.c
+        srcs/interface/ui_tools.c
         srcs/parser/export.c
+        srcs/parser/export_anim.c
+        srcs/parser/export_anim_tools.c
         srcs/parser/export_csg.c
         srcs/parser/export_shape.c
         srcs/parser/export_toolbox.c
         srcs/parser/obj_data.c
         srcs/parser/obj_name.c
+        srcs/parser/parse_anim.c
+        srcs/parser/parse_anim_tools.c
         srcs/parser/parse_csg.c
+        srcs/parser/parse_shape.c
         srcs/parser/parse_toolbox.c
         srcs/parser/parse_txt.c
         srcs/parser/parse_utils.c
@@ -78,12 +90,15 @@ target_sources(RT PRIVATE
         srcs/render/cast.c
         srcs/render/filters.c
         srcs/render/light.c
+        srcs/render/normal_mapping.c
         srcs/render/perturbation.c
         srcs/render/post_process.c
         srcs/render/render.c
         srcs/render/texture_loader.c
         srcs/render/texture_toolbox.c
-        srcs/render/normal_mapping.c
+        srcs/render/skybox.c
+        srcs/render/perlin.c
+        srcs/render/perlin_texture.c
         srcs/render_utils
         srcs/render_utils/error_sdl.c
         srcs/render_utils/exit_sdl.c
@@ -95,13 +110,16 @@ target_sources(RT PRIVATE
         srcs/render_utils/render_sdl.c
         srcs/render_utils/render_time.c
         srcs/render_utils/save_screenshot.c
-        srcs/tools/free_scene.c
+        srcs/tools/animate.c
         srcs/tools/free.c
+        srcs/tools/free2.c
+        srcs/tools/free_scene.c
+        srcs/tools/get_scenes.c
+        srcs/tools/hook.c
+        srcs/tools/list_toolbox.c
+        srcs/tools/load_tools.c
         srcs/tools/reload.c
         srcs/tools/update.c
         srcs/tools/utils.c
-        srcs/tools/free.c
-        srcs/tools/get_scenes.c
-        srcs/csg.c
         srcs/key_mapping.c
         srcs/main.c)

Makefile

@@ -6,7 +6,7 @@
 #    By: nihuynh <[email protected]>            +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2018/09/27 19:33:22 by nihuynh           #+#    #+#              #
-#    Updated: 2019/06/26 04:00:32 by nihuynh          ###   ########.fr        #
+#    Updated: 2019/06/28 20:33:31 by nihuynh          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -29,7 +29,8 @@ PARSER		:=	export_csg.c export_shape.c export_toolbox.c export.c		   \
 				parse_anim.c
 RENDER		:=	camera.c cast.c filters.c light.c normal_mapping.c			   \
 				perturbation.c post_process.c render.c texture_loader.c		   \
-				texture_toolbox.c perlin.c perlin_texture.c
+				texture_toolbox.c perlin.c perlin_texture.c skybox.c		   \
+				pre_render.c
 RENDER_U	:=	init_sdl.c error_sdl.c exit_sdl.c render_sdl.c loop_sdl.c 	   \
 				init_mthr_sdl.c render_mthr_sdl.c save_screenshot.c			   \
 				render_pool.c render_time.c

includes/libui.h

@@ -6,7 +6,7 @@
 /*   By: nihuynh <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/11/28 03:32:43 by nihuynh           #+#    #+#             */
-/*   Updated: 2019/06/25 22:40:50 by nihuynh          ###   ########.fr       */
+/*   Updated: 2019/06/26 18:02:12 by nihuynh          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -60,6 +60,7 @@ struct				s_sdl
 	void			(*click_map)(SDL_Event *, void *);
 	void			(*update)(void *arg);
 	void			(*render_gui)(void *arg);
+	void			(*prep_render)(t_sdl *sdl);
 	bool			sepia;
 	bool			grayscale;
 	bool			cartoon;
@@ -107,7 +108,7 @@ void				render_sdl(t_sdl *sdl, int (*f) (int, int, void*), void *d);
 void				loop_sdl(t_sdl *sdl, void *arg);
 void				save_screenshot(t_sdl *sdl, char *arg);
 void				init_mthr_sdl(t_sdl *sdl, int (*do_pxl)(int, int, void*),
-									void *data);
+									void *data, void (*prep_render)(t_sdl*));
 void				render_mthr_sdl(t_sdl *sdl);
 void				apply_simple_filter(t_sdl *sdl, uint32_t (*fun) (uint32_t));
 

includes/parse.h

@@ -116,6 +116,7 @@ float			parse_fval(char *key, t_parse_txt *scene_file);
 t_vec3			parse_vector(char *key, t_parse_txt *scene_file);
 t_vec2			parse_vec2(char *key, t_parse_txt *scene_file);
 char			*parse_str(t_parse_txt *scene_file, char *key);
+t_texture		*parse_texture(char *key_name, t_parse_txt *scene_file);
 int				parse_int(char *key, t_parse_txt *scene_file);
 
 /*
@@ -158,7 +159,6 @@ void			cylinder_set(t_obj *obj, void *cylinder, t_parse_txt *scene_fi);
 void			plane_set(t_obj *obj, void *plane, t_parse_txt *scene_file);
 void			sphere_set(t_obj *obj, void *sphere, t_parse_txt *scene_file);
 void			csg_set(t_obj *obj, void *root, t_parse_txt *scene_file);
-void			set_min_max_corner(t_cube *cube);
 void			cube_set(t_obj *obj, void *root, t_parse_txt *scene_file);
 void			tore_set(t_obj *obj, void *root, t_parse_txt *scene_file);
 

includes/render.h

@@ -35,6 +35,7 @@ void			set_direction(t_cam *cam, t_vec3 direction);
 void			cam_ray(t_data *app, t_ray *res, float x, float y);
 t_color			cast_light_primary(t_list *obj_list, t_inter *inter);
 t_vec3			compute_shading_normal(t_material mat, t_vec3 uv, t_vec3 geo_n);
+t_color			get_sky_color(t_scene scene, t_settings settings, t_ray ray);
 
 void			update_camera(t_cam *cam, bool *needs_render);
 

includes/t_data.h

@@ -6,7 +6,7 @@
 /*   By: nihuynh <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/06/03 00:06:56 by nihuynh           #+#    #+#             */
-/*   Updated: 2019/06/26 01:20:56 by nihuynh          ###   ########.fr       */
+/*   Updated: 2019/06/26 17:46:31 by nihuynh          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -40,6 +40,7 @@ typedef struct	s_data
 */
 
 int				process_pixel(int x, int y, void *arg);
+void			prep_render(t_sdl *sdl);
 t_obj			*find_obj_at_pixel(t_data *app, int x, int y);
 void			interface(t_data *app);
 t_data			*get_app(t_data *app);

includes/t_scene.h

@@ -23,6 +23,7 @@ typedef struct	s_scene
 	t_list		*lst_anim_light;
 	int			nb_objs[7];
 	int			nb_light;
+	t_texture	*skybox;
 }				t_scene;
 
 typedef struct	s_scene_name

includes/t_settings.h

@@ -30,6 +30,7 @@ typedef struct	s_settings
 	bool		anti_a;
 	bool		debug_normal;
 	bool		normal_mapping;
+	bool		skybox;
 	int			depth_max;
 	float		fov;
 }				t_settings;