[email protected] 8 anni fa
parent
commit
0c73713d5c

+ 4 - 4
examples/Game/part3/src/GameScene.cpp

@@ -13,10 +13,10 @@ GameScene::GameScene()
     _game->attachTo(_view);
 
     //create menu button
-    spActor btn = initActor(new MyButton,
-                            arg_resAnim = res::ui.getResAnim("menu"),
-                            arg_anchor = Vector2(0.5f, 0.5f),
-                            arg_attachTo = _view);
+    spSprite btn = new MyButton;
+    btn->setResAnim(res::ui.getResAnim("menu"));
+    btn->setAnchor(0.5f, 0.5f);
+    btn->attachTo(_view);
 
     //align it to top right
     btn->setX(_view->getWidth() - btn->getWidth() / 2);

+ 11 - 28
examples/Game/part3/src/MainMenuScene.cpp

@@ -14,47 +14,30 @@ MainMenuScene::MainMenuScene()
     sky->setResAnim(res::ui.getResAnim("bg"));
     sky->attachTo(_view);
 
-    /*
-    'initActor' is syntax sugar for
-
     spSprite logo = new Sprite;
     logo->setResAnim(res::ui.getResAnim("logo2")),
-    logo->attachTo(_view);
-    */
-
-    //create logo
-    spSprite logo = initActor(new Sprite,
-                              arg_resAnim = res::ui.getResAnim("logo2"),
-                              arg_attachTo = _view);
+         logo->attachTo(_view);
     logo->setPosition(_view->getSize() - logo->getSize());
 
 
-    /*
+    //create play button at center
     spSprite btn = new MyButton;
-    btn->setResAnim(res::ui.getResAnim("play")),
-    btn->setAnchor(Vector2(0.5f, 0.5f));
-    btn->setPosition(_view->getSize()/2);
+    btn->setName("play");
+    btn->setResAnim(res::ui.getResAnim("play"));
+    btn->setAnchor(0.5f, 0.5f);
+    btn->setPosition(_view->getSize() / 2);
     btn->attachTo(_view);
-    */
-
-    //create play button at center
-    spSprite btn = initActor(new MyButton,
-                             arg_name = "play",
-                             arg_resAnim = res::ui.getResAnim("play"),
-                             arg_anchor = Vector2(0.5f, 0.5f),
-                             arg_pos = _view->getSize() / 2,
-                             arg_attachTo = _view);
 
     //handle click to button
     btn->addEventListener(TouchEvent::CLICK, CLOSURE(this, &MainMenuScene::onEvent));
 
 
     //create menu button
-    btn = initActor(new MyButton,
-                    arg_name = "exit",
-                    arg_resAnim = res::ui.getResAnim("menu"),
-                    arg_anchor = Vector2(0.5f, 0.5f),
-                    arg_attachTo = _view);
+    btn = new MyButton;
+    btn->setName("exit");
+    btn->setResAnim(res::ui.getResAnim("menu"));
+    btn->setAnchor(0.5f, 0.5f);
+    btn->attachTo(_view);
 
     //align it to top right
     btn->setX(_view->getWidth() - btn->getWidth() / 2);

+ 16 - 17
examples/Game/part4/src/GameMenu.cpp

@@ -8,11 +8,10 @@ spGameMenu GameMenu::instance;
 GameMenu::GameMenu()
 {
     //initialize dialog background
-    _bg = initActor(new Box9Sprite,
-                    arg_attachTo = _view,
-                    arg_resAnim = res::ui.getResAnim("box9"),
-                    arg_pos = _view->getSize() / 2 - Vector2(300, 300) / 2);
-
+    _bg = new Box9Sprite;
+    _bg->attachTo(_view);
+    _bg->setResAnim(res::ui.getResAnim("box9"));
+    _bg->setPosition(_view->getSize() / 2 - Vector2(300, 300) / 2);
     _bg->setGuides(30, 30, 30, 30);
 
 
@@ -31,14 +30,14 @@ GameMenu::GameMenu()
     //horizontal align
     style.hAlign = TextStyle::HALIGN_MIDDLE;
 
-    spTextField paused = initActor(new TextField,
-                                   arg_style = style,
-                                   //colored text by "html" tags
-                                   arg_htmlText = "Paused<div c='00FF00'>!</div>",
-                                   arg_x = _view->getWidth() / 2,
-                                   arg_y = y,
-                                   arg_attachTo = _buttons,
-                                   arg_alpha = 128);
+    spTextField paused = new TextField;
+    paused->setStyle(style);
+    //colored text by "html" tags
+    paused->setHtmlText("Paused<div c='00FF00'>!</div>");
+    paused->setX(_view->getWidth() / 2);
+    paused->setY(y);
+    paused->attachTo(_buttons);
+    paused->setAlpha(128);
 
     //animate with infinity loops "Paused!" text
     paused->addTween(Actor::TweenAlpha(255), 1200, -1, true);
@@ -58,10 +57,10 @@ GameMenu::GameMenu()
         const AnimationFrame& frame = btns->getFrame(rand() % btns->getColumns(), rand() % btns->getRows());
 
         //MyButton is user class inherited from Sprite
-        spMyButton button = initActor(new MyButton,
-                                      arg_resAnim = frame,
-                                      arg_anchor = Vector2(0.5f, 0.5f),
-                                      arg_attachTo = _buttons);
+        spMyButton button = new MyButton;
+        button->setAnimFrame(frame);
+        button->setAnchor(0.5f, 0.5f);
+        button->attachTo(_buttons);
 
         button->setX(_view->getWidth() / 2);
         button->setY(y);

+ 4 - 4
examples/Game/part4/src/GameScene.cpp

@@ -20,10 +20,10 @@ GameScene::GameScene()
     _game->setClock(new Clock);
 
     //create menu button
-    spActor btn = initActor(new MyButton,
-                            arg_resAnim = res::ui.getResAnim("menu"),
-                            arg_anchor = Vector2(0.5f, 0.5f),
-                            arg_attachTo = _view);
+    spSprite btn = new MyButton;
+    btn->setResAnim(res::ui.getResAnim("menu"));
+    btn->setAnchor(0.5f, 0.5f);
+    btn->attachTo(_view);
 
     //align it to top right
     btn->setX(_view->getWidth() - btn->getWidth() / 2);

+ 12 - 27
examples/Game/part4/src/MainMenuScene.cpp

@@ -12,47 +12,32 @@ MainMenuScene::MainMenuScene()
     sky->setResAnim(res::ui.getResAnim("bg"));
     sky->attachTo(_view);
 
-    /*
-    'initActor' is syntax sugar for
 
     spSprite logo = new Sprite;
     logo->setResAnim(res::ui.getResAnim("logo2")),
-    logo->attachTo(_view);
-    */
-
-    //create logo
-    spSprite logo = initActor(new Sprite,
-                              arg_resAnim = res::ui.getResAnim("logo2"),
-                              arg_attachTo = _view);
+         logo->attachTo(_view);
     logo->setPosition(_view->getSize() - logo->getSize());
 
 
-    /*
-    spSprite btn = new MyButton;
-    btn->setResAnim(res::ui.getResAnim("play")),
-    btn->setAnchor(Vector2(0.5f, 0.5f));
-    btn->setPosition(_view->getSize()/2);
-    btn->attachTo(_view);
-    */
 
     //create play button at center
-    spSprite btn = initActor(new MyButton,
-                             arg_name = "play",
-                             arg_resAnim = res::ui.getResAnim("play"),
-                             arg_anchor = Vector2(0.5f, 0.5f),
-                             arg_pos = _view->getSize() / 2,
-                             arg_attachTo = _view);
+    spSprite btn = new MyButton;
+    btn->setName("play");
+    btn->setResAnim(res::ui.getResAnim("play"));
+    btn->setAnchor(0.5f, 0.5f);
+    btn->setPosition(_view->getSize() / 2);
+    btn->attachTo(_view);
 
     //handle click to button
     btn->addEventListener(TouchEvent::CLICK, CLOSURE(this, &MainMenuScene::onEvent));
 
 
     //create menu button
-    btn = initActor(new MyButton,
-                    arg_name = "exit",
-                    arg_resAnim = res::ui.getResAnim("menu"),
-                    arg_anchor = Vector2(0.5f, 0.5f),
-                    arg_attachTo = _view);
+    btn = new MyButton;
+    btn->setName("exit");
+    btn->setResAnim(res::ui.getResAnim("menu"));
+    btn->setAnchor(0.5f, 0.5f);
+    btn->attachTo(_view);
 
     //align it to top right
     btn->setX(_view->getWidth() - btn->getWidth() / 2);

+ 4 - 4
examples/Game/part4/src/MyButton.cpp

@@ -38,10 +38,10 @@ void MyButton::setText(const string& txt)
 
         //attach it to MyButton and set the same size as button
         //text would be centered
-        _text = initActor(new TextField,
-                          arg_style = style,
-                          arg_size = getSize(),
-                          arg_attachTo = this);
+        _text = new TextField;
+        _text->setStyle(style);
+        _text->setSize(getSize());
+        _text->attachTo(this);
     }
 
     _text->setText(txt);

+ 16 - 17
examples/Game/part5/src/GameMenu.cpp

@@ -8,11 +8,10 @@ spGameMenu GameMenu::instance;
 GameMenu::GameMenu()
 {
     //initialize dialog background
-    _bg = initActor(new Box9Sprite,
-                    arg_attachTo = _view,
-                    arg_resAnim = res::ui.getResAnim("box9"),
-                    arg_pos = _view->getSize() / 2 - Vector2(300, 300) / 2);
-
+    _bg = new Box9Sprite;
+    _bg->attachTo(_view);
+    _bg->setResAnim(res::ui.getResAnim("box9"));
+    _bg->setPosition(_view->getSize() / 2 - Vector2(300, 300) / 2);
     _bg->setGuides(30, 30, 30, 30);
 
 
@@ -31,14 +30,14 @@ GameMenu::GameMenu()
     //horizontal align
     style.hAlign = TextStyle::HALIGN_MIDDLE;
 
-    spTextField paused = initActor(new TextField,
-                                   arg_style = style,
-                                   //colored text by "html" tags
-                                   arg_htmlText = "Paused<div c='00FF00'>!</div>",
-                                   arg_x = _view->getWidth() / 2,
-                                   arg_y = y,
-                                   arg_attachTo = _buttons,
-                                   arg_alpha = 128);
+    spTextField paused = new TextField;
+    paused->setStyle(style);
+    //colored text by "html" tags
+    paused->setHtmlText("Paused<div c='00FF00'>!</div>");
+    paused->setX(_view->getWidth() / 2);
+    paused->setY(y);
+    paused->attachTo(_buttons);
+    paused->setAlpha(128);
 
     //animate with infinity loops "Paused!" text
     paused->addTween(Actor::TweenAlpha(255), 1200, -1, true);
@@ -58,10 +57,10 @@ GameMenu::GameMenu()
         const AnimationFrame& frame = btns->getFrame(rand() % btns->getColumns(), rand() % btns->getRows());
 
         //MyButton is user class inherited from Sprite
-        spMyButton button = initActor(new MyButton,
-                                      arg_resAnim = frame,
-                                      arg_anchor = Vector2(0.5f, 0.5f),
-                                      arg_attachTo = _buttons);
+        spMyButton button = new MyButton;
+        button->setAnimFrame(frame);
+        button->setAnchor(0.5f, 0.5f);
+        button->attachTo(_buttons);
 
         button->setX(_view->getWidth() / 2);
         button->setY(y);

+ 4 - 4
examples/Game/part5/src/GameScene.cpp

@@ -20,10 +20,10 @@ GameScene::GameScene()
     _game->setClock(new Clock);
 
     //create menu button
-    spActor btn = initActor(new MyButton,
-                            arg_resAnim = res::ui.getResAnim("menu"),
-                            arg_anchor = Vector2(0.5f, 0.5f),
-                            arg_attachTo = _view);
+    spSprite btn = new MyButton;
+    btn->setResAnim(res::ui.getResAnim("menu"));
+    btn->setAnchor(0.5f, 0.5f);
+    btn->attachTo(_view);
 
     //align it to top right
     btn->setX(_view->getWidth() - btn->getWidth() / 2);

+ 12 - 27
examples/Game/part5/src/MainMenuScene.cpp

@@ -12,47 +12,32 @@ MainMenuScene::MainMenuScene()
     sky->setResAnim(res::ui.getResAnim("bg"));
     sky->attachTo(_view);
 
-    /*
-    'initActor' is syntax sugar for
 
     spSprite logo = new Sprite;
     logo->setResAnim(res::ui.getResAnim("logo2")),
-    logo->attachTo(_view);
-    */
-
-    //create logo
-    spSprite logo = initActor(new Sprite,
-                              arg_resAnim = res::ui.getResAnim("logo2"),
-                              arg_attachTo = _view);
+         logo->attachTo(_view);
     logo->setPosition(_view->getSize() - logo->getSize());
 
 
-    /*
-    spSprite btn = new MyButton;
-    btn->setResAnim(res::ui.getResAnim("play")),
-    btn->setAnchor(Vector2(0.5f, 0.5f));
-    btn->setPosition(_view->getSize()/2);
-    btn->attachTo(_view);
-    */
 
     //create play button at center
-    spSprite btn = initActor(new MyButton,
-                             arg_name = "play",
-                             arg_resAnim = res::ui.getResAnim("play"),
-                             arg_anchor = Vector2(0.5f, 0.5f),
-                             arg_pos = _view->getSize() / 2,
-                             arg_attachTo = _view);
+    spSprite btn = new MyButton;
+    btn->setName("play");
+    btn->setResAnim(res::ui.getResAnim("play"));
+    btn->setAnchor(0.5f, 0.5f);
+    btn->setPosition(_view->getSize() / 2);
+    btn->attachTo(_view);
 
     //handle click to button
     btn->addEventListener(TouchEvent::CLICK, CLOSURE(this, &MainMenuScene::onEvent));
 
 
     //create menu button
-    btn = initActor(new MyButton,
-                    arg_name = "exit",
-                    arg_resAnim = res::ui.getResAnim("menu"),
-                    arg_anchor = Vector2(0.5f, 0.5f),
-                    arg_attachTo = _view);
+    btn = new MyButton;
+    btn->setName("exit");
+    btn->setResAnim(res::ui.getResAnim("menu"));
+    btn->setAnchor(0.5f, 0.5f);
+    btn->attachTo(_view);
 
     //align it to top right
     btn->setX(_view->getWidth() - btn->getWidth() / 2);

+ 4 - 4
examples/Game/part5/src/MyButton.cpp

@@ -38,10 +38,10 @@ void MyButton::setText(const string& txt)
 
         //attach it to MyButton and set the same size as button
         //text would be centered
-        _text = initActor(new TextField,
-                          arg_style = style,
-                          arg_size = getSize(),
-                          arg_attachTo = this);
+        _text = new TextField;
+        _text->setStyle(style);
+        _text->setSize(getSize());
+        _text->attachTo(this);
     }
 
     _text->setText(txt);

+ 1 - 1
examples/Match3/src/example.cpp

@@ -26,7 +26,7 @@ void example_init()
     board.init(6, 5);
 
     spActor view = board.getView();
-    view->setScale(getStage()->getHeight()/view->getHeight());
+    view->setScale(getStage()->getHeight() / view->getHeight());
     view->setPosition(getStage()->getSize() / 2 - view->getScaledSize() / 2);
     getStage()->addChild(view);
 }