Merge pull request assimp#350 from Gargaj/ambientlight

Enable ambient lights
jiaping · Aug 28, 2014 · 201807f · 201807f
2 parents 258afb3 + ae7aba3
commit 201807f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/code/ColladaHelper.h b/code/ColladaHelper.h
@@ -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. */

diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp
@@ -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();

diff --git a/include/assimp/light.h b/include/assimp/light.h
@@ -75,6 +75,13 @@ enum aiLightSourceType
 	//! sport arenas.
 	aiLightSource_SPOT          = 0x3,
 
+	//! The generic light level of the world, including the bounces
+	//! of all other lightsources.
+	//! Typically, there's at most one ambient light in a scene.
+	//! 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.