524e2e4728
fix warning, hopefully ...
2020-06-15 21:34:49 +02:00
31b8d4710f
Merge branch 'master' into issue_3165
2020-06-15 20:32:00 +02:00
15f11aec93
Merge branch 'master' into gltf2_targetNames_export
2020-06-14 09:43:09 +02:00
f938a6b744
fix leak: just ignore broken texture coordinates.
2020-06-12 14:52:02 +02:00
1e0c5f26b4
Merge branch 'migenius-migenius-fix-texcoord' of https://github.com/assimp/assimp into migenius-migenius-fix-texcoord
2020-06-12 12:30:11 +02:00
ad62e6e863
fix unittest check - cannot work, just crash shall not occurr any more.
2020-06-12 12:29:51 +02:00
f67c71d5c7
Merge branch 'master' into fbx_blendshape_channelName
2020-06-12 10:55:32 +02:00
e65434bf82
extra callback
2020-06-11 17:37:06 -07:00
f57e7221c0
temp
2020-06-10 13:23:29 -07:00
578a7ac502
add Callback API in ExporterProperties
2020-06-09 11:20:48 -07:00
ffaa634c48
Merge branch 'master' into issue_3165
2020-06-09 10:48:27 +02:00
88c1509d69
Remove dead code
2020-06-09 10:15:35 +02:00
620bebb999
diable warning only for gcc 8.0 or greater
2020-06-09 10:14:57 +02:00
42afc40d16
Disable warning only for gcc 8.0 or greater
2020-06-09 10:13:43 +02:00
35fb4c9370
Remove dead code
2020-06-09 10:07:25 +02:00
5c7bed01f1
remove dead code.
2020-06-09 10:06:50 +02:00
9e46f9751f
Check for invalid texture coordinate accessor. Fixes #3269 .
2020-06-09 15:49:38 +10:00
8fed101432
avoid all zero
2020-06-08 16:18:11 -07:00
f18f1a35f6
accommodate linux build
2020-06-08 14:49:50 -07:00
2065512470
remove comments
2020-06-08 14:41:53 -07:00
12dc736d94
Merge branch 'master' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export
2020-06-08 14:32:23 -07:00
26421aebc9
support channel name in blendshape name
2020-06-08 13:33:16 -07:00
b37d42f6b5
Perform sanity check only in debug
...
closes https://github.com/assimp/assimp/issues/3255
2020-06-07 18:03:47 +02:00
e6446e1e68
Merge branch 'master' into issue_3258
2020-06-07 08:23:04 +02:00
2c0df39ef3
Added rapidjson define to avoid warnings in c++17
2020-06-06 14:33:41 +02:00
62273b63e5
closes https://github.com/assimp/assimp/issues/3256 : Remove redundand code
2020-06-06 12:22:01 +02:00
4e34853ac7
gltf2 export target names for blendshapes
2020-06-05 12:17:27 -07:00
6d04e16c7e
Merge branch 'master' into issue_3165
2020-05-28 21:51:58 +02:00
d40a3026db
closes https://github.com/assimp/assimp/issues/3165 : fix gcc build.
2020-05-28 21:02:13 +02:00
87584eb007
glTF2: fix "file size doesn't match" issue when importing GLB in Blender
2020-05-28 11:05:38 +02:00
98767cbb08
pull master
2020-05-27 10:23:28 -07:00
2c9cfefe67
Merge branch 'master' into gltf2_sparseAccessor_import
2020-05-26 21:30:51 +02:00
e33ed9e7a1
File is duplicated
...
closes https://github.com/assimp/assimp/issues/3238
2020-05-25 20:30:18 +02:00
78c9ac2889
Merge branch 'master' into gltf2_sparseAccessor_import
2020-05-25 16:11:01 +02:00
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
a97e4c15b3
Merge branch 'master' into master
2020-05-21 21:15:50 +02:00
ecfca1d5c5
Merge branch 'master' into verboseLogging
2020-05-21 18:30:52 +02:00
50f0a86798
conditional export
2020-05-19 16:10:41 -07:00
c4055d04b4
Fix double free caused in FindInvalidDataProcess
...
In debug builds, there's no issues, but in release, an invalid mesh that
is deleted in FindInvalidDataProcess will be double free'd when the
parent scene is destroyed.
2020-05-19 14:38:10 -04:00
c10e409a5d
merge
2020-05-18 12:16:45 -07:00
193deb3441
cleanup
2020-05-18 12:01:09 -07:00
e39c632809
cleanup
2020-05-18 11:50:51 -07:00
0897c4c7be
merge
2020-05-18 11:31:44 -07:00
02cbd36271
pull master
2020-05-18 11:15:18 -07:00
e9a3cc2c8a
Fixed rotation order bug in BVH Loader
...
This bug has been present since after the 4.10 release.
It fixes the issue "play the bvh error" #2187
Almost all bvh files are affected, such as any of the CMU library.
The bug is caused by the introduction of channelMap in the BVHLoader.cpp - function void BVHLoader::CreateAnimation(aiScene *pScene). The channelMap loses the rotation order present oin the BVH file, and always applies the rotations in X,Y,Z order.
2020-05-18 16:07:46 +01:00
14692368d5
Same for LogDebug -> LogVerboseDebug
2020-05-18 11:55:14 +01:00
87a7662bee
More thinks using VERBOSE_DEBUG
2020-05-18 11:45:00 +01:00
2438e1b52e
Merge branch 'master' into gltf2_fix_skin_recursion
2020-05-18 09:05:28 +02:00
4b0a3305b1
Merge branch 'master' into master
2020-05-17 13:54:10 +02:00
4f24b3dac2
Merge branch 'added_check_before_using' of https://github.com/qarmin/assimp into qarmin-added_check_before_using
2020-05-17 11:48:24 +02:00
cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes
2020-05-16 20:50:34 +02:00
b8e39b58d1
clean up
2020-05-15 12:32:58 -07:00
f6720271cb
sparce accessor exporter
2020-05-15 12:20:31 -07:00
d70685d37f
Fix typo
2020-05-15 17:50:48 +01:00
90cdbd9d9a
Fix ups
2020-05-15 17:46:50 +01:00
434c5e3d37
More verbose logging
2020-05-15 17:29:49 +01:00
e11d78596f
Use verbose debug logging in certain places
2020-05-15 17:26:17 +01:00
5e0136d737
Add concept of verboseDebug
2020-05-15 17:23:07 +01:00
2ffd1cb8db
nits
2020-05-15 17:22:15 +01:00
bcca3a0d79
No need for bespoke macros
2020-05-15 17:22:02 +01:00
6be0ce1ec9
Initial pass at adding logging
2020-05-15 17:21:45 +01:00
7a16a7a7e4
Fix infinite recursion in gltf2 skin parsing
...
Previously parsing a node caused the skin that was attached to it
to be parsed, which caused the skins node joints to be parsed,
which could cause the skin to be re-parsed leading to infinite or
at the very least exponential recursion.
The fix is to just get a reference to a temporarily uninitialized
skin as they were being parsed after the scene graph just to be safe
anyway. This way we avoid the recursion problem and all the references
will be valid in the end.
2020-05-15 16:48:41 +03:00
464d4cf99a
Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master
2020-05-15 15:08:30 +02:00
246ec2b0dc
Merge branch 'migenius-fix-ortho' of https://github.com/migenius/assimp into migenius-migenius-fix-ortho
2020-05-15 13:37:03 +02:00
a6b5abd698
Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master
2020-05-15 08:51:46 +02:00
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
e9b67cdb89
gltf2 import sparse accessor
2020-05-11 14:34:35 -07:00
c3a21666da
Make gltf2 export normal normalization safe
...
This avoids introducing NaNs e.g. when the input mesh has 0-length normals
2020-05-11 12:02:38 -07:00
c5a9fbd47f
Gracefully handle NaNs and Infs in gltf2 accessor bound computation
2020-05-11 12:02:38 -07:00
aef4ecada5
Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated
...
This can happen currently for example if NaNs are introduced in accessor bounds as rapidjson cannot write NaN/inf floats (see subsequent commit for fix there) and will halt writing to buffer at this point. Fix here ensures that whenever anything like this happens we throw an exception so this ends up as a registered export failure case, rather than silently exporting the incomplete JSON
2020-05-11 12:02:38 -07:00
3fdcd0861f
Fix fbx rotation ;
2020-05-11 10:28:05 +02:00
a1bcca2c99
remove step prototype: does not work this way.
2020-05-07 14:00:40 +02:00
89a865ce19
Merge branch 'master' into master
2020-05-06 22:07:39 +02:00
201347700f
fix incorrect header path on framework build
2020-05-06 16:15:23 +03:00
60e8146b9f
fix wrong target idx when importing
2020-05-05 12:51:40 -07:00
56a4e61533
Collada: Don't copy the scene when exporting
...
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
2020-05-05 10:16:13 +01:00
6e447b2c44
Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes
2020-05-05 09:52:08 +01:00
d1ae6ac77a
Fix typo in <visual_scene>
...
Swapped Id and Name
2020-05-05 09:51:41 +01:00
fa1d2f09db
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-05 09:33:48 +01:00
ddee1b1ddb
Merge branch 'master' into aaronfranke-file-formatting
2020-05-05 10:21:46 +02:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
bf95d1da7c
fix conversion
2020-05-04 21:48:46 +02:00
8e73984a11
Collada Root Nodes aren't allowed to have meshes
...
Create a null parent node instead
2020-05-04 17:47:09 +01:00
6e200cb0d3
Merge branch 'master' into bug-3177-dae-geo-id
...
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
ea917bd4ae
Move Collada into AssetLib folder
...
Should make the merge easier
2020-05-04 13:54:49 +01:00
91fa9a102b
closes https://github.com/assimp/assimp/issues/3181 : fix typo for light type.
2020-05-03 12:17:32 +02:00
3b06f57150
add missing inclde +
2020-05-02 21:11:47 +02:00
514593548d
add assert-test for nullptr.
2020-05-02 21:07:41 +02:00
3329e76263
closes https://github.com/assimp/assimp/issues/3178 : throw exception in case of invalid export stream.
2020-05-02 21:06:55 +02:00
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
1dabb1a094
Collada: Fix crash with AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES
...
Add unit test for this
2020-05-01 14:59:09 +01:00
3e2dd186d1
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-01 12:08:12 +01:00
5b9f207f1f
ColladaExporter cleanup
...
Namespace, NULL and includes
2020-05-01 11:54:34 +01:00
ee16d2c4c9
Fix camera, light and bone unique ids
...
Bones don't have a unit test yet
2020-05-01 11:13:38 +01:00
083ebdbc2e
Collada Export: More unique Ids
...
Nodes, Materials, Animations, Lights, Cameras, Bones
2020-04-30 18:28:06 +01:00
2d9d112015
fix warning
2020-04-29 21:35:42 +02:00
1c30b7bf8e
tryout: check if leak is coupled to type double.
2020-04-29 21:31:01 +02:00
e0bc0f7fad
try to fix double memleak.
2020-04-29 21:19:15 +02:00
da2bf5c7a4
fix wrong size
2020-04-29 21:13:46 +02:00
f808ed9fb5
fbxconverter: fix memoryleak.
2020-04-29 20:52:49 +02:00
c6131ce38a
scenecombiner: fix leak.
2020-04-29 20:43:23 +02:00
ff9f3b8608
Collada: Ensure <geometry> has unique id
...
Use the "id" for mesh names by default.
Set option AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES to use the mesh "name" instead
2020-04-29 17:17:46 +01:00
2c6ac23a4e
Apply Assimp clangformat to touched Collada files
2020-04-29 14:21:17 +01:00
6967a02fcb
Merge branch 'master' into added_check_before_using
2020-04-28 18:33:29 +00:00
4dfdbbf171
Check index before using
2020-04-28 20:31:59 +02:00
efa046366e
Retrigger build
2020-04-28 09:14:53 +02:00
4488e3e745
build on Linux with gcc and clang; warning as error only for 'assimp' target
2020-04-27 23:38:33 -07:00
81abd90ee1
Fix reading of orthographic camera data. Fixes #3028 .
2020-04-28 10:07:56 +10:00
b0c9711894
Small format finding
2020-04-27 15:16:57 +02:00
629320a3a0
Add timescale for collada
2020-04-27 11:52:04 +02:00
d98787f35b
CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt;
2020-04-26 12:50:42 -07:00
6c1e21d754
fix formatting.
2020-04-26 19:14:30 +02:00
bafb8e3189
closes https://github.com/assimp/assimp/issues/3165 : remove deprecated code whch causes compiler warning.
2020-04-26 08:59:52 +02:00
638df2ceac
Merge branch 'master' into master
2020-04-25 12:07:06 +02:00
9b1759dcc2
Merge branch 'master' into migenius-migenius-rsws53-mig-2
2020-04-22 19:59:53 +02:00
ca70b44e44
Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2
2020-04-22 19:58:41 +02:00
c36b028412
fix type error for template deduction.
2020-04-21 16:39:18 +02:00
c91d3764ca
Merge branch 'master' into optimized_bonelimits
2020-04-21 08:45:50 +02:00
f71b332ed1
Update glTF2Asset.inl
...
fix VS-compiler warning.
2020-04-19 21:14:47 +02:00
e3563212d7
Merge branch 'master' into master
2020-04-19 21:13:12 +02:00
e0f6eb09e6
Merge branch 'master' into optimized_bonelimits
2020-04-17 20:37:28 +02:00
9c52fd7633
Update D3MFExporter.cpp
2020-04-17 12:58:41 +08:00
e9a72a5053
repair formate 3MF
2020-04-17 12:38:07 +08:00
3bbc8e76bd
Rgba2Hex to repair rgba(1,1,1,1)
2020-04-17 12:34:05 +08:00
c0dc26de8e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-16 11:29:37 +02:00
996abd3fbe
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-16 11:08:29 +02:00
d12e938a70
Merge branch 'master' into ifdef_export_defines
2020-04-16 10:24:23 +02:00
e341eadfd9
Fix typo
2020-04-16 10:23:50 +02:00
69f8d47941
glTF2 support targetNames
2020-04-15 09:39:46 +01:00
e4ceccb42d
Merge branch 'master' into master
2020-04-12 15:58:25 +01:00
a14b5fb06f
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-10 08:44:19 +01:00
485d7ab52e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-10 08:44:18 +01:00
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
755f3748f1
Merge branch 'master' into master
2020-04-07 11:46:14 +01:00
9a11d91cb8
code reformattings.
2020-04-06 13:33:03 +02:00
131aed73b0
closes https://github.com/assimp/assimp/issues/2166 : add missing setter for metadata.
2020-04-06 11:16:16 +02:00
132ecae6f4
Merge branch 'master' into kimkulling_dev
2020-04-04 18:28:50 +02:00
956c57f18e
Merge branch 'master' into master
2020-04-03 13:42:59 +01:00
a07bf8b26f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-03 08:40:32 +01:00
d966f3394b
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-03 08:40:29 +01:00
c21a1ffffa
Remove comments to increase readability
2020-04-01 11:16:39 +02:00
a7208b02e0
Merge branch 'master' into assimp_gltf2_exporter
2020-04-01 08:42:48 +02:00
53990ffa42
Check for existed bone
2020-03-31 14:18:51 -07:00
87e2d3a54d
Added support for glTF2 sparse accessors.
...
Refactored Accessors, pulling out reusable bits between those
and sparse accessors' indices / values.
2020-03-31 11:28:26 +01:00
54419eb9a0
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-31 09:54:12 +01:00
806d81c919
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-31 09:54:01 +01:00
3ef46b0edd
Weights and bones count checks
2020-03-30 16:56:33 -07:00
5e93b9ea8b
Fixed bone splitting with excessive amount of bones with 0 weight
2020-03-30 12:42:32 -07:00
6973aea6da
fix compiler warnings.
2020-03-30 20:41:39 +02:00
4c177ad72e
fix possible warnings
2020-03-30 20:33:43 +02:00
d51b89f3ce
trigger build
2020-03-29 13:44:14 +02:00
b1165cff28
Merge branch 'master' into kimkulling_dev
2020-03-29 12:07:20 +02:00
222b145307
Merge branch 'master' into optimized_bonelimits
2020-03-29 12:54:07 +03:00
9b83d74830
apply code-conventions to unrealloader
2020-03-28 09:48:55 +01:00
27e1a20efe
Update 3DSConverter.cpp
...
Trigger build.
2020-03-27 20:46:32 +01:00
3a206a424d
Merge branch 'master' into kimkulling_dev
2020-03-27 18:25:13 +01:00
e543a58dfb
Update m3d.h
...
fix more alignment errors.
2020-03-27 18:23:22 +01:00
2cfdbe2d50
Update m3d.h
...
Fix alignment bug.
2020-03-27 16:27:07 +01:00
7a01061c3e
Update m3d.h
...
Try to fix build error.
2020-03-27 15:39:49 +01:00
60750161d5
Update m3d.h
...
replace assignment by memcpy.
2020-03-27 15:28:32 +01:00
855452831c
Merge branch 'master' into fbx_rotation_fix
2020-03-27 14:36:00 +02:00
32c59643f2
Update m3d.h
...
fix alignment issue.
2020-03-27 11:38:38 +01:00
80323b57bc
Update UnrealLoader.cpp
...
Fix static code analysis findings.
2020-03-27 11:30:40 +01:00
7a2bc5f8f3
Merge branch 'master' into optimized_bonelimits
2020-03-27 07:12:25 +02:00
69176ad425
Merge branch 'master' into optimized_bonelimits
2020-03-26 21:28:47 +02:00
7f521b4eb4
Merge branch 'master' into fbx_rotation_fix
2020-03-26 21:28:03 +02:00
609632c6a5
Added missing functionalities to C API.
...
The C API functions that have been added are the following:
Vector2:
- aiVector2AreEqual
- aiVector2AreEqualEpsilon
- aiVector2Add
- aiVector2Subtract
- aiVector2Scale
- aiVector2SymMul
- aiVector2DivideByScalar
- aiVector2DivideByVector
- aiVector2Length
- aiVector2SquareLength
- aiVector2Negate
- aiVector2DotProduct
- aiVector2Normalize
Vector3:
- aiVector3AreEqual
- aiVector3AreEqualEpsilon
- aiVector3LessThan
- aiVector3Add
- aiVector3Subtract
- aiVector3Scale
- aiVector3SymMul
- aiVector3DivideByScalar
- aiVector3DivideByVector
- aiVector3Length
- aiVector3SquareLength
- aiVector3Negate
- aiVector3DotProduct
- aiVector3CrossProduct
- aiVector3Normalize
- aiVector3NormalizeSafe
- aiVector3RotateByQuaternion
Matrix3x3:
- aiMatrix3FromMatrix4
- aiMatrix3FromQuaternion
- aiMatrix3AreEqual
- aiMatrix3AreEqualEpsilon
- aiMatrix3Inverse
- aiMatrix3Determinant
- aiMatrix3RotationZ
- aiMatrix3FromRotationAroundAxis
- aiMatrix3Translation
- aiMatrix3FromTo
Matrix4x4:
- aiMatrix4FromMatrix3
- aiMatrix4FromScalingQuaternionPosition
- aiMatrix4Add
- aiMatrix4AreEqual
- aiMatrix4AreEqualEpsilon
- aiMatrix4Inverse
- aiMatrix4Determinant
- aiMatrix4IsIdentity
- aiMatrix4DecomposeIntoScalingEulerAnglesPosition
- aiMatrix4DecomposeIntoScalingAxisAnglePosition
- aiMatrix4DecomposeNoScaling
- aiMatrix4FromEulerAngles
- aiMatrix4RotationX
- aiMatrix4RotationY
- aiMatrix4RotationZ
- aiMatrix4FromRotationAroundAxis
- aiMatrix4Translation
- aiMatrix4Scaling
- aiMatrix4FromTo
Quaternion:
- aiQuaternionFromEulerAngles
- aiQuaternionFromAxisAngle
- aiQuaternionFromNormalizedQuaternion
- aiQuaternionAreEqual
- aiQuaternionAreEqualEpsilon
- aiQuaternionNormalize
- aiQuaternionConjugate
- aiQuaternionMultiply
- aiQuaternionInterpolate
In addition, a const qualifier has been added to aiQuaterniont::Rotate to allow call to this method via a const aiQuaterniont pointer.
2020-03-26 13:08:40 -04:00
96c7c567e6
Merge branch 'master' into kimkulling_dev
2020-03-26 11:56:45 +01:00
3c9751ce0c
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-26 10:16:58 +00:00
ccd13436da
fix memory leak during export
2020-03-25 16:37:43 +01:00
14b8d1242b
Added pre and post rotation handling to FBXConverter::GenerateSimpleNodeAnim. Fixed quaternion interpolation flip. Cleaned code.
2020-03-25 08:20:31 +02:00
b962af93fc
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-24 21:35:22 +02:00
ec17aff6d6
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-24 11:56:44 +00:00
ef20cdc430
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-24 11:56:42 +00:00
2820edee54
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-24 11:56:38 +00:00
891b1d4b3f
Merge branch 'master' into fix_FBX_no_preservePivots_bug
2020-03-24 14:38:23 +08:00
046f50880f
{cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule
...
When libraries are included as submodules in large projects, having an option with a generic name like "BUILD_DOCS" is not very helpful. (e.g. one project I work on includes many libraries as submodules)
It can also clash with options from other libraries which can break things.
2020-03-23 12:35:32 -04:00
bb4bcb442a
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-23 10:35:06 +02:00
2006eeed85
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-23 08:07:25 +00:00
94da6d61a4
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-23 08:03:29 +00:00
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
973e38ad97
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-23 07:57:38 +00:00
f0243cc7f3
Changed AI_LMW_MAX_WEIGHTS*2 to 8 which is same thing.
2020-03-22 15:58:12 +02:00
c0ae9b6040
fix invalid check
2020-03-22 14:21:24 +01:00
68a9fa2df3
reformat unittests.
2020-03-22 12:13:09 +01:00
d5d30c898b
Optimized LimitBoneWeightsProcess. Added SmallVector to reduce heap allocations. Simplified algorithm and removed unnecessary copying.
2020-03-22 12:47:42 +02:00
4283e61189
fix clang-compiler warning: wrong move constructor.
2020-03-21 18:25:49 +01:00
089ab0693a
fix static-code-analysis check.
2020-03-21 18:03:35 +01:00
7d624e7f60
obj: add missing init.
2020-03-21 09:00:29 +01:00
9f7d9becb2
fix the linux build.
2020-03-21 08:56:49 +01:00
1529f9518f
Make file formatting comply with POSIX and Unix standards
...
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
b40769c395
try to fix linux build.2
2020-03-20 13:18:49 +01:00
7c3fd351d3
fix no preservePivots bug
2020-03-20 17:19:27 +08:00
ac3f08a4d8
fix 3rdparty warnings.
2020-03-20 09:49:36 +01:00
2ee948eb84
fix missing parthesis.
2020-03-19 17:07:21 +01:00
5b8e6832c3
add mssing move constructor.
2020-03-19 16:53:05 +01:00
de06c860ea
add missing constructor.
2020-03-19 16:20:55 +01:00
9ba014739a
fix compiler warning.
2020-03-19 15:25:34 +01:00
4d917c97bd
fix warnings detected in vs2017.
2020-03-19 12:58:41 +01:00
68f7f545a9
fix typo.
2020-03-19 11:09:20 +01:00
9aa5e3e04f
fix new vs2013 warnings.
2020-03-18 21:32:17 +01:00
097d2faeea
fix vs2013 specific warnings.
2020-03-18 19:31:30 +01:00
d1afd97ec2
fix 2 more warnings for vs2013.
2020-03-18 16:48:32 +01:00
017b3238ba
Update IFCReaderGen_2x3.h
...
Fix a typo
2020-03-18 16:20:38 +01:00
959446e416
Update IFCReaderGen_2x3.h
...
Disable warning
2020-03-18 15:52:16 +01:00
f17b04168f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-18 13:58:35 +01:00
f68c60c7c6
Update StepReaderGen.h
...
disable warning
2020-03-17 20:32:23 +01:00
a2fa19aa78
Merge branch 'master' into enable_vs_warning_all
2020-03-17 19:19:29 +01:00
a9e8f65941
fix the build - add misisng forward declaration for aiVector3t.
2020-03-16 10:50:07 +01:00
27c125ef4d
Add 2013-spcific compiler warning disabling statements.
2020-03-15 18:22:49 +01:00
856ca9f2dd
Fix static-code findings,
2020-03-15 12:16:17 +01:00
976091a6f6
ix compiler warning for pragma statements.
2020-03-15 11:47:05 +01:00
9e91a33d76
fix review findings.
2020-03-15 10:28:37 +01:00
8b6f95ec30
Obj: apply clang format.
2020-03-15 10:21:08 +01:00
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
0357333c81
fix all unittests.
2020-03-15 10:17:54 +01:00
255758e6ff
fix read for precision-depending data.
2020-03-14 11:16:44 +01:00
dc04759492
fix unittests part 2.
2020-03-13 17:00:14 +01:00
3c97447c9c
Merge branch 'master' into gltf2_blendshape_export
2020-03-13 13:26:08 +01:00
733e5343c8
export blendshape positions/normals in gltf2/glb2
2020-03-12 12:14:17 -07:00
b295fda22c
fix unittests part 1.
2020-03-12 17:38:42 +01:00
19b40397a9
fix misor findings.
2020-03-11 17:42:10 +01:00
3f75ef68ae
Assimp guarantees in its docs that mRootNode is never NULL.
...
glTF2Importer::ImportNodes therefore must always create a root node, or throw an exception.
A GLTF2 file is invalid without a scene, so the importer should throw in that case. For GLTF2 files with a scene without nodes, it should create an empty root node.
2020-03-11 15:47:05 +00:00
1bc7c710d6
Added a check to detect and prevent recursive references in GLTF2 files
2020-03-11 09:54:24 +00:00
84e060a816
Change: ExtractData throws exception instead of returning false if data is invalid.
...
Explanation: The return value of ExtractData is never checked anywhere in code. However if it returns false, outData remains uninitialized. All code using ExtractData assumes outData is initialized and proceeds to using it. I haven't encountered a real-life case where this goes wrong - but the simple fact that it can go wrong is a red flag. Instead of relying on every bit of code checking the return value and handling this properly, I think it makes much more sense to have ExtractData throw an exception. It obviously is an exceptional situation, and throwing makes sure that no code that doesn't explicitly handle such a scenario continues running and potentially causing harm.
2020-03-11 09:40:42 +00:00
69551e81ed
Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all
2020-03-11 10:15:25 +01:00
f8757322be
fix warnings
2020-03-11 09:43:55 +01:00
7e7555a91b
fix compiler warnings in tools and test-
2020-03-11 00:43:44 +01:00
02e5698a38
fix linker issues.
2020-03-09 22:49:32 +01:00
f3b6b78d4d
small refactorings.
2020-03-09 10:55:32 +01:00
e8d2b84017
clean all warnings for vs-2019
2020-03-08 21:24:01 +01:00
8b9abc58e7
ifdef the exporters as specifying harsher linker flags than what's in default CMake causes linking issues.
2020-03-04 17:15:09 -08:00
bb62249f0c
fix gltf2 exporter memory crash
2020-03-04 14:52:26 -08:00
0b227219b7
Merge branch 'master' into gltf2_broken_bones_count
2020-03-03 11:33:56 +01:00
920535165d
next fixed warnings
2020-03-01 13:15:45 +01:00
710dbba52d
Trimmed trailing whitespaces
2020-02-28 19:19:10 -08:00
496fcd35c1
Trimmed trailing whitespaces
2020-02-28 19:17:53 -08:00
5f35d62d61
Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0
2020-02-28 18:43:47 -08:00
22311883ce
Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop
2020-02-28 18:42:22 -08:00
03182c21b8
xml-migration amf - next steps.
2020-02-26 22:19:42 +01:00
919ae489fc
Merge branch 'master' into master
2020-02-25 23:32:31 +02:00
ae50c4ebdf
Add support for orthographic camera information and use in glTF2 importer. Fixes #3030 .
2020-02-25 14:45:00 +11:00
fb5b01958a
Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028
2020-02-25 11:03:07 +11:00
e4b2fd246d
Merge branch 'master' into remove-else-endif-constructs-cmake-files
2020-02-24 20:08:17 +01:00
28f4b95ff5
Merge branch 'master' into master
2020-02-24 21:05:51 +02:00
edfaaed56f
Removed uneeded expression in else() and endif() constructs.
...
The following changes were tested against building with a master copy.
For a more detailed report, please read the followings below:
The flags that were checked were the ones checked by default + the following:
ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES
The list of compilable projects in Visual Studio were the following:
- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic
The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.
UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004 .
2020-02-23 07:09:35 -05:00
f28b087d16
small improvements in the CMakeLists.txt file
...
If ASSIMP_NO_EXPORT is not defined:
- don't add the macro for the exporters
- don't include the files for all the exporter
- don't display any messages about what exporters are enabled or not
2020-02-21 20:17:38 +02:00
3f5136b7b2
Merge branch 'master' into master
2020-02-19 21:52:57 +01:00
4de0237167
small fix
2020-02-18 21:55:35 +02:00
a5524ffcd9
more changes
2020-02-18 19:02:14 +02:00
ad52c5c5f6
.clear in destructor is redundant
2020-02-18 18:56:09 +02:00
bf85fc1386
small changes
2020-02-18 18:50:48 +02:00
016c0a8665
small changes
2020-02-18 18:42:59 +02:00
d0922230a9
fixed the = default on the destructor
2020-02-18 18:24:52 +02:00
a65bac27e9
fixed the make_unique
2020-02-18 18:01:53 +02:00
6e13381bdb
next warnings.
2020-02-18 14:41:19 +01:00
22118dff1d
Merge branch 'master' into enable_vs_warning_all
2020-02-16 15:37:48 +01:00
c2bfbdacf4
fix more warnings.
2020-02-16 15:37:20 +01:00
ec3a5620d0
Update AssxmlExporter.cpp
...
Fix the build.
2020-02-16 15:04:18 +01:00
ada4f51d5b
Merge branch 'master' into kimkulling_dev
2020-02-16 13:10:41 +01:00
024b5e60bc
Merge remote-tracking branch 'origin/master'
2020-02-15 23:29:26 +02:00
5c99d6a864
very small changes
...
- FIND_PACKAGE(DirectX) is already used in the samples and assimp tool cmake files - so is not needed in the main cmake fil
- other small changes
2020-02-15 23:29:04 +02:00
00a104efde
Merge branch 'master' into master
2020-02-14 20:58:13 +01:00
bdd5e52176
Merge branch 'master' into search-invalid-textures-missing-texture-types
2020-02-14 18:04:30 +01:00
1473c6616b
Merge branch 'master' into master
2020-02-14 12:56:14 +01:00
d662b25b17
Merge branch 'master' into master
2020-02-14 13:40:15 +02:00
d04df3e7c5
A bug when importing multiple gltf files
...
meshOffsets are not cleared when importing multiple gltf files
2020-02-14 08:41:55 +01:00
523e6c9f73
Merge branch 'master' into gltf-camera-pos
2020-02-14 08:21:54 +01:00
b62bd38c71
Fix: GLTF animation works on RTS not matrix; fix matrix related bug.
2020-02-14 02:11:12 +00:00
56a71f22e1
Merge branch 'master' into master
2020-02-14 01:04:46 +02:00
25feb77982
more minor changes
2020-02-13 00:38:56 +02:00
6f1870681b
reduced the scope of iStep variable
2020-02-13 00:27:30 +02:00
24cdb1f221
revert small change
2020-02-13 00:21:04 +02:00
6f53e8b43b
Merge branch 'master' into master
2020-02-13 00:14:20 +02:00
fc4dd6455a
minor code improvements for the obj code
...
- make use of range for loops
- make use of empty() method for the std::vector
- removed unnecessary std::string initialization
- use ' ' instead of " " for the find methods (should be "faster")
- simplified some function
- make use of emplace_back instead of push_back (should be "faster")
- other small changes
2020-02-13 00:10:07 +02:00
f5af791633
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-12 17:58:00 +01:00
47fc3f2627
Update M3DImporter.cpp
...
Fix a memoryleak.
2020-02-12 14:54:00 +01:00
1c13c793f0
Merge branch 'master' into master
2020-02-11 22:00:22 +01:00
50334086cf
Added missing texture types when searching for invalid textures.
2020-02-11 11:42:13 -05:00
58990d4e3f
Update FBXParser.cpp
...
add missing brackets.
2020-02-10 23:59:52 +01:00
5e979d72c9
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-02-10 23:59:13 +01:00
471f9b23c9
Merge branch 'master' into master
2020-02-10 21:37:01 +01:00
8fd053315c
Update ArmaturePopulate.cpp
...
- Introduce tabs width of 4.
- Add missing brackets
- Use c++ comment blocks
2020-02-09 11:14:42 +01:00
407c550240
Merge branch 'master' into master
2020-02-09 11:05:35 +01:00
af9705e3d1
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-02-07 11:52:00 +01:00
acf57bdb13
Merge branch 'master' into master
2020-02-06 22:58:19 +01:00
8c09cd2ef3
Fixed TextureTypeToString defined multiple times.
...
- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 missing values in TextureTypeToString.
- Added 6 missing aiTextureType enum values in assimp_cmd/Info.cpp.
2020-02-06 13:19:01 -05:00
b33272b1c8
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-02-06 14:39:09 +01:00
29603128f4
Fixed invalid armature node population when there's mesh on a node with the same name as the bone
2020-02-06 10:28:38 +01:00
979153522c
xml-migration: migration of XGLImporter.
2020-02-05 22:51:39 +01:00
18c01a023c
Use the translation matrix in gltf2 cameras for aiCamera.mPosition
2020-02-05 21:24:54 +00:00
8af0229e0d
In "ByVertice" case tempData.size() needs to be mapping_offsets.size(), not vertex_count
2020-02-05 14:40:35 +00:00
f00256d185
Merge branch 'master' into rename-writedumb-to-writedump
2020-02-05 13:58:09 +01:00
eb1d25631b
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-05 11:12:57 +00:00
ec024085ab
Merge branch 'FBXMeshGeometry_checksizes_fix' of https://github.com/ms-maxvollmer/assimp into FBXMeshGeometry_checksizes_fix
2020-02-05 11:08:00 +00:00
cb55e2658d
Removed unnecessary checks that may result in false positives rejecting valid models
2020-02-05 11:07:39 +00:00
1a8d5667b6
xml-migration: migrate shared code from irr-loader.
2020-02-04 20:47:20 +01:00
bd2ffc8d58
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
2020-02-03 21:19:30 +01:00
c1fcee9c5a
XMl-Migration: Migration of IrrMesh.
2020-02-03 21:19:03 +01:00
ad286a8ab1
Merge branch 'master' into fix_clang_warnings
2020-02-03 19:07:02 +01:00
8e009c3d0c
Update MDLLoader.cpp
...
fix a tab.
2020-02-03 19:06:36 +01:00
2d5c28ac46
Merge branch 'master' into scene-combiner-memory-leak
2020-02-02 20:43:52 +01:00
99175e3eaf
Merge branch 'master' into master
2020-02-01 19:26:52 +01:00
4862d11807
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-01 13:25:32 +01:00
d6567e606e
Fixed wrong changes applied during merge.
2020-01-31 18:14:26 -05:00
3386e9ea58
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-31 16:55:45 -05:00
ede860173e
Fixed mValues allocated twice.
...
mValues is already allocated in aiMetadata::Alloc().
2020-01-31 16:43:20 -05:00
9a971ffeac
Merge branch 'master' into master
2020-01-31 19:12:02 +01:00
0269000884
Update glTF2Exporter.cpp
...
Replacing tabs by spaces.
2020-01-31 19:11:36 +01:00
187b74355b
Update glTFImporter.cpp
...
Replace tabs by spaces.
2020-01-31 19:08:04 +01:00
0af44fb3e8
Update glTFExporter.cpp
...
Replacing tabs by spaces.
2020-01-31 19:06:56 +01:00
ca614a7419
Merge branch 'master' into master
2020-01-31 14:29:39 +01:00
e434c63c31
Fixed what kimkulling broke
2020-01-31 14:20:23 +01:00
bbe6f7f213
Fixed a bunch of clang warnings
...
1. Fix misleading indentation warnings.
2. Fix creating a temporary const copy when iterating over a map (thanks to range analysis warnings)
3. Fix creating a copy when iterating over a range without reference qualifier (also thanks to range analysis warnings)
2020-01-30 18:42:30 -05:00
2c1c1d846e
Renamed WriteDumb.cpp to WriteDump.cpp
...
This includes as well changes to places referencing WriteDumb.cpp.
2020-01-30 16:40:34 -05:00
53c394179c
Merge branch 'master' into refactor-assxml-and-xml-dump-writer
2020-01-30 16:33:24 +01:00
dc01f99fed
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-01-30 09:20:14 +00:00
feeb875453
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-01-30 09:20:08 +00:00
a2ef0b5bd5
Update M3DImporter.cpp
...
Fix some review finding:
- Add missing brackets to make code more readable
- fix scope of variables
2020-01-30 10:00:43 +01:00
605336832f
Update M3DImporter.cpp
...
Add missing brackets
2020-01-30 09:47:39 +01:00
0273ffc367
Merge branch 'master' into master
2020-01-30 09:46:41 +01:00
cb623f8b74
Merge branch 'master' into master
2020-01-29 22:24:48 +01:00
398a8f757e
Additional checks on invalid input
2020-01-29 22:08:34 +01:00
ff168d7bc0
Refactored Assxml exporter and dump xml writer.
...
- Moved AssxmlExporter serialization code in a new file AssxmlFileWriter.cpp/h
- Added new files to CMakeLists.txt
- Replaced string format specifiers %i by %u to match argument type.
- Made a few changes in WriteDumb.cpp to call the new DumpSceneToAssxml function.
2020-01-29 13:44:51 -05:00
9e46fca9a9
Added missing checks for tempData and uvIndices sizes in all cases
2020-01-29 15:06:48 +00:00
0d672efa90
Check input token length before copy
2020-01-29 15:04:26 +00:00
6c95ee145c
Merge branch 'master' into kimkulling-patch-1
2020-01-29 14:37:32 +01:00
194d31002d
Import/export of embedded texture names for the glTF/glTF2 format
2020-01-29 14:04:41 +01:00
e40df80d0e
Merge branch 'master' into master
2020-01-29 10:57:06 +01:00
81bc7825d1
Potentially fixed strncpy warning by Coverity.
2020-01-28 14:02:09 -05:00
5f30d4c0f8
Added missing cmd writting.
2020-01-28 12:30:09 -05:00
20388d6a4f
Refactored Assbin exporter and assimp_cmd binary serialization functions.
...
- Renamed AssimpExport to AssimpFileWriter.
- Moved AssimpFileWriter to it's own file.
- Added a try catch in WriteBinaryDump to fix a case with memory leak.
- Replaced calls to WriteBinaryDump with AssimpFileWriter.
- Added new AssimpFileWriter files to CMakeLists.txt.
2020-01-28 09:55:05 -05:00
27449f17ca
Merge branch 'master' into master
2020-01-28 14:13:29 +01:00
02df65d541
Merge branch 'master' into pugi_xml
2020-01-28 13:13:47 +01:00
21e4632b99
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-27 18:01:24 -05:00
16d71908d7
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-27 18:01:03 -05:00
00ad892a49
xml: last changes.
2020-01-27 23:54:59 +01:00
0cb236bae3
next steps.
2020-01-27 22:18:48 +01:00
8ef106e185
xml-migration: introduce xmlnode.
2020-01-27 22:11:27 +01:00
6a471b4390
xml-migration: next steps.
2020-01-27 22:10:42 +01:00
4337c07e4b
Remove explicit setting of macos install_name
...
Use CMake default behaviour for libassimp
Fixes #2961
2020-01-27 17:08:56 +00:00
5d5a4faf47
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-25 13:35:14 -05:00
5ab67f6491
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-25 13:34:59 -05:00
48bb2978af
Added support to load HL1 MDL external texture files directly.
2020-01-24 13:14:37 -05:00
e093066a2c
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-24 07:22:59 -05:00
b9ae88f200
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-24 07:20:03 -05:00
57c735cdca
Merge branch 'master' into master
2020-01-24 11:30:59 +01:00
770c822621
Updated places to achFormatHint referencing array size.
2020-01-23 15:26:49 -05:00
02acb3f8c2
Merge branch 'master' into pugi_xml
2020-01-23 21:26:04 +01:00
11f49f85c4
try to migrate AMF
2020-01-23 21:25:25 +01:00
kimkulling
Kim Kulling
ywang
Paul Arden
Alec
FRICOTEAUX
Ryan Styrczula
Kevin Shepherd
Malcolm Tyrrell
Matias Kangasjärvelä
Jeremy Cytryn
hoshiryu
Sercan Degirmenci
RichardTea
kkulling
Rafał Mikrut
qarmin
luca
Inho Lee
Hehongyuanlove
Timur Umayev
György Straub
Max Vollmer (Microsoft Havok)
György Straub
Alexey Medvedev
György Straub
Ville Ruusutie
Marc-Antoine Lortie
simon chen
Andy Maloney
Aaron Franke
chenmou.cm
Max Vollmer
Sebastian Matusik
Adrian Iusca
iamAdrianIusca
Hui.Du
Tomas Mariancik
Luke Lau
Marc-Antoine Lortie
Zoltan Baldaszti
bzt
Hanif Bin Ariffin
Loïc