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