Commit 9380a280c54977b0796fe3ac1bb8166618ae8394

Authored by Richard Huang
1 parent f5a8e854

Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D

Change-Id: If79d262a37658ab3de84e98abc399c20e135a391
examples/item-view/item-view-example.cpp
... ... @@ -250,7 +250,7 @@ public:
250 250 mDeleteButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
251 251 mDeleteButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
252 252 mDeleteButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
253   - mDeleteButton.SetDrawMode( DrawMode::OVERLAY );
  253 + mDeleteButton.SetDrawMode( DrawMode::OVERLAY_2D );
254 254 mDeleteButton.SetButtonImage( ResourceImage::New( DELETE_IMAGE ) );
255 255 mDeleteButton.SetSelectedImage( ResourceImage::New( DELETE_IMAGE_SELECTED ) );
256 256 mDeleteButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
... ... @@ -265,7 +265,7 @@ public:
265 265 mInsertButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
266 266 mInsertButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
267 267 mInsertButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
268   - mInsertButton.SetDrawMode( DrawMode::OVERLAY );
  268 + mInsertButton.SetDrawMode( DrawMode::OVERLAY_2D );
269 269 mInsertButton.SetButtonImage( ResourceImage::New( INSERT_IMAGE ) );
270 270 mInsertButton.SetSelectedImage( ResourceImage::New( INSERT_IMAGE_SELECTED ) );
271 271 mInsertButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
... ... @@ -280,7 +280,7 @@ public:
280 280 mReplaceButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
281 281 mReplaceButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
282 282 mReplaceButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
283   - mReplaceButton.SetDrawMode( DrawMode::OVERLAY );
  283 + mReplaceButton.SetDrawMode( DrawMode::OVERLAY_2D );
284 284 mReplaceButton.SetButtonImage( ResourceImage::New( REPLACE_IMAGE ) );
285 285 mReplaceButton.SetSelectedImage( ResourceImage::New( REPLACE_IMAGE_SELECTED ) );
286 286 mReplaceButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
... ...
examples/text-label/text-label-example.cpp
... ... @@ -107,7 +107,7 @@ public:
107 107 mContainer.SetParentOrigin( ParentOrigin::CENTER );
108 108 mLayoutSize = Vector2(stageSize.width*0.6f, stageSize.width*0.6f);
109 109 mContainer.SetSize( mLayoutSize );
110   - mContainer.SetDrawMode( DrawMode::OVERLAY );
  110 + mContainer.SetDrawMode( DrawMode::OVERLAY_2D );
111 111 stage.Add( mContainer );
112 112  
113 113 // Resize the center layout when the corner is grabbed
... ...
resources/scripts/animated-colors.json
... ... @@ -18,7 +18,7 @@
18 18 "stage": [
19 19 {
20 20 "type": "Control",
21   - "draw-mode": "OVERLAY",
  21 + "draw-mode": "OVERLAY_2D",
22 22 "actors": [
23 23 {
24 24 "type": "Control",
... ...
resources/scripts/background-color.json
... ... @@ -19,7 +19,7 @@
19 19 // A TextLabel with a red background
20 20 {
21 21 "type": "TextLabel",
22   - "draw-mode": "OVERLAY",
  22 + "draw-mode": "OVERLAY_2D",
23 23 "text": "Hello World",
24 24 "parent-origin": "TOP_CENTER",
25 25 "anchor-point": "TOP_CENTER",
... ...
resources/scripts/table-view.json
... ... @@ -44,7 +44,7 @@
44 44 "type":"TableView",
45 45 "background-color": [0.5,0.5,0,1],
46 46 "parent-origin": "CENTER",
47   - "draw-mode": "OVERLAY",
  47 + "draw-mode": "OVERLAY_2D",
48 48 "size":[400,400,1],
49 49 "rows": 4,
50 50 "columns": 4,
... ...