Yingying Wang
|
60e8146b9f
|
fix wrong target idx when importing
|
2020-05-05 12:51:40 -07:00 |
RichardTea
|
56a4e61533
|
Collada: Don't copy the scene when exporting
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
|
2020-05-05 10:16:13 +01:00 |
|
RichardTea
|
6e447b2c44
|
Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes
|
2020-05-05 09:52:08 +01:00 |
|
RichardTea
|
d1ae6ac77a
|
Fix typo in <visual_scene>
Swapped Id and Name
|
2020-05-05 09:51:41 +01: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
|
bf95d1da7c
|
fix conversion
|
2020-05-04 21:48:46 +02:00 |
|
RichardTea
|
8e73984a11
|
Collada Root Nodes aren't allowed to have meshes
Create a null parent node instead
|
2020-05-04 17:47:09 +01: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 |
|
RichardTea
|
ea917bd4ae
|
Move Collada into AssetLib folder
Should make the merge easier
|
2020-05-04 13:54:49 +01:00 |
Kim Kulling
|
91fa9a102b
|
closes https://github.com/assimp/assimp/issues/3181: fix typo for light type.
|
2020-05-03 12:17:32 +02:00 |
|
Kim Kulling
|
3b06f57150
|
add missing inclde +
|
2020-05-02 21:11:47 +02:00 |
|
Kim Kulling
|
514593548d
|
add assert-test for nullptr.
|
2020-05-02 21:07:41 +02:00 |
|
Kim Kulling
|
3329e76263
|
closes https://github.com/assimp/assimp/issues/3178: throw exception in case of invalid export stream.
|
2020-05-02 21:06:55 +02:00 |
|
Kim Kulling
|
f8e6512a63
|
Move format importer and exporter into its won folder.
|
2020-05-02 15:14:38 +02:00 |
|
RichardTea
|
1dabb1a094
|
Collada: Fix crash with AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES
Add unit test for this
|
2020-05-01 14:59:09 +01: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 |
|
RichardTea
|
ee16d2c4c9
|
Fix camera, light and bone unique ids
Bones don't have a unit test yet
|
2020-05-01 11:13:38 +01:00 |
|
RichardTea
|
083ebdbc2e
|
Collada Export: More unique Ids
Nodes, Materials, Animations, Lights, Cameras, Bones
|
2020-04-30 18:28:06 +01:00 |
|
Kim Kulling
|
2d9d112015
|
fix warning
|
2020-04-29 21:35:42 +02:00 |
|
Kim Kulling
|
1c30b7bf8e
|
tryout: check if leak is coupled to type double.
|
2020-04-29 21:31:01 +02:00 |
|
Kim Kulling
|
e0bc0f7fad
|
try to fix double memleak.
|
2020-04-29 21:19:15 +02:00 |
|
Kim Kulling
|
da2bf5c7a4
|
fix wrong size
|
2020-04-29 21:13:46 +02:00 |
|
Kim Kulling
|
f808ed9fb5
|
fbxconverter: fix memoryleak.
|
2020-04-29 20:52:49 +02:00 |
|
Kim Kulling
|
c6131ce38a
|
scenecombiner: fix leak.
|
2020-04-29 20:43:23 +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 |
|
RichardTea
|
2c6ac23a4e
|
Apply Assimp clangformat to touched Collada files
|
2020-04-29 14:21:17 +01:00 |
Rafał Mikrut
|
6967a02fcb
|
Merge branch 'master' into added_check_before_using
|
2020-04-28 18:33:29 +00:00 |
qarmin
|
4dfdbbf171
|
Check index before using
|
2020-04-28 20:31:59 +02:00 |
|
Kim Kulling
|
efa046366e
|
Retrigger build
|
2020-04-28 09:14:53 +02:00 |
luca
|
4488e3e745
|
build on Linux with gcc and clang; warning as error only for 'assimp' target
|
2020-04-27 23:38:33 -07:00 |
Paul Arden
|
81abd90ee1
|
Fix reading of orthographic camera data. Fixes #3028.
|
2020-04-28 10:07:56 +10:00 |
|
Kim Kulling
|
b0c9711894
|
Small format finding
|
2020-04-27 15:16:57 +02:00 |
Inho Lee
|
629320a3a0
|
Add timescale for collada
|
2020-04-27 11:52:04 +02:00 |
|
luca
|
d98787f35b
|
CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt;
|
2020-04-26 12:50:42 -07:00 |
|
Kim Kulling
|
6c1e21d754
|
fix formatting.
|
2020-04-26 19:14:30 +02: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
|
638df2ceac
|
Merge branch 'master' into master
|
2020-04-25 12:07:06 +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
|
c36b028412
|
fix type error for template deduction.
|
2020-04-21 16:39:18 +02:00 |
|
Kim Kulling
|
c91d3764ca
|
Merge branch 'master' into optimized_bonelimits
|
2020-04-21 08:45:50 +02: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 |
|
Kim Kulling
|
e0f6eb09e6
|
Merge branch 'master' into optimized_bonelimits
|
2020-04-17 20:37:28 +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
|
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 |
György Straub
|
e4ceccb42d
|
Merge branch 'master' into master
|
2020-04-12 15:58:25 +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 |
|
György Straub
|
755f3748f1
|
Merge branch 'master' into master
|
2020-04-07 11:46:14 +01: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 |
György Straub
|
956c57f18e
|
Merge branch 'master' into master
|
2020-04-03 13:42:59 +01: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 |
Alexey Medvedev
|
53990ffa42
|
Check for existed bone
|
2020-03-31 14:18:51 -07: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 |
|
Alexey Medvedev
|
3ef46b0edd
|
Weights and bones count checks
|
2020-03-30 16:56:33 -07: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
|
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 |
Ville Ruusutie
|
222b145307
|
Merge branch 'master' into optimized_bonelimits
|
2020-03-29 12:54:07 +03: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
|
7a2bc5f8f3
|
Merge branch 'master' into optimized_bonelimits
|
2020-03-27 07:12:25 +02: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 |
|
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 |