Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,113 Commits 19 Branches 43 Tags
b934331985ea698f431faef2abd76e93de8b86bf
Commit Graph

2461 Commits

Author SHA1 Message Date
Kim Kulling
b934331985 closes https://github.com/assimp/assimp/issues/1111: add warning when 
detecting invalid mat definition.
 2016-12-19 20:44:00 +01:00
Kim Kulling
bd0449ea79 closes assimp/assimp/issues/1101: copy aiTexture type declaration instead 
of using decltype for declaration to fix iOS build.
 2016-12-14 21:42:01 +01:00
Kim Kulling
5caa232b15 Merge pull request #1109 from assimp/issue_899 
closes assimp/assimp/issues/899: fix parsing of texture name.
 2016-12-12 23:42:24 +01:00
Kim Kulling
df03c657bf Merge pull request #1106 from elect86/master 
OBJ, added the index to handle clamp option for each cubemap texture
 2016-12-12 21:22:56 +01:00
Kim Kulling
859d15d3a0 closes assimp/assimp/issues/899: fix parsing of texture name. 2016-12-12 21:22:03 +01:00
Giuseppe Barbieri
5127e18da6 Update PlyParser.h 
Typo
 2016-12-11 13:01:26 +01:00
Giuseppe Barbieri
b1d5390413 Update ObjFileImporter.cpp 2016-12-09 19:31:07 +01:00
Giuseppe Barbieri
83896f18b3 Update ObjFileImporter.h 2016-12-09 19:27:01 +01:00
Kim Kulling
b1e89e3636 closes https://github.com/assimp/assimp/issues/1098: add license info. 2016-12-08 20:07:56 +01:00
Kim Kulling
d24ba9a4bb Merge pull request #1099 from asmaloney/warning_fixes 
Fixes two type warnings and a missing case option
 2016-12-08 17:49:36 +01:00
Andy Maloney
0c7aac02eb Fixes spelling in comments 2016-12-07 21:31:51 -05:00
Andy Maloney
3c5f1578c2 Fixes two type warnings and a missing case option 2016-12-07 20:30:45 -05:00
Kim Kulling
a3a1c82380 Merge pull request #1087 from elect86/patch-4 
Update ObjFileMtlImporter.cpp
 2016-12-07 20:16:57 +01:00
Giuseppe Barbieri
ff73821cea Update ObjFileMtlImporter.cpp 2016-12-07 19:52:03 +01:00
Mika Rautio
8929760b3e Add better MinGW support for IFCReaderGen big objects 2016-12-05 12:57:05 +02:00
Mika Rautio
f9cce7f59c MinGW __stat64 support depends on MSVCRT version 2016-12-05 12:33:48 +02:00
Mika Rautio
17fc3eea8f Do not build exporter if its importer is not built 2016-12-05 11:12:46 +02:00
Kim Kulling
769805efd0 Merge branch 'master' into issue_1089 2016-12-02 14:31:18 +01:00
Kim Kulling
dcfc696e86 FBX: woraround for issue 1089. 2016-12-02 11:32:34 +01:00
Kim Kulling
c46ac37c9b Merge pull request #1085 from elect86/patch-3 
Update ObjFileParser.cpp
 2016-12-01 17:56:20 +01:00
Kim Kulling
c80777f13f Enable SIBImport test. 2016-11-30 17:49:22 +01:00
Kim Kulling
12ea506504 Enable unittest for apacity bug for dae files. 2016-11-30 15:05:06 +01:00
Kim Kulling
c2deb3e15f BaseIMporter: fix review findings. 2016-11-30 15:03:32 +01:00
Kim Kulling
a80d7346d8 AMFImporter: fix some review findings. 2016-11-30 15:03:02 +01:00
Kim Kulling
f2817587ab AMFImporter: use correct unique token to identify schema for AMF-assets. 2016-11-29 19:50:40 +01:00
Kim Kulling
43e1cae2ea Fix appveyor build: disable bugger mingw config. 2016-11-28 10:40:10 +01:00
Giuseppe Barbieri
a2c82051d4 Update ObjFileMtlImporter.cpp 
Fixed grammar
 2016-11-27 22:44:03 +01:00
Giuseppe Barbieri
fe7863d22f Update ObjFileParser.cpp 
Fixed error message
 2016-11-27 20:32:59 +01:00
Kim Kulling
181f78687f Merge branch 'master' of https://github.com/assimp/assimp 2016-11-27 16:44:03 +01:00
Kim Kulling
8272514b83 ObjImporter: use pre increment as a micro optimization. 2016-11-27 16:43:25 +01:00
Kim Kulling
8bfe465d03 Merge pull request #1083 from jaredmulconry/implementation_warning_fix 
Fixed warnings on MSVC14 x64 (Issue #1065)
 2016-11-27 16:40:45 +01:00
Kim Kulling
1d9f91946f Merge pull request #1080 from johnmaf/bugfix/collada-transparency 
Properly export COLLADA <transparency> value
 2016-11-27 16:30:59 +01:00
Jared Mulconry
cf151b77d8 Fixed build warnings on MSVC14 x64 in the XGL loader. 2016-11-27 16:03:25 +11:00
Jared Mulconry
7415289649 Fixed build warnings on MSVC14 x64 in X file importer. 2016-11-27 16:02:21 +11:00
Jared Mulconry
cbfbf2a256 Fixed build warnings on MSVC14 x64 in the X3D format sources. 2016-11-27 15:54:22 +11:00
Jared Mulconry
f22d78a3d3 Fixed build warnings on MSVC14 x64 in Unreal importer. 2016-11-27 14:36:45 +11:00
Jared Mulconry
39f54bf183 Fixed build warnings on MSVC14 x64 in Target Animation source. 2016-11-27 14:35:49 +11:00
Jared Mulconry
387afcf74f Fixed build warnings on MSVC14 x64 in subdivision routine. 2016-11-27 13:37:32 +11:00
Jared Mulconry
58e0d8c261 Fixed build warnings on MSVC14 x64 in the STL format sources. 2016-11-27 13:32:44 +11:00
Jared Mulconry
f2e2aad647 Fixed build warnings on MSVC14 x64 in spacial sort. 2016-11-27 13:28:40 +11:00
Jared Mulconry
20318811ff Fixed build warnings on MSVC14 x64 in the skeleton mesh builder. 2016-11-27 13:17:02 +11:00
Jared Mulconry
98e7eb476d Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix 
# Conflicts:
#	code/ObjFileImporter.cpp
 2016-11-27 13:00:33 +11:00
John Senneker
578ed3f5d0 Properly export COLLADA <transparency> value 2016-11-25 12:09:49 -05:00
John Senneker
1541db01cc Remove scaling of specular exponent in OBJFileImporter.cpp 2016-11-25 10:56:11 -05:00
Kim Kulling
f1254639d0 Merge pull request #1075 from Chainsawkitten/MinGW 
Fix some MinGW warnings
 2016-11-24 21:34:56 +01:00
Kim Kulling
d82fd0d750 closes https://github.com/assimp/assimp/issues/1076: use ai_assert instead 
of assert.
 2016-11-24 21:15:07 +01:00
Albin Bernhardsson
347c09c539 Put back unused line (in comments) 2016-11-24 15:15:17 +01:00
Albin Bernhardsson
bde2b466be Remove unnecessary semicolon 2016-11-24 14:53:33 +01:00
Albin Bernhardsson
bd6f94b926 Remove unused variable 2016-11-24 14:15:13 +01:00
Albin Bernhardsson
3b49dfe93e Comment out unused variables 2016-11-24 14:10:24 +01:00