Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-05-09 22:41:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Build fix on linux.

Browse Source
This commit is contained in:
Relintai 2019-07-19 20:54:57 +02:00
parent 15845efb77
commit ae3aa70f45
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
config.pyc
View File

Binary file not shown.

12
meshes/editor_import_collada_mdr.cpp
View File

@ -66,8 +66,10 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String &
if (mesh.is_valid()) {
Ref<MeshDataResource> mdr;
mdr.instance();
mdr->set_array(apply_transforms(mesh->surface_get_arrays(0), p_options));
Array arrays = mesh->surface_get_arrays(0);
mdr->set_array(apply_transforms(arrays, p_options));
n->queue_delete();
@ -82,7 +84,11 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String &
Array EditorImportColladaMdr::apply_transforms(Array &array, const Map<StringName, Variant> &p_options) {
Transform transform = Transform(Basis(p_options["rotation"]).scaled(p_options["scale"]), p_options["offset"]);
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);

3
meshes/editor_import_collada_mdr.h
View File

@ -8,6 +8,9 @@
#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"