Commit Graph

892 Commits (314bdf196b6cd6b5de62636b17aeef1984ea960a)

Author SHA1 Message Date
Kim Kulling a639221ede
Update to float
- Temporary change to analyze leak.
2020-04-30 09:14:42 +02: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
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