Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-03-20 19:42:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

TerrainWorldEditor variable name tweaks.

Browse Source
This commit is contained in:
Relintai 2025-02-08 12:50:26 +01:00
parent 12214cb8c7
commit ebcac318e7
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
modules/terraman/editor/terrain_world_editor.cpp
View File

@ -112,9 +112,9 @@ EditorPlugin::AfterGUIInput TerrainWorldEditor::forward_spatial_input_event(Came
case TOOL_MODE_PAINT_PICKER: { case TOOL_MODE_PAINT_PICKER: {
// Ignore // Ignore
} break; } break;
case TOOL_MODE_SPAWN_BRUSH: { case TOOL_MODE_CHUNK_SPAWN_BRUSH: {
} break; } break;
case TOOL_MODE_CHUNK_REMOVE: { case TOOL_MODE_CHUNK_REMOVE_BRUSH: {
} break; } break;
} }
@ -157,9 +157,9 @@ EditorPlugin::AfterGUIInput TerrainWorldEditor::forward_spatial_input_event(Came
case TOOL_MODE_PAINT_PICKER: { case TOOL_MODE_PAINT_PICKER: {
// Ignore // Ignore
} break; } break;
case TOOL_MODE_SPAWN_BRUSH: { case TOOL_MODE_CHUNK_SPAWN_BRUSH: {
} break; } break;
case TOOL_MODE_CHUNK_REMOVE: { case TOOL_MODE_CHUNK_REMOVE_BRUSH: {
} break; } break;
} }
@ -223,9 +223,9 @@ EditorPlugin::AfterGUIInput TerrainWorldEditor::forward_spatial_input_event(Came
case TOOL_MODE_PAINT_PICKER: { case TOOL_MODE_PAINT_PICKER: {
_mouse_down = true; _mouse_down = true;
} break; } break;
case TOOL_MODE_SPAWN_BRUSH: { case TOOL_MODE_CHUNK_SPAWN_BRUSH: {
} break; } break;
case TOOL_MODE_CHUNK_REMOVE: { case TOOL_MODE_CHUNK_REMOVE_BRUSH: {
} break; } break;
} }
@ -250,9 +250,9 @@ EditorPlugin::AfterGUIInput TerrainWorldEditor::forward_spatial_input_event(Came
paint_pick(position); paint_pick(position);
} }
} break; } break;
case TOOL_MODE_SPAWN_BRUSH: { case TOOL_MODE_CHUNK_SPAWN_BRUSH: {
} break; } break;
case TOOL_MODE_CHUNK_REMOVE: { case TOOL_MODE_CHUNK_REMOVE_BRUSH: {
} break; } break;
} }
@ -481,9 +481,9 @@ void TerrainWorldEditor::edit(TerrainWorld *p_world) {
} break; } break;
case TOOL_MODE_PAINT_PICKER: { case TOOL_MODE_PAINT_PICKER: {
} break; } break;
case TOOL_MODE_SPAWN_BRUSH: { case TOOL_MODE_CHUNK_SPAWN_BRUSH: {
} break; } break;
case TOOL_MODE_CHUNK_REMOVE: { case TOOL_MODE_CHUNK_REMOVE_BRUSH: {
} break; } break;
} }
@ -658,19 +658,19 @@ TerrainWorldEditor::TerrainWorldEditor(EditorNode *p_editor) {
_paint_picker_button->set_shortcut(ED_SHORTCUT("terrain_world_editor/paint_picker", "Paint Picker", KEY_L)); _paint_picker_button->set_shortcut(ED_SHORTCUT("terrain_world_editor/paint_picker", "Paint Picker", KEY_L));
_tool_button_container->add_child(_paint_picker_button); _tool_button_container->add_child(_paint_picker_button);
_spawn_brush_button = memnew(ToolButton); _chunk_spawn_brush_button = memnew(ToolButton);
_spawn_brush_button->set_toggle_mode(true); _chunk_spawn_brush_button->set_toggle_mode(true);
_spawn_brush_button->set_button_group(_tool_button_group); _chunk_spawn_brush_button->set_button_group(_tool_button_group);
_spawn_brush_button->set_meta("tool_mode", TOOL_MODE_SPAWN_BRUSH); _chunk_spawn_brush_button->set_meta("tool_mode", TOOL_MODE_CHUNK_SPAWN_BRUSH);
_spawn_brush_button->set_shortcut(ED_SHORTCUT("terrain_world_editor/spawn_brush", "Spawn Brush", KEY_M)); _chunk_spawn_brush_button->set_shortcut(ED_SHORTCUT("terrain_world_editor/chunk_spawn_brush", "Chunk Spawn Brush", KEY_M));
_tool_button_container->add_child(_spawn_brush_button); _tool_button_container->add_child(_chunk_spawn_brush_button);
_chunk_remove_button = memnew(ToolButton); _chunk_remove_brush_button = memnew(ToolButton);
_chunk_remove_button->set_toggle_mode(true); _chunk_remove_brush_button->set_toggle_mode(true);
_chunk_remove_button->set_button_group(_tool_button_group); _chunk_remove_brush_button->set_button_group(_tool_button_group);
_chunk_remove_button->set_meta("tool_mode", TOOL_MODE_CHUNK_REMOVE); _chunk_remove_brush_button->set_meta("tool_mode", TOOL_MODE_CHUNK_REMOVE_BRUSH);
_chunk_remove_button->set_shortcut(ED_SHORTCUT("terrain_world_editor/chunk_remove", "Chunk Remove", KEY_U)); _chunk_remove_brush_button->set_shortcut(ED_SHORTCUT("terrain_world_editor/chunk_remove_brush", "Chunk Remove Brush", KEY_U));
_tool_button_container->add_child(_chunk_remove_button); _tool_button_container->add_child(_chunk_remove_brush_button);
main_container->add_child(memnew(HSeparator)); main_container->add_child(memnew(HSeparator));
@ -902,10 +902,10 @@ void TerrainWorldEditor::_notification(int p_what) {
_paint_brush_liquid_mode_button->set_icon(get_theme_icon("CylinderShape", "EditorIcons")); _paint_brush_liquid_mode_button->set_icon(get_theme_icon("CylinderShape", "EditorIcons"));
// Spawn Brush // Spawn Brush
_spawn_brush_button->set_icon(get_theme_icon("AssetLib", "EditorIcons")); _chunk_spawn_brush_button->set_icon(get_theme_icon("AssetLib", "EditorIcons"));
// Chunk Remove // Chunk Remove
_chunk_remove_button->set_icon(get_theme_icon("Clear", "EditorIcons")); _chunk_remove_brush_button->set_icon(get_theme_icon("Clear", "EditorIcons"));
} break; } break;
} }
} }
@ -1058,12 +1058,12 @@ void TerrainWorldEditor::_on_tool_button_pressed(Object *p_button) {
} }
break; break;
case TOOL_MODE_SPAWN_BRUSH: case TOOL_MODE_CHUNK_SPAWN_BRUSH:
_gizmo->visible = false; _gizmo->visible = false;
_gizmo->redraw(); _gizmo->redraw();
break; break;
case TOOL_MODE_CHUNK_REMOVE: case TOOL_MODE_CHUNK_REMOVE_BRUSH:
_gizmo->visible = false; _gizmo->visible = false;
_gizmo->redraw(); _gizmo->redraw();

8
modules/terraman/editor/terrain_world_editor.h
View File

@ -54,8 +54,8 @@ public:
TOOL_MODE_ISOLEVEL_BRUSH = 0, TOOL_MODE_ISOLEVEL_BRUSH = 0,
TOOL_MODE_PAINT_BRUSH, TOOL_MODE_PAINT_BRUSH,
TOOL_MODE_PAINT_PICKER, TOOL_MODE_PAINT_PICKER,
TOOL_MODE_SPAWN_BRUSH, TOOL_MODE_CHUNK_SPAWN_BRUSH,
TOOL_MODE_CHUNK_REMOVE, TOOL_MODE_CHUNK_REMOVE_BRUSH,
// TODO object manipulation tools. // TODO object manipulation tools.
}; };
@ -155,8 +155,8 @@ private:
ToolButton *_isolevel_brush_button; ToolButton *_isolevel_brush_button;
ToolButton *_paint_brush_button; ToolButton *_paint_brush_button;
ToolButton *_paint_picker_button; ToolButton *_paint_picker_button;
ToolButton *_spawn_brush_button; ToolButton *_chunk_spawn_brush_button;
ToolButton *_chunk_remove_button; ToolButton *_chunk_remove_brush_button;
HFlowContainer *_tool_button_container; HFlowContainer *_tool_button_container;
Ref<ButtonGroup> _tool_button_group; Ref<ButtonGroup> _tool_button_group;