Commit Graph

913 Commits

Author SHA1 Message Date
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