v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,548 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

4548 Commits (647b59b7fa84586c59a60bf03f4d6a1f701c6b2d)

Author SHA1 Message Date
Kim Kulling 647b59b7fa Merge pull request #1334 from assimp/x_deals_with_lines 
X-Importer: make it deal with lines.
 2017-07-07 18:38:51 +02:00
Kim Kulling af216ec294 X-Importer: make it deal with lines. 2017-07-07 16:34:08 +02:00
Kim Kulling 5de0172869 Merge pull request #1333 from gongminmin/master 
Remove std functions deprecated by C++11.
 2017-07-06 08:34:55 +02:00
Minmin Gong 4efe7bfd41 Remove std functions deprecated by C++11. 2017-07-04 17:01:03 -07:00
Kim Kulling b38ba233f5 add missing coverity token. 2017-07-01 10:42:47 +02:00
Kim Kulling ac37e4ddba closes https://github.com/assimp/assimp/issues/1320: check if all 
exporters are disabled.
 2017-06-28 22:13:49 +02:00
Kim Kulling 616e62c4b8 Merge branch 'master' of https://github.com/assimp/assimp 2017-06-28 22:09:53 +02:00
Kim Kulling 3bf8c9dcf4 Merge pull request #1318 from rspencer01/master 
Fixes parameters to pyassimp.load
 2017-06-28 22:09:20 +02:00
Kim Kulling 12908506ab Merge pull request #1322 from assimp/issue_1319 
closes https://github.com/assimp/assimp/issues/1319: fix build without
 2017-06-28 22:08:44 +02:00
Kim Kulling f30fd58494 fix review findings., 2017-06-28 22:08:20 +02:00
Kim Kulling a8285f181d add missing coverity scan token. 2017-06-28 20:26:15 +02:00
Kim Kulling 27b7b44c9d fix unittests. 2017-06-28 20:11:13 +02:00
Kim Kulling 18538e353d Merge pull request #1323 from vkovalev123/master 
Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attr…
 2017-06-27 13:26:36 +02:00
Vitaly Kovalev 6891db99af Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attributes 
Signed-off-by: Vitaly Kovalev <vkovalev@gkmsoft.ru>
 2017-06-27 13:52:43 +03:00
Kim Kulling a408b92279 closes https://github.com/assimp/assimp/issues/1319: fix build without 
3DS.
 2017-06-26 22:01:15 +02:00
Kim Kulling 9ffc1a97c1 Merge pull request #1321 from pdaehne/master 
Fixes for X3DImporter/X3DExporter
 2017-06-26 21:04:25 +02:00
Patrick Dähne d8cac6eb24 Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet 2017-06-26 15:25:15 +02:00
Robert Spencer c6d888531b Fixes parameters to pyassimp.load 
Commit 704e57db4e changed the order
of the parameters to `pyassimp.load`.  The new order groups
`filename` and `file_type` which is preferable, but the samples and
other calls to `load` still point to the old order.  This fixes that
with named arguments where necessary.
 2017-06-25 15:18:53 +02:00
Kim Kulling afb2f3036e OpenDDLParser: latest greatest. 2017-06-25 13:21:36 +02:00
Patrick Dähne aaa476cb10 X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags 2017-06-23 11:59:14 +02:00
Patrick Dähne 3c8a4a5abb X3D Exporter: fixed missing attributes 2017-06-22 20:48:33 +02:00
Patrick Dähne 855589d2a1 X3D importer: Fixed import of normals for the single index / normal per vertex case 2017-06-22 18:54:03 +02:00
Patrick Dähne 6118f77d3b X3D importer: Fixed handling of inlined files 2017-06-22 16:29:26 +02:00
Patrick Dähne 840ed9dd34 X3D importer: fixed whitespace handling (issue #1202) 2017-06-22 15:05:23 +02:00
Kim Kulling 56a9d5c659 Update Readme.md 
Inproved readme.
 2017-06-22 10:11:54 +02:00
Kim Kulling f6c4edeb7d Update Readme.md 
Add the donation button.
 2017-06-22 10:07:02 +02:00
Kim Kulling 6aca0f86b4 Merge pull request #1314 from jamesgk/gltf-export 
GLTF exporter: ensure buffer view byte offsets are correctly aligned
 2017-06-22 08:31:07 +02:00
Kim Kulling b26add35a0 Merge pull request #1311 from PetrPPetrov/master 
Fixed bug in material color processing
 2017-06-22 08:30:11 +02:00
Kim Kulling 735e64309b LWO: use forward declaration in header. 2017-06-21 23:06:53 +02:00
Kim Kulling bd2af6591f Fix compiler warnings. 2017-06-21 23:02:46 +02:00
Kim Kulling 5011e382c7 unittest: fix compiler warning. 2017-06-21 23:02:26 +02:00
jamesgk 7e45c63901 GLTF exporter: ensure buffer view byte offsets are correctly aligned 2017-06-21 09:58:24 -07:00
Kim Kulling 3ed08971c4 Merge pull request #1313 from assimp/issue_586_make_scenecombiner_public 
Issue 586 make scenecombiner public
 2017-06-21 16:41:47 +02:00
Kim Kulling 439409bef2 SceneCombiner: fix the build. 2017-06-21 15:24:06 +02:00
Kim Kulling b727420cf2 SceneCOmbiner: Fix the build. 2017-06-21 14:31:37 +02:00
Kim Kulling 612ac234c5 SceneCombiner: move header for scenecombiner to public folder. 2017-06-21 14:21:16 +02:00
Petr Petrovich Petrov 323e470b3e Fixed bug in material color processing 
Thanks to @evgeny-panasyuk
 2017-06-20 14:29:16 +03:00
Kim Kulling 51b915c97b openddlparser: closes https://github.com/assimp/assimp/issues/1271. 2017-06-19 21:07:18 +02:00
Kim Kulling d3140a68ab Merge branch 'master' of https://github.com/assimp/assimp 2017-06-17 21:17:39 +02:00
Kim Kulling c62429998e Merge pull request #1310 from assimp/new_cpputf8_issue_1309 
New cpputf8 issue 1309
 2017-06-17 21:17:05 +02:00
Kim Kulling 64cbc69337 remove dead code. 2017-06-17 20:36:59 +02:00
Kim Kulling d7e13e67c4 Utf8: integrate new lib. 2017-06-17 19:38:47 +02:00
Kim Kulling 6e1034996e UTF8Encoding: introduce new lib. 2017-06-16 16:43:39 +02:00
Kim Kulling 79818145a7 ObjImporter: remove dead code. 2017-06-15 20:24:10 +02:00
Kim Kulling 51520cb5f1 unittest: Fix compiler warning 2017-06-15 08:37:44 +02:00
Kim Kulling a5a5343304 travis ci: enable sudo support. 2017-06-13 20:29:25 +02:00
Kim Kulling 056b6621ef Merge pull request #1304 from malytomas/master 
fixed CMAKE_MODULE_PATH overwriting previous values
 2017-06-12 09:12:49 +02:00
Tomas Maly 4399922ea1 fixed CMAKE_MODULE_PATH overwriting previous values 2017-06-10 20:12:12 +02:00
Kim Kulling e1df9e5be9 Merge branch 'master' of https://github.com/assimp/assimp 2017-06-10 11:19:25 +02:00
Kim Kulling 7977ded078 Merge pull request #1300 from assimp/ply_export_test 
ply-exporter: add unittest.
 2017-06-09 23:02:30 +02:00