dmuratshin 9 years ago
parent
commit
2d8c54fc38
3 changed files with 3 additions and 2 deletions
  1. 1 1
      oxygine/src/STDMaterial.cpp
  2. 1 0
      oxygine/src/ThreadLoader.cpp
  3. 1 1
      oxygine/src/initActor.h

+ 1 - 1
oxygine/src/STDMaterial.cpp

@@ -154,7 +154,7 @@ namespace oxygine
 #endif
 #endif
 
 
             _renderer->setTransform(rs.transform);
             _renderer->setTransform(rs.transform);
-            _renderer->draw(rs.getFinalColor(sprite->getColor()), frame.getSrcRect(), frame.getDestRect());
+            _renderer->draw(rs.getFinalColor(sprite->getColor()), frame.getSrcRect(), sprite->getDestRect());
         }
         }
     }
     }
 
 

+ 1 - 0
oxygine/src/ThreadLoader.cpp

@@ -107,6 +107,7 @@ namespace oxygine
 
 
     void ThreadLoader::loaded(Event*)
     void ThreadLoader::loaded(Event*)
     {
     {
+        _threadDone = true;
         Event ev(ThreadLoader::COMPLETE, true);
         Event ev(ThreadLoader::COMPLETE, true);
         dispatchEvent(&ev);
         dispatchEvent(&ev);
         releaseRef();
         releaseRef();

+ 1 - 1
oxygine/src/initActor.h

@@ -166,7 +166,7 @@ namespace oxygine
 #define arg_htmlText args::htmlText()
 #define arg_htmlText args::htmlText()
 #define arg_hAlign args::hAlign()
 #define arg_hAlign args::hAlign()
 #define arg_vAlign args::vAlign()
 #define arg_vAlign args::vAlign()
-#define arg_fontSize2Scale args::fontSize2Scale()
+#define arg_fontSize args::fontSize()
 #define arg_font args::font()
 #define arg_font args::font()
 #define arg_multiline args::multiline()
 #define arg_multiline args::multiline()
 #define arg_tcolor args::color()
 #define arg_tcolor args::color()