X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-scene-loader%2Fpublic-api%2Fenvironment-definition.cpp;h=9b09b650a900b402346ae4ad7918f33af9e3fd72;hp=c95883fb2ef6b1ad9d5d33b320687db1ff0a00b0;hb=66ac5f38e4fc285c159381c80e5f1f25f07fba6d;hpb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d

diff --git a/dali-scene-loader/public-api/environment-definition.cpp b/dali-scene-loader/public-api/environment-definition.cpp
index c95883f..9b09b65 100644
--- a/dali-scene-loader/public-api/environment-definition.cpp
+++ b/dali-scene-loader/public-api/environment-definition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,33 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/environment-variable.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+
 // INTERNAL INCLUDES
 #include "dali-scene-loader/public-api/environment-definition.h"
 #include "dali-scene-loader/public-api/utils.h"
+#include "dali-scene-loader/public-api/cube-map-loader.h"
+
+namespace
+{
+#define TOKEN_STRING(x) #x
+std::string GetDaliImagePath()
+{
+  return (nullptr == DALI_IMAGE_DIR) ? Dali::EnvironmentVariable::GetEnvironmentVariable(TOKEN_STRING(DALI_IMAGE_DIR)) : DALI_IMAGE_DIR;
+}
+} // unnamed namespace
 
 namespace Dali
 {
 namespace SceneLoader
 {
+namespace
+{
+const std::string PRE_COMPUTED_BRDF_TEXTURE_FILE_NAME = "brdfLUT.png";
+}
+
 EnvironmentDefinition::RawData
 EnvironmentDefinition::LoadRaw(const std::string& environmentsPath) const
 {
@@ -44,6 +63,15 @@ EnvironmentDefinition::LoadRaw(const std::string& environmentsPath) const
 
   loadFn(mDiffuseMapPath, raw.mDiffuse);
   loadFn(mSpecularMapPath, raw.mSpecular);
+
+  if(mUseBrdfTexture)
+  {
+    Devel::PixelBuffer pixelBuffer = LoadImageFromFile(GetDaliImagePath() + PRE_COMPUTED_BRDF_TEXTURE_FILE_NAME);
+    if(pixelBuffer)
+    {
+      raw.mBrdf = Devel::PixelBuffer::Convert(pixelBuffer);
+    }
+  }
   return raw;
 }
 
@@ -62,6 +90,12 @@ EnvironmentDefinition::Textures EnvironmentDefinition::Load(RawData&& raw) const
   {
     textures.mSpecular = raw.mSpecular.CreateTexture();
   }
+
+  if(raw.mBrdf)
+  {
+    textures.mBrdf = Texture::New(TextureType::TEXTURE_2D, raw.mBrdf.GetPixelFormat(), raw.mBrdf.GetWidth(), raw.mBrdf.GetHeight());
+    textures.mBrdf.Upload(raw.mBrdf);
+  }
   return textures;
 }