Peter M. Groen / dali-demo

Commit 1618b01c3f4b964ef98c0eb0af31bb185eeb066c

Authored by seungho baek
1 parent c67ec74e

Modify to use LoadEnvironmentMap to load skybox env map 

Change-Id: Icbcf0ccdb046064f883b1e9514c285f491b68f0f
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Inline Side-by-side
Showing 1 changed file with 4 additions and 9 deletions
examples/scene3d-model/scene3d-model-example.cpp
  View file @1618b01
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 #include <cstring> 25 #include <cstring>
26 26
27 #include <dali-scene3d/public-api/controls/model/model.h> 27 #include <dali-scene3d/public-api/controls/model/model.h>
  28 +#include <dali-scene3d/public-api/loader/environment-map-loader.h>
28 29
29 using namespace Dali; 30 using namespace Dali;
30 using namespace Dali::Toolkit; 31 using namespace Dali::Toolkit;
@@ -376,15 +377,9 @@ public: @@ -376,15 +377,9 @@ public:
376 mSkyboxGeometry.AddVertexBuffer(vertexBuffer); 377 mSkyboxGeometry.AddVertexBuffer(vertexBuffer);
377 mSkyboxGeometry.SetType(Geometry::TRIANGLES); 378 mSkyboxGeometry.SetType(Geometry::TRIANGLES);
378 379
379 - // Diffuse Cube Map  
380 - Devel::PixelBuffer diffusePixelBuffer = LoadImageFromFile(uri_cube_diffuse_texture);  
381 - int32_t diffuseFaceSize = diffusePixelBuffer.GetWidth() / 4;  
382 - Texture texture = Texture::New(TextureType::TEXTURE_CUBE, diffusePixelBuffer.GetPixelFormat(), diffuseFaceSize, diffuseFaceSize);  
383 - for(int32_t i = 0; i < 6; ++i)  
384 - {  
385 - UploadTextureFace(texture, diffusePixelBuffer, i);  
386 - }  
387 - texture.GenerateMipmaps(); 380 + Dali::Scene3D::Loader::EnvironmentMapData environmentMapData;
  381 + Dali::Scene3D::Loader::LoadEnvironmentMap(uri_cube_diffuse_texture, environmentMapData);
  382 + Texture texture = environmentMapData.GetTexture();
388 383
389 mSkyboxTextures = TextureSet::New(); 384 mSkyboxTextures = TextureSet::New();
390 mSkyboxTextures.SetTexture(0, texture); 385 mSkyboxTextures.SetTexture(0, texture);