Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

6877 Commits

Author SHA1 Message Date
Giuseppe Barbieri
54757a47a8 Update PlyLoader.cpp 
Sorry, I was wrong
 2017-01-16 21:09:38 +01:00
Giuseppe Barbieri
f14e433dd9 Update PlyLoader.cpp 
Typo
 2017-01-16 21:06:05 +01:00
Giuseppe Barbieri
f438652df8 Update PlyLoader.cpp 2017-01-16 21:04:24 +01:00
Giuseppe Barbieri
342824303c Update PlyLoader.cpp 2017-01-16 21:01:49 +01:00
Kim Kulling
f16387e5a7 Merge pull request #1135 from hblasins/objExtension 
Added support for parameters Ni and Tf in OBJ/MTL file format.
 2017-01-16 20:22:41 +01:00
Henryk Blasinski
17cae8ac5a Added support for parameters Ni and Tf in OBJ/MTL file format. 2017-01-12 17:11:17 -08:00
Antti Määttä
9621dff027 Morph animation support for collada 2017-01-12 13:41:32 +02:00
Kim Kulling
a97a4fb03b Merge pull request #1131 from Sibras/master 
FBX: Fix light and camera transformations and add some missing properties.
 2017-01-10 17:48:35 +01:00
Andy Maloney
6483b10997 {D3MF} Move #ifndefs before #includes 2017-01-10 09:53:11 -05:00
Matt Oliver
2f2fe92b62 FBX: Add additional material properties. 
Currently there isnt a AI_MATKEY_DISPLACEMENTSCALING define but fbx supports the value so for the moment it is just manually specified.
 2017-01-09 17:03:38 +11:00
Matt Oliver
5be2351dc6 FBX: Correct camera position and clip planes. 
Fbx cameras are stored in the scene graph as well as having separate camera properties.
The separate camera properties have a camera position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
camera being transformed twice. Since the scene graph contains all the relevant
transformations the camera position and direction can just use default values. Fbx
specifies cameras along the positive x axis so the default camera values have a up and
direction set accordingly.

Fixes: #807 #643
 2017-01-09 17:03:32 +11:00
Matt Oliver
b34a552fb7 FBX: Add correct light locations and falloff values. 
Fbx lights are stored in the scene graph as well as having separate light properties.
The separate light properties have a light position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
light being transformed twice. Since the scene graph contains all the relevant
transformations the light position and direction can just use default values. Fbx
specifies lights along the negative y axis so the default light values have a up and
direction set accordingly.

The DecayStart value specifies the distance from the light that the light intensity
will drop to half. Using the default assimp falloff equation of f=1/c+lr+qr^2 then
the falloff coefficients can be calculated for either c,l or q accordingly by setting
r=DecayStart and f=0.5.

Fixes #851
 2017-01-09 17:03:25 +11:00
Tan Li Boon
c3d40810b5 Cleared majority of codepage warnings in Visual Studio 14. 2017-01-09 00:41:10 +08:00
Kim Kulling
dfa3409de9 Blender: add missing constructors. 2017-01-05 20:23:02 +01:00
Kim Kulling
58af9efdc9 FBX: fix compiler warning: remove unused local function. 2016-12-31 16:09:17 +01:00
Kim Kulling
6dfff37d8f SubDivision: fix compiler warning: unused variable. 2016-12-31 16:07:11 +01:00
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