Commit Graph

786 Commits (ba09e1ef94176a97766203f36a850c6fe9c58c8c)

Author SHA1 Message Date
Malcolm Tyrrell 14692368d5 Same for LogDebug -> LogVerboseDebug 2020-05-18 11:55:14 +01:00
Malcolm Tyrrell df2630d0e8 Change in comment. 2020-05-18 11:45:13 +01:00
Malcolm Tyrrell e11d78596f Use verbose debug logging in certain places 2020-05-15 17:26:17 +01:00
Malcolm Tyrrell 5e0136d737 Add concept of verboseDebug 2020-05-15 17:23:07 +01:00
Malcolm Tyrrell 6be0ce1ec9 Initial pass at adding logging 2020-05-15 17:21:45 +01:00
Kim Kulling 2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id 2020-05-13 20:24:53 +02:00
RichardTea fa1d2f09db
Merge branch 'master' into bug-3177-dae-geo-id 2020-05-05 09:33:48 +01:00
Kim Kulling ddee1b1ddb
Merge branch 'master' into aaronfranke-file-formatting 2020-05-05 10:21:46 +02:00
kkulling 4e16716924 Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting 2020-05-05 10:17:52 +02:00
Kim Kulling 6afb72216c
Compile constructor of aiMetadataType only for c++ 2020-05-04 20:50:44 +02:00
Kim Kulling 3b4a9812e5 add init list for metadatatype. 2020-05-04 20:40:08 +02:00
kimkulling 5c9a08e375 closes https://github.com/assimp/assimp/issues/3190 : fix leak. 2020-05-04 15:36:54 +02:00
RichardTea 6e200cb0d3 Merge branch 'master' into bug-3177-dae-geo-id
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
Kim Kulling 3b06f57150 add missing inclde + 2020-05-02 21:11:47 +02:00
RichardTea 3e2dd186d1
Merge branch 'master' into bug-3177-dae-geo-id 2020-05-01 12:08:12 +01:00
RichardTea 5b9f207f1f ColladaExporter cleanup
Namespace, NULL and includes
2020-05-01 11:54:34 +01:00
Kim Kulling 52122a9900 Merge branch 'master' into kimkulling_dev 2020-05-01 10:49:03 +02:00
Kim Kulling da2bf5c7a4 fix wrong size 2020-04-29 21:13:46 +02:00
Kim Kulling c6131ce38a scenecombiner: fix leak. 2020-04-29 20:43:23 +02:00
Kim Kulling fd555a1349 review findings. 2020-04-29 20:33:37 +02:00
RichardTea 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
Kim Kulling bafb8e3189 closes https://github.com/assimp/assimp/issues/3165: remove deprecated code whch causes compiler warning. 2020-04-26 08:59:52 +02:00
Kim Kulling 9b1759dcc2
Merge branch 'master' into migenius-migenius-rsws53-mig-2 2020-04-22 19:59:53 +02:00
Kim Kulling 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
Kim Kulling 232761be02
Fix another typo 2020-04-21 16:09:11 +02:00
Kim Kulling 843ca6e386
Fix typo 2020-04-21 15:50:17 +02:00
Kim Kulling 428b91154a
Adapt smallvector
- Add doc ( public header )
- Fix type error
2020-04-21 08:59:40 +02:00
Kim Kulling 788f2f244e
Adapt code
- Reformatting based on clang-format rules
- Add usage of size_t instead of unsigned int for sizes
- Fix typo in naming
2020-04-21 08:50:51 +02:00
Kim Kulling e0f6eb09e6
Merge branch 'master' into optimized_bonelimits 2020-04-17 20:37:28 +02:00
Kim Kulling e299f71cfe
Adapt the formatting 2020-04-17 16:16:28 +02:00
Hehongyuanlove f80bdc5b71
Update StringUtils.h 2020-04-17 12:57:33 +08:00
Hehongyuanlove 59e32a5ad9
Update StringUtils.h 2020-04-17 12:51:18 +08:00
Hehongyuanlove cc3760aff1
Update StringUtils.h 2020-04-17 12:50:49 +08:00
Hehongyuanlove 3154cec79c
Rgba2Hex add 2020-04-17 12:31:07 +08:00
Kim Kulling b2a547b817
Add doc 2020-04-14 19:07:41 +02:00
Marc-Antoine Lortie ac16a857ff Merge remote-tracking branch 'upstream/master' into add-tests-to-c-api-2 2020-04-13 09:08:45 -04:00
Kim Kulling 79af2b1a5c
Merge branch 'master' into kimkulling_dev 2020-04-09 19:55:45 +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 4c177ad72e fix possible warnings 2020-03-30 20:33:43 +02:00
Marc-Antoine Lortie f9a7d2abf1 Added C API tests. 2020-03-27 07:59:10 -04:00
Ville Ruusutie 7a2bc5f8f3
Merge branch 'master' into optimized_bonelimits 2020-03-27 07:12:25 +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
napina bb4bcb442a Merge branch 'master' of https://github.com/assimp/assimp 2020-03-23 10:35:06 +02:00
napina d5d30c898b Optimized LimitBoneWeightsProcess. Added SmallVector to reduce heap allocations. Simplified algorithm and removed unnecessary copying. 2020-03-22 12:47:42 +02:00
Kim Kulling 9f7d9becb2 fix the linux build. 2020-03-21 08:56:49 +01:00
Aaron Franke 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
kimkulling 5b8e6832c3 add mssing move constructor. 2020-03-19 16:53:05 +01:00
kimkulling 4de4c34fb2 ry to fix 2013-specific warnings in mesh.h 2020-03-19 15:10:46 +01:00
kimkulling 4d917c97bd fix warnings detected in vs2017. 2020-03-19 12:58:41 +01:00
Kim Kulling 9aa5e3e04f fix new vs2013 warnings. 2020-03-18 21:32:17 +01:00