7967deb06a
Update glTF2Asset.inl
...
some minor review finding: use brackets and add a newline.
2019-12-01 12:34:45 +01:00
ef4bf35f69
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-30 17:11:07 +00:00
97b71dd03b
Add reading of extensionsRequired and explicit check to throw an error if Draco compression is required. Fixes issue #2791 .
2019-11-28 09:01:01 +10:00
30851b796f
Update glTF2Importer.cpp
...
Make them const
2019-11-27 17:18:12 +01:00
e4f1b8e609
Correctly change the coordinate system of the glTF UV transforms to match those used internally inside Assimp. This should now hopefully result in a complete implementation for issue #2119
2019-11-27 11:05:31 +11:00
f52df5d242
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-26 18:42:07 +00:00
fdd76a6d0b
Merge branch 'migenius-fix-doubleexport' of github.com:migenius/assimp into migenius-fix-doubleexport
2019-11-26 18:17:55 +11:00
b4f778f53b
Fix aiGetMaterialUVTransform which assumed the data was 4 floats when in fact it is 5 floats. Fixes and issue seen in #2119 .
2019-11-26 18:17:35 +11:00
184caea952
Merge branch 'master' into migenius-fix-doubleexport
2019-11-25 21:24:35 +01:00
7230f32c14
Fix issue with y UV translation. Fixes #2119 .
2019-11-25 20:58:21 +11:00
8f2123379d
Merge branch 'master' into master
2019-11-25 05:23:18 +01:00
9ddeb4edad
MinGW support, profiling and signed error code
2019-11-25 05:03:10 +01:00
929d83398d
Remove duplicate call to exporter. Fixes issue #2718 .
2019-11-25 13:51:33 +11:00
5cfb0fd633
Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags
2019-11-22 18:27:34 +01:00
136996e1f6
Use std::numeric_limits for double max
2019-11-22 10:56:31 -06:00
868aea8d94
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-11-22 08:19:50 +01:00
36ca37f9ac
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-22 00:14:11 -06:00
91e6d3abeb
Fix glTF Accessor min and max values
2019-11-21 23:46:14 -06:00
3cc4ec4eec
Merge branch 'master' into master
2019-11-21 22:10:28 +01:00
375ee17339
Merge branch 'fix_memory_leak_in_gltf2_on_exception' of https://github.com/muxanickms/assimp into fix_memory_leak_in_gltf2_on_exception
2019-11-19 17:44:05 +00:00
91af4b7476
fix the crash
2019-11-19 17:43:31 +00:00
5985bdfebf
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception
2019-11-19 18:11:10 +01:00
12f184867e
Fix for memory leak in glTF2 Importer if an exception has been thrown
2019-11-19 17:05:24 +00:00
6f7cb6af06
revert memory leak fix
2019-11-19 16:58:48 +00:00
b93c360b87
memory leak fix
2019-11-19 16:10:34 +00:00
7c312f6f68
Merge branch 'master' into master
2019-11-19 01:28:11 +01:00
7e222f0730
fix invalid cast.
2019-11-18 18:43:28 +01:00
83e9c551f5
stbi functions prefixed for those who do not know how to use inlcude
2019-11-18 18:31:53 +01:00
80f5283b2f
Error string of Importer should contain a message in case of an exception
2019-11-18 16:57:01 +00:00
301748be6a
Make Clang happy
2019-11-18 15:22:15 +01:00
2b252bb9a5
My mistake, fixed
2019-11-18 06:23:41 +01:00
2bd92aeb88
Merge branch 'master' into master
2019-11-18 03:21:34 +01:00
41ae01a6b2
Upgraded to newest SDK and improved texture import
2019-11-18 03:04:52 +01:00
75204e20bd
fix invalid setup for texture enum.
2019-11-16 19:22:37 +01:00
17257cd2ae
just a try, i dunno have a clue ...
2019-11-16 15:51:26 +01:00
2eed8b1820
TextureTransform: set material transform only when the extension is provided.
2019-11-16 08:08:57 +01:00
a8182d86cb
fix initialization + some vs2019 compiler warnings.
2019-11-15 19:38:37 +01:00
17946e26ef
add missing setup of texture transform in aiMaterial.
2019-11-15 18:35:33 +01:00
04db5cd5ea
closes https://github.com/assimp/assimp/issues/2119 : initial version.
2019-11-14 21:11:53 +01:00
0c3c88270a
Merge branch 'master' into master
2019-11-11 10:19:22 +01:00
aa25c815bd
closes https://github.com/assimp/assimp/issues/1320 : make sure build works with all exporter disabled.
2019-11-10 09:47:50 +01:00
ddf7c0ad8f
avoid weighting vertex repeatedly when joining identical vertices
2019-11-05 17:34:32 -08:00
adec426b7c
Fix for exporting fbx bigger than 2GB
2019-11-05 17:11:56 +00:00
d29185ec7d
Merge branch 'master' into master
2019-11-03 21:22:01 +01:00
dda46f5f4d
Merge branch 'master' into master
2019-11-02 01:14:04 +01:00
7201ebdccc
Make Clang happy
2019-11-01 21:52:11 +01:00
7d9e9aadbb
Asked modifications and unit test
2019-11-01 17:21:24 +01:00
536fea1c8d
operator less for old compilers
2019-11-01 14:50:30 +00:00
55c2a3edb9
FBX orphant embedded textures
2019-11-01 12:29:54 +00:00
8ebd48442e
Made the M3D SDK C++ wrapper optional
2019-11-01 03:39:36 +01:00
805bc2e766
Update ColladaParser.cpp
...
Add missing brackets.
2019-10-31 20:18:39 +01:00
3bf81375da
Fixed clang's problem with register keyword
2019-10-30 03:06:24 +01:00
37cc29c020
Fixed clang's problem with register keyword
2019-10-30 03:04:33 +01:00
0ff3e40157
Fixed clang's casting issue and MSVC's buffer allocation problem
2019-10-30 02:35:51 +01:00
60e9157699
Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this
2019-10-30 01:37:28 +01:00
5a79287041
More reduced scope fix, what's wrong with reusing i as a loop variable?
2019-10-30 01:21:15 +01:00
7ed621b53f
More reduced scope fix by wasting more memory...
2019-10-30 01:14:20 +01:00
1c23d2e8de
More reduced scope fix by wasting more memory...
2019-10-30 01:11:34 +01:00
5b18baf883
Fixed issues with MSVC
2019-10-30 00:55:54 +01:00
02a63f8b10
Fixed template being used in file
2019-10-29 20:21:16 +00:00
be09110aa8
Merge branch 'master' into feature/easy-armature-lookup
2019-10-29 21:09:50 +01:00
a622e109a0
Fixed PR Quality Review Issues
2019-10-29 18:42:10 +01:00
0baec5f0bd
Added M3D format support
2019-10-29 14:14:00 +01:00
459d8105a7
Merge branch 'master' into fix-3ds-material-names
2019-10-29 13:18:23 +01:00
18555abed0
Merge branch 'master' into migenius-fix-pbrsg
2019-10-28 20:08:47 +01:00
571d64e3c1
Merge branch 'master' into migenius-fix-doublefree
2019-10-28 07:51:19 +01:00
61ea5a4ac6
Merge branch 'master' into collada_zae_textures_2710
2019-10-27 18:24:16 +01:00
a9a0d4d29b
Tidying order of function calls and fixed debug statements
2019-10-27 14:16:39 +00:00
212bcfe75c
Test disable cache
2019-10-27 14:16:39 +00:00
9c8d835704
Explicitly use nullptr
2019-10-27 14:16:39 +00:00
5d0c63391b
Explicitly set the size of the parent node if we have no children
2019-10-27 14:16:39 +00:00
a30936954e
Best to check the number of children before checking the actual array
2019-10-27 14:16:39 +00:00
514257f587
Added unit tests for ArmaturePopulate when used (added huestos model to tests)
...
Added clear documentation for this too to explain, you need to enable it to make it available
Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
46cdd81d75
Added ArmaturePopulate scale process for all formats
2019-10-27 14:16:39 +00:00
93efe4197a
Removed redundant rest matrix and fixed assert compile error
2019-10-27 14:16:39 +00:00
168ae22ad4
Implemented easy armature lookup
...
This lets you directly retrieve the node a bone links to and informs you of the armature directly
This also fixes a bug with bone name being made unique which causes them to become not 1:1 what the modeller has imported.
2019-10-27 14:16:39 +00:00
120e97e55b
Merge branch 'master' into assimp_version_2693
2019-10-27 13:47:59 +01:00
93d87c775d
Merge branch 'master' into master
2019-10-27 09:00:47 +01:00
2d086fd236
ColladaParser: fix handling of empty XML-elements
2019-10-25 15:23:13 +02:00
5f58ef82b9
prevent accidental lower casing material names in ReplaceDefaultMaterial
2019-10-25 10:18:27 +03:00
cbd4e8bc22
Fix inconsistent indentation in previous commit.
2019-10-25 12:19:28 +11:00
822be33408
Move pbrSG glossinessFactor into the correct material extension object. Fixes issue #2724 .
2019-10-25 12:17:43 +11:00
932acf4350
Merge branch 'master' into fix-gltf-importer-crash
2019-10-23 20:14:38 +02:00
df3e22d9ba
Merge branch 'master' into migenius-fix-vs2013-build
2019-10-21 20:57:29 +02:00
9bc2648615
Merge branch 'master' into fix-gltf-importer-crash
2019-10-21 15:29:18 +01:00
c350d4f487
Update ColladaExporter.cpp
...
Small review findings.
2019-10-19 12:08:57 +02:00
9aa9238e7e
Copy texture data before handing on to asset which then handles freeing of the memory. This prevents the memory being released twice which was throwing an error. Fixes issue #2714 .
2019-10-18 14:40:41 +11:00
075d05e604
Merge branch 'master' into fix_dae_export
2019-10-17 23:52:44 +02:00
51fc0f4ec4
Merge branch 'master' into assimp_version_2693
2019-10-16 10:00:50 +01:00
e6a051d953
Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678 .
2019-10-16 19:06:57 +11:00
198bc428fa
Fix some warnings in Collada import
2019-10-14 12:15:02 +01:00
6a6ccc0fb0
Rename ConvertPath() to UriDecodePath()
2019-10-14 11:27:34 +01:00
5e84889724
Merge branch 'master' into collada_zae_textures_2710
2019-10-14 10:56:53 +01:00
ce5c71d2e7
Collada ZAE import must convert manifest and image paths
...
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML
Added more EXPECTS to the Collada tests
2019-10-11 18:57:38 +01:00
059ee0e091
Update assimp legal and version
...
Will now report the major and minor versions specified in cmakelists
2019-10-11 16:28:14 +01:00
3f38011e86
Fix filter for vs for public headers.
2019-10-11 13:41:13 +02:00
33af183bb8
Cleanup the public headers.
2019-10-11 13:27:36 +02:00
3b3e34c36a
Fix one byte memory leak.
2019-10-08 15:15:16 +01:00
5a1276032e
Add bound checks.
2019-10-08 12:51:08 +01:00
32781a566d
Fix FBXConverter: use proper 64-bit constant
...
Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes:
code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch ]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2019-10-06 15:42:11 +02:00
78cfec41ec
Merge branch 'master' into issue_2693
2019-10-06 11:11:22 +02:00
afec2e2c49
Fix #2693 aiGetVersionMajor return wrong version
...
The 2 constants MinorVersion and MajorVersion are updated for 5.0
2019-10-05 19:23:02 +02:00
38153748ab
ColladaExporter: use actual mesh names when available
2019-10-02 19:18:48 +02:00
c08a78f7c6
ColladaExporter: improve name/id handling
2019-10-02 01:32:53 +02:00
6550b1df61
Merge branch 'master' into gltf_mesh_morph_animations
2019-10-01 08:04:46 +01:00
7a8b7ba88d
aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0
2019-09-29 10:09:53 +01:00
5018af995b
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-26 11:33:33 +01:00
2757297b4f
Merge branch 'master' into issue_2662
2019-09-26 09:55:16 +02:00
8ca39ade6a
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-25 16:16:32 +01:00
6e75d7a839
Merge branch 'master' into fix-multi-uvset-coord
2019-09-25 16:57:24 +02:00
e0fee3d87b
gltf2.0 importer - Support for mesh morph animations added.
...
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
2019-09-25 09:58:23 +01:00
12a101124a
Merge branch 'master' into issue_2668
2019-09-24 19:29:40 +02:00
b8e53c967f
Merge branch 'master' into issue_2668
2019-09-24 02:21:59 +01:00
d3a79d0cc2
Merge branch 'master' into issue_2661
2019-09-24 02:21:19 +01:00
17f55aa67e
Merge branch 'master' into issue_2662
2019-09-24 02:20:47 +01:00
3b2e0ebfc7
Merge branch 'master' into issue_2661
2019-09-23 16:59:28 +02:00
aa47a028c8
Fix UV texture coords generation along Z Axis
2019-09-23 11:22:20 +02:00
61fa619f92
Fix: Mismatched new/free in gltf2 importer ( fixes #2668 )
2019-09-22 10:24:30 +01:00
720ac4846b
Fix: memory leak in gltf2 importer ( fixes #2661 )
2019-09-22 10:12:19 +01:00
0e6478c0d4
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports ( fixes #2662 )
2019-09-22 09:59:58 +01:00
94c488d7ea
fix compiler warnings.
2019-09-22 10:15:44 +02:00
ef54a00fc4
Use correct escape sequence for unsigned.
2019-09-22 09:12:37 +02:00
69087abc56
Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor.
2019-09-21 16:36:22 +02:00
a4092a3234
correct uvset index
2019-09-20 17:53:15 -07:00
d4101bbf06
fix regression
2019-09-19 08:07:55 +02:00
18bbfdac1a
init variable 'base' in initializer list
2019-09-19 08:01:47 +02:00
4b9cc1a484
Merge branch 'master' into fix-codacy-issues
2019-09-18 20:32:49 +02:00
dbf47f7769
fix issue #2551
2019-09-18 17:54:30 +02:00
1abf6d50fe
fixed regression #2
2019-09-18 08:31:33 +02:00
2194577429
fix regression
2019-09-18 08:25:24 +02:00
a5859dd3f4
Merge branch 'master' into fix-codacy-issues
2019-09-18 08:19:44 +02:00
c0ec5140ee
init variable in initializer list
2019-09-18 08:18:52 +02:00
6d4854f12c
init variable in initializer list
2019-09-18 08:15:50 +02:00
116dcce0ba
init member in itilializer list
2019-09-18 08:04:46 +02:00
f7da7d8f67
Merge branch 'master' into kimkullig_dev
2019-09-17 22:01:29 +02:00
2edcf82f5a
add missing include.
2019-09-17 21:58:46 +02:00
8b95479bb0
closes https://github.com/assimp/assimp/issues/2598 : introduce getEpsilon
2019-09-15 19:25:37 +02:00
7f7918957a
Issue 2603
...
Normal face indices added to end of already resized vector, so normal faces did not match position faces.
Use vector index rather than push.
2019-09-15 13:05:04 +01:00
2be0eba1ab
put one in comments because the file seems to be corrupt.
2019-09-14 19:32:47 +02:00
79056da4be
closes https://github.com/assimp/assimp/issues/2613 : merge glTF2 patch.
2019-09-14 09:12:08 +02:00
a1254f067e
closes https://github.com/assimp/assimp/issues/2627 - fix typo
...
Remove code from ai_assert test, will be removed in release versions.
2019-09-13 12:05:29 +02:00
3bd63c006f
Merge branch 'gltf_add_ortho_cam' of https://github.com/assimp/assimp into gltf_add_ortho_cam
2019-09-12 20:27:53 +02:00
a25a1f0772
fix the build.
2019-09-12 20:27:35 +02:00
f10bd72100
Merge branch 'master' into gltf_add_ortho_cam
2019-09-12 00:30:06 +02:00
f9c6fed190
Add a camera unittest.
2019-09-11 22:34:53 +02:00
f67c18d41a
introduce inline helper.
2019-09-11 22:21:20 +02:00
7ff7a5d64e
glTF: Try to remove duplicate code.
2019-09-11 17:00:39 +02:00
0307327999
Merge branch 'master' into fix-codacy-issues
2019-09-11 10:06:16 +02:00
28d0300dbe
Merge branch 'master' into gltf_add_ortho_cam
2019-09-11 09:32:14 +02:00
d91eebf347
Add ortho camera.
2019-09-10 22:13:54 +02:00
b9cff2a019
prefer prefix ++/-- operators for non-primitive types
2019-09-10 07:54:07 +02:00
db55ba4908
possible inefficient checking for 'tlist' emptiness
2019-09-09 15:00:28 +02:00
ddc26e1c46
Added maya stingray support for textures
2019-09-08 19:15:27 +01:00
da97f1be79
Implemented basic PBR materials into assimp.
...
This adds the following texture types:
- BASE_COLOR
- NORMAL_CAMERA
- EMISSION_COLOR
- METALNESS
- DIFFUSE_ROUGHNESS
This is the first small change required.
We only support maya right now.
2019-09-08 19:15:27 +01:00
ad2dd2dc18
Merge branch 'master' into fix-codacy-issues
2019-09-08 12:08:01 +02:00
5d8482dae6
Merge branch 'master' into master
2019-09-07 18:53:26 +02:00
f8bcd7cb40
Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
2019-09-07 10:02:20 +02:00
336ae0e55a
Merge branch 'fix_issue_joinIdenticalVertices_notNeeded' of https://github.com/thomasbiang/assimp into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
2019-09-07 09:58:07 +02:00
3546403284
Merge branch 'master' into crash_in_ai_mesh_desctuctor
2019-09-06 20:45:16 +02:00
570b3838c9
Merge branch 'master' into fix-codacy-issues
2019-09-06 13:20:00 +02:00
91706a1f6e
prefer prefix ++/-- operators for non-primitive types
2019-09-06 11:29:52 +02:00
d177c722b1
prefer prefix ++/-- operators for non-primitive types
2019-09-06 11:28:38 +02:00
eb8479a95e
possible inefficient checking for 'tlist' emptiness
2019-09-06 11:19:27 +02:00
6661e7047a
Merge branch 'master' into unicode_fix
2019-09-06 08:59:21 +02:00
22bd047db5
Added VertexColors to FBX exporter (one channel)
...
Works properly with Blender (custom importer) and UnrealEngine (Official SDK)
2019-09-05 23:44:54 +02:00
b271091c64
fix division by zero
2019-09-05 11:44:02 +01:00
4029fe5e46
alloc-dealloc-mismatch
2019-09-05 11:44:02 +01:00
9adc4e87fa
alloc-dealloc-mismatch
2019-09-05 11:44:02 +01:00
873a358ce4
A crash in the aiMesh descructor
2019-09-05 11:44:02 +01:00
eb762e654e
Removed WindowsStore checks
2019-09-03 23:13:44 -04:00
a16906686f
Fixed type conversion warnings
2019-09-03 21:06:48 -04:00
50820e48b9
Merge branch 'master' into fix-codacy-issues
2019-09-03 21:54:59 +02:00
a8822a2b29
Cleaned up formatting in DefaultIOSystem.cpp
2019-09-03 11:18:01 -04:00
0685e415ad
removed extra null character in Utf8ToWide and WideToUtf8
2019-09-03 11:18:01 -04:00
6c65b5b549
Cleaned up unicode code and removed fixed-size buffers
2019-09-03 11:18:01 -04:00
727cf0c49f
Fixed unicode on windows
2019-09-03 11:18:01 -04:00
ceacad237f
prefer prefix ++/-- operators for non-primitive types
2019-09-03 08:00:12 +02:00
33e71ee8df
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:59:17 +02:00
75993ad653
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:57:58 +02:00
53d795c1c9
possible inefficient checking for 'tlist' emptiness
2019-09-03 07:57:08 +02:00
ec1930478c
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:56:37 +02:00
c1d4ed7873
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:55:27 +02:00
0f18ec9e2c
Merge branch 'master' into accessibleIsVerbose
2019-09-02 20:47:04 +02:00
b34f9839f1
Merge branch 'master' into fix-missing-scale-data
2019-08-31 12:42:40 +02:00
01d0f06d3a
Make IsVerbose accessible outside the exporter
2019-08-30 11:42:23 +01:00
de51122639
fix regression
2019-08-29 12:09:56 +02:00
2d0d2374c1
fix ColladaLoader::findMesh() declaration
2019-08-29 12:00:44 +02:00
89079ead12
prefer prefix ++/-- operators for non-primitive types
2019-08-29 11:44:41 +02:00
946d64282b
fix inefficient checking for 'url' emptiness
2019-08-29 10:58:01 +02:00
340611785a
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:57:23 +02:00
cb2beba073
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:56:58 +02:00
aec4726d21
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:56:21 +02:00
b3788039df
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:55:09 +02:00
3ef0860f30
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:54:21 +02:00
e8ae086b35
fix function definition
2019-08-29 10:48:51 +02:00
75fed8340d
fix function declaration
2019-08-29 10:46:50 +02:00
a044852938
fix inefficient checking for lists emptiness
2019-08-29 10:44:19 +02:00
ba3e4ae892
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:42:47 +02:00
2f53d42d45
fix inefficient checking for 'SceneNode_Child' emptiness
2019-08-29 10:42:09 +02:00
cca81e877a
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:41:34 +02:00
b363fa3883
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:41:00 +02:00
69fce64b9c
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:40:31 +02:00
44d7cb8177
possible inefficient checking for lists emptiness
2019-08-29 10:37:19 +02:00
02444be251
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:36:09 +02:00
65ba0c4b46
fix inefficient checking for lists emptiness
2019-08-29 10:30:50 +02:00
ebb061d89c
fix inefficient check for 'mNodeElement_List' emptiness
2019-08-29 10:29:24 +02:00
0d17315166
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:25:38 +02:00
f009c216b6
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:24:58 +02:00
eadbc89a1f
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:23:27 +02:00
438b070508
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:22:50 +02:00
805fda3df8
possible inefficient checking for 'NodeElement_List' emptiness
2019-08-29 09:05:15 +02:00
b1f8f6ae3b
prefer prefix ++/-- operators for non-primitive types
2019-08-29 09:04:27 +02:00
ffb30fbc85
prefer prefix ++ operator for non-primitive types
2019-08-29 09:02:19 +02:00
789e8abfe8
prefer prefix ++ operator for non-primitive types
2019-08-29 08:44:49 +02:00
f1e0c460ed
Prefer prefix ++ operator for non-primitive types
2019-08-29 08:43:56 +02:00
8e90bf8381
fix inefficient checking for lists emptiness
2019-08-29 08:43:09 +02:00
43865e6bc9
fix inefficient checking for 'url' emptiness
2019-08-29 08:34:18 +02:00
60f2535dcd
fix inefficient check for 'SceneNode_Mesh' emptiness
2019-08-29 08:30:24 +02:00
7d8a25993b
prefer prefix ++ operator for non-primitive types
2019-08-29 08:29:30 +02:00
765c0e71f6
prefer prefix ++ operator for non-primitive types
2019-08-29 08:25:19 +02:00
806bcf76b1
fix inefficient checking for lists emptiness
2019-08-29 08:23:09 +02:00
30eb3c56c3
prefer prefix ++ operator for non-primitive types
2019-08-29 08:12:22 +02:00
dbb498095d
function parameter 'meshid' should be passed by const reference
2019-08-29 08:05:45 +02:00
0dd1ae0196
prefer prefix ++ operator for non-primitive types
2019-08-29 08:02:51 +02:00
9ad7ce1129
prefer prefix ++ operator for non-primitive types
2019-08-29 08:02:08 +02:00
a9d902946d
fix inefficient check for 'Composition' emptiness
2019-08-29 08:01:00 +02:00
e20640c2c8
Merge branch 'master' into fix-segfault-fbx-import
2019-08-28 09:14:51 +02:00
43cb76653b
Removed depreciated FBX Unit and scaling code
2019-08-27 15:54:27 +01:00
abdd853ca5
FIX missing update call for scale to post process
2019-08-27 15:50:50 +01:00
ad971468ef
size_t cannot be less than 0
2019-08-27 15:15:40 +01:00
0729a6e20f
Merge branch 'master' into feature/bug-fbx-application-scale-wrong
2019-08-27 14:06:00 +02:00
7e12257ebc
Fix segfault #2614
2019-08-26 22:44:25 +01:00
c50a4d8ade
Fix segfault caused by FBX file with missing face #2614
2019-08-26 22:39:20 +01:00
d56198774e
Fix FBX units not being converted from CM to application scale
2019-08-26 22:03:56 +01:00
48f1f012eb
Merge branch 'master' into feature/fix-removal-of-bones
2019-08-25 09:34:20 +02:00
594d90a18e
Merge branch 'master' into feature/prototype-for-assimp-universal-scale
2019-08-24 10:22:08 +02:00
9a78f2c6f1
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-23 17:24:04 +02:00
0d29203e24
Prototype unit system for assimp generic enough to be used across formats.
2019-08-21 21:41:41 +01:00
b8d4ae5a7c
Add git commit, original filename to DLL PE header
...
Windows only
2019-08-21 15:54:14 +01:00
4bc5e8c262
Stop JoinVerticiesProcess removing bones from mesh as per #2596
...
Co-authored-by: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 19:35:44 +01:00
eb55a6a3cd
Update ScaleProcess.cpp
...
Fix review findings.
2019-08-19 20:24:01 +02:00
fbb34b1de1
ScaleProcess overhauled to improve compatibility with animations and unit conversion.
...
./assimp Added arguments --gs to assimp command line option to enable global scaling.
No scaling for mScale of 1.0.
Co-Authored-By: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 17:36:57 +01:00
f69bf5f7ed
fix for div by zero reported by address sanitizer
2019-08-16 17:04:42 -07:00
84e9d9ddf8
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-16 08:47:02 +02:00
a2ee19e86d
Merge branch 'master' into collada_zae
2019-08-14 20:02:53 +02:00
3d0775eebc
respect export flag if aiJoinIdenticalVertices is not needed
2019-08-12 18:10:43 -07:00
cc8e7dcc1b
Merge branch 'master' into glTF-2.0-Lights-import
2019-08-09 20:03:51 +02:00
f1f409d538
Merge branch 'master' into RemoveStdIterator
2019-08-09 17:43:30 +02:00
3c7a608956
Add an include.
2019-08-09 16:26:59 +01:00
181d3dd84f
Fix node chain bug.
2019-08-09 15:28:14 +01:00
2d7505b244
Merge branch 'master' into glTF-2.0-Lights-import
2019-08-08 21:57:32 +02:00
74d2eb842b
Fixed armature being marked as 'limbnode'
...
This also fixes issue with root bone overwritten - which should not happen as it is a hack.
Before the behaviour would create an additional bone which would end up breaking animations completely on import.
Additionally this fixes required bones being removed.
Co-authored-by: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-08 01:02:30 +01:00
090e896ebf
Merge branch 'master' into collada_zae
2019-08-06 21:22:02 +02:00
9f5b047f7c
Merge branch 'master' into fix_export_group_as_bone
2019-08-06 19:27:37 +02:00
9330cca1cd
glTF 2.0 Lights import
...
Importing of lights according to glTF 2.0 extension KHR_lights_punctual https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual
Since glTF lights are based on PBR they use different attenuation model than conventional lights supported by assimp. It is possible to use attenuation factors in assimp to describe inverse square law fallof. But the light structure does not provide means to save range property. Therefore I resorted to use of metadata. When range parameter is present, I put it into 'PBR_LightRange' metadata of light's node. Please, see comment in glTF2Importer file.
2019-08-03 20:51:00 +02:00
83d2ec7f74
Merge branch 'master' into RemoveStdIterator
2019-08-02 10:35:59 +02:00
cfbe368d72
Remove the usage of std::iterator
2019-07-29 22:34:24 -07:00
deee43f946
Merge branch 'master' into stl-white-ambient
2019-07-29 19:31:33 +02:00
d83af91095
Update Exporter.cpp
...
Add exporter detail.
2019-07-29 09:03:29 +02:00
762e039d15
Merge branch 'master' into test_exporter_ids
2019-07-28 22:20:57 +02:00
7d74a3354d
Merge branch 'master' into fix-multiUV-export
2019-07-28 09:37:00 +02:00
7fc4cf1552
ASSIMP_BUILD_NO_*_EXPORTER
...
Full fix for #2557
These macros should be all-caps.
Correct the cmakelists
2019-07-26 22:17:24 +01:00
94328695d0
Merge branch 'master' into fix_export_group_as_bone
2019-07-26 11:00:04 +02:00
73914cd7e2
Update FBXExporter.cpp
...
small reformatting improvement
2019-07-26 10:55:28 +02:00
d8eaf0bc7f
cleanup empty lines
2019-07-25 15:53:57 -07:00
a6b06ad811
update
2019-07-25 15:49:41 -07:00
aaaa0a02a3
use ExportProperties to customize bind pose epsilon
2019-07-25 15:49:38 -07:00
0f0454c3b7
customize error rate for bind pose
2019-07-25 15:47:17 -07:00
f9f408690e
use ExportProperties to customize bind pose epsilon
2019-07-25 15:45:50 -07:00
2ddb00f4e0
clean up
2019-07-25 15:45:50 -07:00
029338940c
customize error rate for bind pose
2019-07-25 15:45:47 -07:00
0ed9158908
update
2019-07-25 15:43:43 -07:00
6e6765cae3
clean up
2019-07-25 15:43:43 -07:00
c597e21b67
customize error rate for bind pose
2019-07-25 15:43:43 -07:00
9b2aac8c96
use ExportProperties to customize bind pose epsilon
2019-07-25 15:43:43 -07:00
079e522eae
clean up
2019-07-25 15:43:43 -07:00
8fc899035c
customize error rate for bind pose
2019-07-25 15:43:43 -07:00
57a56b7b1d
extra layer for multi uv sets
2019-07-25 13:14:54 -07:00
7e8a3ec4cb
Add unit test of valid and unique Exporter IDs, rename assjson id
...
"json" is a very vague exporter ID, change to "assjson"
Add a unit test to ensure all exporter have unique IDs
and that they all have an ID, description and extension
2019-07-25 13:38:49 +01:00
e993cdc309
Merge branch 'master' into collada_zae
2019-07-25 12:42:08 +01:00
9b78060a4a
Add copyright headers to ZipArchiveIOSystem
2019-07-25 10:14:42 +01:00
3016f3a725
Convert Q3BSP Importer to use ZipArchiveIOSystem
...
Removes duplication, handles large files better
2019-07-25 10:13:53 +01:00
5c6ea5d7ba
Fix memory leak in Collada ZAE and 3MF ZipFile reading
...
Must close the file!
2019-07-25 09:54:39 +01:00
9e04df810e
ZipArchiveIOSystem should be sorted, fix ZipFile::Read()
...
Q3BSP relies on the sort order
Read() should return number of elements read, not count of bytes
Read() should clip to the file size and return elements actually read,
instead of aborting if try to read too much
2019-07-25 09:53:18 +01:00
dadf5c0020
Fix white ambient in STL loader.
...
A problem that sneaked in from #1293 (f84851e893#2059 but not fixed
properly. Having a white ambient practically means all other color information
is ignored and the model stays bright white no matter how you set up your
lighting, so putting it back to how it was before the commit above.
2019-07-25 10:28:09 +02:00
c6620478ec
Fix GCC warnings reported by Travis
2019-07-24 16:12:06 +01:00
17adc98eec
Fix issue #2557
2019-07-23 15:58:30 +02:00
e828dd1757
Merge branch 'master' into collada_zae
2019-07-21 14:37:12 +02:00
5895f04391
Merge branch 'master' into fix_export_custom_bindpose_error
2019-07-21 12:17:02 +02:00
41ea607739
Merge branch 'master' into collada_zae
2019-07-20 14:12:18 +02:00
ff7ec7e454
Merge branch 'master' into fix-obj-line-continuation
2019-07-20 12:07:49 +02:00
103048ff85
Update UnrealLoader.h
...
use memcpy instead of = operator for pos copy.
2019-07-20 10:10:17 +02:00
a8019cf8d8
Unit: Fix new compiler warnings.
2019-07-19 10:38:44 +02:00
e1e9d92c01
update
2019-07-16 13:36:46 -07:00
e3683e49e4
clean up
2019-07-16 13:36:45 -07:00
5121a835b5
customize error rate for bind pose
2019-07-16 13:36:45 -07:00
6299c58fae
use ExportProperties to customize bind pose epsilon
2019-07-16 13:34:00 -07:00
6e0810d3c1
clean up
2019-07-16 13:34:00 -07:00
cdf60d7423
customize error rate for bind pose
2019-07-16 13:33:59 -07:00
c889699d58
set->unordered_set;unsigned int for iteration
2019-07-16 13:33:59 -07:00
9210ff37f2
fix group node being exported as bone node
2019-07-16 13:33:59 -07:00
2122dc231d
Fix line continuations in OBJ files
2019-07-16 20:37:41 +02:00
c1670b6a97
closes https://github.com/assimp/assimp/issues/2548 : check if weight are set or set the weight to 1.0f
2019-07-16 11:40:34 +02:00
bcdb173e09
- Fixed anim meshes generated from blendshapes not being copied to output for multi-material meshes
...
- Fixed first vertex of each blendshape on a multi-material mesh having all unmapped vertice offsets being added to it
- Fixed blendshapes not importing for multi-material FBX meshes with no bones
2019-07-13 22:20:47 +02:00
07d3a7d5b0
Fix some warnings
...
Hopefully the sorts out the MSVC2013 compiler
2019-07-12 16:02:51 +01:00
678dd32da3
Add missing header
2019-07-12 15:37:10 +01:00
53c0f91305
Add unittest for json.
2019-07-12 16:08:51 +02:00
2a72c9b616
Read embedded textures from Collada ZAE
2019-07-12 14:46:48 +01:00
ddd1e770b9
First pass of Collada ZAE support
...
Reads the manifest and loads the DAE
Does not yet load embedded textures
2019-07-12 11:36:46 +01:00
8636d5607c
Add ZipArchiveIOSystem to CMake
2019-07-12 11:35:43 +01:00
d64e1bde13
First pass of Collada ZAE support
...
Reads the manifest and loads the DAE
Does not yet load embedded textures
2019-07-12 11:29:35 +01:00
2c7f607e7c
Create ZipArchiveIOSystem
...
Moved IOSystem Unzip functionality out of D3MF Importer into include/assimp
Cleaned up and more efficient:
Don't map the archive until the caller opens a file or requests the contents list
Don't extract any files until they are opened
Store the location of the data within the ZIP and extract it later if the file is opened.
2019-07-12 11:22:17 +01:00
3b3a965d2b
Delete JTImporter.h
2019-07-11 22:31:40 +02:00
b1d8398243
Delete JTImporter.cpp
...
Remove JTImorter.cpp from pull request
2019-07-11 22:31:24 +02:00
8bf1b9ac5e
Update CMakeLists.txt
...
remove jtimporter
2019-07-11 22:29:30 +02:00
82e7775d6d
Update JTImporter.cpp
...
disable unused method,.
2019-07-11 19:23:00 +02:00
da33262bcc
Update FBXConverter.cpp
...
Fix merge conflicts
2019-07-11 19:17:41 +02:00
eb5e829436
Assjson: add json export to list of exporters.
2019-07-11 17:43:03 +02:00
2e782f43e5
Merge branch 'master' into kimkulling_dev
2019-07-11 17:37:52 +02:00
b463ddd399
closes https://github.com/assimp/assimp/issues/340 : start integrating assimp2json.
2019-07-11 17:37:31 +02:00
d7773dcfba
set->unordered_set;unsigned int for iteration
2019-07-10 09:51:20 -07:00
6b5e0a9914
fix group node being exported as bone node
2019-07-09 19:05:45 -07:00
39dc9801e0
Update ColladaLoader.cpp
...
- add header memory
- Fix format stuff
2019-07-09 20:35:57 +02:00
a01302dd4d
Merge branch 'master' into issue_2182
2019-07-09 19:45:40 +02:00
ed6dbf9533
closes code/Collada/ColladaLoader.cpp: fix possible memleak when throwing an exception.
2019-07-09 19:44:56 +02:00
b87f4c03ba
Remove not needed init.
2019-07-09 11:49:59 +02:00
ae7b1f1a77
Merge branch 'master' into kimkulling_dev
2019-07-03 18:28:15 +02:00
0ec5eb752c
Update FBXConverter.cpp
...
Removing dead and unused code.
2019-07-03 12:50:01 +02:00
1fc232effa
closes https://github.com/assimp/assimp/issues/2368 : just fix it
2019-07-02 21:46:52 +02:00
96f16c7aea
closes https://github.com/assimp/assimp/issues/2527 : use correct macro for Assimp-exporter.
2019-07-02 19:48:53 +02:00
3fcf3bd81f
Merge branch 'master' into topic/embedded_texture_name_fix
2019-06-30 12:43:40 +02:00
f5ece83f31
initial unnamed node uniqueness index outside of loop
2019-06-28 16:12:58 -04:00
6d07473550
all textures use relative path except embedded, this is fix for it
2019-06-27 17:59:55 +01:00
05f5b54f75
Merge branch 'master' into issue_2518_active_importer_ident
2019-06-27 14:02:01 +02:00
af199c50aa
Merge branch 'master' into issue_2456_text_formats_precision
2019-06-26 17:31:11 +02:00
853afdf42b
Merge branch 'master' into fix_issue_2507_collada_import
2019-06-25 20:19:42 +02:00
1952144445
Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev
2019-06-24 21:46:05 +02:00
0f66a917e5
Add unittest.
2019-06-24 21:37:53 +02:00
8f43fb144a
Add "importerIndex" Importer property
...
This indicates the index of the Importer that was selected, or -1 if did not find one at all.
2019-06-24 14:55:48 +01:00
26bd54ae0b
PostProcesswing: add gen-aabb process to postprocessing.
2019-06-23 20:24:32 +02:00
418c07a9bb
closes https://github.com/assimp/assimp/issues/2368 : add missign anim mesh for multimaterial meshes in fbx,.
2019-06-21 18:00:53 +02:00
bf252c4452
Add configuration of text format precision
...
Define ASSIMP_AI_REAL_TEXT_PRECISION
8 when ai_real is float
16 when ai_real is double
2019-06-20 18:11:11 +01:00
59f732e10d
DAE Import: Don't use SkipElement() to skip empty Text
...
IrrXML doesn't recognise the construction: `<author></author>` as being an empty element, and so ColladaParser::TestTextContent advances the element stream into the `</author>` element.
Use TestClosing(const char*) instead of SkipElement() to skip an empty text element.
2019-06-20 16:30:52 +01:00
6b3d6c3b8f
JT: next steps.
2019-06-18 20:35:02 +02:00
ced080f9f3
X: fix out of bound access.
2019-06-15 19:17:15 +02:00
eb27fb753d
Merge branch 'master' into kimkulling-patch-3
2019-06-15 13:44:13 +02:00
6c33374491
update install interface location
2019-06-13 22:08:34 -07:00
d00f4f4b3a
Build Hunter-compatible config file
2019-06-13 21:34:47 -07:00
5cda81e84b
code fixes for Hunter-based build
2019-06-13 21:32:37 -07:00
dab8041bcd
rewrite include paths for Hunter packages
2019-06-13 21:32:36 -07:00
a4587e8609
Use hunter to download dependencies if HUNTER_ENABLED is ON
2019-06-13 21:31:24 -07:00
ba29b8f1da
Merge branch 'master' into patch-1
2019-06-13 13:41:40 +02:00
0021c93892
closes https://github.com/assimp/assimp/issues/2431 : use irrXml directly for mingw compiler.
2019-06-12 22:12:38 +02:00
66f693a6a4
Update IRRLoader.cpp
...
fix case-sensitive typo.
2019-06-12 10:25:11 +02:00
e914b9531b
Update IRRLoader.h
...
fix case-sensity typo.
2019-06-12 00:55:06 +02:00
4dcb3c9235
Update ImporterRegistry.cpp
...
fix case-sensiive folder bug.
2019-06-11 21:55:21 +02:00
fc065d8ab4
Merge branch 'master' into reorg
2019-06-11 20:59:46 +02:00
a6e3fc3fd9
Fix case-sensitive folder name for unix platforms.
2019-06-11 20:54:01 +02:00
cc10967913
Fix the build.
2019-06-11 20:17:50 +02:00
d448b49ae1
fixed MSVC toolset versions >140
...
according to https://cmake.org/cmake/help/latest/variable/MSVC14.html the use of the MSVC** flags is deprecated, this change uses the encouraged MSVC_VERSION variable.
2019-06-11 15:16:53 +02:00
f76d77955d
Merge branch 'master' into reorg
2019-06-11 00:22:50 +02:00
2da3a38d60
Fix the compile pass, still unresolved symbols.
2019-06-10 23:26:00 +02:00
7e20356a20
Update XFileParser.cpp
...
Fix exception.
2019-06-10 20:32:56 +02:00
6fc42cb898
Merge branch 'master' into kimkulling-patch-3
2019-06-10 00:39:05 +02:00
a4bda3a205
Update XFileParser.cpp
...
Test
2019-06-09 21:25:25 +02:00
2d985b92c9
Fix references in cmake file.
2019-06-09 18:43:56 +02:00
83247e3fbd
Merge branch 'master' into glTF-importer---clean-all-member-arrays
2019-06-09 15:52:32 +02:00
cbd5c5b284
Merge branch 'master' into Ogre_with_skeleton_missing
2019-06-08 21:31:47 +02:00
4a46717a77
Merge branch 'master' into kimkulling-patch-3
2019-06-08 09:09:37 +02:00
5679dd435a
Prevent crash when Ogre skeleton file is missing
2019-06-07 09:49:24 +02:00
57c46db042
Reorg of code.
2019-06-06 14:45:43 +02:00
589a306c85
Merge branch 'master' into code-chmod-644
2019-06-06 09:16:07 +02:00
6ed4f5d936
JT: Inital commit.
2019-06-06 08:29:12 +02:00
1855bf44f9
glTF importer - clean all member arrays
...
When importing more than one scene using the same gtlf importer loading fails with error 'bad array new length'. This happens because 'meshOffsets' are not cleared and the importer continues to push_back values at the end. Adjacent values are then used to calculate the length of 'mMeshes' array. This calculation expects that each value is higher than the previous otherwise we get negative length. But when pushin at the end of uncleared array we get contents like this: 0,1,2,3,0,1,2. Then when calculating 0-3 we try to allocate array of length -3 and get this exception.
2019-06-05 18:51:49 +02:00
dcee3295cc
Merge branch 'master' into FindInstancesProcessOptim
2019-06-04 10:36:59 +02:00
48ed2d2d3c
Double precision fix
2019-05-30 10:54:44 +01:00
5bc6787d57
Merge branch 'master' into FindInstancesProcessOptim
2019-05-29 12:21:48 +02:00
a6b51ef911
Merge branch 'master' into code-chmod-644
2019-05-29 08:59:47 +02:00
51527ba038
Merge branch 'master' into utf8
2019-05-28 19:53:14 +02:00
5c3662dc6d
Merge branch 'master' into set_stl_mesh_names
2019-05-24 21:49:35 +02:00
b03b3b9c03
Initial parsing for header and more.
2019-05-24 17:22:54 +02:00
fdcae81b61
Merge branch 'master' into set_stl_mesh_names
2019-05-23 11:21:49 -07:00
e1ed975839
Merge branch 'master' into topic/fbx_node_naming_optimization
2019-05-22 20:13:36 +02:00
daef984ac6
Optim FindInstancesProcess
...
ComputePositionEpsilon() is a costly function which was called in the inner
loop although it only uses data from upper loop.
2019-05-22 20:00:33 +02:00
fc7575f5c5
Remove Unix executable bit on code files
2019-05-22 10:23:13 +02:00
5fa750fda0
Fix code files encoding to make them all UTF-8
2019-05-22 10:19:32 +02:00
52d4564b7e
Merge branch 'master' into topic/fbx_file_more_than_4gb
2019-05-21 20:12:57 +02:00
0eec1c1d4a
One map to rule them all
2019-05-21 16:05:38 +01:00
7ac831489c
Merge branch 'master' into set_stl_mesh_names
2019-05-20 08:52:20 -07:00
627cb93b0b
Merge branch 'master' into topic/fragmented_embedded_textures
2019-05-19 20:16:49 +02:00
ff4ab7ff2e
Add mesh names to imported ASCII STL
2019-05-17 11:48:57 -07:00
2f4cb93764
Merge branch 'master' into topic/exception_spam_fix_fbxmaterial
2019-05-17 19:43:54 +02:00
4b10c7e432
Merge branch 'master' into topic/degenerate_area_fix
2019-05-16 21:44:46 +02:00
81f8ebf2d4
Merge branch 'master' into kimkulling-2449
2019-05-16 17:04:09 +02:00
7cd021e704
Merge branch 'master' into pdb-install-fix
2019-05-16 14:49:29 +02:00
6c13ec8190
fix for clang runtime checks for overflow
2019-05-16 11:59:23 +01:00
c84ac7a135
Fragmented FBX ASCII emdedded resource
2019-05-16 11:59:23 +01:00
13bba4fb4c
even more efficient
2019-05-16 11:58:48 +01:00
b957d44943
Node names optimization and fixing non-unique name
2019-05-16 11:58:48 +01:00
c58ed8da22
Support for FBX file sizes more than 4GB
2019-05-16 11:58:26 +01:00
4e03a2c00d
Exception spam fix for FBXMaterial
2019-05-16 11:58:07 +01:00
5bca43be74
Degenerate triangles with small area removing fix
2019-05-16 11:57:46 +01:00
77281b75b2
Merge branch 'master' into master
2019-05-16 11:13:48 +02:00
785ceaf58a
Merge branch 'master' into windows-external-zlib-fix
2019-05-14 22:07:56 +02:00
747a7c963b
Merge branch 'master' into assimpview_unicode
2019-05-13 23:49:06 +02:00
815730c92d
Update CMakeLists.txt
...
closes https://github.com/assimp/assimp/issues/2449 : fix uwp handling
2019-05-13 21:49:50 +02:00
adbdbf2be6
closes https://github.com/assimp/assimp/issues/2459 : fix duplicated fbx-type propertry.
2019-05-13 21:41:37 +02:00
461e21f66d
Fix Windows build with external zlib
...
assimp.rc contains an include with a double-parent header search.
In a default build configuration, this is resolved via the
configuration header path generated for in-tree zlib.
When external zlib is used, this header search path is not provided
to the RC compiler, therefore fails to find revision.h.
This is solved by simply including "revision.h" since the root of
the binary directory is already used as a search path.
2019-05-12 10:56:59 -10:00
cb0c47764a
Set directory and name properties for installing static lib PDB
2019-05-11 12:11:52 -10:00
4f7de109a1
Merge branch 'master' into assimpview_unicode
2019-05-10 18:52:32 +02:00
741be6f9db
Merge branch 'master' into fbxexport_crashfix
2019-05-10 15:32:18 +02:00
700954c115
Update FBXExporter.cpp
...
Just fixed some typos.
2019-05-10 09:09:47 +02:00
a443544986
Replaced binary literals with hex literals (since binary literals was introduced in C++14)
2019-05-09 15:28:00 +02:00
9903504c42
Removed some code that I didn't mean to fix (I already submitted this in another PR: https://github.com/assimp/assimp/pull/2450 ).
2019-05-09 14:57:18 +02:00
575ef4d927
Added support for embedded textures to the FBXExporter (both binary and ASCII). Also made the FBX-namespaces more consistent (we had both Assimp::FBX:: and FBX::). Since we seem to support two types of embedded texture references (both asterisk+texture_id and filepath) I made the exporter use aiScene::GetEmbeddedTexture for looking up texture reference and integrated @loebl 's modification of the function to support the old ("*1") type of references ( https://github.com/loebl/assimp/commit/e217358 )
2019-05-09 14:50:22 +02:00
6736f3d24b
Don't call PutString with an empty string. Both DumpChildrenAscii and EndAscii can return without modifyting the string, so we need to check the string before calling PutString. This used to cause a crash.
2019-05-09 11:19:05 +02:00
56b82e9cd5
Merge branch 'master' into gltf2-import-animation-name
2019-05-07 21:43:29 +02:00
e1a0861556
Merge branch 'fbx_convert_to_unit' of https://github.com/assimp/assimp into fbx_convert_to_unit
2019-05-07 20:33:42 +02:00
390452bd06
Fix the build.
2019-05-07 20:32:45 +02:00
66a840d9e6
Merge branch 'master' into fbx_convert_to_unit
2019-05-07 15:26:52 +02:00
22b01ca3e8
Merge branch 'master' into master
2019-05-07 09:55:43 +02:00
e917b288a1
fix a typo.
2019-05-06 21:38:45 +02:00
4155f005be
Add implementation to convert from cm to m.
2019-05-06 21:21:58 +02:00
4a9cd08451
Prepaation for conversion.
2019-05-06 20:51:04 +02:00
df2a279895
Merge branch 'master' into issue_2054
2019-05-05 16:28:39 +02:00
9147fb8689
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
2019-05-05 16:24:05 +02:00
1324409c7b
fix build: fix wrong function prototype.
2019-05-05 16:23:42 +02:00
8c18c42afb
Merge branch 'master' into issue_2054
2019-05-05 16:16:45 +02:00
69ece762d1
fix the build: remove errorenous pragma statement.
2019-05-05 16:00:57 +02:00
fcff12b219
closes https://github.com/assimp/assimp/issues/2054 : make empty bone validation optional.
2019-05-05 13:39:10 +02:00
9b9f7b2876
Merge branch 'master' into bad-obj-file
2019-05-04 21:17:15 +02:00
34ede5608b
Merge branch 'master' into fix_assimp_export_consistency
2019-05-03 11:12:56 +01:00
6d5f8cbe26
Merge branch 'master' into obj_nan
2019-05-02 01:36:45 +02:00
e108b6f1d2
Merge branch 'master' into fix-mingw-debug-build
2019-05-01 17:04:45 +02:00
243b2618a9
Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected
2019-04-27 17:37:23 -07:00
bc4e411284
Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected
2019-04-27 17:20:27 -07:00
42202c2204
a test for bad OBJ file format and code fix that handles it
2019-04-26 22:13:29 +12:00
e83671f494
Generate attenuation constants if non are privded in the Blender file. Using: https://imdoingitwrong.wordpress.com/2011/01/31/light-attenuation/
2019-04-24 18:35:14 -04:00
0b42d55f73
Fix inconsistency between animation and node name in glTF2 Importer
2019-04-24 16:58:35 +03:00
48e5b948e3
Update ColladaExporter.cpp
...
Some reformattings
2019-04-24 09:03:59 +02:00
5713be615c
[FBX export] fixed ordering of skin indices and weights, to be consistent between systems
2019-04-18 16:55:54 +01:00
c34327b355
use std::isfinite()
...
GCC is more standards compliant than MSVC
2019-04-17 14:30:40 +01:00
e8bcf162dd
OBJ coerce invalid nan or inf texture coords to 0
...
Some exporters (eg Vectorworks 2019) may export texture coordinate components as "nan".
While this is invalid, it's better to coerce these values to 0 rather than reject the entire file.
2019-04-17 13:55:08 +01:00
51be6236a7
Merge branch 'master' into assimpview_unicode
2019-04-17 12:10:14 +01:00
7b6cb57e3b
Merge branch 'collada_metadata'
2019-04-17 12:07:48 +01:00
00f1fd6f7c
Merge branch 'master' into assimpview_unicode
2019-04-17 10:48:37 +01:00
0b9da72ed8
Merge pull request #5 from assimp/master
...
Rollup FBX material fixes from upstream
2019-04-17 09:44:10 +01:00
836801d37e
CMake updates for VS2015/cmake 3.12 onwards
...
cmake 3.12 adds MSVC_TOOLSET_VERSION to define the version of MSVC toolchain in use
Use that if present instead of if-elseif chain
2019-04-17 09:32:24 +01:00
685a56266b
Merge branch 'master' into fix-fbx-face-material
2019-04-15 09:55:38 +02:00
c92ae50e4f
Fix FBX face materials not being properly loaded if the face count mismatches the material count
2019-04-10 19:16:42 +02:00
f7384dec95
Possible fix for #2406 . Shouldn't affect other compiled files, but have
...
not verified this. Also, if anyone tries to debug StepFileGen1.cpp on MinGW,
the debug info may not be there, but I think this is the best we can do.
2019-04-10 09:45:31 -04:00
9aae110161
* Remove old non-maintained mingw makefile to prevent confusion
...
* Add notes on building with MinGW to Build.md
2019-04-10 09:29:21 -04:00
1f55bdd9a7
Save/Load Collada 1.4 Root Asset Metadata
...
Add Collada 1.4 <asset/> metadata to export and import.
Can store in the Scene or the Root Node for export, will be loaded into the Scene during Import
2019-04-09 16:28:15 +01:00
49459435df
Merge branch 'master' into collada_metadata
2019-04-09 12:38:29 +01:00
e3a397a98d
Merge pull request #3 from assimp/master
...
fast forward to master
2019-04-08 17:57:09 +01:00
d66166675a
first pass at collada metadata
2019-04-08 17:11:50 +01:00
cbd8b032e7
FBX: add test case
2019-04-08 17:37:40 +02:00
2a3626577f
Merge pull request #2 from assimp/master
...
Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00
6dec1346ed
Merge branch 'master' into issue_1957
2019-04-08 14:27:32 +02:00
f7d226768c
Merge branch 'master' into issue_1650
2019-04-08 13:06:30 +02:00
ddfc140fc3
Added <stdint.h>-include
2019-04-07 00:02:22 +02:00
fac392d6cb
Added missing include and fixed a mistake
2019-04-06 23:44:14 +02:00
015e960d0e
Merge branch 'master' into issue_1957
2019-04-06 22:22:05 +02:00
b3177a2a9a
issue 1957: Added support for reading embedded content (textures) in ASCII FBX. In ASCII FBX embedded content is encoded in Base64 and is surrounded by double quotation marks. The decoding functions are based on those used in the glTF importer.
2019-04-06 19:31:56 +02:00
c321fb6a44
Update FBXConverter.cpp
...
FBX: Add missind initializers.
2019-04-06 08:59:30 +02:00
d0ad03d653
Merge branch 'master' into issue_2390
2019-04-05 13:16:29 +02:00
898e59d8ee
Merge branch 'master' into issue_2043
2019-04-04 16:36:44 +02:00
20acce1c5e
Suggested fix for issue : If available, use "Scaling" and "Translation" instead of "ModelUVScaling" and "ModelUVTranslation". This seems to be what 3DS Max and FBX SDK use.
2019-04-04 16:31:34 +02:00
3abb494dd6
Merge branch 'master' into issue_2390
2019-04-04 13:08:27 +02:00
010afeb1d8
Merge branch 'master' into issue_1650
2019-04-04 12:42:21 +02:00
e63b9d4cd8
Merge branch 'master' into issue_2390
2019-04-03 21:17:38 +02:00
6d1514dd10
replaced "typedef" with "using" (I didn't notice Kim Kulling's previous commit until now)
2019-04-03 20:19:44 +02:00
f10e759db6
Merge branch 'issue_2398' of https://github.com/assimp/assimp into issue_2398
2019-04-03 20:16:24 +02:00
42608c0260
Fix small review findings.
2019-04-03 20:15:55 +02:00
287924a7d6
Merge branch 'master' into issue_2398
2019-04-03 20:03:07 +02:00
0251633ea2
Merge branch 'master' into issue_2393
2019-04-03 12:46:11 +02:00
4884cf2172
issue_2393: Added TransparencyFactor material key
2019-04-03 12:35:09 +02:00
fa37018e08
Merge branch 'master' into issue_2390
2019-04-03 12:26:06 +02:00
0505dd7266
issue 2390: FBXConverter::GetUniqueName now uses a map for keeping track of duplicate node name count and a set for registering names that have been taken.This is required because the model might contain a several nodes called "nodename" and another one called "nodename001". In that case we can't add "001" to the second node called "nodename".
2019-04-03 12:19:23 +02:00
930af2da44
closes https://github.com/assimp/assimp/issues/2398 : fix the build.
2019-04-02 20:43:03 +02:00
9d5a71e4af
Merge branch 'master' into fix-more-lgtm-alerts
2019-04-01 11:23:33 -04:00
f15f37634d
BlenderDNA.h:
...
* Fix rethrow that would crash the program.
* QUESTION: am I throwing the right exception here.
COBLoader:
* catch exception by const ref
* fix equality checks using strncmp taht weren't actually checking equality
FBXMaterial: Catch exception by const ref (+ Debug log that it's done so)
FBXConverter: Rename local variables to avoid shadowing parameter
ImageExtractor: Remove duplicated/unreachable code
FBXConverter: Another shadowed variable fix
MD5Loader: 2 shadowed variables
IRRLoader: shadowed parameter
StepFileReader.cpp: Shadowed parameter
IRRLoader: remove empty else statement
STLExporter: Throw error instead of silently ignoring unimplemented option
Misc empty blocks removed or debug logging added
2019-03-30 16:08:25 -04:00
89b3de9473
Update FBXConverter.h
...
Introduce using instead of typedef.
2019-03-29 16:24:45 +01:00
d314afaebc
added casts for rapidjson in gltf asset writer.
2019-03-29 12:19:39 +01:00
faf12c6f5f
Merge https://github.com/assimp/assimp
2019-03-29 11:55:21 +01:00
d129259ae4
Merge branch 'master' into issue_2390
2019-03-29 10:51:35 +01:00
4efa3736ba
Actually fix cmake this time
2019-03-27 12:03:39 -04:00
d718793163
Fix change to CMakeLists.txt
...
change CMakeLists.txt to use add_definitions instead of add_compile_definitions on old versions of cmake
2019-03-27 11:43:21 -04:00
769dd42b73
Add compile definition to fix issue
...
defines MINIZ_USE_UNALIGNED_LOADS_AND_STORES to be 0 to override default of 1 for x86 platforms.
2019-03-27 11:29:40 -04:00
ca08c4a209
FBX: Fix for loading taking a very long time on models with many duplicate names (issue_2390)
2019-03-27 11:20:16 +01:00
22f4667932
Merge branch 'master' into select_exporters
2019-03-17 23:44:35 +01:00
718b5b266b
Merge branch 'master' into fix_vs107_warnings
2019-03-16 18:41:54 +01:00
df6d257633
Fix 3MF importer
2019-03-16 11:55:16 -04:00
5ccd7d8c39
Adds a way to select which exporters you want to compile
...
Mimics the ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT / ASSIMP_BUILD_XXX_IMPORTER code but for exporters.
This works exactly the same way with one exception - ASSIMP_NO_EXPORT still overrides everything and turns off all exporting.
Fixes #2377
2019-03-16 11:40:17 -04:00
581d06a7b7
Merge branch 'master' into issue_1650
2019-03-16 16:22:47 +01:00
64bcf56101
Merge branch 'master' into issue_1650
2019-03-16 16:13:52 +01:00
a0c797a29e
Merge branch 'master' into fix_vs107_warnings
2019-03-16 16:09:14 +01:00
64a7a46406
Update MD3Loader.cpp
...
Fix typo.
2019-03-16 16:08:03 +01:00
ba6a7383b2
closes https://github.com/assimp/assimp/issues/1650 : build irrXml as shared lib.
2019-03-16 09:45:21 +01:00
9a533d826a
fix loading 3D uvs from obj
2019-03-15 22:43:12 +01:00
07bbb2c000
Nicer name for Assimp Binary importer
...
.assbin is not a nice name to show a user
2019-03-15 10:18:43 +00:00
61ffe017e8
Fix some coverity findings.
2019-03-14 17:37:28 +01:00
170549559e
fix: change ScaleProcess priority
2019-03-14 21:50:50 +08:00
04025f09cf
Merge branch 'master' into issue_934
2019-03-13 22:27:23 +01:00
145c3d1589
add missing changes.
2019-03-13 19:35:36 +01:00
650fadebe9
Fix compiler warnings: var declarations hides other var.
2019-03-13 16:58:18 +01:00
0dc2e9197a
Fix compiler warnings.
2019-03-13 14:40:02 +01:00
5fd9789fc3
remove last warning?
2019-03-12 02:51:37 -04:00
4728c1bb68
remove 1 more of the warnings
2019-03-12 02:49:33 -04:00
27dc922d09
Hopefully fix all warnings?
2019-03-12 01:06:54 -04:00
7bb1303773
ValidateDataStructure.cpp:
...
* Fixed warnings introduced by last commit (hopefully)
* Fixed case fallthrough (due to exception flow, it didn't make a practical difference, but hopefully will remove a warning)
* Minor formatting consistency improvements
2019-03-10 13:12:56 -04:00
2e262dbbc6
Make syntax used to call ReportError & ReportWarning a bit more consistent
2019-03-09 12:36:21 -05:00
80dffb63e8
Add aiNode::mName to ValidateDataStructure error reporting to ease debugging
2019-03-09 12:01:45 -05:00
3a610d3d66
Embed version information under Windows
2019-03-08 15:49:18 +00:00
b15c93c726
Merge https://github.com/assimp/assimp
2019-03-07 14:35:41 +01:00
7d7574f189
Merge branch 'master' into ETC_Inc
2019-03-05 12:07:10 +00:00
b9c8e0856f
Merge branch 'master' into fix-bug-autogenerated-names
2019-03-01 20:24:45 +01:00
e9eda062a1
In ColladaLoader in version 3.2.0 (release est. 2015) the name assignment was based on name attribute (xml) with optional fallbacks to id and sid. Over time this was changed to fix a bug and support for names was removed, only to be later (re)added using an optional `useColladaName` setting. We discovered a problem that with when using the name based assignment it doesn't assign automatically generated names like what it did in the logic in v3.2.0 and on the id based approach on current master.
...
We discovered this causes problems with matching the aiCamera and aiLight. So we rectified this problem by auto generating names also on the name based method.
2019-03-01 10:43:18 +07:00
7b01ff6b8d
ignoring invalid normals and uvs indices instead of canceling the import completely
2019-02-27 12:15:03 +13:00
16080ba60c
Merge branch 'master' into simple_skin_test
2019-02-25 22:06:56 +01:00
206004c7d6
introduce simple skin-test +some findings.
2019-02-25 22:06:24 +01:00
c1c42023fa
Merge branch 'master' into ETC_Inc
2019-02-20 16:58:41 +00:00
f59f3976c0
closes https://github.com/assimp/assimp/issues/1593 : fix computation of percentf for 3DS.
2019-02-20 00:02:19 +01:00
adbc7e8f70
closes https://github.com/assimp/assimp/issues/2115 : rollback setup of FBX-camera.
2019-02-19 20:23:20 +01:00
050430cae0
Merge branch 'master' into issue_2340
2019-02-19 13:14:59 +01:00
ae41ae3211
closes https://github.com/assimp/assimp/issues/305 ': fix viewer
2019-02-18 21:43:45 +01:00
4d0740a120
[Issue_2340] Proper closing endif()...
2019-02-18 14:15:39 +01:00
a94c8bf3f6
[Issue_2340] Wrong precondition layout... missed ANDROID=ON and ASSIMP_ANDROID_JNIIOSYSTEM=OFFvalid constellation
2019-02-18 14:14:27 +01:00
c3129e55d2
[Issue_2340] Added ASSIMP_ANDROID_JNIIOSYSTEM precheck to only remain set to ON in proper ANDROID enabled toolchain environment
2019-02-18 14:10:32 +01:00
0810b2d51b
Merge branch 'master' into ETC_Inc
2019-02-15 10:20:30 +01:00
4621bde985
Merge branch 'master' into topic/Bug2034_typeCodeC
2019-02-08 14:38:25 +01:00
6cc41d6be6
Merge branch 'master' into kimkulling-patch-3
2019-02-07 19:27:07 +01:00
cc276c3180
cast size_t to unsigned int
2019-02-06 21:14:22 +02:00
02a5f6b62f
Remove unneeded newline.
2019-02-06 11:15:27 +00:00
f9014d7410
Add tokenization of 'c' type arrays, both compressed and uncompressed.
2019-02-06 11:15:21 +00:00
6e39c22554
Fix potential security issues.
2019-02-05 22:05:52 +01:00
5ce1cfedfe
warning fix for gcc
2019-02-04 16:15:52 +00:00
971ba308b3
Merged PR 2811682: buffer grow changes and large files support
...
Buffer grow changes:
The exporting of relatevely large data could take a few days, because reallocation of a buffer every time for a few new bytes is overkill. I've introduced standard capacity member for the buffer and growth it by 1.5 times every time. That helps a lot, descrease exporting to a minute (from a few days).
Large file support:
glTF is a json file, all lengths and offsets don't have a type, just numbers, but code was always reading it as uint32, this doesn't work for files bigger than int32 (almost all files we have as an example). So, I've changed it to be reading as size_t. Specification doesn't specify the type for it, so it's not against spec.
2019-02-04 15:16:28 +00:00
ce691d383f
Merge branch 'master' into kimkulling-patch-3
2019-02-02 15:21:31 +01:00
0801a62ef7
Merge branch 'master' into kimkulling-dev
2019-01-30 16:09:33 +01:00
a06133ab52
Update copyrights.
2019-01-30 09:41:39 +01:00
38bebaf4d3
Fix glTF2 export with no texture coordinates
2019-01-28 16:02:09 +01:00
b35331b92a
Update FindInvalidDataProcess.cpp
...
-Fix some review findings.
2019-01-28 10:50:36 +01:00
4c2898c82b
Merge branch 'master' into issue_2251
2019-01-28 10:06:44 +01:00
5d6fc7a557
Closes https://github.com/assimp/assimp/issues/2251 : introduce AI_CONFIG_PP_FID_IGNORE_TEXTURECOORDS to avoid removing textures.
2019-01-27 21:05:58 +01:00
3aa5a61516
Merge branch 'master' into ETC_Inc
2019-01-23 19:53:43 +01:00
05ea039846
Merge branch 'master' into ETC_Inc
2019-01-22 20:10:50 +01:00
8191080986
Adapt MemoryIOSystem to delegate unhandled calls to shadowed IO system
2019-01-21 14:14:48 -08:00
a04b96ef66
Disable step.
2019-01-20 20:29:23 +01:00
002af28e54
Merge branch 'master' into fbx-keep-material-params
2019-01-18 17:35:34 +01:00
7dc32ab9b6
Preserve all the material parameters from FBX models
2019-01-17 19:07:15 +01:00
3c651be640
Exporter::ExportToBlob() Pass on preprocessing and properties. Issue #2302
2019-01-17 13:55:05 +00:00
f7fe729c88
Update FBXConverter.cpp
2019-01-17 12:32:36 +01:00
3a3340b926
add FBX Line Element support
...
add FBX Line Element support
2019-01-17 12:26:22 +01:00
19c3cea0db
Merge branch 'master' into fix_obj_progress_reporting
2019-01-09 22:09:25 +01:00
e37a4de2c2
Fix progress reporting in ObjFileParser. Remove old unused code which is claiming to still take up "1/3" of the total progress.
2019-01-08 15:56:57 -05:00
f170c84226
Test fixes
...
Test fixes
2019-01-06 19:38:29 -02:00
35a044bda3
Various additions/fixes (FBX blend-shapes support added)
...
Added animMesh name assignment at ColladaLoader
Fixed animMesh post-processing on ConvertToLhProcess (blend-shapes weren't being affected by post-processing)
Added WindowsStore define. This is used to change some incompatible WinRT methods
Added FBX blend-shapes and blend-shapes animations support
Added Maya FBX specific texture slots parsing
Added extra FBX metadata parsing
Added GLTF2 vertex color parsing
Fixed IFC-Loader zip-buffer reading rountine
Fixed OBJ file parsing line-breaker bug
Fixed IOStreamBuffer cache over-read bug
Added mName field to aiAnimMesh
Reverted EmissiveFactor, TransparencyFactor and SpecularFactor assignment on FBXConverter. Really, the commit #817 breaks a lot of old code.
2019-01-06 16:37:30 -02:00
a44d56976c
Merge branch 'Coverity-findings' of https://github.com/assimp/assimp into Coverity-findings
2018-12-31 14:54:40 +01:00
c63b1a1fd5
fix review finding: dereference after null-check.
2018-12-31 14:47:54 +01:00
96032ca341
Merge branch 'master' into Coverity-findings
2018-12-31 12:16:55 +01:00
425a784b23
fix finding: possible override.
2018-12-31 12:16:20 +01:00
92bb0febdf
fix review finding: fix resource leak.
2018-12-30 16:11:39 +01:00
3596c822a5
fix review finding: Wrapper object use after free.
2018-12-30 16:04:49 +01:00
b42d959418
fix review warning: wrapper object used after free.
2018-12-30 16:02:22 +01:00
35d69c360c
fix out-of-bound access.
2018-12-30 15:59:15 +01:00
281c191367
fix streamreader::end definition for iterators.
2018-12-30 10:44:43 +01:00
a8fda89079
remove unique_ptr ina local function / method.
2018-12-30 10:36:23 +01:00
8912bb333c
Fix memory leak.
2018-12-30 10:33:21 +01:00
f6cbb26d9c
Fix unnecessary allocation.
2018-12-30 10:30:12 +01:00
e09428c95b
eremove useless assertion test.
2018-12-29 21:29:42 +01:00
f5e94a2840
Add a check for the resule of a dynamic cast.
2018-12-29 21:27:20 +01:00
c1dc3901e7
fix more findings.
2018-12-28 11:17:27 +01:00
db202584ab
remove dead code.
2018-12-28 01:45:47 +01:00
859153e3e6
more fixes for coverity-findings.
2018-12-28 01:44:56 +01:00
4c6db68d34
Coverity-findings
2018-12-27 22:28:23 +01:00
ad7964be63
imported animation fix.
2018-12-21 10:36:03 +01:00
3c1d6a3f87
Fix animations import in gltf2
2018-12-19 20:28:43 -03:00
cf6dff0b93
Merge https://github.com/assimp/assimp
2018-12-19 17:27:17 +01:00
ae7a045396
Merge branch 'master' into timmmeh-gltf2-validation-patch
2018-12-11 07:59:11 +01:00
b5ebd24688
closes https://github.com/assimp/assimp/issues/817 : use emmisive factor instead of color.
2018-12-10 22:07:26 +01:00
e22e93e6d7
Merge branch 'master' into allow_step_disable
2018-12-08 21:38:18 +01:00
fd75e4923c
Merge pull request #7 from migenius/migenius-rsws52
...
Add check for NULL texcoord values.
2018-12-07 09:38:41 +11:00
f63caf894e
Add check for NULL texcoord values.
2018-12-06 12:56:02 +11:00
bb9e3c3593
Fix failed assimp validation for glTF2 sample animations
2018-12-05 14:46:56 -08:00
af323de741
Use ADD_ASSIMP_IMPORTER for STEP importer
2018-12-04 23:28:50 +03:00
8b6c6613f9
collada export: Use Camera local coordinate system
...
Fixes #2255
2018-12-04 14:44:49 +00:00
f49dbc8f62
Merge branch 'master' into OFF_Importer_Redesign_js_francal
2018-12-03 23:15:05 +01:00
b1da322deb
Update XFileParser.cpp
...
Add misisng bracket.
2018-12-03 23:13:10 +01:00
54be5fdb7b
Update XFileParser.cpp
2018-12-03 22:03:50 +01:00
ce91f5c888
Off-Importer: introduce unittest.
2018-12-03 21:24:06 +01:00
30d3c8c6a3
Fix CMake target alias typo
2018-12-03 23:22:34 +03:00
bb66af544a
closes https://github.com/assimp/assimp/issues/2228 : prepare pull-request.
2018-12-02 13:08:47 +01:00
117a2bc116
Merge branch 'master' into kimkulling-patch-2-1
2018-12-01 18:41:15 +01:00
aa0a5bb36f
Merge branch 'master' into gltf2-anim-duration
2018-12-01 13:41:54 +01:00
576673536b
Update SMDLoader.cpp
...
Fix compiler warning and do some reformattings.
2018-11-30 22:17:42 +01:00
b16f7c98c0
Merge branch 'master' into dev
2018-11-30 09:25:30 +01:00
2761681022
Issue 1639: Smd mesh vertex bone assignment
...
bone.mOffsetMatrix not set when bone.iParent == -1
2018-11-30 14:42:05 +08:00
9100ca8664
Fix: Smd Cannot read bone names containing spaces
2018-11-30 14:42:05 +08:00
19521d222b
Issue 1117: Smd load multiple animations
...
Read an animation list from a file
2018-11-30 14:42:05 +08:00
8c2e975508
Fix smd animation mess
...
aiMatrix4x4t<TReal>::FromEulerAnglesXYZ modified to row order
2018-11-30 14:42:05 +08:00
ef151b4610
Smd loads a single animation file
...
Can't load without mesh before
2018-11-30 14:42:05 +08:00
ebcea3cb02
Merge branch 'master' into a-bunch-of-fixes
2018-11-29 20:34:13 +01:00
47e3301c47
Update glTF2Asset.inl
...
Remove my nonsense, sorry!
2018-11-27 23:22:09 +01:00
657014dff6
Update glTF2Asset.inl
...
Fix possible nullptr-dereferencing.
2018-11-27 20:18:00 +01:00
ccea70c61f
Calculate the mMaxDuration property based off of keyframes
2018-11-27 11:49:00 +00:00
0bb672c6fa
Fix scenes not always being loaded
2018-11-27 11:45:53 +00:00
770356a55b
AssbinLoader: fix setting mNumChildren and releasing the smart pointer
2018-11-26 15:10:48 +01:00
a7cbb4386c
3DSLoader: exception-safety
...
Fixes memory leaks and/or crashes on malformed input.
2018-11-26 12:06:08 +01:00
430fe98c53
AssbinLoader: hardening, exception safety
...
Fixes potential memory leaks and crashes on malformed input.
2018-11-26 12:06:08 +01:00
66599b6392
Assbin: fix loading/exporting compressed format
2018-11-26 12:06:08 +01:00
02359ea369
closes https://github.com/assimp/assimp/issues/2202 : put STEPParser out of IFC importer.
2018-11-25 12:00:51 +01:00
d03e978c1b
closes https://github.com/assimp/assimp/issues/2210 : use different enum value.
2018-11-25 10:45:45 +01:00
23af5336d5
Update D3MFImporter.cpp
...
Avoid using extension twice.
2018-11-23 20:21:58 +01:00
e595410de1
Fix static init ordering issue in 3mf importer
2018-11-23 20:04:16 +01:00
a24502577f
DXF-Importer: some small review findings.
2018-11-21 22:00:11 +01:00
9ae8efcf09
closes https://github.com/assimp/assimp/issues/2229 : fix count of polylines when only one vertex was indexed.
2018-11-21 21:29:09 +01:00
eba1887d34
Merge branch 'master' into kimkulling-patch-2-1
2018-11-20 20:15:44 +01:00
0535b28908
nullptr instead of NULL
2018-11-16 12:17:12 +01:00
48ee14c64e
C4703 workaround for msvc++
...
`error C4703: potentially uninitialized local pointer variable 'pcFirstFrame'` in debug mode
2018-11-14 21:20:27 +01:00
04ee420f63
Merge branch 'master' into kimkulling-patch-2-1
2018-11-13 16:08:18 +01:00
6a8e11dbb2
Update Exporter.cpp
...
Fix review finding.
2018-11-13 13:10:16 +01:00
9bf4425239
Merge branch 'master' into gltf_skinmesh
2018-11-13 09:13:01 +01:00
b6af80f2fd
closes https://github.com/assimp/assimp/issues/2199 : introduce first version for exporter.
2018-11-12 22:26:10 +01:00
c30c4ae6e2
glTF2 importer multiple primitives and 16-bit index buffer skinmesh support.
2018-11-11 14:27:11 +09:00
02c6b9b64b
Merge branch 'master' into issue_2206
2018-11-09 13:13:52 +01:00
e787604ff1
Update ValidateDataStructure.cpp
...
Integrate review findings.
2018-11-09 11:54:12 +01:00
850d57b39d
closes https://github.com/assimp/assimp/issues/2206 : make bone error in verification more verbose.
2018-11-08 22:12:05 +01:00
044c9b39e0
Merge branch 'master' into patch-2
2018-11-08 22:00:33 +01:00
d5c9b27af8
delete[] doesnt set nullptr
2018-11-08 12:49:35 +01:00
97450fcb55
added DropFaceNormalsProcess to out vector
2018-11-08 11:44:44 +01:00
ad237f1949
MD5-Loader: set meshnames.
2018-11-02 17:02:36 +01:00
d1af9526b1
Update glTF2Importer.cpp
2018-11-01 10:52:39 -07:00
e205399052
Update glTF2Importer.cpp
2018-11-01 09:01:19 -07:00
69abac59d2
Update glTF2Exporter.cpp
2018-11-01 08:49:06 -07:00
b33054e05a
Merge branch 'master' into glt2anim
2018-10-30 15:51:08 +01:00
b8e1207b13
Merge branch 'master' into master
2018-10-30 12:43:15 +01:00
dc591f5c07
Merge branch 'patch-1' of https://github.com/ihmc3jn09hk/assimp into ihmc3jn09hk-patch-1
2018-10-30 10:44:40 +01:00
04c6d8347b
Update glTF2Exporter.cpp
2018-10-29 15:23:26 -07:00
bc80652ae9
Update glTF2Exporter.cpp
2018-10-29 15:04:48 -07:00
e5eb00d8d3
Update glTF2Importer.cpp
2018-10-29 14:53:33 -07:00
7b9f4a66de
Update glTF2Exporter.cpp
2018-10-29 14:52:41 -07:00
bfe1dc2914
Merge branch 'glt2anim' of https://github.com/haroonq/assimp into glt2anim
2018-10-29 14:46:52 -07:00
acad9a06e9
Add support for importing GLTF2 animations.
...
Refactors the glTF2 internal classes to more closely reflect the structure
of the actual GLTF2 file format. Adds implementations for reading skins
and animations from GLTF2 files into those structures.
Also provides implementations for converting skins and animations from GLTF
into assimp data structures. Special handling is required for bone weights
since assimp stores vertex-weights-per-bone whereas GLTF2 stores
bone-weights-per-vertex. Only supports keyframed LINEAR animation data;
STEP and CUBICSPLINE is not currently supported.
2018-10-29 14:44:29 -07:00
c465040738
Update DropFaceNormalsProcess.cpp
...
Fix typo.
2018-10-29 16:58:02 +01:00
6d1dee606a
integrated DropFaceNormals process (cmake, poststepregistry)
2018-10-29 16:26:50 +01:00
95c0deaaff
added DropFaceNormals process
2018-10-29 16:23:11 +01:00
57d3d71b6e
Add support for importing GLTF2 animations.
...
Refactors the glTF2 internal classes to more closely reflect the structure
of the actual GLTF2 file format. Adds implementations for reading skins
and animations from GLTF2 files into those structures.
Also provides implementations for converting skins and animations from GLTF
into assimp data structures. Special handling is required for bone weights
since assimp stores vertex-weights-per-bone whereas GLTF2 stores
bone-weights-per-vertex. Only supports keyframed LINEAR animation data;
STEP and CUBICSPLINE is not currently supported.
2018-10-26 15:39:28 -07:00
9a86714265
Merge branch 'master' into patch-1
2018-10-21 14:18:02 +08:00
df1669d07e
Fix the wrong results when calling aiGetMaterialInteger on bool type properties, such as AI_MATKEY_TWOSIDED.
2018-10-20 17:00:27 -07:00
248f6c3aa1
Make gltf2's roughnessAsShininess matches between importer and exporter.
...
In glTF2Exporter, roughnessFactor = 1 - normalizedShininess = 1 - someFunc(sqrt(shininess / 1000)). But in gltf2Importer, roughnessAsShininess = (1 - roughnessFactor) * 1000. No sqr there. So if save a shininess to a gltf2 and load it back, the value changed. This fix add a square to importer to make sure the consistency.
2018-10-16 21:17:35 -07:00
05b5930b29
Amended the "Key" for the database ReadField
...
Amended the key "flags" -> "flag". The field key("flags") was not matching the key("flag") in the BlendDNA. It was annoying during debug mode since the exception prompt for the mismatching and.
2018-10-16 00:25:44 +08:00
b340c5f2e8
Merge branch 'master' into step-import
2018-10-09 17:35:44 +02:00
ed43c48e93
Update SplitLargeMeshes.cpp
...
Fix double-parthesis.
2018-10-09 15:34:44 +02:00
d166e1fd73
Merge branch 'master' into Manage_PCloud_in_Filters
2018-10-09 11:56:39 +02:00
27c9461aad
Update SplitLargeMeshes.cpp
...
Fix typo.
2018-10-09 11:56:30 +02:00
1c672f4c9d
Update SplitLargeMeshes.cpp
...
Fix clang compile error ( unneeded enum parhesis ) and fix some minor findings.
2018-10-08 21:06:48 +02:00
871e1524e4
Update IFCLoader.cpp
...
Remove dead code.
2018-10-08 14:51:50 +02:00
931ef2cd0b
StepFile: fix conversion from ulong to uint.
2018-10-07 21:15:09 +02:00
2e443dc669
Merge branch 'master' into C4267
2018-10-07 20:31:41 +02:00
afbdb043b0
ReadFieldPtrVector should return true when successful
2018-10-07 19:11:34 +02:00
4c5c172ee2
Merge branch 'master' into C4267
2018-10-07 18:16:44 +02:00
e84ccaea15
Merge branch 'master' into step-import
2018-10-07 16:22:32 +02:00
16bdac5c9e
Merge branch 'master' into patch-1
2018-10-07 16:04:11 +02:00
6af016d149
Fix Blender FOV loading
2018-10-07 15:34:44 +02:00
c355412348
Merge branch 'master' into C4244
2018-10-07 14:29:39 +02:00
c90eda983d
Fix: C4267
2018-10-06 16:31:58 +02:00
b4425d8e36
Fix: C4267
2018-10-06 16:30:38 +02:00
e7da1c634d
Fix: C4244 conversion warning
2018-10-06 16:28:10 +02:00
239c59d715
Fixed include: IFCReaderGen_4 instead of IFCReaderGen4
2018-10-06 16:12:58 +02:00
88c173a6f4
Replaced "../Include/" include from glTFAsset.h
2018-10-06 15:20:28 +02:00
47fcbfd369
Replaced "../Include/" include from glTF2Asset.h
2018-10-06 15:19:56 +02:00
7061493ead
Replaced "../Include/" include from HMPFileData.h
2018-10-06 15:16:40 +02:00
d7bcd58174
Replaced "../Include/" include from MD4FileData.h
2018-10-06 15:15:43 +02:00
8bb4b57d1d
Replaced "../Include/" include from HMPFileData.h
2018-10-06 15:11:47 +02:00
91a805a082
Update HalfLifeFileData.h
2018-10-06 15:05:18 +02:00
463a7e8016
Replaced "../Include/" include from MD3FileData.h
2018-10-06 15:02:58 +02:00
99fc989af7
Replaced "../Include/" include from MDLFileData.h
2018-10-06 15:01:42 +02:00
d9a7ed19a8
Replaced "../Include/" include from 3DSHelper.h
2018-10-06 14:59:20 +02:00
531f30302f
Replaced "../Include/" include from 3DSHelper.h
2018-10-06 14:58:06 +02:00
d4b0cd53ea
Replaced "../Include/" include from FBXDocumentUtil.h
2018-10-06 14:55:20 +02:00
619e09fbec
Stepfile: separate generated code.
2018-10-06 08:45:55 +02:00
106b139ef3
Stepfile: renaming first generated code.
2018-10-05 19:42:26 +02:00
aceaecaed7
StepFile: introduce generated parser code.
2018-10-05 19:41:52 +02:00
b43cf92337
Improved cmake configs for Windows and Linux.
...
Now the configs follows the standard cmake-package code: see https://cmake.org/cmake/help/v3.12/manual/cmake-packages.7.html
Downstreamer no longer have to manually specify target_include_directories with ${ASSIMP_INCLUDE_DIRS}, target_link_libraries with ${ASSIMP_LIBRARY_DIRS} and so on.
Downstreamer can now use:
find_package(assimp CONFIG REQUIRED)
target_link_libraries(AWESOME_APP PUBLIC assimp::assimp)
and everything should work.
Added assimpTargets.cmake.in
Added assimpTargets-debug.cmake.in
Added assimpTargets-release.cmake.in
Modified CMakeLists.txt
Modified code/CMakeLists.txt - added ALIAS assimp::assimp
Tested on Ubuntu 18.04 and Windows 10
2018-09-30 17:18:18 +02:00
35374e777b
Merge branch 'step-import' of https://github.com/assimp/assimp into step-import
2018-09-28 18:02:54 +02:00
3249409243
Some minor findings.
2018-09-28 18:02:49 +02:00
4003309e7a
StepFile: prepare code gen.
2018-09-28 17:06:03 +02:00
e38629613c
Merge branch 'master' into step-import
2018-09-28 15:59:27 +02:00
50a95ad0f2
Merge branch 'master' into migenius-rsws52
2018-09-27 01:04:44 +02:00
2dc572167c
Merge branch 'master' into issue_2154
2018-09-26 22:13:29 +02:00
35a727a3e4
closes https://github.com/assimp/assimp/issues/2154 : remove redundant file from source folder.
2018-09-26 21:37:02 +02:00
74db0e906b
Fix some minor findings.
2018-09-26 21:19:40 +02:00
ea0f074933
Merge branch 'kimmi_dev' of https://github.com/assimp/assimp into kimmi_dev
2018-09-26 20:53:37 +02:00
9c8e6f2127
Fix overflow by face allocation.
2018-09-26 20:52:59 +02:00
5d091c4591
Merge branch 'master' into kimmi_dev
2018-09-26 19:15:58 +02:00
586c812eee
Merge pull request #5 from assimp/master
...
Merge commits from head master.
2018-09-26 15:44:41 +10:00
07362fdd35
Merge branch 'kimmi_dev' of https://github.com/assimp/assimp into kimmi_dev
2018-09-25 20:16:28 +02:00
6146ff818c
Enable coveralls for export tests.
2018-09-25 20:15:48 +02:00
504e5fd5c5
Use unique_ptr for gltf2 textures
2018-09-24 21:28:53 +02:00
72aa49c54f
Merge branch 'master' into kimmi_dev
2018-09-22 15:52:22 +02:00
9f6238f3af
INtroduce unittests.
2018-09-22 15:50:40 +02:00
56392cc02f
Update MMDPmxParser.cpp
...
Fix encoding for readstrings.
2018-09-22 12:50:23 +02:00
d42f9a3226
Update MMDImporter.cpp
...
Reformattings
2018-09-22 12:46:38 +02:00
02c4b7f1bc
Merge branch 'master' into umw_dev
2018-09-22 10:24:09 +02:00
cc0b3e1249
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-09-22 07:54:10 +02:00
24b42274fb
Update MDCFileData.h
...
Fix build by remove not supported initializer for array.
2018-09-21 20:13:35 +02:00
3a38c2c067
Update MDLFileData.h
...
Remove not supported array initialization.
2018-09-21 19:43:19 +02:00
e129d88825
Update ASEParser.h
...
Fix not supported array initialization.
2018-09-21 19:26:41 +02:00
2017e50e7b
Update AMFImporter_Node.hpp
...
Fix invalid array initialization.
2018-09-21 18:59:47 +02:00
f75bf6d99c
MAke noexcept compiler-specific.
2018-09-21 16:25:27 +02:00
f818a909e5
Fix static-code-analysis findings.
2018-09-21 16:07:09 +02:00
6cea62142c
Merge branch 'master' into Manage_PCloud_in_Filters
2018-09-20 10:34:55 +02:00
9eeaf19eab
Allow findDegenerate and SplitLargeMesh to pass point clouds models.
...
Otherwise the model is removed or crash
2018-09-20 10:31:32 +02:00
29496d877e
Merge branch 'master' into master
2018-09-17 19:58:11 +02:00
6ee9b07c49
closes https://github.com/assimp/assimp/issues/212 : introduce unittest for line-splitter, will validate that the current behaviour is correct.
2018-09-16 17:13:34 +02:00
4e357d1ff4
Merge branch 'master' into master
2018-09-13 20:04:41 +02:00
7911faf130
Fixed problem getting glTF 2.0 camera type, fixes #2138 .
2018-09-13 16:04:04 +10:00
4f7bacd108
Collada: some reformatting + minor findings.
2018-09-11 20:01:16 +02:00
d5de32ec1c
FBX import: fix import of direct data by vertices + unify node renaming
2018-09-11 16:07:43 +02:00
c1ed5e0048
Merge branch 'master' into assbin_test
2018-09-11 11:14:50 +02:00
afd47d5ab6
Update AssbinLoader.cpp
...
Fix memory leak,
2018-09-11 09:12:28 +02:00
081365df48
Introduce simple export test for assbin.
2018-09-10 22:42:24 +02:00
c3d8464a37
Remove aiCreateAndRegisterDefaultMaterial, it's completely wrong
2018-09-10 16:41:12 +03:00
c25a2dfc22
Assbin: add unittest.
2018-09-08 19:15:56 +02:00
1c577f66f7
Collada-Exporter: fix some minor findings.
2018-09-07 19:14:52 +02:00
2ee09b2528
Correct 3MF displaycolor import
2018-09-05 16:23:47 +02:00
640698ba57
Fix compile error that clang caught.
2018-09-03 13:22:46 -07:00
d3f1f2337d
Merge master
2018-09-03 21:59:08 +02:00
b191754863
Merge branch 'master' into step-import
2018-09-03 21:59:00 +02:00
78fe5e7f04
Fix expensive memory allocation and memory copying occurring in obj files with a large number of meshes.
2018-09-03 11:33:56 -07:00
499f66f3cc
Step: check step-files for import.
2018-09-02 13:04:52 +02:00
a7306abcfe
MDC-Loader: fix a possible nullptr access.
2018-08-31 19:29:17 +02:00
dcfc505c4c
Merge branch 'master' into issue_1451
2018-08-28 19:44:46 +02:00
aa8e32c509
closes https://github.com/assimp/assimp/issues/1451 : break when assimp-bin format was exported with a different version.
2018-08-28 19:42:20 +02:00
c75bc99902
Step-Importer: introduce new files.
2018-08-26 19:05:21 +02:00
09cf839188
Merge branch 'master' into master
2018-08-19 13:17:27 +02:00
74e8200a49
Merge branch 'master' into master
2018-08-17 14:12:15 -07:00
82f3d40d60
Fixes crash when importing invalid glTF/2.0 files
...
Skips some glTF/2.0 uv processing if the count of uvs in the attribute stream doesn't match the vertex count.
This happens with some malformed glTF/2.0 files, and the change will allow them to be processed properly.
Without the change, an access violation will occur several lines below if uv count is less than the position count.
2018-08-17 13:49:01 -07:00
a16fb1e54c
Merge branch 'master' into master
2018-08-17 21:46:08 +02:00
0ba57202f7
Use array delete command vs object delete since mMeshes is allocated with new[]
2018-08-16 13:56:35 -07:00
f4e6d4bb9e
Merge branch 'master' into master
2018-08-16 19:02:20 +02:00
102486005d
Fix memory leak on throw
2018-08-15 03:40:39 +03:00
2b15586e6b
Replace memcpy_s with memcpy to fix build with gcc 4.8
2018-08-15 01:22:28 +03:00
d25083dba9
Add point cloud support for OBJ importer
2018-08-13 00:18:12 +03:00
dd8cf73415
Update BVHLoader.cpp
...
Fix compiler warning: not handled enum in switch.
2018-08-11 00:15:22 +02:00
b3132bd8c2
FBX: some refactorings.
2018-08-10 01:57:11 +02:00
c3d043e761
FBX: some refactorings.
2018-08-09 21:51:53 +02:00
43be7abb70
closes https://github.com/assimp/assimp/issues/2088 : fix possible out-of-bound access in fbx-lerp operaation.
2018-08-09 20:48:25 +02:00
8fba4ce7cf
Support out of order channels
2018-08-08 15:22:10 -07:00
77980bf07c
Merge branch 'master' into master
2018-08-06 23:46:54 +02:00
5321e1036d
Fix .obj displacement texture parsing
...
The string for an opacity texture is a substring of the displacement
texture string. Due to the nature of the string comparison in the
material texture parsing, any displacement textures will be incorrectly
assigned as opacity textures. Fix this by simply performing the check
for displacement texture before checking for opacity texture.
2018-08-04 16:36:04 -05:00
824399c5c4
Merge branch 'master' into Fix2077
2018-08-04 17:00:19 +02:00
3c37fbdc6b
Remove try catch(...) on gltf2 importer
...
Better to throw exception than hide it ?
2018-08-04 12:47:37 +02:00
ae0f82d5b7
Fix #2077 : GLTF segfault using triangle strip
2018-08-04 12:47:37 +02:00
c2c44a831c
Pass parameter by reference
2018-08-03 14:51:01 +02:00
a65a7b6c81
Merge branch 'master' into master
2018-08-02 20:26:48 +02:00
cb567d9f65
added internal to_string.
2018-08-01 16:38:33 +02:00
92490eea01
Optimisation of FBX node name uniqueness
2018-07-30 17:27:03 +02:00
b965e7a6dc
FlipUVsProcess should also process AnimMeshes (if any)
2018-07-28 18:18:17 +01:00
cd061a0957
Merge branch 'master' into stl_format_issue_2064
2018-07-25 18:38:59 +03:00
9a6b07e522
closes https://github.com/assimp/assimp/issues/1724 : add default material access to the material API.
2018-07-25 15:11:24 +02:00
7d630e98da
STLImporter::LoadBinaryFile add one child node to produce same scene structure as in STLImporter::LoadASCIIFile
2018-07-23 16:44:20 +03:00
a69e95bdc1
Add support of 32-bit indices for the glTF2 export
2018-07-19 11:29:04 +02:00
8a3daa1a24
closes https://github.com/assimp/assimp/issues/2056 : use correc exception type in MMD-loader.
2018-07-18 20:29:05 +02:00
417fed1693
Merge branch 'master' into fbximport-fix-uniquename
2018-07-18 11:43:38 +02:00
a5f95f993c
Merge branch 'master' into feature/join_vertices_processor_kill_unused_vertices
2018-07-15 22:21:04 +02:00
bf1683ab7e
Merge branch 'master' into fbximport-fix-uniquename
2018-07-15 19:19:33 +02:00
7cb467da11
Update FBXConverter.cpp
...
Try to trigger travis.
2018-07-15 14:55:52 +02:00
a4533770f4
Merge branch 'master' into issue_2046
2018-07-14 19:25:07 +02:00
b069e7d7d0
Merge branch 'master' into feature/glTFv2_blendshapes_support
2018-07-14 17:09:05 +02:00
72de09a562
Update FBXConverter.cpp
...
Remove dead code.
2018-07-14 17:08:04 +02:00
91b30e7e74
Update FBXConverter.cpp
...
simple change to retrigger CI
2018-07-14 12:10:59 +02:00
7967f0a33f
FBXImporter: Fix GetUniqueName to return names properly
2018-07-13 15:25:04 -05:00
309c52b10f
Merge branch 'master' into patch-1
2018-07-10 13:07:28 +02:00
c58aef4b4b
Merge branch 'master' into ios-build-script
2018-07-10 11:28:54 +02:00
992194b1b9
Removed signed int vs unsigned int comparison in for loops
2018-07-05 15:15:50 +01:00
0cc9240886
Build fix
2018-07-05 14:46:15 +01:00
ec1333bfdf
JoinVerticesProcess should only try to deduplicate used vertices.
2018-07-05 14:38:58 +01:00
3e3a785750
glTF v2 importer morph targets support
2018-07-05 14:28:29 +01:00
e43e30b726
Slight rework for fix to issue #2046 to remove some duplicated code.
2018-07-05 09:49:08 +10:00
e7699ca585
Added support for non-indexed meshes in glTF importer. Addresses issue #2046 .
2018-07-05 09:37:57 +10:00
cb1fc76859
Add TARGET_INCLUDE_DIRECTORIES for assimp target
...
With `TARGET_INCLUDE_DIRECTORIES` the `assimp` target can directly used in another CMake project, e.g. assimp can be used in a submodule with an `add_subdirectory()` call.
2018-07-04 22:56:35 +02:00
1a0231f91e
Merge branch 'master' into bug/keep_small_triangles_in_triangulation
2018-07-02 18:08:09 +02:00
6a45f84b73
Revert
2018-07-01 13:10:44 +03:00
6e346a5504
Added comment
2018-07-01 11:35:56 +03:00
1feb0d1c60
Change order of PP steps to triangulate before searching for degenerates
2018-06-29 15:52:12 +02:00
3c5c0a0df3
Deactivate area based rejection of triangles in triangulation
...
Use FindDegenerates post processing step for that.
2018-06-29 15:52:09 +02:00
eebf549e8e
Merge branch 'master' into ios-build-script
...
* master:
Fix regression on FBX importer unit test
Check nb of faces and vertices for FBX unit test
Update helper.py
Update helper.py
Solved pyassimp.errors.AssimpError in conda
Hide commit signature information when fetching commit hash
2018-06-27 09:59:51 +03:00
a17e788808
Merge branch 'master' into master
2018-06-26 15:12:03 +02:00
52c017b595
Added check to BaseImporter::SearchFileHeaderForToken making sure that a detected token is not in fact just a fraction of a longer token. Microsoft exported binary gltf files were detected as OBJ, because the "gltf " in the string "Microsoft GLTF Exporter 2.4.1.7" was detected as the token "f ". I added a new bool parameter to the method enabling this check. It's default false, and only ObjFileImporter sets it to true, so no other code should be affected.
2018-06-25 12:05:37 +02:00
de8adacb54
Fix regression on FBX importer unit test
...
box.fbx was broken since b28bcc commit.
2018-06-23 20:25:31 +02:00
097625e542
Merge branch 'master' into ios-build-script
...
* master:
Make glTF2 the default exporter for glft
2018-06-20 14:34:17 +03:00
7acc4c6808
Make glTF2 the default exporter for glft
...
- Put it in front of the list of exporters
closes https://github.com/assimp/assimp/issues/2001
2018-06-19 20:40:41 +02:00
ee2f0bccac
Merge branch 'master' into ios-build-script
...
* master:
Fix missing model error in Irr-instancing
closes https://github.com/assimp/assimp/issues/2024 : make code more readable.
closes https://github.com/assimp/assimp/issues/2019 : fix the qt-viewer without export.
applied coding conventions added check against the known faces
issue_2016 only add material uv mappings if set, ignore when no uvmapping set removed unneccessary pad_i1 field (to prevent unnecessary field read exceptions)
Update XFileParser.cpp
Update XFileParser.cpp
Some FBX files have Null/LimbNode attributes with an empty Properties70 element, where the Element is not NULL, but it's Compound is. The code only checked if the Element itself is NULL, thus causing a DeadlyImportError when trying to instantiate a PropertyTable for an Element that doesn't have a Compound.
fix build for independent build dir
Some review findings.
2018-06-19 10:02:25 +03:00
961cefb227
Merge branch 'master' into issue_2024
2018-06-18 21:49:07 +02:00
43ddd93fae
Merge branch 'master' into issue_2024
2018-06-18 21:21:07 +02:00
cc08c19248
closes https://github.com/assimp/assimp/issues/2024 : make code more readable.
2018-06-18 21:19:54 +02:00
cd0f5d0f70
Merge branch 'master' into master
2018-06-18 20:16:12 +02:00
e5fa1798f6
closes https://github.com/assimp/assimp/issues/2019 : fix the qt-viewer without export.
2018-06-17 20:37:09 +02:00
a96587d551
applied coding conventions
...
added check against the known faces
2018-06-16 15:30:22 +02:00
41bf572af6
issue_2016
...
only add material uv mappings if set, ignore when no uvmapping set
removed unneccessary pad_i1 field (to prevent unnecessary field read exceptions)
2018-06-16 15:08:19 +02:00
d416fe874e
Update XFileParser.cpp
...
Fix compiler warnings.
2018-06-16 10:32:43 +02:00
3e45acbf4e
Merge branch 'master' into review
2018-06-16 09:10:41 +02:00
a03ab068be
Update XFileParser.cpp
...
Fix typo.
2018-06-16 09:10:30 +02:00
0b02b92701
Some FBX files have Null/LimbNode attributes with an empty Properties70 element, where the Element is not NULL, but it's Compound is. The code only checked if the Element itself is NULL, thus causing a DeadlyImportError when trying to instantiate a PropertyTable for an Element that doesn't have a Compound.
2018-06-15 15:46:38 +02:00
1d5b1b12e2
Merge branch 'master' into ios-build-script
...
* master: (34 commits)
Update INSTALL for iOS build
Improve the contribution guide
usage of dynamic_cast instead of static_cast
prevent zero sized array allocations
reworked to ElemBase *
use of malloc and free (given to shared ptr) for correct mem management
rereworked suggested by clang
travis changes according clang 5.0
again travis hit me
changes according travis compiles
changes according travis build
changed to coding convention
issue_1973 added support for CustomData(Layer) to support multiple (texture) UV mappings added unittest with sample model
Update script.iss
replace typo by comment statement.
Update script.iss
Update script.iss
Update script.iss
Update script.iss
Update script.iss
...
2018-06-14 14:55:02 +03:00
a8236f2986
Merge branch 'master' into master
2018-06-12 22:10:54 +02:00
5f3aa142b4
Merge branch 'master' into master
2018-06-12 11:40:40 +02:00
9415380b4c
usage of dynamic_cast instead of static_cast
2018-06-10 10:35:15 +02:00
7db668e66f
prevent zero sized array allocations
2018-06-09 23:36:42 +02:00
959c0e8907
reworked to ElemBase *
2018-06-09 23:29:50 +02:00
5b4b16f360
use of malloc and free (given to shared ptr) for correct mem management
2018-06-09 21:25:59 +02:00
9d2a1ca047
rereworked suggested by clang
2018-06-09 21:12:05 +02:00
19fade2164
travis changes according clang 5.0
2018-06-09 20:57:32 +02:00
09825d8d03
again travis hit me
2018-06-09 20:42:02 +02:00
96bc2d3146
changes according travis compiles
2018-06-09 20:22:59 +02:00
2c2b76a2bb
changes according travis build
2018-06-09 16:47:05 +02:00
b8facc5dae
changed to coding convention
2018-06-09 15:56:26 +02:00
85b0026c92
issue_1973
...
added support for CustomData(Layer) to support multiple (texture) UV mappings
added unittest with sample model
2018-06-09 15:45:09 +02:00
fbdb4b17fd
Merge branch 'force_generate_normals'
...
# solved Conflicts:
# code/GenFaceNormalsProcess.cpp
# code/GenVertexNormalsProcess.cpp
2018-06-04 10:51:12 +02:00
a2a7877939
Merge branch 'master' into make_tools
2018-06-04 09:12:11 +02:00
87315883b5
Merge branch 'master' into master
2018-06-04 08:17:50 +02:00
d86a0e3adb
Merge branch 'master' into ios-build-script
...
* master:
LWOMaterial: Fix strict aliasing violations
3DS: Fix strict aliasing violations
Fix strict aliasing violation in MaterialSystem
Replace type punning with explicit memcpys
Update FBXConverter.cpp
Update Readme.md
FBX: LayeredTextures now work with embedded texture data
[pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3
[pyassimp] Updated setup.py
Properly reads in glTF/2.0 sampler address modes.
does not access undefined memory area anymore.
2018-06-03 14:25:36 +03:00
f15dcf7663
Added forced generation of normals with extra flag.
2018-06-01 17:32:02 +02:00
9064c983ad
Merge branch 'master' into master
2018-06-01 13:42:35 +02:00
b0b6048502
LWOMaterial: Fix strict aliasing violations
2018-06-01 12:37:21 +03:00
6788d7b18b
3DS: Fix strict aliasing violations
2018-06-01 12:28:33 +03:00
bbb60c29f0
Fix strict aliasing violation in MaterialSystem
2018-06-01 12:20:16 +03:00
b176513efa
FBX export. to_ktime ticks was ok.
2018-06-01 09:24:53 +02:00
31e75b9d54
Update FBXConverter.cpp
...
Replaces a 0 by nullptr.
2018-05-31 20:18:17 +02:00
339cc2e951
Some review findings.
2018-05-31 20:15:13 +02:00
fceeaa72f4
FBX animation export: Assimp animation time is already in seconds. Just convert to FBX time.
2018-05-31 15:07:00 +02:00
ffb6756d2a
FBX: LayeredTextures now work with embedded texture data
2018-05-30 14:56:53 +02:00
1ee9200277
smallerMax
2018-05-30 08:49:11 +03:00
1883d44b9b
Merge branch 'master' into master
2018-05-29 19:02:40 +02:00
c6eda67296
Changed assimp to force regeneration of normals.
2018-05-29 13:01:11 +02:00
27b989fd36
Merge branch 'master' into ios-build-script
...
* master: (148 commits)
Update Importer.cpp
[-] Trace print removed.
[F] Get return "like true" when error occured.
[*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision.
[F] List of importers can be empty.
[F] More correct control by a mouse
[F] React on mouse pressing ig view only.
[F] One alignment for labels. [-] Unused checkbox.
[+] QtCreator temporary file.
[*] Refactoring of "draw axes" procedure. [-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
[-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
Fix GenVertexNormals
[F] Wrong type in equation.
[F] Uninitialized variables.
Fix #1587 : add validation to LWS unit test
Fix #1970 : stl with empty solid
Add test for issue 1970: STL with empty solid
Add mesh name to ValidateDataStructure log
Read and write the KHR_materials_unlit glTF/2.0 extension.
...
# Conflicts:
# CMakeLists.txt
# port/iOS/build.sh
2018-05-28 16:27:00 +03:00
323d59c7aa
Check for null
2018-05-28 16:12:54 +03:00
bf7ec7d130
Merge branch 'master' into fix-vector-out-of-bound-access
2018-05-26 13:25:57 +02:00
aa18e8a2a5
Update Importer.cpp
...
Make check more expressive.
2018-05-25 21:43:39 +02:00
02d2b6e0d8
[F] Get return "like true" when error occured.
2018-05-25 21:30:59 +03:00
5b23492421
Merge branch 'master' into qt_assimp_viewer
2018-05-25 21:20:03 +03:00
d72ff712cb
[F] List of importers can be empty.
2018-05-25 21:16:08 +03:00
97cecc858a
Properly reads in glTF/2.0 sampler address modes.
...
Assimp was returning glTF/2.0 values as address modes instead of aiTextureMapModes.
Also modified text glTF/2.0 model's sampler uv address modes to mirror/clamp respectively, and tests for them in the unit test.
2018-05-24 17:25:26 -07:00
c4c22069e1
Merge branch 'master' into master
2018-05-24 14:38:50 +02:00
e761f13c80
does not access undefined memory area anymore.
...
This will fix some Debuggers, which throw an exception, when accessing out-of-bound memory
2018-05-24 12:07:05 +02:00
3861fb4ab5
Merge branch 'master' into qt_assimp_viewer
2018-05-24 12:36:59 +03:00
e201fcf4f4
[-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
2018-05-24 12:25:27 +03:00
0c07397720
glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
2018-05-22 17:32:12 -07:00
7777883fe7
Fix GenVertexNormals
2018-05-22 13:55:36 -07:00
8abcc454ad
[F] Uninitialized variables.
2018-05-21 17:38:01 +03:00
84739fda0a
Fix #1970 : stl with empty solid
...
Log warning instead of stopping whole import.
2018-05-19 23:19:36 +02:00
6c0553d810
Add mesh name to ValidateDataStructure log
2018-05-19 23:19:25 +02:00
caecd385b5
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-19 03:05:29 +02:00
a1a17c1dda
Read and write the KHR_materials_unlit glTF/2.0 extension.
2018-05-18 14:52:02 -07:00
c788fff2b0
Merge branch 'master' into bug/exception-on-empty-mesh-after-degenerate-removal
2018-05-17 09:36:53 +02:00
9e80e18b1a
Remove dead code
2018-05-16 11:10:48 +02:00
46ed73c768
Do not throw exception on empty mesh after removal of degenerates
...
Remove mesh instead. This keeps one edge case open: nodes without mesh
references. They are kept as it is for now (they may stilol contain
transformations and child references).
2018-05-16 11:06:06 +02:00
2879e0d6ef
Fix typos on code using codespell
2018-05-13 16:35:03 +02:00
e3548fe850
Update glTF2Exporter.h
...
Fix typo.
2018-05-12 08:50:17 +02:00
950496c351
some minor refactorings.
2018-05-12 08:39:22 +02:00
f93ee9dace
closes https://github.com/assimp/assimp/issues/1780 : check against nullptr before accessing normal data in aiMesh instance.
2018-05-12 08:10:26 +02:00
ef605fecaa
FBX: small optimization to avoind static computation in loop.
2018-05-12 08:09:27 +02:00
c08614bbff
closes https://github.com/assimp/assimp/issues/919 : add missing cast for vs2015.
2018-05-10 09:44:31 +02:00
c160d1f7df
Merge branch 'master' into umw_dev
2018-05-09 13:03:07 +02:00
400b61b3fe
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-09 11:22:09 +02:00
700c85bbfb
_stat64 doesn't seem to exist. use __stat64!
...
Merely add an extra _ to the type name...
2018-05-08 13:01:56 -04:00
ea2c90ae79
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-08 18:35:57 +08:00
cc1bde0514
change the length of bufferView byteLength
...
chang the joint attribute bufferView byteLength
2018-05-08 18:31:27 +08:00
f92d4edced
Merge branch 'master' into patch-1
2018-05-08 10:22:14 +02:00
948cf4d3cc
Merge branch 'master' into master
2018-05-07 21:32:13 +02:00
50c5f3cb58
Fixes DXF loader false positive on FBX file
...
A binary FBX file can have an header section `FBXHeaderVersion` which starts around the 70th byte.
Therefore, the token check for DXF file was hitting true because the `SearchFileHeaderForToken` is case insensitive.
We limit the scope of the token search to the first 32 bytes.
2018-05-07 15:16:32 +02:00
ce11aa51f5
add win32-based make script.
2018-05-07 00:07:41 +02:00
327a43c26f
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-06 19:39:37 +02:00
be0203229b
Merge branch 'master' into master
2018-05-06 16:41:12 +02:00
36c6ce7431
Merge branch 'master' into master
2018-05-06 12:29:21 +02:00
908ef3e44a
1740 Issue - Enabling and Disabling importers
...
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT will be respected by the macro
--using local variable ASSIMP_IMPORTER_ENABLED to include or exclude
--an importer
-Fixes individual importer ex: set(ASSIMP_BUILD_FBX_IMPORTER OFF)
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT is cached
--if assimp is a child cmake project, need to force cache
--from parent project
--ex: set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT CACHE INTERNAL FALSE)
2018-05-05 16:57:59 -04:00
458a7ae801
Silencing compile warnings during build, all little stuff like uint to size_t or BOOL to bool.
2018-05-03 15:03:14 -04:00
b759aa63a0
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-05-03 20:33:50 +02:00
4aaf7ad547
Added name to nodes
2018-05-03 11:07:39 +02:00
a5791b66fe
Merge branch 'master' into master
2018-05-02 17:47:32 +02:00
99139e9c9e
Merge branch 'master' into master
2018-05-02 17:11:54 +02:00
a0bf664695
closes code/SortByPTypeProcess.cpp: fix memory leak.
2018-05-02 16:42:22 +02:00
ed86023016
Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the exporter so that it matches the importer and respect the standard specifications
2018-05-02 16:13:17 +02:00
2acb513732
Merge branch 'master' into issue-1167
2018-05-02 15:45:52 +02:00
7bb2d6271b
Merge branch 'master' into fix_fbx_empty_names
2018-05-02 14:57:08 +02:00
27d41442c9
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-02 15:28:57 +08:00
5c5226a98c
Merge branch 'master' into issue-1923
2018-05-01 21:10:52 +02:00
037a213bb4
STL-Exporter: fix division by zero in normalize method during update
2018-05-01 15:06:56 +02:00
eced86b949
some refactorings.
2018-05-01 13:41:39 +02:00
2c47717ca6
Introduce export with test for point clouds.
2018-05-01 13:28:53 +02:00
9f835ea843
closes https://github.com/assimp/assimp/issues/842 : experimental suppor for ascii stl pointcloud export.
2018-05-01 09:06:22 +02:00
4b7b692e5e
Fix Issue #1923 : OBJ Exporter can't correctly export vertex colors
...
The indexMap for vertices now uses a combined vp + vc index
2018-04-30 16:29:22 +02:00
6fb9ebe3c8
Apply fix
2018-04-28 23:34:07 -04:00
7a7a706ebd
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-29 11:29:43 +08:00
814b56e5e2
multi joint has bug with ReplaceData
...
multi joint has a bug in ReplaceData_joint with "bin" change
2018-04-28 15:05:21 +08:00
1533aec21c
Fix ply exporter to be conformant to spec respecting vertex colors.
...
Vertex colors should be defined as red, green, blue, alpha instead of r, g, b, a and should have the type 'uchar' instead of 'float'
2018-04-27 22:11:36 +02:00
af8f9a97a9
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-04-27 12:45:47 +01:00
1f9d6f1ec4
Fix for blendshapes import when using the JoinIdenticalVertices optimization flag
2018-04-27 11:52:31 +01:00
e2d0c07791
Merge branch 'master' into use_log_macros
2018-04-26 22:02:18 +02:00
b877b3e10e
use correct log macro.
2018-04-26 22:01:41 +02:00
6a311210e7
fix another bug of misusage of the log macros.
2018-04-26 17:01:22 +02:00
8626b185fb
Fix misused log macros + compiler warnings.
2018-04-26 16:38:42 +02:00
c299755721
DXF: fix macro issues.
2018-04-26 16:13:57 +02:00
a5e14db19b
fix invaid macro usage.
2018-04-26 15:41:31 +02:00
68288782e4
Merge branch 'use_log_macros' of https://github.com/assimp/assimp into use_log_macros
2018-04-26 15:18:24 +02:00
75c7b15b55
Fix c++11 usage.
2018-04-26 15:05:49 +02:00
3d79472172
fix the build.
2018-04-26 14:36:59 +02:00
dd7d0943f6
Update glTF2Asset.inl
...
Move creation of vars to avoid useless creation in case of an error.
2018-04-26 14:24:00 +02:00
8f26b9d840
Merge branch 'master' into use_log_macros
2018-04-26 14:13:04 +02:00
30c20eb5fc
INtroduce new log macros.
2018-04-26 14:10:18 +02:00
972fffe70b
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-26 13:40:49 +02:00
f6af6ded1f
fixed the bug of export gltf2, the JOINTS_0 componentType is Incorrect
2018-04-26 11:03:50 +08:00
6b4caa0f12
fix export gltf2, The JOINTS_0 componentType is incorrect
2018-04-26 10:56:56 +08:00
a8077baed5
Add vertex color support to glTF2 export
2018-04-25 11:37:56 +02:00
ce6a5e5d56
ImproveCacheLocality crashes if non triangular faces
2018-04-23 11:33:48 +02:00
0e15b25cd1
Next log call changes.
2018-04-20 16:23:24 +02:00
b6f29bf54f
Add usage of log macros, next files.
2018-04-19 17:21:21 +02:00
066349f36b
Add usage of log macros.
2018-04-19 16:48:43 +02:00
f2833539d7
closes https://github.com/assimp/assimp/issues/1784 : change so.name to keep track of the minor version of the lib.
2018-04-19 08:52:21 +02:00
c797f16b0e
In IFC, fixed parser to avoid interpretation of '##' in string as identifiers
2018-04-18 11:53:49 +02:00
6ca8423e24
Improved memory footprint of IFC loading by avoiding keeping in cache duplicated indices.
2018-04-18 11:12:40 +02:00
f235646030
Correction on Collada parser missing textures when the image is in CDATA
...
<image id="image-1404706686">
<init_from><![CDATA[textures\burgundy.png]]></init_from>
</image>
2018-04-13 09:36:01 +02:00
e57394a772
move log tools from blender to logger interface.
2018-04-12 16:09:01 +02:00
096f7e272a
Merge branch 'master' into isue_1621
2018-04-12 00:05:38 +02:00
5319974fe1
Use correct check to do a tokensearch.
2018-04-11 21:16:20 +02:00
0f9268bf01
Merge branch 'master' into issue_1893
2018-04-11 20:27:05 +02:00
da073f1270
closes https://github.com/assimp/assimp/issues/1893 : fix mem leak in glft2Importer.
2018-04-11 17:22:31 +02:00
9ca32b2373
closes https://github.com/assimp/assimp/issues/1894 : use mesh name to name exported obj node.
2018-04-11 17:04:49 +02:00
f096843c45
Merge branch 'master' into umw_dev
2018-04-08 21:42:10 +02:00
c41d459e21
add missing constructor to ensure RTTI
2018-04-08 21:27:18 +02:00
483541ee25
Merge branch 'master' into isue_1621
2018-04-06 20:54:01 +02:00
183224f045
closes https://github.com/assimp/assimp/issues/1621 : add file check for dxf file without extensions.
2018-04-06 20:51:07 +02:00
0a3fb04b04
Update ScenePrivate.h
...
add missing header
2018-04-06 16:23:59 +02:00
32b466941b
Add missig docs and fix some small review findings.
2018-04-06 12:01:22 +02:00
08ddd5c296
Export missig symbols.
2018-04-06 10:53:32 +02:00
a636146cf2
Merge branch 'master' into develop_kimkulling
2018-04-06 10:34:46 +02:00
a3cb1ef55e
Merge branch 'master' into develop_kimkulling
2018-04-06 10:32:35 +02:00
40f5f19ce0
Merge branch 'master' into issue-1219
2018-04-05 15:24:40 +02:00
8cb25328cb
committing all changes.
2018-04-05 17:50:30 +10:00
b8025d92fc
Merge branch 'master' into issue-1219
2018-04-04 21:12:52 +01:00
0e945b5581
Merge branch 'master' into develop_kimkulling
2018-04-04 16:32:46 +02:00
6147a4f50d
Updated COB importer plugin to flip normals.
2018-04-04 08:08:28 +10:00
0c035f131d
Merge branch 'master' into issue-1219
2018-04-02 14:39:13 +01:00
4d662c42b3
Add check for SSE2-support.
2018-04-02 10:27:05 +02:00
35f4e7101a
Fixed issue#1219. CalcTangentsProcess::ProcessMesh.
2018-04-02 01:46:14 +01:00
0624eb0e08
Merge branch 'master' into gltf2-duplicated-textures
2018-04-01 18:09:14 +02:00
d17047cfd1
Merge branch 'master' into fbx_export_ascii
2018-04-01 17:00:42 +02:00
c9bb3592ff
FBX-Importer: remove unused lookup tables for nodes.
2018-03-31 18:10:29 +02:00
f3cc2f79fc
FBX-Importer: remove unused lookup table.
2018-03-31 17:30:31 +02:00
2a5728b4c3
FBX-Importer: fix usage of deprecated include.
2018-03-31 17:25:29 +02:00
c97fb99435
closes https://github.com/assimp/assimp/issues/1855 : fix correction of node names.
2018-03-31 16:37:39 +02:00
21b518e350
use memset to allow VS compiler
2018-03-31 14:44:18 +08:00
1ea7230785
Handle materials with texture id < 0
2018-03-31 14:06:26 +08:00
04d70dc76d
adjust encoding to fit the new utf8 library
2018-03-31 13:29:42 +08:00
4919d3da2f
closes https://github.com/assimp/assimp/issues/1836 : make documentation much more clear how to apply global scaling.
2018-03-30 16:58:11 +02:00
26ac2ffb6c
Not duplicating textures for embedded ones
2018-03-29 15:52:05 +02:00
070acfbadd
FBX Export: relax bindpose matrix check slightly.
...
Apparently +/- 1e-5 is too strict.
2018-03-29 14:29:02 +02:00
39d9878429
FBX Export: use ai_snprintf.
2018-03-29 13:10:41 +02:00
4b2120ab56
FBX Export: fix for geometric transform nodes with multiple children.
2018-03-29 10:45:23 +02:00
0dad1d0c04
FBX Export: fix Texture_Alpha_soutce typo.
2018-03-29 01:47:31 +02:00
826243f289
Implement ascii FBX export.
...
It's available under the 'fbxa' format id.
2018-03-29 01:44:32 +02:00
aadb413fc0
Explicit handling of an FBXExportNode edge-case.
2018-03-28 16:09:07 +02:00
00277d93f2
Tidier FBXExportNode construction with properties.
2018-03-28 15:47:27 +02:00
e972b73fc2
FBX Export: tidy includes
2018-03-27 13:29:03 +02:00
ee0cdb3954
FBX Export: Tidy animation export code.
2018-03-27 13:12:15 +02:00
57bd125839
FBX Export: implement basic animation export.
2018-03-27 11:45:03 +02:00
2dff6e2d5b
FBXExportProperty: implement float and long array properties.
2018-03-26 18:27:15 +02:00
d810446bb2
Merge branch 'master' into patch-1
2018-03-23 19:43:58 +01:00
666e224359
Merge branch 'master' into issue_1527
2018-03-22 23:57:30 +01:00
be4c780115
Update FBXMeshGeometry.cpp
...
Fix build.
2018-03-22 23:08:25 +01:00
13ae0a0ac3
FBX: fix parse error for uv-coordinates.
2018-03-22 22:14:10 +01:00
376586b164
Merge branch 'master' into patch-1
2018-03-22 13:09:32 -04:00
cad11df039
Fix mingw compilation
2018-03-22 16:54:12 +08:00
e01e77a6c7
Merge branch 'master' into develop_kimkulling
2018-03-21 21:20:28 +01:00
af3bba1572
fix review findings.
2018-03-20 23:38:08 +01:00
4ae7298489
Update DefaultIOSystem.cpp
...
fix typo
2018-03-20 21:59:45 +01:00
1a887a64c1
Update EmbedTexturesProcess.cpp
...
Fix typo.
2018-03-20 21:56:26 +01:00
b01594f6a8
Update EmbedTexturesProcess.cpp
...
Replace c-cast by static_cast.
2018-03-20 21:52:42 +01:00
339e33303e
Update DefaultIOSystem.cpp
...
Use static_cast instead of int.
2018-03-20 20:39:15 +01:00
d0edb94208
Update D3MFImporter.cpp
...
Use static cast instead of c-cast.
2018-03-20 20:38:03 +01:00
f898f40486
Merge branch 'master' into master
2018-03-20 20:33:17 +01:00
5814e6f9f0
Optimize some std::string usages.
2018-03-20 18:43:54 +01:00
2d7ece4ce7
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 16:14:25 +01:00
e36f78482c
https://github.com/assimp/assimp/issues/1796 : return correct value on detach logger.
2018-03-20 14:53:57 +01:00
e668b97453
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 14:12:00 +01:00
317f3e2a59
3MF: Export metadata.
2018-03-20 14:10:08 +01:00
b66bee8d79
Export: Copy metadata to be able to export it properly.
2018-03-20 14:09:07 +01:00
ef12eb84bb
3MF: add metadata import.
2018-03-20 10:09:47 +01:00
9d813a48b0
fixed emply buffer stream write, removed some cast warnings.
2018-03-19 18:22:27 +01:00
4841ee05c5
Merge branch 'master' into patch-1
2018-03-19 10:29:43 -04:00
f7854e4b32
Merge branch 'master' into master
2018-03-18 20:56:25 +01:00
6843b7a00c
Merge branch 'master' into patch-3
2018-03-18 17:44:21 +01:00
2d980c16f0
Support Maya 2018 Collada Export with blendshapes and bones controllers for a mesh
2018-03-15 21:41:40 -07:00
5cf6509fb5
closes https://github.com/assimp/assimp/issues/1120 : use euler angles for pre- and post-rotation.
2018-03-14 20:42:42 +01:00
4c023c3818
fix unittest folder for roundtriptest.
2018-03-13 21:40:23 +01:00
546ad1c1bd
Merge branch 'master' into patch-3
2018-03-13 15:19:14 -04:00
9e1638e813
Merge branch 'master' into patch-1
2018-03-13 15:18:50 -04:00
6b9add5594
fix compiler warning fr 64 bit
2018-03-13 18:19:10 +01:00
f11d4902c6
fix CanRead-method for the 3MF-Importer.
2018-03-13 17:50:34 +01:00
c5c0052a6c
Merge branch '3mf_basematerial_support' of https://github.com/assimp/assimp into 3mf_basematerial_support
2018-03-12 22:28:53 +01:00
c7ac32f891
fix naming readout + export.
2018-03-12 22:28:00 +01:00
a3ad45f3b3
Merge branch 'master' into 3mf_basematerial_support
2018-03-11 20:16:40 +01:00
c8ae0bbb3d
3MF: fix model folder desc.
2018-03-11 20:15:49 +01:00
017b7d1a2f
3MF: add missig tags for meta data.
2018-03-11 20:15:25 +01:00
336a09ee0e
add material reference to faces.
2018-03-09 23:35:12 +01:00
72280463c2
Merge branch 'master' into patch-3
2018-03-09 14:40:30 -05:00
f7469df871
Merge branch 'master' into patch-2
2018-03-09 14:40:16 -05:00
c539dfe7a2
Merge branch 'master' into patch-1
2018-03-09 14:38:54 -05:00
6668eeb68e
Fix possible nullptr dereferencing.
2018-03-09 19:03:05 +01:00
2ca2e7e355
Merge branch 'master' into fbx_export_footer_tweak
2018-03-09 18:11:56 +01:00
69742670dd
3mf: use correct material assignment in case of multi-materials.
2018-03-09 11:40:45 +01:00
56f9069eb5
Merge branch 'master' into blender_fbx_opacity_fix
2018-03-09 08:30:23 +01:00
7f04b4dd43
Merge branch 'master' into fix/issue623
2018-03-09 00:04:28 +01:00
cfd56a43a5
Fix compile error
...
Fixed bad cast.
2018-03-07 18:24:38 -05:00
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
af8839a8b5
Merge branch 'master' into fbx_export_footer_tweak
2018-03-07 19:44:38 +01:00
9f02c8a97c
Fix default opacity of materials exported to FBX by Blender.
2018-03-07 09:15:08 +01:00
6fd64b95c3
Fix compile error
...
Add parens to use of 'sizeof' operator
2018-03-06 15:03:44 -05:00
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
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
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
f4c37fa245
Collada: add importer property that forces the use of collada names. Closes #1375 .
2018-03-06 00:30:33 +01:00
5312ec806e
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-03-05 18:19:36 +01:00
22182a907e
Merge branch 'master' into master
2018-03-05 13:20:07 +01:00
15fa86f100
Set primitive_type to point when PLY is a point cloud
2018-03-04 22:43:20 +01:00
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
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
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
8e7b7a0d87
Merge branch 'master' into master
2018-03-02 15:04:28 +01:00
a58f8e1c1a
FBX Export: add missing 0 value to file footer.
2018-02-28 23:38:49 +01:00
f07d27eb07
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-02-27 18:47:11 -08:00
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
ef371bddd6
Merge branch 'master' into master
2018-02-27 18:34:34 +01:00
c0f04bf965
IMporter: fix lookup for tokens during inmemory imports.
2018-02-27 18:30:36 +01:00
e99dfdb050
fix cppcheck findings.
2018-02-25 21:03:09 +01:00
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
249f1844ae
FBX Export: reconstruct full skeleton for any FBX deformers.
2018-02-25 09:53:09 +01:00
72e9f3ecb9
fixed embedded texture reading.
2018-02-24 18:47:43 +01:00
138b990d0a
added missing install of pbrmaterial.h
2018-02-24 17:57:42 +01:00
4b7cd97fea
added support for embedded textures defined with buffer views.
2018-02-24 17:44:40 +01:00
b0ac2d9daf
Merge https://github.com/assimp/assimp
2018-02-24 17:06:12 +01:00
a9d70b2dbc
FBX Import: properly delete inverse geotrans nodes when not using them.
2018-02-24 09:37:36 +01:00
c18a07e47f
FBX Import: Properly clean up post_nodes_chain in case of exception.
2018-02-24 08:43:36 +01:00
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
5e4b2b898f
Merge branch 'master' into fbx_export_squashed
2018-02-23 23:33:43 +01:00
375dd4c179
Update D3MFImporter.cpp
...
Fix order of init list.
2018-02-23 20:34:34 +01:00
437ae0c839
Merge branch 'master' into 3mf_basematerial_support
2018-02-23 18:29:54 +01:00
606a28dbe8
Merge branch 'master' into develop_kimkulling
2018-02-23 17:54:58 +01:00
1d901f075c
3mf-importer: fix parsing of base-material color.
2018-02-23 17:49:29 +01:00
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
c1f353f6c7
FBX Export: Geometric transformations always create transformation chain.
...
In combination with fb213e4bfixes #1112 .
2018-02-21 14:15:03 +01:00
50b6c63594
Merge branch 'master' into develop_kimkulling
2018-02-21 13:31:32 +01:00
22dbb6c2d2
Update FileSystemFilter.h
...
- Fix typo.
-test in public metod against invalid parameters
2018-02-21 13:10:51 +01:00
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
8ae7231654
Blender: Silence warning about uninitialized member
2017-11-18 16:50:45 +02:00
2c8cc1f732
BlenderDNA: Silence warning about uninitialized member
2017-11-18 16:49:03 +02:00
bcffa28a33
MDLImporter: Don't take address of packed struct member
2017-11-18 16:39:43 +02:00
1067ae4bfa
FIReader: Fix strict-aliasing warnings
2017-11-18 15:54:40 +02:00
c1515db56f
Blender: Fix strict-aliasing warnings
2017-11-18 15:50:56 +02:00
703d046fd9
Update ValidateDataStructure.cpp
2017-11-18 00:34:00 +01:00
fc360b9cc8
Update ValidateDataStructure.h
2017-11-18 00:05:17 +01:00
b428c66f39
Update ValidateDataStructure.h
2017-11-17 23:10:05 +01:00
07a99e0843
Merge branch 'master' into issue_1513
2017-11-16 17:32:34 +01:00
d9965f6220
Update Importer.cpp
2017-11-16 14:42:20 +01:00
7db10022e9
closes https://github.com/assimp/assimp/issues/1513 : fix assimp for cross compile for android
2017-11-15 21:26:25 +01:00
f475803f93
X3DImporter: Add assertions to silence static analyzer warnings
2017-11-15 11:45:21 +02:00
66c18cc406
TerragenLoader: Remove unused variable
2017-11-15 11:45:21 +02:00
e47bf932e8
SIBImporter: Add assertions to silence static analyzer warnings
2017-11-15 11:45:21 +02:00
583d3f88b8
FBX: Remove dead assignment
2017-11-15 11:45:21 +02:00
ef0af40f90
IFC: Remove dead code
2017-11-15 11:45:21 +02:00
b49a4e1338
PLY: Remove dead assignment and reduce scope of a variable
2017-11-15 11:45:21 +02:00
97843f19d2
OpenGEX: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
f470b8466f
GLTF2: Fix signed/unsigned warning
2017-11-15 11:45:21 +02:00
f90019bc1e
NFF: Add assertions to silence static analyzer warnings
2017-11-15 11:45:21 +02:00
3f299b2a2b
NFF: Split up some complicated assignments
2017-11-15 11:45:21 +02:00
d24e0d44b2
Raw: Fix misleading indentation warning
2017-11-15 11:45:21 +02:00
2b93a210c9
NFF: Reduce scope of a variable
2017-11-15 11:45:21 +02:00
940449d837
LWO: Reduce scope of a variable
2017-11-15 11:45:21 +02:00
a276a02726
IRRLoader: Fix confusing boolean casting
2017-11-15 11:45:21 +02:00
437816fc33
AssbinExporter: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
4c9f169109
ASE: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
856d402b59
AMFImporter: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
2c7770eed5
AMFImporter: Add a block
2017-11-15 11:45:21 +02:00
bd0d47c5fc
Whitespace
2017-11-15 11:45:21 +02:00
a7fccf8f33
OptimizeGraph: Fix possible null pointer dereference
2017-11-15 11:45:21 +02:00
c51b92cfa3
RemoveRedundantMaterials: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
95f2319b41
ImproveCacheLocality: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
c774e864a0
Remove some dead assignments
2017-11-15 11:45:21 +02:00
266e3b29a8
RemoveRedundantMaterials: Set pointer to nullptr after deleting it
2017-11-15 11:45:21 +02:00
76919e87ea
fast_atof: Silence some uninitialized variable warnings
2017-11-15 11:45:21 +02:00
24b728b3ea
FindDegeneratives: adapt unittests and add configs
2017-11-12 22:09:18 +01:00
9206d1b62b
Merge branch 'master' into issue_216
2017-11-12 11:04:51 +01:00
005b537324
unittests: add VS-based source groups for the unittests.
2017-11-10 20:40:00 +01:00
de1ec4ee5d
Merge branch 'master' into gltf2-mesh-export-fix
2017-11-10 19:07:46 +01:00
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
ad2ff9fd71
check for area test if the face is a triangle.
2017-11-09 21:40:10 +01:00
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
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
5bc4e73727
Merge branch 'master' into issue_1292
2017-11-08 22:52:46 +01:00
ab639a71ae
Merge branch 'master' into issue_1315
2017-11-08 21:09:02 +01:00
36475bf868
closes https://github.com/assimp/assimp/issues/1292 : export class subdivision
2017-11-08 20:50:16 +01:00
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
6954c7d75b
Merge branch 'master' into master
2017-11-08 18:34:25 +01:00
fe55bc9996
Update ColladaExporter.cpp
...
fix build
2017-11-08 18:34:16 +01:00
6b826fecfd
Merge branch 'master' into issue_1251
2017-11-08 01:07:35 +01:00
f41ed2f41f
closes https://github.com/assimp/assimp/issues/1251 : use correct lookup for utf32.
2017-11-08 01:07:04 +01:00
29cf414468
Merge branch 'master' into md2_fix
2017-11-07 22:03:02 +01:00
75fdd25b6b
Merge branch 'master' into issue_104
2017-11-07 11:27:06 +01:00
da7ce89ff2
Update STLLoader.cpp
...
add missing const.
2017-11-07 10:47:27 +01:00
b87e7643d2
Update STLLoader.cpp
...
Fix memory-alignment bug.
2017-11-07 10:42:51 +01:00
4ff2592747
Update STLLoader.h
...
Fixed a typo.
2017-11-07 00:31:09 +01:00
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
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
ab3cf3687c
Merge branch 'master' into UnitTest_X3D
2017-11-05 18:10:10 +01:00
2929a27edc
add unittest for x3d-importer.
2017-11-05 17:41:26 +01:00
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
a33e115fd1
fix mem-lead: face will be not released in case of an error.
2017-11-04 18:26:30 +01:00
c9ada44ab5
Fix memory leak in case of an error.
2017-11-04 17:05:23 +01:00
c700c08fa5
Merge branch 'master' into master
2017-11-04 10:45:57 +01:00
b7bd006304
Merge branch 'master' into ObjExporter_nomtl
2017-11-04 09:32:50 +01:00
4587e63e2f
Merge branch 'master' into fix_trivial_warnings
2017-11-03 20:05:16 +01:00
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
d279a3cc02
Merge branch 'master' into fix_trivial_warnings
2017-11-03 10:35:02 +01:00
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
931542bf3c
Merge branch 'master' into ObjExporter_nomtl
2017-11-02 10:46:57 +01:00
e52e44ea07
Formatting
2017-10-31 15:18:08 -04:00
cc4531459f
Set mNumUVComponents to 0 when deleting texture coordinate sets
2017-10-31 15:14:21 -04:00
8be196f77d
closes https://github.com/assimp/assimp/issues/1490 : fix invalid access to mesh array when the array is empty.
2017-10-31 14:03:03 +01:00
af4556d569
only scale the root node because this will rescale all children nodes as well.
2017-10-31 13:08:24 +01:00
64ee21024b
Add missing file.
2017-10-31 13:07:07 +01:00
ae020281e2
Add unittest
2017-10-31 12:24:32 +01:00
711050de8a
fix frame pointer arithmetic
2017-10-30 19:08:51 +01:00
4d09e61b13
Merge branch 'master' into master
2017-10-30 11:41:25 +01:00
99b9ba4c11
Merge branch 'master' into master
2017-10-30 16:33:47 +08:00
aca8f068d0
Update ColladaExporter.cpp
2017-10-30 16:29:57 +08:00
bbeb9dd640
Use correct lookup if scaling is enabled.
2017-10-29 23:18:37 +01:00
f49de6ecfe
closes https://github.com/assimp/assimp/issues/1514 : add postprocess step for scaling
2017-10-29 20:28:59 +01:00
18cef9b391
[ObjExporter] add a "no mtl" version of the obj exporter
2017-10-27 10:14:38 +02:00
8b73ec7541
Fix shininess to roughness conversion; Add comments
...
Was accidentally flipping to value (1 - x) twice, thus negating the effect.
2017-10-26 11:33:33 -04:00
bfa33b50ad
Merge branch 'master' into gltf2-materials
2017-10-24 10:40:20 +02:00
cc8374dd80
Return exception when obj file contains invalid face indice
2017-10-21 20:58:00 +02:00
90ba199ad4
Update ColladaExporter.cpp
2017-10-21 18:28:14 +08:00
cd4ef0a2e9
Update ColladaExporter.h
2017-10-21 18:15:46 +08:00
8cf61c3c89
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-20 15:22:49 +02:00
6e88838602
powf -> pow
...
Fix build errors on linux
2017-10-19 16:21:29 -04:00
40147d253d
Prefer “BLEND” over “MASK” as an alphaMode default
...
“BLEND” is a much nicer alphaMode value (if the hardware supports it – not a steep requirement) than “MASK” as mask is either fully opaque or fully transparent, depending on the alphaCutoff. This matches many other converters’ alphaMode default.
2017-10-19 16:21:29 -04:00
89358458f0
Approximate specularity / glossiness in metallicRoughness materials
...
Before, models (of traditional lighting models) with specularity/glossiness would be completely flat when exported to metallicRoughness. These changes approximate glossiness (as an inverse of roughness, with specular intensity as a multiplier) both reading from gltf2 and writing to gltf2.
2017-10-19 16:21:29 -04:00
a898c1f2d1
SpecularFactor import and export improvements
...
The changes here (which only apply to reading from or writing to pbrSpecularGlossiness) will:
- store and read specular color on `AI_MATKEY_COLOR_SPECULAR ` rather than `AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_SPECULAR_FACTOR`
- store and read specular texture from `aiTextureType_SPECULAR` rather than `AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_SPECULARGLOSSINESS_TEXTURE`. Even though pbrSG’s specularGlossiness texture uses the alpha channel for glossiness, it will still work well enough with just the RGB channels of the image
2017-10-19 16:21:29 -04:00
c71790c78d
Diffuse color and diffuse texture import and export improvements
...
These changes do a better of importing and exporting baseColor colors and textures, as well as diffuse colors and textures (in the case of pbrSpecularGlossiness)
- baseColorFactor will be stored on both `$clr.diffuse` and `$mat.gltf.pbrMetallicRoughness.baseColorFactor`, and will be extracted from `$mat.gltf.pbrMetallicRoughness.baseColorFactor` first, and falling back to `$clr.diffuse`. The behaviour for baseColorTexture is similar
- pbrSG’s diffuseFactor will now only be store on `$clr.diffuse` (overwriting any previous assignments to `$clr.diffuse`, e.g. from metallicRoughness’ baseColorFactor, as diffuseFactor is more analogous to diffuse color than baseColor), and will only extract from `$clr.diffuse`
2017-10-19 16:21:16 -04:00
5eaf083fbd
Fix output of glTF 1 version string
...
Was writing out “\u0001” instead of “1.0” as the data types were incorrect
2017-10-19 12:43:52 -04:00
b2eb599176
Update ColladaExporter.cpp
...
Retrigger travis.
2017-10-16 18:51:25 +02:00
44ad80201c
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-14 21:47:21 +02:00
f8c4002294
Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug
2017-10-14 18:46:19 +03:00
9a6b141568
FBX: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
7cbb5f4d3b
B3DImporter: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
e662f2dc6f
Blender: fix short overflow.
2017-10-13 22:41:38 +02:00
e79848ff79
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-11 13:49:47 +02:00
3e7dbb5dfb
Merge branch 'master' of github.com:assimp/assimp into appveyor
2017-10-11 19:06:29 +11:00
a1b79e23e6
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-10 19:33:07 +02:00
c128e7e56c
Merge branch 'master' into issue_1453
2017-10-10 18:20:22 +02:00
fa91a0f64c
Another minor source change, this time even more minor than the last. Let's see what the cache can do with this.
2017-10-10 22:45:45 +11:00
1497cc27b2
Cleaned up the whitespace again. Let's see how the cache does.
2017-10-10 22:08:13 +11:00
b8ad03baa1
Because I have to change a file somewhere to properly test the cache on AppVeyor, I've made some whitespace a bit better.
2017-10-10 19:45:57 +11:00
7c8e8e04fa
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-09 16:00:46 +02:00
7353d25c13
Prevent failing stringstream to crash the export process
...
Text exporters are using string streams to hold the file content first and then write them to the file in a single pass. If for whatever reason the stream has the fail bit set, tellp() will return pos_type(-1), which in turn makes the subsequent write crash - at least on Windows systems. One reason for the stream being in fail state is when its size exceeds 2^31 bytes, even on 64-bit systems (i.e., when very large scenes get exported).
The fix is checking the fail() before even opening the file.
2017-10-09 15:47:17 +02:00
d60fe38253
Merge branch 'master' into master
2017-10-09 00:07:43 +02:00
cd64eae590
GenericProperty: Remove useless const qualifier from return value
2017-10-08 12:45:48 +03:00
7e033c6cef
FBX: Remove useless const qualifier from return value
...
const qualifier on primitive return type does nothing.
2017-10-08 12:45:02 +03:00
b57011552b
Merge branch 'master' into issue_1453
2017-10-07 19:08:52 +02:00
f925e2cf4e
Reproduce issue and remove assertion when a nullptr makes more sence
2017-10-07 19:08:20 +02:00
9a79d243f9
added additional displacement texture token.
2017-10-07 12:36:02 +02:00
326158633b
Fixed warnings on MSVC caused by implicit conversions from double to float.
2017-10-06 18:23:28 +03:00
50b43f76e1
OpenGEXImporter: Copy materials to scene
2017-10-06 18:23:28 +03:00
b841ed194b
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
2017-10-06 18:23:28 +03:00
775f984d99
OpenGEXImporter: Fix IOStream leak
2017-10-06 18:23:28 +03:00
22b55d01a2
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
2017-10-06 18:23:28 +03:00
61278aa408
AMFImporter: Fix memory leak
2017-10-06 18:23:28 +03:00
1f16ed9fd0
UnrealLoader: Fix IOStream leak
2017-10-06 18:23:28 +03:00
c1f93a69ae
Revert "WIP: Enable Travis clang build"
2017-10-06 15:42:05 +02:00
c9b9dab1ff
Merge pull request #1475 from jaredmulconry/master
...
Fixed warning on clang 3.9 caused by static data member in class template
2017-10-06 15:37:33 +02:00
3803a5181c
Fixed warnings on MSVC caused by implicit conversions from double to float.
2017-10-06 20:32:33 +11:00
341222697a
Address warnings on Clang 3.9 caused by having a static data member in a class template.
2017-10-05 23:55:10 +11:00
3f0bb9c634
OpenGEXImporter: Copy materials to scene
2017-10-05 12:51:08 +03:00
568003a0d3
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
2017-10-05 12:43:49 +03:00
e7ff7b167f
OpenGEXImporter: Fix IOStream leak
2017-10-05 12:38:44 +03:00
b6d2b91799
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
2017-10-05 12:35:17 +03:00
316046f748
AMFImporter: Fix memory leak
2017-10-05 12:15:28 +03:00
34acf47acd
UnrealLoader: Fix IOStream leak
2017-10-05 12:15:28 +03:00
afce984228
FBXImporter: Add explicit instantiation of log_prefix so other FBX source files can see it
2017-10-05 12:15:25 +03:00
bf1aaf98f9
IFCImporter: Add explicit instantiation of log_prefix so IFCMaterial.cpp can see it
2017-10-05 12:15:11 +03:00
cbca8f574e
Merge pull request #1432 from turol/asan
...
Asan
2017-10-04 16:12:44 +02:00
c3e9d6132c
Merge pull request #1468 from assimp/issue_1467
...
closes https://github.com/assimp/assimp/issues/1467 .
2017-10-03 09:58:56 +02:00
5804667dbb
Addressed some mismatched news/deletes caused by the new glTF2 sources.
2017-10-02 11:04:15 +03:00
1eb7eceddf
Addressed a number of memory leaks identified in unit tests by asan
2017-10-02 11:03:24 +03:00
1095ec454b
Fix delete / delete[] mismatches in glTF2 importer
2017-10-02 10:55:26 +03:00
efd861253d
Fix delete / delete[] mismatches in MakeVerboseFormat
2017-10-02 10:55:26 +03:00
5ecab20bd0
Fix delete / delete[] mismatch in glTFAsset
2017-10-02 10:55:26 +03:00
6ec25be0a6
OpenGEX: improve logging to be able to detect error-prone situations.
2017-10-02 09:41:01 +02:00
3f4663e369
closes https://github.com/assimp/assimp/issues/1467 .
2017-10-02 09:33:51 +02:00
9088deeb1d
Eliminated all warnings under clang with default settings. One remains in the included zlib contrib project.
2017-09-30 23:29:56 +10:00
c4e91eb33f
add some asserts.
2017-09-30 10:47:23 +02:00
1c76962c98
closes https://github.com/assimp/assimp/issues/1450 : use correct name of exporter to gltf2
2017-09-30 09:38:13 +02:00
9033071237
Obj: rename attribute from exporter.
2017-09-30 09:37:34 +02:00
5adc029225
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-29 21:59:11 +02:00
c42589460d
closes https://github.com/assimp/assimp/issues/1459 : fix out-of-boundary access error
2017-09-29 21:58:58 +02:00
febd611d48
Fix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars
2017-09-27 18:41:35 -07:00
79a5165106
Fixed unused variable warning by replacing them with descriptive comments
2017-09-24 21:46:15 +10:00
8dabd76e03
Fixed a warning caused by aiVector3D appearing in a packed struct, causing it to fail to pack as requested.
2017-09-24 21:19:03 +10:00
059a32654e
Addressed warnings generated on MSVC across x86 and x64.
2017-09-24 19:29:43 +10:00
b5ac248703
Merge pull request #1444 from turol/warnings
...
Clean up some more GCC warnings
2017-09-20 22:18:21 +02:00
81b94a1dca
Merge pull request #1445 from Matter-and-Form/gltf2-alphaMode-fix
...
Fix glTF2 alphaMode storage and reading
2017-09-19 15:40:53 +02:00
5c44776532
Merge pull request #1447 from Matter-and-Form/gltf1-color-import-fix
...
[gltf1] Don’t ignore rgba(1,1,1,1) color properties
2017-09-19 15:40:00 +02:00
adec1b2175
Merge pull request #1446 from Matter-and-Form/feature/gltf2-primitives
...
glTF2 primitives fixes
2017-09-19 15:39:11 +02:00
d27e667f1e
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-19 00:32:50 +02:00
af9596674d
FBX: add missing inversion of postrotation matrix for fbx.
2017-09-19 00:31:41 +02:00
3e8955faf5
Don’t ignore rgba(1,1,1,1) color properties
...
Do not ignore rgba(1,1,1,1) material properties when importing glTF1. While a white diffuse color may be the default value for a default assimp material, `1,1,1,1` is a very explicit color value for ambient/specular/emissive color properties.
Closes #1434
2017-09-18 18:16:48 -04:00
798542d7bd
Formatting
2017-09-18 14:48:07 -04:00
de0bf2ea96
Fix alphaMode storage and reading
...
alphaMode is now converted from a std::string to an aiString and back to std::string, since aiString is easier to store and retrieve from aiMaterial properties than std::string
Fixes issues of alphaMode being written out as `\fOPAQUE\0\0\0\0\0\0…`
2017-09-18 12:19:55 -04:00
8743d28ec5
SImplify mesh merging code
...
My assumption that primitives of different types (modes) can’t be in the same mesh was incorrect.
2017-09-18 12:16:30 -04:00
2efd2cdef8
tweaks to primitive merging logic; comments + formatting
2017-09-18 11:16:05 -04:00
814e8b3f8e
Formatting
2017-09-18 11:16:05 -04:00
28523232cf
Merge multiple meshes in a node into one mesh with many primtives; write out only one mesh per node
...
To do:
- clean up MergeMeshes
- see if there’s a way to do this earlier in the flow
2017-09-18 11:16:05 -04:00
5147acfe65
Revert "store node mesh vs. meshes"
...
This reverts commit a0d97505e5
2017-09-18 11:16:04 -04:00
982430c3ce
BlenderDNA: Silence warning about inline function which is declared but not defined
...
It's a templated method which is meant to be specialized. The base version
is never called. Just remove 'inline' to make GCC shut up.
2017-09-18 15:21:51 +03:00
40c308af44
glTF: Silence uninitialized variable warning
...
This is a false positive. 'jointNamesIndex' is either set by the loop
or the following conditional is false which also sets it. The undefined value
is never seen by the following code.
2017-09-18 15:18:45 +03:00
b74fc9495a
PlyLoader: Fix operator precedence issue in header check
...
The previous version might read past end of buffer
2017-09-18 15:16:21 +03:00
4652be8f18
FIReader: Silence uninitialized variable warning
...
This is a false positive. First time through the loop 'imod3' is always 0
so c1 is not used. It's also set so further iterations have a valid 'c1'.
If 'value' is empty the switch doesn't look at 'c1' either since 'imod3'
is still 0.
2017-09-18 14:59:55 +03:00
41724ace2d
Collada: Silence uninitialized variable warning
...
This is a false positive. Value of 'method' is only used if 'targetMeshes'
contains something and all paths through the first loop which add stuff
to 'targetMeshes' also set 'method'.
2017-09-18 14:10:58 +03:00
c207e74534
Fix glTF 2.0 multi-primitive support
...
Previously, only one primitive was supported, in fact memory was corrupted
when more than one primitive was found per glTF mesh.
In this change, each primitive is unrolled as a new Assimp Mesh, resulting
in multiple Assimp meshes per node when multiple primitives exist per
glTF mesh. This is required in the general case, since glTF primitives can
have different material bindings and primitive modes.
2017-09-17 10:08:49 -07:00
484f73b179
Merge pull request #1437 from rmitton/sib-version
...
Added support for SIB models from Silo 2.5
2017-09-16 16:27:38 +02:00
f602055da5
Added Silo 2.5 support
...
Silo 2.5 bumps the version number of SIB files for no apparent reason. Doesn't appear to be any other changes to the file format.
2017-09-15 12:40:38 -07:00
234ffc0ad6
Fixed truncated material names
...
The previous Unicode library change accidentally trimmed off the last character of SIB material names.
2017-09-15 12:39:58 -07:00
01c50394ce
FBXParser: Silence uninitialized variable warnings
2017-09-15 12:42:17 +03:00
f1998d52dc
Importer: Whitespace cleanup to fix GCC misleading indentation warning
2017-09-15 12:41:53 +03:00
046c229e48
AssbinExporter: Fix strict aliasing violation
2017-09-15 12:41:40 +03:00
f4a0ab81b1
AssbinExporter: Add Write specialization for aiColor3D
2017-09-15 12:41:13 +03:00
b9efc234d0
DefaultLogger: Whitespace cleanup to fix GCC misleading indentation warning
2017-09-15 12:40:07 +03:00
0b140db0a4
glTFExporter: Silence uninitialized variable warning
...
This is a false positive, idx_srcdata_begin is only used if comp_allow
is true and in that case it's also initialized.
2017-09-15 12:39:58 +03:00
58213804ff
Update 3DSLoader.cpp
...
Fixed reading of CHINK_RGBF. If reading performs on x32 platform then reading will execute right, but on x64 it`s wrong because it will read 8 bytes instead 4.
2017-09-14 14:55:02 +03:00
afd6c4d57d
Revert "Asan"
2017-09-13 21:40:44 +02:00
d139b4d180
Merge pull request #1423 from Matter-and-Form/feature/gltf2
...
glTF 2 Importer + glTF 2 Spec Conformity
2017-09-13 20:01:38 +02:00
d49f86f1e7
Merge pull request #1427 from turol/asan
...
Asan
2017-09-13 19:38:44 +02:00
b6f122ff2c
Fix delete / delete[] mismatch in glTFAsset
2017-09-13 11:31:05 +03:00
6a3b030094
MDP: fix encoding issues.
2017-09-12 21:16:59 +02:00
b5f770e456
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-12 19:07:21 +02:00
e3163ec15e
FBX: fix some minor findings.
2017-09-12 19:07:17 +02:00
cbedc448c6
closes https://github.com/assimp/assimp/issues/1426 : add Defines.h to include folder for install.
2017-09-12 18:59:38 +02:00
933bbb4f1c
Manually read alphaMode material property
2017-09-12 11:55:52 -04:00
eca008d5ec
Properly move string passed to JSON writer
2017-09-12 11:55:22 -04:00
b0da0796c8
Fix Segfault caused by losing pointer to std::string
...
Keep std::string alive
2017-09-12 10:07:15 -04:00
cde29c937c
Formatting
2017-09-11 11:02:16 -04:00
b1a5ca4516
Use `forceNumber` argument of `WriteAttrs` to write correct attribute names, instead
2017-09-11 11:02:16 -04:00
990fe143a1
Fix mesh primitive’s attributes’ names
...
Per spec
TEXCOORD -> TEXCOORD_0
COLOR -> COLOR_0
JOINTS -> JOINTS_0
WEIGHTS -> WEIGHTS_0
Remove JOINTMATRIX since it’s not supported (and doesn’t seem to be output, anyway)
TANGENT should be added at a later date
2017-09-11 11:02:16 -04:00
816e6909ca
Remove KHR_binary_glTF code
...
Binary glTF is now part of the glTF2 spec. However, it’s implemented incorrectly, so will be temporarily removed
2017-09-11 11:02:16 -04:00
b4f5033d89
Remove compresssed file format flag
2017-09-11 11:02:16 -04:00
d518289e72
more specific token search for Collada Loader
...
collada can appear in many files, such as glTFs via the “generator” field (in the form of collada2gltf)
2017-09-11 11:02:15 -04:00
5cb13aa4b3
Load gltf .bin files from correct directory
2017-09-11 11:02:15 -04:00
a438ece655
Remove premultipliedAlpha from gltf2
2017-09-11 11:02:15 -04:00
140b903d7a
Fix parsing of glTF version
...
Handle version as int in gltf
Fix format specifiers in glTF version parser
2017-09-11 11:02:15 -04:00
19876e9822
Add support for importing both glTF and glTF2 files
2017-09-11 11:02:15 -04:00
2ee7991558
Restrict search for OFF header to first 3 bytes
2017-09-11 11:02:14 -04:00
a5e8e0b2bd
Remove commented out code
2017-09-11 11:02:14 -04:00
0a8183531e
Set alphaMode, baseColorFactor opacity when model’s opacity isn’t 1
2017-09-11 11:02:14 -04:00
37582131f4
Set the metallicFactor to 0 if source file doesn’t have metallicFactor
...
Otherwise, the models have full metallic materials and appear very dim
2017-09-11 11:02:14 -04:00
da6a252efb
Fix METALLIC_FACTOR typo
2017-09-11 11:02:14 -04:00
3ba00ca421
Define gltf material property names as constants
2017-09-11 11:02:14 -04:00
54dd4804cd
Fix indentation
2017-09-11 11:02:14 -04:00
44757af34a
Implement pbrSpecularGlossiness property as Nullable
2017-09-11 11:02:13 -04:00
03cfa04ee4
Define default material values as static constants
...
for reuse
2017-09-11 11:02:13 -04:00
1a5823700f
Remove need for Has by returning an empty Ref in Get
2017-09-11 11:02:13 -04:00
21259e0835
Use different form of index accessor
2017-09-11 11:02:13 -04:00
37527849b7
Export material names properly
2017-09-11 11:02:13 -04:00
a9c4fa84b5
Sampler improvements; Add new LazyDict method
...
Samplers are now imported into assimp internal format from textures;
Samplers have defaults as per spec;
Sampler enums are strongly typed with UNSET values;
Samplers are exported properly;
Sampler filters are exported as well;
Samplers are re-used across textures on export
Default sampler values are not written
2017-09-11 11:02:12 -04:00
7245cceead
Set default values on Sampler
2017-09-11 10:55:51 -04:00
2abdbdb55e
Fix unused CopyValue
2017-09-11 10:55:51 -04:00
63ef19d9ad
Export extensions
2017-09-11 10:55:51 -04:00
d277995a97
Formatting
2017-09-11 10:55:51 -04:00
7f01e3f48f
Only export byteStride if not 0
2017-09-11 10:55:50 -04:00
a0d97505e5
store node mesh vs. meshes
...
glTF nodes can only hold one mesh. this simply assigns to and check’s a Node’s Mesh
2017-09-11 10:55:50 -04:00
ab08a7c3cb
reenable animation and skins exports
...
Currently incorrect, however. May need to be removed
2017-09-11 10:55:50 -04:00
f09892ab63
Write specularGlossiness textures on the specularGlossiness object
2017-09-11 10:50:39 -04:00
feee7528d6
Make sure `on` flag for specularGlossiness is being persisted
2017-09-11 10:50:39 -04:00
8bef546b41
mention pbrSpecularGlossiness support
2017-09-11 10:50:39 -04:00
2d54019b8f
Remove OPEN3DGC and compression references
2017-09-11 10:50:39 -04:00
562920fbb8
Changes to GLTF2 materials
...
pbrMetallicRoughness and pbrSpecularGlossiness as structs; persist textureinfo properties from start to finish; persist pbrSpecularGlossiness (via extensionsUsed) usage from start to finish
2017-09-11 10:50:39 -04:00
7532d6aac1
Remove Light, Technique references
2017-09-11 10:50:38 -04:00
863458cd4a
Start removing materials common, and adding pbrSpecularGlossiness
2017-09-11 10:50:38 -04:00
7615a97cd3
Remove redundant function
2017-09-11 10:50:38 -04:00
0cf69479c3
Use `!ObjectEmpty()` vs. `MemberCount() > 0`
2017-09-11 10:50:38 -04:00
11cb9ac139
Working read, import, export, and write of gltf2 (pbr) material
2017-09-11 10:50:38 -04:00
b42d785afe
Start managing and importing gltf2 pbr materials
2017-09-11 10:50:38 -04:00
67eb3b0608
temporarily disable gltf exporting of animations and skins
2017-09-11 10:50:38 -04:00
39172feb3e
Start reading pbr materials
2017-09-11 10:50:37 -04:00
4d59dee5ea
Cache retrieved items via an original index map
2017-09-11 10:50:37 -04:00
47c7c3cf50
Disambiguate Get methods
2017-09-11 10:50:37 -04:00
f814acf33a
Update glTF2 Asset to use indexes
2017-09-11 10:50:37 -04:00
63d3655f1b
Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List
2017-09-11 10:50:36 -04:00
3c1cda0b8c
Merge branch 'master' of github.com:assimp/assimp into issue_1065
2017-09-11 00:17:23 +10:00
698cd5826d
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-11 00:16:26 +10:00
e40cd6c13c
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-11 00:09:40 +10:00
1167edaeca
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-11 00:09:35 +10:00
6db0a63d6e
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:13:12 +10:00
6e02bcd8d6
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:10:59 +10:00
b7f1277175
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:07:37 +10:00
98532b45bf
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:04:44 +10:00
97b67d5cb5
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 18:47:24 +10:00
2ec46cc188
fix name lost in mesh and nodes when load with aiProcess_PreTransformVertices flag
2017-09-09 19:04:15 +03:00
c143d2e02c
closes https://github.com/assimp/assimp/issues/1404 : set name with merged meshes for output mesh.
2017-09-07 20:30:17 +02:00
3de9bbb73d
fixed spelling error
2017-09-02 19:44:51 +02:00
b4da9c4f56
Fix review findings: remove unused includes
2017-08-31 11:30:31 +02:00
00e3b03c5b
closes https://github.com/assimp/assimp/issues/1406 : fix merge issue + improve 3MF-tests
2017-08-31 11:04:13 +02:00
f8ef94095a
Update version check in FBX reader to check for version >= 7500 instead of exactly 7500.
2017-08-29 15:41:25 +02:00
7151cf117b
Merge branch 'master' of https://github.com/rickomax/assimp into rickomax-master
2017-08-25 16:47:08 +02:00
ce9c8a4efc
Merge pull request #1403 from kebby/fbx_anim_fix
...
FBX importer: Use actual min/max of anim keys when start/stop time is missing
2017-08-25 13:33:09 +02:00
12a28d33ce
FBX importer: try a constant again (ll suffix this time)
2017-08-25 12:14:03 +02:00
9a12b6ef0b
FBX importer: Back to INT64_MIN but include <stdint.h> also.
2017-08-25 11:17:07 +02:00
cac93ad0a8
Merge pull request #1400 from kebby/master
...
Collada importer: Add support for line strip primitives
2017-08-25 09:10:38 +02:00
80489963a1
FBX importer: don't rely ont INT64_MIN / ..MAX macros
2017-08-24 17:18:54 +02:00
7182f89a51
FBX importer: Use actual min/max of animation keyframes when start/stop time is missing
2017-08-24 14:40:53 +02:00
92beee9924
Collada importer: Add support for line strip primitives
2017-08-23 17:52:53 +02:00
2e5e56c000
Re-enabling PACK_STRUCT for MDL files.
...
When using this compiler:
Apple LLVM version 7.3.0 (clang-703.0.31)
Target: x86_64-apple-darwin15.4.0
Thread model: posix
The MDL::Frame is aligned in 8-byte boundaries instead of 4. This
generates this error when loading old Quake 1 MDL files:
ERROR: Failed to load file: Invalid MDL file. The file is too small
or contains invalid data (File: MDLLoader.cpp Line: 422)
It seems this error was introduced by commit
bd2af6591f
2017-08-21 09:27:40 +01:00
e0fc412e57
Fix OBJ discarding all material names if the material library is missing
2017-08-18 17:40:07 +04:30
b26fea4cf5
Fix compiling problems under VS2017.3.
...
1. WordIterator's operator== and operator!= must take const WordIterator& as parameter type.
2. OpenMP doesn't work with new two phase lookups. Need to disable twoPhase.
2017-08-14 21:51:59 -07:00
dab0985994
assert: remove assert with more than one statement and use only ai_assert.
2017-08-14 22:20:26 +02:00
b1313b04b8
should be map, not set
2017-08-12 00:16:00 -04:00
847e0291a0
changed a few leftover asserts to ai_assert
2017-08-12 00:13:24 -04:00
5b3b80cbc2
Formatting
2017-08-09 11:41:12 -04:00
83bfa61f8d
version in glb header is stored as uint32_t
...
Validator complains about `1` not being a valid version, however.
2017-08-09 11:09:43 -04:00
7a4a32625c
Ensure gltf asset version is printed as \d.0
2017-08-09 10:47:34 -04:00
7fd9c3dc98
§
2017-08-05 18:54:17 +02:00
8091e46e81
Merge pull request #1370 from 0xcccc/master
...
Fix android build issues
2017-08-03 16:40:32 +02:00
ba658e7813
ply-importer: fix creation of vertex attributes.
2017-08-03 14:57:48 +02:00
8478df7dbd
PlyLoader: fix vertex attribute lookup.
2017-08-02 14:24:53 +02:00
def42bf624
Fix android build issues
2017-08-02 19:15:07 +08:00
81fd027860
closes https://github.com/assimp/assimp/issues/1270 : use HasTexture for
...
texture coordinates.
2017-08-02 11:35:57 +02:00
44e2ba541f
Merge pull request #1363 from jamesgk/gltf2
...
glTF2 export support
2017-07-29 15:08:52 +02:00
efa0aaf729
Merge pull request #1364 from pdaehne/master
...
X3D importer: Workaround for buggy Android NDK (issue #1361 )
2017-07-29 15:07:38 +02:00
7557fdbb72
Fix install for builds with MSVC compiler and NMake.
...
The CMake variable "MSVC" and the related versioned variables indicate that the
Visual Studio compiler is used but when using that compiler and the "NMake
Makefiles JOM" build generator the files it tried to install weren't in the
expected Debug folder.
2017-07-29 07:45:25 -04:00
3fe8c72f5d
new release: update to 4.0.1.
2017-07-28 22:27:36 +02:00
6c526d7c64
PPdPmdParser: fix compilation for clang.
2017-07-28 22:23:08 +02:00
5939d81138
glTF2: Use better mipmap filter defaults
2017-07-27 15:18:35 -07:00
d052b74b96
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-27 20:49:54 +02:00
a2bbf76cf4
StreamReader: fix out-of-range exception
2017-07-27 20:49:49 +02:00
d74306ad67
fix build
2017-07-27 13:07:26 +02:00
c91e9a94da
glTF2: export materials' normal maps
2017-07-26 14:42:22 -07:00
b7b17b03ec
glTF2: use opacity for diffuse alpha + alphaMode
...
The "transparency" attribute is unused in glTF2.
2017-07-26 14:39:35 -07:00
acf8c54e55
glTF2: Fix animation export
2017-07-26 14:20:53 -07:00
16ed8861eb
X3D importer: Workaround for buggy Android NDK (issue #1361 )
2017-07-26 14:14:11 +02:00
bb55246c18
Export glTF 2
2017-07-25 18:05:18 -07:00
d7cbbaf23e
Compile with glTF2 export option (currently same as glTF1 output)
2017-07-25 17:34:03 -07:00
38626d4260
glTF: start fork of files used in export, for glTF2
2017-07-25 17:34:03 -07:00
4dc2cd8442
Profiler: fix invalid using statement.
2017-07-25 08:54:29 +02:00
2cb1a9efc6
Profiler: add a unittest.
2017-07-25 00:00:43 +02:00
96cb3f7140
Merge pull request #1359 from sacereda/profilerLogging
...
Elapsed seconds not shown correctly
2017-07-23 01:56:22 +02:00
6429502fc5
Elapsed seconds not shown correctly
2017-07-22 23:31:10 +02:00
8606ec6060
Low performance in OptimizeMeshesProcess::ProcessNode with huge number of aiMeshes
2017-07-22 23:28:55 +02:00
147541ab7f
Complementing last fix
...
Complementing last fix
2017-07-19 19:04:10 -03:00
3d4b54f8fc
Fixed FBX 7500 Binary reading
...
Seems that all FBX 7.5 Binary files uses 32 bits adresses. The code now is taking this in consideration. This commit fixes the https://github.com/assimp/assimp/issues/838 issue.
2017-07-19 19:00:53 -03:00
3859cd692f
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-18 19:02:47 +02:00
5e98898dca
Update version.
2017-07-18 19:02:08 +02:00
a895808959
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-18 17:03:45 +02:00
4361262029
PlyLoader: fix out of bound access.
2017-07-18 17:02:21 +02:00
80acc1f241
Fix Collada export image tag
...
Fix compiler double issues
2017-07-17 09:42:26 +02:00
3346fb517f
fix compiler warnings.
2017-07-16 01:02:33 +02:00
328646f1d1
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-15 11:22:14 -03:00
c9d18ebe1f
Merge pull request #1345 from jamesgk/master
...
Use unique node names when loading Collada files
2017-07-15 11:08:59 +02:00
bd7fdfeeca
Merge pull request #1338 from pdaehne/master
...
X3D importer: Support for binary X3D files
2017-07-15 11:08:08 +02:00
c86013b08d
Fixed many FBX bugs
...
Fixed a bug where FBX loader won´t load embedded textures that don´t have the Content data filled. Some FBX files only fill this data once, so any embedded texture with the same source filename, should use the pre-loaded data.
Fixed another bug where FBX Texture "Filename" field came different than on some files than the one defined by the code. One suggestion is load all properties by the case-insensitive function created.
Added the "AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES" flag to tell the importer to load embedded texture data from already loaded ones.
2017-07-15 00:27:33 -03:00
727cffdfb4
Use unique node names when loading Collada files
2017-07-14 11:54:37 -07:00
0a1a4a0b96
X3D importer: Fixed iterator on MSVC 2015
2017-07-12 20:48:49 +02:00
c1442c63cf
X3D importer: Fixed problems with auto, override and regex on older compilers
2017-07-12 19:57:10 +02:00
e97ba7aec2
X3D importer: Fixed missing header file
2017-07-11 21:32:47 +02:00
8959bcb847
X3D importer: Fixed path handling
2017-07-11 19:41:24 +02:00
457dff1bf1
X3D importer: Implemented support for binary X3D files
2017-07-11 19:28:40 +02:00
1026264c64
Fixed bug in assbin metadata export when no metadata are defined
2017-07-11 18:15:56 +02:00
6c6a8fe671
Added support for metadata in assbin format
2017-07-11 17:39:36 +02:00
e66dc5c9ad
Collada: add workaround to deal with polygon with holes .
2017-07-11 10:42:10 +02:00
d40b6089e8
Fix compiler warnings + one review finding.
2017-07-09 22:17:35 +02:00
647b59b7fa
Merge pull request #1334 from assimp/x_deals_with_lines
...
X-Importer: make it deal with lines.
2017-07-07 18:38:51 +02:00
af216ec294
X-Importer: make it deal with lines.
2017-07-07 16:34:08 +02:00
4efe7bfd41
Remove std functions deprecated by C++11.
2017-07-04 17:01:03 -07:00
ac37e4ddba
closes https://github.com/assimp/assimp/issues/1320 : check if all
...
exporters are disabled.
2017-06-28 22:13:49 +02:00
12908506ab
Merge pull request #1322 from assimp/issue_1319
...
closes https://github.com/assimp/assimp/issues/1319 : fix build without
2017-06-28 22:08:44 +02:00
f30fd58494
fix review findings.,
2017-06-28 22:08:20 +02:00
27b7b44c9d
fix unittests.
2017-06-28 20:11:13 +02:00
6891db99af
Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attributes
...
Signed-off-by: Vitaly Kovalev <vkovalev@gkmsoft.ru>
2017-06-27 13:52:43 +03:00
a408b92279
closes https://github.com/assimp/assimp/issues/1319 : fix build without
...
3DS.
2017-06-26 22:01:15 +02:00
9ffc1a97c1
Merge pull request #1321 from pdaehne/master
...
Fixes for X3DImporter/X3DExporter
2017-06-26 21:04:25 +02:00
d8cac6eb24
Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet
2017-06-26 15:25:15 +02:00
afb2f3036e
OpenDDLParser: latest greatest.
2017-06-25 13:21:36 +02:00
aaa476cb10
X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags
2017-06-23 11:59:14 +02:00
3c8a4a5abb
X3D Exporter: fixed missing attributes
2017-06-22 20:48:33 +02:00
855589d2a1
X3D importer: Fixed import of normals for the single index / normal per vertex case
2017-06-22 18:54:03 +02:00
6118f77d3b
X3D importer: Fixed handling of inlined files
2017-06-22 16:29:26 +02:00
840ed9dd34
X3D importer: fixed whitespace handling (issue #1202 )
2017-06-22 15:05:23 +02:00
6aca0f86b4
Merge pull request #1314 from jamesgk/gltf-export
...
GLTF exporter: ensure buffer view byte offsets are correctly aligned
2017-06-22 08:31:07 +02:00
735e64309b
LWO: use forward declaration in header.
2017-06-21 23:06:53 +02:00
bd2af6591f
Fix compiler warnings.
2017-06-21 23:02:46 +02:00
7e45c63901
GLTF exporter: ensure buffer view byte offsets are correctly aligned
2017-06-21 09:58:24 -07:00
439409bef2
SceneCombiner: fix the build.
2017-06-21 15:24:06 +02:00
b727420cf2
SceneCOmbiner: Fix the build.
2017-06-21 14:31:37 +02:00
612ac234c5
SceneCombiner: move header for scenecombiner to public folder.
2017-06-21 14:21:16 +02:00
d3140a68ab
Merge branch 'master' of https://github.com/assimp/assimp
2017-06-17 21:17:39 +02:00
64cbc69337
remove dead code.
2017-06-17 20:36:59 +02:00
d7e13e67c4
Utf8: integrate new lib.
2017-06-17 19:38:47 +02:00
6e1034996e
UTF8Encoding: introduce new lib.
2017-06-16 16:43:39 +02:00
79818145a7
ObjImporter: remove dead code.
2017-06-15 20:24:10 +02:00
7977ded078
Merge pull request #1300 from assimp/ply_export_test
...
ply-exporter: add unittest.
2017-06-09 23:02:30 +02:00
4974c99288
Merge remote-tracking branch 'github/master' into contrib
2017-06-08 11:01:11 +02:00
548c09271b
ply-exporter: add unittest.
2017-06-07 14:06:38 +02:00
7f8839b1f4
Merge pull request #1293 from arkeon7/PLY_refactoring
...
PLYImporter refactoring
2017-06-06 11:55:37 +02:00
19d59b630b
SpatialSort: use much easier reabability.
2017-06-06 11:37:02 +02:00
44a9f80e40
Ply importer with correction from last general trunk merge
2017-06-02 22:19:41 +02:00
f84851e893
PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply import - manage texture coords on faces in ply import - correction on point cloud faces generation
...
IFC :
- update poly2tri to avoid crash on some IFC files
Collada :
- manage missing texture reference in collada import
2017-06-02 13:48:57 +02:00
ca5ac0b532
Fixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the complete model
2017-06-01 09:47:50 +02:00
9e98097aae
closes https://github.com/assimp/assimp/issues/1244 : log error for
...
overflow.
2017-05-31 21:43:41 +02:00
8c6f18ea2a
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-31 21:37:42 +02:00
1207a81b70
ObjImporter: remove dead code.
2017-05-31 21:37:16 +02:00
4dc7940ac5
ObjImporter: fix dead code.
2017-05-31 20:28:00 +02:00
e501cc17c2
Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks
2017-05-31 20:18:39 +02:00
82380084c5
ObjImporter: next try for multiple line stuff.
2017-05-31 16:36:08 +02:00
813f3b8248
ObjLoader: improve performance of obj-import.
2017-05-30 21:10:33 +02:00
c121cec68a
Obj-Importer: introduce working test for line breaks.
2017-05-29 22:00:13 +02:00
d30b1e585c
Tests how o adress this topic.
2017-05-28 22:25:06 +02:00
8cc80a3d9c
ObjImporter: fix the build.
2017-05-28 14:14:22 +02:00
3d99892b94
Opj-Importer: fix coverity finding.
2017-05-27 19:37:28 +02:00
e93355c8b4
Build: fix some compiler warnings for g++.
2017-05-26 09:18:23 +02:00
1b4cbcc6ad
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-25 22:40:36 +02:00
fb33199d99
GLTFImporter: exclude headers from build whem no_glft_importer is
...
defined.
2017-05-25 22:34:45 +02:00
b7d4b69e0d
X3DImporter: fix the build.
2017-05-24 22:35:35 +02:00
3c370c83b9
MDLImporter: remove dead code.
2017-05-24 21:18:51 +02:00
18b0316d52
X3DImporter: fix coverity finding ( missing comma ).
2017-05-24 21:15:55 +02:00
ec496a5833
X3DImporter: fix coverity finding.
2017-05-24 21:04:35 +02:00
3d5e94477f
Merge pull request #1272 from assimp/issue-1262
...
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-19 23:13:40 +02:00
febf94f6aa
Merge pull request #1212 from aoowweenn/umw_dev
...
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
eba06f0c8b
Merge pull request #1275 from ab4d/master
...
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-17 11:34:35 +02:00
1daad40b30
Merge branch 'master' into issue-1262
2017-05-17 10:20:45 +02:00
04f908aa4c
Obj-Exporter: fix build.
2017-05-17 10:13:07 +02:00
60c54cbf59
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-17 09:25:30 +02:00
2f649833d5
LWOLoader: fix link in loader description.
2017-05-17 09:25:07 +02:00
331bbacf3d
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-16 22:18:47 +02:00
2b89a3cffc
Using single quote for one character parameter in find_last_of method call
2017-05-16 21:56:49 +02:00
3f68278ea0
Merge branch 'master' into issue-1262
2017-05-16 21:53:35 +02:00
a45b5cdfb5
OpenGEX: fix invalid handling with color4 token.
2017-05-16 21:45:23 +02:00
542fe31a94
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-16 21:07:20 +02:00
c3974512e4
Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl
2017-05-16 15:55:40 +02:00
04dbdca329
Revert "Creating fileName.mtl file instead of fileName.obj.mtl"
...
This reverts commit 5757980ea5
2017-05-16 15:47:57 +02:00
5757980ea5
Creating fileName.mtl file instead of fileName.obj.mtl
2017-05-16 15:34:50 +02:00
ff7624f06f
Merge pull request #1268 from VennGrayDog/b1
...
Add TokensForSearch in BlenderLoader
2017-05-15 21:37:26 +02:00
7e011c92f0
Merge pull request #1269 from assimp/issue_1266
...
closes https://github.com/assimp/assimp/issues/1266 : fix wrong delete
2017-05-15 21:33:42 +02:00
428a4cdd71
SpatialSort: use std::vector::clear().
2017-05-15 19:41:08 +02:00
e5657bf0c5
closes https://github.com/assimp/assimp/issues/1266 : fix wrong delete
...
Instead of delete delete [] must be used.
2017-05-15 09:55:39 +02:00
ab45dc79fa
Merge pull request #1263 from jamesgk/gltf-export
...
GLTF exporter: convert animation time from ticks to seconds
2017-05-15 09:12:57 +02:00
0b34089df0
Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files.
2017-05-15 02:34:53 -04:00
24790398b9
Merge pull request #1264 from smokris/master
...
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'
2017-05-15 00:39:36 +02:00
3d05df2d3e
Fix location of config.h
2017-05-14 15:09:31 -04:00
2e455b78c8
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'.
2017-05-11 15:21:37 -04:00
c33039d682
GLTF exporter: convert animation time from ticks to seconds
2017-05-11 11:04:23 -07:00
9b2671b280
Merge pull request #1248 from NcJie/fixed-android-atof-not-found-issue
...
Fixed no member named 'atop' in global namespace issue for Android ND…
2017-05-11 10:55:59 +02:00
ab19c5e3f7
Merge pull request #1258 from jamesgk/gltf-export
...
GLTF exporter: ensure animation accessors have same count
2017-05-11 10:46:06 +02:00
f6a8be5bac
AMPImporter: fix coverity findings.
2017-05-10 19:34:50 +02:00
5411f769e8
STEPFile: fix coverity findings.
2017-05-10 18:50:51 +02:00
d36fbfbb8b
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-10 18:30:36 +02:00
0300574b8b
AMFImporter: fix coverity findings.
2017-05-10 18:29:42 +02:00
b8747fffca
Merge pull request #1259 from Squareys/fix-cmake-install
...
[One-Line-Change] Fix config.h not being found during cmake --build . --target install
2017-05-10 09:37:04 +02:00
9ef1a4fae0
X3D: fix coverity findings.
2017-05-09 22:54:04 +02:00
cfb867b5e7
Fix config.h not being found during install
2017-05-09 21:51:49 +02:00
eb828a3b71
X3DImporter: fix coverity findings.
2017-05-09 21:35:21 +02:00
4a5c483ac4
AMFImporter: make test against nullptr dereferencing meaningful.
2017-05-09 21:03:20 +02:00
f77e27ca19
ColladaExporter: remove self assignment.
2017-05-09 20:59:01 +02:00
03d97b23ec
Coverity: fix finding in COBLoader.
2017-05-09 20:15:30 +02:00
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
36f4fb8826
GLTF exporter: ensure animation accessors have same count
2017-05-08 14:45:26 -07:00
186629b372
SpatialSort: use std::vector::resize( 0 ) to improve readability.
2017-05-08 21:57:08 +02:00
65653edf88
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-08 21:29:07 +02:00
5289954e27
Fix review findings.
2017-05-06 20:57:17 +02:00
98100d8cab
Blender-Importer: fix coverity findings.
2017-05-06 11:14:04 +02:00
39e048dea6
Merge pull request #1254 from samitc/master
...
Improve performance of obj line break
2017-05-04 19:53:51 +02:00
7f014ea889
Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri
...
Fix incorrect truncation of binary URI in glTF exporter
2017-05-04 19:52:18 +02:00
d6e8fd34f0
Search for .gltf extension at end of file name for buffer prefix.
...
Previously the code assumed that there would be only one '.' in the file
name, which is not a valid assumption. This patch fixes this issue, but
still assumes that the only occurrence of the string ".gltf" is at the
end of the file name. In particular, it will fail on a file name like
"/path/to/a.gltf/my_gltf.wrong_extension".
2017-05-03 15:11:31 -04:00
dd1d10407e
make array non static to support multithreaded
2017-05-01 16:54:07 +03:00
8b4e066ca5
Improve performance of obj line break
2017-05-01 16:32:49 +03:00
0069552183
Fix static init ordering bug in OpenGEX importer
2017-05-01 15:11:22 +02:00
4a0171bd82
- Apply mechanism to decide use for IrrXML external or internal
...
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.
Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists
Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00
aff391c681
Fixed no member named 'atop' in global namespace issue for Android NDK compilation
2017-04-27 17:15:03 +09:00
8445db2cd9
Set UVW index material properties for OBJ files.
2017-04-21 01:09:26 -07:00
b64882f4c7
Fix spelling
2017-04-11 16:33:13 -04:00
9fc7f72b55
fix line breakes in obj files
2017-04-11 17:16:18 +03:00
0e3956caf1
Compilation fix: Removing the vector4 headers from code/CMakeLists.txt
2017-04-08 23:25:39 +02:00
2825d2daf8
Merge branch 'master' of https://github.com/assimp/assimp
2017-04-07 17:50:20 +02:00
38fab5ae8e
doc updatedoc update
2017-04-07 17:46:53 +02:00
8f3aaa88f9
Fixed compiler error on clang 4.0 running on OSX
...
glTFExporter.cpp:585:35: error: ordered comparison between pointer and zero ('aiVector3D *'
(aka 'aiVector3t<float> *') and 'int')
if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
2017-04-03 11:07:43 +02:00
0f6782df27
Fix PDB file installation in RelWithDebInfo configuration
2017-04-01 16:03:01 +02:00
6d71e4d5d7
Config.h.in: fix typo.
2017-03-29 21:08:40 +02:00
1ab85f16ff
Merge pull request #1217 from Kai-W/master
...
Added ComponentType Unsigned int and Error handling
2017-03-28 17:06:06 +02:00
8accf5b386
3MF: reformattings.
2017-03-28 00:35:56 +02:00
6c73cc8aff
Added ComponentType Unsigned int and Error handling
...
Part of GLTF 2.0 changes
2017-03-27 17:22:49 +02:00
7bd3242563
comment out override specifier
2017-03-27 22:49:58 +08:00
51dae22828
merge master and adjust assimp/DefaultIOSystem.h
2017-03-27 22:35:19 +08:00
8cd0d3b3c7
change std::make_unique to mmd::make_unique
2017-03-27 22:16:19 +08:00
ccf2bce2b0
correct offset matrix
2017-03-24 15:45:50 +08:00
59b48fb960
finish skin controller
2017-03-24 14:39:34 +08:00
968612fea1
testing2
2017-03-24 12:04:40 +08:00
314bb451bb
testing weights, still strange
2017-03-23 16:30:01 +08:00
f10f2f5814
Almost finish vertex weghts
2017-03-23 04:33:53 +08:00
1c525a9365
Merge pull request #1208 from terziman/master
...
Added parameters to IFC importer to control tessellation
2017-03-22 20:08:21 +01:00
845d206959
Fill in mParent for each node in Assbin Loader
2017-03-22 21:11:17 +08:00
5bf974ae3b
keep writing dae skinning
2017-03-22 17:06:55 +08:00
e5a3038abd
try to fill in vertex weights to dae exportor
2017-03-21 16:21:49 +08:00
d1c7d905e8
Fixed infinite loop on non-manifold geometry
...
Geometry that had strange non-manifold faces could cause the normal
calculation to enter an infinite loop. Instead we now correctly detect
which faces to scan over.
2017-03-19 13:46:23 -07:00
209e972762
Fixed faceted normals in SIB importer.
2017-03-18 14:52:48 -07:00
bf2e2f7537
Extended support for tessellation parameter to more IFC shapes
2017-03-17 14:55:18 +01:00
d4ead31c18
Merge remote-tracking branch 'github/master' into contrib
2017-03-17 12:13:52 +01:00
9ef234b842
Added parameter to control cylindrical shapes tessellation
...
+ renamed smoothing angle parameter for better user understanding
2017-03-17 11:58:50 +01:00
fff0e886a1
Fixed bug in IFC openings when curmesh.vertcnt is empty
2017-03-17 11:53:36 +01:00
0eecff74d8
correct node hierarchy
2017-03-16 01:25:53 +08:00
2cd6c3d755
Closes https://github.com/assimp/assimp/issues/1128 : do not use non
...
verbose format flag for import.
2017-03-14 19:01:41 +01:00
0231af4343
skeleton almost done
2017-03-14 02:01:26 +08:00
bb7f387bcf
Merge branch 'master' of https://github.com/assimp/assimp
2017-03-11 22:13:48 +01:00
1c6145b39e
Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api
2017-03-11 18:19:36 +01:00
b47bfeb0d7
StringUtils: add the right missing header.
2017-03-11 17:25:34 +01:00
6179e22749
StringUtils: add missing include for VS2012 & 2013
2017-03-11 11:34:23 +01:00
8bc183182c
Added new option to IFC importer to control tessellation angle
...
+ removed unused IFC option
2017-03-10 14:42:17 +01:00
2d3dd1d40f
use SkeletonMeshBuilder to show bone positions.
2017-03-10 17:15:01 +08:00
b725d7dbf5
Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes
2017-03-08 10:27:57 +01:00
3bd9efa82c
Cleanup_includes: fix linux build.
2017-03-08 09:55:44 +01:00
c0c480a4cb
fixup! merge master and mv FindDevIL to cmake-modules
2017-03-05 23:36:36 +08:00
83db3fc084
fixup! remove dependency of ICU library
2017-03-05 23:14:21 +08:00
7226d73682
merge master and mv FindDevIL to cmake-modules
2017-03-05 23:07:06 +08:00
34906071fc
remove dependency of ICU library
2017-03-05 22:59:53 +08:00
8d27945619
Merge branch 'master' into cleanup_includes
2017-03-05 15:15:29 +01:00
e6dcad384a
Fix missing includes.
2017-03-05 15:05:40 +01:00
0c0ca403b5
Convert to OpenGL space by three processes.
2017-03-05 20:40:41 +08:00
7a25f5ac25
finish UV texture
2017-03-02 23:16:29 +08:00
ffc95162ec
fix for FreeBSD
2017-03-01 16:30:03 +09:00
e89c29a9cc
finish vertex
2017-03-01 13:52:46 +08:00
a38b2fb10f
Merge pull request #1191 from Lugdunum3D/feature-importers-whitelist
...
Allow to enable importers in a whitelist manner
2017-03-01 00:34:10 +01:00
9a0a74ef1f
Merge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip
...
Fix buildsystem minizip
2017-03-01 00:15:12 +01:00
574c192575
Merge pull request #1186 from astillich/ase_cface
...
Fixed parsing ASE MESH_CFACE
2017-03-01 00:12:12 +01:00
f312d8709e
More cleanup
2017-02-28 16:37:07 +01:00
5dd1bb9d6c
Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/
2017-02-28 11:44:04 +09:00
d77989088c
Allow to enable importers in a whitelist manner
2017-02-28 11:42:53 +09:00
4495162f5f
Fix new lines problem
2017-02-27 18:34:04 -05:00
7a47f1f8f7
Issue-1183: add stp to the list of supported extensions for step-files.
2017-02-27 20:11:59 +01:00
e80d3aa9d4
finish mesh creation
2017-02-27 21:02:58 +08:00
0700dfe711
Fixed parsing ASE MESH_CFACE
2017-02-25 23:30:41 +01:00
4045466f73
pass through but panic
2017-02-24 08:35:15 +08:00
5e2c846ca0
Remove unused header.
2017-02-22 17:22:23 +01:00
ef540f46a3
Remove unused headers.
2017-02-22 17:20:26 +01:00
Kim Kulling
Gordon MacPherson
Paul Arden
Zoltan Baldaszti
bzt
Loïc
Cory Fabre
Mike Samsonov
Kim Kulling
Yingying Wang
Raphael Dümig
Rem
Malcolm Tyrrell
TGE
RichardTea
Malcolm Tyrrell
Fabrice Fontaine
Engin Manap
Chris Weermann (TGE)
vcebollada
Theak
Alan
Jennifer Buehler
escherstair
Bruno
PascalGilbraith
RumbleballTheReal
Ryan McCampbell
Gordon MacPherson
Ghanshyam Bhutra
petrmohelnik
Minmin Gong
RichardTea
thomasbiang
Vladimír Vondruš
Pierre Anquez
kkulling
Merwan
Frooxius
Rob Conde
Rahul Sheth
PK
Arkeon
Brian Naranjo
Alexandre Avenel
Rémi Verschelde
Jack Andersen
Matias
Hugo Pereira
b1skit
Vitaly Ovchinnikov
Martin Vorbrodt
Heorhii Shakula
Charlie Gettys
Matias Lavik
Marco Di Benedetto
Andy Maloney
Tomas Maly
Rich ard
Aidmx
Lawrence Kok
Marc-Anton Boehm-von Thenen
Lassi Lääti
FRICOTEAUX
Adrian Perez
SchroerDev
Marc Kurtz
rickomax
Andrés Iraolagoitía
tirichards
sfalexrog
twhittock
wxyu
Luke Lau
Martin Jeřábek
rdb
Matthias Moulin
ruyo
mnml_
haroonq
Haroon Qureshi
ihmc3jn09hk
Burkhard Mittelbach
Gargaj
dormon
Turo Lamminen
Daniel Löber
Joe Schutte
gstanlo
Mike Feldstein
Jeka Vlasov
Gareth Morgan
Eddie James
Jesus Fernandez
Sebastian Matusik
Власов Евгений
Kenneth Perry (thothonegan)
Seb Bro
Doron Adler
Max Vollmer
Max Vollmer
Christian
CwTCwT
Sebastian Maisch
microm8
Michael Roer Pedersen
Tammo Hinrichs
smalcom
Matthias Möller
Alexander Gessler
Diego Lopes
wuxq
A. Breust
Eugene Barnett
Nicholas Woodfield
LoicFr
Korbinian Würl
Trylz
Sergio Acereda
Leo Terziman
James Carthew
Edward Andrew
Edward Andrew
A. Breust
aoowweenn
Tommy
JeffH-BMG
Cloud Wu
Sergey Gonchar
Daniel Kirchner
Josh Faust
Josh Faust
Giuseppe Barbieri
Martin Buchner
mbuchner
Rohan Singh
BuildTools
Christian Meurin
awefers
Faule Socke
Teybeo
Daniel Hritzkiv
awefers
Patrick Dähne
Mika Rautio
Mika Rautio
Unknown
Thomas Lemaire
Lars Jørgen Solberg
Victor NG
ndotl
Jared Mulconry
Haik Lorenz
Jeremy Cowles
Richard Mitton
vkovalev123
John Senneker
Amit Cirt
IOhannes m zmölnig
Eduardo Costa
Arshia001
Jeremy Abel
Knox Shao
jamesgk
Madrich
Kim Kulling
Andrej
VennGrayDog
Steve Mokris
Squareys
rdb
Helio Chissini de Castro
Cong Jie
Tyson Grant Nottingham
Guillaume Bittoun
Maarten Heremans
Andre Schulz
Kai Westerkamp
rmitton
Shin-ya Murakami
Antoine Bolvy
Alexander Stillich