@@ -1,6 +1,6 @@
repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 7841a7ab3ec8ecbdb26527726a05b70cff76a392
+node: ebaba1c87e20484a1efac6375e6ca8543baac20e
branch: default
latesttag: oldrender
-latesttagdistance: 973
-changessincelatesttag: 1134
+latesttagdistance: 975
+changessincelatesttag: 1138
@@ -29,11 +29,8 @@ namespace oxygine
}
Actor::Actor():
- _pos(0, 0),
- _size(0, 0),
_extendedIsOn(0),
_zOrder(0),
- _anchor(0, 0),
_scale(1, 1),
_rotation(0),
_flags(flag_visible | flag_touchEnabled | flag_touchChildrenEnabled | flag_childrenRelative | flag_fastTransform),
@@ -32,7 +32,7 @@ namespace oxygine
class AnimationFrame
{
public:
- AnimationFrame() : _srcRect(0, 0, 1, 1), _destRect(0, 0, 1, 1), _frameSize(0, 0), _resAnim(0), _row(0), _column(0) {}
+ AnimationFrame() : _srcRect(0, 0, 1, 1), _destRect(0, 0, 1, 1), _resAnim(0), _row(0), _column(0) {}
void init(ResAnim* rs, const Diffuse& df,
const RectF& srcRect, const RectF& destRect, const Vector2& frame_size);
@@ -5,6 +5,9 @@
#include "Serialize.h"
#include <sstream>
#include "STDRenderer.h"
+#include "DebugActor.h"
+#include "res/ResAnim.h"
+#include "res/resources.h"
namespace oxygine
@@ -38,6 +41,9 @@ namespace oxygine
_guideX[1] = 0.0f;
_guideY[0] = 0.0f;
_guideY[1] = 0.0f;
+
+ if (DebugActor::resSystem)
+ setResAnim(DebugActor::resSystem->getResAnim("btn"));
void Box9Sprite::setVerticalMode(StretchMode m)
@@ -1,5 +1,8 @@
#include "Button.h"
#include "Stage.h"
+#include "res/Resources.h"
@@ -19,6 +22,9 @@ namespace oxygine
addEventListener(TouchEvent::OVER, ncb);
addEventListener(TouchEvent::OUT, ncb);
addEventListener(TouchEvent::CLICK, ncb);
+ setResAnim(DebugActor::resSystem->getResAnim("button"));
Button::~Button()
@@ -54,8 +54,6 @@ namespace oxygine
Draggable::Draggable(): _bounds(0, 0, -1, -1),
_dragClient(0),
_actor(0),
- _clientPos(0, 0),
- _dragPos(0, 0),
_startTm(0),
_clientIsParent(false),
_dragEnabled(true),
@@ -2,7 +2,7 @@
#include "Actor.h"
- PointerState::PointerState(): _index(0), _position(0, 0)
+ PointerState::PointerState(): _index(0)
for (int i = 0; i < MouseButton_Count; ++i)
_isPressed[i] = false;
@@ -19,8 +19,6 @@ namespace oxygine
_rad(_defaultTouchThreshold),
_maxSpeed(250),
_downTime(0),
- _downPos(0, 0),
- _speed(0, 0),
_lastTime(0), _current(0), _lastIterTime(0)
_clip = new ClipRectActor;
@@ -25,7 +25,7 @@ namespace oxygine
END = sysEventID('S', 'E', 'N')
};
- SlidingEvent(SEvent ev) : Event(ev), speed(0, 0) {}
+ SlidingEvent(SEvent ev) : Event(ev) {}
Vector2 speed;
@@ -96,7 +96,7 @@ namespace oxygine
template <class T>
- VectorT2<T>::VectorT2()
+ VectorT2<T>::VectorT2(): x(0), y(0)
{}
@@ -11,6 +11,7 @@
<image file="images.png"/>
<image file="logo.png"/>
<image file="btn.png" guideX1="19" guideY1="15" guideX2="46" guideY2="42" vertical="2" horizontal="2"/>
+ <image file="button.png" cols="3"/>
</atlas>
<set path = "system/fonts" />