From 56ce70f02531464f436cd44b03af0f577a7e278f Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 25 Sep 2019 01:49:35 +0200 Subject: [PATCH] Work on VoxelStructure. --- world/voxel_structure.cpp | 160 +++++++++++++++++++++++++++++++++++++- world/voxel_structure.h | 49 ++++++++++++ 2 files changed, 208 insertions(+), 1 deletion(-) diff --git a/world/voxel_structure.cpp b/world/voxel_structure.cpp index c1fb5a0..98edace 100644 --- a/world/voxel_structure.cpp +++ b/world/voxel_structure.cpp @@ -1,11 +1,169 @@ #include "voxel_structure.h" -VoxelStructure::VoxelStructure() { +int VoxelStructure::get_chunk_size_x() const { + return _chunk_size.x; +} +void VoxelStructure::set_chunk_size_x(const int value) { + _chunk_size.x = value; +} +int VoxelStructure::get_chunk_size_y() const { + return _chunk_size.y; +} +void VoxelStructure::set_chunk_size_y(const int value) { + _chunk_size.y = value; +} + +int VoxelStructure::get_chunk_size_z() const { + return _chunk_size.z; +} +void VoxelStructure::set_chunk_size_z(const int value) { + _chunk_size.z = value; +} + + +int VoxelStructure::get_world_position_x() const { + return _world_position.x; +} +void VoxelStructure::set_world_position_x(const int value) { + _world_position.x = value; +} + +int VoxelStructure::get_world_position_y() const { + return _world_position.y; +} +void VoxelStructure::set_world_position_y(const int value) { + _world_position.y = value; +} + +int VoxelStructure::get_world_position_z() const { + return _world_position.z; +} +void VoxelStructure::set_world_position_z(const int value) { + _world_position.z = value; +} + +Ref VoxelStructure::get_chunk_pos(int x, int y, int z) { + //get, or create if not exists + return Ref(); +} + +int VoxelStructure::get_voxel(int x, int y, int z, unsigned int channel_index) const { + //vb = get_chunk_pos + //err fail cond + //get, ret + + return 0; +} +void VoxelStructure::set_voxel(int value, int x, int y, int z, unsigned int channel_index) { + //vb = get_chunk_pos + //err fail cond + //set +} +void VoxelStructure::set_voxel_v(int value, Vector3 pos, unsigned int channel_index) { + +} + +void VoxelStructure::add_chunk(Ref chunk, const int x, const int y, const int z) { + _chunks.set(Vector3i(x, y, z), chunk); + + VoxelStructureChunk c; + c.buffer = chunk; + c.position = Vector3i(x, y, z); + + _chunks_vector.push_back(c); +} +Ref VoxelStructure::get_chunk(const int x, const int y, const int z) const { + const Ref *chunk = _chunks.getptr(Vector3i(x, y, z)); + + return Ref(chunk); +} +Ref VoxelStructure::remove_chunk(const int x, const int y, const int z) { + Ref *chunk = _chunks.getptr(Vector3i(x, y, z)); + + Ref c(chunk); + + if (c.is_valid()) { + + for (int i = 0; i < _chunks_vector.size(); ++i) { + if (_chunks_vector.get(i).buffer == c) { + _chunks_vector.remove(i); + break; + } + } + } + + return c; +} + +Ref VoxelStructure::get_chunk_index(const int index) { + return _chunks_vector.get(index).buffer; +} +int VoxelStructure::get_chunk_count() const { + return _chunks_vector.size(); +} + +void VoxelStructure::clear_chunks() { + for (int i = 0; i < _chunks_vector.size(); ++i) { + _chunks_vector.get(i).buffer.unref(); + } + + _chunks_vector.clear(); + + _chunks.clear(); +} + + +VoxelStructure::VoxelStructure() { + _chunk_size = Vector3i(16, 16, 16); + _world_position = Vector3i(0, 0, 0); } VoxelStructure::~VoxelStructure() { + for (int i = 0; i < _chunks_vector.size(); ++i) { + _chunks_vector.get(i).buffer.unref(); + } + + _chunks.clear(); + _chunks_vector.clear(); } void VoxelStructure::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_chunk_size_x"), &VoxelStructure::get_chunk_size_x); + ClassDB::bind_method(D_METHOD("set_chunk_size_x", "value"), &VoxelStructure::set_chunk_size_x); + ADD_PROPERTY(PropertyInfo(Variant::INT, "chunk_size_x"), "set_chunk_size_x", "get_chunk_size_x"); + + ClassDB::bind_method(D_METHOD("get_chunk_size_y"), &VoxelStructure::get_chunk_size_y); + ClassDB::bind_method(D_METHOD("set_chunk_size_y", "value"), &VoxelStructure::set_chunk_size_y); + ADD_PROPERTY(PropertyInfo(Variant::INT, "chunk_size_y"), "set_chunk_size_y", "get_chunk_size_y"); + + ClassDB::bind_method(D_METHOD("get_chunk_size_z"), &VoxelStructure::get_chunk_size_z); + ClassDB::bind_method(D_METHOD("set_chunk_size_z", "value"), &VoxelStructure::set_chunk_size_z); + ADD_PROPERTY(PropertyInfo(Variant::INT, "chunk_size_z"), "set_chunk_size_z", "get_chunk_size_z"); + + + ClassDB::bind_method(D_METHOD("get_world_position_x"), &VoxelStructure::get_world_position_x); + ClassDB::bind_method(D_METHOD("set_world_position_x", "value"), &VoxelStructure::set_world_position_x); + ADD_PROPERTY(PropertyInfo(Variant::INT, "world_position_x"), "set_world_position_x", "get_world_position_x"); + + ClassDB::bind_method(D_METHOD("get_world_position_y"), &VoxelStructure::get_world_position_y); + ClassDB::bind_method(D_METHOD("set_world_position_y", "value"), &VoxelStructure::set_world_position_y); + ADD_PROPERTY(PropertyInfo(Variant::INT, "world_position_y"), "set_world_position_y", "get_world_position_y"); + + ClassDB::bind_method(D_METHOD("get_world_position_z"), &VoxelStructure::get_world_position_z); + ClassDB::bind_method(D_METHOD("set_world_position_z", "value"), &VoxelStructure::set_world_position_z); + ADD_PROPERTY(PropertyInfo(Variant::INT, "world_position_z"), "set_world_position_z", "get_world_position_z"); + + ClassDB::bind_method(D_METHOD("get_voxel", "x", "y", "z", "channel_index"), &VoxelStructure::get_voxel, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("set_voxel", "value", "x", "y", "z", "channel_index"), &VoxelStructure::set_voxel, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("set_voxel_v", "value", "pos", "channel_index"), &VoxelStructure::set_voxel_v, DEFVAL(0)); + + ClassDB::bind_method(D_METHOD("add_chunk", "chunk", "x", "y", "z"), &VoxelStructure::add_chunk); + ClassDB::bind_method(D_METHOD("get_chunk", "x", "y", "z"), &VoxelStructure::get_chunk); + ClassDB::bind_method(D_METHOD("remove_chunk", "x", "y", "z"), &VoxelStructure::remove_chunk); + + ClassDB::bind_method(D_METHOD("get_chunk_index", "index"), &VoxelStructure::get_chunk_index); + ClassDB::bind_method(D_METHOD("get_chunk_count"), &VoxelStructure::get_chunk_count); + + ClassDB::bind_method(D_METHOD("clear_chunks"), &VoxelStructure::clear_chunks); } diff --git a/world/voxel_structure.h b/world/voxel_structure.h index a180160..85a5f67 100644 --- a/world/voxel_structure.h +++ b/world/voxel_structure.h @@ -3,16 +3,65 @@ #include "core/reference.h" +#include "core/hash_map.h" +#include "../math/vector3i.h" +#include "voxel_buffer.h" + class VoxelStructure : public Reference { GDCLASS(VoxelStructure, Reference); public: + int get_chunk_size_x() const; + void set_chunk_size_x(const int value); + + int get_chunk_size_y() const; + void set_chunk_size_y(const int value); + + int get_chunk_size_z() const; + void set_chunk_size_z(const int value); + + + int get_world_position_x() const; + void set_world_position_x(const int value); + + int get_world_position_y() const; + void set_world_position_y(const int value); + + int get_world_position_z() const; + void set_world_position_z(const int value); + + Ref get_chunk_pos(int x, int y, int z); + + int get_voxel(int x, int y, int z, unsigned int channel_index = 0) const; + void set_voxel(int value, int x, int y, int z, unsigned int channel_index = 0); + void set_voxel_v(int value, Vector3 pos, unsigned int channel_index = 0); + + void add_chunk(Ref chunk, const int x, const int y, const int z); + Ref get_chunk(const int x, const int y, const int z) const; + Ref remove_chunk(const int x, const int y, const int z); + + Ref get_chunk_index(const int index); + int get_chunk_count() const; + + void clear_chunks(); + VoxelStructure(); ~VoxelStructure(); protected: static void _bind_methods(); + struct VoxelStructureChunk { + Vector3i position; + Ref buffer; + }; + +private: + Vector3i _chunk_size; + Vector3i _world_position; + + HashMap, Vector3iHasher> _chunks; + Vector _chunks_vector; }; #endif