Commit Graph

1181 Commits (e86f1acb9b11e317fe81124cbd38972da04f98d7)

Author SHA1 Message Date
Malcolm Tyrrell 7e7161852a Add a unit test. 2020-07-15 11:19:10 +01:00
Robert Reif 37c74f6fa3 add test to unit for acc file format loader 2020-07-06 20:16:22 -04:00
Robert Reif f753a6e7ad add acc file test using existing ac file converted to acc format 2020-07-06 20:14:03 -04:00
Hill Ma 30f09e9fc0 Fix build when ASSIMP_DOUBLE_PRECISION is on.
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make

The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
2020-06-28 17:36:21 -07:00
Evangel d75d59a4fd Added operator== and operator!= to aiMetadata to allow for testing.
Updated utMetadata.copy_test to reflect that there's now 8 metadata types.
2020-06-26 15:07:42 +10:00
Malcolm Tyrrell edaa8e4a80 Need to use ASSIMP_BUILD_DEBUG. 2020-06-24 11:37:43 +01:00
Malcolm Tyrrell 2977643352 Fix. 2020-06-23 12:08:06 +01:00
Malcolm Tyrrell 9188f56839 Allow assert handling to be replaced. 2020-06-23 11:55:51 +01:00
Kim Kulling 31b8d4710f
Merge branch 'master' into issue_3165 2020-06-15 20:32:00 +02:00
kimkulling ad62e6e863 fix unittest check - cannot work, just crash shall not occurr any more. 2020-06-12 12:29:51 +02:00
kimkulling 1b0b4d8d1a add a unittest. 2020-06-12 11:43:31 +02:00
Kim Kulling ffaa634c48
Merge branch 'master' into issue_3165 2020-06-09 10:48:27 +02:00
Kim Kulling 2a8daed68f
Remove dead code. 2020-06-09 10:16:05 +02:00
Hanif Bin Ariffin 7db6475592 Change from (int division -> cast) to (cast -> float division) 2020-05-29 11:59:28 -04:00
Hanif Bin Ariffin eceb8aeed1 Cleaned up implicit conversion and code. 2020-05-28 19:22:06 -04:00
Kim Kulling 6d04e16c7e
Merge branch 'master' into issue_3165 2020-05-28 21:51:58 +02:00
kimkulling d40a3026db closes https://github.com/assimp/assimp/issues/3165: fix gcc build. 2020-05-28 21:02:13 +02:00
Kim Kulling c94ed5c7b1
Update utRemoveComponent.cpp
closes https://github.com/assimp/assimp/issues/3183
2020-05-25 20:40:19 +02:00
Kim Kulling 4b0a3305b1
Merge branch 'master' into master 2020-05-17 13:54:10 +02:00
Kim Kulling cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes 2020-05-16 20:50:34 +02:00
Kim Kulling df9c09d9e1
Merge branch 'master' into collada_unit_test_cleanup 2020-05-16 19:59:30 +02:00
Kim Kulling 2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id 2020-05-13 20:24:53 +02: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
Kim Kulling 4c75857f50
Remove duplicate flag 2020-05-06 13:46:26 +02:00
RichardTea dc8550290e Ensure to delete the scene copy after the test 2020-05-05 10:53:26 +01: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
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 5a986090ca Merge branch 'master' into collada_unit_test_cleanup 2020-05-04 13:25:38 +01:00
Kim Kulling f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02: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 29c75f4948
Merge branch 'master' into collada_unit_test_cleanup 2020-05-01 12:09:28 +01:00
RichardTea 3e2dd186d1
Merge branch 'master' into bug-3177-dae-geo-id 2020-05-01 12:08:12 +01:00
RichardTea e6c4175d8d Rename Collada export tests
Use existing naming convention.
Brings all Collada tests together in Test Explorers
2020-05-01 11:49:15 +01:00
RichardTea 083ebdbc2e Collada Export: More unique Ids
Nodes, Materials, Animations, Lights, Cameras, Bones
2020-04-30 18:28:06 +01:00
Kim Kulling a639221ede
Update to float
- Temporary change to analyze leak.
2020-04-30 09:14:42 +02:00
RichardTea ff9f3b8608 Collada: Ensure <geometry> has unique id
Use the "id" for mesh names by default.
Set option AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES to use the mesh "name" instead
2020-04-29 17:17:46 +01:00
Kim Kulling 6c1e21d754 fix formatting. 2020-04-26 19:14:30 +02:00
Kim Kulling bafb8e3189 closes https://github.com/assimp/assimp/issues/3165: remove deprecated code whch causes compiler warning. 2020-04-26 08:59:52 +02:00
Kim Kulling c0dc26de8e
Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-16 11:29:37 +02:00
Kim Kulling 5377d740e8
fix the build 2020-04-15 21:52:21 +02:00
Kim Kulling d46ec3f9b9
fix init ordering of members 2020-04-15 20:41:38 +02:00
Kim Kulling a0218c690b
Remove unused variable m 2020-04-15 20:06:22 +02:00
Marc-Antoine Lortie e399a12f71 Small changes to C API unit tests.
- (1) Changed randomized math structure values to predefined values to prevent cases that could potentially lead to division by zero.
- (2) Removed unused variable(s) due to (1).
- (3) Renamed variable(s) for better clarity.
2020-04-13 14:13:54 -04:00
Marc-Antoine Lortie ac16a857ff Merge remote-tracking branch 'upstream/master' into add-tests-to-c-api-2 2020-04-13 09:08:45 -04:00
Kim Kulling 13429485d9
Update CMakeLists.txt
remove not needed lib
2020-04-10 17:00:38 +02:00
Kim Kulling 9b671c6eb4
Update CMakeLists.txt
Add explicit linking of irrxml.
2020-04-10 12:27:40 +02:00
Max Vollmer (Microsoft Havok) 485d7ab52e
Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-10 08:44:18 +01:00
Kim Kulling 79af2b1a5c
Merge branch 'master' into kimkulling_dev 2020-04-09 19:55:45 +02:00
Kim Kulling 131aed73b0 closes https://github.com/assimp/assimp/issues/2166: add missing setter for metadata. 2020-04-06 11:16:16 +02:00
Kim Kulling 132ecae6f4
Merge branch 'master' into kimkulling_dev 2020-04-04 18:28:50 +02:00
Max Vollmer (Microsoft Havok) e61cb1794f
Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-02 08:08:08 +01:00
Marc-Antoine Lortie 06e40b9820 Removed unneeded SceneDiffer.h includes. 2020-03-31 17:22:56 -04:00
Kim Kulling bc3de4079a
Disable terragen test. 2020-03-31 13:49:22 +02:00
Kim Kulling 7f63a4b0d7 add terragen importer unittest. 2020-03-30 21:53:25 +02:00
Kim Kulling 4c177ad72e fix possible warnings 2020-03-30 20:33:43 +02:00
Marc-Antoine Lortie f9a7d2abf1 Added C API tests. 2020-03-27 07:59:10 -04:00
Kim Kulling 96c7c567e6
Merge branch 'master' into kimkulling_dev 2020-03-26 11:56:45 +01:00
Max Vollmer (Microsoft Havok) 3c9751ce0c
Merge branch 'master' into GLTF2_recursive_references_fix 2020-03-26 10:16:58 +00:00
Max Vollmer (Microsoft Havok) 2006eeed85
Merge branch 'master' into GLTF2_recursive_references_fix 2020-03-23 08:07:25 +00:00
Kim Kulling 6f8d96b57e
Merge branch 'master' into kimkulling_dev 2020-03-23 09:00:41 +01:00
Max Vollmer (Microsoft Havok) 973e38ad97
Merge branch 'master' into GLTF2_guarantee_rootnode_fix 2020-03-23 07:57:38 +00:00
Kim Kulling c0ae9b6040 fix invalid check 2020-03-22 14:21:24 +01:00
Kim Kulling 14860f3822 fix warning. 2020-03-22 13:34:27 +01:00
Kim Kulling 68a9fa2df3 reformat unittests. 2020-03-22 12:13:09 +01:00
Kim Kulling edc73552cd fix another warning: missing override. 2020-03-22 09:17:44 +01:00
Kim Kulling 378c87ccf4 Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all 2020-03-21 20:10:44 +01:00
Kim Kulling 14aea3f1a4 fix another unittest warning. 2020-03-21 20:10:40 +01:00
Kim Kulling 7fda14078b
Merge branch 'master' into enable_vs_warning_all 2020-03-21 08:57:15 +01:00
Aaron Franke 1529f9518f
Make file formatting comply with POSIX and Unix standards
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
kimkulling dd58568d60 fix vs2013 warnings in unittests 2020-03-20 10:04:44 +01:00
Kim Kulling f17b04168f
Merge branch 'master' into GLTF2_recursive_references_fix 2020-03-18 13:58:35 +01:00
Max Vollmer (Microsoft Havok) c9cf661b29
Merge branch 'master' into FBXParser_check_inputlength_fix 2020-03-16 07:40:07 +00:00
Kim Kulling 4210318a34
Merge branch 'master' into enable_vs_warning_all 2020-03-15 10:19:49 +01:00
kimkulling dc04759492 fix unittests part 2. 2020-03-13 17:00:14 +01:00
Max Vollmer ec69e2bf59 Added unit test for recursive references in GLTF2 file 2020-03-12 09:10:48 +00:00
Max Vollmer a4bbd9b936 Added two unit tests for cases where Assimp returned a scene that didn't have a root node:
- NoScene tests that Assimp correctly fails importing an invalid GLTF2 file that doesn't have a scene.

- SceneWithoutNodes tests that Assimp correctly creates an empty root node for GLTF2 files with a scene that has no nodes.
2020-03-12 09:01:29 +00:00
Max Vollmer ad278055ae Added test file and test case for ASCII FBX files with invalid (out of bounds) float values 2020-03-11 12:46:13 +00:00
kimkulling 69551e81ed Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all 2020-03-11 10:15:25 +01:00
kkulling f8757322be fix warnings 2020-03-11 09:43:55 +01:00
Kim Kulling 7e7555a91b fix compiler warnings in tools and test- 2020-03-11 00:43:44 +01:00
Kim Kulling 02e5698a38 fix linker issues. 2020-03-09 22:49:32 +01:00
Marc-Antoine Lortie edfaaed56f Removed uneeded expression in else() and endif() constructs.
The following changes were tested against building with a master copy.

For a more detailed report, please read the followings below:

The flags that were checked were the ones checked by default + the following:

ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES

The list of compilable projects in Visual Studio were the following:

- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic

The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.

UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004.
2020-02-23 07:09:35 -05:00
Kim Kulling ada4f51d5b
Merge branch 'master' into kimkulling_dev 2020-02-16 13:10:41 +01:00
Kim Kulling b3d894ee73
Update CMakeLists.txt
temporary disable iiXml test until xml-parser migration is ready.
2020-02-16 13:06:38 +01:00
Marc-Antoine Lortie be4fe131d5 Made changes to write compiled binaries to a common directory.
The following changes were tested with the following projects:

- assimp DLL
- unit tests
- tools/assimp_cmd
- tools/assimp viewer
- samples/SimpleOpenGL
- samples/SimpleTexturedDirectx11
- samples/SimpleTexturedOpenGL

For each program listed above, the results were tested when (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) is true and false.

Also, the "lib" in SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib") was changed to "bin" to allow DLLs to be written to executables/launchables programs directory.
2020-02-15 13:10:11 -05:00
tellypresence 9e1eba7912 Revert image files corrupted by a8a1ca9 2020-01-27 19:58:05 +09:00
Kim Kulling fc4ae3586e
Update utMDLImporter.cpp
unittests: Fix compiler warning: comparison between signed and unsigned.
2020-01-25 11:31:14 +01:00
Marc-Antoine Lortie 48bb2978af Added support to load HL1 MDL external texture files directly. 2020-01-24 13:14:37 -05:00
Kim Kulling 092883cf19
Merge branch 'master' into update-copyright-end-date 2020-01-22 18:03:43 +01:00
Turo Lamminen a74e13d6b2 Re-enable dwarf.x import test 2020-01-22 12:22:52 +02:00
Marc-Antoine Lortie 552519c2c4
Merge branch 'master' into update-copyright-end-date 2020-01-21 11:57:07 -05:00
Turo Lamminen c2a74c61f4 Add more X unit tests 2020-01-21 15:14:34 +02:00
Turo Lamminen d4d19b7062 Add more AC unit tests 2020-01-21 15:11:50 +02:00
Turo Lamminen c407892c9c Refactor AC unit test 2020-01-21 15:11:50 +02:00
Turo Lamminen 0b776f16cb Add more 3D unit tests 2020-01-21 15:11:50 +02:00
Turo Lamminen 461f9923a7 Refactor 3D import unit test 2020-01-21 15:11:50 +02:00
Turo Lamminen 69284bdef9 Add more XGL unit tests 2020-01-21 15:11:50 +02:00
Turo Lamminen 2875f7fd5f Refactor XGL unit test 2020-01-21 15:11:50 +02:00
Turo Lamminen 963d475748 Add MD3 importer unit tests 2020-01-21 15:11:50 +02:00
Turo Lamminen 8619ff55b6 Revert broken .X test model to working version 2020-01-21 13:05:02 +02:00
Kim Kulling a708e5b2ff
Merge branch 'master' into revert-broken 2020-01-20 18:25:00 +01:00
Marc-Antoine Lortie 9aea72f70e Changed date in test aiGetLegalStringTest to the appropriate year. 2020-01-20 09:14:04 -05:00
Marc-Antoine Lortie 4e7e47bd43 Updated copyright dates.
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
2020-01-20 08:53:12 -05:00
Turo Lamminen 1eeecb7ca7 Revert broken Q3D test models to working versions 2020-01-20 15:30:49 +02:00
Turo Lamminen cbdf6296e2 Revert broken terragen model to working version 2020-01-20 14:42:25 +02:00
Turo Lamminen 808a0a5412 Revert broken STL test model to working version 2020-01-20 14:41:25 +02:00
Turo Lamminen e876afeaab Revert broken XGL test model to working version 2020-01-20 14:33:18 +02:00
Turo Lamminen b7690be5e2 Revert broken 3DS test model to working version 2020-01-20 14:30:51 +02:00
Turo Lamminen 74e8981193 Revert broken HMP test model to working version 2020-01-20 14:27:06 +02:00
Turo Lamminen 527244bdf9 Revert broken FBX models to working versions 2020-01-20 14:25:31 +02:00
Turo Lamminen 6e4b208659 Revert QuickDraw--Chasis.lwo to working version 2020-01-20 14:14:17 +02:00
Turo Lamminen 0c228806f7 Add all shipped .blend files to unit tests 2020-01-20 13:48:45 +02:00
Kim Kulling c4d98ced49
Merge branch 'master' into kimkulling_dev 2020-01-18 14:05:51 +01:00
Turo Lamminen 2a366388c2 Revert Wuson.ms3d to working version 2020-01-16 13:55:34 +02:00
Turo Lamminen 08110be9f7 Revert BoxTextured.glb to working version 2020-01-16 13:41:01 +02:00
kimkulling 10ff2d94f7 more tests. 2020-01-15 13:59:17 +01:00
Turo Lamminen 542b1f7688 Add more COB importer unit tests 2020-01-15 14:34:25 +02:00
Turo Lamminen 26a80bb019 Refactor COB import test to not use a class 2020-01-15 14:15:29 +02:00
Turo Lamminen a50b94dd63 Revert test model dwarf.cob to working version 2020-01-15 14:10:09 +02:00
Turo Lamminen d6e9a15b15 Add MD5 importer unit tests 2020-01-15 13:23:13 +02:00
Kim Kulling d1abe68b93 Testcoverage improvements. 2020-01-14 21:44:45 +01:00
Turo Lamminen 7e140ff912 Add MD2 importer unit tests 2020-01-10 13:50:16 +02:00
Turo Lamminen d372d28d2e Revert more broken test models to working versions
Was broken by a8a1ca9894.
Partially revert that commit.

Closes #2861
2020-01-09 21:56:39 +02:00
Turo Lamminen 7b7100a94b Revert 3_bananas.amf.7z to working version
Was broken by a8a1ca9894.
Partially revert that commit.

Closes #2857
2020-01-08 14:20:56 +02:00
RichardTea ae7a0aa6ef
Merge branch 'master' into collada_modeller_metadata 2020-01-02 13:25:04 +00:00
RichardTea ab50b5e181 Fix typo, fix GCC build 2020-01-02 13:02:40 +00:00
RichardTea d11af753f2 Fix Codacity warnings, test Exporter metadata
Pass std::string around instead as need to create one anyway.

Use CamelCase version to avoid caseSensiTivity issues
as will usually want the camelcase edition anyway.
Not UTF-8 but the standard XML tags are ASCII anyway
2020-01-02 12:35:00 +00:00
Marc-Antoine Lortie 7e957768db Removed dead code. 2019-12-25 08:13:20 -05:00
Marc-Antoine Lortie 607243448f Fixed int/unsigned int comparaisons. 2019-12-18 08:33:41 -05:00
Marc-Antoine Lortie 5d79639a8a Removed unused variable. 2019-12-18 08:10:12 -05:00
Marc-Antoine Lortie 4144a222d3 Added HL1 MDL loader tests.
Added new unit test source files.
Added MDL samples for tests.
Updated CMakeLists file to include the new unit tests.
2019-12-16 11:31:41 -05:00
Kim Kulling 9ef2d7fb7d
Merge branch 'master' into collada_modeller_metadata 2019-12-13 08:28:50 +01:00
Malcolm Tyrrell b6553b8a78
Merge branch 'master' into fixTexcoord 2019-12-12 12:19:02 +00:00
Malcolm Tyrrell 2124da8340 Add a texcoord unit test. 2019-12-12 12:06:36 +00:00
RichardTea f498a395e4 Add common metadata to Collada
Also add AI_METADATA_SOURCE_COPYRIGHT common metadata
2019-12-09 14:05:41 +00:00
Malcolm Tyrrell 6639d5180b Add a test for gltf2 and FBX metadata. 2019-12-05 14:05:49 +00:00
Malcolm Tyrrell 81984002d3 Fix and test for GLTF. 2019-12-05 13:52:34 +00:00
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
Kim Kulling 5c5226a98c
Merge branch 'master' into issue-1923 2018-05-01 21:10:52 +02:00
Kim Kulling 1679c8b08e STL: reenable unittest. 2018-05-01 16:03:56 +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 2c47717ca6 Introduce export with test for point clouds. 2018-05-01 13:28:53 +02:00
Korbinian Würl 2247513064 Fix for TravisCI 2018-05-01 11:23:38 +02:00
Korbinian Würl 9cfdb8d365 Fixed test .obj file: OBJ Vertex Colors are expected to be floats 0-1
See https://github.com/cnr-isti-vclab/vcglib/blob/master/wrap/io_trimesh/import_obj.h#L326
2018-04-30 16:29:10 +02:00
Korbinian Würl 9e484daa65 Unit test for Issue #1923: OBJ Exporter can't correctly export vertex colors 2018-04-30 16:29:02 +02:00
Sergio Acereda 43dedb6e09 unit test: missing mNumIndices 2018-04-23 12:23:12 +02:00
Kim Kulling 42dcf8c14c Add missing test DXF-file. 2018-04-11 23:11:13 +02:00
Kim Kulling 5319974fe1 Use correct check to do a tokensearch. 2018-04-11 21:16:20 +02:00