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

4227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giuseppe Barbieri
342824303c Update PlyLoader.cpp 2017-01-16 21:01:49 +01:00
Kim Kulling
ce14a05280 unittest: reenable LWO import test. 2017-01-16 20:23:37 +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
Kim Kulling
06ca0e094b GenBlenderDNA: use common formatting. 2017-01-16 20:21:11 +01:00
Kim Kulling
2e0db8cfd5 Merge branch 'master' of https://github.com/assimp/assimp 2017-01-15 18:29:49 +01:00
Kim Kulling
c6cceef867 Scene: add method to add children. 2017-01-15 17:37:45 +01:00
Alexander Gessler
6ce590763b Merge pull request #1138 from waldyrious/patch-1 
use SVG in Travis badge
 2017-01-14 21:05:26 +01:00
Waldir Pimenta
f6a5bc601a use SVG in Travis badge 
this improves the sharpness of the resulting image to match the quality of the other badges.
 2017-01-14 16:46:21 +00:00
Kim Kulling
2c1830ce2f Merge pull request #1134 from anttimaa/morphanimcollada 
Morph animation support for collada
 2017-01-14 10:35:06 +01:00
Kim Kulling
09dcdc4b32 Merge pull request #1137 from simon-heinen/patch-1 
Update Readme.md
 2017-01-14 09:27:21 +01:00
Simon Heinen
eebe457960 Update Readme.md 
I would suggest to add https://github.com/makc/assimp2json to the ports of Assimp, also to drive contribution & attention to it since it would be really valuable to have it working in JS.
 2017-01-14 07:28:52 +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
Kim Kulling
4d8c1bb54c unittest: add missing file to fix the build. 2017-01-12 21:41:19 +01:00
Kim Kulling
69052812f5 unit: add format import test for lws-format. 2017-01-12 20:17:35 +01: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
Kim Kulling
be9e4f4cfd Merge pull request #1132 from asmaloney/asm_master 
{D3MF} Move #ifndefs before #includes
 2017-01-10 17:47:42 +01:00
Andy Maloney
6483b10997 {D3MF} Move #ifndefs before #includes 2017-01-10 09:53:11 -05:00
Kim Kulling
9eb4ca6036 Update Readme.md 2017-01-09 22:11:45 +01:00
Kim Kulling
3f3861a93b Update Readme.md 2017-01-09 22:10:59 +01:00
Kim Kulling
3b12d552c0 Update Readme.md 2017-01-09 21:33:07 +01:00
Kim Kulling
60c593611e Merge branch 'master' of https://github.com/assimp/assimp 2017-01-09 20:01:45 +01:00
Kim Kulling
2b4f16d2d2 unittest: add import test for ifc file importer. 2017-01-09 20:01:13 +01: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
Kim Kulling
685c737051 Merge pull request #1130 from undisputed-seraphim/clear-msvc-codepage-warnings 
Cleared majority of codepage warnings in Visual Studio 2015.
 2017-01-08 18:34:34 +01:00
Tan Li Boon
c3d40810b5 Cleared majority of codepage warnings in Visual Studio 14. 2017-01-09 00:41:10 +08:00
Kim Kulling
575afd82f1 Update Readme.md 2017-01-08 11:38:50 +01:00
Kim Kulling
7b17f25e41 Update Readme.md 2017-01-08 11:38:04 +01:00
Kim Kulling
c62015fe6b unittest: add unittest for hmp import format. 2017-01-07 21:29:22 +01:00
Kim Kulling
a0ab85b159 unittest: add a disabled glft unittest. 2017-01-07 21:16:24 +01:00
Kim Kulling
779c698453 unittest: add unittest for CSM format importer / exporter. 2017-01-07 21:07:41 +01:00
Kim Kulling
a9d3a60617 unittest: add import export test for collada file importer exporter. 2017-01-07 20:32:35 +01:00
Kim Kulling
8b015b31ec unittest: add unittest for bvh file importer. 2017-01-07 20:27:59 +01:00
Kim Kulling
3b05a720d6 unittest: add unittest for b3d format importer / exporte3r. 2017-01-07 20:02:36 +01:00
Kim Kulling
80f3c64b87 unittest: add unittest from ASE format importer. 2017-01-07 19:58:27 +01:00
Kim Kulling
83b88ae5b8 unittest: add import export unittest for AMF-format. 2017-01-07 17:58:31 +01:00
Kim Kulling
abb507bf6d unittest: add unittest form 3ds-format. 2017-01-07 17:48:33 +01:00
Kim Kulling
b78af0f80f unittest: new unittest for 3D-importer. 2017-01-07 17:45:29 +01:00
Kim Kulling
61ddd9141c Unittest: new unittests. 2017-01-07 17:33:18 +01:00
Kim Kulling
061afba7ab Blender: add import test to unit test suite. 2017-01-07 16:14:09 +01:00
Kim Kulling
dfa3409de9 Blender: add missing constructors. 2017-01-05 20:23:02 +01:00
Kim Kulling
2038d01f22 Unittest: fix compiler warning: unused variable. 2016-12-31 16:20:59 +01:00
Kim Kulling
6813ed49bb Unittest: fix compiler warning: signed unsigned mismatch. 2016-12-31 16:18:13 +01:00
Kim Kulling
7bb59004c3 SceneDiffer: fix compiler warning: unused function. 2016-12-31 16:14:06 +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
4e43763523 Unittests: fix compiler warning signed unsigned mismatch. 2016-12-31 16:00:03 +01:00
Kim Kulling
161cdd4038 Merge pull request #1119 from rdb/master 
Replace use of nullptr in headers with NULL
 2016-12-28 18:20:50 +01:00