Commit Graph

8841 Commits

Author SHA1 Message Date
Kim Kulling
323686f878 Fix funding 2020-03-31 19:59:02 +02:00
Kim Kulling
17d8aa008e Merge pull request #3112 from assimp/issue_3104
closes https://github.com/assimp/assimp/pull/3104:
2020-03-31 19:46:24 +02:00
Kim Kulling
f5324e23ef closes https://github.com/assimp/assimp/pull/3104: remove unused includes. 2020-03-31 19:35:19 +02:00
György Straub
773107b015 Merge branch 'master' into master 2020-03-31 14:09:13 +01:00
Ville Ruusutie
f072d26c35 Merge branch 'master' into optimized_bonelimits 2020-03-31 15:02:52 +03:00
Kim Kulling
a691e8cd3e Disable terragen test. 2020-03-31 13:49:59 +02:00
Kim Kulling
bc3de4079a Disable terragen test. 2020-03-31 13:49:22 +02:00
György Straub
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
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
51438bff87 Merge branch 'master' into cmake_targets_determine_lib_path 2020-03-31 10:31:31 +02:00
Alexey Medvedev
3ef46b0edd Weights and bones count checks 2020-03-30 16:56:33 -07:00
Kim Kulling
e445eba674 Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev 2020-03-30 21:53:46 +02:00
Kim Kulling
7f63a4b0d7 add terragen importer unittest. 2020-03-30 21:53:25 +02:00
Kim Kulling
a57edf2e99 Merge branch 'master' into kimkulling_dev 2020-03-30 21:52:12 +02:00
Kim Kulling
0d9bccbcca Merge pull request #3098 from assimp/kimkulling-patch-5
add windows build
2020-03-30 21:51:51 +02:00
Alexey Medvedev
5e93b9ea8b Fixed bone splitting with excessive amount of bones with 0 weight 2020-03-30 12:42:32 -07:00
Kim Kulling
bb046a3f80 fix typo 2020-03-30 21:41:03 +02:00
Kim Kulling
c2cbac979e Select releyase config 2020-03-30 21:10:23 +02:00
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