7fc4603579
fix test/models/3DS/IMAGE1.bmp: is jpg
2021-12-18 14:32:46 +03:00
003942aafe
Merge branch 'master' into copyscene_fix
2021-12-13 21:19:08 +01:00
cb657e4c13
Use correct XmlParser-methods and add some missing casts
2021-12-13 18:06:23 +01:00
2be6bac4b0
Bug: Export crashes when any of the meshes contains texture coordinate names #4243
2021-12-07 20:42:43 +01:00
75e7d0f6ef
Merge branch 'master' into deprecated_gltfpbr_macros
2021-12-07 09:01:50 +00:00
e831ecf3c2
Add a separate test case for Blender 276 and update Box.blend to be 293
2021-11-26 22:09:06 -04:00
44fa1ec6a7
Make Blender importer aware of collections, and use them when available. Also add the default startup file for Blender 2.93
2021-11-26 22:09:06 -04:00
34daf87428
Delete test/models/3DS/UVTransformTest directory
...
- Remove deprecated data
2021-11-26 19:17:42 +01:00
d18709b899
Small float values should be true
2021-11-23 14:15:32 +00:00
2fdf52488f
float and integer material property bool conversion
...
All reading float and integer material property values as bool
Zero => False
Non-Zero => True
2021-11-23 13:53:58 +00:00
bf1f142a72
Fix warnings
2021-11-20 18:40:38 +01:00
0d857bcf9f
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-20 12:35:56 +01:00
74b3be194d
Read the Value, not the Attribute
...
Correct some mistakes made when moving to pugixml from IrrXML
Fixes #4179
2021-11-17 17:10:10 +00:00
c24f99cd0e
Redefine deprecated glTF-specific PBR material macros
...
Intended to support Qt5 QtQuick3D until it is ported to generic PBR
macros.
2021-11-16 11:42:59 +00:00
f48731622b
Disable m3d tesat
2021-11-13 08:30:29 +01:00
37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-12 10:37:19 +01:00
7120504c46
Merge branch 'master' into fix_aiMesh_abi_4162
2021-11-11 20:02:46 +01:00
9f28ef4c25
Merge branch 'master' into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-10 20:43:39 +01:00
a31c979abc
Use helloworld as X3D-Testcase
2021-11-10 20:40:05 +01:00
8ed18621db
Fixes
2021-11-10 20:37:27 +01:00
8a613a8655
Fix unittest
2021-11-09 23:27:58 +01:00
86a25b62e4
Better aiMesh ABI compatibility with 5.0.1, make smaller
...
Move new mTextureCoordsNames member to end of struct
Convert to pointer-to-array, saving ~8KB per aiMesh in almost all cases
Add C++ accessor functions for simpler usage
2021-11-09 13:03:06 +00:00
8c0b869998
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-10-28 13:38:41 +02:00
db0127859a
CalculateDistance method
2021-10-21 08:39:44 +01:00
791cb195be
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-10-20 21:14:43 +02:00
4ba99c1bb0
Comments
2021-10-20 16:15:00 +01:00
c644f9d719
Subtract the centroid
2021-10-20 15:08:08 +01:00
36c937cc19
Merge branch 'master' into debian-fixes
2021-10-18 09:07:47 +02:00
0e3d058504
Add some exporter macros.
2021-10-17 15:10:25 +02:00
3b8126d26a
Fix spelling mistake
2021-10-08 08:48:01 +02:00
5a1bcc6aa5
Fix build and test
2021-10-07 10:01:33 +01:00
7788c1a04e
Add a unit test for json schemas.
2021-10-07 10:01:32 +01:00
65173df9d9
fixed x3d importer test
2021-09-16 13:45:56 +02:00
3001d88172
Merge branch 'master' into x3d_pugi_migration
2021-09-07 15:04:08 +02:00
b39f38b73c
Add export property for assimp json exporter to write compressed json (without whitespaces).
2021-08-27 18:17:27 +02:00
38dcd3583c
Fix compiler warnings: comparison signed unsigned.
2021-08-20 20:20:47 +02:00
c396bc78b1
closes https://github.com/assimp/assimp/issues/3951 : Use using directive to define type.
2021-08-20 19:40:04 +02:00
758116b083
removed trailing spaces and tabs from source and text
...
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
2021-07-29 13:28:51 +02:00
bff1d012bd
Read matrix and input (shared) correctly
...
<matrix> may have leading and trailing whitespace
<input/> set attribute is unsigned. It is also optional, default 0
2021-07-13 16:50:09 +01:00
8e3a159141
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-23 10:10:28 -04:00
94c3abd841
Apply various performance fixes from clang-tidy
2021-06-22 12:27:15 -04:00
985f3ee665
Fix glTFv2 texcoord/uv mapping
...
Use the standard property to indicate the UV map index
2021-06-14 15:11:41 +01:00
fb039bb9eb
Add glTFv2 Clearcoat import/export tests
...
Uses Clearcoat model from Khronos
2021-06-14 15:11:41 +01:00
4a66ec25d0
Standardise Clearcoat, Sheen and Transmission
...
Also cleanup glTFv2 defaults, don't import/export if disabled
2021-06-14 15:11:41 +01:00
4476352882
First pass at simplifying glTFv2 PBR
...
Removed 'core' set of GLTF-specific properties
2021-06-14 15:11:41 +01:00
e01a6b4276
Add xml doc.
2021-05-18 21:15:48 +02:00
3f5c3eb38c
Delete dna.txt
2021-05-05 15:11:36 +02:00
067993d607
Delete dae.dae
2021-05-05 15:11:20 +02:00
0aadd8a3f9
Delete spiderExport.stl
2021-05-05 15:10:59 +02:00
d1991ad949
Delete AssimpLog_Cpp.txt
2021-05-05 15:10:50 +02:00
e683c6eef9
Delete testExport.stl
2021-05-05 15:10:30 +02:00
9395322e56
Delete AssimpLog_C.txt
2021-05-05 15:10:22 +02:00
2a6b84c8ea
- closes https://github.com/assimp/assimp/issues/3830
...
- Fix rgba2hex
- Add tests
2021-05-05 14:43:51 +02:00
930cc25c0e
fixed version string test
2021-04-19 09:51:44 +02:00
31e8042071
Renaming PI to aiPi.
2021-04-05 09:59:22 -05:00
8d86bcf0fb
Also check member
2021-03-15 16:32:17 +00:00
57652a9084
Version is strictly a string
2021-03-15 16:27:50 +00:00
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
c669c8f1eb
Merge branch 'master' into update_copyrights
2021-02-28 12:18:41 +01:00
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
888415246e
Merge branch 'master' into issue_2195_draco
2021-02-08 11:52:54 +01:00
6b7b1caa06
Merge branch 'master' into fix_gcc_compiler_warning
2021-02-05 21:59:21 +01:00
6f759474bc
Merge branch 'issue_3564' of https://github.com/assimp/assimp into issue_3564
2021-02-05 21:45:53 +01:00
710f1d17d4
RapidJSon: Upgrade to latest greatest
2021-02-05 21:45:37 +01:00
0e941c2478
Merge branch 'master' into issue_3564
2021-02-05 20:45:18 +01:00
6784427287
Workaround: disable test which cause undefined behaviour.
2021-02-05 20:44:39 +01:00
4207c97c17
Fix compiler warning: warning: argument to ... call is the same expression as the source
2021-02-05 20:01:57 +01:00
5fbbba2fac
Merge branch 'master' into issue_2195_draco
2021-01-31 16:02:57 +01:00
5a8e00b219
Merge branch 'master' into SignCompareFix
2021-01-30 16:57:22 -08:00
c86dcbe1a8
cleaned up sign-compare unittest build warnings
...
addresses issue #3624
2021-01-30 16:49:32 -08:00
79eb9ecc86
Update all minimum cmake req to 3.10
2021-01-29 21:05:46 +01:00
79a442f95d
Fixes a mem leak in aiMetadata::Set
2021-01-29 20:25:02 +01:00
26ce6ba4f6
draco unit test when draco disabled
...
Should not load the draco file
2021-01-27 10:25:56 +00:00
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
Garux
Kim Kulling
Kim Kulling
kovacsv
RichardTea
Pencil Amazing
Malcolm Tyrrell
IOhannes m zmölnig
René Martin
Krishty
Aaron Gokaslan
kkulling
Krishty
Scott Baldric
contriteobserver
contriteobserver
JacksonM8
Rahul Sheth
Marc-Antoine Lortie
MeyerFabian
Robert Reif
Hill Ma
Evangel
Hanif Bin Ariffin
Jeremy Cytryn
Max Vollmer (Microsoft Havok)
Marc-Antoine Lortie
Aaron Franke