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

VoxelChunk is a Reference now.

Browse Source
This commit is contained in:
Relintai 2019-07-18 02:05:50 +02:00
parent 9c036f0706
commit 7e7c07cbd8
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
world/voxel_chunk.cpp
View File

@ -96,6 +96,21 @@ void VoxelChunk::set_mesher(Ref<VoxelMesher> mesher) {
_mesher = mesher;
}
VoxelWorld *VoxelChunk::get_voxel_world() const {
return _voxel_world;
}
void VoxelChunk::set_voxel_world(VoxelWorld *world) {
_voxel_world = world;
}
void VoxelChunk::set_voxel_world_bind(Node *world) {
if (world == NULL) {
_voxel_world = NULL;
return;
}
_voxel_world = Object::cast_to<VoxelWorld>(world);
}
bool VoxelChunk::get_build_mesh() const {
return _build_mesh;
}
@ -177,6 +192,8 @@ void VoxelChunk::finalize_mesh() {
}
void VoxelChunk::create_colliders() {
ERR_FAIL_COND(_voxel_world == NULL);
_shape_rid = PhysicsServer::get_singleton()->shape_create(PhysicsServer::SHAPE_CONCAVE_POLYGON);
_body_rid = PhysicsServer::get_singleton()->body_create(PhysicsServer::BODY_MODE_STATIC);
@ -186,7 +203,7 @@ void VoxelChunk::create_colliders() {
PhysicsServer::get_singleton()->body_add_shape(_body_rid, _shape_rid);
PhysicsServer::get_singleton()->body_set_state(_body_rid, PhysicsServer::BODY_STATE_TRANSFORM, Transform(Basis(), Vector3(_chunk_position.x * _chunk_size.x * _voxel_scale, _chunk_position.y * _chunk_size.y * _voxel_scale, _chunk_position.z * _chunk_size.z * _voxel_scale)));
PhysicsServer::get_singleton()->body_set_space(_body_rid, get_world()->get_space());
PhysicsServer::get_singleton()->body_set_space(_body_rid, get_voxel_world()->get_world()->get_space());
}
void VoxelChunk::build_collider() {
@ -207,8 +224,6 @@ void VoxelChunk::set_enabled(bool p_enabled) {
_enabled = p_enabled;
if (is_inside_tree())
set_physics_process_internal(p_enabled);
}
bool VoxelChunk::is_enabled() const {
@ -273,6 +288,8 @@ void VoxelChunk::clear_baked_lights() {
}
void VoxelChunk::create_meshes() {
ERR_FAIL_COND(_voxel_world == NULL);
ERR_FAIL_COND(!get_library().is_valid());
_mesh_instance_rid = VS::get_singleton()->instance_create();
@ -281,8 +298,8 @@ void VoxelChunk::create_meshes() {
VS::get_singleton()->instance_geometry_set_material_override(_mesh_instance_rid, get_library()->get_material()->get_rid());
}
if (get_world().is_valid())
VS::get_singleton()->instance_set_scenario(_mesh_instance_rid, get_world()->get_scenario());
if (get_voxel_world()->get_world().is_valid())
VS::get_singleton()->instance_set_scenario(_mesh_instance_rid, get_voxel_world()->get_world()->get_scenario());
_mesh_rid = VS::get_singleton()->mesh_create();
@ -302,12 +319,13 @@ void VoxelChunk::remove_meshes() {
}
void VoxelChunk::create_debug_immediate_geometry() {
ERR_FAIL_COND(_voxel_world == NULL);
ERR_FAIL_COND(_debug_drawer != NULL);
_debug_drawer = memnew(ImmediateGeometry());
get_parent()->add_child(_debug_drawer);
_debug_drawer->set_owner(get_parent());
get_voxel_world()->add_child(_debug_drawer);
_debug_drawer->set_owner(get_voxel_world());
_debug_drawer->set_transform(Transform(Basis(), Vector3(_chunk_position.x * _chunk_size.x * _voxel_scale, _chunk_position.y * _chunk_size.y * _voxel_scale, _chunk_position.z * _chunk_size.z * _voxel_scale)));
}
@ -421,6 +439,7 @@ VoxelChunk::VoxelChunk() {
_buffer.instance();
_debug_drawer = NULL;
_voxel_world = NULL;
}
VoxelChunk::~VoxelChunk() {
@ -508,6 +527,10 @@ void VoxelChunk::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_mesher", "Mesher"), &VoxelChunk::set_mesher);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesher", PROPERTY_HINT_RESOURCE_TYPE, "VoxelMesher"), "set_mesher", "get_mesher");
ClassDB::bind_method(D_METHOD("get_voxel_world"), &VoxelChunk::get_voxel_world);
ClassDB::bind_method(D_METHOD("set_voxel_world", "world"), &VoxelChunk::set_voxel_world_bind);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "voxel_world", PROPERTY_HINT_RESOURCE_TYPE, "VoxelWorld"), "set_voxel_world", "get_voxel_world");
ClassDB::bind_method(D_METHOD("add_lights", "lights"), &VoxelChunk::add_lights);
ClassDB::bind_method(D_METHOD("add_voxel_light", "light"), &VoxelChunk::add_voxel_light);
ClassDB::bind_method(D_METHOD("remove_voxel_light", "light"), &VoxelChunk::remove_voxel_light);

15
world/voxel_chunk.h
View File

@ -3,14 +3,17 @@
#include "core/engine.h"
#include "core/object.h"
#include "core/reference.h"
#include "core/ustring.h"
#include "scene/3d/mesh_instance.h"
#include "scene/3d/spatial.h"
//#include "scene/3d/spatial.h"
#include "scene/3d/collision_shape.h"
#include "scene/3d/physics_body.h"
#include "scene/resources/concave_polygon_shape.h"
#include "core/array.h"
#include "voxel_world.h"
#include "../data/voxel_light.h"
#include "../meshers/voxel_mesher.h"
@ -22,8 +25,8 @@
#include "voxel_buffer.h"
class VoxelChunk : public Spatial {
GDCLASS(VoxelChunk, Spatial);
class VoxelChunk : public Reference {
GDCLASS(VoxelChunk, Reference);
public:
int get_chunk_position_x();
@ -58,6 +61,10 @@ public:
Ref<VoxelMesher> get_mesher() const;
void set_mesher(Ref<VoxelMesher> mesher);
VoxelWorld *get_voxel_world() const;
void set_voxel_world(VoxelWorld *world);
void set_voxel_world_bind(Node *world);
bool get_build_mesh() const;
void set_build_mesh(bool value);
@ -114,6 +121,8 @@ protected:
bool _enabled;
VoxelWorld *_voxel_world;
Vector3i _chunk_position;
Vector3i _chunk_size;