platform/upstream/assimp.git
7 years agoX3D importer: Fixed handling of inlined files
Patrick Dähne [Thu, 22 Jun 2017 14:29:26 +0000 (16:29 +0200)]
X3D importer: Fixed handling of inlined files

7 years agoX3D importer: fixed whitespace handling (issue #1202)
Patrick Dähne [Thu, 22 Jun 2017 13:05:23 +0000 (15:05 +0200)]
X3D importer: fixed whitespace handling (issue #1202)

7 years agoopenddlparser: closes https://github.com/assimp/assimp/issues/1271.
Kim Kulling [Mon, 19 Jun 2017 19:07:18 +0000 (21:07 +0200)]
openddlparser: closes https://github.com/assimp/assimp/issues/1271.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 17 Jun 2017 19:17:39 +0000 (21:17 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoMerge pull request #1310 from assimp/new_cpputf8_issue_1309
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

7 years agoremove dead code.
Kim Kulling [Sat, 17 Jun 2017 18:36:59 +0000 (20:36 +0200)]
remove dead code.

7 years agoUtf8: integrate new lib.
Kim Kulling [Sat, 17 Jun 2017 17:38:47 +0000 (19:38 +0200)]
Utf8: integrate new lib.

7 years agoUTF8Encoding: introduce new lib.
Kim Kulling [Fri, 16 Jun 2017 14:43:39 +0000 (16:43 +0200)]
UTF8Encoding: introduce new lib.

7 years agoObjImporter: remove dead code.
Kim Kulling [Thu, 15 Jun 2017 18:24:10 +0000 (20:24 +0200)]
ObjImporter: remove dead code.

7 years agounittest: Fix compiler warning
Kim Kulling [Thu, 15 Jun 2017 06:37:44 +0000 (08:37 +0200)]
unittest: Fix compiler warning

7 years agotravis ci: enable sudo support.
Kim Kulling [Tue, 13 Jun 2017 18:29:25 +0000 (20:29 +0200)]
travis ci: enable sudo support.

7 years agoMerge pull request #1304 from malytomas/master
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

7 years agofixed 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

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 10 Jun 2017 09:19:25 +0000 (11:19 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoMerge pull request #1300 from assimp/ply_export_test
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.

7 years agoUnittests: fix uppercase typo in export path for ply export test.
Kim Kulling [Fri, 9 Jun 2017 19:57:41 +0000 (21:57 +0200)]
Unittests: fix uppercase typo in export path for ply export test.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 9 Jun 2017 18:24:31 +0000 (20:24 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoUnitetsts: reformats.
Kim Kulling [Fri, 9 Jun 2017 18:20:24 +0000 (20:20 +0200)]
Unitetsts: reformats.

7 years agoMerge pull request #1302 from terziman/master
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

7 years agoMerge remote-tracking branch 'github/master' into contrib
Leo Terziman [Thu, 8 Jun 2017 09:01:11 +0000 (11:01 +0200)]
Merge remote-tracking branch 'github/master' into contrib

7 years agoCreate .travis.yml
Kim Kulling [Thu, 8 Jun 2017 07:13:44 +0000 (09:13 +0200)]
Create .travis.yml

Fix build.

7 years agotravis: exclose some build env to avoid double tests.
Kim Kulling [Wed, 7 Jun 2017 19:10:52 +0000 (21:10 +0200)]
travis: exclose some build env to avoid double tests.

7 years agoMatrix: some reformattings.
Kim Kulling [Wed, 7 Jun 2017 18:23:50 +0000 (20:23 +0200)]
Matrix: some reformattings.

7 years agoMerge pull request #1298 from severin-lemaignan/master
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"

7 years agoply-exporter: add unittest.
Kim Kulling [Wed, 7 Jun 2017 12:06:38 +0000 (14:06 +0200)]
ply-exporter: add unittest.

7 years agoMerge pull request #1299 from assimp/travis_osx_support
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.

7 years agotravis-ci: fix unittest executor.
Kim Kulling [Wed, 7 Jun 2017 09:48:00 +0000 (11:48 +0200)]
travis-ci: fix unittest executor.

7 years agotravis-ci: disable tests for osx.
Kim Kulling [Wed, 7 Jun 2017 08:30:40 +0000 (10:30 +0200)]
travis-ci: disable tests for osx.

7 years agotravis-ci: disable coverage test for osx.
Kim Kulling [Wed, 7 Jun 2017 07:32:48 +0000 (09:32 +0200)]
travis-ci: disable coverage test for osx.

7 years agotravis-ci: use correct package name.
Kim Kulling [Tue, 6 Jun 2017 21:58:00 +0000 (23:58 +0200)]
travis-ci: use correct package name.

7 years agotravis-ci: add missing close bracket for if block.
Kim Kulling [Tue, 6 Jun 2017 19:41:39 +0000 (21:41 +0200)]
travis-ci: add missing close bracket for if block.

7 years agotravis-ci: reenable osx.
Kim Kulling [Tue, 6 Jun 2017 14:57:19 +0000 (16:57 +0200)]
travis-ci: reenable osx.

7 years agoRevert "Installing assimp library as well"
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.

7 years agoFix build.
Kim Kulling [Tue, 6 Jun 2017 09:58:36 +0000 (11:58 +0200)]
Fix build.

7 years agoMerge pull request #1293 from arkeon7/PLY_refactoring
Kim Kulling [Tue, 6 Jun 2017 09:55:37 +0000 (11:55 +0200)]
Merge pull request #1293 from arkeon7/PLY_refactoring

PLYImporter refactoring

7 years agotravis-ci: enable oxs-build.
Kim Kulling [Tue, 6 Jun 2017 09:38:08 +0000 (11:38 +0200)]
travis-ci: enable oxs-build.

7 years agoSpatialSort: use much easier reabability.
Kim Kulling [Tue, 6 Jun 2017 09:37:02 +0000 (11:37 +0200)]
SpatialSort: use much easier reabability.

7 years agoSample: update dx11 texture loader.
Kim Kulling [Sat, 3 Jun 2017 07:25:20 +0000 (09:25 +0200)]
Sample: update dx11 texture loader.

7 years agoPly importer with correction from last general trunk merge
arkeon [Fri, 2 Jun 2017 20:19:41 +0000 (22:19 +0200)]
Ply importer with correction from last general trunk merge

7 years agoPLYImporter: - optimize memory and speed on ply importer / change parser to use a...
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

7 years agoUpdate CMakeLists.txt
Kim Kulling [Fri, 2 Jun 2017 09:20:48 +0000 (11:20 +0200)]
Update CMakeLists.txt

Enable check for OpenMP-support.

7 years agoMerge pull request #1291 from Ias0601/samples
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

7 years agoUpdate ModelLoader.cpp
Ias0601 [Thu, 1 Jun 2017 15:42:48 +0000 (21:12 +0530)]
Update ModelLoader.cpp

7 years agoUpdate Mesh.h
Ias0601 [Thu, 1 Jun 2017 15:41:48 +0000 (21:11 +0530)]
Update Mesh.h

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 1 Jun 2017 14:22:25 +0000 (16:22 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoMerge commit 'cab6cdf7'
Kim Kulling [Thu, 1 Jun 2017 14:22:14 +0000 (16:22 +0200)]
Merge commit 'cab6cdf7'

7 years agoViewer: fix the build.
Kim Kulling [Thu, 1 Jun 2017 14:21:23 +0000 (16:21 +0200)]
Viewer: fix the build.

7 years agoAdd files via upload
Ias0601 [Thu, 1 Jun 2017 13:59:22 +0000 (19:29 +0530)]
Add files via upload

7 years agoAdd files via upload
Ias0601 [Thu, 1 Jun 2017 13:58:25 +0000 (19:28 +0530)]
Add files via upload

7 years agoCreate main.cpp
Ias0601 [Thu, 1 Jun 2017 13:55:25 +0000 (19:25 +0530)]
Create main.cpp

7 years agoDelete SimpleTexturedDirectx11.sln
Ias0601 [Thu, 1 Jun 2017 13:54:41 +0000 (19:24 +0530)]
Delete SimpleTexturedDirectx11.sln

7 years agoAdd files via upload
Ias0601 [Thu, 1 Jun 2017 13:54:08 +0000 (19:24 +0530)]
Add files via upload

7 years agoUpdate CMakeLists.txt
Kim Kulling [Thu, 1 Jun 2017 13:50:19 +0000 (15:50 +0200)]
Update CMakeLists.txt

Build: Make windows headers much smaller.

7 years agoDelete a.txt
Ias0601 [Thu, 1 Jun 2017 13:45:10 +0000 (19:15 +0530)]
Delete a.txt

7 years agoCreate a.txt
Ias0601 [Thu, 1 Jun 2017 13:44:56 +0000 (19:14 +0530)]
Create a.txt

7 years agoFixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the...
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

7 years agoMerge pull request #1290 from assimp/issue_1244
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

7 years agocloses 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.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 31 May 2017 19:37:42 +0000 (21:37 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoObjImporter: remove dead code.
Kim Kulling [Wed, 31 May 2017 19:37:16 +0000 (21:37 +0200)]
ObjImporter: remove dead code.

7 years agoMerge pull request #1289 from assimp/obj_with_linebreaks
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

7 years agoObjImporter: fix dead code.
Kim Kulling [Wed, 31 May 2017 18:28:00 +0000 (20:28 +0200)]
ObjImporter: fix dead code.

7 years agoMerge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_...
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

7 years agoObjImporter: next try for multiple line stuff.
Kim Kulling [Wed, 31 May 2017 14:36:08 +0000 (16:36 +0200)]
ObjImporter: next try for multiple line stuff.

7 years agoObjLoader: improve performance of obj-import.
Kim Kulling [Tue, 30 May 2017 19:10:33 +0000 (21:10 +0200)]
ObjLoader: improve performance of obj-import.

7 years agoObj-Importer: introduce working test for line breaks.
Kim Kulling [Mon, 29 May 2017 20:00:13 +0000 (22:00 +0200)]
Obj-Importer: introduce working test for line breaks.

7 years agoMerge pull request #1282 from rdb/master
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

7 years agoTests how o adress this topic.
Kim Kulling [Sun, 28 May 2017 20:25:06 +0000 (22:25 +0200)]
Tests how o adress this topic.

7 years agoObjImporter: fix the build.
Kim Kulling [Sun, 28 May 2017 12:14:22 +0000 (14:14 +0200)]
ObjImporter: fix the build.

7 years agoOpj-Importer: fix coverity finding.
Kim Kulling [Sat, 27 May 2017 17:37:28 +0000 (19:37 +0200)]
Opj-Importer: fix coverity finding.

7 years agoUnittests: fix import material test.
Kim Kulling [Fri, 26 May 2017 18:29:21 +0000 (20:29 +0200)]
Unittests: fix import material test.

7 years agoBuild: fix some compiler warnings for g++.
Kim Kulling [Fri, 26 May 2017 07:18:23 +0000 (09:18 +0200)]
Build: fix some compiler warnings for g++.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 25 May 2017 20:40:36 +0000 (22:40 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoaiMetaData: introduce aiMetaData::Dealloc.
Kim Kulling [Thu, 25 May 2017 20:35:27 +0000 (22:35 +0200)]
aiMetaData: introduce aiMetaData::Dealloc.

7 years agoGLTFImporter: exclude headers from build whem no_glft_importer is
Kim Kulling [Thu, 25 May 2017 20:34:45 +0000 (22:34 +0200)]
GLTFImporter: exclude headers from build whem no_glft_importer is
defined.

7 years agoX3DImporter: fix the build.
Kim Kulling [Wed, 24 May 2017 20:35:35 +0000 (22:35 +0200)]
X3DImporter: fix the build.

7 years agoMDLImporter: remove dead code.
Kim Kulling [Wed, 24 May 2017 19:18:51 +0000 (21:18 +0200)]
MDLImporter: remove dead code.

7 years agoX3DImporter: fix coverity finding ( missing comma ).
Kim Kulling [Wed, 24 May 2017 19:15:55 +0000 (21:15 +0200)]
X3DImporter: fix coverity finding ( missing comma ).

7 years agoX3DImporter: fix coverity finding.
Kim Kulling [Wed, 24 May 2017 19:04:35 +0000 (21:04 +0200)]
X3DImporter: fix coverity finding.

7 years agoFix error when custom CMAKE_C_FLAGS is specified
rdb [Tue, 23 May 2017 13:34:02 +0000 (15:34 +0200)]
Fix error when custom CMAKE_C_FLAGS is specified

7 years agoObjImporter: Add unittest.
Kim Kulling [Mon, 22 May 2017 19:11:01 +0000 (21:11 +0200)]
ObjImporter: Add unittest.

7 years agoMerge pull request #1279 from Squareys/update-docs
Kim Kulling [Sat, 20 May 2017 18:45:26 +0000 (20:45 +0200)]
Merge pull request #1279 from Squareys/update-docs

Update docs (Logging, Preamble Copyright and embedded Textures)

7 years agoMerge pull request #1272 from assimp/issue-1262
Kim Kulling [Fri, 19 May 2017 21:13:40 +0000 (23:13 +0200)]
Merge pull request #1272 from assimp/issue-1262

closes https://github.com/assimp/assimp/issues/1262: fix .

7 years agoOpenGEX: fix lowercase typo for linux.
Kim Kulling [Fri, 19 May 2017 21:00:57 +0000 (23:00 +0200)]
OpenGEX: fix lowercase typo for linux.

7 years agodocs: Explain texture paths for embedded textures
Squareys [Fri, 19 May 2017 11:31:20 +0000 (13:31 +0200)]
docs: Explain texture paths for embedded textures

7 years agodocs: Update logging docs
Squareys [Fri, 19 May 2017 11:30:48 +0000 (13:30 +0200)]
docs: Update logging docs

7 years agodocs: Update copyright notice in preamble
Squareys [Fri, 19 May 2017 11:30:11 +0000 (13:30 +0200)]
docs: Update copyright notice in preamble

7 years agoMerge pull request #1212 from aoowweenn/umw_dev
Kim Kulling [Wed, 17 May 2017 10:01:46 +0000 (12:01 +0200)]
Merge pull request #1212 from aoowweenn/umw_dev

MikuMikuDance Format

7 years agoMerge pull request #1275 from ab4d/master
Kim Kulling [Wed, 17 May 2017 09:34:35 +0000 (11:34 +0200)]
Merge pull request #1275 from ab4d/master

Fixed build error in ObjExporter :: GetMaterialLibFileName

7 years agoMerge branch 'master' into issue-1262
Kim Kulling [Wed, 17 May 2017 08:20:45 +0000 (10:20 +0200)]
Merge branch 'master' into issue-1262

7 years agoObj-Exporter: fix build.
Kim Kulling [Wed, 17 May 2017 08:13:07 +0000 (10:13 +0200)]
Obj-Exporter: fix build.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 17 May 2017 07:25:30 +0000 (09:25 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoLWOLoader: fix link in loader description.
Kim Kulling [Wed, 17 May 2017 07:25:07 +0000 (09:25 +0200)]
LWOLoader: fix link in loader description.

7 years agoFixed build error in ObjExporter :: GetMaterialLibFileName
Andrej [Tue, 16 May 2017 20:18:47 +0000 (22:18 +0200)]
Fixed build error in ObjExporter :: GetMaterialLibFileName

7 years agoMerge pull request #1274 from ab4d/master
Kim Kulling [Tue, 16 May 2017 20:09:59 +0000 (22:09 +0200)]
Merge pull request #1274 from ab4d/master

Improved obj exporter to export materials to fileName.mtl file instead of fileName.obj.mtl

7 years agoUsing single quote for one character parameter in find_last_of method call
Andrej [Tue, 16 May 2017 19:56:49 +0000 (21:56 +0200)]
Using single quote for one character parameter in find_last_of method call

7 years agoMerge branch 'master' into issue-1262
Kim Kulling [Tue, 16 May 2017 19:53:35 +0000 (21:53 +0200)]
Merge branch 'master' into issue-1262

7 years agobuild: add missing files.
Kim Kulling [Tue, 16 May 2017 19:46:04 +0000 (21:46 +0200)]
build: add missing files.

7 years agoOpenGEX: fix invalid handling with color4 token.
Kim Kulling [Tue, 16 May 2017 19:45:23 +0000 (21:45 +0200)]
OpenGEX: fix invalid handling with color4 token.

7 years agocloses https://github.com/assimp/assimp/issues/1262: fix .
Kim Kulling [Tue, 16 May 2017 19:07:20 +0000 (21:07 +0200)]
closes https://github.com/assimp/assimp/issues/1262: fix .