fix VS compile error

Change-Id: Ibb1630816bfeec3eb1fdd006806672acbba1e36e
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --git a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj
index c338a76..70f7725 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj
+++ b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj
@@ -50,17 +50,30 @@
     <None Include="res\json\date-picker.json" />\r
     <None Include="res\json\style-example-theme-one.json" />\r
     <None Include="res\json\spin.json" />\r
+    <None Include="res\models\Dino.mtl" />\r
+    <None Include="res\models\Dino.obj" />\r
     <None Include="tizen-manifest.xml" />\r
     <None Include="shared\res\NUISamples.TizenTV.png" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Compile Include="examples\control-dashboard.cs" />\r
+    <Compile Include="examples\custom-control.cs" />\r
+    <Compile Include="examples\dali-test.cs" />\r
     <Compile Include="examples\date-picker-using-json.cs" />\r
     <Compile Include="examples\date-picker.cs" />\r
     <Compile Include="examples\flex-container.cs" />\r
+    <Compile Include="examples\hello-test.cs" />\r
+    <Compile Include="examples\image-view.cs" />\r
+    <Compile Include="examples\json-loader.cs" />\r
+    <Compile Include="examples\scroll-view.cs" />\r
     <Compile Include="examples\test1.cs" />\r
+    <Compile Include="examples\user-alphafunction.cs" />\r
     <Compile Include="examples\visual-view-test.cs" />\r
     <Compile Include="examples\hello-world.cs" />\r
+    <Compile Include="examples\visuals-example.cs" />\r
+    <Compile Include="examples\visuals-using-custom-view\ContactData.cs" />\r
+    <Compile Include="examples\visuals-using-custom-view\ContactView.cs" />\r
+    <Compile Include="examples\visuals-using-custom-view\visuals-using-custom-view.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -76,12 +89,18 @@
     <Content Include="res\images\application-icon-0.png" />\r
     <Content Include="res\images\arrow.png" />\r
     <Content Include="res\images\background-blocks.jpg" />\r
+    <Content Include="res\images\Dino-Painted_lambert2SG_color.png" />\r
+    <Content Include="res\images\Dino-Painted_lambert2SG_gloss.png" />\r
+    <Content Include="res\images\Dino-Painted_lambert2SG_nmap.png" />\r
+    <Content Include="res\images\Dino2_lambert2SG_color.png" />\r
+    <Content Include="res\images\Dino2_lambert2SG_nmap.png" />\r
     <Content Include="res\images\gallery-0.jpg" />\r
     <Content Include="res\images\gallery-1.jpg" />\r
     <Content Include="res\images\gallery-2.jpg" />\r
     <Content Include="res\images\gallery-3.jpg" />\r
     <Content Include="res\images\gallery-4.jpg" />\r
     <Content Include="res\images\gallery-5.jpg" />\r
+    <Content Include="res\images\gallery-small-43.jpg" />\r
     <Content Include="res\images\image-1.jpg" />\r
     <Content Include="res\images\image-2.jpg" />\r
     <Content Include="res\images\image-3.jpg" />\r

diff --git a/NUISamples/NUISamples.TizenTV/examples/json-loader.cs b/NUISamples/NUISamples.TizenTV/examples/json-loader.cs
index e9badc8..8946e61 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/json-loader.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/json-loader.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs b/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs
index fd211ac..18e6044 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs
@@ -25,6 +25,7 @@ namespace VisualViewTest
     class Example : NUIApplication
     {
         private VisualView _visualView = null;
+        private const string resources = "/home/owner/apps_rw/NUISamples.TizenTV/res";
 
         public Example() : base()
         {
@@ -62,7 +63,7 @@ namespace VisualViewTest
 
             /* image visual 1. */
             ImageVisualMap imageVisualMap1 = new ImageVisualMap();
-            imageVisualMap1.URL = "./examples/images/image-1.jpg";
+            imageVisualMap1.URL = resources + "/images/image-1.jpg";
             imageVisualMap1.VisualSize = new Vector2(200.0f, 200.0f);
             imageVisualMap1.Offset = new Vector2(10.0f, 10.0f);
             imageVisualMap1.OffsetPolicy = new Vector2(1, 1);
@@ -73,7 +74,7 @@ namespace VisualViewTest
 
             /* image visual 2. */
             ImageVisualMap imageVisualMap2 = new ImageVisualMap();
-            imageVisualMap2.URL = "./examples/images/image-2.jpg";
+            imageVisualMap2.URL = resources + "/images/image-2.jpg";
             imageVisualMap2.VisualSize = new Vector2(250.0f, 200.0f);
             imageVisualMap2.Offset = new Vector2(220.0f, 10.0f);
             imageVisualMap2.OffsetPolicy = new Vector2(1, 1);
@@ -96,7 +97,7 @@ namespace VisualViewTest
             textVisualMap1.Text = "Hello Goodbye";
             textVisualMap1.PointSize = 20.0f;
 
-            textVisualMap1.VisualSize = new Vector2(200.0f, 50.0f);
+            textVisualMap1.VisualSize = new Vector2(900.0f, 250.0f);
             textVisualMap1.Offset = new Vector2(10.0f, 220.0f);
             textVisualMap1.OffsetPolicy = new Vector2(1, 1);
             textVisualMap1.SizePolicy = new Vector2(1, 1);
@@ -110,7 +111,7 @@ namespace VisualViewTest
             borderVisualMap1.Size = 5.0f;
 
             borderVisualMap1.VisualSize = new Vector2(100.0f, 100.0f);
-            borderVisualMap1.Offset = new Vector2(10.0f, 280.0f);
+            borderVisualMap1.Offset = new Vector2(10.0f, 380.0f);
             borderVisualMap1.OffsetPolicy = new Vector2(1, 1);
             borderVisualMap1.SizePolicy = new Vector2(1, 1);
             borderVisualMap1.Origin = AlignType.TOP_BEGIN;
@@ -139,7 +140,7 @@ namespace VisualViewTest
             gradientVisualMap1.Radius = 1.414f;
 
             gradientVisualMap1.VisualSize = new Vector2(100.0f, 100.0f);
-            gradientVisualMap1.Offset = new Vector2(120.0f, 280.0f);
+            gradientVisualMap1.Offset = new Vector2(120.0f, 380.0f);
             gradientVisualMap1.OffsetPolicy = new Vector2(1, 1);
             gradientVisualMap1.SizePolicy = new Vector2(1, 1);
             gradientVisualMap1.Origin = AlignType.TOP_BEGIN;
@@ -155,7 +156,7 @@ namespace VisualViewTest
             primitiveVisualMap1.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f);
 
             primitiveVisualMap1.VisualSize = new Vector2(100.0f, 100.0f);
-            primitiveVisualMap1.Offset = new Vector2(230.0f, 280.0f);
+            primitiveVisualMap1.Offset = new Vector2(230.0f, 380.0f);
             primitiveVisualMap1.OffsetPolicy = new Vector2(1, 1);
             primitiveVisualMap1.SizePolicy = new Vector2(1, 1);
             primitiveVisualMap1.Origin = AlignType.TOP_BEGIN;
@@ -171,7 +172,7 @@ namespace VisualViewTest
             primitiveVisualMap2.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f);
 
             primitiveVisualMap2.VisualSize = new Vector2(100.0f, 100.0f);
-            primitiveVisualMap2.Offset = new Vector2(340.0f, 280.0f);
+            primitiveVisualMap2.Offset = new Vector2(340.0f, 380.0f);
             primitiveVisualMap2.OffsetPolicy = new Vector2(1, 1);
             primitiveVisualMap2.SizePolicy = new Vector2(1, 1);
             primitiveVisualMap2.Origin = AlignType.TOP_BEGIN;
@@ -187,7 +188,7 @@ namespace VisualViewTest
             primitiveVisualMap3.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f);
 
             primitiveVisualMap3.VisualSize = new Vector2(100.0f, 100.0f);
-            primitiveVisualMap3.Offset = new Vector2(10.0f, 390.0f);
+            primitiveVisualMap3.Offset = new Vector2(10.0f, 490.0f);
             primitiveVisualMap3.OffsetPolicy = new Vector2(1, 1);
             primitiveVisualMap3.SizePolicy = new Vector2(1, 1);
             primitiveVisualMap3.Origin = AlignType.TOP_BEGIN;
@@ -203,7 +204,7 @@ namespace VisualViewTest
             primitiveVisualMap4.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f);
 
             primitiveVisualMap4.VisualSize = new Vector2(100.0f, 100.0f);
-            primitiveVisualMap4.Offset = new Vector2(120.0f, 390.0f);
+            primitiveVisualMap4.Offset = new Vector2(120.0f, 490.0f);
             primitiveVisualMap4.OffsetPolicy = new Vector2(1, 1);
             primitiveVisualMap4.SizePolicy = new Vector2(1, 1);
             primitiveVisualMap4.Origin = AlignType.TOP_BEGIN;
@@ -219,7 +220,7 @@ namespace VisualViewTest
             primitiveVisualMap5.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f);
 
             primitiveVisualMap5.VisualSize = new Vector2(100.0f, 100.0f);
-            primitiveVisualMap5.Offset = new Vector2(230.0f, 390.0f);
+            primitiveVisualMap5.Offset = new Vector2(230.0f, 490.0f);
             primitiveVisualMap5.OffsetPolicy = new Vector2(1, 1);
             primitiveVisualMap5.SizePolicy = new Vector2(1, 1);
             primitiveVisualMap5.Origin = AlignType.TOP_BEGIN;
@@ -228,13 +229,13 @@ namespace VisualViewTest
 
             /* mesh visual nothing show. */
             MeshVisualMap meshVisualMap1 = new MeshVisualMap();
-            meshVisualMap1.ObjectURL = "./examples/models/Dino.obj";
-            meshVisualMap1.MaterialtURL = "./examples/models/Dino.mtl";
-            meshVisualMap1.TexturesPath = "./examples/images/";
+            meshVisualMap1.ObjectURL = resources + "/models/Dino.obj";
+            meshVisualMap1.MaterialtURL = resources + "/models/Dino.mtl";
+            meshVisualMap1.TexturesPath = resources + "/images/";
             meshVisualMap1.ShadingMode = MeshVisualShadingModeValue.TexturedWithSpecularLighting;
 
             meshVisualMap1.VisualSize = new Vector2(200.0f, 200.0f);
-            meshVisualMap1.Offset = new Vector2(10.0f, 500.0f);
+            meshVisualMap1.Offset = new Vector2(10.0f, 600.0f);
             meshVisualMap1.OffsetPolicy = new Vector2(1, 1);
             meshVisualMap1.SizePolicy = new Vector2(1, 1);
             meshVisualMap1.Origin = AlignType.TOP_BEGIN;
@@ -243,7 +244,7 @@ namespace VisualViewTest
         }
 
         [STAThread]
-        static void _Main(string[] args)
+        static void Main(string[] args)
         {
             Example example = new Example();
             example.Run(args);

diff --git a/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs b/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs
index 07b005c..a20f1a5 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj
index 3d96a68..a4c0e50 100755 (executable)
--- a/src/Tizen.NUI/Tizen.NUI.csproj
+++ b/src/Tizen.NUI/Tizen.NUI.csproj
@@ -165,6 +165,7 @@
     <Compile Include="src\internal\PinchGestureDetector.cs" />\r
     <Compile Include="src\internal\PixelData.cs" />\r
     <Compile Include="src\internal\PixelFormat.cs" />\r
+    <Compile Include="src\internal\VisualTransformPolicyType.cs" />\r
     <Compile Include="src\public\CustomView\VisualView.cs" />\r
     <Compile Include="src\public\VisualMaps.cs" />\r
     <Compile Include="src\public\Position2D.cs" />\r