Setup for a new VoxelWorldEditor.

SCsub

@@ -56,6 +56,7 @@ sources = [
     "clutter/ground_clutter.cpp",
     "clutter/ground_clutter_foliage.cpp",
 
+    "world/voxel_world_editor.cpp",
     #"prop_tool/prop_tool_editor_plugin.cpp",
 ]
 

register_types.cpp

@@ -62,6 +62,8 @@ SOFTWARE.
 #include "clutter/ground_clutter.h"
 #include "clutter/ground_clutter_foliage.h"
 
+#include "world/voxel_world_editor.h"
+
 //#include "prop_tool/prop_tool_editor_plugin.h"
 
 void register_voxelman_types() {
@@ -105,9 +107,13 @@ void register_voxelman_types() {
 
 	ClassDB::register_class<GroundClutterFoliage>();
 
-//#ifdef TOOLS_ENABLED
-//	EditorPlugins::add_by_type<PropToolEditorPlugin>();
-//#endif
+#ifdef TOOLS_ENABLED
+	EditorPlugins::add_by_type<VoxelWorldEditorPlugin>();
+#endif
+
+	//#ifdef TOOLS_ENABLED
+	//	EditorPlugins::add_by_type<PropToolEditorPlugin>();
+	//#endif
 }
 
 void unregister_voxelman_types() {

world/voxel_world_editor.cpp

@@ -0,0 +1,123 @@
+/*
+Copyright (c) 2020 Péter Magyar
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include "voxel_world_editor.h"
+
+#include "core/os/input.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
+#include "editor/plugins/spatial_editor_plugin.h"
+#include "scene/3d/camera.h"
+#include "voxel_world.h"
+
+#include "core/math/geometry.h"
+#include "core/os/keyboard.h"
+
+bool VoxelWorldEditor::forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event) {
+	return false;
+}
+
+void VoxelWorldEditor::edit(VoxelWorld *p_world) {
+}
+
+VoxelWorldEditor::VoxelWorldEditor() {
+}
+VoxelWorldEditor::VoxelWorldEditor(EditorNode *p_editor) {
+	spatial_editor_hb = memnew(HBoxContainer);
+	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);
+}
+VoxelWorldEditor::~VoxelWorldEditor() {
+}
+
+void VoxelWorldEditor::_node_removed(Node *p_node) {
+
+	if (p_node == _world)
+		_world = NULL;
+}
+
+void VoxelWorldEditor::_bind_methods() {
+	ClassDB::bind_method("_node_removed", &VoxelWorldEditor::_node_removed);
+}
+
+void VoxelWorldEditorPlugin::_notification(int p_what) {
+
+	if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
+
+		switch ((int)EditorSettings::get_singleton()->get("editors/voxelman/editor_side")) {
+			case 0: { // Left.
+				SpatialEditor::get_singleton()->get_palette_split()->move_child(voxel_world_editor, 0);
+			} break;
+			case 1: { // Right.
+				SpatialEditor::get_singleton()->get_palette_split()->move_child(voxel_world_editor, 1);
+			} break;
+		}
+	}
+}
+
+void VoxelWorldEditorPlugin::edit(Object *p_object) {
+
+	voxel_world_editor->edit(Object::cast_to<VoxelWorld>(p_object));
+}
+
+bool VoxelWorldEditorPlugin::handles(Object *p_object) const {
+
+	return p_object->is_class("VoxelWorld");
+}
+
+void VoxelWorldEditorPlugin::make_visible(bool p_visible) {
+
+	if (p_visible) {
+		voxel_world_editor->show();
+		voxel_world_editor->spatial_editor_hb->show();
+		voxel_world_editor->set_process(true);
+	} else {
+
+		voxel_world_editor->spatial_editor_hb->hide();
+		voxel_world_editor->hide();
+		voxel_world_editor->edit(NULL);
+		voxel_world_editor->set_process(false);
+	}
+}
+
+VoxelWorldEditorPlugin::VoxelWorldEditorPlugin(EditorNode *p_node) {
+
+	editor = p_node;
+
+	EDITOR_DEF("editors/voxelman/editor_side", 1);
+	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "editors/voxelman/editor_side", PROPERTY_HINT_ENUM, "Left,Right"));
+
+	voxel_world_editor = memnew(VoxelWorldEditor(editor));
+	switch ((int)EditorSettings::get_singleton()->get("editors/voxelman/editor_side")) {
+		case 0: { // Left.
+			add_control_to_container(CONTAINER_SPATIAL_EDITOR_SIDE_LEFT, voxel_world_editor);
+		} break;
+		case 1: { // Right.
+			add_control_to_container(CONTAINER_SPATIAL_EDITOR_SIDE_RIGHT, voxel_world_editor);
+		} break;
+	}
+	voxel_world_editor->hide();
+}
+
+VoxelWorldEditorPlugin::~VoxelWorldEditorPlugin() {
+}

world/voxel_world_editor.h

@@ -0,0 +1,76 @@
+/*
+Copyright (c) 2020 Péter Magyar
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#ifndef VOXEL_WORLD_EDITOR_PLUGIN_H
+#define VOXEL_WORLD_EDITOR_PLUGIN_H
+
+#include "editor/editor_node.h"
+#include "editor/editor_plugin.h"
+
+class VoxelWorld;
+class SpatialEditorPlugin;
+
+class VoxelWorldEditor : public VBoxContainer {
+	GDCLASS(VoxelWorldEditor, VBoxContainer);
+
+public:
+	bool forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event);
+
+	void edit(VoxelWorld *p_world);
+
+	VoxelWorldEditor();
+	VoxelWorldEditor(EditorNode *p_editor);
+	~VoxelWorldEditor();
+
+	HBoxContainer *spatial_editor_hb;
+
+protected:
+	static void _bind_methods();
+	void _node_removed(Node *p_node);
+
+private:
+	VoxelWorld *_world;
+};
+
+class VoxelWorldEditorPlugin : public EditorPlugin {
+
+	GDCLASS(VoxelWorldEditorPlugin, EditorPlugin);
+
+	VoxelWorldEditor *voxel_world_editor;
+	EditorNode *editor;
+
+protected:
+	void _notification(int p_what);
+
+public:
+	virtual bool forward_spatial_gui_input(Camera *p_camera, const Ref<InputEvent> &p_event) { return voxel_world_editor->forward_spatial_input_event(p_camera, p_event); }
+	virtual String get_name() const { return "VoxelWorld"; }
+	bool has_main_screen() const { return false; }
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
+	virtual void make_visible(bool p_visible);
+
+	VoxelWorldEditorPlugin(EditorNode *p_node);
+	~VoxelWorldEditorPlugin();
+};
+
+#endif