Adrian Iusca
5ec896af49
Merge branch 'master' into master
2020-04-21 20:33:29 +03:00
Kim Kulling
f71b332ed1
Update glTF2Asset.inl
...
fix VS-compiler warning.
2020-04-19 21:14:47 +02:00
Kim Kulling
e3563212d7
Merge branch 'master' into master
2020-04-19 21:13:12 +02:00
Hehongyuanlove
9c52fd7633
Update D3MFExporter.cpp
2020-04-17 12:58:41 +08:00
Hehongyuanlove
e9a72a5053
repair formate 3MF
2020-04-17 12:38:07 +08:00
Hehongyuanlove
3bbc8e76bd
Rgba2Hex to repair rgba(1,1,1,1)
2020-04-17 12:34:05 +08:00
Kim Kulling
5eeea82793
Merge branch 'master' into master
2020-04-16 11:54:57 +02:00
Kim Kulling
c0dc26de8e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-16 11:29:37 +02:00
Kim Kulling
996abd3fbe
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-16 11:08:29 +02:00
Kim Kulling
d12e938a70
Merge branch 'master' into ifdef_export_defines
2020-04-16 10:24:23 +02:00
Kim Kulling
e341eadfd9
Fix typo
2020-04-16 10:23:50 +02:00
Timur Umayev
69f8d47941
glTF2 support targetNames
2020-04-15 09:39:46 +01:00
Max Vollmer (Microsoft Havok)
a14b5fb06f
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-10 08:44:19 +01:00
Max Vollmer (Microsoft Havok)
485d7ab52e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-10 08:44:18 +01:00
Kim Kulling
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
Kim Kulling
9a11d91cb8
code reformattings.
2020-04-06 13:33:03 +02:00
Kim Kulling
131aed73b0
closes https://github.com/assimp/assimp/issues/2166 : add missing setter for metadata.
2020-04-06 11:16:16 +02:00
Kim Kulling
132ecae6f4
Merge branch 'master' into kimkulling_dev
2020-04-04 18:28:50 +02:00
Max Vollmer (Microsoft Havok)
a07bf8b26f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-03 08:40:32 +01:00
Max Vollmer (Microsoft Havok)
d966f3394b
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-03 08:40:29 +01:00
Kim Kulling
c21a1ffffa
Remove comments to increase readability
2020-04-01 11:16:39 +02:00
Kim Kulling
a7208b02e0
Merge branch 'master' into assimp_gltf2_exporter
2020-04-01 08:42:48 +02:00
Max Vollmer (Microsoft Havok)
54419eb9a0
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-31 09:54:12 +01:00
Max Vollmer (Microsoft Havok)
806d81c919
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-31 09:54:01 +01:00
Kim Kulling
6973aea6da
fix compiler warnings.
2020-03-30 20:41:39 +02:00
Kim Kulling
4c177ad72e
fix possible warnings
2020-03-30 20:33:43 +02:00
Kim Kulling
d51b89f3ce
trigger build
2020-03-29 13:44:14 +02:00
Kim Kulling
b1165cff28
Merge branch 'master' into kimkulling_dev
2020-03-29 12:07:20 +02:00
Kim Kulling
9b83d74830
apply code-conventions to unrealloader
2020-03-28 09:48:55 +01:00
Kim Kulling
27e1a20efe
Update 3DSConverter.cpp
...
Trigger build.
2020-03-27 20:46:32 +01:00
Kim Kulling
3a206a424d
Merge branch 'master' into kimkulling_dev
2020-03-27 18:25:13 +01:00
Kim Kulling
e543a58dfb
Update m3d.h
...
fix more alignment errors.
2020-03-27 18:23:22 +01:00
Kim Kulling
2cfdbe2d50
Update m3d.h
...
Fix alignment bug.
2020-03-27 16:27:07 +01:00
Kim Kulling
7a01061c3e
Update m3d.h
...
Try to fix build error.
2020-03-27 15:39:49 +01:00
Kim Kulling
60750161d5
Update m3d.h
...
replace assignment by memcpy.
2020-03-27 15:28:32 +01:00
Ville Ruusutie
855452831c
Merge branch 'master' into fbx_rotation_fix
2020-03-27 14:36:00 +02:00
Kim Kulling
32c59643f2
Update m3d.h
...
fix alignment issue.
2020-03-27 11:38:38 +01:00
Kim Kulling
80323b57bc
Update UnrealLoader.cpp
...
Fix static code analysis findings.
2020-03-27 11:30:40 +01:00
Ville Ruusutie
7f521b4eb4
Merge branch 'master' into fbx_rotation_fix
2020-03-26 21:28:03 +02:00
Marc-Antoine Lortie
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
Kim Kulling
96c7c567e6
Merge branch 'master' into kimkulling_dev
2020-03-26 11:56:45 +01:00
Max Vollmer (Microsoft Havok)
3c9751ce0c
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-26 10:16:58 +00:00
kimkulling
ccd13436da
fix memory leak during export
2020-03-25 16:37:43 +01:00
napina
14b8d1242b
Added pre and post rotation handling to FBXConverter::GenerateSimpleNodeAnim. Fixed quaternion interpolation flip. Cleaned code.
2020-03-25 08:20:31 +02:00
Max Vollmer (Microsoft Havok)
ec17aff6d6
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-24 11:56:44 +00:00
Max Vollmer (Microsoft Havok)
ef20cdc430
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-24 11:56:42 +00:00
Max Vollmer (Microsoft Havok)
2820edee54
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-24 11:56:38 +00:00
simon chen
891b1d4b3f
Merge branch 'master' into fix_FBX_no_preservePivots_bug
2020-03-24 14:38:23 +08:00
Andy Maloney
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
Max Vollmer (Microsoft Havok)
2006eeed85
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-23 08:07:25 +00:00