Skip to content

Commit 61d409b

Browse files
heinezenheinezen
committed
Merge branch 'fix/render_entity_threadsafe' into feature/apply_effect
2 parents b1dfe87 + d41cec3 commit 61d409b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+502
-413
lines changed

‎copying.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ _the openage authors_ are:
154154
| Haoyang Bi | AyiStar | ayistar à outlook dawt com |
155155
| Michael Seibt | RoboSchmied | github à roboschmie dawt de |
156156
| Nikhil Ghosh | NikhilGhosh75 | nghosh606 à gmail dawt com |
157+
| Edvin Lindholm | EdvinLndh | edvinlndh à gmail dawt com |
157158

158159
If you're a first-time committer, add yourself to the above list. This is not
159160
just for legal reasons, but also to keep an overview of all those nicknames.

‎libopenage/gamestate/game_entity.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2023 the openage authors. See copying.md for legal info.
1+
// Copyright 2022-2024 the openage authors. See copying.md for legal info.
22

33
#include "game_entity.h"
44

@@ -30,7 +30,7 @@ entity_id_t GameEntity::get_id() const {
3030
return this->id;
3131
}
3232

33-
void GameEntity::set_render_entity(const std::shared_ptr<renderer::world::WorldRenderEntity> &entity) {
33+
void GameEntity::set_render_entity(const std::shared_ptr<renderer::world::RenderEntity> &entity) {
3434
// TODO: Transfer state from old render entity to new one?
3535

3636
this->render_entity = entity;

‎libopenage/gamestate/game_entity.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
namespace openage {
1515

1616
namespace renderer::world {
17-
class WorldRenderEntity;
17+
class RenderEntity;
1818
}
1919

2020
namespace gamestate {
@@ -62,7 +62,7 @@ class GameEntity {
6262
*
6363
* @param entity New render entity.
6464
*/
65-
void set_render_entity(const std::shared_ptr<renderer::world::WorldRenderEntity> &entity);
65+
void set_render_entity(const std::shared_ptr<renderer::world::RenderEntity> &entity);
6666

6767
/**
6868
* Set the event manager of this entity.
@@ -142,7 +142,7 @@ class GameEntity {
142142
/**
143143
* Render entity for pushing updates to the renderer. Can be \p nullptr.
144144
*/
145-
std::shared_ptr<renderer::world::WorldRenderEntity> render_entity;
145+
std::shared_ptr<renderer::world::RenderEntity> render_entity;
146146

147147
/**
148148
* Event manager.

‎libopenage/gamestate/terrain_chunk.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ TerrainChunk::TerrainChunk(const util::Vector2s size,
1818
}
1919
}
2020

21-
void TerrainChunk::set_render_entity(const std::shared_ptr<renderer::terrain::TerrainRenderEntity> &entity) {
21+
void TerrainChunk::set_render_entity(const std::shared_ptr<renderer::terrain::RenderEntity> &entity) {
2222
this->render_entity = entity;
2323
}
2424

‎libopenage/gamestate/terrain_chunk.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class TerrainChunk {
3232
*
3333
* @param entity New render entity.
3434
*/
35-
void set_render_entity(const std::shared_ptr<renderer::terrain::TerrainRenderEntity> &entity);
35+
void set_render_entity(const std::shared_ptr<renderer::terrain::RenderEntity> &entity);
3636

3737
/**
3838
* Get the size of this terrain chunk.
@@ -103,7 +103,7 @@ class TerrainChunk {
103103
/**
104104
* Render entity for pushing updates to the renderer. Can be \p nullptr.
105105
*/
106-
std::shared_ptr<renderer::terrain::TerrainRenderEntity> render_entity;
106+
std::shared_ptr<renderer::terrain::RenderEntity> render_entity;
107107
};
108108

109109
} // namespace openage::gamestate

‎libopenage/input/controller/hud/controller.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023-2023 the openage authors. See copying.md for legal info.
1+
// Copyright 2023-2024 the openage authors. See copying.md for legal info.
22

33
#include "controller.h"
44

@@ -27,19 +27,19 @@ bool Controller::process(const event_arguments &ev_args,
2727
return true;
2828
}
2929

30-
void Controller::set_drag_entity(const std::shared_ptr<renderer::hud::HudDragRenderEntity> &entity) {
30+
void Controller::set_drag_entity(const std::shared_ptr<renderer::hud::DragRenderEntity> &entity) {
3131
this->drag_entity = entity;
3232
}
3333

34-
const std::shared_ptr<renderer::hud::HudDragRenderEntity> &Controller::get_drag_entity() const {
34+
const std::shared_ptr<renderer::hud::DragRenderEntity> &Controller::get_drag_entity() const {
3535
return this->drag_entity;
3636
}
3737

3838
void setup_defaults(const std::shared_ptr<BindingContext> &ctx,
3939
const std::shared_ptr<renderer::hud::HudRenderStage> &hud_renderer) {
4040
binding_func_t drag_selection_init{[&](const event_arguments &args,
4141
const std::shared_ptr<Controller> controller) {
42-
auto render_entity = std::make_shared<renderer::hud::HudDragRenderEntity>(args.mouse);
42+
auto render_entity = std::make_shared<renderer::hud::DragRenderEntity>(args.mouse);
4343
hud_renderer->add_drag_entity(render_entity);
4444
controller->set_drag_entity(render_entity);
4545
}};

‎libopenage/input/controller/hud/controller.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace openage {
1111

1212
namespace renderer::hud {
13-
class HudDragRenderEntity;
13+
class DragRenderEntity;
1414
class HudRenderStage;
1515
} // namespace renderer::hud
1616

@@ -42,20 +42,20 @@ class Controller : public std::enable_shared_from_this<Controller> {
4242
*
4343
* @param entity New render entity.
4444
*/
45-
void set_drag_entity(const std::shared_ptr<renderer::hud::HudDragRenderEntity> &entity);
45+
void set_drag_entity(const std::shared_ptr<renderer::hud::DragRenderEntity> &entity);
4646

4747
/**
4848
* Get the render entity for the selection box.
4949
*
5050
* @return Render entity for the selection box.
5151
*/
52-
const std::shared_ptr<renderer::hud::HudDragRenderEntity> &get_drag_entity() const;
52+
const std::shared_ptr<renderer::hud::DragRenderEntity> &get_drag_entity() const;
5353

5454
private:
5555
/**
5656
* Render entity for the selection box.
5757
*/
58-
std::shared_ptr<renderer::hud::HudDragRenderEntity> drag_entity;
58+
std::shared_ptr<renderer::hud::DragRenderEntity> drag_entity;
5959
};
6060

6161
/**

‎libopenage/renderer/demo/demo_3.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void renderer_demo_3(const util::Path &path) {
123123

124124
// Fill a 10x10 terrain grid with height values
125125
auto terrain_size = util::Vector2s{10, 10};
126-
std::vector<std::pair<terrain::TerrainRenderEntity::terrain_elevation_t, std::string>> tiles{};
126+
std::vector<std::pair<terrain::RenderEntity::terrain_elevation_t, std::string>> tiles{};
127127
tiles.reserve(terrain_size[0] * terrain_size[1]);
128128
for (size_t i = 0; i < terrain_size[0] * terrain_size[1]; ++i) {
129129
tiles.emplace_back(0.0f, "./textures/test_terrain.terrain");

‎libopenage/renderer/demo/stresstest_0.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void renderer_stresstest_0(const util::Path &path) {
133133

134134
// Fill a 10x10 terrain grid with height values
135135
auto terrain_size = util::Vector2s{10, 10};
136-
std::vector<std::pair<terrain::TerrainRenderEntity::terrain_elevation_t, std::string>> tiles{};
136+
std::vector<std::pair<terrain::RenderEntity::terrain_elevation_t, std::string>> tiles{};
137137
tiles.reserve(terrain_size[0] * terrain_size[1]);
138138
for (size_t i = 0; i < terrain_size[0] * terrain_size[1]; ++i) {
139139
tiles.emplace_back(0.0f, "./textures/test_terrain.terrain");
@@ -147,7 +147,7 @@ void renderer_stresstest_0(const util::Path &path) {
147147
terrain0->update(terrain_size, tiles);
148148

149149
// World entities
150-
std::vector<std::shared_ptr<renderer::world::WorldRenderEntity>> render_entities{};
150+
std::vector<std::shared_ptr<renderer::world::RenderEntity>> render_entities{};
151151
auto add_world_entity = [&](const coord::phys3 initial_pos,
152152
const time::time_t time) {
153153
const auto animation_path = "./textures/test_tank_mirrored.sprite";

‎libopenage/renderer/demo/stresstest_1.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void renderer_stresstest_1(const util::Path &path) {
138138

139139
// Fill a 10x10 terrain grid with height values
140140
auto terrain_size = util::Vector2s{10, 10};
141-
std::vector<std::pair<terrain::TerrainRenderEntity::terrain_elevation_t, std::string>> tiles{};
141+
std::vector<std::pair<terrain::RenderEntity::terrain_elevation_t, std::string>> tiles{};
142142
tiles.reserve(terrain_size[0] * terrain_size[1]);
143143
for (size_t i = 0; i < terrain_size[0] * terrain_size[1]; ++i) {
144144
tiles.emplace_back(0.0f, "./textures/test_terrain.terrain");
@@ -151,7 +151,7 @@ void renderer_stresstest_1(const util::Path &path) {
151151
// send the terrain data to the terrain renderer
152152
terrain0->update(terrain_size, tiles);
153153

154-
std::vector<std::shared_ptr<renderer::world::WorldRenderEntity>> render_entities{};
154+
std::vector<std::shared_ptr<renderer::world::RenderEntity>> render_entities{};
155155
auto add_world_entity = [&](const coord::phys3 initial_pos,
156156
const time::time_t time) {
157157
const auto animation_path = "./textures/test_tank_mirrored.sprite";

0 commit comments

Comments
 (0)