dmuratshin 9 years ago
parent
commit
e5330b4ac8

BIN
3rdPartyTools/PVRTexToolCL.exe


+ 0 - 0
examples/Demo/prepare_res.bat → examples/Demo/build_atlasses.bat


+ 0 - 0
examples/Demo/prepare_res.sh → examples/Demo/build_atlasses.sh


+ 0 - 0
examples/Demo/prepare_res_etc1.bat → examples/Demo/build_atlasses_etc1.bat


+ 0 - 0
examples/Demo/prepare_res_low.bat → examples/Demo/build_atlasses_low.bat


+ 0 - 0
examples/Demo/prepare_res_pvrtc.bat → examples/Demo/build_atlasses_pvrtc.bat


+ 0 - 0
examples/Demo/prepare_res_pvrtc.sh → examples/Demo/build_atlasses_pvrtc.sh


+ 0 - 0
examples/Demo/prepare_res_pvrtc_high_quality.sh → examples/Demo/build_atlasses_pvrtc_high_quality.sh


+ 4 - 4
oxygine/src/res/ResFontBM.cpp

@@ -74,11 +74,11 @@ namespace oxygine
 
     const oxygine::Font* ResFontBM::getClosestFont(float worldScale, int styleFontSize, float& resScale) const
     {
-        if (styleFontSize)
-            resScale = _size / float(styleFontSize);
-        else
-            resScale = _font->getScale();
+        if (!styleFontSize)
+            styleFontSize = _size;
 
+        float scale = _size / float(styleFontSize) * _font->getScale();
+        resScale = resScale;
         return _font;
     }
 

+ 1 - 1
tools/resbuild/oxygine_helper.py

@@ -14,7 +14,7 @@ class helper(object):
         elif sys.platform == "linux2":
             self.path_pvrtextool = self.path_root + "/3rdPartyTools/linux/PVRTexToolCLI "
         else:
-            self.path_pvrtextool = self.path_root + "/3rdPartyTools/PVRTexToolCL.exe "
+            self.path_pvrtextool = self.path_root + "/3rdPartyTools/PVRTexToolCLI.exe "
 
     def process_xml(self, embedded, args):
         if embedded: