Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-01-25 15:09:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a new tool to the world editor, it adds a block to the location of the spatial editor's camera.

Browse Source
This commit is contained in:
Relintai 2020-04-17 18:36:14 +02:00
parent ba0c1bc820
commit c382dac3ff
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
world/voxel_world_editor.cpp
View File

@ -260,6 +260,12 @@ VoxelWorldEditor::VoxelWorldEditor(EditorNode *p_editor) {
remove_button->set_shortcut(ED_SHORTCUT("voxelman_world_editor/remove_mode", "Remove Mode", KEY_S)); remove_button->set_shortcut(ED_SHORTCUT("voxelman_world_editor/remove_mode", "Remove Mode", KEY_S));
spatial_editor_hb->add_child(remove_button); spatial_editor_hb->add_child(remove_button);
ToolButton *insert_buton = memnew(ToolButton);
insert_buton->set_text("Insert");
insert_buton->connect("button_up", this, "_on_insert_block_at_camera_button_pressed");
insert_buton->set_shortcut(ED_SHORTCUT("voxelman_world_editor/instert_block_at_camera", "Insert at camera", KEY_B));
spatial_editor_hb->add_child(insert_buton);
set_custom_minimum_size(Size2(200 * EDSCALE, 0)); set_custom_minimum_size(Size2(200 * EDSCALE, 0));
TabContainer *tab_container = memnew(TabContainer); TabContainer *tab_container = memnew(TabContainer);
@ -327,6 +333,35 @@ void VoxelWorldEditor::_on_tool_button_pressed() {
} }
} }
void VoxelWorldEditor::_on_insert_block_at_camera_button_pressed() {
int selected_voxel = 0;
int channel = 0;
if (_current_tab == 0) {
channel = _channel_type;
} else {
channel = _channel_liquid_type;
}
if (channel == -1)
return;
SpatialEditorViewport *vp = SpatialEditor::get_singleton()->get_editor_viewport(0);
if (!vp)
return;
Camera *cam = vp->get_camera();
if (!cam)
return;
Vector3 pos = cam->get_transform().origin;
selected_voxel = _selected_type + 1;
_world->set_voxel_at_world_position(pos, selected_voxel, channel);
}
void VoxelWorldEditor::_tab_selected(int tab) { void VoxelWorldEditor::_tab_selected(int tab) {
_current_tab = tab; _current_tab = tab;
} }
@ -336,6 +371,7 @@ void VoxelWorldEditor::_bind_methods() {
ClassDB::bind_method("_on_surface_button_pressed", &VoxelWorldEditor::_on_surface_button_pressed); ClassDB::bind_method("_on_surface_button_pressed", &VoxelWorldEditor::_on_surface_button_pressed);
ClassDB::bind_method("_on_tool_button_pressed", &VoxelWorldEditor::_on_tool_button_pressed); ClassDB::bind_method("_on_tool_button_pressed", &VoxelWorldEditor::_on_tool_button_pressed);
ClassDB::bind_method("_tab_selected", &VoxelWorldEditor::_tab_selected); ClassDB::bind_method("_tab_selected", &VoxelWorldEditor::_tab_selected);
ClassDB::bind_method("_on_insert_block_at_camera_button_pressed", &VoxelWorldEditor::_on_insert_block_at_camera_button_pressed);
} }
void VoxelWorldEditorPlugin::_notification(int p_what) { void VoxelWorldEditorPlugin::_notification(int p_what) {

1
world/voxel_world_editor.h
View File

@ -64,6 +64,7 @@ protected:
void _node_removed(Node *p_node); void _node_removed(Node *p_node);
void _on_surface_button_pressed(); void _on_surface_button_pressed();
void _on_tool_button_pressed(); void _on_tool_button_pressed();
void _on_insert_block_at_camera_button_pressed();
void _tab_selected(int tab); void _tab_selected(int tab);
private: private: