v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,031 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

3476 Commits (cc1bde0514773ff9b96ca2284215e20545017f4a)

Author SHA1 Message Date
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
Kim Kulling 01081765ad closes https://github.com/assimp/assimp/issues/1638: use memcpy instead of dynamic_cast. 2018-01-06 18:03:27 +01:00
Kim Kulling 6bbdb669e1
Merge branch 'master' into master 2018-01-06 09:30:13 +01:00
A. Breust ca152f41e2
Merge branch 'master' into 1674-buffer-relative-uri 2018-01-06 09:19:48 +01:00
BuildTools 66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Alexis Breust 9b5df71150 Not using external bin file for glb2 2018-01-05 10:28:12 +01:00
Alexis Breust 988acd00f1 Using relative buffers URI 2018-01-05 10:08:17 +01:00
Kim Kulling f376a3e8cd move data declaration after test if elements are in current scope. 2018-01-04 13:09:43 +01:00
Kim Kulling 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
Kim Kulling 2f6dab53f4
Merge branch 'master' into remove_ctest 2018-01-04 00:28:04 +01:00
Kim Kulling c66c7d7ae6 remove ctest to make workspace more readable. 2018-01-03 17:22:07 +01:00
Leo Terziman d0bee866c0 Merge remote-tracking branch 'github/master' into contrib 2018-01-03 16:15:07 +01:00
Leo Terziman 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
Leo Terziman 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
Turo Lamminen 8a505398a3 MMD: Fix memory leak 2018-01-02 20:35:06 +02:00
Turo Lamminen 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
Turo Lamminen 7ebd8e7543 glTFAsset: Use std:unique_ptr for Image data 2018-01-02 20:09:22 +02:00
Turo Lamminen d308cfcb43 glTF: Fix delete / delete[] mismatch 2018-01-02 19:23:21 +02:00
Alexandre Avenel ced6e8ce43 Use std::unique_ptr in ObjFileParser 2017-12-30 13:23:44 +01:00
Alexandre Avenel 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
Alexandre Avenel 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
Turo Lamminen 096056b899 Q3BSP: Fix build with clang libc++ 2017-12-24 22:17:59 +02:00
Turo Lamminen dc94e5921e MDLImporter: Use unique_ptr 
Fixes a double free
 2017-12-24 22:17:11 +02:00
Turo Lamminen 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
Turo Lamminen 90cdd0f20c RemoveComments: Fix out-of-bounds read when file ends with a comment 2017-12-24 22:14:39 +02:00
Turo Lamminen 4078543827 OpenGEX: Throw exception on malformed color4 instead of crashing 2017-12-24 14:57:14 +02:00
Turo Lamminen 7932a85ca1 Raw: Fix unitialized values in scene 2017-12-24 14:38:26 +02:00
Turo Lamminen 1ad789bae9 Raw: Reformat code, no functional change 2017-12-24 14:26:53 +02:00
Faule Socke 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
Kim Kulling 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
Kim Kulling 2294390917
Merge branch 'master' into iosystem-patch 2017-12-20 09:57:54 +01:00
Giuseppe Barbieri 06179cee04
Update FBXDocument.cpp 2017-12-19 22:53:59 +01:00
Turo Lamminen bb5495f99a Q3BSP: Add assertion to silence a static analyzer warning 2017-12-19 19:39:04 +02:00
Turo Lamminen c44522d4db ObjImporter: Fix possible memory leak 2017-12-19 19:38:38 +02:00
Turo Lamminen 47b725a8c8 MDCLoader: Fix horrible pointer casting hack 2017-12-19 18:55:14 +02:00
Turo Lamminen 0cf772a4d4 MDCLoader: Replace min and strlen with strnlen 2017-12-19 18:46:48 +02:00
Turo Lamminen 65ffeaa81e ObjImporter: Use unique_ptr 2017-12-19 18:24:03 +02:00
Turo Lamminen 1e9f329e6d MMD: Add virtual destructor to a class which already has virtual functions 2017-12-19 18:18:14 +02:00
Turo Lamminen b6800a9992 X3DImporter: Add virtual destructors to some classes which already have virtual functions 2017-12-19 18:16:41 +02:00
rickomax 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
Kim Kulling 04dc52fcf0
Merge branch 'master' into iosystem-patch 2017-12-18 08:59:14 +01:00
Kim Kulling 39e36371f9
Merge branch 'master' into nonascii_chars_in_fbxmaterial_cpp 2017-12-17 20:41:52 +01:00
Giuseppe Barbieri 76dd48d64f
Update FBXDocumentUtil.h 2017-12-17 18:43:23 +01:00
Tommy 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
Kim Kulling d081b4ab4e
Merge branch 'master' into fix_clang5_issue 2017-12-17 16:11:44 +01:00
Kim Kulling efc893a139
Merge branch 'master' into gltf2-exporter-improvements 2017-12-17 09:39:14 +01:00
Kim Kulling 3d743151ce
Merge branch 'master' into fix_1623 2017-12-17 09:04:08 +01:00
Kim Kulling 0bcf5c22db
Merge branch 'master' into unique_ptr 2017-12-17 02:16:48 +01:00
Kim Kulling 74319a6a50
Merge branch 'master' into fix_gltf_exporter_define_name 2017-12-17 00:30:56 +01:00
Kim Kulling 05f8af950a
Merge branch 'master' into master 2017-12-16 19:56:41 +01:00
Turo Lamminen 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
Turo Lamminen 2f082340fc MDLLoader: Add workaround for clang 5.0 build issue 2017-12-16 15:48:01 +02:00
Tommy 379562055b Fix incorrect NO_GLTF_IMPORTER define name in glTFExporter.h 2017-12-15 23:18:45 +01:00
Alexis Breust 32e5e3a576 Forgot to uncomment isBinary 2017-12-15 15:40:31 +01:00
Kim Kulling 5e63ba9a9d typo. 2017-12-14 18:10:42 +01:00
Kim Kulling dec3e2ba42 XGLLoader: fix const issue when seeting vec2. 2017-12-14 18:06:28 +01:00
Alexis Breust d29173aaa9 Following specification for padding 2017-12-14 17:32:18 +01:00
Kim Kulling eb0608f2e9 diable unaigned pointer access temprary, second one. 2017-12-14 17:00:16 +01:00
Kim Kulling 722420c5dc diable unaigned pointer access temprary. 2017-12-14 16:51:47 +01:00
Kim Kulling 422776b479
Merge branch 'master' into master 2017-12-14 16:38:22 +01:00
Alexis Breust d09df8cc07 Fixed leftover log 2017-12-14 16:18:17 +01:00
Alexis Breust 31a4ccaebb Added support for generating glb2 (binary glTF 2) 2017-12-14 16:11:12 +01:00
Alexandre Avenel 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
Turo Lamminen 89afe0780b B3DImporter: Fix double free when reusing Importer 2017-12-12 20:03:16 +02:00
Turo Lamminen 824dfc314b B3DImporter: Store node animations in unique_ptr 2017-12-12 19:46:11 +02:00
Turo Lamminen 08a35d4e1f B3DImporter: Store materials in unique_ptr 2017-12-12 19:46:11 +02:00
Turo Lamminen f1707e920d B3DImporter: Store meshes in unique_ptr 2017-12-12 19:46:11 +02:00
Turo Lamminen acab4c327e B3DImporter: Store animations in unique_ptr 2017-12-12 19:46:07 +02:00
Turo Lamminen 30ae14fae9 B3DImporter: Add unique_to_array helper function 2017-12-12 18:40:28 +02:00
Teybeo 99031997bd
Fix 3MF define typo 2017-12-11 16:27:27 +01:00
Teybeo 8cd1ede9ba
Fix 3MF define typo 2017-12-11 16:26:45 +01:00
Teybeo 7337474b6c
Fix 3MF define typo 2017-12-11 16:26:00 +01:00
Kim Kulling 28b01cbdd1
Update to 4.1.0 2017-12-11 13:20:19 +01:00
Daniel Löber 2f93cd77f8 added path conversion code for unicode on windows 2017-12-11 10:28:50 +01:00
Giuseppe Barbieri 3e0b072263
Update FBXBinaryTokenizer.cpp 2017-12-09 23:42:23 +01:00
Kim Kulling 972d8517b5 fix the model xml 2017-12-07 17:50:18 +01:00
Kim Kulling 0588d6cccf FBX: closes https://github.com/assimp/assimp/issues/1619: return correct index for embedded textures. 2017-12-07 09:44:48 +01:00
Kim Kulling c23c63e821 fix correct folder naming scheme. 2017-12-06 22:15:34 +01:00
Kim Kulling 95e9cd75fa 3MF: fix working test for 3MF-export. 2017-12-06 21:41:48 +01:00
Giuseppe Barbieri e741e7aec6
Update MD5Loader.h 2017-12-02 23:16:10 +01:00
Kim Kulling b8ab90ae4b
Merge branch 'master' into patch-16 2017-12-02 21:15:54 +01:00
Turo Lamminen 2c3558fdd0 Remove ScopeGuard 2017-12-02 17:24:19 +02:00
Turo Lamminen b60d84a8a2 C4D: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:23:49 +02:00
Turo Lamminen bd4f024562 XGLLoader: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:22:19 +02:00
Turo Lamminen e8eccfa27d FBX: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:19:18 +02:00
Turo Lamminen 6f50be82aa 3MF: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:15:57 +02:00
Turo Lamminen f35d5952dc BlenderLoader: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:13:43 +02:00
Turo Lamminen af8e297e0f BaseImporter: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:10:06 +02:00
Giuseppe Barbieri 42c1c733b9
Update MD3Loader.cpp 2017-12-01 15:20:50 +01:00
Kim Kulling 4811c0bdd1
Merge branch 'master' into fix/multibody-binary-stls 2017-11-30 10:13:56 +01:00
Kim Kulling 5822d1920e
Update STLLoader.cpp 
Retrigger travis + appveyor.
 2017-11-30 09:22:55 +01:00
Kim Kulling c27fda62e5
Merge branch 'master' into export_3mf 2017-11-30 00:32:23 +01:00
Kim Kulling 9be69a90b1
Merge branch 'master' into fix/multibody-binary-stls 2017-11-30 00:28:59 +01:00
Kim Kulling 46caecdf35 enable compiler switch test for no exporter requested. 2017-11-29 21:02:52 +01:00
Daniel Hritzkiv 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
Daniel Hritzkiv 67c236647d
Restore import of multi mesh binary STLs 
Regression introduced in: 9a9f18bbed

This restores the behaviour for binary STLs with multiple bodies.

The code could be improved (to reuse code found at the end of LoadASCIIFile) but for now this is a quick fix
 2017-11-29 11:20:09 -05:00
Kim Kulling b5e79c3cb6 fix invalid include 2017-11-29 16:11:33 +01:00
Kim Kulling ddd23fad3f Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf 2017-11-28 19:05:00 +01:00
Kim Kulling 6a2cd1c91d
Update D3MFExporter.cpp 
Fix the build
 2017-11-28 10:14:23 +01:00
Kim Kulling 9bd9b3d99c
Merge branch 'master' into export_3mf 2017-11-28 09:24:02 +01:00
Kim Kulling 4b6e49ca7b
Update D3MFExporter.h 
Fix review findings.
 2017-11-28 09:09:04 +01:00
Kim Kulling 4f972661e8
Update D3MFExporter.cpp 
Fix review findings.
 2017-11-28 09:08:16 +01:00
Kim Kulling 7a395e274f
Merge branch 'master' into fix/gltf2-transforms 2017-11-28 08:48:19 +01:00
Kim Kulling 8ce5985aa0
Merge branch 'master' into fix/gltf2-preserve-node-names 2017-11-28 00:50:07 +01:00
Kim Kulling 09f7769820 remove unused attribute. 2017-11-27 23:36:32 +01:00
Kim Kulling 8e413ac1e3
Merge branch 'master' into export_3mf 2017-11-27 22:50:17 +01:00
Kim Kulling 7280dec838 fix unittest. 2017-11-27 22:46:57 +01:00
Kim Kulling 3dfca3bc84 3MF: add export to a given archive. 2017-11-27 21:48:33 +01:00
awefers 0031165789
Add support for tangents in glTF2.0 import 
Closes #1562
 2017-11-27 13:45:40 -05:00
awefers 0b04ae1d91
Preserve node names when importing glTF2.0 
Closes #1522
 2017-11-27 11:58:19 -05:00
awefers e53d4735b0
Fix transform matrices multiplication order per glTF2.0 spec 
Closes #1568
 2017-11-27 11:32:05 -05:00
Kim Kulling 623b5a515a
Merge branch 'master' into fix-typo-gltf 2017-11-25 20:11:49 +01:00
Alexandre Avenel eb452b28a2 Fix warning on MSVC14 2017-11-25 11:38:12 +01:00
Alexandre Avenel d529dd17f9 Fix warning cast double to float 2017-11-24 22:29:58 +01:00
Alexandre Avenel 273f6b0267 Fix MSVC14 warning cast double to real 2017-11-24 22:13:38 +01:00
Alexandre Avenel f80e8b39a1 Fix warning C4138: '*/' found outside of comment on MSVC14 2017-11-24 22:08:50 +01:00
Alexandre Avenel c63263b025 Fix typo on gltf2 camera parameters 2017-11-24 22:02:47 +01:00
Kim Kulling 0bdb375804 Add missing file export into archive. 2017-11-24 18:59:37 +01:00
Kim Kulling 09a5946dbd Prepare archive structure. 2017-11-23 22:47:18 +01:00
Kim Kulling d180cfcba5
Merge branch 'master' into master 2017-11-22 16:01:16 +01:00
Kim Kulling e35f789ace
Merge branch 'master' into scene_combiner_crash 2017-11-22 13:46:14 +01:00
Kim Kulling 454b8919b0 use one header for all xml-tags. 2017-11-21 21:34:25 +01:00
Kim Kulling b474e75e29 3Mf-Export: add prototypes for relations and rest of 3MF-document. 2017-11-21 18:41:16 +01:00
Kim Kulling a7be5b527f add missing return statement. 2017-11-20 23:53:53 +01:00
Kim Kulling 9ca7b00280 Merge branch 'master' into export_3mf 2017-11-20 22:36:50 +01:00
Kim Kulling c22b4acd47 3MF: Export initial commit. 2017-11-20 22:36:17 +01:00
Kim Kulling 70d9df868d
Merge branch 'master' into patch-12 2017-11-20 22:23:47 +01:00
Kim Kulling ba3acd7459
Merge branch 'master' into patch-12 2017-11-20 19:56:14 +01:00
Patrick Dähne a05d74a281 [glTF2] Moved byteStride from accessor to bufferView 2017-11-20 19:01:28 +01:00
Kim Kulling beff88228d
Merge branch 'master' into master 2017-11-20 18:56:10 +01:00
Patrick Dähne 6cbfd5b977 [glTF2] Implemented reading binary glTF2 (glb) files 2017-11-20 14:59:05 +01:00
Mika Rautio 9f1dce8e57
Merge branch 'master' into master 2017-11-20 10:27:11 +02:00
Mika Rautio 4fb5038fb1 Add support for building Mac OS X Framework bundles 2017-11-20 00:10:05 +02:00
Kim Kulling 2a9f79f958 check for 0 properties before copy them 2017-11-19 19:05:51 +01:00
Kim Kulling 55c9761228
Merge branch 'master' into patch-12 2017-11-19 18:25:22 +01:00
Kim Kulling 9707fde709 check for nullptr dereferencing before copying scene data 2017-11-19 17:41:31 +01:00
Kim Kulling 65d6daa414
Merge branch 'master' into patch-13 2017-11-18 20:36:05 +01:00
Kim Kulling 1a1d96d3e2 Merge branch 'master' into fix_android 2017-11-18 18:32:58 +01:00
Kim Kulling a8e65a1e8a Fix android build. 2017-11-18 18:32:16 +01:00
Turo Lamminen 8ae7231654 Blender: Silence warning about uninitialized member 2017-11-18 16:50:45 +02:00
Turo Lamminen 2c8cc1f732 BlenderDNA: Silence warning about uninitialized member 2017-11-18 16:49:03 +02:00
Turo Lamminen bcffa28a33 MDLImporter: Don't take address of packed struct member 2017-11-18 16:39:43 +02:00
Turo Lamminen 1067ae4bfa FIReader: Fix strict-aliasing warnings 2017-11-18 15:54:40 +02:00
Turo Lamminen c1515db56f Blender: Fix strict-aliasing warnings 2017-11-18 15:50:56 +02:00
Giuseppe Barbieri 703d046fd9
Update ValidateDataStructure.cpp 2017-11-18 00:34:00 +01:00
Giuseppe Barbieri fc360b9cc8
Update ValidateDataStructure.h 2017-11-18 00:05:17 +01:00
Giuseppe Barbieri b428c66f39
Update ValidateDataStructure.h 2017-11-17 23:10:05 +01:00
Kim Kulling 07a99e0843
Merge branch 'master' into issue_1513 2017-11-16 17:32:34 +01:00
Giuseppe Barbieri d9965f6220
Update Importer.cpp 2017-11-16 14:42:20 +01:00
Kim Kulling 7db10022e9 closes https://github.com/assimp/assimp/issues/1513: fix assimp for cross compile for android 2017-11-15 21:26:25 +01:00
Turo Lamminen f475803f93 X3DImporter: Add assertions to silence static analyzer warnings 2017-11-15 11:45:21 +02:00
Turo Lamminen 66c18cc406 TerragenLoader: Remove unused variable 2017-11-15 11:45:21 +02:00
Turo Lamminen e47bf932e8 SIBImporter: Add assertions to silence static analyzer warnings 2017-11-15 11:45:21 +02:00
Turo Lamminen 583d3f88b8 FBX: Remove dead assignment 2017-11-15 11:45:21 +02:00
Turo Lamminen ef0af40f90 IFC: Remove dead code 2017-11-15 11:45:21 +02:00
Turo Lamminen b49a4e1338 PLY: Remove dead assignment and reduce scope of a variable 2017-11-15 11:45:21 +02:00
Turo Lamminen 97843f19d2 OpenGEX: Add assertion to silence a static analyzer warning 2017-11-15 11:45:21 +02:00
Turo Lamminen f470b8466f GLTF2: Fix signed/unsigned warning 2017-11-15 11:45:21 +02:00
Turo Lamminen f90019bc1e NFF: Add assertions to silence static analyzer warnings 2017-11-15 11:45:21 +02:00
Turo Lamminen 3f299b2a2b NFF: Split up some complicated assignments 2017-11-15 11:45:21 +02:00
Turo Lamminen d24e0d44b2 Raw: Fix misleading indentation warning 2017-11-15 11:45:21 +02:00
Turo Lamminen 2b93a210c9 NFF: Reduce scope of a variable 2017-11-15 11:45:21 +02:00
Turo Lamminen 940449d837 LWO: Reduce scope of a variable 2017-11-15 11:45:21 +02:00
Turo Lamminen a276a02726 IRRLoader: Fix confusing boolean casting 2017-11-15 11:45:21 +02:00
Turo Lamminen 437816fc33 AssbinExporter: Add assertion to silence a static analyzer warning 2017-11-15 11:45:21 +02:00
Turo Lamminen 4c9f169109 ASE: Add assertion to silence a static analyzer warning 2017-11-15 11:45:21 +02:00
Turo Lamminen 856d402b59 AMFImporter: Add assertion to silence a static analyzer warning 2017-11-15 11:45:21 +02:00
Turo Lamminen 2c7770eed5 AMFImporter: Add a block 2017-11-15 11:45:21 +02:00
Turo Lamminen bd0d47c5fc Whitespace 2017-11-15 11:45:21 +02:00
Turo Lamminen a7fccf8f33 OptimizeGraph: Fix possible null pointer dereference 2017-11-15 11:45:21 +02:00
Turo Lamminen c51b92cfa3 RemoveRedundantMaterials: Add assertion to silence a static analyzer warning 2017-11-15 11:45:21 +02:00
Turo Lamminen 95f2319b41 ImproveCacheLocality: Add assertion to silence a static analyzer warning 2017-11-15 11:45:21 +02:00
Turo Lamminen c774e864a0 Remove some dead assignments 2017-11-15 11:45:21 +02:00
Turo Lamminen 266e3b29a8 RemoveRedundantMaterials: Set pointer to nullptr after deleting it 2017-11-15 11:45:21 +02:00
Turo Lamminen 76919e87ea fast_atof: Silence some uninitialized variable warnings 2017-11-15 11:45:21 +02:00
Kim Kulling 24b728b3ea FindDegeneratives: adapt unittests and add configs 2017-11-12 22:09:18 +01:00
Kim Kulling 9206d1b62b Merge branch 'master' into issue_216 2017-11-12 11:04:51 +01:00
Kim Kulling 005b537324 unittests: add VS-based source groups for the unittests. 2017-11-10 20:40:00 +01:00
Kim Kulling de1ec4ee5d
Merge branch 'master' into gltf2-mesh-export-fix 2017-11-10 19:07:46 +01:00
Unknown 12dbbd4ce9 Misc. typos 
Some are doxy comments, some are just trivial source comment typos. 
Found using `codespell -q 3 --skip="./contrib" -I ../assimp-whitelist.txt`
whereby whitelist contained:
```
childs
iff
lod
nto
ot
whitespaces
```
 2017-11-09 17:19:26 -05:00
Kim Kulling ad2ff9fd71 check for area test if the face is a triangle. 2017-11-09 21:40:10 +01:00
Kim Kulling 30e06f7437 closes https://github.com/assimp/assimp/issues/216: check the area of a triangle to check if its degenerated or not. 2017-11-09 21:31:16 +01:00
Daniel Hritzkiv 9ec117d0bc
Fix export of deleted meshes; Add LazyDict::Remove method 
When I was merging a node’s multiple meshes into that node’s first mesh’s primitives, I was deleting the merged meshes from the node.

However, I wasn’t deleting the merged meshes from the mAsset->meshes Dict, causing the gltf2 export to contain extra unreferenced meshes and duplicate primitives.

This new code adds a new method to LazyDict, which removes the object from it, taking care to update indexes of the subsequent objects. This change also requires that `Ref`s of `Mesh`es (stored in node->meshes) have their indexes updated.
 2017-11-08 18:31:32 -05:00
Kim Kulling 5bc4e73727
Merge branch 'master' into issue_1292 2017-11-08 22:52:46 +01:00
Kim Kulling ab639a71ae
Merge branch 'master' into issue_1315 2017-11-08 21:09:02 +01:00
Kim Kulling 36475bf868 closes https://github.com/assimp/assimp/issues/1292: export class subdivision 2017-11-08 20:50:16 +01:00
Kim Kulling cdfd4b9702 closes https://github.com/assimp/assimp/issues/1315: check in exporting against out-of-bounds-access . 2017-11-08 20:44:53 +01:00
Kim Kulling 6954c7d75b
Merge branch 'master' into master 2017-11-08 18:34:25 +01:00
Kim Kulling fe55bc9996
Update ColladaExporter.cpp 
fix build
 2017-11-08 18:34:16 +01:00
Kim Kulling 6b826fecfd
Merge branch 'master' into issue_1251 2017-11-08 01:07:35 +01:00
Kim Kulling f41ed2f41f closes https://github.com/assimp/assimp/issues/1251: use correct lookup for utf32. 2017-11-08 01:07:04 +01:00
Kim Kulling 29cf414468
Merge branch 'master' into md2_fix 2017-11-07 22:03:02 +01:00
Kim Kulling 75fdd25b6b
Merge branch 'master' into issue_104 2017-11-07 11:27:06 +01:00
Kim Kulling da7ce89ff2
Update STLLoader.cpp 
add missing const.
 2017-11-07 10:47:27 +01:00
Kim Kulling b87e7643d2
Update STLLoader.cpp 
Fix memory-alignment bug.
 2017-11-07 10:42:51 +01:00
Kim Kulling 4ff2592747
Update STLLoader.h 
Fixed a typo.
 2017-11-07 00:31:09 +01:00
Kim Kulling 9a9f18bbed closes https://github.com/assimp/assimp/issues/104: deal with more solids in one STL file. 2017-11-06 22:30:07 +01:00
Kim Kulling 4a4f3fddc7 closes https://github.com/assimp/assimp/issues/213: log an error instead of letting the fbx-importer crash. 2017-11-05 22:52:07 +01:00
Kim Kulling ab3cf3687c
Merge branch 'master' into UnitTest_X3D 2017-11-05 18:10:10 +01:00
Kim Kulling 2929a27edc add unittest for x3d-importer. 2017-11-05 17:41:26 +01:00
Kim Kulling 02b042d78e closes https://github.com/assimp/assimp/issues/1351: use correct name for obj-meshname export for groups. 2017-11-05 16:35:22 +01:00
Kim Kulling a33e115fd1 fix mem-lead: face will be not released in case of an error. 2017-11-04 18:26:30 +01:00
Kim Kulling c9ada44ab5 Fix memory leak in case of an error. 2017-11-04 17:05:23 +01:00
Kim Kulling c700c08fa5
Merge branch 'master' into master 2017-11-04 10:45:57 +01:00
Kim Kulling b7bd006304
Merge branch 'master' into ObjExporter_nomtl 2017-11-04 09:32:50 +01:00
Kim Kulling 4587e63e2f
Merge branch 'master' into fix_trivial_warnings 2017-11-03 20:05:16 +01:00
Daniel Hritzkiv 2922753589
Return early when element is TextureFile 
In cases where the TextureFile name would start with an integer, `strtoul10` would parse that number and incorrectly set `numOccur` to that number. This caused PLY parsing to fail for vertex positions.

Since TextureFile is a single line, and does not have any follow-up lines, it’s okay to return early
 2017-11-03 11:50:28 -04:00
Kim Kulling d279a3cc02
Merge branch 'master' into fix_trivial_warnings 2017-11-03 10:35:02 +01:00
Thomas Lemaire 5b76a31485 fix trivial warnings 
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
 2017-11-02 11:13:52 +01:00
thomas-lemaire 931542bf3c
Merge branch 'master' into ObjExporter_nomtl 2017-11-02 10:46:57 +01:00
Daniel Hritzkiv e52e44ea07
Formatting 2017-10-31 15:18:08 -04:00
Daniel Hritzkiv cc4531459f
Set mNumUVComponents to 0 when deleting texture coordinate sets 2017-10-31 15:14:21 -04:00