Skip to content

Commit b556b9e

Browse files
author
Michael Fiess
authored
text fixes (#1543)
* Revert "Disabled the Font/Glyph 'scaling' memory saving strategy ... Fixed (#1470) * update to 1.2.0.2
1 parent 486e39c commit b556b9e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

examples/pxScene2d/src/macstuff/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.2.0.1</string>
22+
<string>1.2.0.2</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleVersion</key>

examples/pxScene2d/src/pxFont.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,11 @@ GlyphTextureEntry pxFont::getGlyphTexture(uint32_t codePoint, float sx, float sy
364364
GlyphTextureEntry result;
365365
// Select a glyph texture better suited for rendering the glyph
366366
// taking pixelSize and scale into account
367-
uint32_t pixelSize=((uint32_t)ceil((sy>sx?sy:sx)*mPixelSize));
367+
uint32_t pixelSize=(uint32_t)ceil((sx>sy?sx:sy)*mPixelSize);
368368

369369
// TODO: FIXME: Disabled for now. Sub-Pixel rounding making some Glyphs too "wide" at certain sizes.
370370
//
371-
//#if 0
371+
#if 0
372372
if (pixelSize < 8)
373373
{
374374
pixelSize = (pixelSize + 7) & 0xfffffff8; // next multiple of 8
@@ -378,11 +378,11 @@ GlyphTextureEntry pxFont::getGlyphTexture(uint32_t codePoint, float sx, float sy
378378
//pixelSize = (pixelSize + 7) & 0xfffffff8; // next multiple of 8
379379
pixelSize += (pixelSize % 2);
380380
}
381-
/*else
381+
else
382382
pixelSize = npot(pixelSize); // else next power of two
383383
#else
384384
pixelSize = mPixelSize; // HACK
385-
#endif*/
385+
#endif
386386

387387

388388
GlyphKey key;

examples/pxScene2d/src/win/pxscene.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
IDI_ICON1 ICON Spark_installer.ico
22

33
1 VERSIONINFO
4-
FILEVERSION 1,2,0,1
4+
FILEVERSION 1,2,0,2
55
FILEOS 0x4
66
FILETYPE 0x0
77
BEGIN
@@ -15,7 +15,7 @@ BEGIN
1515
VALUE "LegalCopyright", "Copyright 2018"
1616
VALUE "OriginalFilename", "pxscene.exe"
1717
VALUE "ProductName", "pxscene"
18-
VALUE "ProductVersion", "1,2,0,1"
18+
VALUE "ProductVersion", "1,2,0,2"
1919
END
2020
END
2121

0 commit comments

Comments
 (0)