dm 7 years ago
parent
commit
aeb994ef5f

+ 3 - 3
examples/Demo/src/TestAlphaHitTest.h

@@ -21,16 +21,16 @@ public:
 
         sprite = new Sprite;
         sprite->setResAnim(resources.getResAnim("flower"));
-        sprite->attachTo(content);
+        sprite->attachTo(_content);
         sprite->setAnchor(0.5f, 0.5f);
-        sprite->setPosition(content->getSize() / 2);
+        sprite->setPosition(_content->getSize() / 2);
 
         sprite->addEventListener(TouchEvent::OVER, CLOSURE(this, &TestAlphaHitTest::onEvent));
         sprite->addEventListener(TouchEvent::OUTX, CLOSURE(this, &TestAlphaHitTest::onEvent));
         sprite->setTouchChildrenEnabled(false);
 
         txt = new TextField;
-        txt->attachTo(content);
+        txt->attachTo(_content);
         txt->setVAlign(TextStyle::VALIGN_BOTTOM);
         txt->setHAlign(TextStyle::HALIGN_MIDDLE);
         txt->setX(getWidth() / 2);

+ 2 - 2
examples/Demo/src/TestCamera.h

@@ -134,8 +134,8 @@ public:
     TestCamera()
     {
         spCamera cam = new Camera;
-        cam->attachTo(content);
-        cam->setSize(content->getSize());
+        cam->attachTo(_content);
+        cam->setSize(_content->getSize());
 
 
         spSprite map = new Sprite();

+ 2 - 2
examples/Demo/src/TestClipRect.h

@@ -7,8 +7,8 @@ public:
     TestClipRect()
     {
         spClipRectActor clp = createClipRect(250, 250, 4.0f);
-        clp->attachTo(content);
-        clp->setPosition(content->getSize() / 2 - clp->getSize() / 2);
+        clp->attachTo(_content);
+        clp->setPosition(_content->getSize() / 2 - clp->getSize() / 2);
 
         spClipRectActor childClp = createClipRect(100, 100, 2.0f);
         childClp->setPosition(-40.0f, -40.0f);

+ 1 - 1
examples/Demo/src/TestColorFont.h

@@ -103,7 +103,7 @@ public:
 
         spShaderTextField txt = new ShaderTextField;
         //spTextField txt = new TextField;
-        txt->attachTo(content);
+        txt->attachTo(_content);
         _txt = txt;
 
         TextStyle st;

+ 2 - 2
examples/Demo/src/TestCounter.h

@@ -10,7 +10,7 @@ public:
         spSprite bg = new Sprite;
         bg->setResAnim(resources.getResAnim("score_table"));
         bg->setPosition(getStage()->getSize() / 2 - bg->getSize() / 2);
-        content->addChild(bg);
+        _content->addChild(bg);
 
 
         //Thanks to Dmitry Volokitin for Counter class  source code and assets used in this Test
@@ -21,7 +21,7 @@ public:
         counter->reset();
         counter->setValue(1000);
         counter->setPosition(bg->getPosition() + Vector2(25, 20));
-        content->addChild(counter);
+        _content->addChild(counter);
     }
 
     spCounter counter;

+ 12 - 12
examples/Demo/src/TestDrag.h

@@ -93,7 +93,7 @@ public:
             spSprite sprite = new DraggableSprite;
             sprite->setPosition(pos[i]);
             sprite->setResAnim(resources.getResAnim("batterfly"));
-            sprite->attachTo(content);
+            sprite->attachTo(_content);
 
 
             float angle = scalar::randFloat(0, (float)MATH_PI * 2);
@@ -109,7 +109,7 @@ public:
         }
 
         contacts = new Actor;
-        contacts->attachTo(content);
+        contacts->attachTo(_content);
         contacts->setPriority(10000);
         contacts->setTouchChildrenEnabled(false);
         //contacts->setVisible(false);
@@ -137,7 +137,7 @@ public:
                     c->setAnchor(0.5f, 0.5f);
                     c->setResAnim(resources.getResAnim("snow"));
                     c->addTween(Actor::TweenAlpha(0), 300)->detachWhenDone();
-                    Vector2 pos = a->local2stage(contact, content);
+                    Vector2 pos = a->local2stage(contact, _content.get());
                     c->setPosition(pos);
                     c->attachTo(contacts);
                 }
@@ -185,25 +185,25 @@ public:
         basket = new Sprite;
         basket->setName("basket");
         basket->setResAnim(resources.getResAnim("batterfly"));
-        basket->attachTo(content);
+        basket->attachTo(_content);
         basket->setAnchor(0.5f, 0.5f);
-        basket->setX(content->getWidth() * 3 / 4);
-        basket->setY(content->getHeight() / 2);
+        basket->setX(_content->getWidth() * 3 / 4);
+        basket->setY(_content->getHeight() / 2);
 
         ball = new Sprite;
         ball->setName("ball");
         ball->setResAnim(resources.getResAnim("batterfly"));
-        ball->attachTo(content);
+        ball->attachTo(_content);
         ball->setAnchor(0.5f, 0.5f);
-        ball->setX(content->getWidth() * 1 / 4);
-        ball->setY(content->getHeight() / 2);
+        ball->setX(_content->getWidth() * 1 / 4);
+        ball->setY(_content->getHeight() / 2);
 
         ball->addEventListener(TouchEvent::TOUCH_DOWN, CLOSURE(this,  &Drag2Test::ballTouchDown));
         ball->addEventListener(TouchEvent::TOUCH_UP, CLOSURE(this,  &Drag2Test::ballTouchUp));
-        content->addEventListener(TouchEvent::TOUCH_UP, CLOSURE(this, &Drag2Test::touchUp));
+        _content->addEventListener(TouchEvent::TOUCH_UP, CLOSURE(this, &Drag2Test::touchUp));
 
         txt = new TextField;
-        txt->attachTo(content);
+        txt->attachTo(_content);
         txt->setVAlign(TextStyle::VALIGN_MIDDLE);
         txt->setHAlign(TextStyle::HALIGN_MIDDLE);
         txt->setPosition(getSize() / 2);
@@ -219,7 +219,7 @@ public:
     {
         if (!dragging)
             return;
-        if (event->currentTarget.get() != content)
+        if (event->currentTarget.get() != _content.get())
             return;
 
         dragging->setColor(Color::White);

+ 1 - 1
examples/Demo/src/TestEdges.h

@@ -19,7 +19,7 @@ public:
                 sp->attachTo(parent);
             }
 
-        content->addChild(parent);
+        _content->addChild(parent);
         parent->setPosition(getStage()->getSize() / 2 - Vector2(200, 200));
         parent->setAnchor(0.5f, 0.5f);
         parent->setSize(300.0f, 300.0f);

+ 3 - 3
examples/Demo/src/TestHttp.h

@@ -14,14 +14,14 @@ public:
         image1->load("http://oxygine.org/img/madewith.png");
         image1->setSize(100, 100);
         image1->setPosition(image1->getPosition() + Vector2(image1->getWidth() + 10, 0));
-        image1->attachTo(content);
+        image1->attachTo(_content);
 
         //Testing http GET request with redirect
         spWebImage image2 = new WebImage;
         image2->load("http://graph.facebook.com/1373973107/picture?type=normal&return_ssl_resources=0");
         image2->setSize(100, 100);
         image2->setPosition(getStage()->getSize() / 2);
-        image2->attachTo(content);
+        image2->attachTo(_content);
 
         //Testing loading a file in memory
         spHttpRequestTask task = HttpRequestTask::create();
@@ -45,7 +45,7 @@ public:
         _bar->setResAnim(resources.getResAnim("slide"));
         _bar->setProgress(0);
         _bar->setY(getStage()->getHeight() - _bar->getHeight());
-        _bar->attachTo(content);
+        _bar->attachTo(_content);
 
         //Testing http POST
         task = HttpRequestTask::create();

+ 2 - 2
examples/Demo/src/TestInputText.h

@@ -47,13 +47,13 @@ public:
 
         spTextWithBackground t = new TextWithBackground("click and edit me 1");
         t->setSize(200, 60);
-        t->setPosition(content->getWidth() / 2 - t->getWidth() / 2, 100);
+        t->setPosition(_content->getWidth() / 2 - t->getWidth() / 2, 100);
         t->attachTo(this);
         t->addEventListener(TouchEvent::CLICK, CLOSURE(this, &TestInputText::onClick));
 
         t = new TextWithBackground("click and edit me 2");
         t->setSize(200, 60);
-        t->setPosition(content->getWidth() / 2 - t->getWidth() / 2, 170);
+        t->setPosition(_content->getWidth() / 2 - t->getWidth() / 2, 170);
         t->attachTo(this);
         t->addEventListener(TouchEvent::CLICK, CLOSURE(this, &TestInputText::onClick));
     }

+ 4 - 4
examples/Demo/src/TestManageRes.h

@@ -56,7 +56,7 @@ public:
             if (ra->getTotalFrames() > 1)
                 sprite->addTween(TweenAnim(ra), 500, -1);
             sprite->setPosition(scalar::randFloat(50.0f, getWidth() - 100.0f), scalar::randFloat(50.0f, getHeight() - 100.0f));
-            sprite->attachTo(content);
+            sprite->attachTo(_content);
 
             if (ra->isName("bg"))
             {
@@ -66,7 +66,7 @@ public:
         }
 
         spTextField text = new TextField;
-        text->attachTo(content);
+        text->attachTo(_content);
 
         text->setSize(300, 200);
         text->setPosition(140.0f, (float)getHeight() - text->getHeight());
@@ -84,7 +84,7 @@ public:
     void _loaded(Event* event)
     {
         notify("Loaded!");
-        ui->getChild("loading")->addTween(Sprite::TweenAlpha(0), 400)->detachWhenDone();
+        _ui->getChild("loading")->addTween(Sprite::TweenAlpha(0), 400)->detachWhenDone();
 
         releaseRef();//added ref earlier from void clicked(id)
     }
@@ -105,7 +105,7 @@ public:
         spSprite sp = new Sprite;
         sp->setName("loading");
         sp->setResAnim(resources.getResAnim("loading"));
-        sp->attachTo(ui);
+        sp->attachTo(_ui);
         sp->setAnchor(0.5f, 0.5f);
         sp->setPosition(getSize() - sp->getSize() / 4);
         sp->setScale(0.5f);

+ 8 - 8
examples/Demo/src/TestMask.h

@@ -14,7 +14,7 @@ public:
     TestMask(): _lastSnow(0)
     {
         spSprite sp = new Sprite;
-        sp->attachTo(content);
+        sp->attachTo(_content);
         sp->setResAnim(resources.getResAnim("sky"));
 
         _mask = new Sprite;
@@ -26,14 +26,14 @@ public:
         _mask->setAnchor(0.5f, 0.5f);
         _mask->setResAnim(resources.getResAnim("mask"));
         _mask->setVisible(true);
-        _mask->attachTo(content);
+        _mask->attachTo(_content);
 
         _mask->addTween(Actor::TweenRotation(MATH_PI * 2), 15000, -1, true);
-        _mask->addTween(Actor::TweenX(content->getWidth() - 100), 10000, -1, true);
-        _mask->addTween(Actor::TweenY(content->getHeight() - 50), 12000, -1, true);
+        _mask->addTween(Actor::TweenX(_content->getWidth() - 100), 10000, -1, true);
+        _mask->addTween(Actor::TweenY(_content->getHeight() - 50), 12000, -1, true);
 
         _masked = new MaskedSprite;
-        _masked->attachTo(content);
+        _masked->attachTo(_content);
 
         _masked->setMask(_mask, true);
 
@@ -55,7 +55,7 @@ public:
 
         spTextField text = new TextField();
         text->attachTo(_masked);
-        text->setPosition(content->getSize() / 2);
+        text->setPosition(_content->getSize() / 2);
         text->setText("Oxygine. Masked sky demo");
         text->setStyle(style);
 
@@ -124,11 +124,11 @@ public:
             snow->setResAnim(resources.getResAnim("snow"));
             snow->setRotation(scalar::randFloat(0, MATH_PI * 2));
             snow->setScale(scalar::randFloat(0.4f, 1.0f));
-            snow->setX(scalar::randFloat(0, content->getWidth()));
+            snow->setX(scalar::randFloat(0, _content->getWidth()));
             snow->setY(-50);
             snow->attachTo(_masked);
 
-            snow->addTween(Actor::TweenY(content->getHeight() + 50), 6000)->detachWhenDone();
+            snow->addTween(Actor::TweenY(_content->getHeight() + 50), 6000)->detachWhenDone();
             snow->addTween(Actor::TweenRotation(scalar::randFloat(0, MATH_PI * 2)), 5000);
         }
     }

+ 1 - 1
examples/Demo/src/TestOpenGL.h

@@ -156,6 +156,6 @@ public:
         spOpenGLSprite sprite = new OpenGLSprite;
         sprite->setPosition(getStage()->getSize() / 2);
         sprite->setScale(3);
-        content->addChild(sprite);
+        _content->addChild(sprite);
     }
 };

+ 9 - 9
examples/Demo/src/TestPerf.h

@@ -28,14 +28,14 @@ public:
         toggle dr[] = {toggle("driver=null", 0, new VideoDriverNull), toggle("driver=default", 0, 0)};
         addToggle("driver", dr, 2);
 
-        content->setTouchEnabled(false);
-        content->setTouchChildrenEnabled(false);
+        _content->setTouchEnabled(false);
+        _content->setTouchChildrenEnabled(false);
     }
 
     void toggleClicked(string id, const toggle* data)
     {
-        if (id == "driver")
-            content->driver = (IVideoDriver*)(data->data);
+        //if (id == "driver")
+        //    content->driver = (IVideoDriver*)(data->data);
     }
 
     void clicked(string id)
@@ -51,7 +51,7 @@ public:
                 sprite->setAnchor(Vector2(0.5f, 0.5f));
                 sprite->setSize(getStage()->getSize() / 20);
                 sprite->setPosition(scalar::randFloat(0, (float)getWidth()), scalar::randFloat(0, (float)getHeight()));
-                content->addChild(sprite);
+                _content->addChild(sprite);
             }
 
             char str[255];
@@ -60,7 +60,7 @@ public:
         }
         if (id == "scale0.01")
         {
-            spActor child = content->getFirstChild();
+            spActor child = _content->getFirstChild();
             while (child)
             {
                 child->setScale(Vector2(1, 1) * 0.01f);
@@ -69,7 +69,7 @@ public:
         }
         if (id == "scale0.2")
         {
-            spActor child = content->getFirstChild();
+            spActor child = _content->getFirstChild();
             while (child)
             {
                 child->setScale(Vector2(1, 1) * 0.2f);
@@ -79,7 +79,7 @@ public:
 
         if (id == "scale0.5")
         {
-            spActor child = content->getFirstChild();
+            spActor child = _content->getFirstChild();
             while (child)
             {
                 child->setScale(Vector2(1, 1) * 0.5f);
@@ -89,7 +89,7 @@ public:
 
         if (id == "animate")
         {
-            spActor child = content->getFirstChild();
+            spActor child = _content->getFirstChild();
             while (child)
             {
                 spTween t = 0;

+ 2 - 2
examples/Demo/src/TestPolygon.h

@@ -11,7 +11,7 @@ public:
     {
         poly = new oxygine::Polygon;
         poly->addTween(Actor::TweenRotation(MATH_PI * 2), 16000, -1);
-        poly->setPosition(content->getSize() / 2);
+        poly->setPosition(_content->getSize() / 2);
 
         //ResAnim "tiled" has only single frame and uses own separate atlas texture
         //it should have options trim=extend=false
@@ -27,7 +27,7 @@ public:
 
         update(_num);
 
-        content->addChild(poly);
+        _content->addChild(poly);
 
         addButton("+1", "+1");
     }

+ 1 - 1
examples/Demo/src/TestProgressBar.h

@@ -20,7 +20,7 @@ public:
         bar->setPosition(getSize() / 2);
 
         //bar->setSize(600, 200);
-        content->addChild(bar);
+        _content->addChild(bar);
     }
 
     void clicked(string id)

+ 6 - 6
examples/Demo/src/TestRender2Texture.h

@@ -17,22 +17,22 @@ public:
 
         spSprite back = new Sprite;
         back->setResAnim(resources.getResAnim("bg"));
-        back->attachTo(content);
+        back->attachTo(_content);
         back->setSize(getStage()->getSize());
 
-        back->setPosition(content->getSize() / 2 - back->getScaledSize() / 2);
+        back->setPosition(_content->getSize() / 2 - back->getScaledSize() / 2);
 
 
 
         color = Color(255, 255, 255, 32);
 
-        Vector2 size = content->getSize();
+        Vector2 size = _content->getSize();
 
         texture = IVideoDriver::instance->createTexture();
         texture->init((int)size.x, (int)size.y, TF_R8G8B8A8, true);
 
         preview = new Sprite;
-        preview->attachTo(content);
+        preview->attachTo(_content);
 
 
         AnimationFrame frame;
@@ -44,8 +44,8 @@ public:
         preview->setAnimFrame(frame);
 
 
-        content->addEventListener(TouchEvent::MOVE, CLOSURE(this, &TestRender2Texture::onMove));
-        content->addEventListener(TouchEvent::TOUCH_DOWN, CLOSURE(this, &TestRender2Texture::onDown));
+        _content->addEventListener(TouchEvent::MOVE, CLOSURE(this, &TestRender2Texture::onMove));
+        _content->addEventListener(TouchEvent::TOUCH_DOWN, CLOSURE(this, &TestRender2Texture::onDown));
 
 
         Test::toggle t[2];

+ 1 - 1
examples/Demo/src/TestSignedDistanceFont.h

@@ -120,7 +120,7 @@ public:
 
 
         spTextField txt = new TextField;
-        txt->attachTo(content);
+        txt->attachTo(_content);
         _txt = txt;
 
         TextStyle st;

+ 1 - 1
examples/Demo/src/TestSliding.h

@@ -47,7 +47,7 @@ public:
 
         sliding->setContent(map);
         sliding->setPosition(getSize() / 2 - sliding->getSize() / 2);
-        sliding->attachTo(content);
+        sliding->attachTo(_content);
 
         _sliding = sliding;
 

+ 2 - 2
examples/Demo/src/TestTexel2Pixel.h

@@ -10,10 +10,10 @@ public:
         Vector2 pos(0, 0);
         sprite->setPosition(pos);
         sprite->setResAnim(resources.getResAnim("t2p"));
-        sprite->attachTo(content);
+        sprite->attachTo(_content);
         float scale = 1.0f / getStage()->getScaleX();
         sprite->setScale(scale);
         Vector2 displaySpriteSize = sprite->getSize() * scale;
-        sprite->setPosition((content->getSize() - displaySpriteSize) / 2.0f);
+        sprite->setPosition((_content->getSize() - displaySpriteSize) / 2.0f);
     }
 };

+ 2 - 2
examples/Demo/src/TestText.h

@@ -43,7 +43,7 @@ public:
         addButton("prev", "Prev Test");
 
         textDetails = new TextField;
-        textDetails->attachTo(ui);
+        textDetails->attachTo(_ui);
         textDetails->setSize(Vector2(300, 0));
         textDetails->setPosition(200.0f, getStage()->getHeight() - 10);
 
@@ -55,7 +55,7 @@ public:
         textDetails->setStyle(st);
 
         bg = new ColorRectSprite();
-        bg->attachTo(content);
+        bg->attachTo(_content);
         bg->setColor(Color(64, 64, 64, 255));
 
         /*

+ 2 - 2
examples/Demo/src/TestTextureFormat.h

@@ -19,7 +19,7 @@ public:
 
     void updateTest(string prefix)
     {
-        content->removeChildren();
+        _content->removeChildren();
 
         ResAnim* res = resources.getResAnim("bg" + prefix);
 
@@ -31,7 +31,7 @@ public:
         atlas->load();
 
         spSprite sp = new Sprite;
-        sp->attachTo(content);
+        sp->attachTo(_content);
         sp->setResAnim(res);
     }
 

+ 2 - 2
examples/Demo/src/TestTiled.h

@@ -322,8 +322,8 @@ public:
 
         //use camera class from other test!
         spCamera cam = new Camera;
-        cam->attachTo(content);
+        cam->attachTo(_content);
         cam->setContent(tiled);
-        cam->setSize(content->getSize());
+        cam->setSize(_content->getSize());
     }
 };

+ 4 - 4
examples/Demo/src/TestTouches.h

@@ -19,7 +19,7 @@ public:
         orange->setName(name);
         orange->setSize(size);
         orange->setPosition(pos);
-        orange->attachTo(content);
+        orange->attachTo(_content);
         //orange->setAlpha(200);
         orange->addEventListener(TouchEvent::OVER, CLOSURE(this, &TestTouches::onOver));
         orange->addEventListener(TouchEvent::OUTX, CLOSURE(this, &TestTouches::onOver));
@@ -118,7 +118,7 @@ public:
 
 
         spSprite Orange = createRect("Orange", Color::Orange, Vector2(200, 200), Vector2(300, 300));
-        Orange->attachTo(content);
+        Orange->attachTo(_content);
 
         spSprite Green = createRect("Green", Color::Green, Vector2(100, 25), Vector2(100, 150));
         Green->attachTo(Orange);
@@ -140,10 +140,10 @@ public:
     spTextField createTF(const Color& c)
     {
         spTextField tf = new TextField;
-        tf->attachTo(content);
+        tf->attachTo(_content);
         tf->setWidth(300);
         tf->setColor(c);
-        tf->setX(content->getWidth() - tf->getWidth());
+        tf->setX(_content->getWidth() - tf->getWidth());
         tf->setY(y);
         tf->setMultiline(true);
         tf->setFont(_resources.getResFont("big"));

+ 1 - 1
examples/Demo/src/TestTweenPostProcessing.h

@@ -29,7 +29,7 @@ public:
     {
         spSprite sprite = new Sprite;
         sprite->setResAnim(resources.getResAnim("t2p"));
-        sprite->attachTo(content);
+        sprite->attachTo(_content);
         sprite->setPosition(getStage()->getSize() / 2);
         sprite->addTween(Actor::TweenRotationDegrees(360), 30000, -1);
         sprite->setAnchor(0.5f, 0.5f);

+ 2 - 2
examples/Demo/src/TestTweenShine.h

@@ -51,9 +51,9 @@ public:
     {
         sprite = new Sprite;
         sprite->setResAnim(resources.getResAnim("flower"));
-        sprite->attachTo(content);
+        sprite->attachTo(_content);
         //sprite->setAnchor(0.5f, 0.5f);
-        sprite->setPosition(content->getSize() / 2 - sprite->getSize() / 2);
+        sprite->setPosition(_content->getSize() / 2 - sprite->getSize() / 2);
 
         sprite->addTween(TweenShine::create(10, 300));
 

+ 1 - 1
examples/Demo/src/TestTweenText.h

@@ -36,7 +36,7 @@ public:
     TestTweenText()
     {
         spTextField text = new TextField;
-        content->addChild(text);
+        _content->addChild(text);
 
         TextStyle st;
         st.font = _resources.getResFont("big");

+ 2 - 2
examples/Demo/src/TestTweens.h

@@ -29,7 +29,7 @@ public:
 
 
         _sprite = new Sprite();
-        _sprite->attachTo(content);
+        _sprite->attachTo(_content);
         _sprite->setAnchor(0.5f, 0.5f);
         _sprite->setResAnim(resources.getResAnim("anim"));
         _sprite->setPosition(getWidth() / 2.0f, getHeight() / 2);
@@ -77,7 +77,7 @@ public:
         _easeGraph = createEaseTest(_ease);
         _easeGraph->setPriority(-1);
         _easeGraph->setY(getHeight() / 2 - _easeGraph->getHeight() / 2);
-        content->addChild(_easeGraph);
+        _content->addChild(_easeGraph);
 
         updateText("ease", "ease: " + ease2String(_ease));
     }

+ 1 - 1
examples/Demo/src/TestUserShader.h

@@ -113,7 +113,7 @@ public:
 
         _sprite = new Sprite;
         _sprite->setResAnim(resources.getResAnim("bg"));
-        _sprite->attachTo(content);
+        _sprite->attachTo(_content);
 
         toggle t[] =
         {

+ 2 - 2
examples/Demo/src/example.cpp

@@ -171,8 +171,8 @@ void example_init()
     resources.loadXML("xmls/res.xml");
     
 
-    Test::instance = new TestActor;
-    getStage()->addChild(Test::instance);
+    Test::_instance = new TestActor;
+    getStage()->addChild(Test::_instance);
 
     //Initialize http requests
     HttpRequestTask::init();

File diff suppressed because it is too large
+ 0 - 0
examples/Demo/src/test.cpp


+ 3 - 28
examples/Demo/src/test.h

@@ -9,28 +9,6 @@ using namespace std;
 spTextField createText(const std::string& txt);
 spButton createButtonHelper(spButton, const std::string& txt, EventCallback cb);
 
-class Content: public Actor
-{
-public:
-    Content() : driver(0) { setName("content"); }
-    IVideoDriver* driver;
-
-    /*
-    void render(const RenderState& parentRS)
-    {
-
-        parentRS.renderer->drawBatch();
-
-        RenderState rs = parentRS;
-        STDRenderer renderer(driver ? driver : IVideoDriver::instance);
-        renderer.Renderer::begin(parentRS.renderer);
-        rs.renderer = &renderer;
-        Actor::render(rs);
-        renderer.end();
-    }
-    */
-};
-
 DECLARE_SMART(Test, spTest);
 class Test: public Actor
 {
@@ -41,7 +19,7 @@ public:
     static void init();
     static void free();
 
-    static spTest instance;
+    static spTest _instance;
     static Resources _resources;
 
     struct toggle
@@ -73,11 +51,8 @@ protected:
 
     float _x;
     float _y;
-    spActor ui;
-    Content* content;
+    spActor _ui;
+    spActor _content;
     enum {MAX_NOTIFIES = 8};
     int _notifies[MAX_NOTIFIES];
-
-public:
-    
 };

Some files were not shown because too many files changed in this diff