Merge "Add GetSpanType API" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / public-api / loader / environment-definition.cpp

diff --git a/dali-scene3d/public-api/loader/environment-definition.cpp b/dali-scene3d/public-api/loader/environment-definition.cpp
index 173959c..0c76617 100644 (file)
--- a/dali-scene3d/public-api/loader/environment-definition.cpp
+++ b/dali-scene3d/public-api/loader/environment-definition.cpp
@@ -31,6 +31,8 @@ std::string GetDaliImagePath()
 {
   return (nullptr == DALI_IMAGE_DIR) ? Dali::EnvironmentVariable::GetEnvironmentVariable(TOKEN_STRING(DALI_IMAGE_DIR)) : DALI_IMAGE_DIR;
 }
+
+static constexpr float DEFAULT_INTENSITY = 1.0f;
 } // unnamed namespace
 
 namespace Dali
@@ -57,7 +59,7 @@ EnvironmentDefinition::LoadRaw(const std::string& environmentsPath) const
         face.push_back(PixelData::New(new uint8_t[3]{0xff, 0xff, 0xff}, 3, 1, 1, Pixel::RGB888, PixelData::DELETE_ARRAY));
       }
     }
-    else if(!LoadCubeMapData(environmentsPath + path, cd))
+    else if(!LoadCubeMapData(environmentsPath + path, cd)) // TODO: supporting EQUIRECTANGULAR
     {
       ExceptionFlinger(ASSERT_LOCATION) << "Failed to load cubemap texture from '" << path << "'.";
     }
@@ -101,6 +103,11 @@ EnvironmentDefinition::Textures EnvironmentDefinition::Load(RawData&& raw) const
   return textures;
 }
 
+float EnvironmentDefinition::GetDefaultIntensity()
+{
+  return DEFAULT_INTENSITY;
+}
+
 } // namespace Loader
 } // namespace Scene3D
 } // namespace Dali