Fixed illumination model conversion in the OBJ loader.

Added map_d support to obj.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@332 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2009-02-05 18:13:34 +00:00
parent ec9226c5b9
commit 4048eb92f5
4 changed files with 37 additions and 4 deletions

View File

@@ -146,7 +146,7 @@ struct Object
//! \brief Data structure to store all material specific data
struct Material
{
//! NAme of material description
//! Name of material description
aiString MaterialName;
//! Texture names
@@ -155,6 +155,7 @@ struct Material
aiString textureAmbient;
aiString textureBump;
aiString textureSpecularity;
aiString textureOpacity;
//! Ambient color
aiColor3D ambient;
@@ -168,10 +169,15 @@ struct Material
float shineness;
//! Illumination model
int illumination_model;
//! Index of refraction
float ior;
//! Constructor
Material()
: diffuse(0.6f,0.6f,0.6f)
: diffuse (0.6f,0.6f,0.6f)
, ior (1.f)
, alpha (1.f)
, illumination_model (1)
{
// empty
}