From b9cb58897af8e4fc9526b3355528f10f3d2c19e1 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 10 Apr 2020 14:02:39 +0200 Subject: [PATCH] Clang format. --- mesh_data_resource.cpp | 1 - mesh_data_resource.h | 2 +- plugin_collada/editor_import_collada_mdr.cpp | 15 +++++++-------- plugin_collada/editor_plugin_collada_mdr.h | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/mesh_data_resource.cpp b/mesh_data_resource.cpp index 273413f..5e3eded 100644 --- a/mesh_data_resource.cpp +++ b/mesh_data_resource.cpp @@ -32,7 +32,6 @@ void MeshDataResource::set_array(const Array &p_arrays) { } MeshDataResource::MeshDataResource() { - } void MeshDataResource::_bind_methods() { diff --git a/mesh_data_resource.h b/mesh_data_resource.h index 7c375e6..22a2f14 100644 --- a/mesh_data_resource.h +++ b/mesh_data_resource.h @@ -23,8 +23,8 @@ SOFTWARE. #ifndef MESH_DATA_REOURCE_H #define MESH_DATA_REOURCE_H -#include "core/resource.h" #include "core/array.h" +#include "core/resource.h" #include "scene/resources/mesh.h" class MeshDataResource : public Resource { diff --git a/plugin_collada/editor_import_collada_mdr.cpp b/plugin_collada/editor_import_collada_mdr.cpp index a454f0a..c3304e2 100644 --- a/plugin_collada/editor_import_collada_mdr.cpp +++ b/plugin_collada/editor_import_collada_mdr.cpp @@ -88,9 +88,9 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String & if (mesh.is_valid()) { Ref mdr; mdr.instance(); - - Array arrays = mesh->surface_get_arrays(0); - + + Array arrays = mesh->surface_get_arrays(0); + mdr->set_array(apply_transforms(arrays, p_options)); n->queue_delete(); @@ -104,12 +104,11 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String & 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"]; - + 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); diff --git a/plugin_collada/editor_plugin_collada_mdr.h b/plugin_collada/editor_plugin_collada_mdr.h index 9ef8054..ad3bfd6 100644 --- a/plugin_collada/editor_plugin_collada_mdr.h +++ b/plugin_collada/editor_plugin_collada_mdr.h @@ -23,8 +23,8 @@ SOFTWARE. #ifndef EDITOR_PLUGIN_COLLADA_MDR #define EDITOR_PLUGIN_COLLADA_MDR -#include "editor/editor_plugin.h" #include "core/ustring.h" +#include "editor/editor_plugin.h" #include "editor_import_collada_mdr.h"