fb213e4bac
FBX Importer: apply inverse of geometric transform to child nodes.
2018-02-21 12:45:09 +01:00
7cd1a66c8b
Use correct lookup.
2018-02-20 22:08:40 +01:00
a92dbabc25
Update FileSystemFilter.h
...
Fix missing save.
2018-02-20 16:36:55 +01:00
7c33d932e3
Merge branch 'master' into master
2018-02-20 10:40:04 +01:00
d49c5b6ecf
Merge branch 'master' into fix-paint3d-vertexcolor
2018-02-20 09:23:53 +01:00
a84604f566
Merge branch 'master' into develop_kimkulling
2018-02-20 09:04:11 +01:00
f0ccff70a4
Update FileSystemFilter.h
...
Fix review findings
2018-02-20 09:03:18 +01:00
5f4539db28
Merge branch 'master' into issue_1773
2018-02-19 22:55:11 +01:00
b9a34dbc50
Merge branch 'master' into globalscale-registry
2018-02-19 20:19:17 +01:00
f78f273916
Merge branch 'master' into issue_1773
2018-02-19 15:54:46 +01:00
1de9b3232a
Silence a clang warning.
2018-02-19 15:04:46 +01:00
95f66f84ef
Remove constexpr for MSVC.
2018-02-19 14:33:40 +01:00
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
219702597f
Merge branch 'master' into develop_kimkulling
2018-02-19 11:47:41 +01:00
8950504cf0
Fix import of materials.
2018-02-18 21:30:23 +01:00
58436068e7
Update BlenderScene.cpp
2018-02-16 22:16:10 +01:00
1b53c26943
Merge branch 'master' into globalscale-registry
2018-02-15 18:04:38 +01:00
a7587cb526
Merge branch 'master' into issue_1773
2018-02-15 15:31:41 +01:00
ccbcaa2ee8
fix some static-analysis findings.
2018-02-13 20:36:22 +01:00
cdfe33e3f2
Merge branch 'master' into pbrmaterial_h
2018-02-13 19:17:18 +01:00
4fb0e85d9d
Merge branch 'master' into issue_1773
2018-02-13 14:45:14 +01:00
9a7611a93e
AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h
2018-02-12 22:33:51 +01:00
331e67c32d
3mf: introduce first prototype for basematerial support.
2018-02-12 22:07:12 +01:00
8a4fd2f947
globalScale process not registered
2018-02-12 21:51:40 +01:00
78173177e8
closes https://github.com/assimp/assimp/issues/1564 : remove copy constructor.
2018-02-12 21:45:47 +01:00
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
f00d450d25
Update BlenderDNA.inl
2018-02-11 17:43:49 +01:00
c874fd8ae2
changed std::to_string to to_string.
2018-02-09 16:18:49 +01:00
affedc139e
Merge https://github.com/assimp/assimp
2018-02-09 15:54:34 +01:00
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
4e4098f1fc
Merge branch 'master' into issue_567
2018-02-08 20:29:47 +01:00
674a47dd3e
closes https://github.com/assimp/assimp/issues/567 : prevend dependency cycle
2018-02-08 20:24:18 +01:00
c7ea536351
closes https://github.com/assimp/assimp/issues/1386 : fix undefined behaviour in compare function.
2018-02-07 20:21:05 +01:00
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
277fa2da93
Merge branch 'master' into memleaks
2018-02-07 00:38:23 +01:00
57c1fe5954
x-parser: fix the crash.
2018-02-06 23:59:46 +01:00
4736160b79
Update BlenderDNA.h
2018-02-06 22:36:37 +01:00
495ae70cc5
XFileParser: release x-file-based scene when throwing an exception.
2018-02-06 19:21:56 +01:00
17b26c91e2
OpenGEX: Use std::unique_ptr to fix some memory leaks
2018-02-06 20:20:16 +02:00
5ce9ece0cc
OpenGEX: Replace std::copy with explicit loop
2018-02-06 20:08:49 +02:00
aa434b9566
OpenGEX: Add comment about pointer ownership
2018-02-06 20:05:02 +02:00
ef891fb850
LWO: Move some assignments to make it clearer when the thing should be moved
2018-02-06 19:58:05 +02:00
3b68ffe363
LWO: Use C++11 auto for easier refactoring
2018-02-06 19:50:42 +02:00
9344074a04
MDLLoader: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:22:32 +02:00
1aed63afb7
OpenGEX: Replace another raw pointer with vector to fix a memory leak
2018-02-06 19:13:54 +02:00
880be5403f
OpenGEX: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:03:47 +02:00
c42dd9104c
BlenderLoader: Fix memory leak
2018-02-06 18:52:23 +02:00
d284d107e7
XGLLoader: Fix a memory leak
2018-02-06 18:43:51 +02:00
dceb7257dd
Update XFileParser.cpp
...
Fix the build.
2018-02-05 13:53:06 +01:00
eb23946fe7
Update XFileParser.cpp
...
Fix alignment for float and double.
2018-02-05 13:44:19 +01:00
ff556027ef
X: fix some review findings.
2018-02-05 00:33:41 +01:00
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
1a9f17e13d
Merge branch 'master' into issue_774
2018-02-04 18:33:22 +01:00
c5157bc471
fbx: global settings use float instead of double.
2018-02-04 17:13:58 +01:00
37d352622b
closes https://github.com/assimp/assimp/issues/774 : use correct type for unitscale in fbx.
2018-02-04 16:42:36 +01:00
5278e1a5f8
CSM: Fix a possible memory leak by using std::unique_ptr
2018-02-03 17:52:25 +02:00
cfcaf3e97b
BVH: Initialize all members of Node in constructor
2018-02-03 17:38:30 +02:00
da19ed0b2a
BaseImporter: Remove dead condition
...
operator new never returns NULL, it throws exception on allocation failure
2018-02-03 17:25:31 +02:00
be865ae613
LimitBoneWeightsProcess: Initialize all members of Weight in constructor
2018-02-03 17:19:27 +02:00
9397932e4f
PretransformVertices: Rearrange some assignments to clarify things
2018-02-03 17:08:25 +02:00
d47f34344e
closes https://github.com/assimp/assimp/issues/1752 : move guard over include statement.
2018-02-03 08:46:03 +01:00
58d1ef6492
Merge branch 'master' into unzipExt
2018-02-01 19:21:09 +01:00
a1963feab7
Merge branch 'master' into warning4221
2018-01-31 20:27:45 +01:00
2714e146e0
Update OgreXmlSerializer.cpp
...
- Make constats static
- add asserts to check against nullptr dereferencing
2018-01-31 09:57:34 +01:00
8f99c1a0be
including <unzip.h> instead of <contrib/unzip/unzip.h>
2018-01-30 22:13:44 +01:00
46e9d1321d
Merge branch 'master' into warning4221
2018-01-30 21:41:44 +01:00
388ec8461c
Ogre: Change OgreXmlSerializer::ReadAttribute parameter from std::string to pointer
2018-01-30 20:12:46 +02:00
cfc9a69512
Ogre: Don't create std::strings in global scope where char pointer will do
2018-01-30 20:03:28 +02:00
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
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
be33feba44
Warning LNK4221 when not building exporter.
2018-01-29 12:39:40 +01:00
bd29fe73fa
Merge branch 'master' into new_license_dates
2018-01-28 20:16:17 +01:00
b049933d2f
update license dates.
2018-01-28 19:42:05 +01:00
e0cbd92da4
ASE: Delete BaseNode constructor which doesn't take name
2018-01-27 18:48:57 +02:00
4b20e9712c
ASE: Explicitly pass "DUMMY" as Dummy node name
2018-01-27 18:48:57 +02:00
2d1bd1eec4
ASE: Delete Camera default constructor
2018-01-27 18:48:57 +02:00
7fef5e6d23
ASE: Explicitly pass "UNNAMED" as default camera name
2018-01-27 18:48:57 +02:00
945f2bed09
ASE: Add Camera constructor which takes name
2018-01-27 18:48:57 +02:00
039ca38542
ASE: Delete Light default constructor
2018-01-27 18:48:57 +02:00
4fd791796c
ASE: Explicitly pass "UNNAMED" as default Light name
2018-01-27 18:48:57 +02:00
f3d702339c
ASE: Add Light constructor which takes name
2018-01-27 18:48:57 +02:00
17f801ae8a
ASE: Delete Mesh default constructor
2018-01-27 18:48:57 +02:00
59ab30cb25
ASE: Explicitly pass "UNNAMED" as default mesh name
2018-01-27 18:48:57 +02:00
f3474fb399
ASE: Add Mesh constructor which takes name
2018-01-27 18:48:57 +02:00
3874720947
ASE: Add BaseNode constructor which takes name
2018-01-27 18:48:57 +02:00
1836b00f51
ASE: Delete Bone default constructor
2018-01-27 18:48:57 +02:00
e75f7a5964
ASE: Explicitly pass "UNNAMED" as default bone name
2018-01-27 18:48:57 +02:00
3f377e11f5
3DS: Delete Node default constructor
2018-01-27 18:48:57 +02:00
0d69b15238
3DS: Explicitly pass "UNNAMED" as 3DS root node name
2018-01-27 18:48:57 +02:00
6c23b57208
3DS: Pass name to Node constructor
2018-01-27 18:48:57 +02:00
56a19ac492
3DS: Add Node constructor which takes name
2018-01-27 18:48:57 +02:00
c0c06093b4
3DS: Whitespace
2018-01-27 18:48:57 +02:00
8c219c7bd1
3DS: Delete Mesh default constructor
2018-01-27 18:48:57 +02:00
93fa373206
3DS: Pass name to Mesh constructor
2018-01-27 18:48:57 +02:00
b580064414
3DS: Add Mesh constructor with takes name
2018-01-27 18:48:57 +02:00
25c5384208
Merge branch 'master' into master
2018-01-25 09:11:14 +01:00
2e7e16b52b
Merge branch 'master' into issue_1728
2018-01-24 23:58:55 +01:00
1037ac5b93
Merge branch 'master' into issue_1721
2018-01-24 21:57:53 +01:00
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
47a2775b94
Update FBXConverter.cpp
...
Renamed nested looping variable
2018-01-24 21:30:25 +01:00
0b15d5cd46
closes https://github.com/assimp/assimp/issues/1721 : set camera parameters instead of nonsense.
2018-01-24 21:20:34 +01:00
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
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
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
e6ff15d201
3DS: Initialize Material name in initializer list
2018-01-23 20:41:26 +02:00
4acd96d405
3DS: Remove Material default constructor
2018-01-23 20:36:51 +02:00
dd7035372d
3DS: Pass default material name to constructor instead of changing after the fact
2018-01-23 20:36:05 +02:00
10246bf052
3DS: Pass default material name to Material constructor
2018-01-23 20:29:46 +02:00
f2ec3eeeb8
ASE: Delete Material default constructor
2018-01-23 20:20:37 +02:00
209966ef35
ASE: Pass default material name to constructor
2018-01-23 20:15:21 +02:00
1b28124f21
ASE: Pass a default material name when resizing submaterials buffer
2018-01-23 19:54:16 +02:00
4b1b5f1b59
ASE: Pass a default material name when resizing materials buffer
2018-01-23 19:50:20 +02:00
60d78f1701
ASE: Add Material constructor which takes material name
2018-01-23 19:43:15 +02:00
d49996d8a6
3DS: Add Material constructor which takes material name
2018-01-23 19:38:38 +02:00
024aade208
ASE: Add explicit default constructors and assignment operators to Material
2018-01-23 19:33:50 +02:00
9e7b21f83d
3DS: Add explicit default constructors and assignment operators to Material
2018-01-23 19:24:22 +02:00
4d946d9e31
ASE: Reformat another initializer list
2018-01-23 19:10:00 +02:00
6c4e3bce53
3DS: Reformat initializer list
2018-01-23 18:58:23 +02:00
70ae30f26a
ASE: Reformat initializer list
2018-01-23 18:58:19 +02:00
88a0bb1b6d
FBX: store UnitScaleFactor for fbx-files.
2018-01-23 15:13:23 +01:00
8ac1de3287
closes https://github.com/assimp/assimp/issues/1390 : aiScene now stores metadata as well.
2018-01-23 15:12:57 +01:00
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
5f38bd01ec
restored gltf checks.
2018-01-18 22:28:44 +01:00
c749594e9d
gltf instant ok on valid extension.
2018-01-18 19:12:51 +01:00
55ca48e838
Merge branch 'master' of https://github.com/assimp/assimp
2018-01-18 19:08:54 +01:00
8b9b770f9f
Merge branch 'master' into gltf2-fixes
2018-01-16 21:50:48 +01:00
81fbe2c7d3
Merge branch 'master' into issue_1660
2018-01-16 17:13:02 +01:00
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
5e6cae3094
Force normalized normals
2018-01-16 09:56:44 +01:00
0f4189c77e
Forced 4-bits alignment for glTF buffers
2018-01-16 09:26:18 +01:00
0c37ef55be
IFCLoader.h fix
2018-01-15 19:23:13 -08:00
f88572f572
fix includes
2018-01-15 19:14:44 -08:00
86fa0f4524
Merge branch 'master' into master
2018-01-15 19:10:14 -08:00
d0c92e30be
conflict resolution again, temp. move LogAux.h
2018-01-15 19:07:33 -08:00
68db518696
Fix IFC branch merge conflict
2018-01-15 19:00:56 -08:00
c07069821d
Merge branch 'master' into better_fbx_material_import
2018-01-14 22:04:20 +01:00
03b43ee9c3
Merge branch 'master' into ifc_40
2018-01-13 14:40:50 +01:00
5e339d0ff0
fix case-sensitive typo in include.
2018-01-13 10:54:38 +01:00
cecab969c6
IFC: introduce new namespace fpr IFC-schema2x3
2018-01-13 10:27:45 +01:00
4410de1c44
correct header path for new process
2018-01-11 13:21:40 -08:00
925be5e983
Merge branch 'master' into master
2018-01-11 13:13:46 -08:00
193165fb43
Merge branch 'master' into issue_1684
2018-01-11 10:16:20 -08:00
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
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
88df886bcc
Merge branch 'master' into issue_1605
2018-01-11 11:39:14 +01:00
538bc95499
Merge branch 'master' into master
2018-01-10 20:10:54 -08:00
3e127bebff
glTF 2.0: Import scale for normal textures and strength for occlusion textures
...
resolves #1693
2018-01-10 16:45:17 -08:00
936eb26dde
Merge branch 'master' into issue_1605
2018-01-11 00:54:35 +01:00
bb71f2ba64
Merge branch 'master' into issue_1605
2018-01-10 12:04:41 -08:00
45d5f2eec8
Merge branch 'master' into issue_1691
2018-01-10 20:50:37 +01:00
978c156c2a
added import of material properties (double sided and transparency) in glTF 1.0 importer.
2018-01-10 20:02:41 +01:00
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
dc79b572cf
glTF 2.0: Assign default material to meshes with no material reference.
...
fixes #1691
2018-01-08 14:57:55 -08:00
4235765856
glTF 2.0: Set camera "look at" to (0.0, 0.0, -1.0).
2018-01-08 14:19:30 -08:00
0fff3b1232
Merge branch 'master' into master
2018-01-08 15:36:03 +01:00
559bc38e5d
Embedding images post-process
2018-01-08 09:26:52 +01:00
5ef13e7b38
Merge branch 'master' into master
2018-01-07 11:34:18 -08:00
dd7a323103
Merge branch 'master' into issue_1574
2018-01-07 11:30:03 +01:00
7b5c543b82
Merge branch 'master' into master
2018-01-06 14:48:23 -08:00
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
b2bfb40859
Merge branch 'master' into remove_ctest
2018-01-06 21:31:22 +01:00
3896f3ffce
Merge branch 'master' into 1674-buffer-relative-uri
2018-01-06 20:40:27 +01:00
01081765ad
closes https://github.com/assimp/assimp/issues/1638 : use memcpy instead of dynamic_cast.
2018-01-06 18:03:27 +01:00
6bbdb669e1
Merge branch 'master' into master
2018-01-06 09:30:13 +01:00
ca152f41e2
Merge branch 'master' into 1674-buffer-relative-uri
2018-01-06 09:19:48 +01:00
66171de915
Successful lib build, unit testing still WIP
2018-01-05 16:18:33 -08:00
9b5df71150
Not using external bin file for glb2
2018-01-05 10:28:12 +01:00
988acd00f1
Using relative buffers URI
2018-01-05 10:08:17 +01:00
f376a3e8cd
move data declaration after test if elements are in current scope.
2018-01-04 13:09:43 +01:00
9efa4282fe
closes https://github.com/assimp/assimp/issues/1460 : skip uv- and color-components if these are not defined.
2018-01-04 12:37:35 +01:00
2f6dab53f4
Merge branch 'master' into remove_ctest
2018-01-04 00:28:04 +01:00
c66c7d7ae6
remove ctest to make workspace more readable.
2018-01-03 17:22:07 +01:00
d0bee866c0
Merge remote-tracking branch 'github/master' into contrib
2018-01-03 16:15:07 +01:00
712a7ee779
Fixed bug in IFC where SweptDiskSolid tessellation would fail for polylines with only 2 points.
...
Indeed, the EstimateSampleCount is not always accurate in this case, as the number of generated curvature pointer is greater by one. Moreover, it is redundant to call EstimateSampleCount, as the SampleDiscrete method will provide the (correct) number of points anyway. This commit fix the described bug, but also increase the efficiency of the ProcessSweptDiskSolid method, as EstimateSampleCount is only called once now, instead of two times.
2018-01-03 16:14:20 +01:00
32dfd423db
Fixed bug in IFC when dimensional exponent parameters in IfcSIUnits is not defined.
...
Usually, the value of this parameter is derived from parents, but it is not always the case for some files.
2018-01-03 16:08:18 +01:00
8a505398a3
MMD: Fix memory leak
2018-01-02 20:35:06 +02:00
aac41cf2c3
MMD: Fix delete / delete[] mismatch
...
Also this was a horrible abuse of std::vector and shouldn't have worked
2018-01-02 20:28:08 +02:00
7ebd8e7543
glTFAsset: Use std:unique_ptr for Image data
2018-01-02 20:09:22 +02:00
d308cfcb43
glTF: Fix delete / delete[] mismatch
2018-01-02 19:23:21 +02:00
ced6e8ce43
Use std::unique_ptr in ObjFileParser
2017-12-30 13:23:44 +01:00
606fd6b1a1
Replace assertion by an exception in Obj parsing
...
This crash could happen when the user try to parse an ill-formed obj file.
2017-12-29 18:07:41 +01:00
20ef807982
Remove assertion in ObjFileImporter
...
This assertion is already handled by an exception, and could lead to a
crash when parsing an ill-formed OBJ file.
2017-12-29 17:56:30 +01:00
096056b899
Q3BSP: Fix build with clang libc++
2017-12-24 22:17:59 +02:00
dc94e5921e
MDLImporter: Use unique_ptr
...
Fixes a double free
2017-12-24 22:17:11 +02:00
55e69272bd
MMD: Remove bogus assert
...
It can be triggered by input file, it's undocumented and it looks like nothing breaks
2017-12-24 22:15:19 +02:00
90cdd0f20c
RemoveComments: Fix out-of-bounds read when file ends with a comment
2017-12-24 22:14:39 +02:00
4078543827
OpenGEX: Throw exception on malformed color4 instead of crashing
2017-12-24 14:57:14 +02:00
7932a85ca1
Raw: Fix unitialized values in scene
2017-12-24 14:38:26 +02:00
1ad789bae9
Raw: Reformat code, no functional change
2017-12-24 14:26:53 +02:00
4a65e76ca7
Fix buffer overflow in obj loader
...
The overflow-checking code in ObjFileImporter::createVertexArray is at
the wrong position, allowing buffer overflows in preceding code.
This fix moves the code to the right spot.
An actual overflow can be caused by usign some more bugs and weird
behaviours and injecting a malformed line statement into the object
file, containing only one index. Such a malformed file could for
example look like:
o 1
v 0 0 0
v 1 1 1
v 2 2 2
l 1
f 1 2 3
Because the code in ObjFileImporter::createTopology incorrectly handles
line-type faces containing only one index (in line 364), it
underestimates the number of required indices and therefore causes the
buffer allocated in line 421 to be too small.
I believe, the correct fix for this would be in the parser and
rejecting such faces early. However the overflow check was misplaced
anyway.
If you can't reproduce a crash, just insert some more "l 1" lines
before the "f 1 2 3" line until it crashes. The behaviour of heap buffer
overflows strongly depends on memory layout and allocation history.
2017-12-23 17:57:48 +01:00
5a30bccdae
closes https://github.com/assimp/assimp/issues/1612 : make wstaring handling depend from encoding of the filename.
2017-12-22 16:45:07 +01:00
2294390917
Merge branch 'master' into iosystem-patch
2017-12-20 09:57:54 +01:00
06179cee04
Update FBXDocument.cpp
2017-12-19 22:53:59 +01:00
bb5495f99a
Q3BSP: Add assertion to silence a static analyzer warning
2017-12-19 19:39:04 +02:00
c44522d4db
ObjImporter: Fix possible memory leak
2017-12-19 19:38:38 +02:00
47b725a8c8
MDCLoader: Fix horrible pointer casting hack
2017-12-19 18:55:14 +02:00
0cf772a4d4
MDCLoader: Replace min and strlen with strnlen
2017-12-19 18:46:48 +02:00
65ffeaa81e
ObjImporter: Use unique_ptr
2017-12-19 18:24:03 +02:00
1e9f329e6d
MMD: Add virtual destructor to a class which already has virtual functions
2017-12-19 18:18:14 +02:00
b6800a9992
X3DImporter: Add virtual destructors to some classes which already have virtual functions
2017-12-19 18:16:41 +02:00
4623c2f14c
FBX Embedding Fix
...
FBX files may use a texture reference from an embedded texture that hasn't been loaded yet. This patch fixes this issue, storing all texture filenames, that can be acessed later via "scene::GetEmbeddedTexture", when all textures are already loaded.
Some warnings have been added to other file formats that uses embedded data.
2017-12-18 18:14:54 -02:00
04dc52fcf0
Merge branch 'master' into iosystem-patch
2017-12-18 08:59:14 +01:00
39e36371f9
Merge branch 'master' into nonascii_chars_in_fbxmaterial_cpp
2017-12-17 20:41:52 +01:00
76dd48d64f
Update FBXDocumentUtil.h
2017-12-17 18:43:23 +01:00
47c422ea49
Fix non-ascii encoding in comments in FBXMaterial.cpp.
...
It looks like it was just saved with a wrong encoding,
as these 0xB4 characters were in place of "'".
Also converted tabs to spaces to match indent in the rest of the file.
2017-12-17 16:40:12 +01:00
d081b4ab4e
Merge branch 'master' into fix_clang5_issue
2017-12-17 16:11:44 +01:00
efc893a139
Merge branch 'master' into gltf2-exporter-improvements
2017-12-17 09:39:14 +01:00
3d743151ce
Merge branch 'master' into fix_1623
2017-12-17 09:04:08 +01:00
0bcf5c22db
Merge branch 'master' into unique_ptr
2017-12-17 02:16:48 +01:00
74319a6a50
Merge branch 'master' into fix_gltf_exporter_define_name
2017-12-17 00:30:56 +01:00
05f8af950a
Merge branch 'master' into master
2017-12-16 19:56:41 +01:00
463dec5c7e
Change StreamReader::IncPtr argument to signed
...
Negative values are passed to it so it needs to be signed
2017-12-16 15:48:01 +02:00
2f082340fc
MDLLoader: Add workaround for clang 5.0 build issue
2017-12-16 15:48:01 +02:00
379562055b
Fix incorrect NO_GLTF_IMPORTER define name in glTFExporter.h
2017-12-15 23:18:45 +01:00
32e5e3a576
Forgot to uncomment isBinary
2017-12-15 15:40:31 +01:00
5e63ba9a9d
typo.
2017-12-14 18:10:42 +01:00
dec3e2ba42
XGLLoader: fix const issue when seeting vec2.
2017-12-14 18:06:28 +01:00
d29173aaa9
Following specification for padding
2017-12-14 17:32:18 +01:00
eb0608f2e9
diable unaigned pointer access temprary, second one.
2017-12-14 17:00:16 +01:00
722420c5dc
diable unaigned pointer access temprary.
2017-12-14 16:51:47 +01:00
422776b479
Merge branch 'master' into master
2017-12-14 16:38:22 +01:00
d09df8cc07
Fixed leftover log
2017-12-14 16:18:17 +01:00
31a4ccaebb
Added support for generating glb2 (binary glTF 2)
2017-12-14 16:11:12 +01:00
50bcaf39fd
Fix issue #1623 : crash when loading multiple PLY files
...
Pointer mGeneratedMesh was not reset to nullptr when transfering ownership
to pScene->mMeshes
2017-12-12 20:48:51 +01:00
89afe0780b
B3DImporter: Fix double free when reusing Importer
2017-12-12 20:03:16 +02:00
824dfc314b
B3DImporter: Store node animations in unique_ptr
2017-12-12 19:46:11 +02:00
08a35d4e1f
B3DImporter: Store materials in unique_ptr
2017-12-12 19:46:11 +02:00
f1707e920d
B3DImporter: Store meshes in unique_ptr
2017-12-12 19:46:11 +02:00
acab4c327e
B3DImporter: Store animations in unique_ptr
2017-12-12 19:46:07 +02:00
30ae14fae9
B3DImporter: Add unique_to_array helper function
2017-12-12 18:40:28 +02:00
99031997bd
Fix 3MF define typo
2017-12-11 16:27:27 +01:00
8cd1ede9ba
Fix 3MF define typo
2017-12-11 16:26:45 +01:00
7337474b6c
Fix 3MF define typo
2017-12-11 16:26:00 +01:00
28b01cbdd1
Update to 4.1.0
2017-12-11 13:20:19 +01:00
2f93cd77f8
added path conversion code for unicode on windows
2017-12-11 10:28:50 +01:00
3e0b072263
Update FBXBinaryTokenizer.cpp
2017-12-09 23:42:23 +01:00
972d8517b5
fix the model xml
2017-12-07 17:50:18 +01:00
0588d6cccf
FBX: closes https://github.com/assimp/assimp/issues/1619 : return correct index for embedded textures.
2017-12-07 09:44:48 +01:00
c23c63e821
fix correct folder naming scheme.
2017-12-06 22:15:34 +01:00
95e9cd75fa
3MF: fix working test for 3MF-export.
2017-12-06 21:41:48 +01:00
e741e7aec6
Update MD5Loader.h
2017-12-02 23:16:10 +01:00
b8ab90ae4b
Merge branch 'master' into patch-16
2017-12-02 21:15:54 +01:00
2c3558fdd0
Remove ScopeGuard
2017-12-02 17:24:19 +02:00
b60d84a8a2
C4D: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:23:49 +02:00
bd4f024562
XGLLoader: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:22:19 +02:00
e8eccfa27d
FBX: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:19:18 +02:00
6f50be82aa
3MF: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:15:57 +02:00
f35d5952dc
BlenderLoader: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:13:43 +02:00
af8e297e0f
BaseImporter: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:10:06 +02:00
42c1c733b9
Update MD3Loader.cpp
2017-12-01 15:20:50 +01:00
4811c0bdd1
Merge branch 'master' into fix/multibody-binary-stls
2017-11-30 10:13:56 +01:00
5822d1920e
Update STLLoader.cpp
...
Retrigger travis + appveyor.
2017-11-30 09:22:55 +01:00
c27fda62e5
Merge branch 'master' into export_3mf
2017-11-30 00:32:23 +01:00
9be69a90b1
Merge branch 'master' into fix/multibody-binary-stls
2017-11-30 00:28:59 +01:00
46caecdf35
enable compiler switch test for no exporter requested.
2017-11-29 21:02:52 +01:00
98e98dc40c
Fix node names sharing same name
...
Uses node name if it is set, and globally unique id otherwise.
This may still break in some models (glTF2 spec doesn’t guaruntee name values to be unique). However, I couldn’t cause it to break any further using gltf2 models on hand.
Closes #1600
2017-11-29 12:20:44 -05:00
67c236647d
Restore import of multi mesh binary STLs
...
Regression introduced in: 9a9f18bbed
2017-11-29 11:20:09 -05:00
b5e79c3cb6
fix invalid include
2017-11-29 16:11:33 +01:00
ddd23fad3f
Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf
2017-11-28 19:05:00 +01:00
6a2cd1c91d
Update D3MFExporter.cpp
...
Fix the build
2017-11-28 10:14:23 +01:00
9bd9b3d99c
Merge branch 'master' into export_3mf
2017-11-28 09:24:02 +01:00
4b6e49ca7b
Update D3MFExporter.h
...
Fix review findings.
2017-11-28 09:09:04 +01:00
4f972661e8
Update D3MFExporter.cpp
...
Fix review findings.
2017-11-28 09:08:16 +01:00
7a395e274f
Merge branch 'master' into fix/gltf2-transforms
2017-11-28 08:48:19 +01:00
8ce5985aa0
Merge branch 'master' into fix/gltf2-preserve-node-names
2017-11-28 00:50:07 +01:00
09f7769820
remove unused attribute.
2017-11-27 23:36:32 +01:00
8e413ac1e3
Merge branch 'master' into export_3mf
2017-11-27 22:50:17 +01:00
7280dec838
fix unittest.
2017-11-27 22:46:57 +01:00
3dfca3bc84
3MF: add export to a given archive.
2017-11-27 21:48:33 +01:00
0031165789
Add support for tangents in glTF2.0 import
...
Closes #1562
2017-11-27 13:45:40 -05:00
0b04ae1d91
Preserve node names when importing glTF2.0
...
Closes #1522
2017-11-27 11:58:19 -05:00
e53d4735b0
Fix transform matrices multiplication order per glTF2.0 spec
...
Closes #1568
2017-11-27 11:32:05 -05:00
623b5a515a
Merge branch 'master' into fix-typo-gltf
2017-11-25 20:11:49 +01:00
eb452b28a2
Fix warning on MSVC14
2017-11-25 11:38:12 +01:00
d529dd17f9
Fix warning cast double to float
2017-11-24 22:29:58 +01:00
273f6b0267
Fix MSVC14 warning cast double to real
2017-11-24 22:13:38 +01:00
f80e8b39a1
Fix warning C4138: '*/' found outside of comment on MSVC14
2017-11-24 22:08:50 +01:00
c63263b025
Fix typo on gltf2 camera parameters
2017-11-24 22:02:47 +01:00
0bdb375804
Add missing file export into archive.
2017-11-24 18:59:37 +01:00
09a5946dbd
Prepare archive structure.
2017-11-23 22:47:18 +01:00
d180cfcba5
Merge branch 'master' into master
2017-11-22 16:01:16 +01:00
e35f789ace
Merge branch 'master' into scene_combiner_crash
2017-11-22 13:46:14 +01:00
454b8919b0
use one header for all xml-tags.
2017-11-21 21:34:25 +01:00
b474e75e29
3Mf-Export: add prototypes for relations and rest of 3MF-document.
2017-11-21 18:41:16 +01:00
a7be5b527f
add missing return statement.
2017-11-20 23:53:53 +01:00
9ca7b00280
Merge branch 'master' into export_3mf
2017-11-20 22:36:50 +01:00
c22b4acd47
3MF: Export initial commit.
2017-11-20 22:36:17 +01:00
70d9df868d
Merge branch 'master' into patch-12
2017-11-20 22:23:47 +01:00
ba3acd7459
Merge branch 'master' into patch-12
2017-11-20 19:56:14 +01:00
a05d74a281
[glTF2] Moved byteStride from accessor to bufferView
2017-11-20 19:01:28 +01:00
beff88228d
Merge branch 'master' into master
2017-11-20 18:56:10 +01:00
6cbfd5b977
[glTF2] Implemented reading binary glTF2 (glb) files
2017-11-20 14:59:05 +01:00
9f1dce8e57
Merge branch 'master' into master
2017-11-20 10:27:11 +02:00
4fb5038fb1
Add support for building Mac OS X Framework bundles
2017-11-20 00:10:05 +02:00
2a9f79f958
check for 0 properties before copy them
2017-11-19 19:05:51 +01:00
55c9761228
Merge branch 'master' into patch-12
2017-11-19 18:25:22 +01:00
9707fde709
check for nullptr dereferencing before copying scene data
2017-11-19 17:41:31 +01:00
65d6daa414
Merge branch 'master' into patch-13
2017-11-18 20:36:05 +01:00
1a1d96d3e2
Merge branch 'master' into fix_android
2017-11-18 18:32:58 +01:00
a8e65a1e8a
Fix android build.
2017-11-18 18:32:16 +01:00
Tommy
Kim Kulling
Kim Kulling
Giuseppe Barbieri
Martin Buchner
Sergio Acereda
mbuchner
Marco Di Benedetto
Turo Lamminen
Max Vollmer
Rohan Singh
Alexis Breust
BuildTools
Christian Meurin
awefers
A. Breust
Leo Terziman
Alexandre Avenel
Faule Socke
rickomax
Teybeo
Daniel Löber
Daniel Hritzkiv
awefers
Patrick Dähne
Mika Rautio
Mika Rautio