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

The air block is not required anymore. Also Implemented the sidebar for world editor. And fixed a naming error for a virtual method in the merger library.

Browse Source
This commit is contained in:
Relintai 2020-04-17 00:37:22 +02:00
parent 76f9011c24
commit 7c0390de74
6 changed files with 139 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/voxelman_library_merger.cpp
View File

@ -159,7 +159,7 @@ void VoxelmanLibraryMerger::set_voxel_surfaces(const Vector<Variant> &surfaces)
}
//Liquids
Ref<VoxelSurface> VoxelmanLibraryMerger::get_liquid_voxel_surface(const int index) {
Ref<VoxelSurface> VoxelmanLibraryMerger::get_liquid_surface(const int index) {
ERR_FAIL_INDEX_V(index, _liquid_surfaces.size(), Ref<VoxelSurface>(NULL));
return _liquid_surfaces[index];

2
library/voxelman_library_merger.h
View File

@ -65,7 +65,7 @@ public:
Vector<Variant> get_voxel_surfaces();
void set_voxel_surfaces(const Vector<Variant> &surfaces);
Ref<VoxelSurface> get_liquid_voxel_surface(const int index);
Ref<VoxelSurface> get_liquid_surface(const int index);
void add_liquid_surface(Ref<VoxelSurface> value);
void set_liquid_voxel_surface(const int index, Ref<VoxelSurface> value);
void remove_liquid_surface(const int index);

2
meshers/blocky/voxel_mesher_blocky.cpp
View File

@ -80,7 +80,7 @@ void VoxelMesherBlocky::_add_chunk(Ref<VoxelChunk> p_chunk) {
if (type == 0)
continue;
Ref<VoxelSurface> surface = _library->get_voxel_surface(type);
Ref<VoxelSurface> surface = _library->get_voxel_surface(type - 1);
if (!surface.is_valid())
continue;

4
meshers/transvoxel_uv_mesher/voxel_mesher_uv_transvoxel.cpp
View File

@ -285,8 +285,8 @@ void VoxelMesherUVTransvoxel::_add_chunk(Ref<VoxelChunk> p_chunk) {
if (type_id1 != type_id2)
surface_ratio = static_cast<float>(type_id1c) / static_cast<float>(type_id2c) / 8.0;
Ref<VoxelSurface> surface1 = _library->get_voxel_surface(type_id1);
Ref<VoxelSurface> surface2 = _library->get_voxel_surface(type_id2);
Ref<VoxelSurface> surface1 = _library->get_voxel_surface(type_id1 - 1);
Ref<VoxelSurface> surface2 = _library->get_voxel_surface(type_id2 - 1);
for (int i = 0; i < vertex_count; ++i) {
int fv = get_regular_vertex_data_first_vertex(case_code, i);

125
world/voxel_world_editor.cpp
View File

@ -34,6 +34,9 @@ SOFTWARE.
#include "voxel_chunk.h"
#include "../library/voxel_surface.h"
#include "../library/voxelman_library.h"
#include "core/version.h"
#if VERSION_MAJOR < 4
@ -104,7 +107,7 @@ bool VoxelWorldEditor::do_input_action(Camera *p_camera, const Point2 &p_point,
if (_tool_mode == TOOL_MODE_ADD) {
pos = (res.position + (Vector3(0.1, 0.1, 0.1) * res.normal));
selected_voxel = _seletced_type;
selected_voxel = _selected_type + 1;
} else if (_tool_mode == TOOL_MODE_REMOVE) {
pos = (res.position + (Vector3(0.1, 0.1, 0.1) * -res.normal));
selected_voxel = 0;
@ -121,18 +124,92 @@ bool VoxelWorldEditor::do_input_action(Camera *p_camera, const Point2 &p_point,
void VoxelWorldEditor::edit(VoxelWorld *p_world) {
_world = p_world;
if (!_world)
return;
spatial_editor = Object::cast_to<SpatialEditorPlugin>(_editor->get_editor_plugin_screen());
for (int i = 0; i < _surfaces_vbox_container->get_child_count(); ++i) {
Node *child = _surfaces_vbox_container->get_child(i);
if (!child->is_queued_for_deletion()) {
child->queue_delete();
}
}
for (int i = 0; i < _liquid_surfaces_vbox_container->get_child_count(); ++i) {
Node *child = _liquid_surfaces_vbox_container->get_child(i);
if (!child->is_queued_for_deletion()) {
child->queue_delete();
}
}
Ref<VoxelmanLibrary> library = _world->get_library();
if (!library.is_valid())
return;
bool f = false;
for (int i = 0; i < library->get_num_surfaces(); ++i) {
Ref<VoxelSurface> surface = library->get_voxel_surface(i);
if (!surface.is_valid())
continue;
String text = String::num(i) + " - " + surface->get_name();
Button *button = memnew(Button);
button->set_h_size_flags(SIZE_EXPAND_FILL);
button->set_text(text);
button->set_meta("index", i);
button->set_toggle_mode(true);
button->set_button_group(_surfaces_button_group);
button->connect("button_up", this, "_on_surface_button_pressed");
_surfaces_vbox_container->add_child(button);
if (!f) {
button->set_pressed(true);
f = true;
}
}
f = false;
for (int i = 0; i < library->get_num_liquid_surfaces(); ++i) {
Ref<VoxelSurface> surface = library->get_liquid_surface(i);
if (!surface.is_valid())
continue;
String text = String::num(i) + " - " + surface->get_name();
Button *button = memnew(Button);
button->set_h_size_flags(SIZE_EXPAND_FILL);
button->set_text(text);
button->set_meta("index", i);
button->set_toggle_mode(true);
button->set_button_group(_liquid_surfaces_button_group);
button->connect("button_up", this, "_on_surface_button_pressed");
_liquid_surfaces_vbox_container->add_child(button);
if (!f) {
button->set_pressed(true);
f = true;
}
}
}
VoxelWorldEditor::VoxelWorldEditor() {
_world = NULL;
_seletced_type = 1;
_selected_type = 0;
_selected_liquid_type = 0;
_editor = NULL;
_tool_mode = TOOL_MODE_ADD;
}
VoxelWorldEditor::VoxelWorldEditor(EditorNode *p_editor) {
_world = NULL;
_seletced_type = 1;
_selected_type = 0;
_selected_liquid_type = 0;
_editor = p_editor;
_tool_mode = TOOL_MODE_ADD;
@ -140,9 +217,35 @@ VoxelWorldEditor::VoxelWorldEditor(EditorNode *p_editor) {
spatial_editor_hb->set_h_size_flags(SIZE_EXPAND_FILL);
spatial_editor_hb->set_alignment(BoxContainer::ALIGN_END);
SpatialEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb);
set_custom_minimum_size(Size2(200 * EDSCALE, 0));
TabContainer *tab_container = memnew(TabContainer);
tab_container->set_h_size_flags(SIZE_EXPAND_FILL);
tab_container->set_v_size_flags(SIZE_EXPAND_FILL);
tab_container->set_name("Surfaces");
add_child(tab_container);
_surfaces_vbox_container = memnew(VBoxContainer);
_surfaces_vbox_container->set_h_size_flags(SIZE_EXPAND_FILL);
_surfaces_vbox_container->set_v_size_flags(SIZE_EXPAND_FILL);
_surfaces_vbox_container->set_name("Surfaces");
tab_container->add_child(_surfaces_vbox_container);
_liquid_surfaces_vbox_container = memnew(VBoxContainer);
_liquid_surfaces_vbox_container->set_h_size_flags(SIZE_EXPAND_FILL);
_liquid_surfaces_vbox_container->set_v_size_flags(SIZE_EXPAND_FILL);
_liquid_surfaces_vbox_container->set_name("Liquids");
tab_container->add_child(_liquid_surfaces_vbox_container);
_surfaces_button_group.instance();
_liquid_surfaces_button_group.instance();
}
VoxelWorldEditor::~VoxelWorldEditor() {
_world = NULL;
_surfaces_button_group.unref();
_liquid_surfaces_button_group.unref();
}
void VoxelWorldEditor::_node_removed(Node *p_node) {
@ -151,8 +254,24 @@ void VoxelWorldEditor::_node_removed(Node *p_node) {
_world = NULL;
}
void VoxelWorldEditor::_on_surface_button_pressed() {
BaseButton *button = _surfaces_button_group->get_pressed_button();
if (button) {
_selected_type = button->get_meta("index");
}
button = _liquid_surfaces_button_group->get_pressed_button();
if (button) {
_selected_liquid_type = button->get_meta("index");
}
}
void VoxelWorldEditor::_bind_methods() {
ClassDB::bind_method("_node_removed", &VoxelWorldEditor::_node_removed);
ClassDB::bind_method("_on_surface_button_pressed", &VoxelWorldEditor::_on_surface_button_pressed);
}
void VoxelWorldEditorPlugin::_notification(int p_what) {

15
world/voxel_world_editor.h
View File

@ -38,8 +38,8 @@ SOFTWARE.
class VoxelWorld;
class SpatialEditorPlugin;
class VoxelWorldEditor : public VBoxContainer {
GDCLASS(VoxelWorldEditor, VBoxContainer);
class VoxelWorldEditor : public PanelContainer {
GDCLASS(VoxelWorldEditor, PanelContainer);
public:
enum VoxelWorldEditorToolMode {
@ -62,11 +62,20 @@ public:
protected:
static void _bind_methods();
void _node_removed(Node *p_node);
void _on_surface_button_pressed();
private:
VBoxContainer *_surfaces_vbox_container;
VBoxContainer *_liquid_surfaces_vbox_container;
Ref<ButtonGroup> _surfaces_button_group;
Ref<ButtonGroup> _liquid_surfaces_button_group;
VoxelWorldEditorToolMode _tool_mode;
VoxelWorld *_world;
int _seletced_type;
int _selected_type;
int _selected_liquid_type;
SpatialEditorPlugin *spatial_editor;
EditorNode *_editor;
};