v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,230 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

3026 Commits (9d224f6ac59adcae3f426b44d23ff18fda39aa43)

Author SHA1 Message Date
Daniel Hritzkiv 98e98dc40c
Fix node names sharing same name 
Uses node name if it is set, and globally unique id otherwise.

This may still break in some models (glTF2 spec doesn’t guaruntee name values to be unique). However, I couldn’t cause it to break any further using gltf2 models on hand.

Closes #1600
 2017-11-29 12:20:44 -05:00
Kim Kulling 7a395e274f
Merge branch 'master' into fix/gltf2-transforms 2017-11-28 08:48:19 +01:00
Kim Kulling 8ce5985aa0
Merge branch 'master' into fix/gltf2-preserve-node-names 2017-11-28 00:50:07 +01:00
awefers 0031165789
Add support for tangents in glTF2.0 import 
Closes #1562
 2017-11-27 13:45:40 -05:00
awefers 0b04ae1d91
Preserve node names when importing glTF2.0 
Closes #1522
 2017-11-27 11:58:19 -05:00
awefers e53d4735b0
Fix transform matrices multiplication order per glTF2.0 spec 
Closes #1568
 2017-11-27 11:32:05 -05:00
Kim Kulling 623b5a515a
Merge branch 'master' into fix-typo-gltf 2017-11-25 20:11:49 +01:00
Alexandre Avenel eb452b28a2 Fix warning on MSVC14 2017-11-25 11:38:12 +01:00
Alexandre Avenel d529dd17f9 Fix warning cast double to float 2017-11-24 22:29:58 +01:00
Alexandre Avenel 273f6b0267 Fix MSVC14 warning cast double to real 2017-11-24 22:13:38 +01:00
Alexandre Avenel f80e8b39a1 Fix warning C4138: '*/' found outside of comment on MSVC14 2017-11-24 22:08:50 +01:00
Alexandre Avenel c63263b025 Fix typo on gltf2 camera parameters 2017-11-24 22:02:47 +01:00
Kim Kulling d180cfcba5
Merge branch 'master' into master 2017-11-22 16:01:16 +01:00
Kim Kulling e35f789ace
Merge branch 'master' into scene_combiner_crash 2017-11-22 13:46:14 +01:00
Kim Kulling 70d9df868d
Merge branch 'master' into patch-12 2017-11-20 22:23:47 +01:00
Kim Kulling ba3acd7459
Merge branch 'master' into patch-12 2017-11-20 19:56:14 +01:00
Patrick Dähne a05d74a281 [glTF2] Moved byteStride from accessor to bufferView 2017-11-20 19:01:28 +01:00
Kim Kulling beff88228d
Merge branch 'master' into master 2017-11-20 18:56:10 +01:00
Patrick Dähne 6cbfd5b977 [glTF2] Implemented reading binary glTF2 (glb) files 2017-11-20 14:59:05 +01:00
Mika Rautio 9f1dce8e57
Merge branch 'master' into master 2017-11-20 10:27:11 +02:00
Mika Rautio 4fb5038fb1 Add support for building Mac OS X Framework bundles 2017-11-20 00:10:05 +02:00
Kim Kulling 2a9f79f958 check for 0 properties before copy them 2017-11-19 19:05:51 +01:00
Kim Kulling 55c9761228
Merge branch 'master' into patch-12 2017-11-19 18:25:22 +01:00
Kim Kulling 9707fde709 check for nullptr dereferencing before copying scene data 2017-11-19 17:41:31 +01:00
Kim Kulling 65d6daa414
Merge branch 'master' into patch-13 2017-11-18 20:36:05 +01:00
Kim Kulling 1a1d96d3e2 Merge branch 'master' into fix_android 2017-11-18 18:32:58 +01:00
Kim Kulling a8e65a1e8a Fix android build. 2017-11-18 18:32:16 +01:00
Turo Lamminen 8ae7231654 Blender: Silence warning about uninitialized member 2017-11-18 16:50:45 +02:00
Turo Lamminen 2c8cc1f732 BlenderDNA: Silence warning about uninitialized member 2017-11-18 16:49:03 +02:00
Turo Lamminen bcffa28a33 MDLImporter: Don't take address of packed struct member 2017-11-18 16:39:43 +02:00
Turo Lamminen 1067ae4bfa FIReader: Fix strict-aliasing warnings 2017-11-18 15:54:40 +02:00
Turo Lamminen c1515db56f Blender: Fix strict-aliasing warnings 2017-11-18 15:50:56 +02:00
Giuseppe Barbieri 703d046fd9
Update ValidateDataStructure.cpp 2017-11-18 00:34:00 +01:00
Giuseppe Barbieri fc360b9cc8
Update ValidateDataStructure.h 2017-11-18 00:05:17 +01:00
Giuseppe Barbieri b428c66f39
Update ValidateDataStructure.h 2017-11-17 23:10:05 +01:00
Kim Kulling 07a99e0843
Merge branch 'master' into issue_1513 2017-11-16 17:32:34 +01:00
Giuseppe Barbieri d9965f6220
Update Importer.cpp 2017-11-16 14:42:20 +01:00
Kim Kulling 7db10022e9 closes https://github.com/assimp/assimp/issues/1513: fix assimp for cross compile for android 2017-11-15 21:26:25 +01:00
Turo Lamminen f475803f93 X3DImporter: Add assertions to silence static analyzer warnings 2017-11-15 11:45:21 +02:00
Turo Lamminen 66c18cc406 TerragenLoader: Remove unused variable 2017-11-15 11:45:21 +02:00
Turo Lamminen e47bf932e8 SIBImporter: Add assertions to silence static analyzer warnings 2017-11-15 11:45:21 +02:00
Turo Lamminen 583d3f88b8 FBX: Remove dead assignment 2017-11-15 11:45:21 +02:00
Turo Lamminen ef0af40f90 IFC: Remove dead code 2017-11-15 11:45:21 +02:00
Turo Lamminen b49a4e1338 PLY: Remove dead assignment and reduce scope of a variable 2017-11-15 11:45:21 +02:00
Turo Lamminen 97843f19d2 OpenGEX: Add assertion to silence a static analyzer warning 2017-11-15 11:45:21 +02:00
Turo Lamminen f470b8466f GLTF2: Fix signed/unsigned warning 2017-11-15 11:45:21 +02:00
Turo Lamminen f90019bc1e NFF: Add assertions to silence static analyzer warnings 2017-11-15 11:45:21 +02:00
Turo Lamminen 3f299b2a2b NFF: Split up some complicated assignments 2017-11-15 11:45:21 +02:00
Turo Lamminen d24e0d44b2 Raw: Fix misleading indentation warning 2017-11-15 11:45:21 +02:00
Turo Lamminen 2b93a210c9 NFF: Reduce scope of a variable 2017-11-15 11:45:21 +02:00