X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fpoint-mesh%2Fpoint-mesh-example.cpp;h=1e66ab568b165d7fdd9105b581a6fb89fa9e4a6f;hb=refs%2Fchanges%2F13%2F252013%2F2;hp=ce7a08092eefbd5a499a72c03d9f4caa706e34be;hpb=07ab57fde5eb011ecd843162afd4eeae3f7d844b;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp
index ce7a080..1e66ab5 100644
--- a/examples/point-mesh/point-mesh-example.cpp
+++ b/examples/point-mesh/point-mesh-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 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.
@@ -16,95 +16,53 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 // INTERNAL INCLUDES
+#include "shared/utility.h"
 #include "shared/view.h"
+#include "generated/point-mesh-vert.h"
+#include "generated/point-mesh-frag.h"
 
 using namespace Dali;
 
 namespace
 {
-const char* MATERIAL_SAMPLE( DEMO_IMAGE_DIR "gallery-small-48.jpg" );
-const char* MATERIAL_SAMPLE2( DEMO_IMAGE_DIR "gallery-medium-19.jpg" );
-
-#define MAKE_SHADER(A)#A
-
-const char* VERTEX_SHADER = MAKE_SHADER(
-attribute mediump vec2    aPosition;
-attribute highp   float   aHue;
-varying   mediump vec2    vTexCoord;
-uniform   mediump mat4    uMvpMatrix;
-uniform   mediump vec3    uSize;
-uniform   mediump float   uPointSize;
-uniform   lowp    vec4    uFadeColor;
-varying   mediump vec3    vVertexColor;
-varying   mediump float   vHue;
-
-vec3 hsv2rgb(vec3 c)
-{
-  vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
-  vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
-  return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
-}
-
-void main()
-{
-  mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);
-  vertexPosition.xyz *= (uSize-uPointSize);
-  vertexPosition = uMvpMatrix * vertexPosition;
-  vVertexColor = hsv2rgb( vec3( aHue, 0.7, 1.0 ) );
-  vHue = aHue;
-  gl_PointSize = uPointSize;
-  gl_Position = vertexPosition;
-}
-);
-
-const char* FRAGMENT_SHADER = MAKE_SHADER(
-varying mediump vec3  vVertexColor;
-varying mediump float vHue;
-uniform lowp  vec4    uColor;
-uniform sampler2D     sTexture1;
-uniform sampler2D     sTexture2;
-uniform lowp vec4     uFadeColor;
-
-void main()
-{
-  mediump vec4 texCol1 = texture2D(sTexture1, gl_PointCoord);
-  mediump vec4 texCol2 = texture2D(sTexture2, gl_PointCoord);
-  gl_FragColor = vec4(vVertexColor, 1.0) * ((texCol1*vHue) + (texCol2*(1.0-vHue)));
-}
-);
+const char* MATERIAL_SAMPLE(DEMO_IMAGE_DIR "gallery-small-48.jpg");
+const char* MATERIAL_SAMPLE2(DEMO_IMAGE_DIR "gallery-medium-19.jpg");
 
 Geometry CreateGeometry()
 {
   // Create vertices
-  struct Vertex { Vector2 position; float hue; };
+  struct Vertex
+  {
+    Vector2 position;
+    float   hue;
+  };
 
-  unsigned int numSides = 20;
-  Vertex polyhedraVertexData[numSides];
-  float angle=0;
-  float sectorAngle = 2.0f * Math::PI / (float) numSides;
+  const unsigned int numSides = 20;
+  Vertex             polyhedraVertexData[numSides];
+  float              angle       = 0;
+  float              sectorAngle = 2.0f * Math::PI / (float)numSides;
 
-  for(unsigned int i=0; i<numSides; ++i)
+  for(unsigned int i = 0; i < numSides; ++i)
   {
-    polyhedraVertexData[i].position.x = sinf(angle)*0.5f;
-    polyhedraVertexData[i].position.y = cosf(angle)*0.5f;
-    polyhedraVertexData[i].hue = angle / ( 2.0f * Math::PI);
+    polyhedraVertexData[i].position.x = sinf(angle) * 0.5f;
+    polyhedraVertexData[i].position.y = cosf(angle) * 0.5f;
+    polyhedraVertexData[i].hue        = angle / (2.0f * Math::PI);
     angle += sectorAngle;
   }
 
   Property::Map polyhedraVertexFormat;
   polyhedraVertexFormat["aPosition"] = Property::VECTOR2;
-  polyhedraVertexFormat["aHue"] = Property::FLOAT;
-  PropertyBuffer polyhedraVertices = PropertyBuffer::New( polyhedraVertexFormat, numSides );
-  polyhedraVertices.SetData(polyhedraVertexData);
+  polyhedraVertexFormat["aHue"]      = Property::FLOAT;
+  VertexBuffer polyhedraVertices     = VertexBuffer::New(polyhedraVertexFormat);
+  polyhedraVertices.SetData(polyhedraVertexData, numSides);
 
   // Create the geometry object
   Geometry polyhedraGeometry = Geometry::New();
-  polyhedraGeometry.AddVertexBuffer( polyhedraVertices );
-  polyhedraGeometry.SetGeometryType( Geometry::POINTS );
+  polyhedraGeometry.AddVertexBuffer(polyhedraVertices);
+  polyhedraGeometry.SetType(Geometry::POINTS);
 
   return polyhedraGeometry;
 }
@@ -116,16 +74,15 @@ Geometry CreateGeometry()
 class ExampleController : public ConnectionTracker
 {
 public:
-
   /**
    * The example controller constructor.
    * @param[in] application The application instance
    */
-  ExampleController( Application& application )
-  : mApplication( application )
+  ExampleController(Application& application)
+  : mApplication(application)
   {
     // Connect to the Application's Init signal
-    mApplication.InitSignal().Connect( this, &ExampleController::Create );
+    mApplication.InitSignal().Connect(this, &ExampleController::Create);
   }
 
   /**
@@ -140,63 +97,61 @@ public:
    * Invoked upon creation of application
    * @param[in] application The application instance
    */
-  void Create( Application& application )
+  void Create(Application& application)
   {
-    Stage stage = Stage::GetCurrent();
-    stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
+    Window window = application.GetWindow();
+    window.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
 
-    mStageSize = stage.GetSize();
+    mWindowSize = window.GetSize();
 
     // The Init signal is received once (only) during the Application lifetime
 
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
-    mImage = ResourceImage::New( MATERIAL_SAMPLE );
-    Image image = ResourceImage::New( MATERIAL_SAMPLE2 );
+    Texture texture0 = DemoHelper::LoadTexture(MATERIAL_SAMPLE);
+    Texture texture1 = DemoHelper::LoadTexture(MATERIAL_SAMPLE2);
 
-    mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
+    Shader shader = Shader::New(SHADER_POINT_MESH_VERT, SHADER_POINT_MESH_FRAG);
 
-    mMaterial = Material::New( mShader );
-    mMaterial.AddTexture(mImage, "sTexture1");
-    mMaterial.AddTexture(image, "sTexture2");
+    TextureSet textureSet = TextureSet::New();
+    textureSet.SetTexture(0u, texture0);
+    textureSet.SetTexture(1u, texture1);
 
-    mGeometry = CreateGeometry();
+    Geometry geometry = CreateGeometry();
 
-    mRenderer = Renderer::New( mGeometry, mMaterial );
+    mRenderer = Renderer::New(geometry, shader);
+    mRenderer.SetTextures(textureSet);
 
     mMeshActor = Actor::New();
-    mMeshActor.AddRenderer( mRenderer );
-    mMeshActor.SetSize(400, 400);
+    mMeshActor.AddRenderer(mRenderer);
+    mMeshActor.SetProperty(Actor::Property::SIZE, Vector2(400, 400));
 
-    mMeshActor.RegisterProperty( "uFadeColor", Color::GREEN );
+    mMeshActor.RegisterProperty("uFadeColor", Color::GREEN);
 
-    mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA );
-    mRenderer.RegisterProperty( "uPointSize", 80.0f );
-    mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
+    mRenderer.RegisterProperty("uFadeColor", Color::MAGENTA);
+    mRenderer.RegisterProperty("uPointSize", 80.0f);
+    mRenderer.SetProperty(Renderer::Property::DEPTH_INDEX, 0);
 
-    mMeshActor.SetParentOrigin( ParentOrigin::CENTER );
-    mMeshActor.SetAnchorPoint( AnchorPoint::CENTER );
-    stage.Add( mMeshActor );
+    mMeshActor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    mMeshActor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+    window.Add(mMeshActor);
 
-    Animation  animation = Animation::New(15);
+    Animation animation = Animation::New(15);
     KeyFrames keyFrames = KeyFrames::New();
     keyFrames.Add(0.0f, Vector4::ZERO);
-    keyFrames.Add(1.0f, Vector4( 1.0f, 0.0f, 1.0f, 1.0f ));
+    keyFrames.Add(1.0f, Vector4(1.0f, 0.0f, 1.0f, 1.0f));
 
-    animation.AnimateBy( Property(mMeshActor, Actor::Property::ORIENTATION), Quaternion(Degree(360), Vector3::ZAXIS) );
+    animation.AnimateBy(Property(mMeshActor, Actor::Property::ORIENTATION), Quaternion(Degree(360), Vector3::ZAXIS));
 
     animation.SetLooping(true);
     animation.Play();
 
-    stage.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));
+    window.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));
   }
 
   /**
    * Invoked whenever the quit button is clicked
    * @param[in] button the quit button
    */
-  bool OnQuitButtonClicked( Toolkit::Button button )
+  bool OnQuitButtonClicked(Toolkit::Button button)
   {
     // quit the application
     mApplication.Quit();
@@ -205,9 +160,9 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.state == KeyEvent::Down)
+    if(event.GetState() == KeyEvent::DOWN)
     {
-      if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
+      if(IsKey(event, Dali::DALI_KEY_ESCAPE) || IsKey(event, Dali::DALI_KEY_BACK))
       {
         mApplication.Quit();
       }
@@ -215,14 +170,9 @@ public:
   }
 
 private:
+  Application& mApplication; ///< Application instance
+  Vector3      mWindowSize;  ///< The size of the window
 
-  Application&  mApplication;                             ///< Application instance
-  Vector3 mStageSize;                                     ///< The size of the stage
-
-  Image    mImage;
-  Shader   mShader;
-  Material mMaterial;
-  Geometry mGeometry;
   Renderer mRenderer;
   Actor    mMeshActor;
   Renderer mRenderer2;
@@ -230,20 +180,10 @@ private:
   Timer    mChangeImageTimer;
 };
 
-void RunTest( Application& application )
+int DALI_EXPORT_API main(int argc, char** argv)
 {
-  ExampleController test( application );
-
+  Application       application = Application::New(&argc, &argv);
+  ExampleController test(application);
   application.MainLoop();
-}
-
-// Entry point for Linux & SLP applications
-//
-int main( int argc, char **argv )
-{
-  Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
   return 0;
 }