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

4546 Commits (c27f35a6fdddcc4ba2a7dbf7595e8b9a4d98bcbc)

Author SHA1 Message Date
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
Ias0601 4456b7ca82 Update Mesh.h 2017-06-01 21:11:48 +05:30
Kim Kulling 9d69a12532 Merge branch 'master' of https://github.com/assimp/assimp 2017-06-01 16:22:25 +02:00
Kim Kulling b20a8e551f Merge commit 'cab6cdf7' 2017-06-01 16:22:14 +02:00
Kim Kulling cab6cdf7b2 Viewer: fix the build. 2017-06-01 16:21:23 +02:00
Ias0601 514244ffc2 Add files via upload 2017-06-01 19:29:22 +05:30
Ias0601 863ae1d80d Add files via upload 2017-06-01 19:28:25 +05:30
Ias0601 629e80ee4a Create main.cpp 2017-06-01 19:25:25 +05:30
Ias0601 4c2385b55b Delete SimpleTexturedDirectx11.sln 2017-06-01 19:24:41 +05:30
Ias0601 f02663fb5b Add files via upload 2017-06-01 19:24:08 +05:30
Kim Kulling 0a35fa0aef Update CMakeLists.txt 
Build: Make windows headers much smaller.
 2017-06-01 15:50:19 +02:00
Ias0601 8974a4f326 Delete a.txt 2017-06-01 19:15:10 +05:30
Ias0601 6782a69d0b Create a.txt 2017-06-01 19:14:56 +05:30
Leo Terziman ca5ac0b532 Fixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the complete model 2017-06-01 09:47:50 +02:00
Kim Kulling 3d088e5d90 Merge pull request #1290 from assimp/issue_1244 
closes https://github.com/assimp/assimp/issues/1244: log error for
 2017-05-31 22:25:46 +02:00
Kim Kulling 9e98097aae closes https://github.com/assimp/assimp/issues/1244: log error for 
overflow.
 2017-05-31 21:43:41 +02:00
Kim Kulling 8c6f18ea2a Merge branch 'master' of https://github.com/assimp/assimp 2017-05-31 21:37:42 +02:00
Kim Kulling 1207a81b70 ObjImporter: remove dead code. 2017-05-31 21:37:16 +02:00
Kim Kulling 9da181cff1 Merge pull request #1289 from assimp/obj_with_linebreaks 
Obj with linebreaks
 2017-05-31 21:34:59 +02:00
Kim Kulling 4dc7940ac5 ObjImporter: fix dead code. 2017-05-31 20:28:00 +02:00
Kim Kulling e501cc17c2 Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks 2017-05-31 20:18:39 +02:00
Kim Kulling 82380084c5 ObjImporter: next try for multiple line stuff. 2017-05-31 16:36:08 +02:00
Kim Kulling 813f3b8248 ObjLoader: improve performance of obj-import. 2017-05-30 21:10:33 +02:00
Kim Kulling c121cec68a Obj-Importer: introduce working test for line breaks. 2017-05-29 22:00:13 +02:00
Kim Kulling ea4dbb9e46 Merge pull request #1282 from rdb/master 
Fix error when custom CMAKE_C_FLAGS is specified
 2017-05-29 12:52:26 +02:00
Kim Kulling d30b1e585c Tests how o adress this topic. 2017-05-28 22:25:06 +02:00
Kim Kulling 8cc80a3d9c ObjImporter: fix the build. 2017-05-28 14:14:22 +02:00
Kim Kulling 3d99892b94 Opj-Importer: fix coverity finding. 2017-05-27 19:37:28 +02:00
Kim Kulling 96839bd860 Unittests: fix import material test. 2017-05-26 20:29:21 +02:00
Kim Kulling 342b572281 Merge branch 'master' into coverity_scan 2017-05-26 09:19:13 +02:00
Kim Kulling 1cded5a186 Merge branch 'coverity_scan' of https://github.com/assimp/assimp into coverity_scan 2017-05-26 09:19:03 +02:00
Kim Kulling e93355c8b4 Build: fix some compiler warnings for g++. 2017-05-26 09:18:23 +02:00
Kim Kulling 1b4cbcc6ad Merge branch 'master' of https://github.com/assimp/assimp 2017-05-25 22:40:36 +02:00
Kim Kulling f3407ef804 aiMetaData: introduce aiMetaData::Dealloc. 2017-05-25 22:35:27 +02:00
Kim Kulling fb33199d99 GLTFImporter: exclude headers from build whem no_glft_importer is 
defined.
 2017-05-25 22:34:45 +02:00
Kim Kulling 4d3dec718a Merge branch 'master' into coverity_scan 2017-05-24 22:36:37 +02:00