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

4826 Commits (87546ec54c801750333512304e0f2baa2a72f3bd)

Author SHA1 Message Date
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
Madrich 1eca19b400 Merge pull request #12 from assimp/master 
Update Fork
 2017-06-18 23:16:00 +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
Kim Kulling 616a18b0c7 Unittests: fix uppercase typo in export path for ply export test. 2017-06-09 21:57:41 +02:00
Kim Kulling 6329a0e62b Merge branch 'master' of https://github.com/assimp/assimp 2017-06-09 20:24:31 +02:00
Kim Kulling ad74bfc260 Unitetsts: reformats. 2017-06-09 20:20:24 +02:00
Alexander Gessler fae5a0e71a Merge pull request #1302 from terziman/master 
Fix IFC bug of partially imported models
 2017-06-09 20:14:51 +02:00
Leo Terziman 4974c99288 Merge remote-tracking branch 'github/master' into contrib 2017-06-08 11:01:11 +02:00
Kim Kulling 1eb1c5ed4e Create .travis.yml 
Fix build.
 2017-06-08 09:13:44 +02:00
Kim Kulling ab9aa67c49 travis: exclose some build env to avoid double tests. 2017-06-07 21:10:52 +02:00
Kim Kulling 0d3e826182 Matrix: some reformattings. 2017-06-07 20:23:50 +02:00
Kim Kulling ea61e8bc5b Merge pull request #1298 from severin-lemaignan/master 
Revert "Installing assimp library as well"
 2017-06-07 14:41:52 +02:00
Kim Kulling 548c09271b ply-exporter: add unittest. 2017-06-07 14:06:38 +02:00
Kim Kulling 30e88af520 Merge pull request #1299 from assimp/travis_osx_support 
travis-ci: reenable osx.
 2017-06-07 13:41:09 +02:00
Kim Kulling 1792333031 travis-ci: fix unittest executor. 2017-06-07 11:48:00 +02:00
Kim Kulling 098e2ffaf9 travis-ci: disable tests for osx. 2017-06-07 10:30:40 +02:00
Kim Kulling a687354674 travis-ci: disable coverage test for osx. 2017-06-07 09:32:48 +02:00
Kim Kulling e08577adf7 travis-ci: use correct package name. 2017-06-06 23:58:00 +02:00
Kim Kulling 846fa1f55e travis-ci: add missing close bracket for if block. 2017-06-06 21:41:39 +02:00
Kim Kulling 074caf971b travis-ci: reenable osx. 2017-06-06 16:57:19 +02:00
Séverin Lemaignan 4d37f90ea5 Revert "Installing assimp library as well" 
This reverts commit 33bd5cfcfb.

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.
 2017-06-06 15:14:18 +01:00
Kim Kulling 6730d658d7 Fix build. 2017-06-06 11:58:36 +02:00
Kim Kulling 7f8839b1f4 Merge pull request #1293 from arkeon7/PLY_refactoring 
PLYImporter refactoring
 2017-06-06 11:55:37 +02:00
Kim Kulling 1f88310f17 travis-ci: enable oxs-build. 2017-06-06 11:38:08 +02:00
Kim Kulling 19d59b630b SpatialSort: use much easier reabability. 2017-06-06 11:37:02 +02:00
Kim Kulling ff83701a6f Sample: update dx11 texture loader. 2017-06-03 09:25:20 +02:00
arkeon 44a9f80e40 Ply importer with correction from last general trunk merge 2017-06-02 22:19:41 +02:00
Arkeon 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 
IFC :
 - update poly2tri to avoid crash on some IFC files

Collada :
 - manage missing texture reference in collada import
 2017-06-02 13:48:57 +02:00
Kim Kulling dcc5887817 Update CMakeLists.txt 
Enable check for OpenMP-support.
 2017-06-02 11:20:48 +02:00
Kim Kulling 71ad42b603 Merge pull request #1291 from Ias0601/samples 
A new sample : Directx11 Textured Sample with embedded texture support
 2017-06-02 10:33:17 +02:00
Ias0601 db4b959868 Update ModelLoader.cpp 2017-06-01 21:12:48 +05:30