minor

.hg_archival.txt

@@ -1,6 +1,6 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 2324072e9e0e2efb681c8b5354b7497a7e045669
+node: 1c0805392f4100f6d0f9da1a5f2cde06f496254a
 branch: default
 latesttag: oldrender
-latesttagdistance: 977
-changessincelatesttag: 1140
+latesttagdistance: 979
+changessincelatesttag: 1142

oxygine/src/Actor.cpp

@@ -610,6 +610,16 @@ namespace oxygine
         return _transformInvert;
     }
 
+    float Actor::getWidth() const
+    {
+        return _size.x;
+    }
+
+    float Actor::getHeight() const
+    {
+        return _size.y;
+    }
+
     unsigned char Actor::getAlpha() const
     {
         return _alpha;

oxygine/src/Actor.h

@@ -130,11 +130,11 @@ namespace oxygine
         Vector2             getSize() const {return _size;}
         /**Returns Size*Scale*/
         Vector2             getScaledSize() const { return _size.mult(_scale); }
-        float               getWidth() const {return _size.x;}
+        float               getWidth() const;
         float               getScaledWidth() const {return _size.x * _scale.x;}
-        float               getHeight() const {return _size.y;}
+        float               getHeight() const;
         float               getScaledHeight() const {return _size.y * _scale.y;}
-        unsigned char       getAlpha() const {return _alpha;}
+        unsigned char       getAlpha() const;
         const spClock&      getClock() const;
         virtual RectF       getDestRect() const;
         /**returns touch id if actor is pressed down*/

oxygine/src/core/file.h

@@ -41,8 +41,8 @@ namespace oxygine
 
             const void* getData() const {if (data.empty()) return 0; return &data[0];}
             unsigned int getSize() const {return (unsigned int)data.size();}
-			
-			std::string getString() const {return std::string((char *)&data[0], size());}
+
+            std::string getString() const {return std::string((char*)&data[0], size());}
 
             typedef std::vector<uchar> buff;
             buff data;

oxygine/src/math/Rect.h

@@ -96,11 +96,11 @@ namespace oxygine
         T getRight() const {return pos.x + size.x;}
         T getBottom() const {return pos.y + size.y;}
 
-		void set(T x, T y, T w, T h) {pos.x = x; pos.y = y; size.x = w; size.y = h;}
+        void set(T x, T y, T w, T h) {pos.x = x; pos.y = y; size.x = w; size.y = h;}
         void setPosition(const point2& pos_) {pos = pos_;}
-		void setPosition(T x, T y) {pos.x = x; pos.y = y;}
+        void setPosition(T x, T y) {pos.x = x; pos.y = y;}
         void setSize(const point2& size_) {size = size_;}
-		void setSize(T x, T y) {size.x = x; size.y = y;}
+        void setSize(T x, T y) {size.x = x; size.y = y;}
         void setX(T v) {pos.x = v;}
         void setY(T v) {pos.y = v;}
 

oxygine/src/math/vector2.h

@@ -22,9 +22,9 @@ namespace oxygine
         VectorT2 operator - (const VectorT2&) const;
         VectorT2 operator - () const;
 
-		void set(T x_, T y_) {x = x_; y = y_;}
-		void setZero() {x = 0; y = 0;}
-		
+        void set(T x_, T y_) {x = x_; y = y_;}
+        void setZero() {x = 0; y = 0;}
+
         template <class R>
         VectorT2 operator * (R s) const {VectorT2 r(*this); r.x = type(r.x * s); r.y = type(r.y * s); return r;}
         template <class R>