Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,114 Commits 19 Branches 43 Tags
82f3d40d600aa98285c1348f8f7fd1c12495787c
Commit Graph

3503 Commits

Author SHA1 Message Date
gstanlo
82f3d40d60 Fixes crash when importing invalid glTF/2.0 files 
Skips some glTF/2.0 uv processing if the count of uvs in the attribute stream doesn't match the vertex count.

This happens with some malformed glTF/2.0 files, and the change will allow them to be processed properly.
Without the change, an access violation will occur several lines below if uv count is less than the position count.
 2018-08-17 13:49:01 -07:00
Kim Kulling
1883d44b9b Merge branch 'master' into master 2018-05-29 19:02:40 +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
Kim Kulling
f93ee9dace closes https://github.com/assimp/assimp/issues/1780: check against nullptr before accessing normal data in aiMesh instance. 2018-05-12 08:10:26 +02:00
Kim Kulling
ef605fecaa FBX: small optimization to avoind static computation in loop. 2018-05-12 08:09:27 +02:00
Kim Kulling
c08614bbff closes https://github.com/assimp/assimp/issues/919: add missing cast for vs2015. 2018-05-10 09:44:31 +02:00
Diego Lopes
700c85bbfb _stat64 doesn't seem to exist. use __stat64! 
Merely add an extra _ to the type name...
 2018-05-08 13:01:56 -04:00
Kim Kulling
f92d4edced Merge branch 'master' into patch-1 2018-05-08 10:22:14 +02:00
Kim Kulling
948cf4d3cc Merge branch 'master' into master 2018-05-07 21:32:13 +02:00
A. Breust
50c5f3cb58 Fixes DXF loader false positive on FBX file 
A binary FBX file can have an header section `FBXHeaderVersion` which starts around the 70th byte.
Therefore, the token check for DXF file was hitting true because the `SearchFileHeaderForToken` is case insensitive.
We limit the scope of the token search to the first 32 bytes.
 2018-05-07 15:16:32 +02:00
Kim Kulling
be0203229b Merge branch 'master' into master 2018-05-06 16:41:12 +02:00
Kim Kulling
36c6ce7431 Merge branch 'master' into master 2018-05-06 12:29:21 +02:00
Eugene Barnett
908ef3e44a 1740 Issue - Enabling and Disabling importers 
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT will be respected by the macro
--using local variable ASSIMP_IMPORTER_ENABLED to include or exclude
--an importer
-Fixes individual importer ex: set(ASSIMP_BUILD_FBX_IMPORTER OFF)

-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT is cached
--if assimp is a child cmake project, need to force cache
--from parent project
--ex: set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT CACHE INTERNAL FALSE)
 2018-05-05 16:57:59 -04:00
Nicholas Woodfield
458a7ae801 Silencing compile warnings during build, all little stuff like uint to size_t or BOOL to bool. 2018-05-03 15:03:14 -04:00
Kim Kulling
b759aa63a0 Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2 2018-05-03 20:33:50 +02:00
Alexis Breust
4aaf7ad547 Added name to nodes 2018-05-03 11:07:39 +02:00
LoicFr
a5791b66fe Merge branch 'master' into master 2018-05-02 17:47:32 +02:00
LoicFr
99139e9c9e Merge branch 'master' into master 2018-05-02 17:11:54 +02:00
kimkulling
a0bf664695 closes code/SortByPTypeProcess.cpp: fix memory leak. 2018-05-02 16:42:22 +02:00
Loïc Fricoteaux
ed86023016 Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the exporter so that it matches the importer and respect the standard specifications 2018-05-02 16:13:17 +02:00
Kim Kulling
2acb513732 Merge branch 'master' into issue-1167 2018-05-02 15:45:52 +02:00
Kim Kulling
7bb2d6271b Merge branch 'master' into fix_fbx_empty_names 2018-05-02 14:57:08 +02:00
Kim Kulling
5c5226a98c Merge branch 'master' into issue-1923 2018-05-01 21:10:52 +02:00
Kim Kulling
037a213bb4 STL-Exporter: fix division by zero in normalize method during update 2018-05-01 15:06:56 +02:00
Kim Kulling
eced86b949 some refactorings. 2018-05-01 13:41:39 +02:00
Kim Kulling
2c47717ca6 Introduce export with test for point clouds. 2018-05-01 13:28:53 +02:00
Kim Kulling
9f835ea843 closes https://github.com/assimp/assimp/issues/842: experimental suppor for ascii stl pointcloud export. 2018-05-01 09:06:22 +02:00
Korbinian Würl
4b7b692e5e Fix Issue #1923: OBJ Exporter can't correctly export vertex colors 
The indexMap for vertices now uses a combined vp + vc index
 2018-04-30 16:29:22 +02:00
Trylz
6fb9ebe3c8 Apply fix 2018-04-28 23:34:07 -04:00