Bläddra i källkod

Fix to gameplay-encoder to produce better looking fonts at certain sizes.

sgrenier 12 år sedan
förälder
incheckning
142f3a35b3

BIN
samples/browser/res/common/arial.gpb


+ 4 - 2
tools/encoder/gameplay-encoder.vcxproj.user

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>-p -s 8,10,12 C:\Users\sgrenier\Documents\Sourcecode\GamePlay\bin\windows\arial.ttf</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>
     </LocalDebuggerEnvironment>
     </LocalDebuggerEnvironment>
@@ -11,7 +12,8 @@
     <LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>
     </LocalDebuggerEnvironment>
     </LocalDebuggerEnvironment>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>C:\Users\sgrenier\Documents\Sourcecode\GamePlay\samples\browser\res\common\arial.ttf</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
     <LocalDebuggerWorkingDirectory>.\Release</LocalDebuggerWorkingDirectory>
     <LocalDebuggerWorkingDirectory>.\Release</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   </PropertyGroup>
 </Project>
 </Project>

+ 0 - 22
tools/encoder/src/TTFFontEncoder.cpp

@@ -228,28 +228,6 @@ int writeFont(const char* inFilePath, const char* outFilePath, std::vector<unsig
             return -1;
             return -1;
         }
         }
 
 
-        // If there's an existing generated font in the list of this size, ignore and delete it
-        int duplicateSize = 0;
-        for (size_t i = 0; i < fonts.size(); ++i)
-        {
-            if (fonts[i]->glyphSize == glyphSize)
-            {
-                duplicateSize = fonts[i]->fontSize;
-                break;
-            }
-        }
-        if (duplicateSize != 0)
-        {
-            LOG(1, "Warning: Requested font size (%d) produces same size glyphs as font size (%d). Skipping size %d.\n", fontSize, duplicateSize, fontSize);
-            SAFE_DELETE(font);
-            continue;
-        }
-
-        if (rowSize != (int)fontSize)
-        {
-            LOG(1, "Warning: Could not genreate font of requested size (%d). Generating size %d instead.\n", fontSize, rowSize);
-        }
-
         // Include padding in the rowSize.
         // Include padding in the rowSize.
         rowSize += GLYPH_PADDING;
         rowSize += GLYPH_PADDING;