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

3530 Commits (e3bfd0844556bd89d887650a5c50da3ef0d9ee64)

Author SHA1 Message Date
Max Vollmer 0b02b92701 Some FBX files have Null/LimbNode attributes with an empty Properties70 element, where the Element is not NULL, but it's Compound is. The code only checked if the Element itself is NULL, thus causing a DeadlyImportError when trying to instantiate a PropertyTable for an Element that doesn't have a Compound. 2018-06-15 15:46:38 +02:00
Kim Kulling a8236f2986
Merge branch 'master' into master 2018-06-12 22:10:54 +02:00
Kim Kulling 5f3aa142b4
Merge branch 'master' into master 2018-06-12 11:40:40 +02:00
CwTCwT 9415380b4c usage of dynamic_cast instead of static_cast 2018-06-10 10:35:15 +02:00
CwTCwT 7db668e66f prevent zero sized array allocations 2018-06-09 23:36:42 +02:00
CwTCwT 959c0e8907 reworked to ElemBase * 2018-06-09 23:29:50 +02:00
CwTCwT 5b4b16f360 use of malloc and free (given to shared ptr) for correct mem management 2018-06-09 21:25:59 +02:00
CwTCwT 9d2a1ca047 rereworked suggested by clang 2018-06-09 21:12:05 +02:00
CwTCwT 19fade2164 travis changes according clang 5.0 2018-06-09 20:57:32 +02:00
CwTCwT 09825d8d03 again travis hit me 2018-06-09 20:42:02 +02:00
CwTCwT 96bc2d3146 changes according travis compiles 2018-06-09 20:22:59 +02:00
CwTCwT 2c2b76a2bb changes according travis build 2018-06-09 16:47:05 +02:00
CwTCwT b8facc5dae changed to coding convention 2018-06-09 15:56:26 +02:00
CwTCwT 85b0026c92 issue_1973 
added support for CustomData(Layer) to support multiple (texture) UV mappings
added unittest with sample model
 2018-06-09 15:45:09 +02:00
Sebastian Maisch fbdb4b17fd Merge branch 'force_generate_normals' 
# solved Conflicts:
#	code/GenFaceNormalsProcess.cpp
#	code/GenVertexNormalsProcess.cpp
 2018-06-04 10:51:12 +02:00
Kim Kulling a2a7877939
Merge branch 'master' into make_tools 2018-06-04 09:12:11 +02:00
microm8 87315883b5
Merge branch 'master' into master 2018-06-04 08:17:50 +02:00
Sebastian Maisch f15dcf7663 Added forced generation of normals with extra flag. 2018-06-01 17:32:02 +02:00
microm8 9064c983ad
Merge branch 'master' into master 2018-06-01 13:42:35 +02:00
Turo Lamminen b0b6048502 LWOMaterial: Fix strict aliasing violations 2018-06-01 12:37:21 +03:00
Turo Lamminen 6788d7b18b 3DS: Fix strict aliasing violations 2018-06-01 12:28:33 +03:00
Turo Lamminen bbb60c29f0 Fix strict aliasing violation in MaterialSystem 2018-06-01 12:20:16 +03:00
Michael Roer Pedersen b176513efa FBX export. to_ktime ticks was ok. 2018-06-01 09:24:53 +02:00
Kim Kulling 31e75b9d54
Update FBXConverter.cpp 
Replaces a 0 by nullptr.
 2018-05-31 20:18:17 +02:00
Michael Roer Pedersen fceeaa72f4 FBX animation export: Assimp animation time is already in seconds. Just convert to FBX time. 2018-05-31 15:07:00 +02:00
Tammo Hinrichs ffb6756d2a FBX: LayeredTextures now work with embedded texture data 2018-05-30 14:56:53 +02:00
Kim Kulling 1883d44b9b
Merge branch 'master' into master 2018-05-29 19:02:40 +02:00
Sebastian Maisch c6eda67296 Changed assimp to force regeneration of normals. 2018-05-29 13:01:11 +02:00
Kim Kulling bf7ec7d130
Merge branch 'master' into fix-vector-out-of-bound-access 2018-05-26 13:25:57 +02:00
Kim Kulling aa18e8a2a5
Update Importer.cpp 
Make check more expressive.
 2018-05-25 21:43:39 +02:00
smalcom 02d2b6e0d8 [F] Get return "like true" when error occured. 2018-05-25 21:30:59 +03:00
smalcom 5b23492421 Merge branch 'master' into qt_assimp_viewer 2018-05-25 21:20:03 +03:00
smalcom d72ff712cb [F] List of importers can be empty. 2018-05-25 21:16:08 +03:00
gstanlo 97cecc858a Properly reads in glTF/2.0 sampler address modes. 
Assimp was returning glTF/2.0 values as address modes instead of aiTextureMapModes.
Also modified text glTF/2.0 model's sampler uv address modes to mirror/clamp respectively, and tests for them in the unit test.
 2018-05-24 17:25:26 -07:00
Kim Kulling c4c22069e1
Merge branch 'master' into master 2018-05-24 14:38:50 +02:00
Matthias Möller e761f13c80 does not access undefined memory area anymore. 
This will fix some Debuggers, which throw an exception, when accessing out-of-bound memory
 2018-05-24 12:07:05 +02:00
smalcom 3861fb4ab5 Merge branch 'master' into qt_assimp_viewer 2018-05-24 12:36:59 +03:00
smalcom e201fcf4f4 [-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed. 2018-05-24 12:25:27 +03:00
gstanlo 0c07397720 glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified. 2018-05-22 17:32:12 -07:00
Adrian Mark Perez 7777883fe7 Fix GenVertexNormals 2018-05-22 13:55:36 -07:00
smalcom 8abcc454ad [F] Uninitialized variables. 2018-05-21 17:38:01 +03:00
Alexandre Avenel 84739fda0a Fix #1970: stl with empty solid 
Log warning instead of stopping whole import.
 2018-05-19 23:19:36 +02:00
Alexandre Avenel 6c0553d810 Add mesh name to ValidateDataStructure log 2018-05-19 23:19:25 +02:00
Stanlo Slasinski a1a17c1dda Read and write the KHR_materials_unlit glTF/2.0 extension. 2018-05-18 14:52:02 -07:00
Kim Kulling c788fff2b0
Merge branch 'master' into bug/exception-on-empty-mesh-after-degenerate-removal 2018-05-17 09:36:53 +02:00
Daniel Löber 9e80e18b1a Remove dead code 2018-05-16 11:10:48 +02:00
Daniel Löber 46ed73c768 Do not throw exception on empty mesh after removal of degenerates 
Remove mesh instead. This keeps one edge case open: nodes without mesh
references. They are kept as it is for now (they may stilol contain
transformations and child references).
 2018-05-16 11:06:06 +02:00
Alexandre Avenel 2879e0d6ef Fix typos on code using codespell 2018-05-13 16:35:03 +02:00
Kim Kulling e3548fe850
Update glTF2Exporter.h 
Fix typo.
 2018-05-12 08:50:17 +02:00
Kim Kulling 950496c351 some minor refactorings. 2018-05-12 08:39:22 +02:00