/*
- * 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/devel-api/rendering/renderer.h>
#include <dali-toolkit/dali-toolkit.h>
// INTERNAL INCLUDES
#include "shared/view.h"
+#include <sstream>
+
using namespace Dali;
namespace
}
);
-PropertyBuffer CreateIndexBuffer( Geometry::GeometryType geometryType )
-{
- // Create indices
- const unsigned int indexDataLines[] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 0 };
- const unsigned int indexDataLoops[] = { 0, 1, 2, 3, 4 };
- const unsigned int indexDataStrips[] = { 0, 1, 2, 3, 4, 0 };
-
- // Create index buffer if doesn't exist
- Property::Map indexFormat;
- indexFormat["indices"] = Property::INTEGER;
- PropertyBuffer indices = PropertyBuffer::New( indexFormat );
-
- // Update buffer
- switch( geometryType )
- {
- case Geometry::LINES:
- {
- indices.SetData( indexDataLines, sizeof(indexDataLines)/sizeof(indexDataLines[0]) );
- break;
- }
- case Geometry::LINE_LOOP:
- {
- indices.SetData( indexDataLoops, sizeof(indexDataLoops)/sizeof(indexDataLoops[0]) );
- break;
- }
- case Geometry::LINE_STRIP:
- {
- indices.SetData( indexDataStrips, sizeof(indexDataStrips)/sizeof(indexDataStrips[0]) );
- break;
- }
- default: // this will never happen, but compilers yells
- {
- }
- }
-
- return indices;
-}
+const unsigned short INDEX_LINES[] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 0 };
+const unsigned short INDEX_LOOP[] = { 0, 1, 2, 3, 4 };
+const unsigned short INDEX_STRIP[] = { 0, 1, 2, 3, 4, 0 };
+const unsigned short* INDICES[3] = { &INDEX_LINES[0], &INDEX_LOOP[0], &INDEX_STRIP[0] };
+const unsigned int INDICES_SIZE[3] = { sizeof(INDEX_LINES)/sizeof(INDEX_LINES[0]), sizeof(INDEX_LOOP)/sizeof(INDEX_LOOP[0]), sizeof(INDEX_STRIP)/sizeof(INDEX_STRIP[0])};
Geometry CreateGeometry()
{
PropertyBuffer pentagonVertices = PropertyBuffer::New( pentagonVertexFormat );
pentagonVertices.SetData(pentagonVertexData, 5);
- // Create indices
- PropertyBuffer indices = CreateIndexBuffer( Geometry::LINES );
// Create the geometry object
Geometry pentagonGeometry = Geometry::New();
pentagonGeometry.AddVertexBuffer( pentagonVertices );
- pentagonGeometry.SetIndexBuffer( indices );
- pentagonGeometry.SetGeometryType( Geometry::LINES );
+ pentagonGeometry.SetIndexBuffer( INDICES[0], INDICES_SIZE[0] );
+ pentagonGeometry.SetType( Geometry::LINES );
return pentagonGeometry;
}
* @param[in] application The application instance
*/
ExampleController( Application& application )
- : mApplication( application )
+ : mApplication( application ),
+ mStageSize(),
+ mShader(),
+ mGeometry(),
+ mRenderer(),
+ mMeshActor(),
+ mButtons(),
+ mMinusButton(),
+ mPlusButton(),
+ mIndicesCountLabel(),
+ mPrimitiveType( Geometry::LINES ),
+ mCurrentIndexCount( 0 ),
+ mMaxIndexCount( 0 )
{
// Connect to the Application's Init signal
mApplication.InitSignal().Connect( this, &ExampleController::Create );
{
Stage stage = Stage::GetCurrent();
+ // initial settings
+ mPrimitiveType = Geometry::LINES;
+ mCurrentIndexCount = 10;
+ mMaxIndexCount = 10;
+
CreateRadioButtons();
stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
mStageSize = stage.GetSize();
- // The Init signal is received once (only) during the Application lifetime
- ReInitialise( Geometry::LINES );
+ Initialise();
// Hide the indicator bar
application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
/**
* Invoked whenever application changes the type of geometry drawn
- * @param[in] type of geometry
*/
- void ReInitialise( Geometry::GeometryType geometryType )
+ void Initialise()
{
Stage stage = Stage::GetCurrent();
mGeometry = CreateGeometry();
mRenderer = Renderer::New( mGeometry, mShader );
+ mRenderer.SetIndexRange( 0, 10 ); // lines
+ mPrimitiveType = Geometry::LINES;
+
mMeshActor = Actor::New();
mMeshActor.AddRenderer( mRenderer );
mMeshActor.SetSize(200, 200);
{
Stage stage = Stage::GetCurrent();
- Toolkit::TableView modeSelectTableView = Toolkit::TableView::New( 3, 1 );
+ Toolkit::TableView modeSelectTableView = Toolkit::TableView::New( 4, 1 );
modeSelectTableView.SetParentOrigin( ParentOrigin::TOP_LEFT );
modeSelectTableView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
modeSelectTableView.SetFitHeight( 0 );
modeSelectTableView.SetFitHeight( 1 );
modeSelectTableView.SetFitHeight( 2 );
modeSelectTableView.SetCellPadding( Vector2( 6.0f, 0.0f ) );
- modeSelectTableView.SetScale( Vector3( 0.5f, 0.5f, 0.5f ));
+ modeSelectTableView.SetScale( Vector3( 0.8f, 0.8f, 0.8f ));
const char* labels[] =
{
for( int i = 0; i < 3; ++i )
{
- Property::Map labelMap;
- labelMap[ "text" ] = labels[i];
- labelMap[ "textColor" ] = Vector4( 0.8f, 0.8f, 0.8f, 1.0f );
-
Dali::Toolkit::RadioButton radio = Dali::Toolkit::RadioButton::New();
- radio.SetProperty( Dali::Toolkit::RadioButton::Property::LABEL, labelMap );
+ radio.SetProperty( Toolkit::Button::Property::LABEL,
+ Property::Map()
+ .Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
+ .Add( Toolkit::TextVisual::Property::TEXT, labels[i] )
+ .Add( Toolkit::TextVisual::Property::TEXT_COLOR, Vector4( 0.8f, 0.8f, 0.8f, 1.0f ) )
+ );
+
radio.SetParentOrigin( ParentOrigin::TOP_LEFT );
radio.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- radio.SetSelected( i == 0 );
+ radio.SetProperty( Toolkit::Button::Property::SELECTED, i == 0 );
radio.PressedSignal().Connect( this, &ExampleController::OnButtonPressed );
mButtons[i] = radio;
modeSelectTableView.AddChild( radio, Toolkit::TableView::CellPosition( i, 0 ) );
}
+
+ Toolkit::TableView elementCountTableView = Toolkit::TableView::New( 1, 3 );
+ elementCountTableView.SetCellPadding( Vector2( 6.0f, 0.0f ) );
+ elementCountTableView.SetParentOrigin( ParentOrigin::BOTTOM_LEFT );
+ elementCountTableView.SetAnchorPoint( AnchorPoint::BOTTOM_LEFT );
+ elementCountTableView.SetFitHeight( 0 );
+ elementCountTableView.SetFitWidth( 0 );
+ elementCountTableView.SetFitWidth( 1 );
+ elementCountTableView.SetFitWidth( 2 );
+ mMinusButton = Toolkit::PushButton::New();
+ mMinusButton.SetProperty( Toolkit::Button::Property::LABEL, "<<" );
+ mMinusButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ mMinusButton.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
+
+ Toolkit::PushButton mPlusButton = Toolkit::PushButton::New();
+ mPlusButton.SetProperty( Toolkit::Button::Property::LABEL, ">>" );
+ mPlusButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ mPlusButton.SetAnchorPoint( AnchorPoint::CENTER_RIGHT );
+
+ mMinusButton.ClickedSignal().Connect( this, &ExampleController::OnButtonClicked );
+ mPlusButton.ClickedSignal().Connect( this, &ExampleController::OnButtonClicked );
+
+ mIndicesCountLabel = Toolkit::TextLabel::New();
+ mIndicesCountLabel.SetParentOrigin( ParentOrigin::CENTER );
+ mIndicesCountLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+
+ std::stringstream str;
+ str << mCurrentIndexCount;
+ mIndicesCountLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, str.str() );
+ mIndicesCountLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0, 1.0, 1.0, 1.0 ) );
+ mIndicesCountLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "BOTTOM");
+ mIndicesCountLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
+ mIndicesCountLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
+
+ elementCountTableView.AddChild( mMinusButton, Toolkit::TableView::CellPosition( 0, 0 ) );
+ elementCountTableView.AddChild( mIndicesCountLabel, Toolkit::TableView::CellPosition( 0, 1 ) );
+ elementCountTableView.AddChild( mPlusButton, Toolkit::TableView::CellPosition( 0, 2 ) );
+
stage.Add(modeSelectTableView);
+ stage.Add(elementCountTableView);
}
/**
bool OnButtonPressed( Toolkit::Button button )
{
- const Geometry::GeometryType geomTypes[] =
- {
- Geometry::LINES,
- Geometry::LINE_LOOP,
- Geometry::LINE_STRIP
- };
-
- size_t index;
+ int indicesArray;
if( button == mButtons[0] )
{
- index = 0;
+ mCurrentIndexCount = 10;
+ mMaxIndexCount = 10;
+ mPrimitiveType = Geometry::LINES;
+ indicesArray = 0;
}
else if( button == mButtons[1] )
{
- index = 1;
+ mCurrentIndexCount = 5;
+ mMaxIndexCount = 5;
+ mPrimitiveType = Geometry::LINE_LOOP;
+ indicesArray = 1;
}
else
{
- index = 2;
+ mCurrentIndexCount = 6;
+ mMaxIndexCount = 6;
+ mPrimitiveType = Geometry::LINE_STRIP;
+ indicesArray = 2;
}
- PropertyBuffer indices = CreateIndexBuffer( geomTypes[ index ] );
- mGeometry.SetIndexBuffer( indices );
- mGeometry.SetGeometryType( geomTypes[ index ] );
-
+ std::stringstream str;
+ str << mCurrentIndexCount;
+ mIndicesCountLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, str.str() );
+ mGeometry.SetType( mPrimitiveType );
+ mGeometry.SetIndexBuffer( INDICES[ indicesArray ], INDICES_SIZE[ indicesArray ] );
+ mRenderer.SetIndexRange( 0, mCurrentIndexCount );
return true;
}
+ bool OnButtonClicked( Toolkit::Button button )
+ {
+ if( button == mMinusButton )
+ {
+ if (--mCurrentIndexCount < 2 )
+ mCurrentIndexCount = 2;
+ }
+ else
+ {
+ if (++mCurrentIndexCount > mMaxIndexCount )
+ mCurrentIndexCount = mMaxIndexCount;
+ }
+ std::stringstream str;
+ str << mCurrentIndexCount;
+ mIndicesCountLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, str.str() );
+ mRenderer.SetIndexRange( 0, mCurrentIndexCount );
+ return true;
+ }
private:
Geometry mGeometry;
Renderer mRenderer;
Actor mMeshActor;
- Toolkit::RadioButton mButtons[3];
+ Toolkit::RadioButton mButtons[3];
+ Toolkit::PushButton mMinusButton;
+ Toolkit::PushButton mPlusButton;
+ Toolkit::TextLabel mIndicesCountLabel;
+ Geometry::Type mPrimitiveType;
+ int mCurrentIndexCount;
+ int mMaxIndexCount;
};
void RunTest( Application& application )
projects / platform / core / uifw / dali-demo.git / blobdiff