Commit Graph

52 Commits (65a79029ecbfe73cc761129ab9c4c4a64f0fcdca)

Author SHA1 Message Date
Kim Kulling 23af5336d5
Update D3MFImporter.cpp
Avoid using extension twice.
2018-11-23 20:21:58 +01:00
rdb e595410de1
Fix static init ordering issue in 3mf importer 2018-11-23 20:04:16 +01:00
Matthias Moulin e7da1c634d
Fix: C4244 conversion warning 2018-10-06 16:28:10 +02:00
Daniel Löber 2ee09b2528 Correct 3MF displaycolor import 2018-09-05 16:23:47 +02:00
Nicholas Woodfield 458a7ae801 Silencing compile warnings during build, all little stuff like uint to size_t or BOOL to bool. 2018-05-03 15:03:14 -04:00
kimkulling 066349f36b Add usage of log macros. 2018-04-19 16:48:43 +02:00
Kim Kulling e01e77a6c7
Merge branch 'master' into develop_kimkulling 2018-03-21 21:20:28 +01:00
Kim Kulling d0edb94208
Update D3MFImporter.cpp
Use static cast instead of c-cast.
2018-03-20 20:38:03 +01:00
Kim Kulling f898f40486
Merge branch 'master' into master 2018-03-20 20:33:17 +01:00
Kim Kulling 5814e6f9f0 Optimize some std::string usages. 2018-03-20 18:43:54 +01:00
Kim Kulling 317f3e2a59 3MF: Export metadata. 2018-03-20 14:10:08 +01:00
Kim Kulling ef12eb84bb 3MF: add metadata import. 2018-03-20 10:09:47 +01:00
Marco Di Benedetto 9d813a48b0 fixed emply buffer stream write, removed some cast warnings. 2018-03-19 18:22:27 +01:00
Kim Kulling 6b9add5594 fix compiler warning fr 64 bit 2018-03-13 18:19:10 +01:00
Kim Kulling f11d4902c6 fix CanRead-method for the 3MF-Importer. 2018-03-13 17:50:34 +01:00
Kim Kulling c7ac32f891 fix naming readout + export. 2018-03-12 22:28:00 +01:00
Kim Kulling c8ae0bbb3d 3MF: fix model folder desc. 2018-03-11 20:15:49 +01:00
Kim Kulling 69742670dd 3mf: use correct material assignment in case of multi-materials. 2018-03-09 11:40:45 +01:00
Kim Kulling 375dd4c179
Update D3MFImporter.cpp
Fix order of init list.
2018-02-23 20:34:34 +01:00
Kim Kulling 1d901f075c 3mf-importer: fix parsing of base-material color. 2018-02-23 17:49:29 +01:00
Kim Kulling 7cd1a66c8b Use correct lookup. 2018-02-20 22:08:40 +01:00
Kim Kulling 8950504cf0 Fix import of materials. 2018-02-18 21:30:23 +01:00
Kim Kulling 331e67c32d 3mf: introduce first prototype for basematerial support. 2018-02-12 22:07:12 +01:00
Sergio Acereda 8f99c1a0be including <unzip.h> instead of <contrib/unzip/unzip.h> 2018-01-30 22:13:44 +01:00
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
BuildTools 66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Kim Kulling 972d8517b5 fix the model xml 2017-12-07 17:50:18 +01:00
Kim Kulling 95e9cd75fa 3MF: fix working test for 3MF-export. 2017-12-06 21:41:48 +01:00
Turo Lamminen 6f50be82aa 3MF: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:15:57 +02:00
Kim Kulling 454b8919b0 use one header for all xml-tags. 2017-11-21 21:34:25 +01:00
Kim Kulling c22b4acd47 3MF: Export initial commit. 2017-11-20 22:36:17 +01:00
Thomas Lemaire 5b76a31485 fix trivial warnings
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
2017-11-02 11:13:52 +01:00
Kim Kulling 00e3b03c5b closes https://github.com/assimp/assimp/issues/1406: fix merge issue + improve 3MF-tests 2017-08-31 11:04:13 +02:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Kim Kulling 98100d8cab Blender-Importer: fix coverity findings. 2017-05-06 11:14:04 +02:00
Kim Kulling 8accf5b386 3MF: reformattings. 2017-03-28 00:35:56 +02:00
Kim Kulling 2cd6c3d755 Closes https://github.com/assimp/assimp/issues/1128: do not use non
verbose format flag for import.
2017-03-14 19:01:41 +01:00
Kim Kulling 8d27945619 Merge branch 'master' into cleanup_includes 2017-03-05 15:15:29 +01:00
Kim Kulling 7a47f1f8f7 Issue-1183: add stp to the list of supported extensions for step-files. 2017-02-27 20:11:59 +01:00
Kim Kulling ef540f46a3 Remove unused headers. 2017-02-22 17:20:26 +01:00
Kim Kulling 45eb13719e fixes https://github.com/assimp/assimp/issues/1141: fix typo. 2017-01-17 22:05:45 +01:00
Andy Maloney 6483b10997 {D3MF} Move #ifndefs before #includes 2017-01-10 09:53:11 -05:00
Jared Mulconry 43ef4ec715 Fixed build warnings on MSVC14 x64 in the D3MF format sources. 2016-11-19 03:34:39 +11:00
Kim Kulling 1724cc9e66 Remove redundant file. 2016-10-21 19:44:31 +02:00
Kim Kulling bac28061ea 3MF: fix nullptr access. 2016-10-18 21:16:44 +02:00
Kim Kulling 09ad67f469 3MF-Importer: remove unused variable. 2016-10-16 17:14:22 +02:00
Sergey Kosarevsky 1c78f1be03 Fixed: unzip.h was still included even if the D3MF importer is disabled 2016-10-10 17:58:06 +02:00
Kim Kulling 22cfe84cba 3MF: add a simple box example from the 3MF-sample repo. 2016-09-10 09:27:29 +02:00
Kim Kulling 05fce9a008 3MF: make xml tags static const. 2016-09-09 20:42:02 +02:00
Kim Kulling 9b6de15b74 closes https://github.com/assimp/assimp/issues/904: add ai_strtof for
VS2012.
2016-06-20 20:30:29 +02:00