asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.

Browse source
This commit is contained in:
SaracenOne 2017-09-16 14:57:17 +01:00
parent 62cb43bb8d
commit a3b3886029
2 changed files with 59 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -3848,6 +3848,20 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian
continue; continue;
} }
memdelete(instanced_scene); memdelete(instanced_scene);
} else if (type == "Texture" ||
type == "ImageTexture" ||
type == "ViewportTexture" ||
type == "CurveTexture" ||
type == "GradientTexture" ||
type == "StreamTexture" ||
type == "AtlasTexture" ||
type == "LargeTexture") {
Ref<Texture> texture = ResourceLoader::load(files[i]);
if (texture.is_valid() == false) {
continue;
}
} else {
continue;
} }
can_instance = true; can_instance = true;
break; break;

57
editor/plugins/spatial_editor_plugin.cpp
View file

@ -2555,11 +2555,18 @@ void SpatialEditorViewport::_create_preview(const Vector<String> &files) const {
String path = files[i]; String path = files[i];
RES res = ResourceLoader::load(path); RES res = ResourceLoader::load(path);
Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res)); Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
if (scene != NULL) { Ref<Mesh> mesh = Ref<Mesh>(Object::cast_to<Mesh>(*res));
if (scene.is_valid()) { if (mesh != NULL || scene != NULL) {
Node *instance = scene->instance(); if (mesh != NULL) {
if (instance) { MeshInstance *mesh_instance = memnew(MeshInstance);
preview_node->add_child(instance); mesh_instance->set_mesh(mesh);
preview_node->add_child(mesh_instance);
} else {
if (scene.is_valid()) {
Node *instance = scene->instance();
if (instance) {
preview_node->add_child(instance);
}
} }
} }
editor->get_scene_root()->add_child(preview_node); editor->get_scene_root()->add_child(preview_node);
@ -2595,13 +2602,29 @@ bool SpatialEditorViewport::_cyclical_dependency_exists(const String &p_target_s
} }
bool SpatialEditorViewport::_create_instance(Node *parent, String &path, const Point2 &p_point) { bool SpatialEditorViewport::_create_instance(Node *parent, String &path, const Point2 &p_point) {
Ref<PackedScene> sdata = ResourceLoader::load(path); RES res = ResourceLoader::load(path);
if (!sdata.is_valid()) { // invalid scene
return false; Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
Ref<Mesh> mesh = Ref<Mesh>(Object::cast_to<Mesh>(*res));
Node *instanced_scene = NULL;
if (mesh != NULL || scene != NULL) {
if (mesh != NULL) {
MeshInstance *mesh_instance = memnew(MeshInstance);
mesh_instance->set_mesh(mesh);
mesh_instance->set_name(mesh->get_name());
instanced_scene = mesh_instance;
} else {
if (!scene.is_valid()) { // invalid scene
return false;
} else {
instanced_scene = scene->instance();
}
}
} }
Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE); if (instanced_scene == NULL) {
if (!instanced_scene) { // error on instancing
return false; return false;
} }
@ -2650,7 +2673,8 @@ void SpatialEditorViewport::_perform_drop_data() {
continue; continue;
} }
Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res)); Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
if (scene != NULL) { Ref<Mesh> mesh = Ref<Mesh>(Object::cast_to<Mesh>(*res));
if (mesh != NULL || scene != NULL) {
bool success = _create_instance(target_node, path, drop_pos); bool success = _create_instance(target_node, path, drop_pos);
if (!success) { if (!success) {
error_files.push_back(path); error_files.push_back(path);
@ -2683,9 +2707,11 @@ bool SpatialEditorViewport::can_drop_data_fw(const Point2 &p_point, const Varian
List<String> scene_extensions; List<String> scene_extensions;
ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions); ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions);
List<String> mesh_extensions;
ResourceLoader::get_recognized_extensions_for_type("Mesh", &mesh_extensions);
for (int i = 0; i < files.size(); i++) { for (int i = 0; i < files.size(); i++) {
if (scene_extensions.find(files[i].get_extension())) { if (mesh_extensions.find(files[i].get_extension()) || scene_extensions.find(files[i].get_extension())) {
RES res = ResourceLoader::load(files[i]); RES res = ResourceLoader::load(files[i]);
if (res.is_null()) { if (res.is_null()) {
continue; continue;
@ -2699,6 +2725,13 @@ bool SpatialEditorViewport::can_drop_data_fw(const Point2 &p_point, const Varian
continue; continue;
} }
memdelete(instanced_scene); memdelete(instanced_scene);
} else if (type == "Mesh" || "ArrayMesh" || "PrimitiveMesh") {
Ref<Mesh> mesh = ResourceLoader::load(files[i]);
if (!mesh.is_valid()) {
continue;
}
} else {
continue;
} }
can_instance = true; can_instance = true;
break; break;