Commit Graph

6445 Commits

Author SHA1 Message Date
Kim Kulling
9c8e6f2127 Fix overflow by face allocation. 2018-09-26 20:52:59 +02:00
Kim Kulling
07362fdd35 Merge branch 'kimmi_dev' of https://github.com/assimp/assimp into kimmi_dev 2018-09-25 20:16:28 +02:00
Kim Kulling
6146ff818c Enable coveralls for export tests. 2018-09-25 20:15:48 +02:00
Kim Kulling
72aa49c54f Merge branch 'master' into kimmi_dev 2018-09-22 15:52:22 +02:00
Kim Kulling
9f6238f3af INtroduce unittests. 2018-09-22 15:50:40 +02:00
Kim Kulling
7865f82082 Merge pull request #1863 from aoowweenn/umw_dev
Some fixes for MMD PMX file
2018-09-22 14:15:25 +02:00
Kim Kulling
56392cc02f Update MMDPmxParser.cpp
Fix encoding for readstrings.
2018-09-22 12:50:23 +02:00
Kim Kulling
d42f9a3226 Update MMDImporter.cpp
Reformattings
2018-09-22 12:46:38 +02:00
Kim Kulling
02c4b7f1bc Merge branch 'master' into umw_dev 2018-09-22 10:24:09 +02:00
Kim Kulling
0b77ebbb3e Merge pull request #1925 from wuxq/fix_gltf2_export_componentType_error
multi joint has bug  with ReplaceData
2018-09-22 10:22:45 +02:00
Kim Kulling
cc0b3e1249 Merge branch 'master' into fix_gltf2_export_componentType_error 2018-09-22 07:54:10 +02:00
Kim Kulling
d585030310 Merge pull request #2151 from assimp/kimmi_dev
Kimmi dev
2018-09-21 21:37:52 +02:00
Kim Kulling
24b42274fb Update MDCFileData.h
Fix build by remove not supported initializer for array.
2018-09-21 20:13:35 +02:00
Kim Kulling
3a38c2c067 Update MDLFileData.h
Remove not supported array initialization.
2018-09-21 19:43:19 +02:00
Kim Kulling
e129d88825 Update ASEParser.h
Fix not supported array initialization.
2018-09-21 19:26:41 +02:00
Kim Kulling
2017e50e7b Update AMFImporter_Node.hpp
Fix invalid array initialization.
2018-09-21 18:59:47 +02:00
Kim Kulling
abfc8fd048 Update texture.h
Fix array init for older compilers.
2018-09-21 18:51:45 +02:00
Kim Kulling
662f7086e3 Update types.h
Fix VS2013: array initialization does not work.
2018-09-21 18:46:30 +02:00
kimkulling
f75bf6d99c MAke noexcept compiler-specific. 2018-09-21 16:25:27 +02:00
kimkulling
bf1c002b5d Add missing file. 2018-09-21 16:09:24 +02:00
kimkulling
b7e7c748ad Introduce COB-import test. 2018-09-21 16:07:43 +02:00
kimkulling
f818a909e5 Fix static-code-analysis findings. 2018-09-21 16:07:09 +02:00
Kim Kulling
0795ebda46 Merge pull request #2092 from assimp/kimkulling-build-instructions
Create Build.md
2018-09-20 00:22:08 +02:00
Kim Kulling
62416122d4 Merge branch 'master' into kimkulling-build-instructions 2018-09-18 20:40:56 +02:00
Kim Kulling
a4aa7e45ef Merge pull request #2143 from turol/strict-aliasing
Disable strict aliasing optimization
2018-09-18 20:40:32 +02:00
Kim Kulling
0a1cffc1fb Merge branch 'master' into strict-aliasing 2018-09-18 18:45:35 +02:00
Kim Kulling
14a5b4854e Merge pull request #2141 from vjf/pyassimp-update2
Updated all of struct.py to be in sync with assimp header files
2018-09-18 18:45:12 +02:00
Turo Lamminen
78fe96f8c4 Prepend our compiler flags instead of appending so overriding them works better 2018-09-18 11:08:01 +03:00
Turo Lamminen
6488bc6387 Disable strict aliasing optimizations
The code is not clean w.r.t the strict aliasing rules.
In particular LWS importer breaks with GCC >= 6.0 if this is enabled.
2018-09-18 11:08:01 +03:00
Kim Kulling
c39fd47745 Merge branch 'master' into pyassimp-update2 2018-09-17 21:57:13 +02:00
Kim Kulling
6329bf66bb Merge pull request #2134 from LoicFr/master
FBX import: fix import of direct data by vertices + unify node renaming
2018-09-17 21:50:14 +02:00
Kim Kulling
29496d877e Merge branch 'master' into master 2018-09-17 19:58:11 +02:00
Kim Kulling
e4509b8780 Merge pull request #2142 from assimp/issue_212
closes https://github.com/assimp/assimp/issues/212: introduce unittes…
2018-09-17 19:57:54 +02:00
Kim Kulling
7150024b27 Add missing test-files. 2018-09-17 18:48:14 +02:00
Kim Kulling
6ee9b07c49 closes https://github.com/assimp/assimp/issues/212: introduce unittest for line-splitter, will validate that the current behaviour is correct. 2018-09-16 17:13:34 +02:00
Vincent Fazio
0adc032f69 Updated to be in sync with assimp header files 2018-09-14 13:09:44 +10:00
Kim Kulling
4e357d1ff4 Merge branch 'master' into master 2018-09-13 20:04:41 +02:00
Kim Kulling
4f03960c88 Merge pull request #2140 from turol/fix_blend_files
Fix blend test files
2018-09-13 20:04:19 +02:00
Turo Lamminen
b20ab96a43 Fix blend test files 2018-09-13 13:44:31 +03:00
Kim Kulling
0066f3dafe Merge pull request #2128 from assimp/assbin_test
Assbin: add unittest.
2018-09-12 21:55:47 +02:00
FRICOTEAUX
d5de32ec1c FBX import: fix import of direct data by vertices + unify node renaming 2018-09-11 16:07:43 +02:00
Kim Kulling
c1ed5e0048 Merge branch 'master' into assbin_test 2018-09-11 11:14:50 +02:00
Kim Kulling
ab5c100fd4 Update utAssbinImportExport.cpp
Fix unittests when no export is configured.
2018-09-11 09:43:38 +02:00
Kim Kulling
afd47d5ab6 Update AssbinLoader.cpp
Fix memory leak,
2018-09-11 09:12:28 +02:00
Kim Kulling
081365df48 Introduce simple export test for assbin. 2018-09-10 22:42:24 +02:00
Kim Kulling
07a8bac415 Merge pull request #2132 from turol/remove_default_material
Remove aiCreateAndRegisterDefaultMaterial
2018-09-10 20:26:26 +02:00
Turo Lamminen
4ff52c98bb Add unit test for two independent importers loading STL models 2018-09-10 16:43:27 +03:00
Turo Lamminen
c3d8464a37 Remove aiCreateAndRegisterDefaultMaterial, it's completely wrong 2018-09-10 16:41:12 +03:00
Kim Kulling
c25a2dfc22 Assbin: add unittest. 2018-09-08 19:15:56 +02:00
Kim Kulling
a7c13eef2c Merge pull request #2122 from loebl/bug/wrong-color-import-in-3mf
Correct 3MF displaycolor import
2018-09-05 17:04:02 +02:00