/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
*/
// EXTERNAL INCLUDES
+#include <dali-toolkit/dali-toolkit.h>
// INTERNAL INCLUDES
#include "shared/view.h"
-
-#include <dali-toolkit/dali-toolkit.h>
+#include "shared/utility.h"
using namespace Dali;
namespace
{
-const char* MATERIAL_SAMPLE( DALI_IMAGE_DIR "gallery-small-48.jpg" );
-const char* MATERIAL_SAMPLE2( DALI_IMAGE_DIR "gallery-medium-19.jpg" );
+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
Property::Map polyhedraVertexFormat;
polyhedraVertexFormat["aPosition"] = Property::VECTOR2;
polyhedraVertexFormat["aHue"] = Property::FLOAT;
- PropertyBuffer polyhedraVertices = PropertyBuffer::New( polyhedraVertexFormat, numSides );
- polyhedraVertices.SetData(polyhedraVertexData);
+ PropertyBuffer polyhedraVertices = PropertyBuffer::New( polyhedraVertexFormat );
+ polyhedraVertices.SetData( polyhedraVertexData, numSides );
// Create the geometry object
Geometry polyhedraGeometry = Geometry::New();
polyhedraGeometry.AddVertexBuffer( polyhedraVertices );
- polyhedraGeometry.SetGeometryType( Geometry::POINTS );
+ polyhedraGeometry.SetType( Geometry::POINTS );
return polyhedraGeometry;
}
// Hide the indicator bar
application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
- mImage = ResourceImage::New( MATERIAL_SAMPLE );
- Image image = ResourceImage::New( MATERIAL_SAMPLE2 );
- mSampler1 = Sampler::New(mImage, "sTexture1");
- mSampler2 = Sampler::New(image, "sTexture2");
+ Texture texture0 = DemoHelper::LoadTexture( MATERIAL_SAMPLE );
+ Texture texture1 = DemoHelper::LoadTexture( MATERIAL_SAMPLE2 );
- mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
+ Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
- mMaterial = Material::New( mShader );
- mMaterial.AddSampler( mSampler1 );
- mMaterial.AddSampler( mSampler2 );
+ 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);
- Property::Index fadeColorIndex = mMeshActor.RegisterProperty( "fade-color", Color::GREEN );
- mMeshActor.AddUniformMapping( fadeColorIndex, std::string("uFadeColor") );
+ mMeshActor.RegisterProperty( "uFadeColor", Color::GREEN );
- fadeColorIndex = mRenderer.RegisterProperty( "fade-color", Color::MAGENTA );
- Property::Index pointSizeIndex = mRenderer.RegisterProperty( "point-size", 80.0f );
- mRenderer.AddUniformMapping( fadeColorIndex, std::string("uFadeColor" ) );
- mRenderer.AddUniformMapping( pointSizeIndex, std::string("uPointSize" ) );
- mRenderer.SetDepthIndex(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 );
animation.SetLooping(true);
animation.Play();
- stage.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));;
+ stage.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));
}
/**
Application& mApplication; ///< Application instance
Vector3 mStageSize; ///< The size of the stage
- Image mImage;
- Sampler mSampler1;
- Sampler mSampler2;
- Shader mShader;
- Material mMaterial;
- Geometry mGeometry;
Renderer mRenderer;
Actor mMeshActor;
Renderer mRenderer2;
Timer mChangeImageTimer;
};
-void RunTest( Application& application )
+int DALI_EXPORT_API main( int argc, char **argv )
{
+ 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;
}