Malcolm Tyrrell
|
20733537d7
|
Merge branch 'master' into fbxReportAssetIssuesProperly
|
2020-10-08 09:54:04 +01:00 |
Malcolm Tyrrell
|
6b9c477763
|
The floar parsing routines are now DeadlyErrors.
|
2020-10-02 13:58:55 +01:00 |
Kim Kulling
|
c7f7ed8901
|
Update ColladaLoader.cpp
|
2020-09-30 20:51:54 +02:00 |
|
Kim Kulling
|
0191c661b5
|
fix division by zero.
|
2020-09-30 20:39:26 +02:00 |
Kim Kulling
|
1c85676a9c
|
collada: fix warning: not inited variable.
|
2020-09-27 21:19:23 +02:00 |
|
Kim Kulling
|
052cc2e070
|
collada: fix warning: not inited variable.
|
2020-09-27 21:16:51 +02:00 |
|
Kim Kulling
|
5038f21d06
|
collada: fix warning: not inited variable.
|
2020-09-27 21:14:21 +02:00 |
|
Kim Kulling
|
202907d471
|
collada: fix warning: unused variable.
|
2020-09-27 21:11:42 +02:00 |
|
Kim Kulling
|
3f97a1df2c
|
collada: fix warning: unused variable.
|
2020-09-27 21:09:06 +02:00 |
|
Kim Kulling
|
bdd3c96eee
|
amf: fix warning: unused variable.
|
2020-09-27 21:06:14 +02:00 |
|
Kim Kulling
|
5653a82a87
|
fix the unittests.
|
2020-09-27 20:20:44 +02:00 |
|
Kim Kulling
|
d6892b3f58
|
Merge branch 'master' into pugi_xml
|
2020-09-25 21:00:09 +02:00 |
|
Kim Kulling
|
557273818d
|
collada: next iteration.
|
2020-09-23 21:23:12 +02:00 |
|
Kim Kulling
|
34351b3cb9
|
fix collada material parsing.
|
2020-09-23 00:20:06 +02:00 |
|
kimkulling
|
71f20eaa8a
|
next fixes
|
2020-09-22 15:51:21 +02:00 |
|
kimkulling
|
dee8e5bee1
|
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
|
2020-09-22 15:20:35 +02:00 |
|
Kim Kulling
|
c4039d5cf0
|
fix collada data parsing.
|
2020-09-21 20:05:16 +02:00 |
|
kimkulling
|
8c88526da8
|
fix collada unittests.
|
2020-09-21 16:39:24 +02:00 |
Fabian Schmidt
|
338c0b753c
|
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
|
2020-09-16 21:43:35 +02:00 |
|
Kim Kulling
|
14d6141f69
|
Collada: fix scenenode parsing.
|
2020-09-14 21:35:36 +02:00 |
|
kimkulling
|
d0932c405f
|
fix duplicated node parsing.
|
2020-09-11 15:46:46 +02:00 |
|
Kim Kulling
|
c1f50e116a
|
fix next unittests.
|
2020-09-11 00:46:29 +02:00 |
|
Kim Kulling
|
689406fbda
|
Fix Colladat import.
|
2020-09-04 07:33:10 +02:00 |
|
Kim Kulling
|
be5089ae40
|
Collada: correct parsing of float data in xml nodes.
|
2020-09-02 22:38:19 +02:00 |
|
Kim Kulling
|
0b8ed5c03a
|
fix crash when x3d is empty
|
2020-09-02 21:49:40 +02:00 |
|
Kim Kulling
|
73fa2cbe88
|
Fix memory handling of xml-nodes in the parser.
|
2020-09-01 21:48:50 +02:00 |
|
Kim Kulling
|
3c2133a3b9
|
fix node collection for collada xml parsing
|
2020-09-01 07:51:17 +02:00 |
|
kimkulling
|
e62b4e5cce
|
next iteration.
|
2020-08-31 16:10:38 +02:00 |
|
Kim Kulling
|
6d5c388780
|
Introduce node iterator.
|
2020-08-30 21:10:04 +02:00 |
|
kimkulling
|
30a4eae17f
|
simplify some ttributes access in loaded xml.
|
2020-08-28 16:25:22 +02:00 |
|
kimkulling
|
0730eebe6f
|
fix collada handling of xml nodes.
|
2020-08-28 16:17:56 +02:00 |
|
crocdialer
|
3c98197be0
|
set aiAnimation->mTicksPerSecond to 1000.0. this is analog to the behaviour of gltf2-importer
|
2020-08-28 16:09:15 +02:00 |
|
Kim Kulling
|
b7e9595e54
|
fix loop of xml-files.
|
2020-08-28 00:09:51 +02:00 |
|
kimkulling
|
582a8b1887
|
Fix xml-migration bild.
|
2020-08-27 17:05:09 +02:00 |
|
Kim Kulling
|
c359b973bb
|
finish migration of collada.
|
2020-08-26 22:31:46 +02:00 |
|
Kim Kulling
|
904f17f29f
|
next collada-iteration
|
2020-08-24 07:44:54 +02:00 |
|
Kim Kulling
|
7adfe1f2d8
|
Xml: introduce helper for attribute parsing.
|
2020-08-21 06:45:30 +02:00 |
|
Kim Kulling
|
cb631517a7
|
next iteration.
|
2020-08-19 22:44:13 +02:00 |
|
kimkulling
|
d393f677ce
|
Collada: next methods migrated.
|
2020-08-19 17:10:30 +02:00 |
|
Malcolm Tyrrell
|
b7c789da67
|
Stop concatenating std::strings. Use formatter.
|
2020-08-18 17:35:08 +01:00 |
|
Malcolm Tyrrell
|
0ffcdf160e
|
Build formatting into DeadlyImportError
|
2020-08-18 16:32:34 +01:00 |
|
Kim Kulling
|
21678df589
|
ogre + collada migration.
|
2020-07-10 22:25:38 +02:00 |
|
Kim Kulling
|
77b705048b
|
fix merge issues.
|
2020-07-04 13:42:23 +02:00 |
|
Kim Kulling
|
b1369d0912
|
next steps.
|
2020-07-02 15:18:59 +02:00 |
|
Kim Kulling
|
fb20e15163
|
start to migrate colladat and amf
|
2020-06-27 15:57:06 +02:00 |
|
Kim Kulling
|
6205af4efb
|
replace NULL and avoid ai_assert with more than 2 tests.
|
2020-06-23 21:05:42 +02:00 |
|
Kim Kulling
|
2be731d1bf
|
Merge branch 'master' into pugi_xml
|
2020-05-22 10:09:46 +02:00 |
|
Kim Kulling
|
ecfca1d5c5
|
Merge branch 'master' into verboseLogging
|
2020-05-21 18:30:52 +02:00 |
|
Kim Kulling
|
cfbdacb02a
|
Merge branch 'master' into bug-3201-collada_root_meshes
|
2020-05-16 20:50:34 +02:00 |
|
Malcolm Tyrrell
|
434c5e3d37
|
More verbose logging
|
2020-05-15 17:29:49 +01:00 |
|
kimkulling
|
464d4cf99a
|
Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master
|
2020-05-15 15:08:30 +02: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
|
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
|
ea917bd4ae
|
Move Collada into AssetLib folder
Should make the merge easier
|
2020-05-04 13:54:49 +01:00 |