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
Kim Kulling
Kim Kulling
ardenpm
tirichards
sfalexrog
twhittock
wxyu
Luke Lau
Martin Jeřábek
rdb
Matthias Moulin
ruyo
mnml_
haroonq
kkulling
Haroon Qureshi
ihmc3jn09hk
Minmin Gong
Burkhard Mittelbach
Gargaj
dormon
Alexandre Avenel
arkeon7
FRICOTEAUX
Turo Lamminen
Daniel Löber
Joe Schutte
gstanlo
Mike Feldstein
Jeka Vlasov
Gareth Morgan
Eddie James
Jesus Fernandez
Marco Di Benedetto
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
Adrian Mark Perez
Alexander Gessler
Diego Lopes
wuxq
A. Breust
Eugene Barnett
Nicholas Woodfield