lint werrors fix, gltf widget params, small fixes and features, camer…

…a fix
gagistech · Jul 13, 2024 · cd06953 · cd06953
1 parent 5b75542
commit cd06953
Show file tree

Hide file tree

Showing 25 changed files with 363 additions and 597 deletions.
diff --git a/config/rel.mk b/config/rel.mk
@@ -2,7 +2,7 @@ include $(config_dir)base/base.mk
 
 this_cxxflags += -O3
 
-#this_lint_cmd = $(prorab_lint_cmd_clang_tidy)
+this_lint_cmd = $(prorab_lint_cmd_clang_tidy)
 
 # WORKAROUND: on ubuntu jammy dpkg-buildpackage passes -ffat-lto-objects compilation flag
 # which is not supported by clang and clang-tidy complains about it:

diff --git a/res/main.res b/res/main.res
@@ -89,11 +89,24 @@ texture_default_normal{
 tex_cube_env_hata{
 	file_px{envs/hata/px.png}
 	file_nx{envs/hata/nx.png}
-	file_py{envs/hata/py.png}
-	file_ny{envs/hata/ny.png}
+	file_py{envs/hata/ny.png}
+	file_ny{envs/hata/py.png}
 	file_pz{envs/hata/pz.png}
 	file_nz{envs/hata/nz.png}
 
+	min_filter{linear}
+	mag_filter{linear}
+	mipmap{nearest}
+}
+
+tex_cube_env_castle{
+	file_px{envs/castle/px.jpg}
+	file_nx{envs/castle/nx.jpg}
+	file_py{envs/castle/ny.jpg}
+	file_ny{envs/castle/py.jpg}
+	file_pz{envs/castle/pz.jpg}
+	file_nz{envs/castle/nz.jpg}
+
 	min_filter{linear}
 	mag_filter{linear}
 	mipmap{nearest}

diff --git a/res/samples_gltf/ball.glb b/res/samples_gltf/ball.glb
diff --git a/res/samples_gltf/ball_bb.glb b/res/samples_gltf/ball_bb.glb
diff --git a/res/test/bake.jpg b/res/test/bake.jpg
diff --git a/res/test/bake.obj b/res/test/bake.obj
diff --git a/src/carcockpit/application.cpp b/src/carcockpit/application.cpp
@@ -51,9 +51,9 @@ application::application(bool window, std::string_view res_path) :
 			if (e.combo.key == ruis::key::escape) {
 				this->quit();
 			} else if (e.combo.key == ruis::key::space) {
-				this->toggleCamera();
+				this->toggle_camera();
 			} else if (e.combo.key == ruis::key::n) {
-				this->toggleNormalMapping();
+				this->toggle_normal_mapping();
 			}
 		}
 		return false;
@@ -62,16 +62,16 @@ application::application(bool window, std::string_view res_path) :
 	this->gui.set_root(std::move(kp));
 }
 
-void application::toggleCamera()
+void application::toggle_camera()
 {
 	cam_toggle = !cam_toggle;
 	auto car_w = this->gui.get_root().try_get_widget_as<carcockpit::gltf_viewer_widget>("gltf_viewer_widget");
 	if (car_w) {
-		car_w->toggleCamera(cam_toggle);
+		car_w->toggle_camera(cam_toggle);
 	}
 }
 
-void application::toggleNormalMapping()
+void application::toggle_normal_mapping()
 {
 	nm_toggle = !nm_toggle;
 	auto car_w = this->gui.get_root().try_get_widget_as<carcockpit::gltf_viewer_widget>("gltf_viewer_widget");

diff --git a/src/carcockpit/application.hpp b/src/carcockpit/application.hpp
@@ -36,14 +36,14 @@ class application : public ruisapp::application
 public:
 	application(bool window, std::string_view res_path);
 
-	void toggleCamera();
-	void toggleNormalMapping();
+	void toggle_camera();
+	void toggle_normal_mapping();
 
 	static constexpr std::string_view app_name = "carcockpit"sv;
 
 	static application& inst()
 	{
-		return static_cast<application&>(ruisapp::application::inst());
+		return dynamic_cast<application&>(ruisapp::application::inst());
 	}
 
 	ruis::render::shader_skybox shader_skybox_v;