Browse Source

minor fixes

dmuratshin 9 years ago
parent
commit
156c4b9c9a
3 changed files with 8 additions and 2 deletions
  1. 2 0
      examples/Demo/src/example.cpp
  2. 2 2
      oxygine/src/res/ResAtlas.cpp
  3. 4 0
      readme/Android.txt

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

@@ -26,6 +26,7 @@
 #include "TestTouches.h"
 #include "TestTouches.h"
 #include "TestColorFont.h"
 #include "TestColorFont.h"
 #include "TestTweenAlphaFade.h"
 #include "TestTweenAlphaFade.h"
+#include "TestEdges.h"
 
 
 #ifdef __S3E__
 #ifdef __S3E__
 #include "s3eKeyboard.h"
 #include "s3eKeyboard.h"
@@ -131,6 +132,7 @@ public:
         if (id == "tweenshine") showTest(new TestTweenShine);
         if (id == "tweenshine") showTest(new TestTweenShine);
         if (id == "multicolorfont") showTest(new TestColorFont);
         if (id == "multicolorfont") showTest(new TestColorFont);
         if (id == "tweenfade") showTest(new TestTweenAlphaFade);
         if (id == "tweenfade") showTest(new TestTweenAlphaFade);
+        if (id == "edges") showTest(new TestEdges);
         if (id == "openbrowser")
         if (id == "openbrowser")
         {
         {
             core::execute("http://oxygine.org/");
             core::execute("http://oxygine.org/");

+ 2 - 2
oxygine/src/res/ResAtlas.cpp

@@ -551,13 +551,13 @@ namespace oxygine
                                 operations::copy(src.getRect(Rect(0, src.h - 1, src.w, 1)), tmp);
                                 operations::copy(src.getRect(Rect(0, src.h - 1, src.w, 1)), tmp);
                             }
                             }
 
 
-                            if (bounds.getX() == 0)
+                            if (bounds.getX() == 0 && dest.pos.x != 0)
                             {
                             {
                                 tmp = mt.lock(Rect(dest.pos.x - 1, dest.pos.y, 1, src.h));
                                 tmp = mt.lock(Rect(dest.pos.x - 1, dest.pos.y, 1, src.h));
                                 operations::copy(src.getRect(Rect(0, 0, 1, src.h)), tmp);
                                 operations::copy(src.getRect(Rect(0, 0, 1, src.h)), tmp);
                             }
                             }
 
 
-                            if (bounds.getWidth() == im.w)
+                            if (bounds.getWidth() == im.w && dest.getRight() != mt.getWidth())
                             {
                             {
                                 tmp = mt.lock(Rect(dest.pos.x + src.w, dest.pos.y, 1, src.h));
                                 tmp = mt.lock(Rect(dest.pos.x + src.w, dest.pos.y, 1, src.h));
                                 operations::copy(src.getRect(Rect(src.w - 1, 0, 1, src.h)), tmp);
                                 operations::copy(src.getRect(Rect(src.w - 1, 0, 1, src.h)), tmp);

+ 4 - 0
readme/Android.txt

@@ -1,4 +1,8 @@
 1. Start from readme.txt
 1. Start from readme.txt
+
+step by step video tutorial:
+http://www.youtube.com/watch?v=d8eHHr_KHgQ
+
 2a. Examples folder have configured android project
 2a. Examples folder have configured android project
 =================================================================================================
 =================================================================================================
 How to build. Steps:
 How to build. Steps: