(Visual Transitions) Ensure all parameters are initialized in the constructor

[platform/core/uifw/dali-demo.git] / shared / utility.h

diff --git a/shared/utility.h b/shared/utility.h
index 3285b98..ece3327 100644 (file)
--- a/shared/utility.h
+++ b/shared/utility.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_DEMO_UTILITY_H__
-#define __DALI_DEMO_UTILITY_H__
+#ifndef DALI_DEMO_UTILITY_H
+#define DALI_DEMO_UTILITY_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -20,8 +20,9 @@
 
 #include <dali/dali.h>
 #include <dali/devel-api/images/atlas.h>
-#include <dali/devel-api/rendering/texture.h>
 #include <dali/devel-api/adaptor-framework/bitmap-loader.h>
+#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/rendering/texture.h>
 
 namespace DemoHelper
 {
@@ -36,17 +37,15 @@ Dali::PixelData LoadPixelData( const char* imagePath,
   return loader.GetPixelData();
 }
 
-
-Dali::Atlas LoadImage( const char* imagePath,
+/**
+ * @deprecated, dont use this anymore
+ */
+Dali::Image 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;
+  return Dali::ResourceImage::New( imagePath, size, fittingMode, samplingMode );
 }
 
 Dali::Texture LoadTexture( const char* imagePath,
@@ -66,6 +65,7 @@ Dali::Texture LoadTexture( const char* imagePath,
 
 /**
  * @brief Load an bitmap resource.
+ * @deprecated, dont use this anymore
  *
  * 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
@@ -74,7 +74,7 @@ Dali::Texture LoadTexture( const char* imagePath,
  * maximum quality.
  */
 
-Dali::Atlas LoadStageFillingImage( const char* imagePath )
+Dali::Image 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 );
@@ -86,6 +86,35 @@ Dali::Texture LoadStageFillingTexture( const char* imagePath )
   return LoadTexture( imagePath, Dali::ImageDimensions( stageSize.x, stageSize.y ), Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR );
 }
 
+Dali::Geometry CreateTexturedQuad()
+{
+  struct Vertex
+  {
+    Dali::Vector2 position;
+    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 ) }};
+
+  Dali::PropertyBuffer 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 );
+
+  //Create the geometry
+  Dali::Geometry geometry = Dali::Geometry::New();
+  geometry.AddVertexBuffer( vertexBuffer );
+  geometry.SetType(Dali::Geometry::TRIANGLE_STRIP );
+
+  return geometry;
+}
 } // DemoHelper
 
-#endif // __DALI_DEMO_HELPER_VIEW_H__
+#endif // DALI_DEMO_UTILITY_H