Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-02-02 22:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix setting all EDITOR_DEFs for the gridmap editor.

Browse Source
This commit is contained in:
Relintai 2022-10-08 23:41:54 +02:00
parent 7f78bdf7fe
commit 51acd0c9d6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/editor_settings.cpp
View File

@ -512,9 +512,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
/* Editors */ /* Editors */
// GridMap
_initial_set("editors/grid_map/pick_distance", 5000.0);
// 3D // 3D
_initial_set("editors/3d/primary_grid_color", Color(0.56, 0.56, 0.56, 0.5)); _initial_set("editors/3d/primary_grid_color", Color(0.56, 0.56, 0.56, 0.5));
_initial_set("editors/3d/secondary_grid_color", Color(0.38, 0.38, 0.38, 0.5)); _initial_set("editors/3d/secondary_grid_color", Color(0.38, 0.38, 0.38, 0.5));

5
modules/gridmap/grid_map_editor_plugin.cpp
View File

@ -1299,7 +1299,7 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
settings_pick_distance->set_max(10000.0f); settings_pick_distance->set_max(10000.0f);
settings_pick_distance->set_min(500.0f); settings_pick_distance->set_min(500.0f);
settings_pick_distance->set_step(1.0f); settings_pick_distance->set_step(1.0f);
settings_pick_distance->set_value(EDITOR_DEF("editors/grid_map/pick_distance", 5000.0)); settings_pick_distance->set_value(EDITOR_GET("editors/grid_map/pick_distance"));
settings_vbc->add_margin_child(TTR("Pick Distance:"), settings_pick_distance); settings_vbc->add_margin_child(TTR("Pick Distance:"), settings_pick_distance);
clip_mode = CLIP_DISABLED; clip_mode = CLIP_DISABLED;
@ -1566,7 +1566,10 @@ void GridMapEditorPlugin::make_visible(bool p_visible) {
GridMapEditorPlugin::GridMapEditorPlugin(EditorNode *p_node) { GridMapEditorPlugin::GridMapEditorPlugin(EditorNode *p_node) {
editor = p_node; editor = p_node;
EDITOR_DEF("editors/grid_map/preview_size", 64);
EDITOR_DEF("editors/grid_map/editor_side", 1); EDITOR_DEF("editors/grid_map/editor_side", 1);
EDITOR_DEF("editors/grid_map/pick_distance", 5000.0);
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "editors/grid_map/editor_side", PROPERTY_HINT_ENUM, "Left,Right")); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "editors/grid_map/editor_side", PROPERTY_HINT_ENUM, "Left,Right"));
grid_map_editor = memnew(GridMapEditor(editor)); grid_map_editor = memnew(GridMapEditor(editor));