Kim Kulling
af8839a8b5
Merge branch 'master' into fbx_export_footer_tweak
2018-03-07 19:44:38 +01:00
Tommy
9f02c8a97c
Fix default opacity of materials exported to FBX by Blender.
2018-03-07 09:15:08 +01:00
JeffH-BMG
6fd64b95c3
Fix compile error
...
Add parens to use of 'sizeof' operator
2018-03-06 15:03:44 -05:00
JeffH-BMG
5ea06e1bb6
Add support for texture file in PLY exports
...
The PLY format has an unofficial way to specify an associated texture, using the "comment TextureFile" comment line. The PLY loader supports this, but the exporter does not. The change looks for a diffuse texture in the scene's materials, and if it finds one, it adds it to the exported mesh using "comment TextureFile".
2018-03-06 14:50:02 -05:00
JeffH-BMG
0dab5c508e
STL binary Export should write 4-byte floats for vertex and normal coordinates
...
The STL binary format uses 4-byte floats. When using double-precision builds of Asset Importer, the STL exporter was writing out 8-byte double values instead..
2018-03-06 13:55:32 -05:00
JeffH-BMG
05cf8bfb2e
Fix import of binary STL files in double-precision builds
...
When ASSIMP_DOUBLE_PRECISION is used, the STL loader attempts to read 8-byte double vertex and normal values from the STL file. STL files are written using 4-byte floats, however, and the import will read past the end of the buffer, and possibly crash.
2018-03-06 13:48:11 -05:00
Daniel Kirchner
f4c37fa245
Collada: add importer property that forces the use of collada names. Closes #1375 .
2018-03-06 00:30:33 +01:00
Kim Kulling
5312ec806e
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-03-05 18:19:36 +01:00
Kim Kulling
22182a907e
Merge branch 'master' into master
2018-03-05 13:20:07 +01:00
Alexandre Avenel
15fa86f100
Set primitive_type to point when PLY is a point cloud
2018-03-04 22:43:20 +01:00
Alexandre Avenel
f053695176
Fix issue #623 PLY importer should not create faces
...
When the PLY file contains no faces, we should not create them.
2018-03-04 22:43:20 +01:00
Alexandre Avenel
d2547e84f5
Fix for undefined behavior when loading binary PLY
...
This commit fix undefined behavior reported by UBSAN when loading a binary
PLY file.
2018-03-04 22:04:31 +01:00
Tommy
701f9ccfe9
FBX Export: minor tweak to footer.
...
Should now be identical to those output by the FBX SDK.
2018-03-03 19:53:49 +01:00
Kim Kulling
8e7b7a0d87
Merge branch 'master' into master
2018-03-02 15:04:28 +01:00
Tommy
a58f8e1c1a
FBX Export: add missing 0 value to file footer.
2018-02-28 23:38:49 +01:00
Josh Faust
f07d27eb07
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-02-27 18:47:11 -08:00
Josh Faust
190190c1d7
Fix material index off-by-one error in some OBJ files (seen in a C4D export)
2018-02-27 14:58:04 -08:00
Kim Kulling
ef371bddd6
Merge branch 'master' into master
2018-02-27 18:34:34 +01:00
Kim Kulling
c0f04bf965
IMporter: fix lookup for tokens during inmemory imports.
2018-02-27 18:30:36 +01:00
Kim Kulling
e99dfdb050
fix cppcheck findings.
2018-02-25 21:03:09 +01:00
Tommy
9d9acf6840
FBX Export: allow export even when not in bind pose,
...
iff all bones have an offset matrix defined.
2018-02-25 11:45:38 +01:00
Tommy
249f1844ae
FBX Export: reconstruct full skeleton for any FBX deformers.
2018-02-25 09:53:09 +01:00
Marco Di Benedetto
72e9f3ecb9
fixed embedded texture reading.
2018-02-24 18:47:43 +01:00
Marco Di Benedetto
138b990d0a
added missing install of pbrmaterial.h
2018-02-24 17:57:42 +01:00
Marco Di Benedetto
4b7cd97fea
added support for embedded textures defined with buffer views.
2018-02-24 17:44:40 +01:00
Marco Di Benedetto
b0ac2d9daf
Merge https://github.com/assimp/assimp
2018-02-24 17:06:12 +01:00
Tommy
a9d70b2dbc
FBX Import: properly delete inverse geotrans nodes when not using them.
2018-02-24 09:37:36 +01:00
Tommy
c18a07e47f
FBX Import: Properly clean up post_nodes_chain in case of exception.
2018-02-24 08:43:36 +01:00
Tommy
b91976eead
FBX Export: handle newly-added geometric transform inverse nodes.
...
This also tidies up the imported node structure a little,
by not adding the inverse nodes if there are no child nodes.
2018-02-24 08:42:05 +01:00
Kim Kulling
5e4b2b898f
Merge branch 'master' into fbx_export_squashed
2018-02-23 23:33:43 +01:00
Kim Kulling
375dd4c179
Update D3MFImporter.cpp
...
Fix order of init list.
2018-02-23 20:34:34 +01:00
Kim Kulling
437ae0c839
Merge branch 'master' into 3mf_basematerial_support
2018-02-23 18:29:54 +01:00
Kim Kulling
606a28dbe8
Merge branch 'master' into develop_kimkulling
2018-02-23 17:54:58 +01:00
Kim Kulling
1d901f075c
3mf-importer: fix parsing of base-material color.
2018-02-23 17:49:29 +01:00
Tommy
f847d4817d
FBX Export: fix logic for determining if scale transformation is identity.
...
Previously it was comparing scale.SquareLength() to 1.0.
2018-02-21 15:29:59 +01:00
Tommy
c1f353f6c7
FBX Export: Geometric transformations always create transformation chain.
...
In combination with fb213e4b
, this fixes #1112 .
2018-02-21 14:15:03 +01:00
Kim Kulling
50b6c63594
Merge branch 'master' into develop_kimkulling
2018-02-21 13:31:32 +01:00
Kim Kulling
22dbb6c2d2
Update FileSystemFilter.h
...
- Fix typo.
-test in public metod against invalid parameters
2018-02-21 13:10:51 +01:00
Tommy
fb213e4bac
FBX Importer: apply inverse of geometric transform to child nodes.
2018-02-21 12:45:09 +01:00
Kim Kulling
7cd1a66c8b
Use correct lookup.
2018-02-20 22:08:40 +01:00
Kim Kulling
a92dbabc25
Update FileSystemFilter.h
...
Fix missing save.
2018-02-20 16:36:55 +01:00
Kim Kulling
7c33d932e3
Merge branch 'master' into master
2018-02-20 10:40:04 +01:00
Kim Kulling
d49c5b6ecf
Merge branch 'master' into fix-paint3d-vertexcolor
2018-02-20 09:23:53 +01:00
Kim Kulling
a84604f566
Merge branch 'master' into develop_kimkulling
2018-02-20 09:04:11 +01:00
Kim Kulling
f0ccff70a4
Update FileSystemFilter.h
...
Fix review findings
2018-02-20 09:03:18 +01:00
Kim Kulling
5f4539db28
Merge branch 'master' into issue_1773
2018-02-19 22:55:11 +01:00
Kim Kulling
b9a34dbc50
Merge branch 'master' into globalscale-registry
2018-02-19 20:19:17 +01:00
Kim Kulling
f78f273916
Merge branch 'master' into issue_1773
2018-02-19 15:54:46 +01:00
Tommy
1de9b3232a
Silence a clang warning.
2018-02-19 15:04:46 +01:00
Tommy
95f66f84ef
Remove constexpr for MSVC.
2018-02-19 14:33:40 +01:00
Tommy
242b5d5874
Initial FBX Export Support, sponsored by MyDidimo (mydidimo.com).
...
Supports:
* mesh data with normals and uvs
* lambert and phong materials
* file textures
* bones / skeletons
* skinning
Does not yet support:
* animations
* cameras
* lights
* embedded textures
2018-02-19 13:53:55 +01:00
Kim Kulling
219702597f
Merge branch 'master' into develop_kimkulling
2018-02-19 11:47:41 +01:00
Kim Kulling
8950504cf0
Fix import of materials.
2018-02-18 21:30:23 +01:00
Giuseppe Barbieri
58436068e7
Update BlenderScene.cpp
2018-02-16 22:16:10 +01:00
Kim Kulling
1b53c26943
Merge branch 'master' into globalscale-registry
2018-02-15 18:04:38 +01:00
Martin Buchner
a7587cb526
Merge branch 'master' into issue_1773
2018-02-15 15:31:41 +01:00
Kim Kulling
ccbcaa2ee8
fix some static-analysis findings.
2018-02-13 20:36:22 +01:00
Kim Kulling
cdfe33e3f2
Merge branch 'master' into pbrmaterial_h
2018-02-13 19:17:18 +01:00
Kim Kulling
4fb0e85d9d
Merge branch 'master' into issue_1773
2018-02-13 14:45:14 +01:00
Sergio Acereda
9a7611a93e
AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h
2018-02-12 22:33:51 +01:00
Kim Kulling
331e67c32d
3mf: introduce first prototype for basematerial support.
2018-02-12 22:07:12 +01:00
Sergio Acereda
8a4fd2f947
globalScale process not registered
2018-02-12 21:51:40 +01:00
Kim Kulling
78173177e8
closes https://github.com/assimp/assimp/issues/1564 : remove copy constructor.
2018-02-12 21:45:47 +01:00
mbuchner
1299905026
Make FileSystemFilter forward all virtual functions to wrapped IOSystem instance
...
This makes it possible to override those functions. Previously the
default implementation was always used.
Fixes #1773
2018-02-12 12:13:44 +01:00
Giuseppe Barbieri
f00d450d25
Update BlenderDNA.inl
2018-02-11 17:43:49 +01:00
Marco Di Benedetto
c874fd8ae2
changed std::to_string to to_string.
2018-02-09 16:18:49 +01:00
Marco Di Benedetto
affedc139e
Merge https://github.com/assimp/assimp
2018-02-09 15:54:34 +01:00
Turo Lamminen
ebdad4f883
Ogre: Avoid creating function-scoped static constants
...
They're causing false positive race condition messages from Helgrind
2018-02-09 15:40:28 +02:00
Kim Kulling
4e4098f1fc
Merge branch 'master' into issue_567
2018-02-08 20:29:47 +01:00
Kim Kulling
674a47dd3e
closes https://github.com/assimp/assimp/issues/567 : prevend dependency cycle
2018-02-08 20:24:18 +01:00
Kim Kulling
c7ea536351
closes https://github.com/assimp/assimp/issues/1386 : fix undefined behaviour in compare function.
2018-02-07 20:21:05 +01:00
Max Vollmer
990dc983ed
Issue #1776 Fixed potential crash bug in ObjectCompare, because it didn't follow strict weak ordering. As counter-intuitive as it seems, a comparator must return false for equal values. The C++ standard defines and expects this behavior: true if lhs < rhs, false otherwise.
2018-02-07 10:48:39 +01:00
Kim Kulling
277fa2da93
Merge branch 'master' into memleaks
2018-02-07 00:38:23 +01:00
Kim Kulling
57c1fe5954
x-parser: fix the crash.
2018-02-06 23:59:46 +01:00
Giuseppe Barbieri
4736160b79
Update BlenderDNA.h
2018-02-06 22:36:37 +01:00
Kim Kulling
495ae70cc5
XFileParser: release x-file-based scene when throwing an exception.
2018-02-06 19:21:56 +01:00
Turo Lamminen
17b26c91e2
OpenGEX: Use std::unique_ptr to fix some memory leaks
2018-02-06 20:20:16 +02:00
Turo Lamminen
5ce9ece0cc
OpenGEX: Replace std::copy with explicit loop
2018-02-06 20:08:49 +02:00
Turo Lamminen
aa434b9566
OpenGEX: Add comment about pointer ownership
2018-02-06 20:05:02 +02:00
Turo Lamminen
ef891fb850
LWO: Move some assignments to make it clearer when the thing should be moved
2018-02-06 19:58:05 +02:00
Turo Lamminen
3b68ffe363
LWO: Use C++11 auto for easier refactoring
2018-02-06 19:50:42 +02:00
Turo Lamminen
9344074a04
MDLLoader: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:22:32 +02:00
Turo Lamminen
1aed63afb7
OpenGEX: Replace another raw pointer with vector to fix a memory leak
2018-02-06 19:13:54 +02:00
Turo Lamminen
880be5403f
OpenGEX: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:03:47 +02:00
Turo Lamminen
c42dd9104c
BlenderLoader: Fix memory leak
2018-02-06 18:52:23 +02:00
Turo Lamminen
d284d107e7
XGLLoader: Fix a memory leak
2018-02-06 18:43:51 +02:00
Kim Kulling
dceb7257dd
Update XFileParser.cpp
...
Fix the build.
2018-02-05 13:53:06 +01:00
Kim Kulling
eb23946fe7
Update XFileParser.cpp
...
Fix alignment for float and double.
2018-02-05 13:44:19 +01:00
Kim Kulling
ff556027ef
X: fix some review findings.
2018-02-05 00:33:41 +01:00
Kim Kulling
3685791e0d
closes https://github.com/assimp/assimp/issues/1729 : check for bit flip when unsigned int overflow happens in x-file parsing.
2018-02-04 22:15:18 +01:00
Kim Kulling
1a9f17e13d
Merge branch 'master' into issue_774
2018-02-04 18:33:22 +01:00
Kim Kulling
c5157bc471
fbx: global settings use float instead of double.
2018-02-04 17:13:58 +01:00
Kim Kulling
37d352622b
closes https://github.com/assimp/assimp/issues/774 : use correct type for unitscale in fbx.
2018-02-04 16:42:36 +01:00
Turo Lamminen
5278e1a5f8
CSM: Fix a possible memory leak by using std::unique_ptr
2018-02-03 17:52:25 +02:00
Turo Lamminen
cfcaf3e97b
BVH: Initialize all members of Node in constructor
2018-02-03 17:38:30 +02:00
Turo Lamminen
da19ed0b2a
BaseImporter: Remove dead condition
...
operator new never returns NULL, it throws exception on allocation failure
2018-02-03 17:25:31 +02:00
Turo Lamminen
be865ae613
LimitBoneWeightsProcess: Initialize all members of Weight in constructor
2018-02-03 17:19:27 +02:00
Turo Lamminen
9397932e4f
PretransformVertices: Rearrange some assignments to clarify things
2018-02-03 17:08:25 +02:00
Kim Kulling
d47f34344e
closes https://github.com/assimp/assimp/issues/1752 : move guard over include statement.
2018-02-03 08:46:03 +01:00
Kim Kulling
58d1ef6492
Merge branch 'master' into unzipExt
2018-02-01 19:21:09 +01:00
Kim Kulling
a1963feab7
Merge branch 'master' into warning4221
2018-01-31 20:27:45 +01:00
Kim Kulling
2714e146e0
Update OgreXmlSerializer.cpp
...
- Make constats static
- add asserts to check against nullptr dereferencing
2018-01-31 09:57:34 +01:00
Sergio Acereda
8f99c1a0be
including <unzip.h> instead of <contrib/unzip/unzip.h>
2018-01-30 22:13:44 +01:00
Kim Kulling
46e9d1321d
Merge branch 'master' into warning4221
2018-01-30 21:41:44 +01:00
Turo Lamminen
388ec8461c
Ogre: Change OgreXmlSerializer::ReadAttribute parameter from std::string to pointer
2018-01-30 20:12:46 +02:00
Turo Lamminen
cfc9a69512
Ogre: Don't create std::strings in global scope where char pointer will do
2018-01-30 20:03:28 +02:00
Turo Lamminen
0c66b3902e
Ogre: Avoid creating static std::strings
...
They're causing false positive race condition messages from Helgrind
2018-01-30 19:47:15 +02:00
Turo Lamminen
12396d0ce3
Ogre: Change OgreXmlSerializer::HasAttribute parameter from std::string to pointer
...
It's immediately passed via string pointer and in most places
it's already a raw string constant.
2018-01-30 19:42:58 +02:00
Sergio Acereda
be33feba44
Warning LNK4221 when not building exporter.
2018-01-29 12:39:40 +01:00
Kim Kulling
bd29fe73fa
Merge branch 'master' into new_license_dates
2018-01-28 20:16:17 +01:00
Kim Kulling
b049933d2f
update license dates.
2018-01-28 19:42:05 +01:00
Turo Lamminen
e0cbd92da4
ASE: Delete BaseNode constructor which doesn't take name
2018-01-27 18:48:57 +02:00
Turo Lamminen
4b20e9712c
ASE: Explicitly pass "DUMMY" as Dummy node name
2018-01-27 18:48:57 +02:00
Turo Lamminen
2d1bd1eec4
ASE: Delete Camera default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
7fef5e6d23
ASE: Explicitly pass "UNNAMED" as default camera name
2018-01-27 18:48:57 +02:00
Turo Lamminen
945f2bed09
ASE: Add Camera constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
039ca38542
ASE: Delete Light default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
4fd791796c
ASE: Explicitly pass "UNNAMED" as default Light name
2018-01-27 18:48:57 +02:00
Turo Lamminen
f3d702339c
ASE: Add Light constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
17f801ae8a
ASE: Delete Mesh default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
59ab30cb25
ASE: Explicitly pass "UNNAMED" as default mesh name
2018-01-27 18:48:57 +02:00
Turo Lamminen
f3474fb399
ASE: Add Mesh constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
3874720947
ASE: Add BaseNode constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
1836b00f51
ASE: Delete Bone default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
e75f7a5964
ASE: Explicitly pass "UNNAMED" as default bone name
2018-01-27 18:48:57 +02:00
Turo Lamminen
3f377e11f5
3DS: Delete Node default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
0d69b15238
3DS: Explicitly pass "UNNAMED" as 3DS root node name
2018-01-27 18:48:57 +02:00
Turo Lamminen
6c23b57208
3DS: Pass name to Node constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
56a19ac492
3DS: Add Node constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
c0c06093b4
3DS: Whitespace
2018-01-27 18:48:57 +02:00
Turo Lamminen
8c219c7bd1
3DS: Delete Mesh default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
93fa373206
3DS: Pass name to Mesh constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
b580064414
3DS: Add Mesh constructor with takes name
2018-01-27 18:48:57 +02:00
Kim Kulling
25c5384208
Merge branch 'master' into master
2018-01-25 09:11:14 +01:00
Kim Kulling
2e7e16b52b
Merge branch 'master' into issue_1728
2018-01-24 23:58:55 +01:00
Kim Kulling
1037ac5b93
Merge branch 'master' into issue_1721
2018-01-24 21:57:53 +01:00
Kim Kulling
5baba37414
closes https://github.com/assimp/assimp/issues/1728 : check if mesh is a null instance before dereferencing it.
2018-01-24 21:43:36 +01:00
Giuseppe Barbieri
47a2775b94
Update FBXConverter.cpp
...
Renamed nested looping variable
2018-01-24 21:30:25 +01:00
Kim Kulling
0b15d5cd46
closes https://github.com/assimp/assimp/issues/1721 : set camera parameters instead of nonsense.
2018-01-24 21:20:34 +01:00
Rohan Singh
b28bcc365c
Interpret IndexAToDirect as Direct when the index element is missing
...
Paint3D exports FBX like this, which is wrong, but could still support it
2018-01-24 09:45:20 -05:00
Turo Lamminen
a8fd9f668f
ASE: Explicitly write out Material move constructor and assignment operator
...
Because MSVC doesn't support defaulting them
2018-01-24 12:25:30 +02:00
Turo Lamminen
cbd7916ced
3DS: Explicitly write out Material move constructor and assignment operator
...
Because MSVC doesn't support defaulting them
2018-01-24 12:11:19 +02:00
Turo Lamminen
e6ff15d201
3DS: Initialize Material name in initializer list
2018-01-23 20:41:26 +02:00
Turo Lamminen
4acd96d405
3DS: Remove Material default constructor
2018-01-23 20:36:51 +02:00
Turo Lamminen
dd7035372d
3DS: Pass default material name to constructor instead of changing after the fact
2018-01-23 20:36:05 +02:00
Turo Lamminen
10246bf052
3DS: Pass default material name to Material constructor
2018-01-23 20:29:46 +02:00
Turo Lamminen
f2ec3eeeb8
ASE: Delete Material default constructor
2018-01-23 20:20:37 +02:00
Turo Lamminen
209966ef35
ASE: Pass default material name to constructor
2018-01-23 20:15:21 +02:00
Turo Lamminen
1b28124f21
ASE: Pass a default material name when resizing submaterials buffer
2018-01-23 19:54:16 +02:00
Turo Lamminen
4b1b5f1b59
ASE: Pass a default material name when resizing materials buffer
2018-01-23 19:50:20 +02:00
Turo Lamminen
60d78f1701
ASE: Add Material constructor which takes material name
2018-01-23 19:43:15 +02:00
Turo Lamminen
d49996d8a6
3DS: Add Material constructor which takes material name
2018-01-23 19:38:38 +02:00
Turo Lamminen
024aade208
ASE: Add explicit default constructors and assignment operators to Material
2018-01-23 19:33:50 +02:00
Turo Lamminen
9e7b21f83d
3DS: Add explicit default constructors and assignment operators to Material
2018-01-23 19:24:22 +02:00
Turo Lamminen
4d946d9e31
ASE: Reformat another initializer list
2018-01-23 19:10:00 +02:00
Turo Lamminen
6c4e3bce53
3DS: Reformat initializer list
2018-01-23 18:58:23 +02:00
Turo Lamminen
70ae30f26a
ASE: Reformat initializer list
2018-01-23 18:58:19 +02:00
kim kulling
88a0bb1b6d
FBX: store UnitScaleFactor for fbx-files.
2018-01-23 15:13:23 +01:00
kim kulling
8ac1de3287
closes https://github.com/assimp/assimp/issues/1390 : aiScene now stores metadata as well.
2018-01-23 15:12:57 +01:00
Kim Kulling
f0d03ec6b8
closes https://github.com/assimp/assimp/issues/1722 : use a const reference to fix issue with ppc.
2018-01-22 14:35:06 +01:00
Marco Di Benedetto
5f38bd01ec
restored gltf checks.
2018-01-18 22:28:44 +01:00
Marco Di Benedetto
c749594e9d
gltf instant ok on valid extension.
2018-01-18 19:12:51 +01:00
Marco Di Benedetto
55ca48e838
Merge branch 'master' of https://github.com/assimp/assimp
2018-01-18 19:08:54 +01:00
Kim Kulling
8b9b770f9f
Merge branch 'master' into gltf2-fixes
2018-01-16 21:50:48 +01:00
Kim Kulling
81fbe2c7d3
Merge branch 'master' into issue_1660
2018-01-16 17:13:02 +01:00
Kim Kulling
d230635ff6
STLLoader: closes https://github.com/assimp/assimp/issues/1660 : use memcpy instead of a c-style dynamic cast to parse a aiVector3D
2018-01-16 16:31:15 +01:00
Alexis Breust
5e6cae3094
Force normalized normals
2018-01-16 09:56:44 +01:00
Alexis Breust
0f4189c77e
Forced 4-bits alignment for glTF buffers
2018-01-16 09:26:18 +01:00
BuildTools
0c37ef55be
IFCLoader.h fix
2018-01-15 19:23:13 -08:00
BuildTools
f88572f572
fix includes
2018-01-15 19:14:44 -08:00
Christian Meurin
86fa0f4524
Merge branch 'master' into master
2018-01-15 19:10:14 -08:00
BuildTools
d0c92e30be
conflict resolution again, temp. move LogAux.h
2018-01-15 19:07:33 -08:00
BuildTools
68db518696
Fix IFC branch merge conflict
2018-01-15 19:00:56 -08:00
Kim Kulling
c07069821d
Merge branch 'master' into better_fbx_material_import
2018-01-14 22:04:20 +01:00
Kim Kulling
03b43ee9c3
Merge branch 'master' into ifc_40
2018-01-13 14:40:50 +01:00
Kim Kulling
5e339d0ff0
fix case-sensitive typo in include.
2018-01-13 10:54:38 +01:00
Kim Kulling
cecab969c6
IFC: introduce new namespace fpr IFC-schema2x3
2018-01-13 10:27:45 +01:00
BuildTools
4410de1c44
correct header path for new process
2018-01-11 13:21:40 -08:00
Christian Meurin
925be5e983
Merge branch 'master' into master
2018-01-11 13:13:46 -08:00
awefers
193165fb43
Merge branch 'master' into issue_1684
2018-01-11 10:16:20 -08:00
Axel Wefers
0e99f1f587
Build fix for 1684
...
Requires cast from size_t to uint64 like in other places, otherwise the call to the constructor for GenericValue() is ambiguous.
Fixes #1684
2018-01-11 10:15:05 -08:00
Tommy
fb4a67d4fe
Improve FBX material import.
...
Some properties were being incorrectly interpreted,
and by default it was relying on a legacy system.
2018-01-11 17:30:21 +01:00
Kim Kulling
88df886bcc
Merge branch 'master' into issue_1605
2018-01-11 11:39:14 +01:00
Christian Meurin
538bc95499
Merge branch 'master' into master
2018-01-10 20:10:54 -08:00
Axel Wefers
3e127bebff
glTF 2.0: Import scale for normal textures and strength for occlusion textures
...
resolves #1693
2018-01-10 16:45:17 -08:00
Kim Kulling
936eb26dde
Merge branch 'master' into issue_1605
2018-01-11 00:54:35 +01:00
awefers
bb71f2ba64
Merge branch 'master' into issue_1605
2018-01-10 12:04:41 -08:00
Kim Kulling
45d5f2eec8
Merge branch 'master' into issue_1691
2018-01-10 20:50:37 +01:00
Marco Di Benedetto
978c156c2a
added import of material properties (double sided and transparency) in glTF 1.0 importer.
2018-01-10 20:02:41 +01:00
Axel Wefers
901b981260
glTF: Always check signature
...
Always check signature for glTF 1.0 and glTF 2.0 files to select the correct importer. Fixes #1605
2018-01-09 09:37:57 -08:00
Axel Wefers
dc79b572cf
glTF 2.0: Assign default material to meshes with no material reference.
...
fixes #1691
2018-01-08 14:57:55 -08:00
Axel Wefers
4235765856
glTF 2.0: Set camera "look at" to (0.0, 0.0, -1.0).
2018-01-08 14:19:30 -08:00
Kim Kulling
0fff3b1232
Merge branch 'master' into master
2018-01-08 15:36:03 +01:00
Alexis Breust
559bc38e5d
Embedding images post-process
2018-01-08 09:26:52 +01:00
Christian Meurin
5ef13e7b38
Merge branch 'master' into master
2018-01-07 11:34:18 -08:00
Kim Kulling
dd7a323103
Merge branch 'master' into issue_1574
2018-01-07 11:30:03 +01:00
Christian Meurin
7b5c543b82
Merge branch 'master' into master
2018-01-06 14:48:23 -08:00
Kim Kulling
abc01bcdf0
closes https://github.com/assimp/assimp/issues/1574 : add API to get name of current branch.
2018-01-06 21:52:58 +01:00
Kim Kulling
b2bfb40859
Merge branch 'master' into remove_ctest
2018-01-06 21:31:22 +01:00
Kim Kulling
3896f3ffce
Merge branch 'master' into 1674-buffer-relative-uri
2018-01-06 20:40:27 +01:00