dde7605158
Implement draco decoding
2021-01-26 16:08:12 +00:00
3a7d0f5656
Add Draco to cmakelists
...
Initial pass. Not yet used.
Add Draco library to assimp build and link
2021-01-26 15:58:14 +00:00
7c9cddf786
Draco test file
...
2CylinderEngine from https://github.com/KhronosGroup/glTF-Sample-Models
2021-01-15 17:25:36 +00:00
3eed6fa006
Remove relative pathing in target_sources() as per CMP0076
2021-01-07 01:23:41 +10:30
19af3f0d31
Swap the meaning using the out_mat property.
2020-12-02 16:59:29 +00:00
f7be3048de
New 3ds Max PBR Materials in FBX
2020-12-01 12:05:42 +00:00
db7e594221
Merge branch 'master' into findDegeneratesOptimization
2020-11-14 12:32:57 +01:00
75818f26eb
closes https://github.com/assimp/assimp/issues/3187
...
Do not use pthread for android
2020-11-11 21:13:17 +01:00
a68f78ab94
C++11
2020-11-02 15:03:17 +00:00
75570307d6
Remove unneeded line
2020-11-02 14:50:20 +00:00
3deae8760c
Optimize FindDegenerates so it doesn't explode
2020-11-02 14:43:35 +00:00
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
b7c6719ed8
Fix test builds
2020-10-12 16:47:36 -04:00
d676e1a13f
closes https://github.com/assimp/assimp/issues/3379 : reproduce error of unresolved symbol with static lib
2020-10-05 21:37:18 +02:00
09a473ff02
fic tests.
2020-10-05 19:06:48 +02:00
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
b4f79411aa
Fix lowrcase names.
2020-09-30 11:24:41 +02:00
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00
5653a82a87
fix the unittests.
2020-09-27 20:20:44 +02:00
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
93ae409e74
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
2020-09-22 17:29:49 +02:00
6e91605268
reformat.
2020-09-22 17:29:46 +02:00
71f20eaa8a
next fixes
2020-09-22 15:51:21 +02:00
8c88526da8
fix collada unittests.
2020-09-21 16:39:24 +02:00
9e2c4e0cf4
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-14 09:00:11 +02:00
c1f50e116a
fix next unittests.
2020-09-11 00:46:29 +02:00
be5089ae40
Collada: correct parsing of float data in xml nodes.
2020-09-02 22:38:19 +02:00
0c05398602
xml-parser: ensure that traverse-collectors are only collecting xmlnodes.
2020-09-02 21:48:58 +02:00
73fa2cbe88
Fix memory handling of xml-nodes in the parser.
2020-09-01 21:48:50 +02:00
3c2133a3b9
fix node collection for collada xml parsing
2020-09-01 07:51:17 +02:00
0730eebe6f
fix collada handling of xml nodes.
2020-08-28 16:17:56 +02:00
b7e9595e54
fix loop of xml-files.
2020-08-28 00:09:51 +02:00
6b32f34fc2
Try disabling C4389 for GTest only for MSVC
2020-08-27 17:02:42 -04:00
b15c111805
Try Hunter-based Github Actions
2020-08-27 16:55:39 -04:00
582a8b1887
Fix xml-migration bild.
2020-08-27 17:05:09 +02:00
6f77d2e06d
Prepare unittest for XmlParser.
2020-08-27 17:04:58 +02:00
5087348a37
Build tests and tools with Hunter
2020-08-25 11:30:46 -04:00
962fe7cd4d
Oops. Fix string to match restored error text.
2020-08-20 15:10:11 +01:00
8f893e3653
Actually, just keep the old behaviour for now.
2020-08-20 14:32:15 +01:00
d7c65c36cd
Add unit test for formatting.
2020-08-19 11:31:46 +01:00
e1a0163e7e
Make all exceptions available.
2020-08-18 18:14:51 +01:00
974252bd8f
Fix two warnings that annoy clang.
2020-08-18 10:33:47 +01:00
a4110a59c5
Use runtime error.
2020-08-18 10:33:47 +01:00
19cdfd12df
Unit test for internal failures.
2020-08-18 10:33:47 +01:00
1bbae19779
Fix leak
2020-08-11 20:28:12 +02:00
b1b9fa94cf
Update utStandardShapes.cpp
2020-08-11 20:21:35 +02:00
45f76f36f3
Add test to CMakeLists
2020-08-11 20:03:23 +02:00
153a6efecc
Add test
2020-08-11 20:02:14 +02:00
11daed69d3
Fixed overwriting of CMake global output directory variables.
2020-08-07 16:04:39 -04:00
6886ea6c65
Fix warning: comparison between unsigned and signed.
2020-07-24 10:57:24 +02:00
0f442b1ff2
Merge branch 'master' into gltfIndexOutOfRangeFix
2020-07-23 11:27:34 +02:00
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
d4f5f29b44
Add missing asset
2020-07-15 12:22:39 +01:00
212903e935
Unit test for all indices out of range, and fix.
2020-07-15 12:19:00 +01:00
7e7161852a
Add a unit test.
2020-07-15 11:19:10 +01:00
37c74f6fa3
add test to unit for acc file format loader
2020-07-06 20:16:22 -04:00
f753a6e7ad
add acc file test using existing ac file converted to acc format
2020-07-06 20:14:03 -04:00
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
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
edaa8e4a80
Need to use ASSIMP_BUILD_DEBUG.
2020-06-24 11:37:43 +01:00
2977643352
Fix.
2020-06-23 12:08:06 +01:00
9188f56839
Allow assert handling to be replaced.
2020-06-23 11:55:51 +01:00
31b8d4710f
Merge branch 'master' into issue_3165
2020-06-15 20:32:00 +02:00
ad62e6e863
fix unittest check - cannot work, just crash shall not occurr any more.
2020-06-12 12:29:51 +02:00
1b0b4d8d1a
add a unittest.
2020-06-12 11:43:31 +02:00
ffaa634c48
Merge branch 'master' into issue_3165
2020-06-09 10:48:27 +02:00
2a8daed68f
Remove dead code.
2020-06-09 10:16:05 +02:00
7db6475592
Change from (int division -> cast) to (cast -> float division)
2020-05-29 11:59:28 -04:00
eceb8aeed1
Cleaned up implicit conversion and code.
2020-05-28 19:22:06 -04:00
6d04e16c7e
Merge branch 'master' into issue_3165
2020-05-28 21:51:58 +02:00
d40a3026db
closes https://github.com/assimp/assimp/issues/3165 : fix gcc build.
2020-05-28 21:02:13 +02:00
c94ed5c7b1
Update utRemoveComponent.cpp
...
closes https://github.com/assimp/assimp/issues/3183
2020-05-25 20:40:19 +02:00
4b0a3305b1
Merge branch 'master' into master
2020-05-17 13:54:10 +02:00
cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes
2020-05-16 20:50:34 +02:00
df9c09d9e1
Merge branch 'master' into collada_unit_test_cleanup
2020-05-16 19:59:30 +02:00
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
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
c5a9fbd47f
Gracefully handle NaNs and Infs in gltf2 accessor bound computation
2020-05-11 12:02:38 -07:00
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
4c75857f50
Remove duplicate flag
2020-05-06 13:46:26 +02:00
dc8550290e
Ensure to delete the scene copy after the test
2020-05-05 10:53:26 +01:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
8e73984a11
Collada Root Nodes aren't allowed to have meshes
...
Create a null parent node instead
2020-05-04 17:47:09 +01:00
6e200cb0d3
Merge branch 'master' into bug-3177-dae-geo-id
...
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
5a986090ca
Merge branch 'master' into collada_unit_test_cleanup
2020-05-04 13:25:38 +01:00
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
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
29c75f4948
Merge branch 'master' into collada_unit_test_cleanup
2020-05-01 12:09:28 +01:00
3e2dd186d1
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-01 12:08:12 +01:00
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
083ebdbc2e
Collada Export: More unique Ids
...
Nodes, Materials, Animations, Lights, Cameras, Bones
2020-04-30 18:28:06 +01:00
a639221ede
Update to float
...
- Temporary change to analyze leak.
2020-04-30 09:14:42 +02:00
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
6c1e21d754
fix formatting.
2020-04-26 19:14:30 +02:00
bafb8e3189
closes https://github.com/assimp/assimp/issues/3165 : remove deprecated code whch causes compiler warning.
2020-04-26 08:59:52 +02:00
c0dc26de8e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-16 11:29:37 +02:00
5377d740e8
fix the build
2020-04-15 21:52:21 +02:00
d46ec3f9b9
fix init ordering of members
2020-04-15 20:41:38 +02:00
a0218c690b
Remove unused variable m
2020-04-15 20:06:22 +02:00
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
ac16a857ff
Merge remote-tracking branch 'upstream/master' into add-tests-to-c-api-2
2020-04-13 09:08:45 -04:00
13429485d9
Update CMakeLists.txt
...
remove not needed lib
2020-04-10 17:00:38 +02:00
9b671c6eb4
Update CMakeLists.txt
...
Add explicit linking of irrxml.
2020-04-10 12:27:40 +02:00
485d7ab52e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-10 08:44:18 +01:00
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
131aed73b0
closes https://github.com/assimp/assimp/issues/2166 : add missing setter for metadata.
2020-04-06 11:16:16 +02:00
132ecae6f4
Merge branch 'master' into kimkulling_dev
2020-04-04 18:28:50 +02:00
e61cb1794f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-02 08:08:08 +01:00
06e40b9820
Removed unneeded SceneDiffer.h includes.
2020-03-31 17:22:56 -04:00
bc3de4079a
Disable terragen test.
2020-03-31 13:49:22 +02:00
7f63a4b0d7
add terragen importer unittest.
2020-03-30 21:53:25 +02:00
4c177ad72e
fix possible warnings
2020-03-30 20:33:43 +02:00
f9a7d2abf1
Added C API tests.
2020-03-27 07:59:10 -04:00
96c7c567e6
Merge branch 'master' into kimkulling_dev
2020-03-26 11:56:45 +01:00
3c9751ce0c
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-26 10:16:58 +00:00
2006eeed85
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-23 08:07:25 +00:00
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
973e38ad97
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-23 07:57:38 +00:00
c0ae9b6040
fix invalid check
2020-03-22 14:21:24 +01:00
14860f3822
fix warning.
2020-03-22 13:34:27 +01:00
68a9fa2df3
reformat unittests.
2020-03-22 12:13:09 +01:00
edc73552cd
fix another warning: missing override.
2020-03-22 09:17:44 +01:00
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
14aea3f1a4
fix another unittest warning.
2020-03-21 20:10:40 +01:00
7fda14078b
Merge branch 'master' into enable_vs_warning_all
2020-03-21 08:57:15 +01:00
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
dd58568d60
fix vs2013 warnings in unittests
2020-03-20 10:04:44 +01:00
f17b04168f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-18 13:58:35 +01:00
c9cf661b29
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-03-16 07:40:07 +00:00
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
dc04759492
fix unittests part 2.
2020-03-13 17:00:14 +01:00
ec69e2bf59
Added unit test for recursive references in GLTF2 file
2020-03-12 09:10:48 +00:00
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
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
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
f8757322be
fix warnings
2020-03-11 09:43:55 +01:00
7e7555a91b
fix compiler warnings in tools and test-
2020-03-11 00:43:44 +01:00
02e5698a38
fix linker issues.
2020-03-09 22:49:32 +01:00
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
ada4f51d5b
Merge branch 'master' into kimkulling_dev
2020-02-16 13:10:41 +01:00
b3d894ee73
Update CMakeLists.txt
...
temporary disable iiXml test until xml-parser migration is ready.
2020-02-16 13:06:38 +01:00
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
9e1eba7912
Revert image files corrupted by a8a1ca9
2020-01-27 19:58:05 +09:00
fc4ae3586e
Update utMDLImporter.cpp
...
unittests: Fix compiler warning: comparison between signed and unsigned.
2020-01-25 11:31:14 +01:00
48bb2978af
Added support to load HL1 MDL external texture files directly.
2020-01-24 13:14:37 -05:00
092883cf19
Merge branch 'master' into update-copyright-end-date
2020-01-22 18:03:43 +01:00
a74e13d6b2
Re-enable dwarf.x import test
2020-01-22 12:22:52 +02:00
552519c2c4
Merge branch 'master' into update-copyright-end-date
2020-01-21 11:57:07 -05:00
c2a74c61f4
Add more X unit tests
2020-01-21 15:14:34 +02:00
d4d19b7062
Add more AC unit tests
2020-01-21 15:11:50 +02:00
RichardTea
JacksonM8
Malcolm Tyrrell
Kim Kulling
Kim Kulling
Rahul Sheth
Marc-Antoine Lortie
MeyerFabian
Robert Reif
Hill Ma
Evangel
Hanif Bin Ariffin
Jeremy Cytryn
kkulling
Max Vollmer (Microsoft Havok)
Marc-Antoine Lortie
Aaron Franke
Max Vollmer
tellypresence
Turo Lamminen
Marc-Antoine Lortie