Commit Graph

9420 Commits (c5f45e26bdfc7c5e0e1ad90f6475f4fd0276c81d)

Author SHA1 Message Date
Kim Kulling 23defc275a
Merge branch 'master' into makeInternalErrorsAccessible 2020-09-14 08:36:13 +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 31f3812241 XGL: fix import of node values. 2020-09-10 21:03:02 +02:00
kimkulling 6ec07e4dc7 XGL: next steps. 2020-09-10 17:31:30 +02:00
kimkulling cca9eddb1c Fix material-base AMF-unittest. 2020-09-10 13:56:04 +02:00
Max Vollmer 615ffdf93f What: Throw instead of assert when input file is invalid.
Why: Assimp shouldn't crash on invalid files. Asserts are disabled on Release builds.
2020-09-10 10:47:58 +01:00
kkulling c2f0bf68af Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml 2020-09-10 11:02:51 +02:00
Kim Kulling d854f3b842 AMF: fix adding for child-nodes. 2020-09-10 00:05:53 +02:00
Kim Kulling bd91033172
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-08 20:53:00 +02:00
Kim Kulling 4f30b2aa5c
Merge pull request #3391 from Naios/unref_param
Fix an unreferenced formal parameter warning on MSVC when no exporter…
2020-09-08 20:35:46 +02:00
Kim Kulling 0618db1f99 AMF: some smaller refactorings to improve readability. 2020-09-07 20:52:46 +02:00
Denis Blank f3b25b999b Fix an unreferenced formal parameter warning on MSVC when no exporter is built 2020-09-05 23:20:31 +02:00
Kim Kulling ef6b93a949
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-04 16:27:47 +02:00
Kim Kulling 689406fbda Fix Colladat import. 2020-09-04 07:33:10 +02:00
Rahul Sheth 78b30d1752
Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-03 09:51:32 -04:00
Rahul Sheth df56a97794 Dummy commit 2 to trigger Github Actions 2020-09-03 08:41:22 -04:00
Rahul Sheth 56a3759925 Dummy commit 1 2020-09-03 08:41:08 -04:00
kimkulling 1e6a1c63ec Remove irrxml search. 2020-09-03 11:45:43 +02:00
Kim Kulling 9ce0671134
Merge pull request #3387 from Gargaj/patch-1
add missing define to glTF importer
2020-09-03 08:42:18 +02:00
Kim Kulling be5089ae40 Collada: correct parsing of float data in xml nodes. 2020-09-02 22:38:19 +02:00
Kim Kulling 075540e15a AMF: fixes. 2020-09-02 22:37:57 +02:00
Kim Kulling 0b8ed5c03a fix crash when x3d is empty 2020-09-02 21:49:40 +02:00
Kim Kulling 34f343233e 3ml: fix xml parsing. 2020-09-02 21:49:20 +02:00
Kim Kulling 0c05398602 xml-parser: ensure that traverse-collectors are only collecting xmlnodes. 2020-09-02 21:48:58 +02:00
kkulling 87d2580aad fix 3mf rel-parsing 2020-09-02 17:45:37 +02:00
Gargaj 9053dfea05
add missing define to glTF importer 2020-09-02 16:28:12 +02:00
Kim Kulling 3081e83f43
Merge pull request #3385 from jnhyatt/smart-ptr-fix
Fix Bad Ownership Acquisition
2020-09-02 16:24:25 +02:00
Kim Kulling 4dad3eab3f
Merge branch 'master' into smart-ptr-fix 2020-09-02 16:14:45 +02:00
Kim Kulling a7d3172dd8
Merge pull request #3386 from flowtsohg/master
Update Jassimp's AiTextureType.java
2020-09-02 16:14:08 +02:00
Chananya Freiman 542d784457 Update Jassimp's AiTextureType.java
The newer PBR enums are missing, making it impossible to import many models.
2020-09-02 02:52:56 +03:00
Kim Kulling 73fa2cbe88 Fix memory handling of xml-nodes in the parser. 2020-09-01 21:48:50 +02:00
Joshua Hyatt 638499a278 Replace unique_ptr and add custom deleter 2020-09-01 10:30:31 -06: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
Joshua Hyatt dcf9a7b2d8 Conform variable names to code standards 2020-08-29 23:58:31 -06:00
Joshua Hyatt 953e976de6 Close stream when finished 2020-08-29 23:56:50 -06:00
Joshua Hyatt cc2613f264 Replace unique_ptr with raw pointer 2020-08-29 23:06:33 -06:00
Joshua Hyatt c769f8d4ad Replace unique_ptr with raw pointer to avoid destructing stream 2020-08-29 22:21:34 -06: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
Rahul Sheth 6b32f34fc2 Try disabling C4389 for GTest only for MSVC 2020-08-27 17:02:42 -04:00
Rahul Sheth b15c111805 Try Hunter-based Github Actions 2020-08-27 16:55:39 -04:00
Rahul Sheth 5f19c8890b Update to the latest Hunter 2020-08-27 16:51:34 -04:00
Rahul Sheth 59c8b4ed84 Move RapidJSON definitions to CMake 2020-08-27 16:51:06 -04:00
kimkulling 582a8b1887 Fix xml-migration bild. 2020-08-27 17:05:09 +02:00
kimkulling 6f77d2e06d Prepare unittest for XmlParser. 2020-08-27 17:04:58 +02:00