Relintai/terraman_2d
1
0
Fork 0
mirror of https://github.com/Relintai/terraman_2d.git synced 2024-11-12 10:15:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a custom transform to world and chunks. It can be used to set up everything as isometric.

Browse Source
This commit is contained in:
Relintai 2022-02-24 18:48:46 +01:00
parent 013d8f0363
commit aa85599ec4
4 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
world/terrain_2d_chunk.cpp
View File

@ -242,6 +242,13 @@ void Terrain2DChunk::set_voxel_world_bind(Node *world) {
set_voxel_world(Object::cast_to<Terrain2DWorld>(world));
}
Transform2D Terrain2DChunk::get_custom_transform() {
return _custom_transform;
}
void Terrain2DChunk::set_custom_transform(const Transform2D &value) {
_custom_transform = value;
}
Ref<Terrain2DJob> Terrain2DChunk::job_get(int index) const {
ERR_FAIL_INDEX_V(index, _jobs.size(), Ref<Terrain2DJob>());
@ -1247,7 +1254,12 @@ void Terrain2DChunk::_generation_physics_process(const float delta) {
void Terrain2DChunk::_world_transform_changed() {
Transform2D t;
t.set_origin( Vector2(_position_x * static_cast<int>(_size_x) * _cell_size_x, _position_y * static_cast<int>(_size_y) * _cell_size_y));
Vector2 pos = Vector2(_position_x * static_cast<int>(_size_x) * _cell_size_x, _position_y * static_cast<int>(_size_y) * _cell_size_y);
pos = _custom_transform.xform(pos);
t *= _custom_transform;
t.set_origin(pos);
set_transform(t);
@ -1464,6 +1476,10 @@ void Terrain2DChunk::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_voxel_world", "world"), &Terrain2DChunk::set_voxel_world_bind);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "voxel_world", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DWorld", 0), "set_voxel_world", "get_voxel_world");
ClassDB::bind_method(D_METHOD("get_custom_transform"), &Terrain2DChunk::get_custom_transform);
ClassDB::bind_method(D_METHOD("set_custom_transform", "player"), &Terrain2DChunk::set_custom_transform);
ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM2D, "get_custom_transform"), "set_custom_transform", "get_custom_transform");
//Terra Data
ClassDB::bind_method(D_METHOD("channel_setup"), &Terrain2DChunk::channel_setup);

5
world/terrain_2d_chunk.h
View File

@ -190,6 +190,9 @@ public:
void set_voxel_world(Terrain2DWorld *world);
void set_voxel_world_bind(Node *world);
Transform2D get_custom_transform();
void set_custom_transform(const Transform2D &value);
//Jobs
Ref<Terrain2DJob> job_get(const int index) const;
void job_set(const int index, const Ref<Terrain2DJob> &job);
@ -446,6 +449,8 @@ protected:
bool _queued_generation;
RID _canvas_item;
Transform2D _custom_transform;
};
#endif

24
world/terrain_2d_world.cpp
View File

@ -130,10 +130,10 @@ void Terrain2DWorld::set_level_generator(const Ref<Terrain2DLevelGenerator> &lev
_level_generator = level_generator;
}
int Terrain2DWorld::get_cell_size_x() const{
int Terrain2DWorld::get_cell_size_x() const {
return _cell_size_x;
}
void Terrain2DWorld::set_cell_size_x(const int value){
void Terrain2DWorld::set_cell_size_x(const int value) {
_cell_size_x = value;
for (int i = 0; i < chunk_get_count(); ++i) {
@ -146,7 +146,7 @@ void Terrain2DWorld::set_cell_size_x(const int value){
}
}
int Terrain2DWorld::get_cell_size_y() const{
int Terrain2DWorld::get_cell_size_y() const {
return _cell_size_y;
}
void Terrain2DWorld::set_cell_size_y(const int value) {
@ -187,6 +187,13 @@ void Terrain2DWorld::set_player_bind(Node *player) {
set_player(Object::cast_to<Node2D>(player));
}
Transform2D Terrain2DWorld::get_custom_transform() {
return _custom_transform;
}
void Terrain2DWorld::set_custom_transform(const Transform2D &value) {
_custom_transform = value;
}
Ref<Terrain2DWorldArea> Terrain2DWorld::world_area_get(const int index) const {
ERR_FAIL_INDEX_V(index, _world_areas.size(), Ref<Terrain2DWorldArea>());
@ -439,7 +446,8 @@ Ref<Terrain2DChunk> Terrain2DWorld::_create_chunk(const int x, const int y, Ref<
chunk->set_library(_library);
chunk->set_cell_size_x(_cell_size_x);
chunk->set_cell_size_y(_cell_size_y);
chunk->set_custom_transform(_custom_transform);
chunk->set_size(_chunk_size_x, _chunk_size_y, _data_margin_start, _data_margin_end);
//chunk->set_translation(Vector3(x * _chunk_size_x * _voxel_scale, y * _chunk_size_y * _voxel_scale, z * _chunk_size_z * _voxel_scale));
@ -767,7 +775,7 @@ uint8_t Terrain2DWorld::get_voxel_at_world_position(const Vector2 &world_positio
Vector2 pos = world_position;
pos.x /= _cell_size_x;
pos.y /= _cell_size_y;
//Note: floor is needed to handle negative numbers properly
int x = static_cast<int>(Math::floor(pos.x / get_chunk_size_x()));
int y = static_cast<int>(Math::floor(pos.y / get_chunk_size_y()));
@ -1168,6 +1176,10 @@ void Terrain2DWorld::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_player", "player"), &Terrain2DWorld::set_player_bind);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "player", PROPERTY_HINT_RESOURCE_TYPE, "node2D", 0), "set_player", "get_player");
ClassDB::bind_method(D_METHOD("get_custom_transform"), &Terrain2DWorld::get_custom_transform);
ClassDB::bind_method(D_METHOD("set_custom_transform", "player"), &Terrain2DWorld::set_custom_transform);
ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM2D, "get_custom_transform"), "set_custom_transform", "get_custom_transform");
ClassDB::bind_method(D_METHOD("world_area_get", "index"), &Terrain2DWorld::world_area_get);
ClassDB::bind_method(D_METHOD("world_area_add", "area"), &Terrain2DWorld::world_area_add);
ClassDB::bind_method(D_METHOD("world_area_remove", "index"), &Terrain2DWorld::world_area_remove);
@ -1278,7 +1290,7 @@ void Terrain2DWorld::_bind_methods() {
PropertyInfo(Variant::INT, "selected_voxel"),
PropertyInfo(Variant::INT, "isolevel")));
#else
GDVIRTUAL_BIND(_set_voxel_with_tool, "mode_add", "hit_position", "selected_voxel", "isolevel");
GDVIRTUAL_BIND(_set_voxel_with_tool, "mode_add", "hit_position", "selected_voxel", "isolevel");
#endif
ClassDB::bind_method(D_METHOD("set_voxel_with_tool", "mode_add", "hit_position", "selected_voxel", "isolevel"), &Terrain2DWorld::set_voxel_with_tool);

5
world/terrain_2d_world.h
View File

@ -114,6 +114,9 @@ public:
void set_player(Node2D *player);
void set_player_bind(Node *player);
Transform2D get_custom_transform();
void set_custom_transform(const Transform2D &value);
//World Areas
Ref<Terrain2DWorldArea> world_area_get(const int index) const;
void world_area_add(const Ref<Terrain2DWorldArea> &area);
@ -283,6 +286,8 @@ private:
int _num_frame_chunk_build_steps;
Vector<Ref<Terrain2DLight>> _lights;
Transform2D _custom_transform;
};
_FORCE_INLINE_ bool operator==(const Terrain2DWorld::IntPos &a, const Terrain2DWorld::IntPos &b) {