/*
- * Copyright (c) 2014 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.
//------------------------------------------------------------------------------
#include <dali/dali.h>
+#include <dali/devel-api/adaptor-framework/file-loader.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/devel-api/builder/builder.h>
#include <dali-toolkit/devel-api/builder/tree-node.h>
std::time_t mLastTime;
std::string mstringPath;
- std::string GetFileContents(const std::string &fn)
+ std::string GetFileContents(const std::string &filename)
{
- std::ifstream t(fn.c_str());
- return std::string((std::istreambuf_iterator<char>(t)), std::istreambuf_iterator<char>());
+ std::streampos bufferSize = 0;
+ Dali::Vector<char> fileBuffer;
+ if( !Dali::FileLoader::ReadFile( filename, bufferSize, fileBuffer, FileLoader::FileType::BINARY ) )
+ {
+ return std::string();
+ }
+
+ return std::string( &fileBuffer[0], bufferSize );
};
};
mTimer.Start();
// Connect to key events in order to exit
- Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleApp::OnKeyEvent);
+ app.GetWindow().KeyEventSignal().Connect(this, &ExampleApp::OnKeyEvent);
}
private:
void ReloadJsonFile(Builder& builder, Layer& layer)
{
- Stage stage = Stage::GetCurrent();
- stage.SetBackgroundColor( Color::WHITE );
+ Window window = mApp.GetWindow();
+ window.SetBackgroundColor( Color::WHITE );
builder = Builder::New();
builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit );
Property::Map defaultDirs;
- defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR;
- defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ] = DALI_MODEL_DIR;
- defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR;
+ defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ] = DEMO_IMAGE_DIR;
+ defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ] = DEMO_MODEL_DIR;
+ defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR;
builder.AddConstants( defaultDirs );
if(!layer)
{
layer = Layer::New();
- layer.SetParentOrigin(ParentOrigin::CENTER);
- layer.SetAnchorPoint(AnchorPoint::CENTER);
- layer.SetSize( stage.GetRootLayer().GetCurrentSize() );
- stage.GetRootLayer().Add(layer);
+ layer.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+ layer.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER);
+ layer.SetProperty( Actor::Property::SIZE, window.GetRootLayer().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) );
+ window.GetRootLayer().Add(layer);
// render tasks may have been setup last load so remove them
- RenderTaskList taskList = stage.GetRenderTaskList();
+ RenderTaskList taskList = window.GetRenderTaskList();
if( taskList.GetTaskCount() > 1 )
{
typedef std::vector<RenderTask> Collection;
}
RenderTask defaultTask = taskList.GetTask(0);
- defaultTask.SetSourceActor( stage.GetRootLayer() );
- defaultTask.SetTargetFrameBuffer( FrameBufferImage() );
+ defaultTask.SetSourceActor( window.GetRootLayer() );
+ defaultTask.SetFrameBuffer( FrameBuffer() );
}
}
//
//
//------------------------------------------------------------------------------
-int main(int argc, char **argv)
+int DALI_EXPORT_API main(int argc, char **argv)
{
- Application dali_app = Application::New(&argc, &argv);
+ Application dali_app = Application::New(&argc, &argv, DEMO_THEME_PATH);
ExampleApp app(dali_app);
- std::cout << "DALi Core: \t" << CORE_MAJOR_VERSION << "." << CORE_MINOR_VERSION << "." << CORE_MICRO_VERSION << " (" << CORE_BUILD_DATE << ")" << std::endl;
- std::cout << "DALi Adaptor: \t" << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << " (" << ADAPTOR_BUILD_DATE << ")\n";
- std::cout << "DALi Toolkit: \t" << Toolkit::TOOLKIT_MAJOR_VERSION << "." << Toolkit::TOOLKIT_MINOR_VERSION << "." << Toolkit::TOOLKIT_MICRO_VERSION << " (" << Toolkit::TOOLKIT_BUILD_DATE << ")\n";
-
-
if(argc > 1)
{
std::cout << "Loading file:" << argc << " " << argv[1] << std::endl;