2017-03-05 15:47:28 +01:00
|
|
|
/*************************************************************************/
|
|
|
|
/* resource_importer_scene.cpp */
|
|
|
|
/*************************************************************************/
|
|
|
|
/* This file is part of: */
|
|
|
|
/* GODOT ENGINE */
|
2017-08-27 14:16:55 +02:00
|
|
|
/* https://godotengine.org */
|
2017-03-05 15:47:28 +01:00
|
|
|
/*************************************************************************/
|
2021-01-01 20:13:46 +01:00
|
|
|
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
|
|
|
|
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
|
2017-03-05 15:47:28 +01:00
|
|
|
/* */
|
|
|
|
/* 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. */
|
|
|
|
/*************************************************************************/
|
2018-01-05 00:50:27 +01:00
|
|
|
|
2017-02-04 13:48:04 +01:00
|
|
|
#include "resource_importer_scene.h"
|
|
|
|
|
2018-09-11 18:13:45 +02:00
|
|
|
#include "core/io/resource_saver.h"
|
2017-03-05 14:21:25 +01:00
|
|
|
#include "editor/editor_node.h"
|
2021-07-07 01:19:15 +02:00
|
|
|
#include "editor/import/editor_importer_bake_reset.h"
|
2021-03-19 13:57:52 +01:00
|
|
|
#include "editor/import/scene_import_settings.h"
|
2020-12-21 16:39:32 +01:00
|
|
|
#include "editor/import/scene_importer_mesh_node_3d.h"
|
2021-03-19 13:57:52 +01:00
|
|
|
#include "scene/3d/area_3d.h"
|
2020-03-26 22:49:16 +01:00
|
|
|
#include "scene/3d/collision_shape_3d.h"
|
|
|
|
#include "scene/3d/mesh_instance_3d.h"
|
2021-03-08 09:47:18 +01:00
|
|
|
#include "scene/3d/navigation_region_3d.h"
|
2020-03-26 22:49:16 +01:00
|
|
|
#include "scene/3d/physics_body_3d.h"
|
2020-03-27 08:44:44 +01:00
|
|
|
#include "scene/3d/vehicle_body_3d.h"
|
2017-09-08 13:06:09 +02:00
|
|
|
#include "scene/animation/animation_player.h"
|
|
|
|
#include "scene/resources/animation.h"
|
2020-03-26 22:49:16 +01:00
|
|
|
#include "scene/resources/box_shape_3d.h"
|
2020-01-21 21:32:27 +01:00
|
|
|
#include "scene/resources/packed_scene.h"
|
2019-02-12 17:18:13 +01:00
|
|
|
#include "scene/resources/resource_format_text.h"
|
2021-08-19 20:21:56 +02:00
|
|
|
#include "scene/resources/separation_ray_shape_3d.h"
|
2020-03-26 22:49:16 +01:00
|
|
|
#include "scene/resources/sphere_shape_3d.h"
|
2020-12-17 19:56:59 +01:00
|
|
|
#include "scene/resources/surface_tool.h"
|
2021-09-14 19:52:35 +02:00
|
|
|
#include "scene/resources/world_boundary_shape_3d.h"
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-12-07 19:44:20 +01:00
|
|
|
uint32_t EditorSceneImporter::get_import_flags() const {
|
2021-08-22 03:52:44 +02:00
|
|
|
int ret;
|
|
|
|
if (GDVIRTUAL_CALL(_get_import_flags, ret)) {
|
|
|
|
return ret;
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ERR_FAIL_V(0);
|
|
|
|
}
|
2020-05-14 14:29:06 +02:00
|
|
|
|
2017-12-07 19:44:20 +01:00
|
|
|
void EditorSceneImporter::get_extensions(List<String> *r_extensions) const {
|
2021-08-22 03:52:44 +02:00
|
|
|
Vector<String> arr;
|
|
|
|
if (GDVIRTUAL_CALL(_get_extensions, arr)) {
|
2017-12-09 18:11:26 +01:00
|
|
|
for (int i = 0; i < arr.size(); i++) {
|
2017-12-07 19:44:20 +01:00
|
|
|
r_extensions->push_back(arr[i]);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ERR_FAIL();
|
|
|
|
}
|
2020-05-14 14:29:06 +02:00
|
|
|
|
2017-12-07 19:44:20 +01:00
|
|
|
Node *EditorSceneImporter::import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err) {
|
2021-08-22 03:52:44 +02:00
|
|
|
Object *ret;
|
|
|
|
if (GDVIRTUAL_CALL(_import_scene, p_path, p_flags, p_bake_fps, ret)) {
|
|
|
|
return Object::cast_to<Node>(ret);
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
2020-04-02 01:20:12 +02:00
|
|
|
ERR_FAIL_V(nullptr);
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
2017-12-09 18:11:26 +01:00
|
|
|
Ref<Animation> EditorSceneImporter::import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps) {
|
2021-08-22 03:52:44 +02:00
|
|
|
Ref<Animation> ret;
|
|
|
|
if (GDVIRTUAL_CALL(_import_animation, p_path, p_flags, p_bake_fps, ret)) {
|
|
|
|
return ret;
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
2020-04-02 01:20:12 +02:00
|
|
|
ERR_FAIL_V(nullptr);
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
//for documenters, these functions are useful when an importer calls an external conversion helper (like, fbx2gltf),
|
|
|
|
//and you want to load the resulting file
|
|
|
|
|
2017-12-09 18:11:26 +01:00
|
|
|
Node *EditorSceneImporter::import_scene_from_other_importer(const String &p_path, uint32_t p_flags, int p_bake_fps) {
|
|
|
|
return ResourceImporterScene::get_singleton()->import_scene_from_other_importer(this, p_path, p_flags, p_bake_fps);
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
Ref<Animation> EditorSceneImporter::import_animation_from_other_importer(const String &p_path, uint32_t p_flags, int p_bake_fps) {
|
2017-12-09 18:11:26 +01:00
|
|
|
return ResourceImporterScene::get_singleton()->import_animation_from_other_importer(this, p_path, p_flags, p_bake_fps);
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void EditorSceneImporter::_bind_methods() {
|
2017-12-09 18:11:26 +01:00
|
|
|
ClassDB::bind_method(D_METHOD("import_scene_from_other_importer", "path", "flags", "bake_fps"), &EditorSceneImporter::import_scene_from_other_importer);
|
|
|
|
ClassDB::bind_method(D_METHOD("import_animation_from_other_importer", "path", "flags", "bake_fps"), &EditorSceneImporter::import_animation_from_other_importer);
|
2017-12-07 19:44:20 +01:00
|
|
|
|
2021-08-22 03:52:44 +02:00
|
|
|
GDVIRTUAL_BIND(_get_import_flags);
|
|
|
|
GDVIRTUAL_BIND(_get_extensions);
|
|
|
|
GDVIRTUAL_BIND(_import_scene, "path", "flags", "bake_fps");
|
|
|
|
GDVIRTUAL_BIND(_import_animation, "path", "flags", "bake_fps");
|
2017-12-07 19:44:20 +01:00
|
|
|
|
2017-12-09 18:11:26 +01:00
|
|
|
BIND_CONSTANT(IMPORT_SCENE);
|
|
|
|
BIND_CONSTANT(IMPORT_ANIMATION);
|
|
|
|
BIND_CONSTANT(IMPORT_FAIL_ON_MISSING_DEPENDENCIES);
|
2021-03-19 13:57:52 +01:00
|
|
|
BIND_CONSTANT(IMPORT_GENERATE_TANGENT_ARRAYS);
|
|
|
|
BIND_CONSTANT(IMPORT_USE_NAMED_SKIN_BINDS);
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/////////////////////////////////
|
2017-02-04 13:48:04 +01:00
|
|
|
void EditorScenePostImport::_bind_methods() {
|
2021-08-22 03:52:44 +02:00
|
|
|
GDVIRTUAL_BIND(_post_import, "scene")
|
2018-01-20 00:48:44 +01:00
|
|
|
ClassDB::bind_method(D_METHOD("get_source_file"), &EditorScenePostImport::get_source_file);
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
Node *EditorScenePostImport::post_import(Node *p_scene) {
|
2021-08-22 03:52:44 +02:00
|
|
|
Object *ret;
|
|
|
|
if (GDVIRTUAL_CALL(_post_import, p_scene, ret)) {
|
|
|
|
return Object::cast_to<Node>(ret);
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
return p_scene;
|
|
|
|
}
|
|
|
|
|
2018-01-20 00:48:44 +01:00
|
|
|
String EditorScenePostImport::get_source_file() const {
|
|
|
|
return source_file;
|
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
void EditorScenePostImport::init(const String &p_source_file) {
|
2018-01-20 00:48:44 +01:00
|
|
|
source_file = p_source_file;
|
|
|
|
}
|
|
|
|
|
2017-02-04 13:48:04 +01:00
|
|
|
EditorScenePostImport::EditorScenePostImport() {
|
|
|
|
}
|
|
|
|
|
|
|
|
String ResourceImporterScene::get_importer_name() const {
|
|
|
|
return "scene";
|
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
String ResourceImporterScene::get_visible_name() const {
|
2017-02-04 13:48:04 +01:00
|
|
|
return "Scene";
|
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
void ResourceImporterScene::get_recognized_extensions(List<String> *p_extensions) const {
|
2020-03-17 07:33:00 +01:00
|
|
|
for (Set<Ref<EditorSceneImporter>>::Element *E = importers.front(); E; E = E->next()) {
|
2017-02-04 13:48:04 +01:00
|
|
|
E->get()->get_extensions(p_extensions);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
String ResourceImporterScene::get_save_extension() const {
|
|
|
|
return "scn";
|
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
String ResourceImporterScene::get_resource_type() const {
|
2017-02-04 13:48:04 +01:00
|
|
|
return "PackedScene";
|
|
|
|
}
|
|
|
|
|
2020-12-02 02:40:47 +01:00
|
|
|
int ResourceImporterScene::get_format_version() const {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
bool ResourceImporterScene::get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const {
|
2017-02-04 13:48:04 +01:00
|
|
|
if (p_option.begins_with("animation/")) {
|
2020-05-14 16:41:43 +02:00
|
|
|
if (p_option != "animation/import" && !bool(p_options["animation/import"])) {
|
2017-02-04 13:48:04 +01:00
|
|
|
return false;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-07-23 23:48:05 +02:00
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
if (p_option == "meshes/lightmap_texel_size" && int(p_options["meshes/light_baking"]) < 3) {
|
2017-12-09 18:11:26 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-02-04 13:48:04 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ResourceImporterScene::get_preset_count() const {
|
2021-03-19 13:57:52 +01:00
|
|
|
return 0;
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
2020-05-14 14:29:06 +02:00
|
|
|
|
2017-02-04 13:48:04 +01:00
|
|
|
String ResourceImporterScene::get_preset_name(int p_idx) const {
|
2021-03-19 13:57:52 +01:00
|
|
|
return String();
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
static bool _teststr(const String &p_what, const String &p_str) {
|
2018-07-02 10:54:14 +02:00
|
|
|
String what = p_what;
|
2018-07-02 07:02:32 +02:00
|
|
|
|
|
|
|
//remove trailing spaces and numbers, some apps like blender add ".number" to duplicates so also compensate for this
|
2018-07-02 10:54:14 +02:00
|
|
|
while (what.length() && ((what[what.length() - 1] >= '0' && what[what.length() - 1] <= '9') || what[what.length() - 1] <= 32 || what[what.length() - 1] == '.')) {
|
|
|
|
what = what.substr(0, what.length() - 1);
|
2018-07-02 07:02:32 +02:00
|
|
|
}
|
|
|
|
|
2020-05-14 16:41:43 +02:00
|
|
|
if (what.findn("$" + p_str) != -1) { //blender and other stuff
|
2017-02-04 13:48:04 +01:00
|
|
|
return true;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
|
|
|
if (what.to_lower().ends_with("-" + p_str)) { //collada only supports "_" and "-" besides letters
|
2017-02-04 13:48:04 +01:00
|
|
|
return true;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
|
|
|
if (what.to_lower().ends_with("_" + p_str)) { //collada only supports "_" and "-" besides letters
|
2017-02-04 13:48:04 +01:00
|
|
|
return true;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
static String _fixstr(const String &p_what, const String &p_str) {
|
2018-07-02 10:54:14 +02:00
|
|
|
String what = p_what;
|
|
|
|
|
|
|
|
//remove trailing spaces and numbers, some apps like blender add ".number" to duplicates so also compensate for this
|
|
|
|
while (what.length() && ((what[what.length() - 1] >= '0' && what[what.length() - 1] <= '9') || what[what.length() - 1] <= 32 || what[what.length() - 1] == '.')) {
|
|
|
|
what = what.substr(0, what.length() - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
String end = p_what.substr(what.length(), p_what.length() - what.length());
|
|
|
|
|
2020-05-14 16:41:43 +02:00
|
|
|
if (what.findn("$" + p_str) != -1) { //blender and other stuff
|
2018-07-02 10:54:14 +02:00
|
|
|
return what.replace("$" + p_str, "") + end;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
|
|
|
if (what.to_lower().ends_with("-" + p_str)) { //collada only supports "_" and "-" besides letters
|
2018-07-02 10:54:14 +02:00
|
|
|
return what.substr(0, what.length() - (p_str.length() + 1)) + end;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
|
|
|
if (what.to_lower().ends_with("_" + p_str)) { //collada only supports "_" and "-" besides letters
|
2018-07-02 10:54:14 +02:00
|
|
|
return what.substr(0, what.length() - (p_str.length() + 1)) + end;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2018-07-02 10:54:14 +02:00
|
|
|
return what;
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
static void _pre_gen_shape_list(Ref<EditorSceneImporterMesh> &mesh, Vector<Ref<Shape3D>> &r_shape_list, bool p_convex) {
|
2021-03-26 07:19:06 +01:00
|
|
|
ERR_FAIL_NULL_MSG(mesh, "Cannot generate shape list with null mesh value");
|
2021-03-19 13:57:52 +01:00
|
|
|
if (!p_convex) {
|
|
|
|
Ref<Shape3D> shape = mesh->create_trimesh_shape();
|
|
|
|
r_shape_list.push_back(shape);
|
|
|
|
} else {
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
Vector<Ref<Shape3D>> cd;
|
|
|
|
cd.push_back(mesh->get_mesh()->create_convex_shape(true, /*Passing false, otherwise VHACD will be used to simplify (Decompose) the Mesh.*/ false));
|
2021-03-19 13:57:52 +01:00
|
|
|
if (cd.size()) {
|
|
|
|
for (int i = 0; i < cd.size(); i++) {
|
|
|
|
r_shape_list.push_back(cd[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> &collision_map) {
|
2018-08-24 09:35:07 +02:00
|
|
|
// children first
|
2017-03-05 16:44:50 +01:00
|
|
|
for (int i = 0; i < p_node->get_child_count(); i++) {
|
2021-03-19 13:57:52 +01:00
|
|
|
Node *r = _pre_fix_node(p_node->get_child(i), p_root, collision_map);
|
2017-02-04 13:48:04 +01:00
|
|
|
if (!r) {
|
|
|
|
i--; //was erased
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
String name = p_node->get_name();
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
bool isroot = p_node == p_root;
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
if (!isroot && _teststr(name, "noimp")) {
|
2017-02-04 13:48:04 +01:00
|
|
|
memdelete(p_node);
|
2020-04-02 01:20:12 +02:00
|
|
|
return nullptr;
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
if (Object::cast_to<EditorSceneImporterMeshNode3D>(p_node)) {
|
|
|
|
EditorSceneImporterMeshNode3D *mi = Object::cast_to<EditorSceneImporterMeshNode3D>(p_node);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
Ref<EditorSceneImporterMesh> m = mi->get_mesh();
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
if (m.is_valid()) {
|
2017-03-05 16:44:50 +01:00
|
|
|
for (int i = 0; i < m->get_surface_count(); i++) {
|
2021-03-19 13:57:52 +01:00
|
|
|
Ref<BaseMaterial3D> mat = m->get_surface_material(i);
|
2020-05-14 16:41:43 +02:00
|
|
|
if (!mat.is_valid()) {
|
2017-02-04 13:48:04 +01:00
|
|
|
continue;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
if (_teststr(mat->get_name(), "alpha")) {
|
2021-03-19 13:57:52 +01:00
|
|
|
mat->set_transparency(BaseMaterial3D::TRANSPARENCY_ALPHA);
|
2017-03-05 16:44:50 +01:00
|
|
|
mat->set_name(_fixstr(mat->get_name(), "alpha"));
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
2017-03-05 16:44:50 +01:00
|
|
|
if (_teststr(mat->get_name(), "vcol")) {
|
2021-03-19 13:57:52 +01:00
|
|
|
mat->set_flag(BaseMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
|
|
|
|
mat->set_flag(BaseMaterial3D::FLAG_SRGB_VERTEX_COLOR, true);
|
2017-03-05 16:44:50 +01:00
|
|
|
mat->set_name(_fixstr(mat->get_name(), "vcol"));
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-24 22:58:51 +02:00
|
|
|
if (Object::cast_to<AnimationPlayer>(p_node)) {
|
2017-02-04 13:48:04 +01:00
|
|
|
//remove animations referencing non-importable nodes
|
2017-08-24 22:58:51 +02:00
|
|
|
AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(p_node);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
List<StringName> anims;
|
|
|
|
ap->get_animation_list(&anims);
|
2021-07-24 15:46:25 +02:00
|
|
|
for (const StringName &E : anims) {
|
2021-07-16 05:45:57 +02:00
|
|
|
Ref<Animation> anim = ap->get_animation(E);
|
2017-02-04 13:48:04 +01:00
|
|
|
ERR_CONTINUE(anim.is_null());
|
2017-03-05 16:44:50 +01:00
|
|
|
for (int i = 0; i < anim->get_track_count(); i++) {
|
2017-02-04 13:48:04 +01:00
|
|
|
NodePath path = anim->track_get_path(i);
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
for (int j = 0; j < path.get_name_count(); j++) {
|
2017-02-04 13:48:04 +01:00
|
|
|
String node = path.get_name(j);
|
2017-03-05 16:44:50 +01:00
|
|
|
if (_teststr(node, "noimp")) {
|
2017-02-04 13:48:04 +01:00
|
|
|
anim->remove_track(i);
|
|
|
|
i--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
|
2021-07-16 05:45:57 +02:00
|
|
|
String animname = E;
|
2021-03-19 13:57:52 +01:00
|
|
|
const int loop_string_count = 3;
|
|
|
|
static const char *loop_strings[loop_string_count] = { "loops", "loop", "cycle" };
|
|
|
|
for (int i = 0; i < loop_string_count; i++) {
|
|
|
|
if (_teststr(animname, loop_strings[i])) {
|
|
|
|
anim->set_loop(true);
|
|
|
|
animname = _fixstr(animname, loop_strings[i]);
|
2021-07-16 05:45:57 +02:00
|
|
|
ap->rename_animation(E, animname);
|
2021-03-19 13:57:52 +01:00
|
|
|
}
|
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-16 14:06:30 +01:00
|
|
|
if (_teststr(name, "colonly") || _teststr(name, "convcolonly")) {
|
2020-05-14 16:41:43 +02:00
|
|
|
if (isroot) {
|
2017-02-04 13:48:04 +01:00
|
|
|
return p_node;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
EditorSceneImporterMeshNode3D *mi = Object::cast_to<EditorSceneImporterMeshNode3D>(p_node);
|
2017-09-06 23:50:18 +02:00
|
|
|
if (mi) {
|
2021-03-19 13:57:52 +01:00
|
|
|
Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();
|
2019-04-10 22:46:04 +02:00
|
|
|
|
|
|
|
if (mesh.is_valid()) {
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
Vector<Ref<Shape3D>> shapes;
|
2019-04-10 22:46:04 +02:00
|
|
|
String fixed_name;
|
|
|
|
if (collision_map.has(mesh)) {
|
|
|
|
shapes = collision_map[mesh];
|
|
|
|
} else if (_teststr(name, "colonly")) {
|
2021-03-19 13:57:52 +01:00
|
|
|
_pre_gen_shape_list(mesh, shapes, false);
|
2019-04-10 22:46:04 +02:00
|
|
|
collision_map[mesh] = shapes;
|
|
|
|
} else if (_teststr(name, "convcolonly")) {
|
2021-03-19 13:57:52 +01:00
|
|
|
_pre_gen_shape_list(mesh, shapes, true);
|
2019-04-10 22:46:04 +02:00
|
|
|
collision_map[mesh] = shapes;
|
2018-10-07 16:18:27 +02:00
|
|
|
}
|
2017-11-16 14:06:30 +01:00
|
|
|
|
2019-04-10 22:46:04 +02:00
|
|
|
if (_teststr(name, "colonly")) {
|
|
|
|
fixed_name = _fixstr(name, "colonly");
|
|
|
|
} else if (_teststr(name, "convcolonly")) {
|
|
|
|
fixed_name = _fixstr(name, "convcolonly");
|
2018-10-07 16:18:27 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2020-04-02 01:20:12 +02:00
|
|
|
ERR_FAIL_COND_V(fixed_name == String(), nullptr);
|
2019-04-10 22:46:04 +02:00
|
|
|
|
|
|
|
if (shapes.size()) {
|
2020-03-26 22:49:16 +01:00
|
|
|
StaticBody3D *col = memnew(StaticBody3D);
|
2019-04-10 22:46:04 +02:00
|
|
|
col->set_transform(mi->get_transform());
|
|
|
|
col->set_name(fixed_name);
|
|
|
|
p_node->replace_by(col);
|
|
|
|
memdelete(p_node);
|
|
|
|
p_node = col;
|
|
|
|
|
2021-03-23 08:08:06 +01:00
|
|
|
_add_shapes(col, shapes);
|
2019-04-10 22:46:04 +02:00
|
|
|
}
|
2018-10-07 16:18:27 +02:00
|
|
|
}
|
2019-04-10 22:46:04 +02:00
|
|
|
|
2017-02-04 13:48:04 +01:00
|
|
|
} else if (p_node->has_meta("empty_draw_type")) {
|
|
|
|
String empty_draw_type = String(p_node->get_meta("empty_draw_type"));
|
2020-03-26 22:49:16 +01:00
|
|
|
StaticBody3D *sb = memnew(StaticBody3D);
|
2017-03-05 16:44:50 +01:00
|
|
|
sb->set_name(_fixstr(name, "colonly"));
|
2020-03-26 22:49:16 +01:00
|
|
|
Object::cast_to<Node3D>(sb)->set_transform(Object::cast_to<Node3D>(p_node)->get_transform());
|
2017-02-04 13:48:04 +01:00
|
|
|
p_node->replace_by(sb);
|
|
|
|
memdelete(p_node);
|
2020-04-02 01:20:12 +02:00
|
|
|
p_node = nullptr;
|
2020-03-26 22:49:16 +01:00
|
|
|
CollisionShape3D *colshape = memnew(CollisionShape3D);
|
2017-02-04 13:48:04 +01:00
|
|
|
if (empty_draw_type == "CUBE") {
|
2020-03-26 22:49:16 +01:00
|
|
|
BoxShape3D *boxShape = memnew(BoxShape3D);
|
2020-12-07 18:52:11 +01:00
|
|
|
boxShape->set_size(Vector3(2, 2, 2));
|
2017-02-04 13:48:04 +01:00
|
|
|
colshape->set_shape(boxShape);
|
2021-08-17 19:15:11 +02:00
|
|
|
} else if (empty_draw_type == "SINGLE_ARROW") {
|
2021-08-19 20:21:56 +02:00
|
|
|
SeparationRayShape3D *rayShape = memnew(SeparationRayShape3D);
|
2021-08-17 19:15:11 +02:00
|
|
|
rayShape->set_length(1);
|
|
|
|
colshape->set_shape(rayShape);
|
|
|
|
Object::cast_to<Node3D>(sb)->rotate_x(Math_PI / 2);
|
2017-02-04 13:48:04 +01:00
|
|
|
} else if (empty_draw_type == "IMAGE") {
|
2021-09-14 19:52:35 +02:00
|
|
|
WorldBoundaryShape3D *world_boundary_shape = memnew(WorldBoundaryShape3D);
|
|
|
|
colshape->set_shape(world_boundary_shape);
|
2017-02-04 13:48:04 +01:00
|
|
|
} else {
|
2020-03-26 22:49:16 +01:00
|
|
|
SphereShape3D *sphereShape = memnew(SphereShape3D);
|
2017-02-04 13:48:04 +01:00
|
|
|
sphereShape->set_radius(1);
|
|
|
|
colshape->set_shape(sphereShape);
|
|
|
|
}
|
|
|
|
sb->add_child(colshape);
|
|
|
|
colshape->set_owner(sb->get_owner());
|
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
} else if (_teststr(name, "rigid") && Object::cast_to<EditorSceneImporterMeshNode3D>(p_node)) {
|
2020-05-14 16:41:43 +02:00
|
|
|
if (isroot) {
|
2017-02-04 13:48:04 +01:00
|
|
|
return p_node;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
EditorSceneImporterMeshNode3D *mi = Object::cast_to<EditorSceneImporterMeshNode3D>(p_node);
|
|
|
|
Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();
|
2019-04-10 22:46:04 +02:00
|
|
|
|
|
|
|
if (mesh.is_valid()) {
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
Vector<Ref<Shape3D>> shapes;
|
2019-04-10 22:46:04 +02:00
|
|
|
if (collision_map.has(mesh)) {
|
|
|
|
shapes = collision_map[mesh];
|
|
|
|
} else {
|
Fix Static & Rigid body generation on mesh import.
The function `_gen_shape_list` is using the resource `Res<Mesh>`, but during the import phase the resource used is instead `Ref<EditorSceneImporterMesh>`.
Note: the `Ref<EditorSceneImporterMesh>` is an intermediate resource, that will be used to create a `Res<Mesh>` at the end of the import process. `Ref<EditorSceneImporterMesh>` and `Ref<Mesh>` are not inheriting each other, so the internal cast done by `Ref<>` during the assignment, is always null:
```c++
Ref<EditorSceneImporterMesh> import_mesh(/* Assume it's initialized */);
CRASH_NOW(import_mesh.is_null());
Ref<Mesh> mesh = import_mesh;
CRASH_NOW(mesh.is_null()); // <--- Here we have a crash, since it's impossible perform the above cast, and the `mesh` is always null.
```
Here the full list of call to `_gen_shape_list`, where we can notice that a `Ref<EditorSceneImporterMesh>` is passed:
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L428
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L454-L458
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L512-L516
As you can notice, we always pass the following mesh: `Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();`.
We already have the function `_pre_gen_shape_list` that executes the exact same job but using the correct type; Since there is no further usage of the function `_gen_shape_list` in the code base, I think it's just some leftover code, so I removed it entirely to use the proper function.
2021-07-24 08:39:18 +02:00
|
|
|
_pre_gen_shape_list(mesh, shapes, true);
|
2019-04-10 22:46:04 +02:00
|
|
|
}
|
|
|
|
|
2021-09-14 20:44:30 +02:00
|
|
|
RigidDynamicBody3D *rigid_body = memnew(RigidDynamicBody3D);
|
|
|
|
rigid_body->set_name(_fixstr(name, "rigid_body"));
|
2019-04-10 22:46:04 +02:00
|
|
|
p_node->replace_by(rigid_body);
|
|
|
|
rigid_body->set_transform(mi->get_transform());
|
|
|
|
p_node = rigid_body;
|
2020-10-17 07:08:21 +02:00
|
|
|
mi->set_transform(Transform3D());
|
2019-04-10 22:46:04 +02:00
|
|
|
rigid_body->add_child(mi);
|
|
|
|
mi->set_owner(rigid_body->get_owner());
|
|
|
|
|
2021-03-23 08:08:06 +01:00
|
|
|
_add_shapes(rigid_body, shapes);
|
2019-04-10 22:46:04 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
} else if ((_teststr(name, "col") || (_teststr(name, "convcol"))) && Object::cast_to<EditorSceneImporterMeshNode3D>(p_node)) {
|
|
|
|
EditorSceneImporterMeshNode3D *mi = Object::cast_to<EditorSceneImporterMeshNode3D>(p_node);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();
|
2019-04-10 22:46:04 +02:00
|
|
|
|
|
|
|
if (mesh.is_valid()) {
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
Vector<Ref<Shape3D>> shapes;
|
2019-04-10 22:46:04 +02:00
|
|
|
String fixed_name;
|
|
|
|
if (collision_map.has(mesh)) {
|
|
|
|
shapes = collision_map[mesh];
|
|
|
|
} else if (_teststr(name, "col")) {
|
Fix Static & Rigid body generation on mesh import.
The function `_gen_shape_list` is using the resource `Res<Mesh>`, but during the import phase the resource used is instead `Ref<EditorSceneImporterMesh>`.
Note: the `Ref<EditorSceneImporterMesh>` is an intermediate resource, that will be used to create a `Res<Mesh>` at the end of the import process. `Ref<EditorSceneImporterMesh>` and `Ref<Mesh>` are not inheriting each other, so the internal cast done by `Ref<>` during the assignment, is always null:
```c++
Ref<EditorSceneImporterMesh> import_mesh(/* Assume it's initialized */);
CRASH_NOW(import_mesh.is_null());
Ref<Mesh> mesh = import_mesh;
CRASH_NOW(mesh.is_null()); // <--- Here we have a crash, since it's impossible perform the above cast, and the `mesh` is always null.
```
Here the full list of call to `_gen_shape_list`, where we can notice that a `Ref<EditorSceneImporterMesh>` is passed:
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L428
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L454-L458
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L512-L516
As you can notice, we always pass the following mesh: `Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();`.
We already have the function `_pre_gen_shape_list` that executes the exact same job but using the correct type; Since there is no further usage of the function `_gen_shape_list` in the code base, I think it's just some leftover code, so I removed it entirely to use the proper function.
2021-07-24 08:39:18 +02:00
|
|
|
_pre_gen_shape_list(mesh, shapes, false);
|
2019-04-10 22:46:04 +02:00
|
|
|
collision_map[mesh] = shapes;
|
|
|
|
} else if (_teststr(name, "convcol")) {
|
Fix Static & Rigid body generation on mesh import.
The function `_gen_shape_list` is using the resource `Res<Mesh>`, but during the import phase the resource used is instead `Ref<EditorSceneImporterMesh>`.
Note: the `Ref<EditorSceneImporterMesh>` is an intermediate resource, that will be used to create a `Res<Mesh>` at the end of the import process. `Ref<EditorSceneImporterMesh>` and `Ref<Mesh>` are not inheriting each other, so the internal cast done by `Ref<>` during the assignment, is always null:
```c++
Ref<EditorSceneImporterMesh> import_mesh(/* Assume it's initialized */);
CRASH_NOW(import_mesh.is_null());
Ref<Mesh> mesh = import_mesh;
CRASH_NOW(mesh.is_null()); // <--- Here we have a crash, since it's impossible perform the above cast, and the `mesh` is always null.
```
Here the full list of call to `_gen_shape_list`, where we can notice that a `Ref<EditorSceneImporterMesh>` is passed:
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L428
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L454-L458
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L512-L516
As you can notice, we always pass the following mesh: `Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();`.
We already have the function `_pre_gen_shape_list` that executes the exact same job but using the correct type; Since there is no further usage of the function `_gen_shape_list` in the code base, I think it's just some leftover code, so I removed it entirely to use the proper function.
2021-07-24 08:39:18 +02:00
|
|
|
_pre_gen_shape_list(mesh, shapes, true);
|
2019-04-10 22:46:04 +02:00
|
|
|
collision_map[mesh] = shapes;
|
2018-07-02 10:54:14 +02:00
|
|
|
}
|
2017-11-16 14:06:30 +01:00
|
|
|
|
2019-04-10 22:46:04 +02:00
|
|
|
if (_teststr(name, "col")) {
|
|
|
|
fixed_name = _fixstr(name, "col");
|
|
|
|
} else if (_teststr(name, "convcol")) {
|
|
|
|
fixed_name = _fixstr(name, "convcol");
|
2018-07-02 10:54:14 +02:00
|
|
|
}
|
2017-11-16 14:06:30 +01:00
|
|
|
|
2019-04-10 22:46:04 +02:00
|
|
|
if (fixed_name != String()) {
|
|
|
|
if (mi->get_parent() && !mi->get_parent()->has_node(fixed_name)) {
|
|
|
|
mi->set_name(fixed_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (shapes.size()) {
|
2020-03-26 22:49:16 +01:00
|
|
|
StaticBody3D *col = memnew(StaticBody3D);
|
2019-04-10 22:46:04 +02:00
|
|
|
mi->add_child(col);
|
|
|
|
col->set_owner(mi->get_owner());
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-23 08:08:06 +01:00
|
|
|
_add_shapes(col, shapes);
|
2019-04-10 22:46:04 +02:00
|
|
|
}
|
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
} else if (_teststr(name, "navmesh") && Object::cast_to<EditorSceneImporterMeshNode3D>(p_node)) {
|
2020-05-14 16:41:43 +02:00
|
|
|
if (isroot) {
|
2017-02-04 13:48:04 +01:00
|
|
|
return p_node;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
EditorSceneImporterMeshNode3D *mi = Object::cast_to<EditorSceneImporterMeshNode3D>(p_node);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();
|
2020-04-02 01:20:12 +02:00
|
|
|
ERR_FAIL_COND_V(mesh.is_null(), nullptr);
|
2020-03-26 22:49:16 +01:00
|
|
|
NavigationRegion3D *nmi = memnew(NavigationRegion3D);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
nmi->set_name(_fixstr(name, "navmesh"));
|
2021-03-19 13:57:52 +01:00
|
|
|
Ref<NavigationMesh> nmesh = mesh->create_navigation_mesh();
|
2017-02-04 13:48:04 +01:00
|
|
|
nmi->set_navigation_mesh(nmesh);
|
2020-03-26 22:49:16 +01:00
|
|
|
Object::cast_to<Node3D>(nmi)->set_transform(mi->get_transform());
|
2017-02-04 13:48:04 +01:00
|
|
|
p_node->replace_by(nmi);
|
|
|
|
memdelete(p_node);
|
2017-03-05 16:44:50 +01:00
|
|
|
p_node = nmi;
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
} else if (Object::cast_to<EditorSceneImporterMeshNode3D>(p_node)) {
|
2017-11-16 14:06:30 +01:00
|
|
|
//last attempt, maybe collision inside the mesh data
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
EditorSceneImporterMeshNode3D *mi = Object::cast_to<EditorSceneImporterMeshNode3D>(p_node);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();
|
2017-02-04 13:48:04 +01:00
|
|
|
if (!mesh.is_null()) {
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
Vector<Ref<Shape3D>> shapes;
|
2019-04-10 22:46:04 +02:00
|
|
|
if (collision_map.has(mesh)) {
|
|
|
|
shapes = collision_map[mesh];
|
|
|
|
} else if (_teststr(mesh->get_name(), "col")) {
|
Fix Static & Rigid body generation on mesh import.
The function `_gen_shape_list` is using the resource `Res<Mesh>`, but during the import phase the resource used is instead `Ref<EditorSceneImporterMesh>`.
Note: the `Ref<EditorSceneImporterMesh>` is an intermediate resource, that will be used to create a `Res<Mesh>` at the end of the import process. `Ref<EditorSceneImporterMesh>` and `Ref<Mesh>` are not inheriting each other, so the internal cast done by `Ref<>` during the assignment, is always null:
```c++
Ref<EditorSceneImporterMesh> import_mesh(/* Assume it's initialized */);
CRASH_NOW(import_mesh.is_null());
Ref<Mesh> mesh = import_mesh;
CRASH_NOW(mesh.is_null()); // <--- Here we have a crash, since it's impossible perform the above cast, and the `mesh` is always null.
```
Here the full list of call to `_gen_shape_list`, where we can notice that a `Ref<EditorSceneImporterMesh>` is passed:
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L428
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L454-L458
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L512-L516
As you can notice, we always pass the following mesh: `Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();`.
We already have the function `_pre_gen_shape_list` that executes the exact same job but using the correct type; Since there is no further usage of the function `_gen_shape_list` in the code base, I think it's just some leftover code, so I removed it entirely to use the proper function.
2021-07-24 08:39:18 +02:00
|
|
|
_pre_gen_shape_list(mesh, shapes, false);
|
2019-04-10 22:46:04 +02:00
|
|
|
collision_map[mesh] = shapes;
|
|
|
|
mesh->set_name(_fixstr(mesh->get_name(), "col"));
|
|
|
|
} else if (_teststr(mesh->get_name(), "convcol")) {
|
Fix Static & Rigid body generation on mesh import.
The function `_gen_shape_list` is using the resource `Res<Mesh>`, but during the import phase the resource used is instead `Ref<EditorSceneImporterMesh>`.
Note: the `Ref<EditorSceneImporterMesh>` is an intermediate resource, that will be used to create a `Res<Mesh>` at the end of the import process. `Ref<EditorSceneImporterMesh>` and `Ref<Mesh>` are not inheriting each other, so the internal cast done by `Ref<>` during the assignment, is always null:
```c++
Ref<EditorSceneImporterMesh> import_mesh(/* Assume it's initialized */);
CRASH_NOW(import_mesh.is_null());
Ref<Mesh> mesh = import_mesh;
CRASH_NOW(mesh.is_null()); // <--- Here we have a crash, since it's impossible perform the above cast, and the `mesh` is always null.
```
Here the full list of call to `_gen_shape_list`, where we can notice that a `Ref<EditorSceneImporterMesh>` is passed:
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L428
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L454-L458
- https://github.com/AndreaCatania/godot/blob/master/editor/import/resource_importer_scene.cpp#L512-L516
As you can notice, we always pass the following mesh: `Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();`.
We already have the function `_pre_gen_shape_list` that executes the exact same job but using the correct type; Since there is no further usage of the function `_gen_shape_list` in the code base, I think it's just some leftover code, so I removed it entirely to use the proper function.
2021-07-24 08:39:18 +02:00
|
|
|
_pre_gen_shape_list(mesh, shapes, true);
|
2019-04-10 22:46:04 +02:00
|
|
|
collision_map[mesh] = shapes;
|
|
|
|
mesh->set_name(_fixstr(mesh->get_name(), "convcol"));
|
|
|
|
}
|
2017-11-16 14:06:30 +01:00
|
|
|
|
2019-04-10 22:46:04 +02:00
|
|
|
if (shapes.size()) {
|
2020-03-26 22:49:16 +01:00
|
|
|
StaticBody3D *col = memnew(StaticBody3D);
|
2019-04-10 22:46:04 +02:00
|
|
|
p_node->add_child(col);
|
|
|
|
col->set_owner(p_node->get_owner());
|
2017-11-16 14:06:30 +01:00
|
|
|
|
2021-03-23 08:08:06 +01:00
|
|
|
_add_shapes(col, shapes);
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return p_node;
|
|
|
|
}
|
|
|
|
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> &collision_map, Set<Ref<EditorSceneImporterMesh>> &r_scanned_meshes, const Dictionary &p_node_data, const Dictionary &p_material_data, const Dictionary &p_animation_data, float p_animation_fps) {
|
2021-03-19 13:57:52 +01:00
|
|
|
// children first
|
|
|
|
for (int i = 0; i < p_node->get_child_count(); i++) {
|
|
|
|
Node *r = _post_fix_node(p_node->get_child(i), p_root, collision_map, r_scanned_meshes, p_node_data, p_material_data, p_animation_data, p_animation_fps);
|
|
|
|
if (!r) {
|
|
|
|
i--; //was erased
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool isroot = p_node == p_root;
|
|
|
|
|
|
|
|
String import_id;
|
|
|
|
|
|
|
|
if (p_node->has_meta("import_id")) {
|
|
|
|
import_id = p_node->get_meta("import_id");
|
|
|
|
} else {
|
|
|
|
import_id = "PATH:" + p_root->get_path_to(p_node);
|
|
|
|
}
|
|
|
|
|
|
|
|
Dictionary node_settings;
|
|
|
|
if (p_node_data.has(import_id)) {
|
|
|
|
node_settings = p_node_data[import_id];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!isroot && (node_settings.has("import/skip_import") && bool(node_settings["import/skip_import"]))) {
|
|
|
|
memdelete(p_node);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Object::cast_to<EditorSceneImporterMeshNode3D>(p_node)) {
|
|
|
|
EditorSceneImporterMeshNode3D *mi = Object::cast_to<EditorSceneImporterMeshNode3D>(p_node);
|
|
|
|
|
|
|
|
Ref<EditorSceneImporterMesh> m = mi->get_mesh();
|
|
|
|
|
|
|
|
if (m.is_valid()) {
|
|
|
|
if (!r_scanned_meshes.has(m)) {
|
|
|
|
for (int i = 0; i < m->get_surface_count(); i++) {
|
|
|
|
Ref<Material> mat = m->get_surface_material(i);
|
|
|
|
if (mat.is_valid()) {
|
|
|
|
String mat_id;
|
|
|
|
if (mat->has_meta("import_id")) {
|
|
|
|
mat_id = mat->get_meta("import_id");
|
|
|
|
} else {
|
|
|
|
mat_id = mat->get_name();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mat_id != String() && p_material_data.has(mat_id)) {
|
|
|
|
Dictionary matdata = p_material_data[mat_id];
|
|
|
|
if (matdata.has("use_external/enabled") && bool(matdata["use_external/enabled"]) && matdata.has("use_external/path")) {
|
|
|
|
String path = matdata["use_external/path"];
|
|
|
|
Ref<Material> external_mat = ResourceLoader::load(path);
|
|
|
|
if (external_mat.is_valid()) {
|
|
|
|
m->set_surface_material(i, external_mat);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
r_scanned_meshes.insert(m);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (node_settings.has("generate/physics")) {
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
int mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_DISABLED;
|
|
|
|
|
|
|
|
const bool generate_collider = node_settings["generate/physics"];
|
|
|
|
if (generate_collider) {
|
|
|
|
mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_MESH_AND_STATIC_COLLIDER;
|
|
|
|
if (node_settings.has("physics/body_type")) {
|
|
|
|
const BodyType body_type = (BodyType)node_settings["physics/body_type"].operator int();
|
|
|
|
switch (body_type) {
|
|
|
|
case BODY_TYPE_STATIC:
|
|
|
|
mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_MESH_AND_STATIC_COLLIDER;
|
|
|
|
break;
|
|
|
|
case BODY_TYPE_DYNAMIC:
|
|
|
|
mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_RIGID_BODY_AND_MESH;
|
|
|
|
break;
|
|
|
|
case BODY_TYPE_AREA:
|
|
|
|
mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_AREA_ONLY;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
if (mesh_physics_mode != MeshPhysicsMode::MESH_PHYSICS_DISABLED) {
|
|
|
|
Vector<Ref<Shape3D>> shapes;
|
2021-03-19 13:57:52 +01:00
|
|
|
if (collision_map.has(m)) {
|
|
|
|
shapes = collision_map[m];
|
|
|
|
} else {
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
shapes = get_collision_shapes(
|
|
|
|
m->get_mesh(),
|
|
|
|
node_settings);
|
2021-03-19 13:57:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (shapes.size()) {
|
|
|
|
CollisionObject3D *base = nullptr;
|
|
|
|
switch (mesh_physics_mode) {
|
|
|
|
case MESH_PHYSICS_MESH_AND_STATIC_COLLIDER: {
|
|
|
|
StaticBody3D *col = memnew(StaticBody3D);
|
|
|
|
p_node->add_child(col);
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
col->set_owner(p_node->get_owner());
|
|
|
|
col->set_transform(get_collision_shapes_transform(node_settings));
|
2021-03-19 13:57:52 +01:00
|
|
|
base = col;
|
|
|
|
} break;
|
|
|
|
case MESH_PHYSICS_RIGID_BODY_AND_MESH: {
|
2021-09-14 20:44:30 +02:00
|
|
|
RigidDynamicBody3D *rigid_body = memnew(RigidDynamicBody3D);
|
2021-03-19 13:57:52 +01:00
|
|
|
rigid_body->set_name(p_node->get_name());
|
|
|
|
p_node->replace_by(rigid_body);
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
rigid_body->set_transform(mi->get_transform() * get_collision_shapes_transform(node_settings));
|
2021-03-19 13:57:52 +01:00
|
|
|
p_node = rigid_body;
|
2020-10-17 07:08:21 +02:00
|
|
|
mi->set_transform(Transform3D());
|
2021-03-19 13:57:52 +01:00
|
|
|
rigid_body->add_child(mi);
|
|
|
|
mi->set_owner(rigid_body->get_owner());
|
|
|
|
base = rigid_body;
|
|
|
|
} break;
|
|
|
|
case MESH_PHYSICS_STATIC_COLLIDER_ONLY: {
|
|
|
|
StaticBody3D *col = memnew(StaticBody3D);
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
col->set_transform(mi->get_transform() * get_collision_shapes_transform(node_settings));
|
2021-03-19 13:57:52 +01:00
|
|
|
col->set_name(p_node->get_name());
|
|
|
|
p_node->replace_by(col);
|
|
|
|
memdelete(p_node);
|
|
|
|
p_node = col;
|
|
|
|
base = col;
|
|
|
|
} break;
|
|
|
|
case MESH_PHYSICS_AREA_ONLY: {
|
|
|
|
Area3D *area = memnew(Area3D);
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
area->set_transform(mi->get_transform() * get_collision_shapes_transform(node_settings));
|
2021-03-19 13:57:52 +01:00
|
|
|
area->set_name(p_node->get_name());
|
|
|
|
p_node->replace_by(area);
|
|
|
|
memdelete(p_node);
|
|
|
|
p_node = area;
|
|
|
|
base = area;
|
|
|
|
|
|
|
|
} break;
|
|
|
|
}
|
|
|
|
|
|
|
|
int idx = 0;
|
2021-07-24 15:46:25 +02:00
|
|
|
for (const Ref<Shape3D> &E : shapes) {
|
2021-03-19 13:57:52 +01:00
|
|
|
CollisionShape3D *cshape = memnew(CollisionShape3D);
|
2021-07-16 05:45:57 +02:00
|
|
|
cshape->set_shape(E);
|
2021-03-19 13:57:52 +01:00
|
|
|
base->add_child(cshape);
|
|
|
|
|
|
|
|
cshape->set_owner(base->get_owner());
|
|
|
|
idx++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//navmesh (node may have changed type above)
|
|
|
|
if (Object::cast_to<EditorSceneImporterMeshNode3D>(p_node)) {
|
|
|
|
EditorSceneImporterMeshNode3D *mi = Object::cast_to<EditorSceneImporterMeshNode3D>(p_node);
|
|
|
|
|
|
|
|
Ref<EditorSceneImporterMesh> m = mi->get_mesh();
|
|
|
|
|
|
|
|
if (m.is_valid()) {
|
|
|
|
if (node_settings.has("generate/navmesh")) {
|
|
|
|
int navmesh_mode = node_settings["generate/navmesh"];
|
|
|
|
|
|
|
|
if (navmesh_mode != NAVMESH_DISABLED) {
|
|
|
|
NavigationRegion3D *nmi = memnew(NavigationRegion3D);
|
|
|
|
|
|
|
|
Ref<NavigationMesh> nmesh = m->create_navigation_mesh();
|
|
|
|
nmi->set_navigation_mesh(nmesh);
|
|
|
|
|
|
|
|
if (navmesh_mode == NAVMESH_NAVMESH_ONLY) {
|
|
|
|
nmi->set_transform(mi->get_transform());
|
|
|
|
p_node->replace_by(nmi);
|
|
|
|
memdelete(p_node);
|
|
|
|
p_node = nmi;
|
|
|
|
} else {
|
|
|
|
mi->add_child(nmi);
|
|
|
|
nmi->set_owner(mi->get_owner());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Object::cast_to<AnimationPlayer>(p_node)) {
|
|
|
|
AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(p_node);
|
|
|
|
|
|
|
|
{
|
|
|
|
//make sure this is unique
|
|
|
|
node_settings = node_settings.duplicate(true);
|
|
|
|
//fill node settings for this node with default values
|
|
|
|
List<ImportOption> iopts;
|
|
|
|
get_internal_import_options(INTERNAL_IMPORT_CATEGORY_ANIMATION_NODE, &iopts);
|
2021-07-24 15:46:25 +02:00
|
|
|
for (const ImportOption &E : iopts) {
|
2021-07-16 05:45:57 +02:00
|
|
|
if (!node_settings.has(E.option.name)) {
|
|
|
|
node_settings[E.option.name] = E.default_value;
|
2021-03-19 13:57:52 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool use_optimizer = node_settings["optimizer/enabled"];
|
|
|
|
float anim_optimizer_linerr = node_settings["optimizer/max_linear_error"];
|
|
|
|
float anim_optimizer_angerr = node_settings["optimizer/max_angular_error"];
|
|
|
|
float anim_optimizer_maxang = node_settings["optimizer/max_angle"];
|
|
|
|
|
|
|
|
if (use_optimizer) {
|
|
|
|
_optimize_animations(ap, anim_optimizer_linerr, anim_optimizer_angerr, anim_optimizer_maxang);
|
|
|
|
}
|
|
|
|
|
|
|
|
Array animation_clips;
|
|
|
|
{
|
|
|
|
int clip_count = node_settings["clips/amount"];
|
|
|
|
|
|
|
|
for (int i = 0; i < clip_count; i++) {
|
|
|
|
String name = node_settings["clip_" + itos(i + 1) + "/name"];
|
|
|
|
int from_frame = node_settings["clip_" + itos(i + 1) + "/start_frame"];
|
|
|
|
int end_frame = node_settings["clip_" + itos(i + 1) + "/end_frame"];
|
|
|
|
bool loop = node_settings["clip_" + itos(i + 1) + "/loops"];
|
|
|
|
bool save_to_file = node_settings["clip_" + itos(i + 1) + "/save_to_file/enabled"];
|
|
|
|
bool save_to_path = node_settings["clip_" + itos(i + 1) + "/save_to_file/path"];
|
|
|
|
bool save_to_file_keep_custom = node_settings["clip_" + itos(i + 1) + "/save_to_file/keep_custom_tracks"];
|
|
|
|
|
|
|
|
animation_clips.push_back(name);
|
|
|
|
animation_clips.push_back(from_frame / p_animation_fps);
|
|
|
|
animation_clips.push_back(end_frame / p_animation_fps);
|
|
|
|
animation_clips.push_back(loop);
|
|
|
|
animation_clips.push_back(save_to_file);
|
|
|
|
animation_clips.push_back(save_to_path);
|
|
|
|
animation_clips.push_back(save_to_file_keep_custom);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (animation_clips.size()) {
|
|
|
|
_create_clips(ap, animation_clips, true);
|
|
|
|
} else {
|
|
|
|
List<StringName> anims;
|
|
|
|
ap->get_animation_list(&anims);
|
2021-07-24 15:46:25 +02:00
|
|
|
for (const StringName &name : anims) {
|
2021-03-19 13:57:52 +01:00
|
|
|
Ref<Animation> anim = ap->get_animation(name);
|
|
|
|
if (p_animation_data.has(name)) {
|
|
|
|
Dictionary anim_settings = p_animation_data[name];
|
|
|
|
{
|
|
|
|
//fill with default values
|
|
|
|
List<ImportOption> iopts;
|
|
|
|
get_internal_import_options(INTERNAL_IMPORT_CATEGORY_ANIMATION, &iopts);
|
2021-07-24 15:46:25 +02:00
|
|
|
for (const ImportOption &F : iopts) {
|
2021-07-16 05:45:57 +02:00
|
|
|
if (!anim_settings.has(F.option.name)) {
|
|
|
|
anim_settings[F.option.name] = F.default_value;
|
2021-03-19 13:57:52 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
anim->set_loop(anim_settings["settings/loops"]);
|
|
|
|
bool save = anim_settings["save_to_file/enabled"];
|
|
|
|
String path = anim_settings["save_to_file/path"];
|
|
|
|
bool keep_custom = anim_settings["save_to_file/keep_custom_tracks"];
|
|
|
|
|
|
|
|
Ref<Animation> saved_anim = _save_animation_to_file(anim, save, path, keep_custom);
|
|
|
|
|
|
|
|
if (saved_anim != anim) {
|
|
|
|
ap->add_animation(name, saved_anim); //replace
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
return p_node;
|
|
|
|
}
|
|
|
|
|
|
|
|
Ref<Animation> ResourceImporterScene::_save_animation_to_file(Ref<Animation> anim, bool p_save_to_file, String p_save_to_path, bool p_keep_custom_tracks) {
|
|
|
|
if (!p_save_to_file || !p_save_to_path.is_resource_file()) {
|
|
|
|
return anim;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (FileAccess::exists(p_save_to_path) && p_keep_custom_tracks) {
|
|
|
|
// Copy custom animation tracks from previously imported files.
|
|
|
|
Ref<Animation> old_anim = ResourceLoader::load(p_save_to_path, "Animation", ResourceFormatLoader::CACHE_MODE_IGNORE);
|
|
|
|
if (old_anim.is_valid()) {
|
|
|
|
for (int i = 0; i < old_anim->get_track_count(); i++) {
|
|
|
|
if (!old_anim->track_is_imported(i)) {
|
|
|
|
old_anim->copy_track(i, anim);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
anim->set_loop(old_anim->has_loop());
|
|
|
|
}
|
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
if (ResourceCache::has(p_save_to_path)) {
|
|
|
|
Ref<Animation> old_anim = Ref<Resource>(ResourceCache::get(p_save_to_path));
|
|
|
|
if (old_anim.is_valid()) {
|
|
|
|
old_anim->copy_from(anim);
|
|
|
|
anim = old_anim;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
anim->set_path(p_save_to_path, true); // Set path to save externally.
|
|
|
|
Error err = ResourceSaver::save(p_save_to_path, anim, ResourceSaver::FLAG_CHANGE_PATH);
|
|
|
|
ERR_FAIL_COND_V_MSG(err != OK, anim, "Saving of animation failed: " + p_save_to_path);
|
|
|
|
return anim;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ResourceImporterScene::_create_clips(AnimationPlayer *anim, const Array &p_clips, bool p_bake_all) {
|
2020-05-14 16:41:43 +02:00
|
|
|
if (!anim->has_animation("default")) {
|
2017-02-04 13:48:04 +01:00
|
|
|
return;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
Ref<Animation> default_anim = anim->get_animation("default");
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
for (int i = 0; i < p_clips.size(); i += 7) {
|
2017-02-04 13:48:04 +01:00
|
|
|
String name = p_clips[i];
|
2017-03-05 16:44:50 +01:00
|
|
|
float from = p_clips[i + 1];
|
|
|
|
float to = p_clips[i + 2];
|
|
|
|
bool loop = p_clips[i + 3];
|
2021-03-19 13:57:52 +01:00
|
|
|
bool save_to_file = p_clips[i + 4];
|
|
|
|
String save_to_path = p_clips[i + 5];
|
|
|
|
bool keep_current = p_clips[i + 6];
|
2020-05-14 16:41:43 +02:00
|
|
|
if (from >= to) {
|
2017-02-04 13:48:04 +01:00
|
|
|
continue;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
Ref<Animation> new_anim = memnew(Animation);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
for (int j = 0; j < default_anim->get_track_count(); j++) {
|
2017-02-04 13:48:04 +01:00
|
|
|
List<float> keys;
|
|
|
|
int kc = default_anim->track_get_key_count(j);
|
2017-03-05 16:44:50 +01:00
|
|
|
int dtrack = -1;
|
|
|
|
for (int k = 0; k < kc; k++) {
|
|
|
|
float kt = default_anim->track_get_key_time(j, k);
|
|
|
|
if (kt >= from && kt < to) {
|
2017-02-04 13:48:04 +01:00
|
|
|
//found a key within range, so create track
|
2017-03-05 16:44:50 +01:00
|
|
|
if (dtrack == -1) {
|
2017-02-04 13:48:04 +01:00
|
|
|
new_anim->add_track(default_anim->track_get_type(j));
|
2017-03-05 16:44:50 +01:00
|
|
|
dtrack = new_anim->get_track_count() - 1;
|
|
|
|
new_anim->track_set_path(dtrack, default_anim->track_get_path(j));
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
if (kt > (from + 0.01) && k > 0) {
|
2021-06-04 02:34:41 +02:00
|
|
|
if (default_anim->track_get_type(j) == Animation::TYPE_TRANSFORM3D) {
|
2021-01-20 08:02:02 +01:00
|
|
|
Quaternion q;
|
2017-02-04 13:48:04 +01:00
|
|
|
Vector3 p;
|
|
|
|
Vector3 s;
|
2017-03-05 16:44:50 +01:00
|
|
|
default_anim->transform_track_interpolate(j, from, &p, &q, &s);
|
|
|
|
new_anim->transform_track_insert_key(dtrack, 0, p, q, s);
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
2019-04-24 01:34:37 +02:00
|
|
|
if (default_anim->track_get_type(j) == Animation::TYPE_VALUE) {
|
|
|
|
Variant var = default_anim->value_track_interpolate(j, from);
|
|
|
|
new_anim->track_insert_key(dtrack, 0, var);
|
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-04 02:34:41 +02:00
|
|
|
if (default_anim->track_get_type(j) == Animation::TYPE_TRANSFORM3D) {
|
2021-01-20 08:02:02 +01:00
|
|
|
Quaternion q;
|
2017-02-04 13:48:04 +01:00
|
|
|
Vector3 p;
|
|
|
|
Vector3 s;
|
2017-03-05 16:44:50 +01:00
|
|
|
default_anim->transform_track_get_key(j, k, &p, &q, &s);
|
|
|
|
new_anim->transform_track_insert_key(dtrack, kt - from, p, q, s);
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
2019-04-24 01:34:37 +02:00
|
|
|
if (default_anim->track_get_type(j) == Animation::TYPE_VALUE) {
|
|
|
|
Variant var = default_anim->track_get_key_value(j, k);
|
|
|
|
new_anim->track_insert_key(dtrack, kt - from, var);
|
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
if (dtrack != -1 && kt >= to) {
|
2021-06-04 02:34:41 +02:00
|
|
|
if (default_anim->track_get_type(j) == Animation::TYPE_TRANSFORM3D) {
|
2021-01-20 08:02:02 +01:00
|
|
|
Quaternion q;
|
2017-02-04 13:48:04 +01:00
|
|
|
Vector3 p;
|
|
|
|
Vector3 s;
|
2017-03-05 16:44:50 +01:00
|
|
|
default_anim->transform_track_interpolate(j, to, &p, &q, &s);
|
|
|
|
new_anim->transform_track_insert_key(dtrack, to - from, p, q, s);
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
2019-04-24 01:34:37 +02:00
|
|
|
if (default_anim->track_get_type(j) == Animation::TYPE_VALUE) {
|
|
|
|
Variant var = default_anim->value_track_interpolate(j, to);
|
|
|
|
new_anim->track_insert_key(dtrack, to - from, var);
|
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
if (dtrack == -1 && p_bake_all) {
|
2017-02-04 13:48:04 +01:00
|
|
|
new_anim->add_track(default_anim->track_get_type(j));
|
2017-03-05 16:44:50 +01:00
|
|
|
dtrack = new_anim->get_track_count() - 1;
|
|
|
|
new_anim->track_set_path(dtrack, default_anim->track_get_path(j));
|
2021-06-04 02:34:41 +02:00
|
|
|
if (default_anim->track_get_type(j) == Animation::TYPE_TRANSFORM3D) {
|
2021-01-20 08:02:02 +01:00
|
|
|
Quaternion q;
|
2017-02-04 13:48:04 +01:00
|
|
|
Vector3 p;
|
|
|
|
Vector3 s;
|
2017-03-05 16:44:50 +01:00
|
|
|
default_anim->transform_track_interpolate(j, from, &p, &q, &s);
|
|
|
|
new_anim->transform_track_insert_key(dtrack, 0, p, q, s);
|
|
|
|
default_anim->transform_track_interpolate(j, to, &p, &q, &s);
|
|
|
|
new_anim->transform_track_insert_key(dtrack, to - from, p, q, s);
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
2019-04-24 01:34:37 +02:00
|
|
|
if (default_anim->track_get_type(j) == Animation::TYPE_VALUE) {
|
|
|
|
Variant var = default_anim->value_track_interpolate(j, from);
|
|
|
|
new_anim->track_insert_key(dtrack, 0, var);
|
|
|
|
Variant to_var = default_anim->value_track_interpolate(j, to);
|
|
|
|
new_anim->track_insert_key(dtrack, to - from, to_var);
|
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
new_anim->set_loop(loop);
|
2017-03-05 16:44:50 +01:00
|
|
|
new_anim->set_length(to - from);
|
|
|
|
anim->add_animation(name, new_anim);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
Ref<Animation> saved_anim = _save_animation_to_file(new_anim, save_to_file, save_to_path, keep_current);
|
|
|
|
if (saved_anim != new_anim) {
|
|
|
|
anim->add_animation(name, saved_anim);
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
anim->remove_animation("default"); //remove default (no longer needed)
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
void ResourceImporterScene::_optimize_animations(AnimationPlayer *anim, float p_max_lin_error, float p_max_ang_error, float p_max_angle) {
|
2017-02-04 13:48:04 +01:00
|
|
|
List<StringName> anim_names;
|
|
|
|
anim->get_animation_list(&anim_names);
|
2021-07-24 15:46:25 +02:00
|
|
|
for (const StringName &E : anim_names) {
|
2021-07-16 05:45:57 +02:00
|
|
|
Ref<Animation> a = anim->get_animation(E);
|
2017-03-05 16:44:50 +01:00
|
|
|
a->optimize(p_max_lin_error, p_max_ang_error, Math::deg2rad(p_max_angle));
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
void ResourceImporterScene::get_internal_import_options(InternalImportCategory p_category, List<ImportOption> *r_options) const {
|
|
|
|
switch (p_category) {
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_NODE: {
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "import/skip_import", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_MESH_3D_NODE: {
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "import/skip_import", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "generate/physics", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
|
2021-03-19 13:57:52 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/navmesh", PROPERTY_HINT_ENUM, "Disabled,Mesh + NavMesh,NavMesh Only"), 0));
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/body_type", PROPERTY_HINT_ENUM, "Static,Dynamic,Area"), 0));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/shape_type", PROPERTY_HINT_ENUM, "Decompose Convex,Simple Convex,Trimesh,Box,Sphere,Cylinder,Capsule", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 0));
|
|
|
|
|
|
|
|
// Decomposition
|
|
|
|
Mesh::ConvexDecompositionSettings decomposition_default;
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "decomposition/advanced", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/precision", PROPERTY_HINT_RANGE, "1,10,1"), 5));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "decomposition/max_concavity", PROPERTY_HINT_RANGE, "0.0,1.0,0.001", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.max_concavity));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "decomposition/symmetry_planes_clipping_bias", PROPERTY_HINT_RANGE, "0.0,1.0,0.001", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.symmetry_planes_clipping_bias));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "decomposition/revolution_axes_clipping_bias", PROPERTY_HINT_RANGE, "0.0,1.0,0.001", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.revolution_axes_clipping_bias));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "decomposition/min_volume_per_convex_hull", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.min_volume_per_convex_hull));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/resolution", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.resolution));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/max_num_vertices_per_convex_hull", PROPERTY_HINT_RANGE, "5,512,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.max_num_vertices_per_convex_hull));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/plane_downsampling", PROPERTY_HINT_RANGE, "1,16,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.plane_downsampling));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/convexhull_downsampling", PROPERTY_HINT_RANGE, "1,16,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.convexhull_downsampling));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "decomposition/normalize_mesh", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.normalize_mesh));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/mode", PROPERTY_HINT_ENUM, "Voxel,Tetrahedron", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), static_cast<int>(decomposition_default.mode)));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "decomposition/convexhull_approximation", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.convexhull_approximation));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/max_convex_hulls", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.max_convex_hulls));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "decomposition/project_hull_vertices", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.project_hull_vertices));
|
|
|
|
|
|
|
|
// Primitives: Box, Sphere, Cylinder, Capsule.
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "primitive/size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), Vector3(2.0, 2.0, 2.0)));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "primitive/height", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 1.0));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "primitive/radius", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 1.0));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "primitive/position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), Vector3()));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "primitive/rotation", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), Vector3()));
|
2021-03-19 13:57:52 +01:00
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_MESH: {
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "save_to_file/path", PROPERTY_HINT_SAVE_FILE, "*.res,*.tres"), ""));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/make_streamable"), ""));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/shadow_meshes", PROPERTY_HINT_ENUM, "Default,Enable,Disable"), 0));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/lightmap_uv", PROPERTY_HINT_ENUM, "Default,Enable,Disable"), 0));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/lods", PROPERTY_HINT_ENUM, "Default,Enable,Disable"), 0));
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_MATERIAL: {
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "use_external/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "use_external/path", PROPERTY_HINT_FILE, "*.material,*.res,*.tres"), ""));
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_ANIMATION: {
|
|
|
|
r_options->push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "settings/loops"), false));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "save_to_file/path", PROPERTY_HINT_SAVE_FILE, "*.res,*.tres"), ""));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/keep_custom_tracks"), ""));
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_ANIMATION_NODE: {
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "import/skip_import", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "optimizer/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), true));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "optimizer/max_linear_error"), 0.05));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "optimizer/max_angular_error"), 0.01));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "optimizer/max_angle"), 22));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slices/amount", PROPERTY_HINT_RANGE, "0,256,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 0));
|
|
|
|
|
|
|
|
for (int i = 0; i < 256; i++) {
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "slice_" + itos(i + 1) + "/name"), ""));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slice_" + itos(i + 1) + "/start_frame"), 0));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slice_" + itos(i + 1) + "/end_frame"), 0));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/loops"), false));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "slice_" + itos(i + 1) + "/save_to_file/path", PROPERTY_HINT_SAVE_FILE, ".res,*.tres"), ""));
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/save_to_file/keep_custom_tracks"), false));
|
2017-12-09 18:11:26 +01:00
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
} break;
|
|
|
|
default: {
|
2017-12-09 18:11:26 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
bool ResourceImporterScene::get_internal_option_visibility(InternalImportCategory p_category, const String &p_option, const Map<StringName, Variant> &p_options) const {
|
|
|
|
if (p_options.has("import/skip_import") && p_option != "import/skip_import" && bool(p_options["import/skip_import"])) {
|
|
|
|
return false; //if skip import
|
|
|
|
}
|
|
|
|
switch (p_category) {
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_NODE: {
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_MESH_3D_NODE: {
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
const bool generate_physics =
|
|
|
|
p_options.has("generate/physics") &&
|
|
|
|
p_options["generate/physics"].operator bool();
|
|
|
|
|
|
|
|
if (
|
|
|
|
p_option == "physics/body_type" ||
|
|
|
|
p_option == "physics/shape_type") {
|
|
|
|
// Show if need to generate collisions.
|
|
|
|
return generate_physics;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p_option.find("decomposition/") >= 0) {
|
|
|
|
// Show if need to generate collisions.
|
|
|
|
if (generate_physics &&
|
|
|
|
// Show if convex is enabled.
|
|
|
|
p_options["physics/shape_type"] == Variant(SHAPE_TYPE_DECOMPOSE_CONVEX)) {
|
|
|
|
if (p_option == "decomposition/advanced") {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
const bool decomposition_advanced =
|
|
|
|
p_options.has("decomposition/advanced") &&
|
|
|
|
p_options["decomposition/advanced"].operator bool();
|
|
|
|
|
|
|
|
if (p_option == "decomposition/precision") {
|
|
|
|
return !decomposition_advanced;
|
|
|
|
} else {
|
|
|
|
return decomposition_advanced;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p_option == "primitive/position" || p_option == "primitive/rotation") {
|
|
|
|
const ShapeType physics_shape = (ShapeType)p_options["physics/shape_type"].operator int();
|
|
|
|
return generate_physics &&
|
|
|
|
physics_shape >= SHAPE_TYPE_BOX;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p_option == "primitive/size") {
|
|
|
|
const ShapeType physics_shape = (ShapeType)p_options["physics/shape_type"].operator int();
|
|
|
|
return generate_physics &&
|
|
|
|
physics_shape == SHAPE_TYPE_BOX;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p_option == "primitive/radius") {
|
|
|
|
const ShapeType physics_shape = (ShapeType)p_options["physics/shape_type"].operator int();
|
|
|
|
return generate_physics && (physics_shape == SHAPE_TYPE_SPHERE ||
|
|
|
|
physics_shape == SHAPE_TYPE_CYLINDER ||
|
|
|
|
physics_shape == SHAPE_TYPE_CAPSULE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p_option == "primitive/height") {
|
|
|
|
const ShapeType physics_shape = (ShapeType)p_options["physics/shape_type"].operator int();
|
|
|
|
return generate_physics &&
|
|
|
|
(physics_shape == SHAPE_TYPE_CYLINDER ||
|
|
|
|
physics_shape == SHAPE_TYPE_CAPSULE);
|
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_MESH: {
|
|
|
|
if (p_option == "save_to_file/path" || p_option == "save_to_file/make_streamable") {
|
|
|
|
return p_options["save_to_file/enabled"];
|
|
|
|
}
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_MATERIAL: {
|
|
|
|
if (p_option == "use_external/path") {
|
|
|
|
return p_options["use_external/enabled"];
|
|
|
|
}
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_ANIMATION: {
|
|
|
|
if (p_option == "save_to_file/path" || p_option == "save_to_file/keep_custom_tracks") {
|
|
|
|
return p_options["save_to_file/enabled"];
|
|
|
|
}
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_ANIMATION_NODE: {
|
|
|
|
if (p_option.begins_with("animation/optimizer/") && p_option != "animation/optimizer/enabled" && !bool(p_options["animation/optimizer/enabled"])) {
|
|
|
|
return false;
|
2017-09-08 13:06:09 +02:00
|
|
|
}
|
2017-02-05 00:31:15 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
if (p_option.begins_with("animation/slice_")) {
|
|
|
|
int max_slice = p_options["animation/slices/amount"];
|
|
|
|
int slice = p_option.get_slice("/", 1).get_slice("_", 1).to_int() - 1;
|
|
|
|
if (slice >= max_slice) {
|
|
|
|
return false;
|
2017-02-05 00:31:15 +01:00
|
|
|
}
|
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
} break;
|
|
|
|
default: {
|
2017-02-05 00:31:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
return true;
|
2017-02-05 00:31:15 +01:00
|
|
|
}
|
|
|
|
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
bool ResourceImporterScene::get_internal_option_update_view_required(InternalImportCategory p_category, const String &p_option, const Map<StringName, Variant> &p_options) const {
|
|
|
|
switch (p_category) {
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_NODE: {
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_MESH_3D_NODE: {
|
|
|
|
if (
|
|
|
|
p_option == "generate/physics" ||
|
|
|
|
p_option == "physics/shape_type" ||
|
|
|
|
p_option.find("decomposition/") >= 0 ||
|
|
|
|
p_option.find("primitive/") >= 0) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_MESH: {
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_MATERIAL: {
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_ANIMATION: {
|
|
|
|
} break;
|
|
|
|
case INTERNAL_IMPORT_CATEGORY_ANIMATION_NODE: {
|
|
|
|
} break;
|
|
|
|
default: {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
void ResourceImporterScene::get_import_options(List<ImportOption> *r_options, int p_preset) const {
|
2020-03-26 22:49:16 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "nodes/root_type", PROPERTY_HINT_TYPE_STRING, "Node"), "Node3D"));
|
2017-03-05 16:44:50 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "nodes/root_name"), "Scene Root"));
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
List<String> script_extentions;
|
2017-03-05 16:44:50 +01:00
|
|
|
ResourceLoader::get_recognized_extensions_for_type("Script", &script_extentions);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
String script_ext_hint;
|
|
|
|
|
2021-07-24 15:46:25 +02:00
|
|
|
for (const String &E : script_extentions) {
|
2020-05-14 16:41:43 +02:00
|
|
|
if (script_ext_hint != "") {
|
2017-03-05 16:44:50 +01:00
|
|
|
script_ext_hint += ",";
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2021-07-16 05:45:57 +02:00
|
|
|
script_ext_hint += "*." + E;
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
|
Variant: Added 64-bit packed arrays, renamed Variant::REAL to FLOAT.
- Renames PackedIntArray to PackedInt32Array.
- Renames PackedFloatArray to PackedFloat32Array.
- Adds PackedInt64Array and PackedFloat64Array.
- Renames Variant::REAL to Variant::FLOAT for consistency.
Packed arrays are for storing large amount of data and creating stuff like
meshes, buffers. textures, etc. Forcing them to be 64 is a huge waste of
memory. That said, many users requested the ability to have 64 bits packed
arrays for their games, so this is just an optional added type.
For Variant, the float datatype is always 64 bits, and exposed as `float`.
We still have `real_t` which is the datatype that can change from 32 to 64
bits depending on a compile flag (not entirely working right now, but that's
the idea). It affects math related datatypes and code only.
Neither Variant nor PackedArray make use of real_t, which is only intended
for math precision, so the term is removed from there to keep only float.
2020-02-24 19:20:53 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "nodes/root_scale", PROPERTY_HINT_RANGE, "0.001,1000,0.001"), 1.0));
|
2017-08-18 13:25:04 +02:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "meshes/ensure_tangents"), true));
|
2020-12-17 19:56:59 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "meshes/generate_lods"), true));
|
2021-01-25 16:20:11 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "meshes/create_shadow_meshes"), true));
|
2021-03-19 13:57:52 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "meshes/light_baking", PROPERTY_HINT_ENUM, "Disabled,Dynamic,Static,Static Lightmaps", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 2));
|
Variant: Added 64-bit packed arrays, renamed Variant::REAL to FLOAT.
- Renames PackedIntArray to PackedInt32Array.
- Renames PackedFloatArray to PackedFloat32Array.
- Adds PackedInt64Array and PackedFloat64Array.
- Renames Variant::REAL to Variant::FLOAT for consistency.
Packed arrays are for storing large amount of data and creating stuff like
meshes, buffers. textures, etc. Forcing them to be 64 is a huge waste of
memory. That said, many users requested the ability to have 64 bits packed
arrays for their games, so this is just an optional added type.
For Variant, the float datatype is always 64 bits, and exposed as `float`.
We still have `real_t` which is the datatype that can change from 32 to 64
bits depending on a compile flag (not entirely working right now, but that's
the idea). It affects math related datatypes and code only.
Neither Variant nor PackedArray make use of real_t, which is only intended
for math precision, so the term is removed from there to keep only float.
2020-02-24 19:20:53 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "meshes/lightmap_texel_size", PROPERTY_HINT_RANGE, "0.001,100,0.001"), 0.1));
|
2020-02-21 11:27:48 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "skins/use_named_skins"), true));
|
2021-03-19 13:57:52 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "animation/import"), true));
|
2021-07-07 01:19:15 +02:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "animation/bake_reset_animation"), true));
|
Variant: Added 64-bit packed arrays, renamed Variant::REAL to FLOAT.
- Renames PackedIntArray to PackedInt32Array.
- Renames PackedFloatArray to PackedFloat32Array.
- Adds PackedInt64Array and PackedFloat64Array.
- Renames Variant::REAL to Variant::FLOAT for consistency.
Packed arrays are for storing large amount of data and creating stuff like
meshes, buffers. textures, etc. Forcing them to be 64 is a huge waste of
memory. That said, many users requested the ability to have 64 bits packed
arrays for their games, so this is just an optional added type.
For Variant, the float datatype is always 64 bits, and exposed as `float`.
We still have `real_t` which is the datatype that can change from 32 to 64
bits depending on a compile flag (not entirely working right now, but that's
the idea). It affects math related datatypes and code only.
Neither Variant nor PackedArray make use of real_t, which is only intended
for math precision, so the term is removed from there to keep only float.
2020-02-24 19:20:53 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "animation/fps", PROPERTY_HINT_RANGE, "1,120,1"), 15));
|
2021-03-19 13:57:52 +01:00
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "import_script/path", PROPERTY_HINT_FILE, script_ext_hint), ""));
|
|
|
|
|
|
|
|
r_options->push_back(ImportOption(PropertyInfo(Variant::DICTIONARY, "_subresources", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), Dictionary()));
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
2017-02-05 00:31:15 +01:00
|
|
|
|
2017-07-23 23:48:05 +02:00
|
|
|
void ResourceImporterScene::_replace_owner(Node *p_node, Node *p_scene, Node *p_new_owner) {
|
|
|
|
if (p_node != p_new_owner && p_node->get_owner() == p_scene) {
|
|
|
|
p_node->set_owner(p_new_owner);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < p_node->get_child_count(); i++) {
|
|
|
|
Node *n = p_node->get_child(i);
|
|
|
|
_replace_owner(n, p_scene, p_new_owner);
|
|
|
|
}
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
2017-12-09 18:11:26 +01:00
|
|
|
Node *ResourceImporterScene::import_scene_from_other_importer(EditorSceneImporter *p_exception, const String &p_path, uint32_t p_flags, int p_bake_fps) {
|
2017-12-07 19:44:20 +01:00
|
|
|
Ref<EditorSceneImporter> importer;
|
|
|
|
String ext = p_path.get_extension().to_lower();
|
|
|
|
|
2020-03-17 07:33:00 +01:00
|
|
|
for (Set<Ref<EditorSceneImporter>>::Element *E = importers.front(); E; E = E->next()) {
|
2020-05-14 16:41:43 +02:00
|
|
|
if (E->get().ptr() == p_exception) {
|
2017-12-07 19:44:20 +01:00
|
|
|
continue;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-12-07 19:44:20 +01:00
|
|
|
List<String> extensions;
|
|
|
|
E->get()->get_extensions(&extensions);
|
|
|
|
|
2021-07-24 15:46:25 +02:00
|
|
|
for (const String &F : extensions) {
|
2021-07-16 05:45:57 +02:00
|
|
|
if (F.to_lower() == ext) {
|
|
|
|
importer = E;
|
2017-12-07 19:44:20 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-14 16:41:43 +02:00
|
|
|
if (importer.is_valid()) {
|
2017-12-07 19:44:20 +01:00
|
|
|
break;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
2020-04-02 01:20:12 +02:00
|
|
|
ERR_FAIL_COND_V(!importer.is_valid(), nullptr);
|
2017-12-07 19:44:20 +01:00
|
|
|
|
|
|
|
List<String> missing;
|
|
|
|
Error err;
|
2017-12-09 18:11:26 +01:00
|
|
|
return importer->import_scene(p_path, p_flags, p_bake_fps, &missing, &err);
|
2017-12-07 19:44:20 +01:00
|
|
|
}
|
|
|
|
|
2017-12-09 18:11:26 +01:00
|
|
|
Ref<Animation> ResourceImporterScene::import_animation_from_other_importer(EditorSceneImporter *p_exception, const String &p_path, uint32_t p_flags, int p_bake_fps) {
|
|
|
|
Ref<EditorSceneImporter> importer;
|
|
|
|
String ext = p_path.get_extension().to_lower();
|
2017-12-07 19:44:20 +01:00
|
|
|
|
2020-03-17 07:33:00 +01:00
|
|
|
for (Set<Ref<EditorSceneImporter>>::Element *E = importers.front(); E; E = E->next()) {
|
2020-05-14 16:41:43 +02:00
|
|
|
if (E->get().ptr() == p_exception) {
|
2017-12-09 18:11:26 +01:00
|
|
|
continue;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-12-09 18:11:26 +01:00
|
|
|
List<String> extensions;
|
|
|
|
E->get()->get_extensions(&extensions);
|
2017-12-07 19:44:20 +01:00
|
|
|
|
2021-07-24 15:46:25 +02:00
|
|
|
for (const String &F : extensions) {
|
2021-07-16 05:45:57 +02:00
|
|
|
if (F.to_lower() == ext) {
|
|
|
|
importer = E;
|
2017-12-09 18:11:26 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2017-12-07 19:44:20 +01:00
|
|
|
|
2020-05-14 16:41:43 +02:00
|
|
|
if (importer.is_valid()) {
|
2017-12-09 18:11:26 +01:00
|
|
|
break;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-12-09 18:11:26 +01:00
|
|
|
}
|
2017-12-07 19:44:20 +01:00
|
|
|
|
2020-04-02 01:20:12 +02:00
|
|
|
ERR_FAIL_COND_V(!importer.is_valid(), nullptr);
|
2017-12-07 19:44:20 +01:00
|
|
|
|
2017-12-09 18:11:26 +01:00
|
|
|
return importer->import_animation(p_path, p_flags, p_bake_fps);
|
2017-07-23 23:48:05 +02:00
|
|
|
}
|
|
|
|
|
2021-04-25 23:36:39 +02:00
|
|
|
void ResourceImporterScene::_generate_meshes(Node *p_node, const Dictionary &p_mesh_data, bool p_generate_lods, bool p_create_shadow_meshes, LightBakeMode p_light_bake_mode, float p_lightmap_texel_size, const Vector<uint8_t> &p_src_lightmap_cache, Vector<Vector<uint8_t>> &r_lightmap_caches) {
|
2020-12-21 16:39:32 +01:00
|
|
|
EditorSceneImporterMeshNode3D *src_mesh_node = Object::cast_to<EditorSceneImporterMeshNode3D>(p_node);
|
|
|
|
if (src_mesh_node) {
|
2020-12-12 13:06:59 +01:00
|
|
|
//is mesh
|
|
|
|
MeshInstance3D *mesh_node = memnew(MeshInstance3D);
|
2020-12-21 16:39:32 +01:00
|
|
|
mesh_node->set_name(src_mesh_node->get_name());
|
|
|
|
mesh_node->set_transform(src_mesh_node->get_transform());
|
|
|
|
mesh_node->set_skin(src_mesh_node->get_skin());
|
|
|
|
mesh_node->set_skeleton_path(src_mesh_node->get_skeleton_path());
|
|
|
|
if (src_mesh_node->get_mesh().is_valid()) {
|
|
|
|
Ref<ArrayMesh> mesh;
|
|
|
|
if (!src_mesh_node->get_mesh()->has_mesh()) {
|
|
|
|
//do mesh processing
|
2021-03-19 13:57:52 +01:00
|
|
|
|
|
|
|
bool generate_lods = p_generate_lods;
|
|
|
|
bool create_shadow_meshes = p_create_shadow_meshes;
|
|
|
|
bool bake_lightmaps = p_light_bake_mode == LIGHT_BAKE_STATIC_LIGHTMAPS;
|
|
|
|
String save_to_file;
|
|
|
|
|
|
|
|
String mesh_id;
|
|
|
|
|
|
|
|
if (src_mesh_node->get_mesh()->has_meta("import_id")) {
|
|
|
|
mesh_id = src_mesh_node->get_mesh()->get_meta("import_id");
|
|
|
|
} else {
|
|
|
|
mesh_id = src_mesh_node->get_mesh()->get_name();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mesh_id != String() && p_mesh_data.has(mesh_id)) {
|
|
|
|
Dictionary mesh_settings = p_mesh_data[mesh_id];
|
|
|
|
|
|
|
|
if (mesh_settings.has("generate/shadow_meshes")) {
|
|
|
|
int shadow_meshes = mesh_settings["generate/shadow_meshes"];
|
|
|
|
if (shadow_meshes == MESH_OVERRIDE_ENABLE) {
|
|
|
|
create_shadow_meshes = true;
|
|
|
|
} else if (shadow_meshes == MESH_OVERRIDE_DISABLE) {
|
|
|
|
create_shadow_meshes = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mesh_settings.has("generate/lightmap_uv")) {
|
|
|
|
int lightmap_uv = mesh_settings["generate/lightmap_uv"];
|
|
|
|
if (lightmap_uv == MESH_OVERRIDE_ENABLE) {
|
|
|
|
bake_lightmaps = true;
|
|
|
|
} else if (lightmap_uv == MESH_OVERRIDE_DISABLE) {
|
|
|
|
bake_lightmaps = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mesh_settings.has("generate/lods")) {
|
|
|
|
int lods = mesh_settings["generate/lods"];
|
|
|
|
if (lods == MESH_OVERRIDE_ENABLE) {
|
|
|
|
generate_lods = true;
|
|
|
|
} else if (lods == MESH_OVERRIDE_DISABLE) {
|
|
|
|
generate_lods = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mesh_settings.has("save_to_file/enabled") && bool(mesh_settings["save_to_file/enabled"]) && mesh_settings.has("save_to_file/path")) {
|
|
|
|
save_to_file = mesh_settings["save_to_file/path"];
|
|
|
|
if (!save_to_file.is_resource_file()) {
|
|
|
|
save_to_file = "";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (generate_lods) {
|
2020-12-21 16:39:32 +01:00
|
|
|
src_mesh_node->get_mesh()->generate_lods();
|
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
if (create_shadow_meshes) {
|
2021-01-25 16:20:11 +01:00
|
|
|
src_mesh_node->get_mesh()->create_shadow_mesh();
|
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
|
|
|
|
if (bake_lightmaps) {
|
2020-10-17 07:08:21 +02:00
|
|
|
Transform3D xf;
|
2021-03-19 13:57:52 +01:00
|
|
|
Node3D *n = src_mesh_node;
|
|
|
|
while (n) {
|
|
|
|
xf = n->get_transform() * xf;
|
2021-06-09 13:06:38 +02:00
|
|
|
n = n->get_parent_node_3d();
|
2021-03-19 13:57:52 +01:00
|
|
|
}
|
|
|
|
|
2021-04-25 23:36:39 +02:00
|
|
|
Vector<uint8_t> lightmap_cache;
|
|
|
|
src_mesh_node->get_mesh()->lightmap_unwrap_cached(xf, p_lightmap_texel_size, p_src_lightmap_cache, lightmap_cache);
|
|
|
|
|
|
|
|
if (!lightmap_cache.is_empty()) {
|
|
|
|
if (r_lightmap_caches.is_empty()) {
|
|
|
|
r_lightmap_caches.push_back(lightmap_cache);
|
|
|
|
} else {
|
|
|
|
String new_md5 = String::md5(lightmap_cache.ptr()); // MD5 is stored at the beginning of the cache data
|
|
|
|
|
|
|
|
for (int i = 0; i < r_lightmap_caches.size(); i++) {
|
|
|
|
String md5 = String::md5(r_lightmap_caches[i].ptr());
|
|
|
|
if (new_md5 < md5) {
|
|
|
|
r_lightmap_caches.insert(i, lightmap_cache);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (new_md5 == md5) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (save_to_file != String()) {
|
|
|
|
Ref<Mesh> existing = Ref<Resource>(ResourceCache::get(save_to_file));
|
|
|
|
if (existing.is_valid()) {
|
|
|
|
//if somehow an existing one is useful, create
|
|
|
|
existing->reset_state();
|
|
|
|
}
|
|
|
|
mesh = src_mesh_node->get_mesh()->get_mesh(existing);
|
|
|
|
|
|
|
|
ResourceSaver::save(save_to_file, mesh); //override
|
|
|
|
|
|
|
|
mesh->set_path(save_to_file, true); //takeover existing, if needed
|
|
|
|
|
|
|
|
} else {
|
|
|
|
mesh = src_mesh_node->get_mesh()->get_mesh();
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
mesh = src_mesh_node->get_mesh()->get_mesh();
|
2020-12-21 16:39:32 +01:00
|
|
|
}
|
2021-01-25 16:20:11 +01:00
|
|
|
|
2020-12-21 16:39:32 +01:00
|
|
|
if (mesh.is_valid()) {
|
|
|
|
mesh_node->set_mesh(mesh);
|
|
|
|
for (int i = 0; i < mesh->get_surface_count(); i++) {
|
2021-04-14 05:45:16 +02:00
|
|
|
mesh_node->set_surface_override_material(i, src_mesh_node->get_surface_material(i));
|
2020-12-21 16:39:32 +01:00
|
|
|
}
|
2020-12-17 19:56:59 +01:00
|
|
|
}
|
2020-12-12 13:06:59 +01:00
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
|
|
|
|
switch (p_light_bake_mode) {
|
|
|
|
case LIGHT_BAKE_DISABLED: {
|
|
|
|
mesh_node->set_gi_mode(GeometryInstance3D::GI_MODE_DISABLED);
|
|
|
|
} break;
|
|
|
|
case LIGHT_BAKE_DYNAMIC: {
|
|
|
|
mesh_node->set_gi_mode(GeometryInstance3D::GI_MODE_DYNAMIC);
|
|
|
|
} break;
|
|
|
|
case LIGHT_BAKE_STATIC:
|
|
|
|
case LIGHT_BAKE_STATIC_LIGHTMAPS: {
|
|
|
|
mesh_node->set_gi_mode(GeometryInstance3D::GI_MODE_BAKED);
|
|
|
|
} break;
|
|
|
|
}
|
|
|
|
|
2020-12-12 13:06:59 +01:00
|
|
|
p_node->replace_by(mesh_node);
|
|
|
|
memdelete(p_node);
|
|
|
|
p_node = mesh_node;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < p_node->get_child_count(); i++) {
|
2021-04-25 23:36:39 +02:00
|
|
|
_generate_meshes(p_node->get_child(i), p_mesh_data, p_generate_lods, p_create_shadow_meshes, p_light_bake_mode, p_lightmap_texel_size, p_src_lightmap_cache, r_lightmap_caches);
|
2020-12-12 13:06:59 +01:00
|
|
|
}
|
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
void ResourceImporterScene::_add_shapes(Node *p_node, const Vector<Ref<Shape3D>> &p_shapes) {
|
2021-07-16 05:45:57 +02:00
|
|
|
for (const Ref<Shape3D> &E : p_shapes) {
|
2021-03-23 08:08:06 +01:00
|
|
|
CollisionShape3D *cshape = memnew(CollisionShape3D);
|
2021-07-16 05:45:57 +02:00
|
|
|
cshape->set_shape(E);
|
2021-03-23 08:08:06 +01:00
|
|
|
p_node->add_child(cshape);
|
|
|
|
|
|
|
|
cshape->set_owner(p_node->get_owner());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
Node *ResourceImporterScene::pre_import(const String &p_source_file) {
|
|
|
|
Ref<EditorSceneImporter> importer;
|
|
|
|
String ext = p_source_file.get_extension().to_lower();
|
|
|
|
|
|
|
|
EditorProgress progress("pre-import", TTR("Pre-Import Scene"), 0);
|
|
|
|
progress.step(TTR("Importing Scene..."), 0);
|
|
|
|
|
|
|
|
for (Set<Ref<EditorSceneImporter>>::Element *E = importers.front(); E; E = E->next()) {
|
|
|
|
List<String> extensions;
|
|
|
|
E->get()->get_extensions(&extensions);
|
|
|
|
|
2021-07-24 20:30:43 +02:00
|
|
|
for (const String &F : extensions) {
|
2021-07-16 05:45:57 +02:00
|
|
|
if (F.to_lower() == ext) {
|
2021-07-24 20:30:43 +02:00
|
|
|
importer = E->get();
|
2021-03-19 13:57:52 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (importer.is_valid()) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ERR_FAIL_COND_V(!importer.is_valid(), nullptr);
|
|
|
|
|
2021-03-24 00:46:22 +01:00
|
|
|
Error err = OK;
|
2021-03-19 13:57:52 +01:00
|
|
|
Node *scene = importer->import_scene(p_source_file, EditorSceneImporter::IMPORT_ANIMATION | EditorSceneImporter::IMPORT_GENERATE_TANGENT_ARRAYS, 15, nullptr, &err);
|
|
|
|
if (!scene || err != OK) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> collision_map;
|
2021-03-19 13:57:52 +01:00
|
|
|
|
|
|
|
_pre_fix_node(scene, scene, collision_map);
|
|
|
|
|
|
|
|
return scene;
|
|
|
|
}
|
|
|
|
|
2019-02-26 22:43:37 +01:00
|
|
|
Error ResourceImporterScene::import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) {
|
2019-06-26 15:08:25 +02:00
|
|
|
const String &src_path = p_source_file;
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
Ref<EditorSceneImporter> importer;
|
2017-03-05 16:44:50 +01:00
|
|
|
String ext = src_path.get_extension().to_lower();
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
EditorProgress progress("import", TTR("Import Scene"), 104);
|
2018-04-22 19:36:01 +02:00
|
|
|
progress.step(TTR("Importing Scene..."), 0);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2020-03-17 07:33:00 +01:00
|
|
|
for (Set<Ref<EditorSceneImporter>>::Element *E = importers.front(); E; E = E->next()) {
|
2017-02-04 13:48:04 +01:00
|
|
|
List<String> extensions;
|
|
|
|
E->get()->get_extensions(&extensions);
|
|
|
|
|
2021-07-24 20:30:43 +02:00
|
|
|
for (const String &F : extensions) {
|
2021-07-16 05:45:57 +02:00
|
|
|
if (F.to_lower() == ext) {
|
2021-07-24 20:30:43 +02:00
|
|
|
importer = E->get();
|
2017-02-04 13:48:04 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-14 16:41:43 +02:00
|
|
|
if (importer.is_valid()) {
|
2017-02-04 13:48:04 +01:00
|
|
|
break;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
ERR_FAIL_COND_V(!importer.is_valid(), ERR_FILE_UNRECOGNIZED);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
float fps = p_options["animation/fps"];
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
int import_flags = 0;
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2020-05-14 16:41:43 +02:00
|
|
|
if (bool(p_options["animation/import"])) {
|
2017-03-05 16:44:50 +01:00
|
|
|
import_flags |= EditorSceneImporter::IMPORT_ANIMATION;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2020-05-14 16:41:43 +02:00
|
|
|
if (bool(p_options["skins/use_named_skins"])) {
|
2020-02-21 11:27:48 +01:00
|
|
|
import_flags |= EditorSceneImporter::IMPORT_USE_NAMED_SKIN_BINDS;
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2020-02-21 11:27:48 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
bool ensure_tangents = p_options["meshes/ensure_tangents"];
|
|
|
|
if (ensure_tangents) {
|
|
|
|
import_flags |= EditorSceneImporter::IMPORT_GENERATE_TANGENT_ARRAYS;
|
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
Error err = OK;
|
2017-02-04 13:48:04 +01:00
|
|
|
List<String> missing_deps; // for now, not much will be done with this
|
2017-03-05 16:44:50 +01:00
|
|
|
Node *scene = importer->import_scene(src_path, import_flags, fps, &missing_deps, &err);
|
|
|
|
if (!scene || err != OK) {
|
2017-02-04 13:48:04 +01:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
Dictionary subresources = p_options["_subresources"];
|
|
|
|
|
|
|
|
Dictionary node_data;
|
|
|
|
if (subresources.has("nodes")) {
|
|
|
|
node_data = subresources["nodes"];
|
|
|
|
}
|
|
|
|
|
|
|
|
Dictionary material_data;
|
|
|
|
if (subresources.has("materials")) {
|
|
|
|
material_data = subresources["materials"];
|
|
|
|
}
|
|
|
|
|
|
|
|
Dictionary animation_data;
|
|
|
|
if (subresources.has("animations")) {
|
|
|
|
animation_data = subresources["animations"];
|
|
|
|
}
|
|
|
|
|
|
|
|
Set<Ref<EditorSceneImporterMesh>> scanned_meshes;
|
Improve collision generation usability in the new 3D scene import workflow.
With this PR it's possible to add a collision during the Mesh import, directly in editor.
To generate the shape is possible to chose between the following options:
- Decompose Convex: The Mesh is decomposed in one or many Convex Shapes (Using the VHACD library).
- Simple Convex: Is generated a convex shape that enclose the entire mesh.
- Trimesh: Generate a trimesh shape using the Mesh faces.
- Box: Add a primitive box shape, where you can tweak the `size`, `position`, `rotation`.
- Sphere: Add a primitive sphere shape, where you can tweak the `radius`, `position`, `rotation`.
- Cylinder: Add a primitive cylinder shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
- Capsule: Add a primitive capsule shape, where you can tweak the `height`, `radius`, `position`, `rotation`.
It's also possible to chose the generated body, so you can create:
- Rigid Body
- Static Body
- Area
2021-08-22 18:19:13 +02:00
|
|
|
Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> collision_map;
|
2021-03-19 13:57:52 +01:00
|
|
|
|
|
|
|
_pre_fix_node(scene, scene, collision_map);
|
|
|
|
_post_fix_node(scene, scene, collision_map, scanned_meshes, node_data, material_data, animation_data, fps);
|
2021-07-07 01:19:15 +02:00
|
|
|
bool use_bake_reset_animation = p_options["animation/bake_reset_animation"];
|
|
|
|
if (use_bake_reset_animation) {
|
|
|
|
BakeReset bake_reset;
|
|
|
|
bake_reset._bake_animation_pose(scene, "RESET");
|
|
|
|
}
|
2021-03-19 13:57:52 +01:00
|
|
|
|
2017-02-04 13:48:04 +01:00
|
|
|
String root_type = p_options["nodes/root_type"];
|
2019-01-30 05:07:56 +01:00
|
|
|
root_type = root_type.split(" ")[0]; // full root_type is "ClassName (filename.gd)" for a script global class.
|
|
|
|
|
2020-04-02 01:20:12 +02:00
|
|
|
Ref<Script> root_script = nullptr;
|
2019-01-30 05:07:56 +01:00
|
|
|
if (ScriptServer::is_global_class(root_type)) {
|
|
|
|
root_script = ResourceLoader::load(ScriptServer::get_global_class_path(root_type));
|
|
|
|
root_type = ScriptServer::get_global_class_base(root_type);
|
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2020-03-26 22:49:16 +01:00
|
|
|
if (root_type != "Node3D") {
|
2021-06-18 00:03:09 +02:00
|
|
|
Node *base_node = Object::cast_to<Node>(ClassDB::instantiate(root_type));
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
if (base_node) {
|
|
|
|
scene->replace_by(base_node);
|
|
|
|
memdelete(scene);
|
2017-03-05 16:44:50 +01:00
|
|
|
scene = base_node;
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-30 05:07:56 +01:00
|
|
|
if (root_script.is_valid()) {
|
|
|
|
scene->set_script(Variant(root_script));
|
|
|
|
}
|
|
|
|
|
2020-05-01 14:34:23 +02:00
|
|
|
float root_scale = 1.0;
|
2020-03-26 22:49:16 +01:00
|
|
|
if (Object::cast_to<Node3D>(scene)) {
|
2020-05-01 14:34:23 +02:00
|
|
|
root_scale = p_options["nodes/root_scale"];
|
2020-03-26 22:49:16 +01:00
|
|
|
Object::cast_to<Node3D>(scene)->scale(Vector3(root_scale, root_scale, root_scale));
|
2017-12-17 19:47:50 +01:00
|
|
|
}
|
|
|
|
|
2020-05-14 16:41:43 +02:00
|
|
|
if (p_options["nodes/root_name"] != "Scene Root") {
|
2019-04-08 18:43:55 +02:00
|
|
|
scene->set_name(p_options["nodes/root_name"]);
|
2020-05-14 16:41:43 +02:00
|
|
|
} else {
|
2019-04-08 18:43:55 +02:00
|
|
|
scene->set_name(p_save_path.get_file().get_basename());
|
2020-05-14 16:41:43 +02:00
|
|
|
}
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2020-12-17 19:56:59 +01:00
|
|
|
bool gen_lods = bool(p_options["meshes/generate_lods"]);
|
2021-01-25 16:20:11 +01:00
|
|
|
bool create_shadow_meshes = bool(p_options["meshes/create_shadow_meshes"]);
|
2017-11-25 05:29:15 +01:00
|
|
|
int light_bake_mode = p_options["meshes/light_baking"];
|
2021-03-19 13:57:52 +01:00
|
|
|
float texel_size = p_options["meshes/lightmap_texel_size"];
|
|
|
|
float lightmap_texel_size = MAX(0.001, texel_size);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
Vector<uint8_t> src_lightmap_cache;
|
2021-04-25 23:36:39 +02:00
|
|
|
Vector<Vector<uint8_t>> mesh_lightmap_caches;
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
{
|
2021-03-19 13:57:52 +01:00
|
|
|
src_lightmap_cache = FileAccess::get_file_as_array(p_source_file + ".unwrap_cache", &err);
|
|
|
|
if (err != OK) {
|
|
|
|
src_lightmap_cache.clear();
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
Dictionary mesh_data;
|
|
|
|
if (subresources.has("meshes")) {
|
|
|
|
mesh_data = subresources["meshes"];
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
2021-04-25 23:36:39 +02:00
|
|
|
_generate_meshes(scene, mesh_data, gen_lods, create_shadow_meshes, LightBakeMode(light_bake_mode), lightmap_texel_size, src_lightmap_cache, mesh_lightmap_caches);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-04-25 23:36:39 +02:00
|
|
|
if (mesh_lightmap_caches.size()) {
|
2021-03-19 13:57:52 +01:00
|
|
|
FileAccessRef f = FileAccess::open(p_source_file + ".unwrap_cache", FileAccess::WRITE);
|
|
|
|
if (f) {
|
2021-04-25 23:36:39 +02:00
|
|
|
f->store_32(mesh_lightmap_caches.size());
|
|
|
|
for (int i = 0; i < mesh_lightmap_caches.size(); i++) {
|
|
|
|
String md5 = String::md5(mesh_lightmap_caches[i].ptr());
|
|
|
|
f->store_buffer(mesh_lightmap_caches[i].ptr(), mesh_lightmap_caches[i].size());
|
2020-04-22 15:34:00 +02:00
|
|
|
}
|
2021-04-25 23:36:39 +02:00
|
|
|
f->close();
|
2017-12-09 18:11:26 +01:00
|
|
|
}
|
|
|
|
}
|
2021-04-25 23:36:39 +02:00
|
|
|
err = OK;
|
2017-02-05 00:31:15 +01:00
|
|
|
|
2018-04-22 19:36:01 +02:00
|
|
|
progress.step(TTR("Running Custom Script..."), 2);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
String post_import_script_path = p_options["import_script/path"];
|
2017-03-05 16:44:50 +01:00
|
|
|
Ref<EditorScenePostImport> post_import_script;
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
if (post_import_script_path != "") {
|
2017-02-04 13:48:04 +01:00
|
|
|
Ref<Script> scr = ResourceLoader::load(post_import_script_path);
|
|
|
|
if (!scr.is_valid()) {
|
2017-03-05 16:44:50 +01:00
|
|
|
EditorNode::add_io_error(TTR("Couldn't load post-import script:") + " " + post_import_script_path);
|
2017-02-04 13:48:04 +01:00
|
|
|
} else {
|
2017-03-05 16:44:50 +01:00
|
|
|
post_import_script = Ref<EditorScenePostImport>(memnew(EditorScenePostImport));
|
2020-02-13 20:03:10 +01:00
|
|
|
post_import_script->set_script(scr);
|
2017-02-04 13:48:04 +01:00
|
|
|
if (!post_import_script->get_script_instance()) {
|
2017-03-05 16:44:50 +01:00
|
|
|
EditorNode::add_io_error(TTR("Invalid/broken script for post-import (check console):") + " " + post_import_script_path);
|
2017-02-04 13:48:04 +01:00
|
|
|
post_import_script.unref();
|
|
|
|
return ERR_CANT_CREATE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (post_import_script.is_valid()) {
|
2021-03-19 13:57:52 +01:00
|
|
|
post_import_script->init(p_source_file);
|
2017-02-04 13:48:04 +01:00
|
|
|
scene = post_import_script->post_import(scene);
|
|
|
|
if (!scene) {
|
2020-05-11 21:09:36 +02:00
|
|
|
EditorNode::add_io_error(
|
|
|
|
TTR("Error running post-import script:") + " " + post_import_script_path + "\n" +
|
2021-05-15 23:48:59 +02:00
|
|
|
TTR("Did you return a Node-derived object in the `_post_import()` method?"));
|
2017-02-04 13:48:04 +01:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-22 19:36:01 +02:00
|
|
|
progress.step(TTR("Saving..."), 104);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
Ref<PackedScene> packer = memnew(PackedScene);
|
2017-02-04 13:48:04 +01:00
|
|
|
packer->pack(scene);
|
2018-08-24 09:35:07 +02:00
|
|
|
print_verbose("Saving scene to: " + p_save_path + ".scn");
|
2017-03-05 16:44:50 +01:00
|
|
|
err = ResourceSaver::save(p_save_path + ".scn", packer); //do not take over, let the changed files reload themselves
|
2019-09-25 10:28:50 +02:00
|
|
|
ERR_FAIL_COND_V_MSG(err != OK, err, "Cannot save scene to file '" + p_save_path + ".scn'.");
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
memdelete(scene);
|
|
|
|
|
2017-08-31 23:57:03 +02:00
|
|
|
//this is not the time to reimport, wait until import process is done, import file is saved, etc.
|
|
|
|
//EditorNode::get_singleton()->reload_scene(p_source_file);
|
2017-02-04 13:48:04 +01:00
|
|
|
|
|
|
|
return OK;
|
|
|
|
}
|
|
|
|
|
2020-04-02 01:20:12 +02:00
|
|
|
ResourceImporterScene *ResourceImporterScene::singleton = nullptr;
|
2017-02-04 13:48:04 +01:00
|
|
|
|
2021-03-19 13:57:52 +01:00
|
|
|
bool ResourceImporterScene::ResourceImporterScene::has_advanced_options() const {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
void ResourceImporterScene::ResourceImporterScene::show_advanced_options(const String &p_path) {
|
|
|
|
SceneImportSettings::get_singleton()->open_settings(p_path);
|
|
|
|
}
|
|
|
|
|
2017-03-05 16:44:50 +01:00
|
|
|
ResourceImporterScene::ResourceImporterScene() {
|
|
|
|
singleton = this;
|
2017-02-04 13:48:04 +01:00
|
|
|
}
|
2020-05-14 14:29:06 +02:00
|
|
|
|
2018-01-30 15:03:46 +01:00
|
|
|
///////////////////////////////////////
|
|
|
|
|
|
|
|
uint32_t EditorSceneImporterESCN::get_import_flags() const {
|
|
|
|
return IMPORT_SCENE;
|
|
|
|
}
|
2020-05-14 14:29:06 +02:00
|
|
|
|
2018-01-30 15:03:46 +01:00
|
|
|
void EditorSceneImporterESCN::get_extensions(List<String> *r_extensions) const {
|
|
|
|
r_extensions->push_back("escn");
|
|
|
|
}
|
2020-05-14 14:29:06 +02:00
|
|
|
|
2018-01-30 15:03:46 +01:00
|
|
|
Node *EditorSceneImporterESCN::import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err) {
|
|
|
|
Error error;
|
|
|
|
Ref<PackedScene> ps = ResourceFormatLoaderText::singleton->load(p_path, p_path, &error);
|
2020-04-02 01:20:12 +02:00
|
|
|
ERR_FAIL_COND_V_MSG(!ps.is_valid(), nullptr, "Cannot load scene as text resource from path '" + p_path + "'.");
|
2018-01-30 15:03:46 +01:00
|
|
|
|
2021-06-18 00:03:09 +02:00
|
|
|
Node *scene = ps->instantiate();
|
2020-04-02 01:20:12 +02:00
|
|
|
ERR_FAIL_COND_V(!scene, nullptr);
|
2018-01-30 15:03:46 +01:00
|
|
|
|
|
|
|
return scene;
|
|
|
|
}
|
2020-05-14 14:29:06 +02:00
|
|
|
|
2018-01-30 15:03:46 +01:00
|
|
|
Ref<Animation> EditorSceneImporterESCN::import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps) {
|
|
|
|
ERR_FAIL_V(Ref<Animation>());
|
|
|
|
}
|