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

1006 Commits

Author SHA1 Message Date
Kim Kulling
df739f00dd Merge branch 'master' into issue_3398 2021-08-28 13:56:50 +02:00
Kim Kulling
4b1ff645e3 closes https://github.com/assimp/assimp/issues/3398: Add support for embedded textures 2021-08-12 21:13:07 +02:00
krishty
aac77e58b6 Merge branch 'master' into fix-logger-comments 2021-08-11 12:16:58 +02:00
krishty
73b25d2578 Merge branch 'master' into fix-logger-comments 2021-08-06 09:40:35 +02:00
krishty
6cb54d1c95 Merge branch 'master' into trim-trailing-whitespace 2021-08-06 09:40:03 +02:00
Hill Ma
538cb3125c Use strlen() rather than fixed length in fast_atof.h 
This avoids reading past the length of the input string.
 2021-08-02 13:21:07 -07:00
Krishty
a1eaaaa0e3 fix comments 
fixes some copy-paste errors in logger comments introduced with 89584c167a
 2021-07-29 14:45:39 +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
Kim Kulling
92af44f092 Fix euler angles 2021-07-26 15:47:19 +02:00
Kim Kulling
b5350899b2 Merge branch 'master' into master 2021-06-24 16:15:51 +02:00
Kim Kulling
00bf757688 Update material.h 2021-06-24 13:28:49 +02:00
Jerome St-Louis
170063643c include/material.h: Fixed broken C support 
- The aiGetMaterialFloat() and aiGetMaterialInteger() C preprocessor definitions were broken because:
   - They had a space before the opening parenthesis
   - Using material key definitions expanding 1 to argument into 3 breaks the invocation of macros expecting 5 parameters
 2021-06-23 18:15:01 -04:00
Evangel63
e736538df3 Merge branch 'master' into master 2021-06-23 13:45:23 +10:00
Kim Kulling
760953c834 Merge branch 'master' into clean_gltf_pbr_brdf 2021-06-22 20:10:03 +02:00
Kim Kulling
a8c75c34a1 Update scene.h 
Add some more checks against nullptr dereferecnes.
 2021-06-17 21:31:28 +02: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
Evangel
064ffc625b Const qualify aiMetadata::HasKey 2021-06-14 12:21:29 +10:00
Hill Ma
121c0e7d0c Add GetEmbeddedTextureAndIndex() to aiScene. 
It allows the caller to get the index of the embedded texture that is always computed anyway.
 2021-06-07 21:53:28 -07: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