X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=shared%2Futility.h;h=71d7a55a986eeb07b64fc7f08faa3ad932bb905d;hb=205f1338ab86cef96b9dd2cd4dd9dff7b8cd92f8;hp=71a2150fd3fcde4ba192833682caa3a51bf900e3;hpb=de02cf1d81d8a6fc40b2d7b55174a1651c658759;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/shared/utility.h b/shared/utility.h
index 71a2150..71d7a55 100644
--- a/shared/utility.h
+++ b/shared/utility.h
@@ -2,7 +2,7 @@
 #define DALI_DEMO_UTILITY_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -19,72 +19,34 @@
  */
 
 #include <dali/dali.h>
-#include <dali/devel-api/images/atlas.h>
-#include <dali/devel-api/adaptor-framework/bitmap-loader.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/public-api/math/uint-16-pair.h>
 #include <dali/public-api/rendering/geometry.h>
 #include <dali/public-api/rendering/texture.h>
 
 namespace DemoHelper
 {
-
-Dali::PixelData LoadPixelData( const char* imagePath,
-                               Dali::ImageDimensions size,
-                               Dali::FittingMode::Type fittingMode,
-                               Dali::SamplingMode::Type samplingMode )
+Dali::Texture LoadTexture(const char*              imagePath,
+                          Dali::ImageDimensions    size                  = Dali::ImageDimensions(),
+                          Dali::FittingMode::Type  fittingMode           = Dali::FittingMode::DEFAULT,
+                          Dali::SamplingMode::Type samplingMode          = Dali::SamplingMode::DEFAULT,
+                          bool                     orientationCorrection = true)
 {
-  Dali::BitmapLoader loader = Dali::BitmapLoader::New( imagePath, size, fittingMode, samplingMode );
-  loader.Load();
-  return loader.GetPixelData();
-}
-
-
-Dali::Atlas LoadImage( const char* imagePath,
-                       Dali::ImageDimensions size = Dali::ImageDimensions(),
-                       Dali::FittingMode::Type fittingMode = Dali::FittingMode::DEFAULT,
-                       Dali::SamplingMode::Type samplingMode = Dali::SamplingMode::DEFAULT )
-{
-  Dali::PixelData pixelData = LoadPixelData(imagePath, size, fittingMode, samplingMode);
-  Dali::Atlas image  =Dali:: Atlas::New( pixelData.GetWidth(), pixelData.GetHeight(), pixelData.GetPixelFormat() );
-  image.Upload( pixelData, 0u, 0u );
-
-  return image;
-}
+  Dali::Devel::PixelBuffer pixelBuffer = LoadImageFromFile(imagePath, size, fittingMode, samplingMode, orientationCorrection);
+  Dali::Texture            texture     = Dali::Texture::New(Dali::TextureType::TEXTURE_2D,
+                                             pixelBuffer.GetPixelFormat(),
+                                             pixelBuffer.GetWidth(),
+                                             pixelBuffer.GetHeight());
 
-Dali::Texture LoadTexture( const char* imagePath,
-                           Dali::ImageDimensions size = Dali::ImageDimensions(),
-                           Dali::FittingMode::Type fittingMode = Dali::FittingMode::DEFAULT,
-                           Dali::SamplingMode::Type samplingMode = Dali::SamplingMode::DEFAULT )
-{
-  Dali::PixelData pixelData = LoadPixelData(imagePath, size, fittingMode, samplingMode);
-  Dali::Texture texture  = Dali::Texture::New( Dali::TextureType::TEXTURE_2D,
-                                               pixelData.GetPixelFormat(),
-                                               pixelData.GetWidth(),
-                                               pixelData.GetHeight() );
-  texture.Upload( pixelData );
+  Dali::PixelData pixelData = Dali::Devel::PixelBuffer::Convert(pixelBuffer);
+  texture.Upload(pixelData);
 
   return texture;
 }
 
-/**
- * @brief Load an bitmap resource.
- *
- * If it is required to scaled-down to no more than the stage dimensions,
- * uses image scaling mode FittingMode::SCALE_TO_FILL to resize the image at
- * load time to cover the entire stage with pixels with no borders,
- * and filter mode BOX_THEN_LINEAR to sample the image with
- * maximum quality.
- */
-
-Dali::Atlas LoadStageFillingImage( const char* imagePath )
-{
-  Dali::Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
-  return LoadImage( imagePath, Dali::ImageDimensions( stageSize.x, stageSize.y ), Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR );
-}
-
-Dali::Texture LoadStageFillingTexture( const char* imagePath )
+Dali::Texture LoadWindowFillingTexture(Dali::Uint16Pair size, const char* imagePath)
 {
-  Dali::Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
-  return LoadTexture( imagePath, Dali::ImageDimensions( stageSize.x, stageSize.y ), Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR );
+  return LoadTexture(imagePath, size, Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR);
 }
 
 Dali::Geometry CreateTexturedQuad()
@@ -95,27 +57,27 @@ Dali::Geometry CreateTexturedQuad()
     Dali::Vector2 texCoord;
   };
 
-  static const Vertex data[] = {{ Dali::Vector2( -0.5f, -0.5f ), Dali::Vector2( 0.0f, 0.0f ) },
-                                { Dali::Vector2(  0.5f, -0.5f ), Dali::Vector2( 1.0f, 0.0f ) },
-                                { Dali::Vector2( -0.5f,  0.5f ), Dali::Vector2( 0.0f, 1.0f ) },
-                                { Dali::Vector2(  0.5f,  0.5f ), Dali::Vector2( 1.0f, 1.0f ) }};
+  static const Vertex data[] = {{Dali::Vector2(-0.5f, -0.5f), Dali::Vector2(0.0f, 0.0f)},
+                                {Dali::Vector2(0.5f, -0.5f), Dali::Vector2(1.0f, 0.0f)},
+                                {Dali::Vector2(-0.5f, 0.5f), Dali::Vector2(0.0f, 1.0f)},
+                                {Dali::Vector2(0.5f, 0.5f), Dali::Vector2(1.0f, 1.0f)}};
 
-  Dali::PropertyBuffer vertexBuffer;
+  Dali::VertexBuffer  vertexBuffer;
   Dali::Property::Map vertexFormat;
   vertexFormat["aPosition"] = Dali::Property::VECTOR2;
   vertexFormat["aTexCoord"] = Dali::Property::VECTOR2;
 
   //Create a vertex buffer for vertex positions and texture coordinates
-  vertexBuffer = Dali::PropertyBuffer::New( vertexFormat );
-  vertexBuffer.SetData( data, 4u );
+  vertexBuffer = Dali::VertexBuffer::New(vertexFormat);
+  vertexBuffer.SetData(data, 4u);
 
   //Create the geometry
   Dali::Geometry geometry = Dali::Geometry::New();
-  geometry.AddVertexBuffer( vertexBuffer );
-  geometry.SetGeometryType(Dali::Geometry::TRIANGLE_STRIP );
+  geometry.AddVertexBuffer(vertexBuffer);
+  geometry.SetType(Dali::Geometry::TRIANGLE_STRIP);
 
   return geometry;
 }
-} // DemoHelper
+} // namespace DemoHelper
 
 #endif // DALI_DEMO_UTILITY_H