v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,235 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

2505 Commits (4d92c01933630e375f2294fbd827eda595f71148)

Author SHA1 Message Date
Kim Kulling 7a47f1f8f7 Issue-1183: add stp to the list of supported extensions for step-files. 2017-02-27 20:11:59 +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
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