Commit Graph

842 Commits (691dfe7012e5d3c8ff12efae1851143d9d01bbaf)

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