use N inplace of sector_size

jere8184 · jere8184 · commit aa9c669ae19e · 2025-10-07T18:32:15.000+01:00
diff --git a/libopenage/curve/tests/container.cpp b/libopenage/curve/tests/container.cpp
@@ -244,7 +244,7 @@ void test_queue() {
 }
 
 void test_array() {
-	Array<int, 4> a;
+	Array<int, 4> a(nullptr, 2);
 	a.set_insert(1, 0, 0);
 	a.set_insert(1, 1, 1);
 	a.set_insert(1, 2, 2);
@@ -271,7 +271,7 @@ void test_array() {
 	TESTEQUALS(res.at(2), 0);
 	TESTEQUALS(res.at(3), 0);
 
-	Array<int, 4> other;
+	Array<int, 4> other(nullptr, 2);
 	other.set_last(0, 0, 999);
 	other.set_last(0, 1, 999);
 	other.set_last(0, 2, 999);
diff --git a/libopenage/gamestate/map.cpp b/libopenage/gamestate/map.cpp
@@ -26,10 +26,9 @@ Map::Map(const std::shared_ptr<GameState> &state,
 	std::unordered_set<nyan::fqon_t> path_types = nyan_db->get_obj_children_all("engine.util.path_type.PathType");
 	size_t grid_idx = 0;
 	auto chunk_size = this->terrain->get_chunk(0)->get_size();
-	auto side_length = std::max(chunk_size[0], chunk_size[1]);
 	auto grid_size = this->terrain->get_chunks_size();
 	for (const auto &path_type : path_types) {
-		auto grid = std::make_shared<path::Grid<path::SECTOR_SIZE>>(grid_idx, grid_size, side_length);
+		auto grid = std::make_shared<path::Grid<path::SECTOR_SIZE>>(grid_idx, grid_size);
 		this->pathfinder->add_grid(grid);
 
 		this->grid_lookup.emplace(path_type, grid_idx);
diff --git a/libopenage/pathfinding/cost_field.h b/libopenage/pathfinding/cost_field.h
@@ -35,14 +35,14 @@ class CostField {
 	/**
 	 * Create a square cost field.
 	 */
-	CostField();
+	CostField(const std::shared_ptr<event::EventLoop> &loop = nullptr, size_t id = 0);
 
 	/**
 	 * Get the size of the cost field.
 	 *
 	 * @return Size of the cost field.
 	 */
-	size_t get_size() const;
+	constexpr size_t get_size() const;
 
 	/**
 	 * Get the cost at a specified position.
@@ -151,6 +151,9 @@ class CostField {
 	 */
 	void clear_dirty();
 
+
+	const curve::Array<cost_t, N> &get_cost_history() const;
+
 private:
 	/**
 	 * Side length of the field.
@@ -180,15 +183,15 @@ class CostField {
 };
 
 template <size_t N>
-CostField<N>::CostField() :
+CostField<N>::CostField(const std::shared_ptr<event::EventLoop> &loop, size_t id) :
 	valid_until{time::TIME_MIN},
 	cells(N * N, COST_MIN),
-	cell_cost_history() {
+	cell_cost_history(loop, id) {
 	log::log(DBG << "Created cost field with size " << N << "x" << N);
 }
 
 template <size_t N>
-size_t CostField<N>::get_size() const {
+constexpr size_t CostField<N>::get_size() const {
 	return N;
 }
 
@@ -271,5 +274,10 @@ void CostField<N>::clear_dirty() {
 	this->valid_until = time::TIME_MAX;
 }
 
+template <size_t N>
+const curve::Array<cost_t, N> &CostField<N>::get_cost_history() const {
+	return this->cell_cost_history;
+};
+
 } // namespace path
 } // namespace openage
diff --git a/libopenage/pathfinding/demo/demo_1.cpp b/libopenage/pathfinding/demo/demo_1.cpp
@@ -25,7 +25,7 @@
 namespace openage::path::tests {
 
 void path_demo_1(const util::Path &path) {
-	auto grid = std::make_shared<Grid<path::SECTOR_SIZE>>(0, util::Vector2s{4, 3}, 10);
+	auto grid = std::make_shared<Grid<path::SECTOR_SIZE>>(0, util::Vector2s{4, 3});
 
 	// Initialize the cost field for each sector.
 	for (auto &sector : grid->get_sectors()) {
@@ -134,8 +134,8 @@ void path_demo_1(const util::Path &path) {
 	window->add_mouse_button_callback([&](const QMouseEvent &ev) {
 		if (ev.type() == QEvent::MouseButtonRelease) {
 			// From the mouse position, calculate the position/cell on the grid
-			auto cell_count_x = grid->get_size()[0] * grid->get_sector_size();
-			auto cell_count_y = grid->get_size()[1] * grid->get_sector_size();
+			auto cell_count_x = grid->get_size()[0] * path::SECTOR_SIZE;
+			auto cell_count_y = grid->get_size()[1] * path::SECTOR_SIZE;
 			auto window_size = window->get_size();
 
 			double cell_size_x = static_cast<double>(window_size[0]) / cell_count_x;
@@ -301,8 +301,8 @@ void RenderManager1::init_passes() {
 	// Create object for the grid
 	auto model = Eigen::Affine3f::Identity();
 	model.prescale(Eigen::Vector3f{
-		2.0f / (this->grid->get_size()[0] * this->grid->get_sector_size()),
-		2.0f / (this->grid->get_size()[1] * this->grid->get_sector_size()),
+		2.0f / (this->grid->get_size()[0] * path::SECTOR_SIZE),
+		2.0f / (this->grid->get_size()[1] * path::SECTOR_SIZE),
 		1.0f});
 	model.pretranslate(Eigen::Vector3f{-1.0f, -1.0f, 0.0f});
 	auto grid_unifs = grid_shader->new_uniform_input(
@@ -413,8 +413,8 @@ renderer::resources::MeshData RenderManager1::get_grid_mesh(const std::shared_pt
 	// increase by 1 in every dimension because to get the vertex length
 	// of each dimension
 	util::Vector2s size{
-		grid->get_size()[0] * grid->get_sector_size() + 1,
-		grid->get_size()[1] * grid->get_sector_size() + 1};
+		grid->get_size()[0] * path::SECTOR_SIZE + 1,
+		grid->get_size()[1] * path::SECTOR_SIZE + 1};
 
 	// add vertices for the cells of the grid
 	std::vector<float> verts{};
@@ -467,7 +467,7 @@ renderer::resources::MeshData RenderManager1::get_grid_mesh(const std::shared_pt
 void RenderManager1::create_impassible_tiles(const std::shared_ptr<path::Grid<path::SECTOR_SIZE>> &grid) {
 	auto width = grid->get_size()[0];
 	auto height = grid->get_size()[1];
-	auto sector_size = grid->get_sector_size();
+	auto sector_size = path::SECTOR_SIZE;
 
 	float tile_offset_width = 2.0f / (width * sector_size);
 	float tile_offset_height = 2.0f / (height * sector_size);
@@ -529,7 +529,7 @@ void RenderManager1::create_impassible_tiles(const std::shared_ptr<path::Grid<pa
 void RenderManager1::create_portal_tiles(const std::shared_ptr<path::Grid<path::SECTOR_SIZE>> &grid) {
 	auto width = grid->get_size()[0];
 	auto height = grid->get_size()[1];
-	auto sector_size = grid->get_sector_size();
+	auto sector_size = path::SECTOR_SIZE;
 
 	float tile_offset_width = 2.0f / (width * sector_size);
 	float tile_offset_height = 2.0f / (height * sector_size);
@@ -606,7 +606,7 @@ void RenderManager1::create_portal_tiles(const std::shared_ptr<path::Grid<path::
 void RenderManager1::create_waypoint_tiles(const Path &path) {
 	auto width = grid->get_size()[0];
 	auto height = grid->get_size()[1];
-	auto sector_size = grid->get_sector_size();
+	auto sector_size = path::SECTOR_SIZE;
 
 	float tile_offset_width = 2.0f / (width * sector_size);
 	float tile_offset_height = 2.0f / (height * sector_size);
diff --git a/libopenage/pathfinding/flow_field.h b/libopenage/pathfinding/flow_field.h
@@ -51,7 +51,7 @@ class FlowField {
 	 *
 	 * @return Size of the flow field.
 	 */
-	size_t get_size() const;
+	constexpr size_t get_size() const;
 
 	/**
 	 * Get the flow field value at a specified position.
@@ -194,7 +194,7 @@ FlowField<N>::FlowField(const std::shared_ptr<IntegrationField<N>> &integration_
 }
 
 template <size_t N>
-size_t FlowField<N>::get_size() const {
+constexpr size_t FlowField<N>::get_size() const {
 	return N;
 }
 
diff --git a/libopenage/pathfinding/grid.h b/libopenage/pathfinding/grid.h
@@ -29,11 +29,9 @@ class Grid {
 	 *
 	 * @param id ID of the grid.
 	 * @param size Size of the grid in sectors (width x height).
-	 * @param sector_size Side length of each sector.
 	 */
 	Grid(grid_id_t id,
-	     const util::Vector2s &size,
-	     size_t sector_size);
+	     const util::Vector2s &size);
 
 	/**
 	 * Create a grid of width x height sectors from a list of existing sectors.
@@ -60,12 +58,6 @@ class Grid {
 	 */
 	const util::Vector2s &get_size() const;
 
-	/**
-	 * Get the side length of the sectors on the grid (in number of cells).
-	 *
-	 * @return Sector side length (in number of cells).
-	 */
-	size_t get_sector_size() const;
 
 	/**
 	 * Get the sector at a specified position.
@@ -121,10 +113,6 @@ class Grid {
 	 */
 	util::Vector2s size;
 
-	/**
-	 * Side length of the grid sectors.
-	 */
-	size_t sector_size;
 
 	/**
 	 * Sectors of the grid.
@@ -141,11 +129,9 @@ class Grid {
 
 template <size_t N>
 Grid<N>::Grid(grid_id_t id,
-              const util::Vector2s &size,
-              size_t sector_size) :
+              const util::Vector2s &size) :
 	id{id},
-	size{size},
-	sector_size{sector_size} {
+	size{size} {
 	for (size_t y = 0; y < size[1]; y++) {
 		for (size_t x = 0; x < size[0]; x++) {
 			this->sectors.push_back(
@@ -165,8 +151,6 @@ Grid<N>::Grid(grid_id_t id,
 	ENSURE(this->sectors.size() == size[0] * size[1],
 	       "Grid has size " << size[0] << "x" << size[1] << " (" << size[0] * size[1] << " sectors), "
 	                        << "but only " << this->sectors.size() << " sectors were provided");
-
-	this->sector_size = sectors.at(0)->get_cost_field()->get_size();
 }
 
 template <size_t N>
@@ -179,11 +163,6 @@ const util::Vector2s &Grid<N>::get_size() const {
 	return this->size;
 }
 
-template <size_t N>
-size_t Grid<N>::get_sector_size() const {
-	return this->sector_size;
-}
-
 template <size_t N>
 const std::shared_ptr<Sector<N>> &Grid<N>::get_sector(size_t x, size_t y) {
 	return this->sectors.at(x + y * this->size[0]);
diff --git a/libopenage/pathfinding/pathfinder.h b/libopenage/pathfinding/pathfinder.h

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class FlowField {`
`51`	`51`	`*`
`52`	`52`	`* @return Size of the flow field.`
`53`	`53`	`*/`
`54`		`- size_t get_size() const;`
	`54`	`+ constexpr size_t get_size() const;`
`55`	`55`
`56`	`56`	`/**`
`57`	`57`	`* Get the flow field value at a specified position.`
`@@ -194,7 +194,7 @@ FlowField<N>::FlowField(const std::shared_ptr<IntegrationField<N>> &integration_`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`template <size_t N>`
`197`		`-size_t FlowField<N>::get_size() const {`
	`197`	`+constexpr size_t FlowField<N>::get_size() const {`
`198`	`198`	`return N;`
`199`	`199`	`}`
`200`	`200`