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.
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
Kim Kulling [Fri, 2 Jun 2017 09:20:48 +0000 (11:20 +0200)]
Update CMakeLists.txt
Enable check for OpenMP-support.
Kim Kulling [Fri, 2 Jun 2017 08:33:17 +0000 (10:33 +0200)]
Merge pull request #1291 from Ias0601/samples
A new sample : Directx11 Textured Sample with embedded texture support
Ias0601 [Thu, 1 Jun 2017 15:42:48 +0000 (21:12 +0530)]
Update ModelLoader.cpp
Ias0601 [Thu, 1 Jun 2017 15:41:48 +0000 (21:11 +0530)]
Update Mesh.h
Kim Kulling [Thu, 1 Jun 2017 14:22:25 +0000 (16:22 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 1 Jun 2017 14:22:14 +0000 (16:22 +0200)]
Kim Kulling [Thu, 1 Jun 2017 14:21:23 +0000 (16:21 +0200)]
Viewer: fix the build.
Ias0601 [Thu, 1 Jun 2017 13:59:22 +0000 (19:29 +0530)]
Add files via upload
Ias0601 [Thu, 1 Jun 2017 13:58:25 +0000 (19:28 +0530)]
Add files via upload
Ias0601 [Thu, 1 Jun 2017 13:55:25 +0000 (19:25 +0530)]
Create main.cpp
Ias0601 [Thu, 1 Jun 2017 13:54:41 +0000 (19:24 +0530)]
Delete SimpleTexturedDirectx11.sln
Ias0601 [Thu, 1 Jun 2017 13:54:08 +0000 (19:24 +0530)]
Add files via upload
Kim Kulling [Thu, 1 Jun 2017 13:50:19 +0000 (15:50 +0200)]
Update CMakeLists.txt
Build: Make windows headers much smaller.
Ias0601 [Thu, 1 Jun 2017 13:45:10 +0000 (19:15 +0530)]
Delete a.txt
Ias0601 [Thu, 1 Jun 2017 13:44:56 +0000 (19:14 +0530)]
Create a.txt
Leo Terziman [Thu, 1 Jun 2017 07:47:50 +0000 (09:47 +0200)]
Fixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the complete model
Kim Kulling [Wed, 31 May 2017 20:25:46 +0000 (22:25 +0200)]
Merge pull request #1290 from assimp/issue_1244
closes https://github.com/assimp/assimp/issues/1244: log error for
Kim Kulling [Wed, 31 May 2017 19:43:41 +0000 (21:43 +0200)]
closes https://github.com/assimp/assimp/issues/1244: log error for
overflow.
Kim Kulling [Wed, 31 May 2017 19:37:42 +0000 (21:37 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 31 May 2017 19:37:16 +0000 (21:37 +0200)]
ObjImporter: remove dead code.
Kim Kulling [Wed, 31 May 2017 19:34:59 +0000 (21:34 +0200)]
Merge pull request #1289 from assimp/obj_with_linebreaks
Obj with linebreaks
Kim Kulling [Wed, 31 May 2017 18:28:00 +0000 (20:28 +0200)]
ObjImporter: fix dead code.
Kim Kulling [Wed, 31 May 2017 18:18:39 +0000 (20:18 +0200)]
Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks
Kim Kulling [Wed, 31 May 2017 14:36:08 +0000 (16:36 +0200)]
ObjImporter: next try for multiple line stuff.
Kim Kulling [Tue, 30 May 2017 19:10:33 +0000 (21:10 +0200)]
ObjLoader: improve performance of obj-import.
Kim Kulling [Mon, 29 May 2017 20:00:13 +0000 (22:00 +0200)]
Obj-Importer: introduce working test for line breaks.
Kim Kulling [Mon, 29 May 2017 10:52:26 +0000 (12:52 +0200)]
Merge pull request #1282 from rdb/master
Fix error when custom CMAKE_C_FLAGS is specified
Kim Kulling [Sun, 28 May 2017 20:25:06 +0000 (22:25 +0200)]
Tests how o adress this topic.
Kim Kulling [Sun, 28 May 2017 12:14:22 +0000 (14:14 +0200)]
ObjImporter: fix the build.
Kim Kulling [Sat, 27 May 2017 17:37:28 +0000 (19:37 +0200)]
Opj-Importer: fix coverity finding.