v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,493 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

8493 Commits (755f3748f1ca6d5a03a1ef97d39a7c067f9ca227)

Author SHA1 Message Date
György Straub 755f3748f1
Merge branch 'master' into master 2020-04-07 11:46:14 +01:00
Kim Kulling b59e6a2df4
Merge pull request #3129 from malortie/fix-assimp-viewer-w4-compile-warnings 
Fixed /W4 compile warnings in Assimp viewer.
 2020-04-07 11:25:28 +02:00
Kim Kulling c79c6f5ae7
Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings 2020-04-07 11:09:25 +02:00
Kim Kulling 0f3b196afc
Merge pull request #3126 from vmatare/master 
use GNUInstallDirs where possible (master branch)
 2020-04-07 11:08:55 +02:00
Kim Kulling 06f148defc
Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings 2020-04-06 20:59:36 +02:00
Kim Kulling 09eba0f039
Merge branch 'master' into master 2020-04-06 20:42:41 +02:00
Kim Kulling 4eb129fa6d
Merge pull request #3137 from assimp/issue_2166 
closes https://github.com/assimp/assimp/issues/2166:
 2020-04-06 20:42:08 +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
György Straub b7d73dfa69
Merge branch 'master' into master 2020-04-05 06:03:19 +01:00
Kim Kulling a73fd6c84c
Update MessageProc.cpp 
I guess Turol meant this change.
 2020-04-04 18:24:19 +02:00
Marc-Antoine Lortie 1b0a0675dc Applied review requested changes - renamed _data to data. 2020-04-04 10:32:29 -04:00
Marc-Antoine Lortie 1cb564aa4b Fixed /W4 compile warnings in Assimp viewer. 2020-04-03 14:36:44 -04:00
Kim Kulling 085212e58a
Merge pull request #3127 from malortie/fix-sample-simpletextureddirectx11-w4-compile-warnings 
Fixed /W4 compile warnings in sample SimpleTexturedDirectx11.
 2020-04-03 18:56:34 +02:00
Marc-Antoine Lortie 4bae1d2596 Fixed warning C4018: '<': signed/unsigned mismatch 2020-04-03 10:07:44 -04:00
Marc-Antoine Lortie e67ddd0ca1 Fixed /W4 compile warnings in sample SimpleTexturedDirectx11. 2020-04-03 09:43:01 -04:00
György Straub 956c57f18e
Merge branch 'master' into master 2020-04-03 13:42:59 +01:00
Victor Mataré 9fb81c3be6 use GNUInstallDirs where possible 
Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and
disable redefining FHS-mandated install locations via user-editable
ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary,
Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables.
 2020-04-03 00:44:44 +02:00
Kim Kulling 6b68c0ee45
Merge pull request #3124 from malortie/fix-sample-simpleogl-w4-compile-warnings 
Fixed /W4 compile warnings in sample SimpleOpenGL.
 2020-04-02 21:02:14 +02:00
Marc-Antoine Lortie c0273a2bb4
Merge branch 'master' into fix-sample-simpleogl-w4-compile-warnings 2020-04-02 14:43:24 -04:00
Kim Kulling 210f40e984
Merge pull request #3113 from thomasbiang/assimp_gltf2_exporter 
Fix gltf2 exporter memory crash
 2020-04-02 20:39:59 +02:00
Marc-Antoine Lortie 56e2f2e37e Fixed /W4 compile warnings in sample SimpleOpenGL. 2020-04-02 14:19:16 -04:00
Kim Kulling c21a1ffffa
Remove comments to increase readability 2020-04-01 11:16:39 +02:00
György Straub 5205c4a422
Merge branch 'master' into master 2020-04-01 08:02:34 +01:00
Kim Kulling a7208b02e0
Merge branch 'master' into assimp_gltf2_exporter 2020-04-01 08:42:48 +02:00
Kim Kulling bfedc05045
Merge pull request #3117 from malortie/remove-unneeded-headers 
Removed unneeded SceneDiffer.h includes.
 2020-04-01 08:35:40 +02:00
Marc-Antoine Lortie 06e40b9820 Removed unneeded SceneDiffer.h includes. 2020-03-31 17:22:56 -04:00
Kim Kulling 0af06d3f0c
Merge pull request #3114 from assimp/kimkulling-patch-5 
Fix funding
 2020-03-31 20:17:56 +02:00
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
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
Kim Kulling 0d9bccbcca
Merge pull request #3098 from assimp/kimkulling-patch-5 
add windows build
 2020-03-30 21:51:51 +02: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 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 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
Ville Ruusutie 855452831c
Merge branch 'master' into fbx_rotation_fix 2020-03-27 14:36:00 +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 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 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
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) ef20cdc430
Merge branch 'master' into GLTF2_guarantee_rootnode_fix 2020-03-24 11:56:42 +00: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