Include <cstdio> to compensate for core inclusion cleanup

[platform/core/uifw/dali-demo.git] / examples / new-window / new-window-example.cpp

diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp
index 14445ac..a6f98c0 100644 (file)
--- a/examples/new-window/new-window-example.cpp
+++ b/examples/new-window/new-window-example.cpp
@@ -16,6 +16,8 @@
 
 #include <dali-toolkit/dali-toolkit.h>
 #include "../shared/view.h"
+#include <cstdio>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -24,7 +26,7 @@ class NewWindowController;
 
 namespace
 {
-const char * gModelFile = DALI_MODEL_DIR "AlbumCute.dae";
+const char * gModelFile = DALI_MODEL_DIR "AlbumCute.dali-bin";
 const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-2.jpg" );
 const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );
 const char * const LOSE_CONTEXT_IMAGE( DALI_IMAGE_DIR "icon-cluster-wobble.png" );
@@ -39,12 +41,12 @@ Application gApplication;
 NewWindowController* gNewWindowController(NULL);
 
 const char*const FRAG_SHADER=
-  "uniform float alpha;\n"
+  "uniform mediump float alpha;\n"
   "\n"
   "void main()\n"
   "{\n"
-  "  vec4 fragColor = texture2D(sTexture, vTexCoord);\n"
-  "  vec4 fxColor   = texture2D(sEffect, vTexCoord);\n"
+  "  mediump vec4 fragColor = texture2D(sTexture, vTexCoord);\n"
+  "  mediump vec4 fxColor   = texture2D(sEffect, vTexCoord);\n"
   "  gl_FragColor   = mix(fragColor,fxColor, alpha);\n"
   "}\n";
 
@@ -147,7 +149,7 @@ void NewWindowController::Create( Application& app )
   }
 
   mLoseContextButton = Toolkit::PushButton::New();
-  mLoseContextButton.SetBackgroundImage( Image::New( LOSE_CONTEXT_IMAGE ) );
+  mLoseContextButton.SetBackgroundImage( ResourceImage::New( LOSE_CONTEXT_IMAGE ) );
   mLoseContextButton.ClickedSignal().Connect( this, &NewWindowController::OnLoseContextButtonClicked );
   mToolBar.AddControl( mLoseContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
 
@@ -158,7 +160,7 @@ void NewWindowController::Create( Application& app )
   logoLayoutActor.SetScale(0.5f);
   mContentLayer.Add(logoLayoutActor);
 
-  Image image = Image::New(DALI_IMAGE_DIR "dali-logo.png");
+  Image image = ResourceImage::New(DALI_IMAGE_DIR "dali-logo.png");
   mImageActor = ImageActor::New(image);
   mImageActor.SetName("dali-logo");
   mImageActor.SetParentOrigin(ParentOrigin::CENTER);
@@ -194,7 +196,7 @@ bool NewWindowController::OnLoseContextButtonClicked( Toolkit::Button button )
 
 void NewWindowController::CreateMeshActor()
 {
-  mEffectImage = Image::New(EFFECT_IMAGE);
+  mEffectImage = ResourceImage::New(EFFECT_IMAGE);
 
   Material baseMaterial = Material::New( "Material1" );
   Dali::MeshActor meshActor = MeshActor::New( CreateMesh(true, baseMaterial) );
@@ -220,7 +222,7 @@ void NewWindowController::CreateMeshActor()
 FrameBufferImage NewWindowController::CreateMirrorImage(const char* imageName)
 {
   FrameBufferImage fbo;
-  Image image = Image::New(imageName);
+  Image image = ResourceImage::New(imageName);
   fbo = CreateFrameBufferForImage(imageName, image, ShaderEffect());
   return fbo;
 }
@@ -228,8 +230,8 @@ FrameBufferImage NewWindowController::CreateMirrorImage(const char* imageName)
 ImageActor NewWindowController::CreateBlurredMirrorImage(const char* imageName)
 {
   FrameBufferImage fbo;
-  Image image = Image::New( imageName );
-  Vector2 FBOSize = Image::GetImageSize(imageName);
+  Image image = ResourceImage::New( imageName );
+  Vector2 FBOSize = ResourceImage::GetImageSize(imageName);
   fbo = FrameBufferImage::New( FBOSize.width, FBOSize.height, Pixel::RGBA8888);
   GaussianBlurView gbv = GaussianBlurView::New(5, 2.0f, Pixel::RGBA8888, 0.5f, 0.5f, true);
   gbv.SetBackgroundColor(Color::TRANSPARENT);
@@ -247,7 +249,7 @@ ImageActor NewWindowController::CreateBlurredMirrorImage(const char* imageName)
 FrameBufferImage NewWindowController::CreateFrameBufferForImage(const char* imageName, Image image, ShaderEffect shaderEffect)
 {
   Stage stage = Stage::GetCurrent();
-  Vector2 FBOSize = Image::GetImageSize(imageName);
+  Vector2 FBOSize = ResourceImage::GetImageSize(imageName);
 
   FrameBufferImage framebuffer = FrameBufferImage::New(FBOSize.x, FBOSize.y );
 
@@ -288,10 +290,10 @@ FrameBufferImage NewWindowController::CreateFrameBufferForImage(const char* imag
 void NewWindowController::CreateBubbles(Vector2 stageSize)
 {
   mEmitter = Toolkit::BubbleEmitter::New( stageSize,
-                                          Image::New( DALI_IMAGE_DIR "bubble-ball.png" ),
+                                          ResourceImage::New( DALI_IMAGE_DIR "bubble-ball.png" ),
                                           1000, Vector2( 5.0f, 5.0f ) );
 
-  Image background = Image::New(BACKGROUND_IMAGE);
+  Image background = ResourceImage::New(BACKGROUND_IMAGE);
   mEmitter.SetBackground( background, mHSVDelta );
   Actor bubbleRoot = mEmitter.GetRootActor();
   mContentLayer.Add( bubbleRoot );
@@ -376,7 +378,7 @@ void NewWindowController::CreateBlending()
   blendShader.SetEffectImage( fb2 );
   blendShader.SetUniform("alpha", 0.5f);
 
-  mBaseImage = Image::New(BASE_IMAGE);
+  mBaseImage = ResourceImage::New(BASE_IMAGE);
   mBlendActor = ImageActor::New( mBaseImage );
   mBlendActor.SetParentOrigin(ParentOrigin::CENTER);
   mBlendActor.SetPosition(Vector3(150.0f, 200.0f, 0.0f));
@@ -449,7 +451,7 @@ void NewWindowController::OnModelLoaded( Model model )
 {
   if( model.GetLoadingState() == ResourceLoadingSucceeded )
   {
-    std::cout << "Succeeded loading collada model" << std::endl;
+    std::cout << "Succeeded loading model" << std::endl;
     mModelActor = ModelActorFactory::BuildActorTree(mModel, "");  // Gets root actor
     mModelActor.SetSize(250.0f, 250.0f);
     mModelActor.SetPosition(0.0f, 200.0f, 70.0f);
@@ -468,7 +470,7 @@ void NewWindowController::OnModelLoaded( Model model )
   }
   else
   {
-    std::cout << "Failed loading collada model" << std::endl;
+    std::cout << "Failed loading model" << std::endl;
     mApplication.Quit();
   }
 }