Commit Graph

891 Commits (629320a3a0b8ae742b8c1760f49f63cd698c4fa9)

Author SHA1 Message Date
Mike Samsonov 631da3a3d1
Merge branch 'master' into preserve_error_string 2019-12-02 10:35:29 +00:00
Zoltan Baldaszti 7c312f6f68
Merge branch 'master' into master 2019-11-19 01:28:11 +01:00
Mike Samsonov 80f5283b2f Error string of Importer should contain a message in case of an exception 2019-11-18 16:57:01 +00:00
bzt 301748be6a Make Clang happy 2019-11-18 15:22:15 +01:00
bzt 41ae01a6b2 Upgraded to newest SDK and improved texture import 2019-11-18 03:04:52 +01:00
Kim Kulling 74080a083a add texture-transfrm unittest. 2019-11-14 21:15:30 +01:00
Kim Kulling d29185ec7d
Merge branch 'master' into master 2019-11-03 21:22:01 +01:00
Zoltan Baldaszti dda46f5f4d
Merge branch 'master' into master 2019-11-02 01:14:04 +01:00
bzt 7d9e9aadbb Asked modifications and unit test 2019-11-01 17:21:24 +01:00
Mike Samsonov 55c2a3edb9 FBX orphant embedded textures 2019-11-01 12:29:54 +00:00
Kim Kulling be09110aa8
Merge branch 'master' into feature/easy-armature-lookup 2019-10-29 21:09:50 +01:00
bzt 0baec5f0bd Added M3D format support 2019-10-29 14:14:00 +01:00
Kim Kulling 61ea5a4ac6
Merge branch 'master' into collada_zae_textures_2710 2019-10-27 18:24:16 +01:00
RevoluPowered d7d79db0ac Tests should always debug log 2019-10-27 14:17:37 +00:00
RevoluPowered 5155efe888 Fixed bitmask issue
We are approaching the limit for the number of post processes
2019-10-27 14:16:39 +00:00
RevoluPowered 212bcfe75c Test disable cache 2019-10-27 14:16:39 +00:00
RevoluPowered 514257f587 Added unit tests for ArmaturePopulate when used (added huestos model to tests)
Added clear documentation for this too to explain, you need to enable it to make it available

Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
RevoluPowered 6ea97a1282 Updated test cases to test import of names
This now doesn't overwrite names anymore as this would cause nasty bugs application side.

We can now support these by default without having to handle them as edge cases.
2019-10-27 14:16:39 +00:00
Kim Kulling 120e97e55b
Merge branch 'master' into assimp_version_2693 2019-10-27 13:47:59 +01:00
Malcolm Tyrrell 9bc2648615
Merge branch 'master' into fix-gltf-importer-crash 2019-10-21 15:29:18 +01:00
RichardTea 17eb292d73 Tests: Fix signed/unsigned warnings 2019-10-14 14:49:57 +01:00
RichardTea f4bd11279f Update Collada ZAE tests to include encoded URIs 2019-10-14 12:25:42 +01:00
RichardTea ce5c71d2e7 Collada ZAE import must convert manifest and image paths
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML

Added more EXPECTS to the Collada tests
2019-10-11 18:57:38 +01:00
RichardTea 059ee0e091 Update assimp legal and version
Will now report the major and minor versions specified in cmakelists
2019-10-11 16:28:14 +01:00
Malcolm Tyrrell 4cde72b4e6 Add unit tests. 2019-10-08 13:05:05 +01:00
Malcolm Tyrrell 5f8f5c3292 Organize test models better. 2019-10-08 12:51:31 +01:00
Malcolm Tyrrell ce4cb39302 Make example minimal. 2019-10-08 11:46:07 +01:00
Malcolm Tyrrell 8498310fa0 A gltf v2 which exercises all the options. 2019-10-08 11:35:03 +01:00
Malcolm Tyrrell 77ebc53f1f Offset nodes. 2019-10-08 10:44:17 +01:00
Malcolm Tyrrell 1e7d1ffbc2 Add non-indexed unit test. 2019-10-08 10:34:08 +01:00
Kim Kulling ecd413c86c
Update utVersion.cpp
Fix the unittests as well.
2019-10-06 20:19:59 +02:00
Kim Kulling fed7fcf2fb
Update utFBXImporterExporter.cpp
put test in comments.
2019-09-18 14:09:48 +02:00
Kim Kulling 06542c49df
Update utFBXImporterExporter.cpp
Disable test
2019-09-18 11:50:26 +02:00
Kim Kulling 2be0eba1ab put one in comments because the file seems to be corrupt. 2019-09-14 19:32:47 +02:00
Kim Kulling ca0549558b closes https://github.com/assimp/assimp/issues/2653: introduce 2 tests to reproduce fbx-tokenize issue. 2019-09-14 10:31:35 +02:00
Kim Kulling f9c6fed190 Add a camera unittest. 2019-09-11 22:34:53 +02:00
Kim Kulling 3546403284
Merge branch 'master' into crash_in_ai_mesh_desctuctor 2019-09-06 20:45:16 +02:00
Mike Samsonov 0324643cd5 Missing model files 2019-09-05 11:44:02 +01:00
Mike Samsonov 873a358ce4 A crash in the aiMesh descructor 2019-09-05 11:44:02 +01:00
escherstair e317fbfbb6
prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:01:56 +02:00
Kim Kulling 9a78f2c6f1
Merge branch 'master' into topic/fbxNodeChainFix 2019-08-23 17:24:04 +02:00
Gordon MacPherson fbb34b1de1 ScaleProcess overhauled to improve compatibility with animations and unit conversion.
./assimp Added arguments --gs to assimp command line option to enable global scaling.

No scaling for mScale of 1.0.

Co-Authored-By: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 17:36:57 +01:00
Kim Kulling 84e9d9ddf8
Merge branch 'master' into topic/fbxNodeChainFix 2019-08-16 08:47:02 +02:00
Malcolm Tyrrell 5b81899302 Add failing test. 2019-08-09 15:24:18 +01:00
Kim Kulling 090e896ebf
Merge branch 'master' into collada_zae 2019-08-06 21:22:02 +02:00
RichardTea 361609c60b
Merge branch 'master' into test_exporter_ids 2019-07-26 22:21:16 +01:00
RichardTea 72e18ed4aa Fix Travis CI sign-compare warning
EXPECT_* triggers sign compare error with literal 0 and unsigned
Use 0u literal with size_t
2019-07-26 09:10:09 +01:00
RichardTea 7e8a3ec4cb Add unit test of valid and unique Exporter IDs, rename assjson id
"json" is a very vague exporter ID, change to "assjson"

Add a unit test to ensure all exporter have unique IDs
and that they all have an ID, description and extension
2019-07-25 13:38:49 +01:00
RichardTea 59a5343a1a Merge branch 'master' into test_gitignore_cleanup 2019-07-25 12:41:30 +01:00
RichardTea e05ece2eec Add Exporter Unit Test output to gitignore 2019-07-25 11:12:06 +01:00
Kim Kulling e828dd1757
Merge branch 'master' into collada_zae 2019-07-21 14:37:12 +02:00
Kim Kulling 78b283135e
Update utIssues.cpp
use correct test for floats.
2019-07-21 13:32:31 +02:00
Kim Kulling 41ea607739
Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
Kim Kulling ff7ec7e454
Merge branch 'master' into fix-obj-line-continuation 2019-07-20 12:07:49 +02:00
Kim Kulling f804036cf3
Update utBlenderWork.cpp
Fix compiler warning signed against unsigned.
2019-07-19 20:44:48 +02:00
kimkulling b6616e7b79 Fix another signed unsigned comparison warning. 2019-07-19 13:28:00 +02:00
kimkulling e84f961f78 change std::array<int, x > to std::array<unsigned int, x> to fix compiler warnings. 2019-07-19 13:03:08 +02:00
kimkulling 68520bff0c Fix another signed / unsigned comparison warning. 2019-07-19 11:55:12 +02:00
kimkulling 3416c04ad9 Unit: fix more compiler warnings. 2019-07-19 11:26:48 +02:00
kkulling a8019cf8d8 Unit: Fix new compiler warnings. 2019-07-19 10:38:44 +02:00
Merwan 2f6a005fb8 Add unit test for OBJ line continuations 2019-07-17 20:17:49 +02:00
kimkulling 53c0f91305 Add unittest for json. 2019-07-12 16:08:51 +02:00
RichardTea 0c718a9c95 Add Collada ZAE unit test 2019-07-12 14:56:29 +01:00
RichardTea d64e1bde13 First pass of Collada ZAE support
Reads the manifest and loads the DAE
Does not yet load embedded textures
2019-07-12 11:29:35 +01:00
kkulling b463ddd399 closes https://github.com/assimp/assimp/issues/340: start integrating assimp2json. 2019-07-11 17:37:31 +02:00
Mike Samsonov 6d07473550 all textures use relative path except embedded, this is fix for it 2019-06-27 17:59:55 +01:00
Kim Kulling 0f66a917e5 Add unittest. 2019-06-24 21:37:53 +02:00
Kim Kulling ced080f9f3 X: fix out of bound access. 2019-06-15 19:17:15 +02:00
Rahul Sheth a4587e8609 Use hunter to download dependencies if HUNTER_ENABLED is ON 2019-06-13 21:31:24 -07:00
Kim Kulling 0021c93892 closes https://github.com/assimp/assimp/issues/2431: use irrXml directly for mingw compiler. 2019-06-12 22:12:38 +02:00
Kim Kulling cc10967913 Fix the build. 2019-06-11 20:17:50 +02:00
Kim Kulling 2d985b92c9 Fix references in cmake file. 2019-06-09 18:43:56 +02:00
Kim Kulling b03b3b9c03 Initial parsing for header and more. 2019-05-24 17:22:54 +02:00
Kim Kulling e1ed975839
Merge branch 'master' into topic/fbx_node_naming_optimization 2019-05-22 20:13:36 +02:00
Mike Samsonov c84ac7a135 Fragmented FBX ASCII emdedded resource 2019-05-16 11:59:23 +01:00
Mike Samsonov 13bba4fb4c even more efficient 2019-05-16 11:58:48 +01:00
Mike Samsonov b957d44943 Node names optimization and fixing non-unique name 2019-05-16 11:58:48 +01:00
Kim Kulling adbdbf2be6 closes https://github.com/assimp/assimp/issues/2459: fix duplicated fbx-type propertry. 2019-05-13 21:41:37 +02:00
Vitaly Ovchinnikov 42202c2204 a test for bad OBJ file format and code fix that handles it 2019-04-26 22:13:29 +12:00
Kim Kulling ef209c6eed
Update utColladaExportCamera.cpp
Add mising override statement.
2019-04-08 20:10:11 +02:00
kimkulling cbd8b032e7 FBX: add test case 2019-04-08 17:37:40 +02:00
Kim Kulling a0c797a29e
Merge branch 'master' into fix_vs107_warnings 2019-03-16 16:09:14 +01:00
kkulling 0dc2e9197a Fix compiler warnings. 2019-03-13 14:40:02 +01:00
Charlie Gettys 28c110af2e Initial pass 2019-03-10 13:15:15 -04:00
Vitaly Ovchinnikov 7b01ff6b8d ignoring invalid normals and uvs indices instead of canceling the import completely 2019-02-27 12:15:03 +13:00
Kim Kulling 262bbc0d5e fix compiler warnings. 2019-02-25 23:19:21 +01:00
Kim Kulling 16080ba60c Merge branch 'master' into simple_skin_test 2019-02-25 22:06:56 +01:00
Kim Kulling 206004c7d6 introduce simple skin-test +some findings. 2019-02-25 22:06:24 +01:00
Kim Kulling ea2e6936e5 Add test file. 2019-02-18 21:44:07 +01:00
Malcolm Tyrrell 56374666a7 Add two test files which require 'c' handling to be tokenized correctly. 2019-02-06 11:15:31 +00:00
Kim Kulling acc8826b02
Merge branch 'master' into issue_2297 2019-02-03 11:34:07 +01:00
Kim Kulling 996fb4aae7 closes https://github.com/assimp/assimp/issues/2297: introduce obj-unittest to validate working importer. 2019-02-03 11:32:56 +01:00
kimkulling a06133ab52 Update copyrights. 2019-01-30 09:41:39 +01:00
Kim Kulling 859153e3e6 more fixes for coverity-findings. 2018-12-28 01:44:56 +01:00
Kim Kulling 49cce86f5f Testing: improve test coverage: 2018-12-26 13:40:22 +01:00
Alexandre Avenel b226982a3c Add formatDetection unit-test for 3DS importer 2018-12-15 18:06:14 +01:00
Alexandre Avenel b25975af48 Add unit-test for STL format auto detection 2018-12-15 18:06:13 +01:00
Alexandre Avenel 95d9c16a3b Add minimal unit-test for LWO file format 2018-12-15 18:06:12 +01:00
Kim Kulling ce91f5c888 Off-Importer: introduce unittest. 2018-12-03 21:24:06 +01:00
Kim Kulling 117a2bc116
Merge branch 'master' into kimkulling-patch-2-1 2018-12-01 18:41:15 +01:00
Kim Kulling f00154802c Issue 2229: add a unittest. 2018-11-21 21:39:16 +01:00
Kim Kulling e1404d349c
Update utExporter.cpp
Remove misuse of the API.
2018-11-13 14:44:34 +01:00
Kim Kulling b6af80f2fd closes https://github.com/assimp/assimp/issues/2199: introduce first version for exporter. 2018-11-12 22:26:10 +01:00
Kim Kulling f26019aa8a
Update utglTF2ImportExport.cpp
disable unused test.
2018-10-09 16:27:48 +02:00
Kim Kulling f6f36a1ccf
Update utglTF2ImportExport.cpp
Disable test until bug is fixed.
2018-10-09 11:55:37 +02:00
Kim Kulling 4cca83f733 fix unittest. 2018-10-08 21:07:40 +02:00
Kim Kulling 01921ee81f Retrigger unittest 2018-10-08 20:40:01 +02:00
Kim Kulling e1247e81e1
Update utglTF2ImportExport.cpp
Check scene pointer against nullptr.
2018-10-08 14:53:33 +02:00
Kim Kulling 92f69affd9 StepFile: Working parser. 2018-10-07 19:22:13 +02:00
Kim Kulling 5d091c4591
Merge branch 'master' into kimmi_dev 2018-09-26 19:15:58 +02:00
Alexandre Avenel 673885a6d3 Add unit test for gltf2 export to obj 2018-09-24 19:10:54 +02:00
Kim Kulling 9f6238f3af INtroduce unittests. 2018-09-22 15:50:40 +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 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
Turo Lamminen b20ab96a43 Fix blend test files 2018-09-13 13:44:31 +03: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 081365df48 Introduce simple export test for assbin. 2018-09-10 22:42:24 +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 543afdc4e2 Obj-Import: add missing unittest for poiuntcloud support. 2018-09-02 13:19:52 +02:00
Kim Kulling 008455b984 MDC: introduce model to test MDC-format. 2018-09-02 10:38:21 +02:00
Kim Kulling e174326ae9 MDC: Fix unittest build. 2018-09-01 18:07:04 +02:00
Kim Kulling f206c5ebf0 MDC: prepare a unittest. 2018-08-31 21:46:12 +02:00
Kim Kulling ea40ea2822
Update utglTF2ImportExport.cpp
Fix clang compiler warnings, see https://stackoverflow.com/questions/31555584/why-is-clang-warning-suggest-braces-around-initialization-of-subobject-wmis for more detailed information.
2018-08-05 00:49:29 +02:00
Alexandre Avenel 319cd64930 Add missing unit tests for gltf2 primitive mode 2018-08-04 12:47:37 +02:00
Alexandre Avenel 15c2a96d25 Add test for glTF2 points 2018-08-04 12:47:37 +02:00
Alexandre Avenel 29ebb126b8 Add test for glTF2 lines, line strip, lines loop 2018-08-04 12:47:37 +02:00
Alexandre Avenel 9dcf83fabd Add unit test for glTF primitive mode 2018-08-04 12:47:37 +02:00
kkulling 7e67553311 Fix memleak. 2018-07-25 15:40:19 +02:00
kimkulling 9a6b07e522 closes https://github.com/assimp/assimp/issues/1724: add default material access to the material API. 2018-07-25 15:11:24 +02:00
kimkulling ee383fd8d2 Add missing files. 2018-07-11 11:09:53 +02:00
kimkulling e13f6876bb closes https://github.com/assimp/assimp/issues/1340: Fix handling of empty nodes in openddl-parser. 2018-07-11 10:10:26 +02:00
Alexandre Avenel 89b90cf2d5 Check nb of faces and vertices for FBX unit test
This test is currently broken !
2018-06-23 20:24:52 +02:00
Kim Kulling 64ab3e27fc
Fix missing model error in Irr-instancing
closes https://github.com/assimp/assimp/issues/2011: add reference to free model.
2018-06-18 22:16:50 +02:00
CwTCwT a96587d551 applied coding conventions
added check against the known faces
2018-06-16 15:30:22 +02:00
CwTCwT 41bf572af6 issue_2016
only add material uv mappings if set, ignore when no uvmapping set
removed unneccessary pad_i1 field (to prevent unnecessary field read exceptions)
2018-06-16 15:08:19 +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
Kim Kulling 1883d44b9b
Merge branch 'master' into master 2018-05-29 19:02:40 +02: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
smalcom 3861fb4ab5 Merge branch 'master' into qt_assimp_viewer 2018-05-24 12:36:59 +03:00
smalcom 8abcc454ad [F] Uninitialized variables. 2018-05-21 17:38:01 +03:00
Alexandre Avenel 978a7cbeb2 Fix #1587 : add validation to LWS unit test
It seems that the validation is now OK.
Also add a bunch of tests to try to import each file we have in this
format.
2018-05-21 11:50:19 +02:00
Alexandre Avenel 4b5c49b087 Add test for issue 1970: STL with empty solid 2018-05-19 23:19:35 +02:00
Kim Kulling 950496c351 some minor refactorings. 2018-05-12 08:39:22 +02:00