Kim Kulling [Tue, 18 Jul 2017 15:03:45 +0000 (17:03 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Tue, 18 Jul 2017 15:02:21 +0000 (17:02 +0200)]
PlyLoader: fix out of bound access.
Kim Kulling [Mon, 17 Jul 2017 09:23:29 +0000 (11:23 +0200)]
Merge pull request #1350 from Madrich/master
Some fixes
Madrich [Mon, 17 Jul 2017 07:42:26 +0000 (09:42 +0200)]
Fix Collada export image tag
Fix compiler double issues
Madrich [Mon, 17 Jul 2017 07:07:41 +0000 (09:07 +0200)]
Merge pull request #13 from assimp/master
Update fork
Kim Kulling [Sat, 15 Jul 2017 23:02:33 +0000 (01:02 +0200)]
fix compiler warnings.
Kim Kulling [Sat, 15 Jul 2017 18:55:57 +0000 (20:55 +0200)]
Merge pull request #1347 from rickomax/master
Fixed many FBX bugs
rickomax [Sat, 15 Jul 2017 14:22:14 +0000 (11:22 -0300)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 15 Jul 2017 09:08:59 +0000 (11:08 +0200)]
Merge pull request #1345 from jamesgk/master
Use unique node names when loading Collada files
Kim Kulling [Sat, 15 Jul 2017 09:08:08 +0000 (11:08 +0200)]
Merge pull request #1338 from pdaehne/master
X3D importer: Support for binary X3D files
rickomax [Sat, 15 Jul 2017 03:27:33 +0000 (00:27 -0300)]
Fixed many FBX bugs
Fixed a bug where FBX loader won´t load embedded textures that don´t have the Content data filled. Some FBX files only fill this data once, so any embedded texture with the same source filename, should use the pre-loaded data.
Fixed another bug where FBX Texture "Filename" field came different than on some files than the one defined by the code. One suggestion is load all properties by the case-insensitive function created.
Added the "AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES" flag to tell the importer to load embedded texture data from already loaded ones.
jamesgk [Fri, 14 Jul 2017 18:42:55 +0000 (11:42 -0700)]
Use unique node names when loading Collada files
Kim Kulling [Wed, 12 Jul 2017 19:28:37 +0000 (21:28 +0200)]
Merge pull request #1337 from terziman/master
Added support for metadata in assbin format
Patrick Dähne [Wed, 12 Jul 2017 18:48:49 +0000 (20:48 +0200)]
X3D importer: Fixed iterator on MSVC 2015
Kim Kulling [Wed, 12 Jul 2017 18:35:50 +0000 (20:35 +0200)]
update python readme.
Patrick Dähne [Wed, 12 Jul 2017 17:57:10 +0000 (19:57 +0200)]
X3D importer: Fixed problems with auto, override and regex on older compilers
Patrick Dähne [Tue, 11 Jul 2017 19:32:47 +0000 (21:32 +0200)]
X3D importer: Fixed missing header file
Patrick Dähne [Tue, 11 Jul 2017 17:41:24 +0000 (19:41 +0200)]
X3D importer: Fixed path handling
Patrick Dähne [Tue, 11 Jul 2017 17:28:40 +0000 (19:28 +0200)]
X3D importer: Implemented support for binary X3D files
Leo Terziman [Tue, 11 Jul 2017 16:15:56 +0000 (18:15 +0200)]
Fixed bug in assbin metadata export when no metadata are defined
Leo Terziman [Tue, 11 Jul 2017 15:39:36 +0000 (17:39 +0200)]
Added support for metadata in assbin format
Kim Kulling [Tue, 11 Jul 2017 08:42:10 +0000 (10:42 +0200)]
Collada: add workaround to deal with polygon with holes .
Kim Kulling [Mon, 10 Jul 2017 11:39:29 +0000 (13:39 +0200)]
closes https://github.com/assimp/assimp/issues/1335: use correct path
for compilers.
Kim Kulling [Sun, 9 Jul 2017 20:17:35 +0000 (22:17 +0200)]
Fix compiler warnings + one review finding.
Kim Kulling [Fri, 7 Jul 2017 16:38:51 +0000 (18:38 +0200)]
Merge pull request #1334 from assimp/x_deals_with_lines
X-Importer: make it deal with lines.
Kim Kulling [Fri, 7 Jul 2017 14:34:08 +0000 (16:34 +0200)]
X-Importer: make it deal with lines.
Kim Kulling [Thu, 6 Jul 2017 06:34:55 +0000 (08:34 +0200)]
Merge pull request #1333 from gongminmin/master
Remove std functions deprecated by C++11.
Minmin Gong [Wed, 5 Jul 2017 00:01:03 +0000 (17:01 -0700)]
Remove std functions deprecated by C++11.
Kim Kulling [Sat, 1 Jul 2017 08:42:47 +0000 (10:42 +0200)]
add missing coverity token.
Kim Kulling [Wed, 28 Jun 2017 20:13:49 +0000 (22:13 +0200)]
closes https://github.com/assimp/assimp/issues/1320: check if all
exporters are disabled.
Kim Kulling [Wed, 28 Jun 2017 20:09:53 +0000 (22:09 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 28 Jun 2017 20:09:20 +0000 (22:09 +0200)]
Merge pull request #1318 from rspencer01/master
Fixes parameters to pyassimp.load
Kim Kulling [Wed, 28 Jun 2017 20:08:44 +0000 (22:08 +0200)]
Merge pull request #1322 from assimp/issue_1319
closes https://github.com/assimp/assimp/issues/1319: fix build without
Kim Kulling [Wed, 28 Jun 2017 20:08:20 +0000 (22:08 +0200)]
fix review findings.,
Kim Kulling [Wed, 28 Jun 2017 18:26:15 +0000 (20:26 +0200)]
add missing coverity scan token.
Kim Kulling [Wed, 28 Jun 2017 18:11:13 +0000 (20:11 +0200)]
fix unittests.
Kim Kulling [Tue, 27 Jun 2017 11:26:36 +0000 (13:26 +0200)]
Merge pull request #1323 from vkovalev123/master
Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attr…
Vitaly Kovalev [Tue, 27 Jun 2017 10:52:43 +0000 (13:52 +0300)]
Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attributes
Signed-off-by: Vitaly Kovalev <vkovalev@gkmsoft.ru>
Kim Kulling [Mon, 26 Jun 2017 20:01:15 +0000 (22:01 +0200)]
closes https://github.com/assimp/assimp/issues/1319: fix build without
3DS.
Kim Kulling [Mon, 26 Jun 2017 19:04:25 +0000 (21:04 +0200)]
Merge pull request #1321 from pdaehne/master
Fixes for X3DImporter/X3DExporter
Patrick Dähne [Mon, 26 Jun 2017 13:25:15 +0000 (15:25 +0200)]
Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet
Robert Spencer [Sun, 25 Jun 2017 13:10:11 +0000 (15:10 +0200)]
Fixes parameters to pyassimp.load
Commit
704e57db4ee640262b8b20f4b687c15231d64354 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.
Kim Kulling [Sun, 25 Jun 2017 11:21:36 +0000 (13:21 +0200)]
OpenDDLParser: latest greatest.
Patrick Dähne [Fri, 23 Jun 2017 09:59:14 +0000 (11:59 +0200)]
X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags
Patrick Dähne [Thu, 22 Jun 2017 18:48:33 +0000 (20:48 +0200)]
X3D Exporter: fixed missing attributes
Patrick Dähne [Thu, 22 Jun 2017 16:54:03 +0000 (18:54 +0200)]
X3D importer: Fixed import of normals for the single index / normal per vertex case
Patrick Dähne [Thu, 22 Jun 2017 14:29:26 +0000 (16:29 +0200)]
X3D importer: Fixed handling of inlined files
Patrick Dähne [Thu, 22 Jun 2017 13:05:23 +0000 (15:05 +0200)]
X3D importer: fixed whitespace handling (issue #1202)
Kim Kulling [Thu, 22 Jun 2017 08:11:54 +0000 (10:11 +0200)]
Update Readme.md
Inproved readme.
Kim Kulling [Thu, 22 Jun 2017 08:07:02 +0000 (10:07 +0200)]
Update Readme.md
Add the donation button.
Kim Kulling [Thu, 22 Jun 2017 06:31:07 +0000 (08:31 +0200)]
Merge pull request #1314 from jamesgk/gltf-export
GLTF exporter: ensure buffer view byte offsets are correctly aligned
Kim Kulling [Thu, 22 Jun 2017 06:30:11 +0000 (08:30 +0200)]
Merge pull request #1311 from PetrPPetrov/master
Fixed bug in material color processing
Kim Kulling [Wed, 21 Jun 2017 21:06:53 +0000 (23:06 +0200)]
LWO: use forward declaration in header.
Kim Kulling [Wed, 21 Jun 2017 21:02:46 +0000 (23:02 +0200)]
Fix compiler warnings.
Kim Kulling [Wed, 21 Jun 2017 21:02:26 +0000 (23:02 +0200)]
unittest: fix compiler warning.
jamesgk [Tue, 20 Jun 2017 21:15:41 +0000 (14:15 -0700)]
GLTF exporter: ensure buffer view byte offsets are correctly aligned
Kim Kulling [Wed, 21 Jun 2017 14:41:47 +0000 (16:41 +0200)]
Merge pull request #1313 from assimp/issue_586_make_scenecombiner_public
Issue 586 make scenecombiner public
Kim Kulling [Wed, 21 Jun 2017 13:24:06 +0000 (15:24 +0200)]
SceneCombiner: fix the build.
Kim Kulling [Wed, 21 Jun 2017 12:31:37 +0000 (14:31 +0200)]
SceneCOmbiner: Fix the build.
Kim Kulling [Wed, 21 Jun 2017 12:21:16 +0000 (14:21 +0200)]
SceneCombiner: move header for scenecombiner to public folder.
Petr Petrovich Petrov [Tue, 20 Jun 2017 11:29:16 +0000 (14:29 +0300)]
Fixed bug in material color processing
Thanks to @evgeny-panasyuk
Kim Kulling [Mon, 19 Jun 2017 19:07:18 +0000 (21:07 +0200)]
openddlparser: closes https://github.com/assimp/assimp/issues/1271.
Madrich [Sun, 18 Jun 2017 21:16:00 +0000 (23:16 +0200)]
Merge pull request #12 from assimp/master
Update Fork
Kim Kulling [Sat, 17 Jun 2017 19:17:39 +0000 (21:17 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 17 Jun 2017 19:17:05 +0000 (21:17 +0200)]
Merge pull request #1310 from assimp/new_cpputf8_issue_1309
New cpputf8 issue 1309
Kim Kulling [Sat, 17 Jun 2017 18:36:59 +0000 (20:36 +0200)]
remove dead code.
Kim Kulling [Sat, 17 Jun 2017 17:38:47 +0000 (19:38 +0200)]
Utf8: integrate new lib.
Kim Kulling [Fri, 16 Jun 2017 14:43:39 +0000 (16:43 +0200)]
UTF8Encoding: introduce new lib.
Kim Kulling [Thu, 15 Jun 2017 18:24:10 +0000 (20:24 +0200)]
ObjImporter: remove dead code.
Kim Kulling [Thu, 15 Jun 2017 06:37:44 +0000 (08:37 +0200)]
unittest: Fix compiler warning
Kim Kulling [Tue, 13 Jun 2017 18:29:25 +0000 (20:29 +0200)]
travis ci: enable sudo support.
Kim Kulling [Mon, 12 Jun 2017 07:12:49 +0000 (09:12 +0200)]
Merge pull request #1304 from malytomas/master
fixed CMAKE_MODULE_PATH overwriting previous values
Tomas Maly [Sat, 10 Jun 2017 18:12:12 +0000 (20:12 +0200)]
fixed CMAKE_MODULE_PATH overwriting previous values
Kim Kulling [Sat, 10 Jun 2017 09:19:25 +0000 (11:19 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 9 Jun 2017 21:02:30 +0000 (23:02 +0200)]
Merge pull request #1300 from assimp/ply_export_test
ply-exporter: add unittest.
Kim Kulling [Fri, 9 Jun 2017 19:57:41 +0000 (21:57 +0200)]
Unittests: fix uppercase typo in export path for ply export test.
Kim Kulling [Fri, 9 Jun 2017 18:24:31 +0000 (20:24 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 9 Jun 2017 18:20:24 +0000 (20:20 +0200)]
Unitetsts: reformats.
Alexander Gessler [Fri, 9 Jun 2017 18:14:51 +0000 (20:14 +0200)]
Merge pull request #1302 from terziman/master
Fix IFC bug of partially imported models
Leo Terziman [Thu, 8 Jun 2017 09:01:11 +0000 (11:01 +0200)]
Merge remote-tracking branch 'github/master' into contrib
Kim Kulling [Thu, 8 Jun 2017 07:13:44 +0000 (09:13 +0200)]
Create .travis.yml
Fix build.
Kim Kulling [Wed, 7 Jun 2017 19:10:52 +0000 (21:10 +0200)]
travis: exclose some build env to avoid double tests.
Kim Kulling [Wed, 7 Jun 2017 18:23:50 +0000 (20:23 +0200)]
Matrix: some reformattings.
Kim Kulling [Wed, 7 Jun 2017 12:41:52 +0000 (14:41 +0200)]
Merge pull request #1298 from severin-lemaignan/master
Revert "Installing assimp library as well"
Kim Kulling [Wed, 7 Jun 2017 12:06:38 +0000 (14:06 +0200)]
ply-exporter: add unittest.
Kim Kulling [Wed, 7 Jun 2017 11:41:09 +0000 (13:41 +0200)]
Merge pull request #1299 from assimp/travis_osx_support
travis-ci: reenable osx.
Kim Kulling [Wed, 7 Jun 2017 09:48:00 +0000 (11:48 +0200)]
travis-ci: fix unittest executor.
Kim Kulling [Wed, 7 Jun 2017 08:30:40 +0000 (10:30 +0200)]
travis-ci: disable tests for osx.
Kim Kulling [Wed, 7 Jun 2017 07:32:48 +0000 (09:32 +0200)]
travis-ci: disable coverage test for osx.
Kim Kulling [Tue, 6 Jun 2017 21:58:00 +0000 (23:58 +0200)]
travis-ci: use correct package name.
Kim Kulling [Tue, 6 Jun 2017 19:41:39 +0000 (21:41 +0200)]
travis-ci: add missing close bracket for if block.
Kim Kulling [Tue, 6 Jun 2017 14:57:19 +0000 (16:57 +0200)]
travis-ci: reenable osx.
Séverin Lemaignan [Tue, 6 Jun 2017 14:14:18 +0000 (15:14 +0100)]
Revert "Installing assimp library as well"
This reverts commit
33bd5cfcfb0f27794a333273b20b60a7a550d184.
Installing the assimp library from setup.py is *not* a good idea as
it will break every packaging effort.
Besides, the original commit relies on an hard-coded path to find the
library that may not exist.
Kim Kulling [Tue, 6 Jun 2017 09:58:36 +0000 (11:58 +0200)]
Fix build.
Kim Kulling [Tue, 6 Jun 2017 09:55:37 +0000 (11:55 +0200)]
Merge pull request #1293 from arkeon7/PLY_refactoring
PLYImporter refactoring
Kim Kulling [Tue, 6 Jun 2017 09:38:08 +0000 (11:38 +0200)]
travis-ci: enable oxs-build.
Kim Kulling [Tue, 6 Jun 2017 09:37:02 +0000 (11:37 +0200)]
SpatialSort: use much easier reabability.
Kim Kulling [Sat, 3 Jun 2017 07:25:20 +0000 (09:25 +0200)]
Sample: update dx11 texture loader.
arkeon [Fri, 2 Jun 2017 20:19:41 +0000 (22:19 +0200)]
Ply importer with correction from last general trunk merge
Arkeon [Fri, 2 Jun 2017 11:24:56 +0000 (13:24 +0200)]
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
IFC :
- update poly2tri to avoid crash on some IFC files
Collada :
- manage missing texture reference in collada import