Commit Graph

  • fbc0914a21 Merge pull request #3383 from crocdialer/collada_animation_ticks_per_sec_issue_3162 Kim Kulling 2020-09-17 14:37:55 +02:00
  • 338c0b753c Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 Fabian Schmidt 2020-09-16 21:43:35 +02:00
  • 9c1edaee96 Merge branch 'master' into gltfBufferViewSizeFix Max Vollmer (Microsoft Havok) 2020-09-16 10:08:47 +01:00
  • 14d6141f69 Collada: fix scenenode parsing. Kim Kulling 2020-09-14 21:35:36 +02:00
  • 9e2c4e0cf4 Merge branch 'master' into rbsheth_hunter_rapidjson Kim Kulling 2020-09-14 09:00:11 +02:00
  • 3e5feb4320 Merge pull request #3375 from MalcolmTyrrell/makeInternalErrorsAccessible Kim Kulling 2020-09-14 08:59:09 +02:00
  • 2901f68668 Adapt code style. Kim Kulling 2020-09-14 08:45:18 +02:00
  • 0e9621012c Adapt code style - finally :-). Kim Kulling 2020-09-14 08:43:31 +02:00
  • 1ff9e2b522 Adapt code style. Kim Kulling 2020-09-14 08:40:21 +02:00
  • 23defc275a Merge branch 'master' into makeInternalErrorsAccessible Kim Kulling 2020-09-14 08:36:13 +02:00
  • d0932c405f fix duplicated node parsing. kimkulling 2020-09-11 15:46:46 +02:00
  • c1f50e116a fix next unittests. Kim Kulling 2020-09-11 00:46:29 +02:00
  • 31f3812241 XGL: fix import of node values. Kim Kulling 2020-09-10 21:03:02 +02:00
  • 6ec07e4dc7 XGL: next steps. kimkulling 2020-09-10 17:31:30 +02:00
  • cca9eddb1c Fix material-base AMF-unittest. kimkulling 2020-09-10 13:56:04 +02:00
  • 615ffdf93f What: Throw instead of assert when input file is invalid. Max Vollmer 2020-09-10 10:47:58 +01:00
  • c2f0bf68af Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml kkulling 2020-09-10 11:02:51 +02:00
  • d854f3b842 AMF: fix adding for child-nodes. Kim Kulling 2020-09-10 00:05:53 +02:00
  • bd91033172 Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 Kim Kulling 2020-09-08 20:53:00 +02:00
  • 4f30b2aa5c Merge pull request #3391 from Naios/unref_param Kim Kulling 2020-09-08 20:35:46 +02:00
  • 0618db1f99 AMF: some smaller refactorings to improve readability. Kim Kulling 2020-09-07 20:52:46 +02:00
  • f3b25b999b Fix an unreferenced formal parameter warning on MSVC when no exporter is built Denis Blank 2020-09-05 23:17:11 +02:00
  • ef6b93a949 Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 Kim Kulling 2020-09-04 16:27:47 +02:00
  • 689406fbda Fix Colladat import. Kim Kulling 2020-09-04 07:33:10 +02:00
  • 78b30d1752 Merge branch 'master' into rbsheth_hunter_rapidjson Rahul Sheth 2020-09-03 09:51:32 -04:00
  • df56a97794 Dummy commit 2 to trigger Github Actions Rahul Sheth 2020-09-03 08:41:22 -04:00
  • 56a3759925 Dummy commit 1 Rahul Sheth 2020-09-03 08:41:08 -04:00
  • 1e6a1c63ec Remove irrxml search. kimkulling 2020-09-03 11:45:43 +02:00
  • 9ce0671134 Merge pull request #3387 from Gargaj/patch-1 Kim Kulling 2020-09-03 08:42:18 +02:00
  • be5089ae40 Collada: correct parsing of float data in xml nodes. Kim Kulling 2020-09-02 22:38:19 +02:00
  • 075540e15a AMF: fixes. Kim Kulling 2020-09-02 22:37:57 +02:00
  • 0b8ed5c03a fix crash when x3d is empty Kim Kulling 2020-09-02 21:49:40 +02:00
  • 34f343233e 3ml: fix xml parsing. Kim Kulling 2020-09-02 21:49:20 +02:00
  • 0c05398602 xml-parser: ensure that traverse-collectors are only collecting xmlnodes. Kim Kulling 2020-09-02 21:48:58 +02:00
  • 87d2580aad fix 3mf rel-parsing kkulling 2020-09-02 17:45:37 +02:00
  • 9053dfea05 add missing define to glTF importer Gargaj 2020-09-02 16:28:12 +02:00
  • 3081e83f43 Merge pull request #3385 from jnhyatt/smart-ptr-fix Kim Kulling 2020-09-02 16:24:25 +02:00
  • 4dad3eab3f Merge branch 'master' into smart-ptr-fix Kim Kulling 2020-09-02 16:14:45 +02:00
  • a7d3172dd8 Merge pull request #3386 from flowtsohg/master Kim Kulling 2020-09-02 16:14:08 +02:00
  • 542d784457 Update Jassimp's AiTextureType.java Chananya Freiman 2020-09-02 02:52:56 +03:00
  • 73fa2cbe88 Fix memory handling of xml-nodes in the parser. Kim Kulling 2020-09-01 21:48:50 +02:00
  • 638499a278 Replace unique_ptr and add custom deleter Joshua Hyatt 2020-09-01 10:30:31 -06:00
  • 3c2133a3b9 fix node collection for collada xml parsing Kim Kulling 2020-09-01 07:51:17 +02:00
  • e62b4e5cce next iteration. kimkulling 2020-08-31 16:10:38 +02:00
  • 6d5c388780 Introduce node iterator. Kim Kulling 2020-08-30 21:10:04 +02:00
  • dcf9a7b2d8 Conform variable names to code standards Joshua Hyatt 2020-08-29 23:58:31 -06:00
  • 953e976de6 Close stream when finished Joshua Hyatt 2020-08-29 23:56:50 -06:00
  • cc2613f264 Replace unique_ptr with raw pointer Joshua Hyatt 2020-08-29 23:06:33 -06:00
  • c769f8d4ad Replace unique_ptr with raw pointer to avoid destructing stream Joshua Hyatt 2020-08-29 22:21:34 -06:00
  • 30a4eae17f simplify some ttributes access in loaded xml. kimkulling 2020-08-28 16:25:22 +02:00
  • 0730eebe6f fix collada handling of xml nodes. kimkulling 2020-08-28 16:17:56 +02:00
  • 3c98197be0 set aiAnimation->mTicksPerSecond to 1000.0. this is analog to the behaviour of gltf2-importer crocdialer 2020-08-28 16:09:15 +02:00
  • b7e9595e54 fix loop of xml-files. Kim Kulling 2020-08-28 00:09:51 +02:00
  • 6b32f34fc2 Try disabling C4389 for GTest only for MSVC Rahul Sheth 2020-08-27 17:02:42 -04:00
  • b15c111805 Try Hunter-based Github Actions Rahul Sheth 2020-08-27 13:14:08 -04:00
  • 5f19c8890b Update to the latest Hunter Rahul Sheth 2020-08-27 16:31:42 -04:00
  • 59c8b4ed84 Move RapidJSON definitions to CMake Rahul Sheth 2020-08-27 11:25:29 -04:00
  • 582a8b1887 Fix xml-migration bild. kimkulling 2020-08-27 17:05:09 +02:00
  • 6f77d2e06d Prepare unittest for XmlParser. kimkulling 2020-08-27 17:04:58 +02:00
  • c359b973bb finish migration of collada. Kim Kulling 2020-08-26 22:31:46 +02:00
  • 5087348a37 Build tests and tools with Hunter Rahul Sheth 2020-08-25 11:30:46 -04:00
  • 904f17f29f next collada-iteration Kim Kulling 2020-08-24 07:44:54 +02:00
  • 7adfe1f2d8 Xml: introduce helper for attribute parsing. Kim Kulling 2020-08-21 06:45:30 +02:00
  • 962fe7cd4d Oops. Fix string to match restored error text. Malcolm Tyrrell 2020-08-20 15:10:11 +01:00
  • fa93ba76fe Do need to export base class. Malcolm Tyrrell 2020-08-20 15:01:24 +01:00
  • 16c227e27c Undo one other small change. Malcolm Tyrrell 2020-08-20 14:53:00 +01:00
  • 8f893e3653 Actually, just keep the old behaviour for now. Malcolm Tyrrell 2020-08-20 14:32:15 +01:00
  • cb631517a7 next iteration. Kim Kulling 2020-08-19 22:44:13 +02:00
  • 9b5e758bdd Even simpler DeadlyErrorBase Malcolm Tyrrell 2020-08-19 17:59:13 +01:00
  • 6f9c61e157 Use case which matches surrounding code. Malcolm Tyrrell 2020-08-19 17:57:25 +01:00
  • 6c2ceb55f8 Simplify some FBX error code. Malcolm Tyrrell 2020-08-19 17:20:57 +01:00
  • d393f677ce Collada: next methods migrated. kimkulling 2020-08-19 17:10:30 +02:00
  • d7c65c36cd Add unit test for formatting. Malcolm Tyrrell 2020-08-19 11:31:46 +01:00
  • 3ccf503d3e Forward template arguments. Malcolm Tyrrell 2020-08-19 11:31:32 +01:00
  • 56381241c5 move hasAttribute to XmlParser scope. Kim Kulling 2020-08-19 00:19:56 +02:00
  • 554ed1bf91 next step.s Kim Kulling 2020-08-18 20:44:06 +02:00
  • 0f6127e90e No need to build strings. Malcolm Tyrrell 2020-08-18 18:21:20 +01:00
  • e1a0163e7e Make all exceptions available. Malcolm Tyrrell 2020-08-18 18:14:51 +01:00
  • b7c789da67 Stop concatenating std::strings. Use formatter. Malcolm Tyrrell 2020-08-18 17:35:08 +01:00
  • 6a8edb21f8 fix merge issues kimkulling 2020-08-18 17:41:37 +02:00
  • 0ffcdf160e Build formatting into DeadlyImportError Malcolm Tyrrell 2020-08-18 16:32:34 +01:00
  • 7e93ae4428 3MF: Migration. kimkulling 2020-08-18 16:54:29 +02:00
  • 974252bd8f Fix two warnings that annoy clang. Malcolm Tyrrell 2020-07-24 11:37:15 +01:00
  • 4f1e904ec8 Fix typo. Malcolm Tyrrell 2020-07-24 10:13:40 +01:00
  • 829ff1adf0 Maybe this will help. Malcolm Tyrrell 2020-07-23 17:26:32 +01:00
  • a4110a59c5 Use runtime error. Malcolm Tyrrell 2020-07-23 16:08:30 +01:00
  • 19cdfd12df Unit test for internal failures. Malcolm Tyrrell 2020-07-23 15:58:18 +01:00
  • b1ed751b83 Provide an API for accessing internal errors. Malcolm Tyrrell 2020-07-23 15:07:24 +01:00
  • 48ec3ef458 Merge pull request #3374 from fuj1n/update_utf8cpp Kim Kulling 2020-08-17 21:11:05 +02:00
  • 995ab805ff Update utf8cpp to fix use of C++17 deprecated feature Arthur (fuj1n) Uzulin 2020-08-17 17:54:48 +10:00
  • 51a417ce6f Merge pull request #3372 from lsliegeo/nff_ai_real Kim Kulling 2020-08-16 13:56:33 +02:00
  • 0d00ff7043 use ai_real instead of float lsliegeo 2020-08-15 14:57:49 +02:00
  • 9fc00cbf74 Merge pull request #3369 from assimp/issue_3364 Kim Kulling 2020-08-11 20:50:11 +02:00
  • 1bbae19779 Fix leak Kim Kulling 2020-08-11 20:28:12 +02:00
  • b1b9fa94cf Update utStandardShapes.cpp Kim Kulling 2020-08-11 20:21:35 +02:00
  • 9bad20e99e Add test to CMakeLists Kim Kulling 2020-08-11 20:03:30 +02:00
  • 45f76f36f3 Add test to CMakeLists Kim Kulling 2020-08-11 20:03:23 +02:00
  • 153a6efecc Add test Kim Kulling 2020-08-11 20:02:14 +02:00
  • 729882debb Fix incorrect index Kim Kulling 2020-08-11 19:57:36 +02:00
  • 394651e640 x3d: migration of goups. Kim Kulling 2020-08-10 22:13:45 +02:00