Revert "[Tizen] Add codes for Dali Windows Backend"

This reverts commit af6ce78432ae8581e823fd08a606a699b32a79a7.

diff --git a/.gitignore b/.gitignore
index 146c707..c714b70 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -43,5 +43,3 @@ simple-image-wall.js
 /debugfiles.list
 /debuglinks.list
 /debugsources.list
-/CMakeCache.txt
-/CMakeFiles

diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100755 (executable)
index 8358791..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-cmake_minimum_required(VERSION 3.11)\r
-\r
-PROJECT (dali)\r
-\r
-add_subdirectory(dali-core)\r
-add_subdirectory(dali-adaptor)\r
-add_subdirectory(dali-toolkit)\r
-\r
-SET( SOURCES ${SOURCES}\r
-dali-demo/main/main-example.cpp\r
-)\r
-\r
-ADD_DEFINITIONS(\r
-#-D _CRT_SECURE_NO_WARNINGS\r
--DAPP_DATA_RES_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res"\r
--DIMAGES_DIR=APP_DATA_RES_DIR"/images/"\r
--DSTYLE_DIR=APP_DATA_RES_DIR"/style/"\r
--DDEMO_THEME_PATH=STYLE_DIR"demo-theme.json"\r
--DDEMO_IMAGE_DIR=IMAGES_DIR\r
--DdataReadOnlyDir="${dali_SOURCE_DIR}/dali-env/opt/share/dali/"\r
--Ddaliimagedir=dataReadOnlyDir"toolkit/images/"\r
--DDALI_IMAGE_DIR=daliimagedir\r
--DDEMO_STYLE_DIR=APP_DATA_RES_DIR"/style/"\r
--DAPPLICATION_RESOURCE_PATH="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res"\r
--DDEMO_VIDEO_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/videos/"\r
--DDEMO_MODEL_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/models/"\r
--DDEMO_SHADER_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/shaders/"\r
--DDEMO_SCRIPT_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/scripts/"\r
--DDEMO_GAME_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/game"\r
-/vmg\r
-/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/PreprocessorDefinitions.h"\r
-/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/DaliDemoPreDefine.h"\r
--Dssize_t=size_t\r
-/Gz\r
-)\r
-#head file path  \r
-INCLUDE_DIRECTORIES(  \r
-${dali_SOURCE_DIR}/dali-demo\r
-${dali_SOURCE_DIR}/dali-env/opt/include\r
-${dali_SOURCE_DIR}/dali-demo/examples/text-label-emojis\r
-${dali_SOURCE_DIR}/dali-core\r
-${dali_SOURCE_DIR}/dali-adaptor\r
-${dali_SOURCE_DIR}/dali-toolkit\r
-${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude\r
-)\r
-\r
-link_directories(\r
-${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExLib\r
-${dali_SOURCE_DIR}/bin\r
-)\r
-\r
-set(EXECUTABLE_OUTPUT_PATH bin)\r
-\r
-add_executable(dali-demo ${SOURCES})\r
-\r
-target_link_libraries(dali-demo dali-core.lib)\r
-target_link_libraries(dali-demo dali-adaptor.lib)\r
-target_link_libraries(dali-demo dali-toolkit.lib)\r
-target_link_libraries(dali-demo Win32File.lib)\r
-target_link_libraries(dali-demo WindowsPlatform.lib)\r
-target_link_libraries(dali-demo libjpeg.lib)\r
-target_link_libraries(dali-demo libcurl_a.lib)\r
-target_link_libraries(dali-demo turbojpeg.lib)\r
-target_link_libraries(dali-demo getopt.lib)\r
-target_link_libraries(dali-demo giflib.lib)\r
-target_link_libraries(dali-demo libEGL.lib)\r
-target_link_libraries(dali-demo libexif.lib)\r
-target_link_libraries(dali-demo libGLESv2.lib)\r
-target_link_libraries(dali-demo pthread.lib)\r
-target_link_libraries(dali-demo libpng.lib)\r
-target_link_libraries(dali-demo zlibstat.lib)\r
-target_link_libraries(dali-demo legacy_stdio_definitions.lib)\r
-target_link_libraries(dali-demo freetype.lib)\r
-target_link_libraries(dali-demo FontConfig.lib)\r
-target_link_libraries(dali-demo libexpat.lib)\r
-target_link_libraries(dali-demo fribidi.lib)\r
-target_link_libraries(dali-demo harfbuzz-1.4.7.lib)\r
-target_link_libraries(dali-demo dlfcn.lib)\r
-target_link_libraries(dali-demo Iphlpapi.lib)\r
-target_link_libraries(dali-demo Psapi.lib)\r
-target_link_libraries(dali-demo Userenv.lib)\r
-\r
-add_dependencies(dali-demo dali-core)\r
-add_dependencies(dali-demo dali-adaptor)\r
-add_dependencies(dali-demo dali-toolkit)\r
-\r

diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp
old mode 100755 (executable)
new mode 100644 (file)
index ad10428..14c4878
--- a/examples/refraction-effect/refraction-effect-example.cpp
+++ b/examples/refraction-effect/refraction-effect-example.cpp
@@ -509,9 +509,7 @@ private:
         }
 
         std::istringstream iss(line.substr(2), std::istringstream::in);
-
-        std::vector<unsigned int> indices( numOfInt );
-
+        unsigned int indices[ numOfInt ];
         unsigned int i=0;
         while( iss >> indices[i++] && i < numOfInt);
         unsigned int step = (i+1) / 3;

diff --git a/examples/text-fonts/text-fonts-example.cpp b/examples/text-fonts/text-fonts-example.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 876b55f..1519b87
--- a/examples/text-fonts/text-fonts-example.cpp
+++ b/examples/text-fonts/text-fonts-example.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 955466b..63f1c36
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -213,7 +213,7 @@ public:
     mContainer = Control::New();
     mContainer.SetName( "Container" );
     mContainer.SetParentOrigin( ParentOrigin::CENTER );
-    mLayoutSize = Vector2(mStageSize.width*0.6f, mStageSize.height*0.6f);
+    mLayoutSize = Vector2(mStageSize.width*0.6f, mStageSize.width*0.6f);
     mContainer.SetSize( mLayoutSize );
     stage.Add( mContainer );
 

diff --git a/main/main-example.cpp b/main/main-example.cpp
deleted file mode 100755 (executable)
index 290d87a..0000000
--- a/main/main-example.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//#include "examples/Alpha-Blending-Cpu/Alpha-Blending-Cpu-example.cpp"\r
-//#include "examples/Animated-Shapes/Animated-Shapes-example.cpp"\r
-//#include "examples/Benchmark/Benchmark.cpp"\r
-//#include "examples/Blocks/Blocks-example.cpp"\r
-#include "examples/Bubble-Effect/Bubble-Effect-example.cpp"\r
-//#include "examples/Buttons/Buttons-example.cpp"\r
-\r
-//#include "examples/Clipping/Clipping-example.cpp"\r
-//#include "examples/Clipping/clipping-item-factory.cpp"\r
-\r
-//#include "examples/Clipping-Draw-Order/Clipping-Draw-Order.cpp"\r
-//#include "examples/Compressed-Texture-Formats/Compressed-Texture-Formats-example.cpp"\r
-\r
-//#include "examples/Contact-Cards/Contact-Cards-example.cpp"\r
-//#include "examples/Contact-Cards/clipped-image.cpp"\r
-//#include "examples/Contact-Cards/contact-card.cpp"\r
-//#include "examples/Contact-Cards/contact-card-layouter.cpp"\r
-//#include "examples/Contact-Cards/contact-data.cpp"\r
-\r
-//#include "examples/compressed-texture-formats/compressed-texture-formats-example.cpp"\r
-\r
-//#include "examples/Cube-Transition-Effect/Cube-Transition-Effect-example.cpp"\r
-//#include "examples/Effects-View/Effects-View-example.cpp"\r
-//#include "examples/Flex-Container/Flex-Container-example.cpp"\r
-//#include "examples/Focus-Integration/Focus-Integration.cpp"\r
-\r
-\r
-//#include "examples/Gradients/Gradients-example.cpp"\r
-//#include "examples/Hello-World/Hello-World-example.cpp"\r
-//#include "examples/Homescreen-Benchmark/Homescreen-Benchmark.cpp"\r
-//#include "examples/Image-Scaling-And-Filtering/Image-Scaling-And-Filtering-example.cpp"\r
-//#include "examples/Image-Scaling-Irregular-Grid/Image-Scaling-Irregular-Grid-example.cpp"\r
-//#include "examples/Image-View/Image-View-example.cpp"\r
-//#include "examples/Image-View-Alpha-Blending/Image-View-Alpha-Blending-example.cpp"\r
-//#include "examples/Image-View-Pixel-Area/Image-View-Pixel-Area-example.cpp"\r
-//#include "examples/Image-View-Svg/Image-View-Svg-example.cpp"\r
-//#include "examples/Image-View-Url/Image-View-Url-example.cpp"\r
-//#include "examples/Item-View/Item-View-example.cpp"\r
-//#include "examples/Line-Mesh/Line-Mesh-example.cpp"\r
-//#include "examples/Magnifier/Magnifier-example.cpp"\r
-//#include "examples/Mesh-Morph/Mesh-Morph-example.cpp"\r
-//#include "examples/Mesh-Visual/Mesh-Visual-example.cpp"\r
-//#include "examples/Model3d-View/Model3d-View-example.cpp"\r
-//#include "examples/Motion-Blur/Motion-Blur-example.cpp"\r
-//#include "examples/Motion-Stretch/Motion-Stretch-example.cpp"\r
-//#include "examples/Native-Image-Source/Native-Image-Source-example.cpp"\r
-//#include "examples/Perf-Scroll/Perf-Scroll.cpp"\r
-//#include "examples/Pivot/Pivot-example.cpp"\r
-//#include "examples/Point-mesh/Point-mesh-example.cpp"\r
-//#include "examples/Popup/Popup-example.cpp"\r
-//#include "examples/Primitive-Shapes/Primitive-Shapes-example.cpp"\r
-//#include "examples/Progress-Bar/Progress-Bar-example.cpp"\r
-//#include "examples/Property-Notification/Property-Notification-example.cpp"\r
-//#include "examples/Ray-Marching/Ray-Marching-example.cpp"\r
-//#include "examples/refraction-effect/refraction-effect-example.cpp"\r
-//#include "examples/Remote-Image-Loading/Remote-Image-Loading-example.cpp"\r
-//#include "examples/Renderer-Stencil/Renderer-Stencil-example.cpp"\r
-//#include "examples/Rendering-Basic-Light/Rendering-Basic-Light-example.cpp"\r
-\r
-//#include "examples/Rendering-Basic-Pbr/Rendering-Basic-Pbr-example.cpp"\r
-//#include "examples/Rendering-Basic-Pbr/ktx-loader.cpp"\r
-//#include "examples/Rendering-Basic-Pbr/model-pbr.cpp"\r
-//#include "examples/Rendering-Basic-Pbr/model-skybox.cpp"\r
-//#include "examples/Rendering-Basic-Pbr/obj-loader.cpp"\r
-\r
-//#include "examples/rendering-skybox/look-camera.cpp"\r
-//#include "examples/rendering-skybox/rendering-skybox.cpp"\r
-\r
-//#include "examples/Rendering-Cube/Rendering-Cube.cpp"\r
-//#include "examples/Rendering-Line/Rendering-Line.cpp"\r
-\r
-//#include "examples/Rendering-Textured-Cube/Rendering-Textured-Cube.cpp"\r
-//#include "examples/Rendering-Triangle/Rendering-Triangle.cpp"\r
-//#include "examples/Scroll-View/Scroll-View-example.cpp"\r
-//#include "examples/Shadows-And-Lights/Shadows-And-Lights-example.cpp"\r
-//#include "examples/Size-Negotiation/Size-Negotiation-example.cpp"\r
-\r
-//#include "examples/simple-visuals-control/my-control.cpp"\r
-//#include "examples/simple-visuals-control/my-control-impl.cpp"\r
-//#include "examples/simple-visuals-control/simple-visuals-application.cpp"\r
-//#include "examples/simple-visuals-control/simple-visuals-example.cpp"\r
-\r
-//#include "examples/Sparkle/Sparkle-Effect-example.cpp"\r
-\r
-//#include "examples/styling/Style-example.cpp"\r
-//#include "examples/styling/image-channel-control.cpp"\r
-//#include "examples/styling/image-channel-control-impl.cpp"\r
-//#include "examples/styling/styling-application.cpp"\r
-\r
-//#include "examples/Text-Editor/Text-Editor-example.cpp"\r
-\r
-//#include "examples/text-fonts/text-fonts-example.cpp"\r
-\r
-//#include "examples/text-label/expanding-buttons.cpp"\r
-//#include "examples/text-label/expanding-buttons-impl.cpp"\r
-//#include "examples/text-label/text-label-example.cpp"\r
-\r
-//#include "examples/text-label-multi-language/text-label-multi-language-example.cpp"\r
-\r
-//#include "examples/Text-Label-Emojis/Text-Label-Emojis.cpp"\r
-//#include "examples/Text-Memory-Profiling/Text-Memory-Profiling-example.cpp"\r
-//#include "examples/Text-Overlap/Text-Overlap-example.cpp"\r
-//#include "examples/Text-Scrolling/Text-Scrolling-example.cpp"\r
-//#include "examples/Textured-Mesh/Textured-Mesh-example.cpp"\r
-//#include "examples/Tilt/Tilt-example.cpp"\r
-//#include "examples/Tooltip/Tooltip-example.cpp"\r
-\r
-//#include "examples/Transitions/Transition-example.cpp"\r
-//#include "examples/Transitions/shadow-button.cpp"\r
-//#include "examples/Transitions/shadow-button-impl.cpp"\r
-//#include "examples/Transitions/transition-application.cpp"\r
-\r
-//#include "examples/Visual-Transitions/Transition-example.cpp"\r
-//#include "examples/Visual-Transitions/beat-control.cpp"\r
-//#include "examples/Visual-Transitions/beat-control-impl.cpp"\r
-//#include "examples/Visual-Transitions/transition-application.cpp"\r
-\r

diff --git a/prebuild.bat b/prebuild.bat
deleted file mode 100755 (executable)
index cab182f..0000000
--- a/prebuild.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-xcopy /s/y/i/f/d "..\dali-adaptor\dali\integration-api\*.h" "..\dali-env\opt\include\dali\integration-api\adaptors"
-xcopy /s/y/i/f/d "..\dali-env\opt\include\dali\integration-api\adaptors\windows\*.*" "..\dali-env\opt\include\dali\integration-api\adaptors"
-copy /d "..\dali-adaptor\dali\public-api\dali.h" "..\dali-env\opt\include\dali\dali.h"
-
-xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\styles\*.json" "..\dali-env\opt\share\dali\toolkit\styles"
-xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\styles\480x800\*.json" "..\dali-env\opt\share\dali\toolkit\styles"
-xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\styles\480x800\images\*.png" "..\dali-env\opt\share\dali\toolkit\styles\images"
-xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\styles\images-common\*.png" "..\dali-env\opt\share\dali\toolkit\images"
-xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\sounds\*.ogg" "..\dali-env\opt\share\dali\toolkit\sounds"
-
-xcopy /s/y/i/f/d "resources\game\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\game"
-xcopy /s/y/i/f/d "resources\images\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\images"
-xcopy /s/y/i/f/d "resources\models\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\models"
-xcopy /s/y/i/f/d "resources\scripts\*.json" "..\dali-env\opt\share\com.samsung.dali-demo\res\scripts"
-xcopy /s/y/i/f/d "resources\shaders\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\shaders"
-xcopy /s/y/i/f/d "resources\style\*.json" "..\dali-env\opt\share\com.samsung.dali-demo\res\style"
-xcopy /s/y/i/f/d "resources\style\images\*.png" "..\dali-env\opt\share\com.samsung.dali-demo\res\style\images"
-xcopy /s/y/i/f/d "resources\videos\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\videos"
-xcopy /s/y/i/f/d "..\dali-adaptor\dali-windows-backend\ExDll\*.dll" "..\bin\Debug"
-
-copy "CMakeLists.txt" "../CMakeLists.txt"
-
-cd ..
-set appPackage=%envDir%"/opt/share/com.samsung.dali-demo/res"
-set csharpDemoDir=%cd%\"dali-windows-backend\csharp-demo"
-
-setx dali_csharp-demo %csharpDemoDir:\=/%
-setx DALI_APPLICATION_PACKAGE %appPackage:\=/%
-setx DALI_WINDOW_WIDTH 1920
-setx DALI_WINDOW_HEIGHT 1080
-@pause
\ No newline at end of file

diff --git a/shared/multi-language-strings.h b/shared/multi-language-strings.h
old mode 100755 (executable)
new mode 100644 (file)
index 0946908..f5f1675
--- a/shared/multi-language-strings.h
+++ b/shared/multi-language-strings.h
@@ -1,4 +1,4 @@
-#ifndef __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__
+#ifndef __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__
 #define __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__
 
 /*