noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Organize 3D editor code and rename a few 3D things

Browse Source
This commit is contained in:
Aaron Franke
2025-07-27 16:50:59 -07:00
parent f964fa714f
commit f89a3efdad
21 changed files with 221 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/editor_node.cpp
+16 -16
View File
@@ -5227,9 +5227,9 @@ void EditorNode::get_preload_scene_modification_table(
new_additive_node_entry.owner = p_node->get_owner();
new_additive_node_entry.index = p_node->get_index();
Node2D *node_2d = Object::cast_to<Node2D>(p_node);
if (node_2d) {
new_additive_node_entry.transform_2d = node_2d->get_transform();
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
if (canvas_item) {
new_additive_node_entry.transform_2d = canvas_item->get_transform();
}
Node3D *node_3d = Object::cast_to<Node3D>(p_node);
if (node_3d) {
@@ -8572,14 +8572,14 @@ EditorNode::EditorNode() {
import_wav.instantiate();
ResourceFormatImporter::get_singleton()->add_importer(import_wav);
Ref<ResourceImporterOBJ> import_obj;
import_obj.instantiate();
ResourceFormatImporter::get_singleton()->add_importer(import_obj);
Ref<ResourceImporterShaderFile> import_shader_file;
import_shader_file.instantiate();
ResourceFormatImporter::get_singleton()->add_importer(import_shader_file);
Ref<ResourceImporterOBJ> import_obj;
import_obj.instantiate();
ResourceFormatImporter::get_singleton()->add_importer(import_obj);
Ref<ResourceImporterScene> import_model_as_scene;
import_model_as_scene.instantiate("PackedScene");
ResourceFormatImporter::get_singleton()->add_importer(import_model_as_scene);
@@ -9456,14 +9456,6 @@ EditorNode::EditorNode() {
resource_preview->add_preview_generator(Ref<EditorGradientPreviewPlugin>(memnew(EditorGradientPreviewPlugin)));
{
Ref<StandardMaterial3DConversionPlugin> spatial_mat_convert;
spatial_mat_convert.instantiate();
resource_conversion_plugins.push_back(spatial_mat_convert);
Ref<ORMMaterial3DConversionPlugin> orm_mat_convert;
orm_mat_convert.instantiate();
resource_conversion_plugins.push_back(orm_mat_convert);
Ref<CanvasItemMaterialConversionPlugin> canvas_item_mat_convert;
canvas_item_mat_convert.instantiate();
resource_conversion_plugins.push_back(canvas_item_mat_convert);
@@ -9476,6 +9468,14 @@ EditorNode::EditorNode() {
particles_mat_convert.instantiate();
resource_conversion_plugins.push_back(particles_mat_convert);
Ref<StandardMaterial3DConversionPlugin> spatial_mat_convert;
spatial_mat_convert.instantiate();
resource_conversion_plugins.push_back(spatial_mat_convert);
Ref<ORMMaterial3DConversionPlugin> orm_mat_convert;
orm_mat_convert.instantiate();
resource_conversion_plugins.push_back(orm_mat_convert);
Ref<ProceduralSkyMaterialConversionPlugin> procedural_sky_mat_convert;
procedural_sky_mat_convert.instantiate();
resource_conversion_plugins.push_back(procedural_sky_mat_convert);
@@ -9615,7 +9615,7 @@ EditorNode::EditorNode() {
ResourceLoader::set_load_callback(_resource_loaded);
// Apply setting presets in case the editor_settings file is missing values.
EditorSettingsDialog::update_navigation_preset();
EditorSettingsDialog::update_3d_navigation_preset();
screenshot_timer = memnew(Timer);
screenshot_timer->set_one_shot(true);