Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D

Change-Id: If79d262a37658ab3de84e98abc399c20e135a391

diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp
index f9998834bdd75d714ad099c56021695c8d7ef6cf..24b78a4a44de70045f53c6284d67cc46e55f974d 100644 (file)
--- a/examples/item-view/item-view-example.cpp
+++ b/examples/item-view/item-view-example.cpp
@@ -250,7 +250,7 @@ public:
     mDeleteButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
     mDeleteButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
     mDeleteButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
-    mDeleteButton.SetDrawMode( DrawMode::OVERLAY );
+    mDeleteButton.SetDrawMode( DrawMode::OVERLAY_2D );
     mDeleteButton.SetButtonImage( ResourceImage::New( DELETE_IMAGE ) );
     mDeleteButton.SetSelectedImage( ResourceImage::New( DELETE_IMAGE_SELECTED ) );
     mDeleteButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
@@ -265,7 +265,7 @@ public:
     mInsertButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
     mInsertButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
     mInsertButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
-    mInsertButton.SetDrawMode( DrawMode::OVERLAY );
+    mInsertButton.SetDrawMode( DrawMode::OVERLAY_2D );
     mInsertButton.SetButtonImage( ResourceImage::New( INSERT_IMAGE ) );
     mInsertButton.SetSelectedImage( ResourceImage::New( INSERT_IMAGE_SELECTED ) );
     mInsertButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
@@ -280,7 +280,7 @@ public:
     mReplaceButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
     mReplaceButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
     mReplaceButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
-    mReplaceButton.SetDrawMode( DrawMode::OVERLAY );
+    mReplaceButton.SetDrawMode( DrawMode::OVERLAY_2D );
     mReplaceButton.SetButtonImage( ResourceImage::New( REPLACE_IMAGE ) );
     mReplaceButton.SetSelectedImage( ResourceImage::New( REPLACE_IMAGE_SELECTED ) );
     mReplaceButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );

diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp
index 9d12f7d9835b915337a4dc3d6f2c4ca48578a038..c7e8555e58935fa39f41aaae0b4a6502b9015321 100644 (file)
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -107,7 +107,7 @@ public:
     mContainer.SetParentOrigin( ParentOrigin::CENTER );
     mLayoutSize = Vector2(stageSize.width*0.6f, stageSize.width*0.6f);
     mContainer.SetSize( mLayoutSize );
-    mContainer.SetDrawMode( DrawMode::OVERLAY );
+    mContainer.SetDrawMode( DrawMode::OVERLAY_2D );
     stage.Add( mContainer );
 
     // Resize the center layout when the corner is grabbed

diff --git a/resources/scripts/animated-colors.json b/resources/scripts/animated-colors.json
index e60b7abd4cb051bd80308f7e313eb27f8c9bae22..bcb61330aa6c666b0f1b2220802c2025acc14685 100644 (file)
--- a/resources/scripts/animated-colors.json
+++ b/resources/scripts/animated-colors.json
@@ -18,7 +18,7 @@
   "stage": [
     {
       "type": "Control",
-      "draw-mode": "OVERLAY",
+      "draw-mode": "OVERLAY_2D",
       "actors": [
         {
           "type": "Control",

diff --git a/resources/scripts/background-color.json b/resources/scripts/background-color.json
index 09591799fd53092a62455086e9b9a321a281fe84..9895e128c9decaf37c75b653824fe019f759fd83 100644 (file)
--- a/resources/scripts/background-color.json
+++ b/resources/scripts/background-color.json
@@ -19,7 +19,7 @@
     // A TextLabel with a red background
     {
       "type": "TextLabel",
-      "draw-mode": "OVERLAY",
+      "draw-mode": "OVERLAY_2D",
       "text": "Hello World",
       "parent-origin": "TOP_CENTER",
       "anchor-point": "TOP_CENTER",

diff --git a/resources/scripts/table-view.json b/resources/scripts/table-view.json
index 6934759c1b62e65544fa866da11c11bb0d6b562c..28a370c64676e6385e93ec4bd2260316e3860c9a 100644 (file)
--- a/resources/scripts/table-view.json
+++ b/resources/scripts/table-view.json
@@ -44,7 +44,7 @@
       "type":"TableView",
       "background-color": [0.5,0.5,0,1],
       "parent-origin": "CENTER",
-      "draw-mode": "OVERLAY",
+      "draw-mode": "OVERLAY_2D",
       "size":[400,400,1],
       "rows": 4,
       "columns": 4,