Commit Graph

2526 Commits

Author SHA1 Message Date
rmitton
209e972762 Fixed faceted normals in SIB importer. 2017-03-18 14:52:48 -07:00
Kim Kulling
2cd6c3d755 Closes https://github.com/assimp/assimp/issues/1128: do not use non
verbose format flag for import.
2017-03-14 19:01:41 +01:00
Kim Kulling
bb7f387bcf Merge branch 'master' of https://github.com/assimp/assimp 2017-03-11 22:13:48 +01:00
Kim Kulling
1c6145b39e Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api 2017-03-11 18:19:36 +01:00
Kim Kulling
b47bfeb0d7 StringUtils: add the right missing header. 2017-03-11 17:25:34 +01:00
Kim Kulling
6179e22749 StringUtils: add missing include for VS2012 & 2013 2017-03-11 11:34:23 +01:00
Kim Kulling
b725d7dbf5 Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes 2017-03-08 10:27:57 +01:00
Kim Kulling
3bd9efa82c Cleanup_includes: fix linux build. 2017-03-08 09:55:44 +01:00
Kim Kulling
8d27945619 Merge branch 'master' into cleanup_includes 2017-03-05 15:15:29 +01:00
Kim Kulling
e6dcad384a Fix missing includes. 2017-03-05 15:05:40 +01:00
Shin-ya Murakami
ffc95162ec fix for FreeBSD 2017-03-01 16:30:03 +09:00
Kim Kulling
a38b2fb10f Merge pull request #1191 from Lugdunum3D/feature-importers-whitelist
Allow to enable importers in a whitelist manner
2017-03-01 00:34:10 +01:00
Kim Kulling
9a0a74ef1f Merge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip
Fix buildsystem minizip
2017-03-01 00:15:12 +01:00
Kim Kulling
574c192575 Merge pull request #1186 from astillich/ase_cface
Fixed parsing ASE MESH_CFACE
2017-03-01 00:12:12 +01:00
Kim Kulling
f312d8709e More cleanup 2017-02-28 16:37:07 +01:00
Antoine Bolvy
5dd1bb9d6c Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/ 2017-02-28 11:44:04 +09:00
Antoine Bolvy
d77989088c Allow to enable importers in a whitelist manner 2017-02-28 11:42:53 +09:00
Antoine Bolvy
4495162f5f Fix new lines problem 2017-02-27 18:34:04 -05:00
Kim Kulling
7a47f1f8f7 Issue-1183: add stp to the list of supported extensions for step-files. 2017-02-27 20:11:59 +01:00
Alexander Stillich
0700dfe711 Fixed parsing ASE MESH_CFACE 2017-02-25 23:30:41 +01:00
Kim Kulling
5e2c846ca0 Remove unused header. 2017-02-22 17:22:23 +01:00
Kim Kulling
ef540f46a3 Remove unused headers. 2017-02-22 17:20:26 +01:00
Kim Kulling
a75fa44bde PLY: prepare bugfix by adding missing unittest. 2017-02-11 14:19:34 +01:00
Kim Kulling
615bdb27d9 Closes https://github.com/assimp/assimp/issues/1102: update Version.cpp 2017-02-11 13:49:48 +01:00
Kim Kulling
6ed1f7570e Merge branch 'master' of https://github.com/assimp/assimp 2017-02-05 19:30:11 +01:00
Kim Kulling
31bb9f7ba6 Obj: fix code review findings. 2017-02-04 18:32:04 +01:00
Kim Kulling
11e2ca173d Fix the build. 2017-02-04 18:15:50 +01:00
Kim Kulling
692fb216f7 closes https://github.com/assimp/assimp/issues/809: add vertex color
export support.
2017-02-04 14:51:23 +01:00
Kim Kulling
f9fa95a7c2 Obj-Importer: fix crash when updating the current mat-index: use correct
index.
2017-02-01 20:11:12 +01:00
Kim Kulling
bfb6eb317c Merge pull request #1160 from NolaDonato/materialindex
OBJParser: set material index when changing current material
2017-02-01 18:42:16 +01:00
nola.donato@samsung.com
e28b5422e0 OBJ: check for null mesh before updating material index
Sometimes the current mesh is null, should check before updating the material index

Submitted by: Nola Donato nola.donato@samsung.com
2017-01-31 16:40:04 -08:00
nola.donato@samsung.com
fc4243a08f OBJParser: set material index when changing current material
When a new material is parsed from the material library, the name of the current material is set but the old material index remains. This leaves an incorrect material index in the current mesh causing textures to not be associated with the right mesh. This patch updates the material index when changing the material name.

submitted by: Nola Donato nola.donato@samsung.com
2017-01-30 20:32:37 -08:00
nola.donato@samsung.com
df5fc5f68d OBJParser: Support spaces in texture file names
This patch allows embedded spaces in texture filenames found in MTL files. It only affects the OBJ parser.

Submitted by: Nola Donato nola.donato@samsung.com
2017-01-30 20:27:35 -08:00
Alexander Gessler
28a78ca460 Merge pull request #1156 from elect86/patch-7
Update ColladaParser.cpp
2017-01-28 13:28:47 +01:00
Alexander Gessler
16c50df071 Merge pull request #1154 from Kvalme/master
Fix for COLLADA export texture mapping #1084
2017-01-28 13:28:31 +01:00
Giuseppe Barbieri
ca47232101 Update ColladaParser.cpp
Fixed indent
2017-01-28 11:54:11 +01:00
Giuseppe Barbieri
c3c637be37 Update ColladaParser.cpp 2017-01-28 08:02:02 +01:00
Denis Biryukov
36e53b75fa Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist> 2017-01-27 14:29:18 +03:00
Giuseppe Barbieri
0434f5a5ff Update ColladaParser.cpp 2017-01-26 17:29:31 +01:00
Giuseppe Barbieri
85e2788e50 Update ColladaParser.cpp 2017-01-26 17:28:39 +01:00
Giuseppe Barbieri
3323d42ad6 Update PlyLoader.cpp 2017-01-20 19:30:36 +01:00
Giuseppe Barbieri
821e9fb0b8 Update PlyLoader.cpp 2017-01-19 22:43:38 +01:00
Kim Kulling
57975cb007 Merge pull request #1145 from elect86/patch-3
typo
2017-01-19 18:54:06 +01:00
Kim Kulling
82b1769759 Fix new call. 2017-01-19 13:38:06 +01:00
Kim Kulling
35b95ba710 API: Fix build 2017-01-19 11:41:43 +01:00
Kim Kulling
ebd04041ab Merge branch 'master' of https://github.com/assimp/assimp 2017-01-19 11:19:02 +01:00
Kim Kulling
f121e2eb66 Fixes https://github.com/assimp/assimp/issues/1143: fix build. 2017-01-19 11:18:33 +01:00
Giuseppe Barbieri
11e1901922 typo 2017-01-18 21:56:33 +01:00
Kim Kulling
45eb13719e fixes https://github.com/assimp/assimp/issues/1141: fix typo. 2017-01-17 22:05:45 +01:00
Giuseppe Barbieri
54757a47a8 Update PlyLoader.cpp
Sorry, I was wrong
2017-01-16 21:09:38 +01:00