v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add ambient light type, allow collada to load it

pull/350/head
Gargaj 2014-08-28 16:27:29 +02:00
parent dbf001b81c
commit d333e08343
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/ColladaHelper.h
View File

@ -118,7 +118,6 @@ struct Camera
float mZNear, mZFar;
};
#define aiLightSource_AMBIENT 0xdeaddead
#define ASSIMP_COLLADA_LIGHT_ANGLE_NOT_SET 1e9f
/** A collada light source. */

4
code/ColladaLoader.cpp
View File

@ -308,10 +308,6 @@ void ColladaLoader::BuildLightsForNode( const ColladaParser& pParser, const Coll
continue;
}
const Collada::Light* srcLight = &srcLightIt->second;
if (srcLight->mType == aiLightSource_AMBIENT) {
DefaultLogger::get()->error("Collada: Skipping ambient light for the moment");
continue;
}
// now fill our ai data structure
aiLight* out = new aiLight();

6
include/assimp/light.h
View File

@ -75,6 +75,12 @@ enum aiLightSourceType
//! sport arenas.
aiLightSource_SPOT = 0x3,
//! The generic light level of the world, including the bounces
//! of all other lightsources.
//! This light type doesn't have a valid position, direction, or
//! other properties, just a color.
aiLightSource_AMBIENT = 0x4,
/** This value is not used. It is just there to force the
* compiler to map this enum to a 32 Bit integer.