Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,779 Commits 19 Branches 43 Tags
046c229e486369ee52ec45db37e18a022cc511d3
Commit Graph

2819 Commits

Author SHA1 Message Date
Turo Lamminen
046c229e48 AssbinExporter: Fix strict aliasing violation 2017-09-15 12:41:40 +03:00
Turo Lamminen
f4a0ab81b1 AssbinExporter: Add Write specialization for aiColor3D 2017-09-15 12:41:13 +03:00
Turo Lamminen
b9efc234d0 DefaultLogger: Whitespace cleanup to fix GCC misleading indentation warning 2017-09-15 12:40:07 +03:00
Turo Lamminen
0b140db0a4 glTFExporter: Silence uninitialized variable warning 
This is a false positive, idx_srcdata_begin is only used if comp_allow
is true and in that case it's also initialized.
 2017-09-15 12:39:58 +03:00
vkovalev123
58213804ff Update 3DSLoader.cpp 
Fixed reading of CHINK_RGBF. If reading performs on x32 platform then reading will execute right, but on x64 it`s wrong because it will read 8 bytes instead 4.
 2017-09-14 14:55:02 +03:00
Kim Kulling
afd6c4d57d Revert "Asan" 2017-09-13 21:40:44 +02:00
Kim Kulling
d139b4d180 Merge pull request #1423 from Matter-and-Form/feature/gltf2 
glTF 2 Importer + glTF 2 Spec Conformity
 2017-09-13 20:01:38 +02:00
Kim Kulling
d49f86f1e7 Merge pull request #1427 from turol/asan 
Asan
 2017-09-13 19:38:44 +02:00
Turo Lamminen
b6f122ff2c Fix delete / delete[] mismatch in glTFAsset 2017-09-13 11:31:05 +03:00
Kim Kulling
6a3b030094 MDP: fix encoding issues. 2017-09-12 21:16:59 +02:00
Kim Kulling
b5f770e456 Merge branch 'master' of https://github.com/assimp/assimp 2017-09-12 19:07:21 +02:00
Kim Kulling
e3163ec15e FBX: fix some minor findings. 2017-09-12 19:07:17 +02:00
Kim Kulling
cbedc448c6 closes https://github.com/assimp/assimp/issues/1426: add Defines.h to include folder for install. 2017-09-12 18:59:38 +02:00
John Senneker
933bbb4f1c Manually read alphaMode material property 2017-09-12 11:55:52 -04:00
John Senneker
eca008d5ec Properly move string passed to JSON writer 2017-09-12 11:55:22 -04:00
Daniel Hritzkiv
b0da0796c8 Fix Segfault caused by losing pointer to std::string 
Keep std::string alive
 2017-09-12 10:07:15 -04:00
Daniel Hritzkiv
cde29c937c Formatting 2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
b1a5ca4516 Use forceNumber argument of WriteAttrs to write correct attribute names, instead 2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
990fe143a1 Fix mesh primitive’s attributes’ names 
Per spec

TEXCOORD -> TEXCOORD_0
COLOR -> COLOR_0
JOINTS -> JOINTS_0
WEIGHTS -> WEIGHTS_0

Remove JOINTMATRIX since it’s not supported (and doesn’t seem to be output, anyway)

TANGENT should be added at a later date
 2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
816e6909ca Remove KHR_binary_glTF code 
Binary glTF is now part of the glTF2 spec. However, it’s implemented incorrectly, so will be temporarily removed
 2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
b4f5033d89 Remove compresssed file format flag 2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
d518289e72 more specific token search for Collada Loader 
collada can appear in many files, such as glTFs via the “generator” field (in the form of collada2gltf)
 2017-09-11 11:02:15 -04:00
Daniel Hritzkiv
5cb13aa4b3 Load gltf .bin files from correct directory 2017-09-11 11:02:15 -04:00
Daniel Hritzkiv
a438ece655 Remove premultipliedAlpha from gltf2 2017-09-11 11:02:15 -04:00
John Senneker
140b903d7a Fix parsing of glTF version 
Handle version as int in gltf
Fix format specifiers in glTF version parser
 2017-09-11 11:02:15 -04:00
John Senneker
19876e9822 Add support for importing both glTF and glTF2 files 2017-09-11 11:02:15 -04:00
John Senneker
2ee7991558 Restrict search for OFF header to first 3 bytes 2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
a5e8e0b2bd Remove commented out code 2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
0a8183531e Set alphaMode, baseColorFactor opacity when model’s opacity isn’t 1 2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
37582131f4 Set the metallicFactor to 0 if source file doesn’t have metallicFactor 
Otherwise, the models have full metallic materials and appear very dim
 2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
da6a252efb Fix METALLIC_FACTOR typo 2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
3ba00ca421 Define gltf material property names as constants 2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
54dd4804cd Fix indentation 2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
44757af34a Implement pbrSpecularGlossiness property as Nullable 2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
03cfa04ee4 Define default material values as static constants 
for reuse
 2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
1a5823700f Remove need for Has by returning an empty Ref in Get 2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
21259e0835 Use different form of index accessor 2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
37527849b7 Export material names properly 2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
a9c4fa84b5 Sampler improvements; Add new LazyDict method 
Samplers are now imported into assimp internal format from textures;
Samplers have defaults as per spec;
Sampler enums are strongly typed with UNSET values;
Samplers are exported properly;
Sampler filters are exported as well;
Samplers are re-used across textures on export
Default sampler values are not written
 2017-09-11 11:02:12 -04:00
Daniel Hritzkiv
7245cceead Set default values on Sampler 2017-09-11 10:55:51 -04:00
Daniel Hritzkiv
2abdbdb55e Fix unused CopyValue 2017-09-11 10:55:51 -04:00
Daniel Hritzkiv
63ef19d9ad Export extensions 2017-09-11 10:55:51 -04:00
Daniel Hritzkiv
d277995a97 Formatting 2017-09-11 10:55:51 -04:00
Daniel Hritzkiv
7f01e3f48f Only export byteStride if not 0 2017-09-11 10:55:50 -04:00
Daniel Hritzkiv
a0d97505e5 store node mesh vs. meshes 
glTF nodes can only hold one mesh. this simply assigns to and check’s a Node’s Mesh
 2017-09-11 10:55:50 -04:00
Daniel Hritzkiv
ab08a7c3cb reenable animation and skins exports 
Currently incorrect, however. May need to be removed
 2017-09-11 10:55:50 -04:00
Daniel Hritzkiv
f09892ab63 Write specularGlossiness textures on the specularGlossiness object 2017-09-11 10:50:39 -04:00
Daniel Hritzkiv
feee7528d6 Make sure on flag for specularGlossiness is being persisted 2017-09-11 10:50:39 -04:00
Daniel Hritzkiv
8bef546b41 mention pbrSpecularGlossiness support 2017-09-11 10:50:39 -04:00
Daniel Hritzkiv
2d54019b8f Remove OPEN3DGC and compression references 2017-09-11 10:50:39 -04:00