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

3393 Commits (21b518e350383f3954111b11910f5af726b9c6a5)

Author SHA1 Message Date
Kim Kulling 2ca2e7e355
Merge branch 'master' into fbx_export_footer_tweak 2018-03-09 18:11:56 +01:00
Kim Kulling 69742670dd 3mf: use correct material assignment in case of multi-materials. 2018-03-09 11:40:45 +01:00
Kim Kulling 56f9069eb5
Merge branch 'master' into blender_fbx_opacity_fix 2018-03-09 08:30:23 +01:00
Kim Kulling 7f04b4dd43
Merge branch 'master' into fix/issue623 2018-03-09 00:04:28 +01:00
JeffH-BMG cfd56a43a5
Fix compile error 
Fixed bad cast.
 2018-03-07 18:24:38 -05:00
JeffH-BMG 89a4cf9495
Respond to comments 
Use memcpy() to read normals and vertices, to mitigate alignment issues, per comments.
 2018-03-07 17:26:01 -05:00
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