terrain: Change chunk offsets to scene coordinate types.

heinezen · heinezen · commit 11f60e1878df · 2023-11-05T18:57:54.000+01:00
diff --git a/libopenage/gamestate/game.cpp b/libopenage/gamestate/game.cpp
@@ -19,6 +19,7 @@
 #include "util/path.h"
 #include "util/strings.h"
 
+#include "coord/phys.h"
 
 namespace openage::gamestate {
 
@@ -128,8 +129,8 @@ void Game::load_path(const util::Path &base_dir,
 void Game::generate_terrain(const std::shared_ptr<TerrainFactory> &terrain_factory) {
 	auto terrain = terrain_factory->add_terrain();
 
-	auto chunk0 = terrain_factory->add_chunk(util::Vector2s{10, 10}, util::Vector2s{0, 0});
-	auto chunk1 = terrain_factory->add_chunk(util::Vector2s{10, 10}, util::Vector2s{10, 0});
+	auto chunk0 = terrain_factory->add_chunk(util::Vector2s{10, 10}, coord::phys2_delta{0, 0});
+	auto chunk1 = terrain_factory->add_chunk(util::Vector2s{10, 10}, coord::phys2_delta{10, 0});
 	terrain->add_chunk(chunk0);
 	terrain->add_chunk(chunk1);
 
diff --git a/libopenage/gamestate/terrain_chunk.cpp b/libopenage/gamestate/terrain_chunk.cpp
@@ -6,7 +6,7 @@
 namespace openage::gamestate {
 
 TerrainChunk::TerrainChunk(const util::Vector2s size,
-                           const util::Vector2s offset) :
+                           const coord::phys2_delta offset) :
 	size{size},
 	offset{offset},
 	height_map{} {
@@ -41,7 +41,7 @@ const util::Vector2s &TerrainChunk::get_size() const {
 	return this->size;
 }
 
-const util::Vector2s &TerrainChunk::get_offset() const {
+const coord::phys2_delta &TerrainChunk::get_offset() const {
 	return this->offset;
 }
 
diff --git a/libopenage/gamestate/terrain_chunk.h b/libopenage/gamestate/terrain_chunk.h
@@ -4,6 +4,7 @@
 
 #include <vector>
 
+#include "coord/phys.h"
 #include "renderer/stages/terrain/terrain_render_entity.h"
 #include "time/time.h"
 #include "util/vector.h"
@@ -21,7 +22,7 @@ const size_t MAX_CHUNK_HEIGHT = 16;
 class TerrainChunk {
 public:
 	TerrainChunk(const util::Vector2s size,
-	             const util::Vector2s offset);
+	             const coord::phys2_delta offset);
 	~TerrainChunk() = default;
 
 	/**
@@ -52,7 +53,7 @@ class TerrainChunk {
      *
      * @return Offset of the terrain chunk (in tiles).
      */
-	const util::Vector2s &get_offset() const;
+	const coord::phys2_delta &get_offset() const;
 
 private:
 	/**
@@ -65,7 +66,7 @@ class TerrainChunk {
 	/**
      * Offset of the terrain chunk to the origin.
      */
-	util::Vector2s offset;
+	coord::phys2_delta offset;
 
 	/**
      * Height map of the terrain chunk.
diff --git a/libopenage/gamestate/terrain_factory.cpp b/libopenage/gamestate/terrain_factory.cpp
@@ -21,7 +21,7 @@ std::shared_ptr<Terrain> TerrainFactory::add_terrain() {
 }
 
 std::shared_ptr<TerrainChunk> TerrainFactory::add_chunk(const util::Vector2s size,
-                                                        const util::Vector2s offset) {
+                                                        const coord::phys2_delta offset) {
 	auto chunk = std::make_shared<TerrainChunk>(size, offset);
 
 	if (this->render_factory) {
diff --git a/libopenage/gamestate/terrain_factory.h b/libopenage/gamestate/terrain_factory.h
@@ -5,6 +5,7 @@
 #include <memory>
 #include <shared_mutex>
 
+#include "coord/phys.h"
 #include "util/vector.h"
 
 
@@ -46,7 +47,7 @@ class TerrainFactory {
      * @return New terrain chunk.
      */
 	std::shared_ptr<TerrainChunk> add_chunk(const util::Vector2s size,
-	                                        const util::Vector2s offset);
+	                                        const coord::phys2_delta offset);
 
 	// TODO: Add tiles
 	// std::shared_ptr<TerrainTile> add_tile(const std::shared_ptr<openage::event::EventLoop> &loop,
diff --git a/libopenage/renderer/demo/demo_3.cpp b/libopenage/renderer/demo/demo_3.cpp
@@ -5,6 +5,7 @@
 #include <eigen3/Eigen/Dense>
 #include <QKeyEvent>
 
+#include "coord/phys.h"
 #include "renderer/camera/camera.h"
 #include "renderer/gui/integration/public/gui_application_with_logger.h"
 #include "renderer/opengl/window.h"
@@ -21,6 +22,7 @@
 #include "renderer/uniform_buffer.h"
 #include "time/clock.h"
 
+
 namespace openage::renderer::tests {
 
 void renderer_demo_3(const util::Path &path) {
@@ -123,7 +125,7 @@ void renderer_demo_3(const util::Path &path) {
 
 	// Create entity for terrain rendering
 	auto terrain0 = render_factory->add_terrain_render_entity(terrain_size,
-	                                                          util::Vector2s{0, 0});
+	                                                          coord::phys2_delta{0, 0});
 
 	// Create "test bumps" in the terrain to check if rendering works
 	height_map[11] = 1.0f;
diff --git a/libopenage/renderer/demo/stresstest_0.cpp b/libopenage/renderer/demo/stresstest_0.cpp
@@ -4,6 +4,7 @@
 
 #include <eigen3/Eigen/Dense>
 
+#include "coord/phys.h"
 #include "renderer/camera/camera.h"
 #include "renderer/gui/integration/public/gui_application_with_logger.h"
 #include "renderer/opengl/window.h"
@@ -126,7 +127,7 @@ void renderer_stresstest_0(const util::Path &path) {
 
 	// Create entity for terrain rendering
 	auto terrain0 = render_factory->add_terrain_render_entity(terrain_size,
-	                                                          util::Vector2s{0, 0});
+	                                                          coord::phys2_delta{0, 0});
 
 	// send the terrain data to the terrain renderer
 	terrain0->update(terrain_size,
diff --git a/libopenage/renderer/render_factory.cpp b/libopenage/renderer/render_factory.cpp
@@ -15,9 +15,9 @@ RenderFactory::RenderFactory(const std::shared_ptr<terrain::TerrainRenderer> ter
 }
 
 std::shared_ptr<terrain::TerrainRenderEntity> RenderFactory::add_terrain_render_entity(const util::Vector2s chunk_size,
-                                                                                       const util::Vector2s chunk_offset) {
+                                                                                       const coord::phys2_delta chunk_offset) {
 	auto entity = std::make_shared<terrain::TerrainRenderEntity>();
-	this->terrain_renderer->add_render_entity(entity, chunk_size, chunk_offset);
+	this->terrain_renderer->add_render_entity(entity, chunk_size, chunk_offset.to_scene2());
 
 	return entity;
 }
diff --git a/libopenage/renderer/render_factory.h b/libopenage/renderer/render_factory.h
@@ -4,6 +4,7 @@
 
 #include <memory>
 
+#include "coord/phys.h"
 #include "util/vector.h"
 
 
@@ -47,7 +48,7 @@ class RenderFactory {
      * @return Render entity for pushing terrain updates.
      */
 	std::shared_ptr<terrain::TerrainRenderEntity> add_terrain_render_entity(const util::Vector2s chunk_size,
-	                                                                        const util::Vector2s chunk_offset);
+	                                                                        const coord::phys2_delta chunk_offset);
 
 	/**
      * Create a new world render entity and register it at the world renderer.
diff --git a/libopenage/renderer/stages/terrain/terrain_chunk.cpp b/libopenage/renderer/stages/terrain/terrain_chunk.cpp
@@ -12,7 +12,7 @@ namespace openage::renderer::terrain {
 
 TerrainChunk::TerrainChunk(const std::shared_ptr<renderer::resources::AssetManager> &asset_manager,
                            const util::Vector2s size,
-                           const util::Vector2s offset) :
+                           const coord::scene2_delta offset) :
 	size{size},
 	offset{offset},
 	asset_manager{asset_manager} {}
@@ -124,7 +124,7 @@ util::Vector2s &TerrainChunk::get_size() {
 	return this->size;
 }
 
-util::Vector2s &TerrainChunk::get_offset() {
+coord::scene2_delta &TerrainChunk::get_offset() {
 	return this->offset;
 }
 
diff --git a/libopenage/renderer/stages/terrain/terrain_chunk.h b/libopenage/renderer/stages/terrain/terrain_chunk.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <vector>
 
+#include "coord/scene.h"
 #include "time/time.h"
 #include "util/vector.h"
 
@@ -29,7 +30,7 @@ class TerrainChunk {
      */
 	TerrainChunk(const std::shared_ptr<renderer::resources::AssetManager> &asset_manager,
 	             const util::Vector2s size,
-	             const util::Vector2s offset);
+	             const coord::scene2_delta offset);
 
 	~TerrainChunk() = default;
 
@@ -75,7 +76,7 @@ class TerrainChunk {
      *
      * @return Offset of the chunk (in tiles).
      */
-	util::Vector2s &get_offset();
+	coord::scene2_delta &get_offset();
 
 private:
 	/**
@@ -93,7 +94,7 @@ class TerrainChunk {
 	/**
      * Offset of the chunk from origin in tiles (x, y).
      */
-	util::Vector2s offset;
+	coord::scene2_delta offset;
 
 	/**
 	 * Meshes composing the terrain. Each mesh represents a drawable vertex surface
diff --git a/libopenage/renderer/stages/terrain/terrain_mesh.cpp b/libopenage/renderer/stages/terrain/terrain_mesh.cpp
@@ -97,10 +97,10 @@ const std::shared_ptr<renderer::UniformInput> &TerrainRenderMesh::get_uniforms()
 	return this->uniforms;
 }
 
-void TerrainRenderMesh::create_model_matrix(util::Vector2s &offset) {
+void TerrainRenderMesh::create_model_matrix(const coord::scene2_delta &offset) {
 	// TODO: Needs input from engine
 	auto model = Eigen::Affine3f::Identity();
-	model.translate(Eigen::Vector3f{offset[0], offset[1], 0.0f});
+	model.translate(Eigen::Vector3f{offset.ne.to_float(), offset.se.to_float(), 0.0f});
 	this->model_matrix = model.matrix();
 }
 
diff --git a/libopenage/renderer/stages/terrain/terrain_mesh.h b/libopenage/renderer/stages/terrain/terrain_mesh.h
@@ -7,6 +7,7 @@
 
 #include <eigen3/Eigen/Dense>
 
+#include "coord/scene.h"
 #include "curve/discrete.h"
 #include "renderer/resources/mesh_data.h"
 #include "time/time.h"
@@ -115,7 +116,7 @@ class TerrainRenderMesh {
      *
      * @param offset Offset of the terrain mesh to the scene origin.
 	 */
-	void create_model_matrix(util::Vector2s &offset);
+	void create_model_matrix(const coord::scene2_delta &offset);
 
 	/**
 	 * Check whether the mesh or texture were changed.
diff --git a/libopenage/renderer/stages/terrain/terrain_model.cpp b/libopenage/renderer/stages/terrain/terrain_model.cpp
@@ -28,7 +28,7 @@ TerrainRenderModel::TerrainRenderModel(const std::shared_ptr<renderer::resources
 
 void TerrainRenderModel::add_chunk(const std::shared_ptr<TerrainRenderEntity> &entity,
                                    const util::Vector2s size,
-                                   const util::Vector2s offset) {
+                                   const coord::scene2_delta offset) {
 	auto chunk = std::make_shared<TerrainChunk>(this->asset_manager, size, offset);
 	chunk->set_render_entity(entity);
 	chunk->fetch_updates();
diff --git a/libopenage/renderer/stages/terrain/terrain_model.h b/libopenage/renderer/stages/terrain/terrain_model.h
@@ -5,6 +5,7 @@
 #include <memory>
 #include <vector>
 
+#include "coord/scene.h"
 #include "time/time.h"
 #include "util/vector.h"
 
@@ -42,7 +43,7 @@ class TerrainRenderModel {
      */
 	void add_chunk(const std::shared_ptr<TerrainRenderEntity> &entity,
 	               const util::Vector2s chunk_size,
-	               const util::Vector2s chunk_offset);
+	               const coord::scene2_delta chunk_offset);
 
 	/**
      * Set the current camera of the scene.
diff --git a/libopenage/renderer/stages/terrain/terrain_render_entity.h b/libopenage/renderer/stages/terrain/terrain_render_entity.h
@@ -81,7 +81,7 @@ class TerrainRenderEntity {
 	bool changed;
 
 	/**
-     * Terrain dimensions (width x height).
+     * Chunk dimensions (width x height).
      */
 	util::Vector2s size;
 
diff --git a/libopenage/renderer/stages/terrain/terrain_renderer.cpp b/libopenage/renderer/stages/terrain/terrain_renderer.cpp
@@ -48,7 +48,7 @@ std::shared_ptr<renderer::RenderPass> TerrainRenderer::get_render_pass() {
 
 void TerrainRenderer::add_render_entity(const std::shared_ptr<TerrainRenderEntity> entity,
                                         const util::Vector2s chunk_size,
-                                        const util::Vector2s chunk_offset) {
+                                        const coord::scene2_delta chunk_offset) {
 	std::unique_lock lock{this->mutex};
 
 	this->render_entity = entity;
diff --git a/libopenage/renderer/stages/terrain/terrain_renderer.h b/libopenage/renderer/stages/terrain/terrain_renderer.h
@@ -5,6 +5,7 @@
 #include <memory>
 #include <shared_mutex>
 
+#include "coord/scene.h"
 #include "util/path.h"
 #include "util/vector.h"
 
@@ -64,7 +65,7 @@ class TerrainRenderer {
 	 */
 	void add_render_entity(const std::shared_ptr<TerrainRenderEntity> entity,
 	                       const util::Vector2s chunk_size,
-	                       const util::Vector2s chunk_offset);
+	                       const coord::scene2_delta chunk_offset);
 
 	/**
 	 * Update the terrain mesh and texture information.

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace openage::gamestate {`
`7`	`7`
`8`	`8`	`TerrainChunk::TerrainChunk(const util::Vector2s size,`
`9`		`- const util::Vector2s offset) :`
	`9`	`+ const coord::phys2_delta offset) :`
`10`	`10`	`size{size},`
`11`	`11`	`offset{offset},`
`12`	`12`	`height_map{} {`
`@@ -41,7 +41,7 @@ const util::Vector2s &TerrainChunk::get_size() const {`
`41`	`41`	`return this->size;`
`42`	`42`	`}`
`43`	`43`
`44`		`-const util::Vector2s &TerrainChunk::get_offset() const {`
	`44`	`+const coord::phys2_delta &TerrainChunk::get_offset() const {`
`45`	`45`	`return this->offset;`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ std::shared_ptr<Terrain> TerrainFactory::add_terrain() {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`std::shared_ptr<TerrainChunk> TerrainFactory::add_chunk(const util::Vector2s size,`
`24`		`- const util::Vector2s offset) {`
	`24`	`+ const coord::phys2_delta offset) {`
`25`	`25`	`auto chunk = std::make_shared<TerrainChunk>(size, offset);`
`26`	`26`
`27`	`27`	`if (this->render_factory) {`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ RenderFactory::RenderFactory(const std::shared_ptr<terrain::TerrainRenderer> ter`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`std::shared_ptr<terrain::TerrainRenderEntity> RenderFactory::add_terrain_render_entity(const util::Vector2s chunk_size,`
`18`		`- const util::Vector2s chunk_offset) {`
	`18`	`+ const coord::phys2_delta chunk_offset) {`
`19`	`19`	`auto entity = std::make_shared<terrain::TerrainRenderEntity>();`
`20`		`- this->terrain_renderer->add_render_entity(entity, chunk_size, chunk_offset);`
	`20`	`+ this->terrain_renderer->add_render_entity(entity, chunk_size, chunk_offset.to_scene2());`
`21`	`21`
`22`	`22`	`return entity;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace openage::renderer::terrain {`
`12`	`12`
`13`	`13`	`TerrainChunk::TerrainChunk(const std::shared_ptr<renderer::resources::AssetManager> &asset_manager,`
`14`	`14`	`const util::Vector2s size,`
`15`		`- const util::Vector2s offset) :`
	`15`	`+ const coord::scene2_delta offset) :`
`16`	`16`	`size{size},`
`17`	`17`	`offset{offset},`
`18`	`18`	`asset_manager{asset_manager} {}`
`@@ -124,7 +124,7 @@ util::Vector2s &TerrainChunk::get_size() {`
`124`	`124`	`return this->size;`
`125`	`125`	`}`
`126`	`126`
`127`		`-util::Vector2s &TerrainChunk::get_offset() {`
	`127`	`+coord::scene2_delta &TerrainChunk::get_offset() {`
`128`	`128`	`return this->offset;`
`129`	`129`	`}`
`130`	`130`