Multiple cameras

benjamaan476 · benjamaan476 · commit 2ca0337c3fb7 · 2024-10-26T15:28:42.000+01:00
diff --git a/engine/renderer/camera.cpp b/engine/renderer/camera.cpp
@@ -51,11 +51,6 @@ namespace egkr
 		return view_;
 	}
 
-	float4x4 camera::get_projection() const
-	{
-		return glm::perspective(fov_, aspect_ratio_, near_clip_, far_clip_);
-	}
-
 	float3 camera::get_forward() const
 	{
 		return -glm::normalize(glm::inverse(view_)[2]);
@@ -152,11 +147,6 @@ namespace egkr
 		is_dirty_ = true;
 	}
 
-	float camera::get_fov() const
-	{
-		return fov_;
-	}
-
 	float camera::get_near_clip() const
 	{
 		return near_clip_;
diff --git a/engine/renderer/camera.h b/engine/renderer/camera.h
@@ -22,7 +22,6 @@ namespace egkr
 		void set_aspect(float aspect);
 
 		[[nodiscard]] float4x4 get_view();
-		[[nodiscard]] float4x4 get_projection() const;
 
 		[[nodiscard]] float3 get_forward() const;
 		[[nodiscard]] float3 get_back() const;
@@ -31,7 +30,6 @@ namespace egkr
 		[[nodiscard]] float3 get_up() const;
 		[[nodiscard]] float3 get_down() const;
 
-		[[nodiscard]] float get_fov() const;
 		[[nodiscard]] float get_far_clip() const;
 		[[nodiscard]] float get_near_clip() const;
 
@@ -53,7 +51,6 @@ namespace egkr
 
 		float4x4 view_{};
 		
-		float fov_{glm::radians(45.F)};
 		float near_clip_{0.1F};
 		float far_clip_{ 1000.F };
 		float aspect_ratio_{ 1.333f };
diff --git a/engine/renderer/render_view.cpp b/engine/renderer/render_view.cpp
@@ -35,8 +35,6 @@ namespace egkr
 		type_{ view_configuration.view_type },
 		custom_shader_name_{ view_configuration.custom_shader_name }
 	{
-		camera_ = camera_system::get_default();
-
 		for (const auto& pass : view_configuration.passes)
 		{
 			auto renderpass = renderpass::renderpass::create(pass);
diff --git a/engine/renderer/render_view.h b/engine/renderer/render_view.h
@@ -70,7 +70,7 @@ namespace egkr
 		virtual bool on_create() = 0;
 		virtual bool on_destroy() = 0;
 		virtual void on_resize(uint32_t width, uint32_t height) = 0;
-		virtual render_view_packet on_build_packet(void* data, viewport* viewport) = 0;
+		virtual render_view_packet on_build_packet(void* data, const camera::shared_ptr& camera, viewport* viewport) = 0;
 		virtual bool on_render(render_view_packet* render_view_packet, const frame_data& frame_data) const = 0;
 
 		virtual bool regenerate_attachment_target(uint32_t /*pass_index*/, const render_target::attachment& /*attachment*/) { return true; }
@@ -87,7 +87,6 @@ namespace egkr
 		uint32_t mode_{};
 		std::vector<renderpass::renderpass::shared_ptr> renderpasses_;
 		std::string custom_shader_name_;
-		camera::shared_ptr camera_;
 	};
 
 	struct skybox_packet_data
diff --git a/engine/renderer/views/render_view_editor.cpp b/engine/renderer/views/render_view_editor.cpp
@@ -21,10 +21,10 @@ namespace egkr
 		shader_system::create_shader(*properties, renderpasses_[0].get());
 		resource_system::unload(colour_shader);
 
-		auto col_shader = shader_system::get_shader(colour_3d_shader_name);
-		locations_.projection = col_shader->get_uniform_index("projection");
-		locations_.view = col_shader->get_uniform_index("view");
-		locations_.model = col_shader->get_uniform_index("model");
+		colour_shader_ = shader_system::get_shader(colour_3d_shader_name);
+		locations_.projection = colour_shader_->get_uniform_index("projection");
+		locations_.view = colour_shader_->get_uniform_index("view");
+		locations_.model = colour_shader_->get_uniform_index("model");
 		event::register_event(event::code::render_target_refresh_required, this, on_event);
 		return true;
 	}
@@ -43,13 +43,13 @@ namespace egkr
 			height_ = height;
 		}
 	}
-	render_view_packet render_view_editor::on_build_packet(void* data, viewport* viewport)
+	render_view_packet render_view_editor::on_build_packet(void* data, const camera::shared_ptr& camera, viewport* viewport)
 	{
 		render_view_packet packet{};
 
 		packet.view = this;
-		packet.view_matrix = camera_->get_view();
-		packet.view_position = camera_->get_position();
+		packet.view_matrix = camera->get_view();
+		packet.view_position = camera->get_position();
 		packet.ambient_colour = ambient_colour_;
 		packet.view_viewport = viewport;
 		gizmo_ = *(editor::gizmo*)data;
@@ -65,21 +65,19 @@ namespace egkr
 		{
 			pass->begin(pass->get_render_targets()[frame_data.render_target_index].get());
 
-			auto colour_shader = shader_system::get_shader("Shader.Builtin.Colour3DShader");
-			shader_system::use(colour_shader->get_id());
-			colour_shader->bind_globals();
-			bool needs_update = (frame_data.frame_number != colour_shader->get_frame_number()) || (frame_data.draw_index != colour_shader->get_draw_index());
+			shader_system::use(colour_shader_->get_id());
+			colour_shader_->bind_globals();
+			bool needs_update = (frame_data.frame_number != colour_shader_->get_frame_number()) || (frame_data.draw_index != colour_shader_->get_draw_index());
 			if (needs_update)
 			{
 				shader_system::set_uniform(locations_.projection, &render_view_packet->view_viewport->projection);
 				shader_system::set_uniform(locations_.view, &render_view_packet->view_matrix);
 			}
 			shader_system::apply_global(needs_update);
 
-			const auto& camera_position = camera_->get_position();
 			const auto& gizmo_position = gizmo_.get_position();
 
-			const auto distance = glm::distance(camera_position, gizmo_position);
+			const auto distance = glm::distance(render_view_packet->view_position, gizmo_position);
 
 			gizmo_.get_selected_model()
 				.and_then([&](float4x4 model) -> std::optional<float4x4>
@@ -91,7 +89,7 @@ namespace egkr
 							  glm::quat rotation;
 							  glm::decompose(model, model_scale, rotation, translation, skew, perspective);
 							  const float fixed_size{ 0.1F };
-							  auto scale_factor = (2 * std::tan(camera_->get_fov() / 2) * distance) * fixed_size;
+							  auto scale_factor = (2 * std::tan(render_view_packet->view_viewport->fov / 2) * distance) * fixed_size;
 							  editor::gizmo::set_scale(scale_factor);
 							  float4x4 scale = glm::scale(glm::mat4x4(1.f), { scale_factor, scale_factor, scale_factor });
 
diff --git a/engine/renderer/views/render_view_editor.h b/engine/renderer/views/render_view_editor.h
@@ -14,11 +14,12 @@ namespace egkr
 		bool on_create() override;
 		bool on_destroy() override;
 		void on_resize(uint32_t width, uint32_t height) override;
-		render_view_packet on_build_packet(void* data, viewport* viewport) override;
+		render_view_packet on_build_packet(void* data, const camera::shared_ptr& camera, viewport* viewport) override;
 		bool on_render(render_view_packet* render_view_packet, const frame_data& frame_data) const override;
 
 	private:
 		shader::shader::shared_ptr shader_{};
+		shader::shader::shared_ptr colour_shader_{};
 		float4 ambient_colour_{};
 		int render_mode{};
 		debug_colour_shader_locations locations_{};
diff --git a/engine/renderer/views/render_view_ui.cpp b/engine/renderer/views/render_view_ui.cpp
@@ -50,7 +50,7 @@ namespace egkr
 		}
 	}
 
-	render_view_packet render_view_ui::on_build_packet(void* data, viewport* viewport)
+	render_view_packet render_view_ui::on_build_packet(void* data, const camera::shared_ptr& /*camera*/, viewport* viewport)
 	{
 		auto* ui_data = (ui_packet_data*)data;
 
diff --git a/engine/renderer/views/render_view_ui.h b/engine/renderer/views/render_view_ui.h
@@ -14,7 +14,7 @@ namespace egkr
 		bool on_create() override;
 		bool on_destroy() override;
 		void on_resize(uint32_t width, uint32_t height) override;
-		render_view_packet on_build_packet(void* data, viewport* viewport) override;
+		render_view_packet on_build_packet(void* data, const camera::shared_ptr& camera, viewport* viewport) override;
 		bool on_render(render_view_packet* render_view_packet, const frame_data& frame_data) const override;
 	private:
 
diff --git a/engine/renderer/views/render_view_world.cpp b/engine/renderer/views/render_view_world.cpp
@@ -66,15 +66,15 @@ namespace egkr
 			height_ = height;
 		}
 	}
-	render_view_packet render_view_world::on_build_packet(void* data, viewport* viewport)
+	render_view_packet render_view_world::on_build_packet(void* data, const camera::shared_ptr& camera, viewport* viewport)
 	{
 		auto* mesh_data = (frame_geometry_data*)data;
 
 		render_view_packet packet{};
 
 		packet.view = this;
-		packet.view_matrix = camera_->get_view();
-		packet.view_position = camera_->get_position();
+		packet.view_matrix = camera->get_view();
+		packet.view_position = camera->get_position();
 		packet.ambient_colour = ambient_colour_;
 		packet.render_packet_data = mesh_data->world_geometries;
 		packet.debug_render_data = mesh_data->debug_geometries;
@@ -94,7 +94,7 @@ namespace egkr
 			{
 
 				shader_system::use(skybox_shader_->get_id());
-				float4x4 view = camera_->get_view();
+				float4x4 view = render_view_packet->view_matrix;
 				view[3][0] = 0.F;
 				view[3][1] = 0.F;
 				view[3][2] = 0.F;
diff --git a/engine/renderer/views/render_view_world.h b/engine/renderer/views/render_view_world.h
@@ -19,7 +19,7 @@ namespace egkr
 		bool on_create() override;
 		bool on_destroy() override;
 		void on_resize(uint32_t width, uint32_t height) override;
-		render_view_packet on_build_packet(void* data, viewport* viewport) override;
+		render_view_packet on_build_packet(void* data, const camera::shared_ptr& camera, viewport* viewport) override;
 		bool on_render(render_view_packet* render_view_packet, const frame_data& frame_data) const override;
 	private:
 		shader::shader::shared_ptr skybox_shader_{};
diff --git a/engine/scenes/simple_scene.cpp b/engine/scenes/simple_scene.cpp
@@ -66,7 +66,7 @@ namespace egkr::scene
 
 		if (state_ >= state::loaded)
 		{
-			auto frustum = egkr::frustum(camera->get_position(), camera->get_forward(), camera->get_right(), camera->get_up(), viewport->viewport_rect.w / viewport->viewport_rect.z, camera->get_fov(), camera->get_near_clip(), camera->get_far_clip());
+			auto frustum = egkr::frustum(camera->get_position(), camera->get_forward(), camera->get_right(), camera->get_up(), viewport->viewport_rect.w / viewport->viewport_rect.z, viewport->fov, camera->get_near_clip(), camera->get_far_clip());
 			//if (update_frustum_)
 			//{
 			//	debug_frustum_ = egkr::debug::debug_frustum::create(camera_frustum_);
@@ -140,10 +140,10 @@ namespace egkr::scene
 		}
 	}
 
-	void simple_scene::populate_render_packet(render_packet* packet, viewport* viewport)
+	void simple_scene::populate_render_packet(render_packet* packet, const camera::shared_ptr& camera, viewport* viewport)
 	{
 		auto world_view = view_system::get("world-opaque");
-		packet->render_views[render_view::type::world] = view_system::build_packet(world_view.get(), &frame_geometry_, viewport);
+		packet->render_views[render_view::type::world] = view_system::build_packet(world_view.get(), &frame_geometry_, camera, viewport);
 		packet->render_views[render_view::type::world].skybox_data.skybox_data = skybox_;
 	}
 
diff --git a/engine/scenes/simple_scene.h b/engine/scenes/simple_scene.h
@@ -87,7 +87,7 @@ namespace egkr
 			void unload();
 
 			void update(const frame_data& delta_time, const camera::shared_ptr& camera, viewport* viewport);
-			void populate_render_packet(render_packet* packet, viewport* viewport);
+			void populate_render_packet(render_packet* packet, const camera::shared_ptr& camera, viewport* viewport);
 
 			//Game owns these, scene just references them
 			void add_directional_light(const std::string& name, std::shared_ptr<light::directional_light>& light);
diff --git a/engine/systems/camera_system.cpp b/engine/systems/camera_system.cpp
@@ -54,7 +54,7 @@ namespace egkr
 		camera_system_->cameras_.push_back(camera::create(name));
 		camera_system_->camera_id_by_name_[name.data()] = id;
 
-		return camera::shared_ptr();
+		return camera_system_->cameras_.back();
 	}
 
 	void camera_system::release(const camera::shared_ptr /*camera*/)
diff --git a/engine/systems/view_system.cpp b/engine/systems/view_system.cpp
@@ -95,9 +95,9 @@ namespace egkr
 		return nullptr;
 	}
 
-	render_view_packet view_system::build_packet(render_view* view, void* data, viewport* viewport)
+	render_view_packet view_system::build_packet(render_view* view, void* data, const camera::shared_ptr& camera, viewport* viewport)
 	{
-		return	view->on_build_packet(data, viewport);
+		return	view->on_build_packet(data, camera, viewport);
 	}
 
 	bool view_system::on_render(const render_view* view, render_view_packet* packet, const frame_data& frame_data)
diff --git a/engine/systems/view_system.h b/engine/systems/view_system.h
@@ -22,7 +22,7 @@ namespace egkr
 		static void create_view(const render_view::configuration& configuration);
 		static	void on_window_resize(uint32_t width, uint32_t height);
 		static render_view::shared_ptr get(std::string_view name);
-		static render_view_packet build_packet(render_view* view, void* data, viewport* viewport);
+		static render_view_packet build_packet(render_view* view, void* data, const camera::shared_ptr& camera, viewport* viewport);
 		static bool on_render(const render_view* view, render_view_packet* packet, const frame_data& frame_data);
 
 	private:
diff --git a/sandbox/sandbox_application.cpp b/sandbox/sandbox_application.cpp
@@ -70,11 +70,16 @@ bool sandbox_application::init()
 	ui_mesh_->load();
 	ui_meshes_.push_back(ui_mesh_);
 
-	camera_ = egkr::camera_system::get_default();
+	camera_ = egkr::camera_system::acquire("world");
 	camera_->set_position({ 10, 10, 10 });
 	camera_->set_rotation({ 0.f, glm::radians(45.f), glm::radians(45.f) });
 	camera_->set_aspect((float)width_ / (float)height_);
 
+	auto cam = egkr::camera_system::get_default();
+	cam->set_position({ 10, 10, 10 });
+	cam->set_rotation({ 0.f, glm::radians(45.f), glm::radians(45.f) });
+	cam->set_aspect((float)width_ / (float)height_);
+
 	//TODO add to scene
 	test_audio = egkr::audio::audio_system::load_chunk("Test.ogg");
 	test_loop_audio = egkr::audio::audio_system::load_chunk("Fire_loop.ogg");
@@ -123,7 +128,7 @@ void sandbox_application::update(const egkr::frame_data& frame_data)
 
 void sandbox_application::prepare_render_packet(egkr::render_packet* render_packet, const egkr::frame_data& /*frame_data*/)
 {
-	main_scene_->populate_render_packet(render_packet, &world_view);
+	main_scene_->populate_render_packet(render_packet, camera_, &world_view);
 		if (!main_scene_->is_loaded())
 		{
 			/*glm::quat q({ 0, 0, 0.5F * frame_data.delta_time });
@@ -138,9 +143,8 @@ void sandbox_application::prepare_render_packet(egkr::render_packet* render_pack
 		render_packet->render_views[egkr::render_view::type::world].debug_render_data.push_back(egkr::render_data{ .render_geometry = test_lines_->get_geometry(), .transform = test_lines_});
 	}
 
-	render_packet->render_views[egkr::render_view::type::editor] = egkr::view_system::build_packet(egkr::view_system::get("editor").get(), &gizmo_, &world_view);
-	auto cam = egkr::camera_system::get_default();
-	const auto& pos = cam->get_position();
+	render_packet->render_views[egkr::render_view::type::editor] = egkr::view_system::build_packet(egkr::view_system::get("editor").get(), &gizmo_, camera_, &world_view);
+	const auto& pos = camera_->get_position();
 	std::string text = std::format("Camera pos: {} {} {}\n Mouse pos: {} {}", (double)pos.x, (double)pos.y, (double)pos.z, mouse_pos_.x, mouse_pos_.y);
 
 	more_test_text_->set_text(text);
@@ -153,7 +157,7 @@ void sandbox_application::prepare_render_packet(egkr::render_packet* render_pack
 	}
 	egkr::ui_packet_data ui{ .mesh_data = {ui_meshes_}, .texts = texts };
 	auto ui_view_packet = egkr::view_system::get("ui");
-	render_packet->render_views[egkr::render_view::type::ui] = egkr::view_system::build_packet(ui_view_packet.get(), &ui, &ui_view);
+	render_packet->render_views[egkr::render_view::type::ui] = egkr::view_system::build_packet(ui_view_packet.get(), &ui, nullptr, &ui_view);
 
 	application_frame_data.reset();
 }
@@ -171,13 +175,14 @@ void sandbox_application::render(egkr::render_packet* render_packet, egkr::frame
 		auto& editor_view_packet = render_packet->render_views[egkr::render_view::type::editor];
 		editor_view_packet.view->on_render(&editor_view_packet, frame_data);
 	}
-	// egkr::renderer->end(frame_data);
+	 egkr::renderer->end(frame_data);
 
-	// egkr::renderer->begin(frame_data);
+	 egkr::renderer->begin(frame_data);
 	{
-		// auto& world_view_packet = render_packet->render_views[egkr::render_view::type::world];
-		// world_view_packet.view_viewport = &world_view2;
-		// world_view_packet.view->on_render(&world_view_packet, frame_data);
+		 auto& world_view_packet = render_packet->render_views[egkr::render_view::type::world];
+		 world_view_packet.view_viewport = &world_view2;
+		 world_view_packet.view_matrix = egkr::camera_system::get_default()->get_view();
+		 world_view_packet.view->on_render(&world_view_packet, frame_data);
 
 		auto& ui_view_packet = render_packet->render_views[egkr::render_view::type::ui];
 		ui_view_packet.view->on_render(&ui_view_packet, frame_data);
@@ -466,7 +471,7 @@ bool sandbox_application::on_button_up(egkr::event::code code, void* /*sender*/,
 		{
 			const auto& view = game->camera_->get_view();
 			const auto& origin = game->camera_->get_position();
-			const auto& proj = game->camera_->get_projection();
+			const auto& proj = game->world_view.projection;
 			egkr::ray ray = egkr::ray::from_screen({ xpos, ypos }, game->world_view.viewport_rect, origin, view, proj);
 
 			auto hit = game->gizmo_.raycast(ray);

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,6 @@ namespace egkr`
`51`	`51`	`return view_;`
`52`	`52`	`}`
`53`	`53`
`54`		`- float4x4 camera::get_projection() const`
`55`		`- {`
`56`		`- return glm::perspective(fov_, aspect_ratio_, near_clip_, far_clip_);`
`57`		`- }`
`58`		`-`
`59`	`54`	`float3 camera::get_forward() const`
`60`	`55`	`{`
`61`	`56`	`return -glm::normalize(glm::inverse(view_)[2]);`
`@@ -152,11 +147,6 @@ namespace egkr`
`152`	`147`	`is_dirty_ = true;`
`153`	`148`	`}`
`154`	`149`
`155`		`- float camera::get_fov() const`
`156`		`- {`
`157`		`- return fov_;`
`158`		`- }`
`159`		`-`
`160`	`150`	`float camera::get_near_clip() const`
`161`	`151`	`{`
`162`	`152`	`return near_clip_;`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ namespace egkr`
`35`	`35`	`type_{ view_configuration.view_type },`
`36`	`36`	`custom_shader_name_{ view_configuration.custom_shader_name }`
`37`	`37`	`{`
`38`		`- camera_ = camera_system::get_default();`
`39`		`-`
`40`	`38`	`for (const auto& pass : view_configuration.passes)`
`41`	`39`	`{`
`42`	`40`	`auto renderpass = renderpass::renderpass::create(pass);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ namespace egkr`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- render_view_packet render_view_ui::on_build_packet(void* data, viewport* viewport)`
	`53`	`+ render_view_packet render_view_ui::on_build_packet(void* data, const camera::shared_ptr& /camera/, viewport* viewport)`
`54`	`54`	`{`
`55`	`55`	`auto* ui_data = (ui_packet_data*)data;`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,15 @@ namespace egkr`
`66`	`66`	`height_ = height;`
`67`	`67`	`}`
`68`	`68`	`}`
`69`		`- render_view_packet render_view_world::on_build_packet(void* data, viewport* viewport)`
	`69`	`+ render_view_packet render_view_world::on_build_packet(void* data, const camera::shared_ptr& camera, viewport* viewport)`
`70`	`70`	`{`
`71`	`71`	`auto* mesh_data = (frame_geometry_data*)data;`
`72`	`72`
`73`	`73`	`render_view_packet packet{};`
`74`	`74`
`75`	`75`	`packet.view = this;`
`76`		`- packet.view_matrix = camera_->get_view();`
`77`		`- packet.view_position = camera_->get_position();`
	`76`	`+ packet.view_matrix = camera->get_view();`
	`77`	`+ packet.view_position = camera->get_position();`
`78`	`78`	`packet.ambient_colour = ambient_colour_;`
`79`	`79`	`packet.render_packet_data = mesh_data->world_geometries;`
`80`	`80`	`packet.debug_render_data = mesh_data->debug_geometries;`
`@@ -94,7 +94,7 @@ namespace egkr`
`94`	`94`	`{`
`95`	`95`
`96`	`96`	`shader_system::use(skybox_shader_->get_id());`
`97`		`- float4x4 view = camera_->get_view();`
	`97`	`+ float4x4 view = render_view_packet->view_matrix;`
`98`	`98`	`view[3][0] = 0.F;`
`99`	`99`	`view[3][1] = 0.F;`
`100`	`100`	`view[3][2] = 0.F;`