Commit Graph

4473 Commits

Author SHA1 Message Date
Kim Kulling
ff83701a6f Sample: update dx11 texture loader. 2017-06-03 09:25:20 +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
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
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
b7d4b69e0d X3DImporter: fix the build. 2017-05-24 22:35:35 +02:00
Kim Kulling
3c370c83b9 MDLImporter: remove dead code. 2017-05-24 21:18:51 +02:00
Kim Kulling
18b0316d52 X3DImporter: fix coverity finding ( missing comma ). 2017-05-24 21:15:55 +02:00
Kim Kulling
ec496a5833 X3DImporter: fix coverity finding. 2017-05-24 21:04:35 +02:00
rdb
9eb0a3f3d5 Fix error when custom CMAKE_C_FLAGS is specified 2017-05-23 15:34:02 +02:00
Kim Kulling
1bfff8ba1d ObjImporter: Add unittest. 2017-05-22 21:11:01 +02:00
Kim Kulling
b84de79219 Merge pull request #1279 from Squareys/update-docs
Update docs (Logging, Preamble Copyright and embedded Textures)
2017-05-20 20:45:26 +02:00
Kim Kulling
3d5e94477f Merge pull request #1272 from assimp/issue-1262
closes https://github.com/assimp/assimp/issues/1262: fix .
2017-05-19 23:13:40 +02:00
Kim Kulling
badd8cb6a4 OpenGEX: fix lowercase typo for linux. 2017-05-19 23:00:57 +02:00
Squareys
4e1ea6ecd7 docs: Explain texture paths for embedded textures 2017-05-19 13:32:04 +02:00
Squareys
efeeb6a827 docs: Update logging docs 2017-05-19 13:32:04 +02:00
Squareys
aab36ca723 docs: Update copyright notice in preamble 2017-05-19 13:32:04 +02:00
Kim Kulling
febf94f6aa Merge pull request #1212 from aoowweenn/umw_dev
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
Kim Kulling
eba06f0c8b Merge pull request #1275 from ab4d/master
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-17 11:34:35 +02:00
Kim Kulling
1daad40b30 Merge branch 'master' into issue-1262 2017-05-17 10:20:45 +02:00