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
Kim Kulling
Engin Manap
Chris Weermann (TGE)
vcebollada
Theak
Alan
Jennifer Buehler
Kim Kulling
ywang
escherstair
Bruno
PascalGilbraith
RevoluPowered
RumbleballTheReal
Mike Samsonov
Ryan McCampbell
Malcolm Tyrrell
Gordon MacPherson
RichardTea
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
ardenpm
tirichards
sfalexrog
twhittock
wxyu