Kim Kulling
6bae5e2a40
Fix unittest execution
2020-03-30 20:44:16 +02: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
RichardTea
d276044ad3
Merge remote-tracking branch 'upstream/master'
2020-03-30 13:38:54 +01:00
Ville Ruusutie
419b0a1ddc
Merge branch 'master' into optimized_bonelimits
2020-03-29 21:48:38 +03:00
Kim Kulling
22d6b761e6
Merge branch 'master' into kimkulling_dev
2020-03-29 18:42:43 +02:00
Kim Kulling
cdc580b947
add windows build
2020-03-29 18:39:55 +02:00
Kim Kulling
b6b3b39bb3
Merge pull request #3096 from assimp/kimkulling-patch-3
...
Add mac
2020-03-29 18:36:26 +02:00
Kim Kulling
5bc2e84c90
Add mac
2020-03-29 17:55:28 +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
Ville Ruusutie
222b145307
Merge branch 'master' into optimized_bonelimits
2020-03-29 12:54:07 +03:00
Kim Kulling
4796ad3d5e
Merge pull request #3086 from napina/fbx_rotation_fix
...
Fixed FBX simple anim pre/post rotation handling
2020-03-29 10:55:55 +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
Marc-Antoine Lortie
f9a7d2abf1
Added C API tests.
2020-03-27 07:59:10 -04: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
7a2bc5f8f3
Merge branch 'master' into optimized_bonelimits
2020-03-27 07:12:25 +02:00
Kim Kulling
bd5b7ecab9
Merge pull request #3089 from malortie/add-missing-c-api-functions
...
Added missing functionalities to C API.
2020-03-26 20:38:22 +01:00
Ville Ruusutie
69176ad425
Merge branch 'master' into optimized_bonelimits
2020-03-26 21:28:47 +02: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
Kim Kulling
da8b174ecb
Merge pull request #3069 from ms-maxvollmer/GLTF2_guarantee_rootnode_fix
...
GLTF2: Fixed behavior of glTF2Importer::ImportNodes
2020-03-26 11:12:33 +01: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
napina
b962af93fc
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-24 21:35:22 +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
Kim Kulling
fb32072391
Merge branch 'master' into cmake_targets_determine_lib_path
2020-03-24 11:56:17 +01:00
Kim Kulling
16725cc3f6
Merge pull request #3075 from aimoonchen/fix_FBX_no_preservePivots_bug
...
fix FBX no preservePivots bug
2020-03-24 11:55:44 +01:00
simon chen
891b1d4b3f
Merge branch 'master' into fix_FBX_no_preservePivots_bug
2020-03-24 14:38:23 +08:00
Kim Kulling
da04a8e39a
Merge pull request #3083 from asmaloney/cmake-submodule
...
{cmake} Prefix options to avoid pollution when included as a submodule
2020-03-23 19:56:09 +01: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
napina
bb4bcb442a
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-23 10:35:06 +02:00
Max Vollmer (Microsoft Havok)
2006eeed85
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-23 08:07:25 +00:00
Max Vollmer (Microsoft Havok)
94da6d61a4
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-23 08:03:29 +00:00
Kim Kulling
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
Max Vollmer (Microsoft Havok)
973e38ad97
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-23 07:57:38 +00:00
Kim Kulling
2e65b11e96
Merge branch 'master' into sample-simpleopengl-minor-improvements
2020-03-22 16:56:59 +01:00
Kim Kulling
7e5a0acc48
Merge pull request #3012 from assimp/enable_vs_warning_all
...
[WIP] Enable all warnings for Visual Studio.
2020-03-22 16:56:11 +01:00