summaryrefslogtreecommitdiff
path: root/src/3rdparty/assimp/code/ColladaHelper.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/assimp/code/ColladaHelper.h')
-rw-r--r--src/3rdparty/assimp/code/ColladaHelper.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/assimp/code/ColladaHelper.h b/src/3rdparty/assimp/code/ColladaHelper.h
index c713e6ace..0e087bd21 100644
--- a/src/3rdparty/assimp/code/ColladaHelper.h
+++ b/src/3rdparty/assimp/code/ColladaHelper.h
@@ -119,6 +119,7 @@ struct Camera
};
#define aiLightSource_AMBIENT 0xdeaddead
+#define ASSIMP_COLLADA_LIGHT_ANGLE_NOT_SET 1e9f
/** A collada light source. */
struct Light
@@ -129,8 +130,8 @@ struct Light
, mAttQuadratic (0.f)
, mFalloffAngle (180.f)
, mFalloffExponent (0.f)
- , mPenumbraAngle (10e10f)
- , mOuterAngle (10e10f)
+ , mPenumbraAngle (ASSIMP_COLLADA_LIGHT_ANGLE_NOT_SET)
+ , mOuterAngle (ASSIMP_COLLADA_LIGHT_ANGLE_NOT_SET)
, mIntensity (1.f)
{}
@@ -320,6 +321,8 @@ struct Mesh
for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS;++i)
mNumUVComponents[i] = 2;
}
+
+ std::string mName;
// just to check if there's some sophisticated addressing involved...
// which we don't support, and therefore should warn about.