From be4b87560dd82068c99948d5d45badd2c42369af Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 17 Sep 2018 20:59:50 +0800
Subject: *update

---
 build/05Font/05Font.vcxproj         |  2 +-
 build/libjin/libjin.vcxproj         |  3 ++-
 build/libjin/libjin.vcxproj.filters |  3 +++
 test/05Font/main.cpp                | 11 +++++++----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build/05Font/05Font.vcxproj b/build/05Font/05Font.vcxproj
index aa5d125..2fe9b4f 100644
--- a/build/05Font/05Font.vcxproj
+++ b/build/05Font/05Font.vcxproj
@@ -22,7 +22,7 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}</ProjectGuid>
     <RootNamespace>My05Font</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/build/libjin/libjin.vcxproj b/build/libjin/libjin.vcxproj
index b1edd9e..fbc7640 100644
--- a/build/libjin/libjin.vcxproj
+++ b/build/libjin/libjin.vcxproj
@@ -85,6 +85,7 @@
     <ClInclude Include="..\..\libjin\Graphics\Color.h" />
     <ClInclude Include="..\..\libjin\Graphics\Drawable.h" />
     <ClInclude Include="..\..\libjin\Graphics\Font.h" />
+    <ClInclude Include="..\..\libjin\Graphics\font.shader.h" />
     <ClInclude Include="..\..\libjin\Graphics\FontData.h" />
     <ClInclude Include="..\..\libjin\Graphics\Graphics.h" />
     <ClInclude Include="..\..\libjin\Graphics\jin_opengl.h" />
@@ -122,7 +123,7 @@
     <ProjectGuid>{407E9199-D39C-4460-B218-0C29AB42483B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>libjin</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/build/libjin/libjin.vcxproj.filters b/build/libjin/libjin.vcxproj.filters
index 1235bd3..aa09b0c 100644
--- a/build/libjin/libjin.vcxproj.filters
+++ b/build/libjin/libjin.vcxproj.filters
@@ -334,6 +334,9 @@
     <ClInclude Include="..\..\libjin\Graphics\FontData.h">
       <Filter>Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\font.shader.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\libjin\README.md" />
diff --git a/test/05Font/main.cpp b/test/05Font/main.cpp
index 30b0e3d..58c13ac 100644
--- a/test/05Font/main.cpp
+++ b/test/05Font/main.cpp
@@ -12,11 +12,11 @@ FontData* data = nullptr;
 void onLoad()
 {
     Filesystem* fs = Filesystem::get();
-    fs->mount("D:/Documents/VisualStudio2017/Projects/Jin/libjin/min/build/Debug");
+    fs->mount("D:/Jin/libjin/min/build/Debug");
     Buffer buffer;
-    fs->read("SIMYOU.TTF", &buffer);
+    fs->read("font.ttf", &buffer);
     data = FontData::createFontData((const unsigned char*)buffer.data, buffer.size);
-    font = Font::createFont(data, 15);
+    font = Font::createFont(data, 50);
     //canvas = Canvas::createCanvas(100, 100);
 }
 
@@ -40,7 +40,10 @@ void onDraw()
     //Canvas::bind(canvas);
     if (font != nullptr)
     {
-        font->print(u8"hello, worldjqp", 0, 0);
+        glColor4f(1, 1, 0, 1);
+        //font->print(u8"¡ºÔ´ÊÏÎïÕZ¡»£¨¤²¤ó¤¸¤â¤Î¤¬", 0, 0);
+        font->print(u8"Ô´", 0, 0);
+        glColor4f(1, 1, 1, 1);
     }
     //Canvas::unbind();
     //canvas->draw(0, 0, 2, 2, 0);
-- 
cgit v1.1-26-g67d0