Commit Graph

3929 Commits (9b6301562693814deb46553a4f06aa04177f348d)

Author SHA1 Message Date
Kim Kulling 6575696459 OpenGEX: fix coverity findings. 2016-05-15 18:57:10 +02:00
Kim Kulling e1084b5314 Merge branch 'feature/opengex_missing_features' 2016-05-14 10:36:46 +02:00
Kim Kulling 71c2b91b98 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-14 10:10:33 +02:00
Kim Kulling 210182b17a OpenGEX: fix coverity findings. 2016-05-14 10:10:05 +02:00
Kim Kulling 142901fbc0 Merge pull request #885 from otgerrogla/master
Fixed GLTF bugs, and added a few test models
2016-05-10 23:38:54 +02:00
Otger 159af06524 Fixed GLTF bugs, and added a few test models 2016-05-10 16:25:15 +02:00
Richard Selneck 86a636fbbf Add in IRRMESH option 2016-05-09 18:26:18 -04:00
Kim Kulling d6ecc8b621 Regression test suite: add ogex-files to database. 2016-05-09 23:55:55 +02:00
Kim Kulling a55e31bc72 Merge pull request #881 from assimp/feature/opengex_missing_features
Feature/opengex missing features
2016-05-09 21:19:09 +02:00
Kim Kulling 2323320df8 OpenGEX: new camra model. 2016-05-09 20:50:22 +02:00
Kim Kulling e9085097f3 OpenGEX: add light impl and add examples. 2016-05-09 20:43:22 +02:00
Kim Kulling 0d5eb30a28 CameraObj: load camera data in the correct way. 2016-05-08 22:31:16 +02:00
Kim Kulling 9e63b769a5 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-08 12:23:02 +02:00
Alexander Gessler d1e355add2 Add STEP to list of exporters 2016-05-08 11:56:15 +02:00
Alexander Gessler 644e06d4a7 Add 3MF to readme, mark glTF as partial support 2016-05-08 11:55:18 +02:00
Kim Kulling 82f73b6d03 OpenGEX: fix invalid access to textures. Next steps to camera and light. 2016-05-08 11:09:53 +02:00
Kim Kulling 513576616c Merge branch 'master' of https://github.com/assimp/assimp 2016-05-07 18:01:21 +02:00
Kim Kulling 896e139470 Merge pull request #879 from gorilux/master
Added 3MF importer
2016-05-07 18:00:13 +02:00
Gorilux 00b574d746 Fixed compile issue for travis-ci 2016-05-07 15:36:05 +02:00
Gorilux 753b63c526 Removed override keywords so compilation success on gcc 4.6 2016-05-07 15:15:00 +02:00
Gorilux 89320bab46 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-07 14:18:17 +02:00
Gorilux 8f4f0047fb Added 3MF importer 2016-05-07 14:16:33 +02:00
Kim Kulling 301b6798c5 aiLight: fix a typo. 2016-05-07 11:16:33 +02:00
Alexander Gessler a931d2bac6 Merge pull request #877 from assimp/followups
Followups
2016-05-05 20:40:54 +02:00
Alexander Gessler 0b79d1ebda Revert previous glTF fix (e5233283ef) because it breaks ODR as pointed out by @turol, instead just make importer depend on the necessary definitions. 2016-05-05 19:11:33 +02:00
Alexander Gessler f5327a99ba Add using namespace std on top of assxml exporter so vsnprintf is found no matter where it lives. 2016-05-05 19:05:02 +02:00
Alexander Gessler 92b1431be3 Merge pull request #876 from assimp/travisfix
Fix travis compile: glTFImporter chokes on unavailability of WriteLaz…
2016-05-05 17:59:04 +02:00
Alexander Gessler c80fe16323 Update regression test suite.
gltf could be a regression, left a question here: https://github.com/assimp/assimp/pull/697
2016-05-05 16:59:26 +02:00
Alexander Gessler e5233283ef Fix travis compile: glTFImporter chokes on unavailability of WriteLazyDict<T>. It does not use it directly, but instantiation of LazyDict<T> creates a reference.
My understanding is that compilers were correct in rejecting this, but I may be missing some detail of C++' template instantiation rules.
2016-05-05 16:37:55 +02:00
Alexander Gessler 174a598759 Merge pull request #875 from assimp/acgmay16
MSVC11 fixes
2016-05-05 16:04:10 +02:00
Alexander Gessler 896120b76a Assimp mostly uses unsigned int where it perhaps should've used size_t, nonetheless SPBC insisted on size_t, causing lots of noisy compile warnings. 2016-05-05 15:41:50 +02:00
Alexander Gessler 167bc579c5 Fix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std. 2016-05-05 15:41:12 +02:00
Alexander Gessler 1daae7b7b9 STEPFile.h: delete deleted copy ctor and move ctors. Class has a const member, so implicit creation is off anyway. Enables pre cpp11 compilation. 2016-05-05 15:40:36 +02:00
Alexander Gessler e7fd168114 Merge pull request #854 from tomacd/fix_scene_combiner
fix SceneCombiner copy of aiNode not setting mParent field
2016-05-05 15:07:09 +02:00
Kim Kulling e9b93788ca Merge pull request #863 from mpersano/master
Fix texture coords exporting on binary PLY files
2016-05-03 21:55:17 +02:00
Richard Selneck 12613720ff Fix macro used for detecting IRR support 2016-05-02 18:24:26 -04:00
Kim Kulling 8449afad71 Merge pull request #868 from otgerrogla/master
Fixed a few GLTF importer/exporter bugs
2016-04-28 22:56:41 +02:00
Otger 11e52dc3d7 Removed rogue comma 2016-04-28 21:34:31 +02:00
Otger 2fe401fc54 Fixed gcc compilation error 2016-04-28 21:22:01 +02:00
Otger 64f78e003f Fixed crashes when files were not found, and fixed some warnings 2016-04-28 20:50:01 +02:00
Kim Kulling 46e7ae5dc0 OpenGEX: prepare light- and camera-node and object. 2016-04-28 20:20:40 +02:00
Otger d9b365eb90 Fixed a few GLTF importer/exporter bugs 2016-04-28 18:44:47 +02:00
Kim Kulling 97145a7f20 Replace std:.endl by backslash n. 2016-04-27 17:59:12 +02:00
Kim Kulling 5192b837da Replace std::endl by using backslash n. 2016-04-27 17:58:40 +02:00
Kim Kulling 7468ca5c35 VS2015-code analysis: fix finding ( index var type too small ). 2016-04-23 09:43:20 +02:00
Kim Kulling fcd1f21231 Merge branch 'master' of https://github.com/assimp/assimp 2016-04-23 09:42:57 +02:00
Kim Kulling 388694e349 cmake build env: add missing license info. 2016-04-23 09:42:27 +02:00
Kim Kulling 829e56df0c cmake env: add license info. 2016-04-23 09:42:05 +02:00
mpersano 473d2ca052 Fix texture coords exporting on binary PLY files 2016-04-22 16:09:45 -03:00
Kim Kulling 2a3c2e3a21 Merge pull request #861 from v4hn/no-locallib
only check a library folder if it actually exists
2016-04-22 11:54:40 +02:00