Kim Kulling
8b1d94d6b1
Merge branch 'master' into deprecated_gltfpbr_macros
2022-01-23 12:16:49 +01:00
Kim Kulling
6e50b04ae0
Merge branch 'master' into IQM
2022-01-17 18:33:37 +01:00
Kim Kulling
7eec3f0d8f
Update copyrights.
2022-01-16 13:19:25 +01:00
Viktor Kovacs
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
Viktor Kovacs
6b9732721a
Merge branch 'assimp:master' into common_base64
2022-01-10 21:15:31 +01:00
Kim Kulling
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
Kim Kulling
30f1583dde
Update utVersion.cpp
2022-01-09 21:06:05 +01:00
kovacsv
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
Garux
46f618a6ef
add Inter-Quake Model (IQM) Importer
2021-12-18 15:34:58 +03:00
Garux
7fc4603579
fix test/models/3DS/IMAGE1.bmp: is jpg
2021-12-18 14:32:46 +03:00
Kim Kulling
003942aafe
Merge branch 'master' into copyscene_fix
2021-12-13 21:19:08 +01:00
Kim Kulling
cb657e4c13
Use correct XmlParser-methods and add some missing casts
2021-12-13 18:06:23 +01:00
kovacsv
2be6bac4b0
Bug: Export crashes when any of the meshes contains texture coordinate names #4243
2021-12-07 20:42:43 +01:00
RichardTea
75e7d0f6ef
Merge branch 'master' into deprecated_gltfpbr_macros
2021-12-07 09:01:50 +00:00
Pencil Amazing
e831ecf3c2
Add a separate test case for Blender 276 and update Box.blend to be 293
2021-11-26 22:09:06 -04:00
Pencil Amazing
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
Kim Kulling
34daf87428
Delete test/models/3DS/UVTransformTest directory
...
- Remove deprecated data
2021-11-26 19:17:42 +01:00
RichardTea
d18709b899
Small float values should be true
2021-11-23 14:15:32 +00:00
RichardTea
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
Kim Kulling
bf1f142a72
Fix warnings
2021-11-20 18:40:38 +01:00
Kim Kulling
0d857bcf9f
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-20 12:35:56 +01:00
RichardTea
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
RichardTea
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
Kim Kulling
f48731622b
Disable m3d tesat
2021-11-13 08:30:29 +01:00
Kim Kulling
37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-12 10:37:19 +01:00
Kim Kulling
7120504c46
Merge branch 'master' into fix_aiMesh_abi_4162
2021-11-11 20:02:46 +01:00
Kim Kulling
9f28ef4c25
Merge branch 'master' into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-10 20:43:39 +01:00
Kim Kulling
a31c979abc
Use helloworld as X3D-Testcase
2021-11-10 20:40:05 +01:00
Kim Kulling
8ed18621db
Fixes
2021-11-10 20:37:27 +01:00
Kim Kulling
8a613a8655
Fix unittest
2021-11-09 23:27:58 +01:00
RichardTea
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
Kim Kulling
8c0b869998
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-10-28 13:38:41 +02:00
Malcolm Tyrrell
db0127859a
CalculateDistance method
2021-10-21 08:39:44 +01:00
Kim Kulling
791cb195be
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-10-20 21:14:43 +02:00
Malcolm Tyrrell
4ba99c1bb0
Comments
2021-10-20 16:15:00 +01:00
Malcolm Tyrrell
c644f9d719
Subtract the centroid
2021-10-20 15:08:08 +01:00
Kim Kulling
36c937cc19
Merge branch 'master' into debian-fixes
2021-10-18 09:07:47 +02:00
Kim Kulling
0e3d058504
Add some exporter macros.
2021-10-17 15:10:25 +02:00
IOhannes m zmölnig
3b8126d26a
Fix spelling mistake
2021-10-08 08:48:01 +02:00
Malcolm Tyrrell
5a1bcc6aa5
Fix build and test
2021-10-07 10:01:33 +01:00
Malcolm Tyrrell
7788c1a04e
Add a unit test for json schemas.
2021-10-07 10:01:32 +01:00
René Martin
65173df9d9
fixed x3d importer test
2021-09-16 13:45:56 +02:00
René Martin
3001d88172
Merge branch 'master' into x3d_pugi_migration
2021-09-07 15:04:08 +02:00
kovacsv
b39f38b73c
Add export property for assimp json exporter to write compressed json (without whitespaces).
2021-08-27 18:17:27 +02:00
kimmi
38dcd3583c
Fix compiler warnings: comparison signed unsigned.
2021-08-20 20:20:47 +02:00
kimmi
c396bc78b1
closes https://github.com/assimp/assimp/issues/3951 : Use using directive to define type.
2021-08-20 19:40:04 +02:00
Krishty
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
RichardTea
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
Aaron Gokaslan
8e3a159141
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-23 10:10:28 -04:00
Aaron Gokaslan
94c3abd841
Apply various performance fixes from clang-tidy
2021-06-22 12:27:15 -04:00
RichardTea
985f3ee665
Fix glTFv2 texcoord/uv mapping
...
Use the standard property to indicate the UV map index
2021-06-14 15:11:41 +01:00
RichardTea
fb039bb9eb
Add glTFv2 Clearcoat import/export tests
...
Uses Clearcoat model from Khronos
2021-06-14 15:11:41 +01:00
RichardTea
4a66ec25d0
Standardise Clearcoat, Sheen and Transmission
...
Also cleanup glTFv2 defaults, don't import/export if disabled
2021-06-14 15:11:41 +01:00
RichardTea
4476352882
First pass at simplifying glTFv2 PBR
...
Removed 'core' set of GLTF-specific properties
2021-06-14 15:11:41 +01:00
Kim Kulling
e01a6b4276
Add xml doc.
2021-05-18 21:15:48 +02:00
Kim Kulling
3f5c3eb38c
Delete dna.txt
2021-05-05 15:11:36 +02:00
Kim Kulling
067993d607
Delete dae.dae
2021-05-05 15:11:20 +02:00
Kim Kulling
0aadd8a3f9
Delete spiderExport.stl
2021-05-05 15:10:59 +02:00
Kim Kulling
d1991ad949
Delete AssimpLog_Cpp.txt
2021-05-05 15:10:50 +02:00
Kim Kulling
e683c6eef9
Delete testExport.stl
2021-05-05 15:10:30 +02:00
Kim Kulling
9395322e56
Delete AssimpLog_C.txt
2021-05-05 15:10:22 +02:00
kkulling
2a6b84c8ea
- closes https://github.com/assimp/assimp/issues/3830
...
- Fix rgba2hex
- Add tests
2021-05-05 14:43:51 +02:00
Krishty
930cc25c0e
fixed version string test
2021-04-19 09:51:44 +02:00
Scott Baldric
31e8042071
Renaming PI to aiPi.
2021-04-05 09:59:22 -05:00
Malcolm Tyrrell
8d86bcf0fb
Also check member
2021-03-15 16:32:17 +00:00
Malcolm Tyrrell
57652a9084
Version is strictly a string
2021-03-15 16:27:50 +00:00
Kim Kulling
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
Kim Kulling
c669c8f1eb
Merge branch 'master' into update_copyrights
2021-02-28 12:18:41 +01:00
Kim Kulling
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
Kim Kulling
888415246e
Merge branch 'master' into issue_2195_draco
2021-02-08 11:52:54 +01:00
Kim Kulling
6b7b1caa06
Merge branch 'master' into fix_gcc_compiler_warning
2021-02-05 21:59:21 +01:00
Kim Kulling
6f759474bc
Merge branch 'issue_3564' of https://github.com/assimp/assimp into issue_3564
2021-02-05 21:45:53 +01:00
Kim Kulling
710f1d17d4
RapidJSon: Upgrade to latest greatest
2021-02-05 21:45:37 +01:00
Kim Kulling
0e941c2478
Merge branch 'master' into issue_3564
2021-02-05 20:45:18 +01:00
Kim Kulling
6784427287
Workaround: disable test which cause undefined behaviour.
2021-02-05 20:44:39 +01:00
kimkulling
4207c97c17
Fix compiler warning: warning: argument to ... call is the same expression as the source
2021-02-05 20:01:57 +01:00
Kim Kulling
5fbbba2fac
Merge branch 'master' into issue_2195_draco
2021-01-31 16:02:57 +01:00
contriteobserver
5a8e00b219
Merge branch 'master' into SignCompareFix
2021-01-30 16:57:22 -08:00
contriteobserver
c86dcbe1a8
cleaned up sign-compare unittest build warnings
...
addresses issue #3624
2021-01-30 16:49:32 -08:00
Kim Kulling
79eb9ecc86
Update all minimum cmake req to 3.10
2021-01-29 21:05:46 +01:00
Kim Kulling
79a442f95d
Fixes a mem leak in aiMetadata::Set
2021-01-29 20:25:02 +01:00
RichardTea
26ce6ba4f6
draco unit test when draco disabled
...
Should not load the draco file
2021-01-27 10:25:56 +00:00
RichardTea
dde7605158
Implement draco decoding
2021-01-26 16:08:12 +00:00
RichardTea
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
RichardTea
7c9cddf786
Draco test file
...
2CylinderEngine from https://github.com/KhronosGroup/glTF-Sample-Models
2021-01-15 17:25:36 +00:00
JacksonM8
3eed6fa006
Remove relative pathing in target_sources() as per CMP0076
2021-01-07 01:23:41 +10:30
Malcolm Tyrrell
19af3f0d31
Swap the meaning using the out_mat property.
2020-12-02 16:59:29 +00:00
Malcolm Tyrrell
f7be3048de
New 3ds Max PBR Materials in FBX
2020-12-01 12:05:42 +00:00
Kim Kulling
db7e594221
Merge branch 'master' into findDegeneratesOptimization
2020-11-14 12:32:57 +01:00
Kim Kulling
75818f26eb
closes https://github.com/assimp/assimp/issues/3187
...
Do not use pthread for android
2020-11-11 21:13:17 +01:00
Malcolm Tyrrell
a68f78ab94
C++11
2020-11-02 15:03:17 +00:00
Malcolm Tyrrell
75570307d6
Remove unneeded line
2020-11-02 14:50:20 +00:00
Malcolm Tyrrell
3deae8760c
Optimize FindDegenerates so it doesn't explode
2020-11-02 14:43:35 +00:00
Kim Kulling
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
Rahul Sheth
b7c6719ed8
Fix test builds
2020-10-12 16:47:36 -04:00
Kim Kulling
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
Kim Kulling
09a473ff02
fic tests.
2020-10-05 19:06:48 +02:00
kimkulling
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
Kim Kulling
b4f79411aa
Fix lowrcase names.
2020-09-30 11:24:41 +02:00
Kim Kulling
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00