Commit Graph

5118 Commits (80ba6d10f7c71cbe2669291b24753681f1f38ab3)

Author SHA1 Message Date
Kim Kulling 80ba6d10f7
Merge pull request #1567 from assimp/fix_android_build
CMake: use define for D_FILE_OFFSET_BITS only for not-android systems.
2017-11-14 21:41:40 +01:00
Kim Kulling c15c96ac76 CMake: use define for D_FILE_OFFSET_BITS only for not-android systems. 2017-11-14 20:11:40 +01:00
Kim Kulling 98a1b7671d
Merge pull request #1558 from assimp/issue_216
closes https://github.com/assimp/assimp/issues/216: check the area of…
2017-11-12 22:42:56 +01:00
Kim Kulling 24b728b3ea FindDegeneratives: adapt unittests and add configs 2017-11-12 22:09:18 +01:00
Kim Kulling 9206d1b62b Merge branch 'master' into issue_216 2017-11-12 11:04:51 +01:00
Kim Kulling b2b671d8ad
Merge pull request #1563 from assimp/fix_buggy_excape_sequence
fix buggy escape sequence.
2017-11-12 11:04:04 +01:00
Kim Kulling d0ac06cbfd fix buggy escape sequence. 2017-11-11 21:16:26 +01:00
Kim Kulling 9756b48bca
Merge pull request #1560 from assimp/source_groups_for_ut
unittests: add VS-based source groups for the unittests.
2017-11-10 21:26:32 +01:00
Kim Kulling 005b537324 unittests: add VS-based source groups for the unittests. 2017-11-10 20:40:00 +01:00
Kim Kulling 248e26ca03
Merge pull request #1557 from Matter-and-Form/gltf2-mesh-export-fix
Fix export of deleted meshes; Add LazyDict::Remove method
2017-11-10 19:37:23 +01:00
Kim Kulling de1ec4ee5d
Merge branch 'master' into gltf2-mesh-export-fix 2017-11-10 19:07:46 +01:00
Kim Kulling f0bed87e07
Merge pull request #1559 from luzpaz/misc-typos
Misc. typos
2017-11-10 10:39:09 +01:00
Unknown 12dbbd4ce9 Misc. typos
Some are doxy comments, some are just trivial source comment typos. 
Found using `codespell -q 3 --skip="./contrib" -I ../assimp-whitelist.txt`
whereby whitelist contained:
```
childs
iff
lod
nto
ot
whitespaces
```
2017-11-09 17:19:26 -05:00
Kim Kulling ad2ff9fd71 check for area test if the face is a triangle. 2017-11-09 21:40:10 +01:00
Kim Kulling 30e06f7437 closes https://github.com/assimp/assimp/issues/216: check the area of a triangle to check if its degenerated or not. 2017-11-09 21:31:16 +01:00
Daniel Hritzkiv 9ec117d0bc
Fix export of deleted meshes; Add LazyDict::Remove method
When I was merging a node’s multiple meshes into that node’s first mesh’s primitives, I was deleting the merged meshes from the node.

However, I wasn’t deleting the merged meshes from the mAsset->meshes Dict, causing the gltf2 export to contain extra unreferenced meshes and duplicate primitives.

This new code adds a new method to LazyDict, which removes the object from it, taking care to update indexes of the subsequent objects. This change also requires that `Ref`s of `Mesh`es (stored in node->meshes) have their indexes updated.
2017-11-08 18:31:32 -05:00
Kim Kulling 9a13bf236f
Merge pull request #1556 from assimp/issue_1292
closes https://github.com/assimp/assimp/issues/1292: export class sub…
2017-11-08 23:52:50 +01:00
Kim Kulling 5bc4e73727
Merge branch 'master' into issue_1292 2017-11-08 22:52:46 +01:00
Kim Kulling bd104bda3b
Merge pull request #1555 from assimp/issue_1315
closes https://github.com/assimp/assimp/issues/1315: check in exporti…
2017-11-08 22:52:32 +01:00
Kim Kulling ab639a71ae
Merge branch 'master' into issue_1315 2017-11-08 21:09:02 +01:00
Kim Kulling 36475bf868 closes https://github.com/assimp/assimp/issues/1292: export class subdivision 2017-11-08 20:50:16 +01:00
Kim Kulling cdfd4b9702 closes https://github.com/assimp/assimp/issues/1315: check in exporting against out-of-bounds-access . 2017-11-08 20:44:53 +01:00
Kim Kulling 191454671d
Merge pull request #1511 from eevictor/master
[Collada] export <library_animations> tag
2017-11-08 19:07:28 +01:00
Kim Kulling 6954c7d75b
Merge branch 'master' into master 2017-11-08 18:34:25 +01:00
Kim Kulling fe55bc9996
Update ColladaExporter.cpp
fix build
2017-11-08 18:34:16 +01:00
Kim Kulling c11a93e73c
Merge pull request #1552 from assimp/issue_1251
closes https://github.com/assimp/assimp/issues/1251: use correct look…
2017-11-08 09:13:27 +01:00
Kim Kulling 6b826fecfd
Merge branch 'master' into issue_1251 2017-11-08 01:07:35 +01:00
Kim Kulling f41ed2f41f closes https://github.com/assimp/assimp/issues/1251: use correct lookup for utf32. 2017-11-08 01:07:04 +01:00
Kim Kulling 792523ce90
Merge pull request #1551 from larsjsol/md2_fix
Fix MD2 frames containing garbage
2017-11-08 00:27:48 +01:00
Kim Kulling 29cf414468
Merge branch 'master' into md2_fix 2017-11-07 22:03:02 +01:00
Kim Kulling a88a23ac7c
Merge pull request #1549 from assimp/issue_104
Issue 104
2017-11-07 13:10:44 +01:00
Kim Kulling 75fdd25b6b
Merge branch 'master' into issue_104 2017-11-07 11:27:06 +01:00
Kim Kulling da7ce89ff2
Update STLLoader.cpp
add missing const.
2017-11-07 10:47:27 +01:00
Kim Kulling b87e7643d2
Update STLLoader.cpp
Fix memory-alignment bug.
2017-11-07 10:42:51 +01:00
Kim Kulling 4ff2592747
Update STLLoader.h
Fixed a typo.
2017-11-07 00:31:09 +01:00
Kim Kulling 26171a7949 SLD: add test model and a unit test. 2017-11-06 22:37:52 +01:00
Kim Kulling 9a9f18bbed closes https://github.com/assimp/assimp/issues/104: deal with more solids in one STL file. 2017-11-06 22:30:07 +01:00
Kim Kulling 10a6524300
Merge pull request #1545 from assimp/issue_213
closes https://github.com/assimp/assimp/issues/213: log an error inst…
2017-11-06 00:44:50 +01:00
Kim Kulling a77d9d7b21
Merge branch 'master' into issue_213 2017-11-05 23:07:08 +01:00
Kim Kulling e09349c734
Merge pull request #1544 from assimp/issue_1526
closes https://github.com/assimp/assimp/issues/1526: use correct incl…
2017-11-05 23:05:46 +01:00
Kim Kulling 4a4f3fddc7 closes https://github.com/assimp/assimp/issues/213: log an error instead of letting the fbx-importer crash. 2017-11-05 22:52:07 +01:00
Kim Kulling 6b04b20869 closes https://github.com/assimp/assimp/issues/1526: use correct include folder for assimp. 2017-11-05 22:41:41 +01:00
Kim Kulling b0e86d281b
Merge pull request #1543 from assimp/issue_1533
closes https://github.com/assimp/assimp/issues/1533:
2017-11-05 19:31:47 +01:00
Kim Kulling 5922200ec3
Merge branch 'master' into issue_1533 2017-11-05 18:53:43 +01:00
Kim Kulling 9835d28f72
Merge pull request #1542 from assimp/UnitTest_X3D
add unittest for x3d-importer.
2017-11-05 18:53:28 +01:00
Kim Kulling f43586305c closes https://github.com/assimp/assimp/issues/1533: put irrXML onto exclucde list for doxygen run. 2017-11-05 18:24:39 +01:00
Kim Kulling ab3cf3687c
Merge branch 'master' into UnitTest_X3D 2017-11-05 18:10:10 +01:00
Kim Kulling 770f531cc6 X3D-Importer: add missing file. 2017-11-05 17:46:25 +01:00
Kim Kulling 2929a27edc add unittest for x3d-importer. 2017-11-05 17:41:26 +01:00
Kim Kulling 1e9919ce81
Merge pull request #1541 from assimp/issue_1351
closes https://github.com/assimp/assimp/issues/1351: use correct name…
2017-11-05 17:18:11 +01:00