Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,236 Commits 19 Branches 43 Tags
9f9d77f882efc445f46139ed2188ce21fc857032
Commit Graph

986 Commits

Author SHA1 Message Date
RichardTea
9f9d77f882 First pass at simplifying glTFv2 PBR 
Removed 'core' set of GLTF-specific properties
 2021-06-10 18:13:46 +01:00
Kim Kulling
8f18820bb2 Merge branch 'master' into master 2021-05-29 15:47:24 +02:00
Kim Kulling
70cc1630fa Merge branch 'master' into fix-gcc4.9-compilation 2021-05-27 15:25:01 +02:00
Kim Kulling
48e99d2e0a Merge branch 'master' into master 2021-05-27 10:45:36 +02:00
Kim Kulling
7258441153 Merge branch 'master' into fix-fov-doc 2021-05-27 10:26:20 +02:00
Carsten Rudolph
c33a4b2634 Fixed base name check. 2021-05-27 10:10:55 +02:00
Kim Kulling
29e5f5fed1 Merge branch 'master' into master 2021-05-26 13:18:04 +02:00
Evangel
2f4fba0703 Static cast i back to unsigned int because MSVC complains otherwise. 
i will never be bigger than an unsigned int since that's what mNumProperties is to begin with.
 2021-05-26 19:11:19 +10:00
Evangel
5468dd667e Fix bug in aiMetadata constructor that overwrites an array of one of aiString, aiVector3D, or aiMetadata with the first entry 
aiMetadata copy constructor calls aiMetadata::Get on the copied from aiMetadata using the const aiString &key version. When
this is called on the metadata of an array type, this overwrites all entries with the first entry. This is due to the key
of all entries in an array being the name of the array. ie, in a glTF2 file with an extension:
"Extension" : [
	"Value1",
	"Value2",
	"Value3"
]
the aiMetadata struct for the "Extension" entry will have 3 entries with key/value pairs as:
"Extension"/"Value1"
"Extension"/"Value2"
"Extension"/"Value3"
So when the copy constructor calls the key based aiMetadata::Get, it will find "Value1" for all three entries.

This change simply replaces the key based aiMetadata::Get with the index based aiMetadata::Get
 2021-05-26 18:36:56 +10:00
Jean-François Verdon
6c104e096e Merge branch 'master' into fix-gcc4.9-compilation 2021-05-23 19:06:28 +02:00
Kim Kulling
aeaa22cbbd Merge branch 'master' into UVStreamNames 2021-05-23 14:37:28 +02:00
Kim Kulling
ac54fe41e2 Merge branch 'master' into PBRsupport 2021-05-23 13:23:06 +02:00
Jean-François Verdon
b7b3c6db7e Fixing GCC 4.9 compilation issues 2021-05-22 16:57:07 +02:00
dlyr
1f32743f8b Fix camera fov comment since full fov is stored 2021-05-22 00:56:01 +02:00
Kim Kulling
ee85ebbd00 Merge branch 'master' into md3Tuning 2021-05-20 20:25:30 +02:00
Kim Kulling
20ade095ea Return null-type in case of an empty document 2021-05-20 13:40:44 +02:00
Kim Kulling
88ccfedd10 Fix possible nullptr dereferences. 2021-05-19 00:16:15 +02:00
Kim Kulling
3726b2eef4 fix the build 2021-05-18 21:21:43 +02:00
Kim Kulling
3fa45e6a8c Merge branch 'master' into sml_doc 2021-05-18 21:18:02 +02:00
Kim Kulling
e01a6b4276 Add xml doc. 2021-05-18 21:15:48 +02:00
Malcolm Tyrrell
54a27f4514 Merge branch 'master' into MalcolmTyrrell/loggingImprovements 2021-05-17 13:32:02 +01:00
Malcolm Tyrrell
3d3462a621 Simplify formatting templates. 2021-05-17 11:54:43 +01:00
Malcolm Tyrrell
084dc73b91 Fast path for unformatted calls. 2021-05-17 11:27:21 +01:00
Carsten Rudolph
43e1e4d3d3 Merge branch 'master' into master 2021-05-17 07:56:41 +02:00
Malcolm Tyrrell
ad6f300b1d Other LogAux functions 2021-05-13 10:43:28 +01:00
Malcolm Tyrrell
c5f22269a8 LogAux 2021-05-13 10:33:25 +01:00
Malcolm Tyrrell
5cd3bdd5c2 No need to distinguish formatting log functions. 2021-05-13 10:25:27 +01:00
Malcolm Tyrrell
6957d34733 Simplify the macros. 2021-05-13 10:14:24 +01:00
Malcolm Tyrrell
78145f1425 log verboseDebug 2021-05-13 10:08:59 +01:00
Malcolm Tyrrell
89584c167a Log debug 2021-05-13 09:56:42 +01:00
Malcolm Tyrrell
ca698c3e49 Log error 2021-05-13 09:36:42 +01:00
Malcolm Tyrrell
58bc4bcb63 log info 2021-05-12 12:55:21 +01:00
Malcolm Tyrrell
813d0aecdd Adjust warn 2021-05-12 12:43:24 +01:00
Salvage
8d20460ae4 Ditch decltype 2021-05-11 19:06:21 +02:00
Carsten Rudolph
a54cd432cd Merge branch 'master' into master 2021-05-11 07:58:05 +02:00
Salvage
632e4a20a9 Utilize decltype for slightly improved syntax 2021-05-11 05:29:51 +02:00
Kim Kulling
b30cbcf117 Merge branch 'master' into jc3-spam-killa 2021-05-09 21:47:17 +02:00
Jason C
e37e00c51f [assimp/fast_atof] Fixed garbage in exception messages. 
Also reduced 100 byte context output to 30 (which is still probably excessive, but not *as* excessive).
 2021-05-07 20:21:56 -04:00
Jason C
2fd6102573 Merge branch 'master' into jc3-spam-killa 2021-05-07 14:48:24 -04:00
Jason C
7b404788a6 Merge branch 'master' into jc3-cctype-fixes 2021-05-07 14:48:01 -04:00
Carsten Rudolph
1b33dd1965 Document AI_CONFIG_EXPORT_BLOB_NAME. 2021-05-07 17:31:38 +02:00
Carsten Rudolph
be85f238f4 Add optional blob base name to blob IO system. 2021-05-07 17:30:58 +02:00
Carsten Rudolph
964778cac1 Add AI_CONFIG_EXPORT_BLOB_NAME export property. 2021-05-07 17:30:26 +02:00
Kim Kulling
55056d11fd Add missing include 2021-05-06 11:50:08 +02:00
Jason C
c08ad2e5c2 Merge branch 'master' into jc3-cctype-fixes 2021-05-05 19:04:47 -04:00
Kim Kulling
992f10e7bf Merge branch 'master' into remove-useless-scaling-prototype 2021-05-05 21:54:31 +02:00
Jason C
7ae8a52d9f Merge branch 'master' into jc3-spam-killa 2021-05-05 10:33:29 -04:00
kkulling
2a6b84c8ea - closes https://github.com/assimp/assimp/issues/3830 
- Fix rgba2hex
- Add tests
 2021-05-05 14:43:51 +02:00
kkulling
f15dcfa981 - Fix model parsing 2021-05-05 13:10:52 +02:00
Jason C
6e65115253 [assimp/xml] Improved XML parse error message. 
Fixed typo, added detail.
 2021-05-05 00:33:57 -04:00