Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,389 Commits 19 Branches 43 Tags
00a2cd20f9fc4e78b6cfcac81bd9ef2e2f3d150f
Commit Graph

5601 Commits

Author SHA1 Message Date
Kim Kulling
2438e1b52e Merge branch 'master' into gltf2_fix_skin_recursion 2020-05-18 09:05:28 +02:00
Kim Kulling
4b0a3305b1 Merge branch 'master' into master 2020-05-17 13:54:10 +02:00
Kim Kulling
4f24b3dac2 Merge branch 'added_check_before_using' of https://github.com/qarmin/assimp into qarmin-added_check_before_using 2020-05-17 11:48:24 +02:00
Kim Kulling
cfbdacb02a Merge branch 'master' into bug-3201-collada_root_meshes 2020-05-16 20:50:34 +02:00
Yingying Wang
b8e39b58d1 clean up 2020-05-15 12:32:58 -07:00
Yingying Wang
f6720271cb sparce accessor exporter 2020-05-15 12:20:31 -07:00
Malcolm Tyrrell
d70685d37f Fix typo 2020-05-15 17:50:48 +01:00
Malcolm Tyrrell
90cdbd9d9a Fix ups 2020-05-15 17:46:50 +01:00
Malcolm Tyrrell
434c5e3d37 More verbose logging 2020-05-15 17:29:49 +01:00
Malcolm Tyrrell
e11d78596f Use verbose debug logging in certain places 2020-05-15 17:26:17 +01:00
Malcolm Tyrrell
5e0136d737 Add concept of verboseDebug 2020-05-15 17:23:07 +01:00
Malcolm Tyrrell
2ffd1cb8db nits 2020-05-15 17:22:15 +01:00
Malcolm Tyrrell
bcca3a0d79 No need for bespoke macros 2020-05-15 17:22:02 +01:00
Malcolm Tyrrell
6be0ce1ec9 Initial pass at adding logging 2020-05-15 17:21:45 +01:00
Matias Kangasjärvelä
7a16a7a7e4 Fix infinite recursion in gltf2 skin parsing 
Previously parsing a node caused the skin that was attached to it
to be parsed, which caused the skins node joints to be parsed,
which could cause the skin to be re-parsed leading to infinite or
at the very least exponential recursion.

The fix is to just get a reference to a temporarily uninitialized
skin as they were being parsed after the scene graph just to be safe
anyway. This way we avoid the recursion problem and all the references
will be valid in the end.
 2020-05-15 16:48:41 +03:00
kimkulling
464d4cf99a Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master 2020-05-15 15:08:30 +02:00
kimkulling
246ec2b0dc Merge branch 'migenius-fix-ortho' of https://github.com/migenius/assimp into migenius-migenius-fix-ortho 2020-05-15 13:37:03 +02:00
kimkulling
a6b5abd698 Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master 2020-05-15 08:51:46 +02:00
Kim Kulling
2571b47a28 Merge branch 'master' into bug-3177-dae-geo-id 2020-05-13 20:24:53 +02:00
Yingying Wang
e9b67cdb89 gltf2 import sparse accessor 2020-05-11 14:34:35 -07:00
Jeremy Cytryn
c3a21666da Make gltf2 export normal normalization safe 
This avoids introducing NaNs e.g. when the input mesh has 0-length normals
 2020-05-11 12:02:38 -07:00
Jeremy Cytryn
c5a9fbd47f Gracefully handle NaNs and Infs in gltf2 accessor bound computation 2020-05-11 12:02:38 -07:00
Jeremy Cytryn
aef4ecada5 Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated 
This can happen currently for example if NaNs are introduced in accessor bounds as rapidjson cannot write NaN/inf floats (see subsequent commit for fix there) and will halt writing to buffer at this point.  Fix here ensures that whenever anything like this happens we throw an exception so this ends up as a registered export failure case, rather than silently exporting the incomplete JSON
 2020-05-11 12:02:38 -07:00
hoshiryu
3fdcd0861f Fix fbx rotation ; 2020-05-11 10:28:05 +02:00
kimkulling
a1bcca2c99 remove step prototype: does not work this way. 2020-05-07 14:00:40 +02:00
Kim Kulling
89a865ce19 Merge branch 'master' into master 2020-05-06 22:07:39 +02:00
Sercan Degirmenci
201347700f fix incorrect header path on framework build 2020-05-06 16:15:23 +03:00
Yingying Wang
60e8146b9f fix wrong target idx when importing 2020-05-05 12:51:40 -07:00
RichardTea
56a4e61533 Collada: Don't copy the scene when exporting 
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
 2020-05-05 10:16:13 +01:00
RichardTea
6e447b2c44 Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes 2020-05-05 09:52:08 +01:00
RichardTea
d1ae6ac77a Fix typo in <visual_scene> 
Swapped Id and Name
 2020-05-05 09:51:41 +01:00
RichardTea
fa1d2f09db Merge branch 'master' into bug-3177-dae-geo-id 2020-05-05 09:33:48 +01:00
Kim Kulling
ddee1b1ddb Merge branch 'master' into aaronfranke-file-formatting 2020-05-05 10:21:46 +02:00
kkulling
4e16716924 Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting 2020-05-05 10:17:52 +02:00
Kim Kulling
bf95d1da7c fix conversion 2020-05-04 21:48:46 +02:00
RichardTea
8e73984a11 Collada Root Nodes aren't allowed to have meshes 
Create a null parent node instead
 2020-05-04 17:47:09 +01:00
RichardTea
6e200cb0d3 Merge branch 'master' into bug-3177-dae-geo-id 
Impossible merge, have discarded upstream
 2020-05-04 13:59:09 +01:00
RichardTea
ea917bd4ae Move Collada into AssetLib folder 
Should make the merge easier
 2020-05-04 13:54:49 +01:00
Kim Kulling
91fa9a102b closes https://github.com/assimp/assimp/issues/3181: fix typo for light type. 2020-05-03 12:17:32 +02:00
Kim Kulling
3b06f57150 add missing inclde + 2020-05-02 21:11:47 +02:00
Kim Kulling
514593548d add assert-test for nullptr. 2020-05-02 21:07:41 +02:00
Kim Kulling
3329e76263 closes https://github.com/assimp/assimp/issues/3178: throw exception in case of invalid export stream. 2020-05-02 21:06:55 +02:00
Kim Kulling
f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02:00
Trevor David Black
a0aa067b5f Moved Texture writing into its own function 2020-05-01 08:35:04 -07:00
RichardTea
1dabb1a094 Collada: Fix crash with AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES 
Add unit test for this
 2020-05-01 14:59:09 +01:00
RichardTea
3e2dd186d1 Merge branch 'master' into bug-3177-dae-geo-id 2020-05-01 12:08:12 +01:00
RichardTea
5b9f207f1f ColladaExporter cleanup 
Namespace, NULL and includes
 2020-05-01 11:54:34 +01:00
RichardTea
ee16d2c4c9 Fix camera, light and bone unique ids 
Bones don't have a unit test yet
 2020-05-01 11:13:38 +01:00
Trevor David Black
2c9d3bea64 Printing out unique textures 2020-04-30 14:01:09 -07:00
RichardTea
083ebdbc2e Collada Export: More unique Ids 
Nodes, Materials, Animations, Lights, Cameras, Bones
 2020-04-30 18:28:06 +01:00