From fb8df96bb316a2379834e05a5f90c5845a9491e4 Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 25 Dec 2019 19:49:01 +0100 Subject: [PATCH] Removed accidentally committed files. --- meshes/editor_import_collada_mdr.cpp | 142 --------------------------- meshes/editor_import_collada_mdr.h | 47 --------- meshes/editor_plugin_collada_mdr.cpp | 22 ----- meshes/editor_plugin_collada_mdr.h | 25 ----- meshes/mesh_data_resource.cpp | 20 ---- meshes/mesh_data_resource.h | 26 ----- 6 files changed, 282 deletions(-) delete mode 100644 meshes/editor_import_collada_mdr.cpp delete mode 100644 meshes/editor_import_collada_mdr.h delete mode 100644 meshes/editor_plugin_collada_mdr.cpp delete mode 100644 meshes/editor_plugin_collada_mdr.h delete mode 100644 meshes/mesh_data_resource.cpp delete mode 100644 meshes/mesh_data_resource.h diff --git a/meshes/editor_import_collada_mdr.cpp b/meshes/editor_import_collada_mdr.cpp deleted file mode 100644 index cf247c7..0000000 --- a/meshes/editor_import_collada_mdr.cpp +++ /dev/null @@ -1,142 +0,0 @@ -#include "editor_import_collada_mdr.h" - -String EditorImportColladaMdr::get_importer_name() const { - return "collada_mdr"; -} - -String EditorImportColladaMdr::get_visible_name() const { - return "Collada MDR"; -} - -void EditorImportColladaMdr::get_recognized_extensions(List *p_extensions) const { - p_extensions->push_back("dae"); -} - -String EditorImportColladaMdr::get_save_extension() const { - return "res"; -} - -String EditorImportColladaMdr::get_resource_type() const { - return "MeshDataResource"; -} - -float EditorImportColladaMdr::get_priority() const { - return 1.0; -} - -int EditorImportColladaMdr::get_preset_count() const { - return 0; -} - -String EditorImportColladaMdr::get_preset_name(int p_idx) const { - return ""; -} - -void EditorImportColladaMdr::get_import_options(List *r_options, int p_preset) const { - r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "offset"), Vector3(0, 0, 0))); - r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "rotation"), Vector3(0, 0, -(3.141592 / 2.0)))); - r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "scale"), Vector3(0.011, 0.011, 0.011))); -} - -bool EditorImportColladaMdr::get_option_visibility(const String &p_option, const Map &p_options) const { - return true; -} - -Error EditorImportColladaMdr::import(const String &p_source_file, const String &p_save_path, const Map &p_options, List *r_platform_variants, List *r_gen_files, Variant *r_metadata) { - Node *n = _importer->import_scene(p_source_file, 0, 15); - - if (n == NULL) { - n->queue_delete(); - return Error::ERR_PARSE_ERROR; - } - - for (int i = 0; i < n->get_child_count(); ++i) { - Node *c = n->get_child(i); - print_error(String::num(i)); - - if (c == NULL) { - continue; - } - - if (Object::cast_to(c)) { - MeshInstance *mi = Object::cast_to(c); - - Ref mesh = mi->get_mesh(); - - if (mesh.is_valid()) { - Ref mdr; - mdr.instance(); - - Array arrays = mesh->surface_get_arrays(0); - - mdr->set_array(apply_transforms(arrays, p_options)); - - n->queue_delete(); - - return ResourceSaver::save(p_save_path + "." + get_save_extension(), mdr); - } - } - } - - n->queue_delete(); - return Error::ERR_PARSE_ERROR; -} - - -Array EditorImportColladaMdr::apply_transforms(Array &array, const Map &p_options) { - Vector3 offset = p_options["offset"]; - Vector3 rotation = p_options["rotation"]; - Vector3 scale = p_options["scale"]; - - Transform transform = Transform(Basis(rotation).scaled(scale), offset); - - Array verts = array.get(Mesh::ARRAY_VERTEX); - - for (int i = 0; i < verts.size(); ++i) { - Vector3 vert = verts[i]; - - vert = transform.xform(vert); - - verts.set(i, (vert)); - } - - Array normals = array.get(Mesh::ARRAY_NORMAL); - - for (int i = 0; i < normals.size(); ++i) { - Vector3 normal = normals[i]; - - normal = transform.basis.xform(normal); - - normals.set(i, normal); - } - - Array tangents = array.get(Mesh::ARRAY_TANGENT); - - if (tangents.size() == verts.size() * 4) { - - for (int i = 0; i < verts.size(); ++i) { - - Plane p(tangents[i * 4 + 0], tangents[i * 4 + 1], tangents[i * 4 + 2], tangents[i * 4 + 3]); - - Vector3 tangent = p.normal; - - tangent = transform.basis.xform(tangent); - - tangents.set(i, tangent); - } - } - - array.set(Mesh::ARRAY_VERTEX, verts); - array.set(Mesh::ARRAY_NORMAL, normals); - array.set(Mesh::ARRAY_TANGENT, tangents); - - return array; -} - -EditorImportColladaMdr::EditorImportColladaMdr() { - _importer.instance(); -} - -EditorImportColladaMdr::~EditorImportColladaMdr() { - _importer.unref(); -} diff --git a/meshes/editor_import_collada_mdr.h b/meshes/editor_import_collada_mdr.h deleted file mode 100644 index 86ab48f..0000000 --- a/meshes/editor_import_collada_mdr.h +++ /dev/null @@ -1,47 +0,0 @@ - -#ifndef EDITOR_IMPORT_COLLADA_MDR -#define EDITOR_IMPORT_COLLADA_MDR - -#include "editor/import/editor_import_plugin.h" -#include "core/ustring.h" -#include "scene/main/node.h" -#include "scene/resources/mesh.h" -#include "scene/3d/mesh_instance.h" -#include "core/io/resource_saver.h" -#include "core/array.h" -#include "core/math/basis.h" -#include "core/math/transform.h" - -#include "mesh_data_resource.h" -#include "editor/import/editor_import_collada.h" - -class EditorImportColladaMdr : public EditorImportPlugin { - - GDCLASS(EditorImportColladaMdr, EditorImportPlugin); - -public: - virtual String get_importer_name() const; - virtual String get_visible_name() const; - virtual void get_recognized_extensions(List *p_extensions) const; - virtual String get_save_extension() const; - virtual String get_resource_type() const; - virtual float get_priority() const; - - virtual int get_preset_count() const; - virtual String get_preset_name(int p_idx) const; - - virtual void get_import_options(List *r_options, int p_preset = 0) const; - virtual bool get_option_visibility(const String &p_option, const Map &p_options) const; - - virtual Error import(const String &p_source_file, const String &p_save_path, const Map &p_options, List *r_platform_variants, List *r_gen_files = NULL, Variant *r_metadata = NULL); - - Array apply_transforms(Array &array, const Map &p_options); - - EditorImportColladaMdr(); - ~EditorImportColladaMdr(); - -private: - Ref _importer; -}; - -#endif diff --git a/meshes/editor_plugin_collada_mdr.cpp b/meshes/editor_plugin_collada_mdr.cpp deleted file mode 100644 index 50ace10..0000000 --- a/meshes/editor_plugin_collada_mdr.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "editor_plugin_collada_mdr.h" - -void EditorPluginColladaMdr::_notification(int p_what) { - switch (p_what) { - case NOTIFICATION_ENTER_TREE: - _importer.instance(); - - add_import_plugin(_importer); - - break; - case NOTIFICATION_EXIT_TREE: - remove_import_plugin(_importer); - - _importer.unref(); - - break; - } -} - -EditorPluginColladaMdr::EditorPluginColladaMdr(EditorNode *node) { - _node = node; -} diff --git a/meshes/editor_plugin_collada_mdr.h b/meshes/editor_plugin_collada_mdr.h deleted file mode 100644 index 4aff12e..0000000 --- a/meshes/editor_plugin_collada_mdr.h +++ /dev/null @@ -1,25 +0,0 @@ - -#ifndef EDITOR_PLUGIN_COLLADA_MDR -#define EDITOR_PLUGIN_COLLADA_MDR - -#include "editor/editor_plugin.h" -#include "core/ustring.h" - -#include "editor_import_collada_mdr.h" - -class EditorPluginColladaMdr : public EditorPlugin { - - GDCLASS(EditorPluginColladaMdr, EditorPlugin); - -public: - EditorPluginColladaMdr(EditorNode *node); - -protected: - void _notification(int p_what); - -private: - EditorNode *_node; - Ref _importer; -}; - -#endif diff --git a/meshes/mesh_data_resource.cpp b/meshes/mesh_data_resource.cpp deleted file mode 100644 index 81a1ea3..0000000 --- a/meshes/mesh_data_resource.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "mesh_data_resource.h" - -Array MeshDataResource::get_array() { - return _arrays; -} -void MeshDataResource::set_array(const Array &p_arrays) { - _arrays.clear(); - - _arrays = p_arrays.duplicate(true); -} - -MeshDataResource::MeshDataResource() { - -} - -void MeshDataResource::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_array"), &MeshDataResource::get_array); - ClassDB::bind_method(D_METHOD("set_array", "array"), &MeshDataResource::set_array); - ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "array"), "set_array", "get_array"); -} diff --git a/meshes/mesh_data_resource.h b/meshes/mesh_data_resource.h deleted file mode 100644 index cd6194b..0000000 --- a/meshes/mesh_data_resource.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef MESH_DATA_REOURCE_H -#define MESH_DATA_REOURCE_H - -#include "core/resource.h" -#include "core/array.h" -#include "scene/resources/mesh.h" - -class MeshDataResource : public Resource { - - GDCLASS(MeshDataResource, Resource); - RES_BASE_EXTENSION("mdres"); - -public: - Array get_array(); - void set_array(const Array &p_arrays); - - MeshDataResource(); - -protected: - static void _bind_methods(); - -private: - Array _arrays; -}; - -#endif