Commit Graph

  • 6118f77d3b X3D importer: Fixed handling of inlined files Patrick Dähne 2017-06-22 16:29:26 +02:00
  • 840ed9dd34 X3D importer: fixed whitespace handling (issue #1202) Patrick Dähne 2017-06-22 15:05:23 +02:00
  • 56a9d5c659 Update Readme.md Kim Kulling 2017-06-22 10:11:54 +02:00
  • f6c4edeb7d Update Readme.md Kim Kulling 2017-06-22 10:07:02 +02:00
  • 6aca0f86b4 Merge pull request #1314 from jamesgk/gltf-export Kim Kulling 2017-06-22 08:31:07 +02:00
  • b26add35a0 Merge pull request #1311 from PetrPPetrov/master Kim Kulling 2017-06-22 08:30:11 +02:00
  • 735e64309b LWO: use forward declaration in header. Kim Kulling 2017-06-21 23:06:53 +02:00
  • bd2af6591f Fix compiler warnings. Kim Kulling 2017-06-21 23:02:46 +02:00
  • 5011e382c7 unittest: fix compiler warning. Kim Kulling 2017-06-21 23:02:26 +02:00
  • 7e45c63901 GLTF exporter: ensure buffer view byte offsets are correctly aligned jamesgk 2017-06-20 14:15:41 -07:00
  • 3ed08971c4 Merge pull request #1313 from assimp/issue_586_make_scenecombiner_public Kim Kulling 2017-06-21 16:41:47 +02:00
  • 439409bef2 SceneCombiner: fix the build. Kim Kulling 2017-06-21 15:24:06 +02:00
  • b727420cf2 SceneCOmbiner: Fix the build. Kim Kulling 2017-06-21 14:31:37 +02:00
  • 612ac234c5 SceneCombiner: move header for scenecombiner to public folder. Kim Kulling 2017-06-21 14:21:16 +02:00
  • 323e470b3e Fixed bug in material color processing Petr Petrovich Petrov 2017-06-20 14:29:16 +03:00
  • 51b915c97b openddlparser: closes https://github.com/assimp/assimp/issues/1271. Kim Kulling 2017-06-19 21:07:18 +02:00
  • 1eca19b400 Merge pull request #12 from assimp/master Madrich 2017-06-18 23:16:00 +02:00
  • d3140a68ab Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-06-17 21:17:39 +02:00
  • c62429998e Merge pull request #1310 from assimp/new_cpputf8_issue_1309 Kim Kulling 2017-06-17 21:17:05 +02:00
  • 64cbc69337 remove dead code. Kim Kulling 2017-06-17 20:36:59 +02:00
  • d7e13e67c4 Utf8: integrate new lib. Kim Kulling 2017-06-17 19:38:47 +02:00
  • 6e1034996e UTF8Encoding: introduce new lib. Kim Kulling 2017-06-16 16:43:39 +02:00
  • 79818145a7 ObjImporter: remove dead code. Kim Kulling 2017-06-15 20:24:10 +02:00
  • 51520cb5f1 unittest: Fix compiler warning Kim Kulling 2017-06-15 08:37:44 +02:00
  • a5a5343304 travis ci: enable sudo support. Kim Kulling 2017-06-13 20:29:25 +02:00
  • 056b6621ef Merge pull request #1304 from malytomas/master Kim Kulling 2017-06-12 09:12:49 +02:00
  • 4399922ea1 fixed CMAKE_MODULE_PATH overwriting previous values Tomas Maly 2017-06-10 20:12:12 +02:00
  • e1df9e5be9 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-06-10 11:19:25 +02:00
  • 7977ded078 Merge pull request #1300 from assimp/ply_export_test Kim Kulling 2017-06-09 23:02:30 +02:00
  • 616a18b0c7 Unittests: fix uppercase typo in export path for ply export test. Kim Kulling 2017-06-09 21:57:41 +02:00
  • 6329a0e62b Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-06-09 20:24:31 +02:00
  • ad74bfc260 Unitetsts: reformats. Kim Kulling 2017-06-09 20:20:24 +02:00
  • fae5a0e71a Merge pull request #1302 from terziman/master Alexander Gessler 2017-06-09 20:14:51 +02:00
  • 4974c99288 Merge remote-tracking branch 'github/master' into contrib Leo Terziman 2017-06-08 11:01:11 +02:00
  • 1eb1c5ed4e Create .travis.yml Kim Kulling 2017-06-08 09:13:44 +02:00
  • ab9aa67c49 travis: exclose some build env to avoid double tests. Kim Kulling 2017-06-07 21:10:52 +02:00
  • 0d3e826182 Matrix: some reformattings. Kim Kulling 2017-06-07 20:23:50 +02:00
  • ea61e8bc5b Merge pull request #1298 from severin-lemaignan/master Kim Kulling 2017-06-07 14:41:52 +02:00
  • 548c09271b ply-exporter: add unittest. Kim Kulling 2017-06-07 14:06:38 +02:00
  • 30e88af520 Merge pull request #1299 from assimp/travis_osx_support Kim Kulling 2017-06-07 13:41:09 +02:00
  • 1792333031 travis-ci: fix unittest executor. Kim Kulling 2017-06-07 11:48:00 +02:00
  • 098e2ffaf9 travis-ci: disable tests for osx. Kim Kulling 2017-06-07 10:30:40 +02:00
  • a687354674 travis-ci: disable coverage test for osx. Kim Kulling 2017-06-07 09:32:48 +02:00
  • e08577adf7 travis-ci: use correct package name. Kim Kulling 2017-06-06 23:58:00 +02:00
  • 846fa1f55e travis-ci: add missing close bracket for if block. Kim Kulling 2017-06-06 21:41:39 +02:00
  • 074caf971b travis-ci: reenable osx. Kim Kulling 2017-06-06 16:57:19 +02:00
  • 4d37f90ea5 Revert "Installing assimp library as well" Séverin Lemaignan 2017-06-06 15:14:18 +01:00
  • 6730d658d7 Fix build. Kim Kulling 2017-06-06 11:58:36 +02:00
  • 7f8839b1f4 Merge pull request #1293 from arkeon7/PLY_refactoring Kim Kulling 2017-06-06 11:55:37 +02:00
  • 1f88310f17 travis-ci: enable oxs-build. Kim Kulling 2017-06-06 11:38:08 +02:00
  • 19d59b630b SpatialSort: use much easier reabability. Kim Kulling 2017-06-06 11:37:02 +02:00
  • ff83701a6f Sample: update dx11 texture loader. Kim Kulling 2017-06-03 09:25:20 +02:00
  • 44a9f80e40 Ply importer with correction from last general trunk merge arkeon 2017-06-02 22:19:41 +02:00
  • f84851e893 PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply import - manage texture coords on faces in ply import - correction on point cloud faces generation Arkeon 2017-06-02 13:24:56 +02:00
  • dcc5887817 Update CMakeLists.txt Kim Kulling 2017-06-02 11:20:48 +02:00
  • 71ad42b603 Merge pull request #1291 from Ias0601/samples Kim Kulling 2017-06-02 10:33:17 +02:00
  • db4b959868 Update ModelLoader.cpp Ias0601 2017-06-01 21:12:48 +05:30
  • 4456b7ca82 Update Mesh.h Ias0601 2017-06-01 21:11:48 +05:30
  • 9d69a12532 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-06-01 16:22:25 +02:00
  • b20a8e551f Merge commit 'cab6cdf7' Kim Kulling 2017-06-01 16:22:14 +02:00
  • cab6cdf7b2 Viewer: fix the build. Kim Kulling 2017-06-01 16:21:23 +02:00
  • 514244ffc2 Add files via upload Ias0601 2017-06-01 19:29:22 +05:30
  • 863ae1d80d Add files via upload Ias0601 2017-06-01 19:28:25 +05:30
  • 629e80ee4a Create main.cpp Ias0601 2017-06-01 19:25:25 +05:30
  • 4c2385b55b Delete SimpleTexturedDirectx11.sln Ias0601 2017-06-01 19:24:41 +05:30
  • f02663fb5b Add files via upload Ias0601 2017-06-01 19:24:08 +05:30
  • 0a35fa0aef Update CMakeLists.txt Kim Kulling 2017-06-01 15:50:19 +02:00
  • 8974a4f326 Delete a.txt Ias0601 2017-06-01 19:15:10 +05:30
  • 6782a69d0b Create a.txt Ias0601 2017-06-01 19:14:56 +05:30
  • ca5ac0b532 Fixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the complete model Leo Terziman 2017-06-01 09:47:50 +02:00
  • 3d088e5d90 Merge pull request #1290 from assimp/issue_1244 Kim Kulling 2017-05-31 22:25:46 +02:00
  • 9e98097aae closes https://github.com/assimp/assimp/issues/1244: log error for overflow. Kim Kulling 2017-05-31 21:43:41 +02:00
  • 8c6f18ea2a Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-05-31 21:37:42 +02:00
  • 1207a81b70 ObjImporter: remove dead code. Kim Kulling 2017-05-31 21:37:16 +02:00
  • 9da181cff1 Merge pull request #1289 from assimp/obj_with_linebreaks Kim Kulling 2017-05-31 21:34:59 +02:00
  • 4dc7940ac5 ObjImporter: fix dead code. Kim Kulling 2017-05-31 20:28:00 +02:00
  • e501cc17c2 Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks Kim Kulling 2017-05-31 20:18:39 +02:00
  • 82380084c5 ObjImporter: next try for multiple line stuff. Kim Kulling 2017-05-31 16:36:08 +02:00
  • 813f3b8248 ObjLoader: improve performance of obj-import. Kim Kulling 2017-05-30 21:10:33 +02:00
  • c121cec68a Obj-Importer: introduce working test for line breaks. Kim Kulling 2017-05-29 22:00:13 +02:00
  • ea4dbb9e46 Merge pull request #1282 from rdb/master Kim Kulling 2017-05-29 12:52:26 +02:00
  • d30b1e585c Tests how o adress this topic. Kim Kulling 2017-05-28 22:25:06 +02:00
  • 8cc80a3d9c ObjImporter: fix the build. Kim Kulling 2017-05-28 14:14:22 +02:00
  • 3d99892b94 Opj-Importer: fix coverity finding. Kim Kulling 2017-05-27 19:37:28 +02:00
  • 96839bd860 Unittests: fix import material test. Kim Kulling 2017-05-26 20:29:21 +02:00
  • 342b572281 Merge branch 'master' into coverity_scan Kim Kulling 2017-05-26 09:19:13 +02:00
  • 1cded5a186 Merge branch 'coverity_scan' of https://github.com/assimp/assimp into coverity_scan Kim Kulling 2017-05-26 09:19:03 +02:00
  • e93355c8b4 Build: fix some compiler warnings for g++. Kim Kulling 2017-05-26 09:18:23 +02:00
  • 1b4cbcc6ad Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-05-25 22:40:36 +02:00
  • f3407ef804 aiMetaData: introduce aiMetaData::Dealloc. Kim Kulling 2017-05-25 22:35:27 +02:00
  • fb33199d99 GLTFImporter: exclude headers from build whem no_glft_importer is defined. Kim Kulling 2017-05-25 22:34:45 +02:00
  • 4d3dec718a Merge branch 'master' into coverity_scan Kim Kulling 2017-05-24 22:36:37 +02:00
  • b7d4b69e0d X3DImporter: fix the build. Kim Kulling 2017-05-24 22:35:35 +02:00
  • 3c370c83b9 MDLImporter: remove dead code. Kim Kulling 2017-05-24 21:18:51 +02:00
  • 18b0316d52 X3DImporter: fix coverity finding ( missing comma ). Kim Kulling 2017-05-24 21:15:55 +02:00
  • ec496a5833 X3DImporter: fix coverity finding. Kim Kulling 2017-05-24 21:04:35 +02:00
  • 9eb0a3f3d5 Fix error when custom CMAKE_C_FLAGS is specified rdb 2017-05-23 15:34:02 +02:00
  • 1bfff8ba1d ObjImporter: Add unittest. Kim Kulling 2017-05-22 21:11:01 +02:00
  • b84de79219 Merge pull request #1279 from Squareys/update-docs Kim Kulling 2017-05-20 20:45:26 +02:00
  • 3d5e94477f Merge pull request #1272 from assimp/issue-1262 Kim Kulling 2017-05-19 23:13:40 +02:00