aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/Debug/05Font.exebin1194496 -> 1091072 bytes
-rw-r--r--build/libjin.sln11
-rw-r--r--build/libjin/libjin.vcxproj8
-rw-r--r--build/libjin/libjin.vcxproj.filters30
4 files changed, 34 insertions, 15 deletions
diff --git a/build/Debug/05Font.exe b/build/Debug/05Font.exe
index cf80b7f..7b9484a 100644
--- a/build/Debug/05Font.exe
+++ b/build/Debug/05Font.exe
Binary files differ
diff --git a/build/libjin.sln b/build/libjin.sln
index 05a6517..59694f9 100644
--- a/build/libjin.sln
+++ b/build/libjin.sln
@@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{D4
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05Font", "05Font\05Font.vcxproj", "{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06TextureFont", "06TextureFont\06TextureFont.vcxproj", "{A81B426C-A6C7-4861-92A9-A087872D2C53}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -73,6 +75,14 @@ Global
{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x64.Build.0 = Release|x64
{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x86.ActiveCfg = Release|Win32
{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}.Release|x86.Build.0 = Release|Win32
+ {A81B426C-A6C7-4861-92A9-A087872D2C53}.Debug|x64.ActiveCfg = Debug|x64
+ {A81B426C-A6C7-4861-92A9-A087872D2C53}.Debug|x64.Build.0 = Debug|x64
+ {A81B426C-A6C7-4861-92A9-A087872D2C53}.Debug|x86.ActiveCfg = Debug|Win32
+ {A81B426C-A6C7-4861-92A9-A087872D2C53}.Debug|x86.Build.0 = Debug|Win32
+ {A81B426C-A6C7-4861-92A9-A087872D2C53}.Release|x64.ActiveCfg = Release|x64
+ {A81B426C-A6C7-4861-92A9-A087872D2C53}.Release|x64.Build.0 = Release|x64
+ {A81B426C-A6C7-4861-92A9-A087872D2C53}.Release|x86.ActiveCfg = Release|Win32
+ {A81B426C-A6C7-4861-92A9-A087872D2C53}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -83,6 +93,7 @@ Global
{0E49D105-2032-4825-9FA1-54B1B94E3655} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
{85071432-24B6-46D4-98D8-DAA63183093C} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
{D1953718-E728-4A86-9CCF-8BEC1F5C5F97} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
+ {A81B426C-A6C7-4861-92A9-A087872D2C53} = {D401F737-EEF5-4EA3-8CEA-A15523AE68AD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {310E7948-2690-4896-9579-19E6AC4D405B}
diff --git a/build/libjin/libjin.vcxproj b/build/libjin/libjin.vcxproj
index ebd95dc..f186a79 100644
--- a/build/libjin/libjin.vcxproj
+++ b/build/libjin/libjin.vcxproj
@@ -36,8 +36,8 @@
<ClCompile Include="..\..\libjin\Graphics\Canvas.cpp" />
<ClCompile Include="..\..\libjin\Graphics\Color.cpp" />
<ClCompile Include="..\..\libjin\Graphics\Drawable.cpp" />
- <ClCompile Include="..\..\libjin\Graphics\Font.cpp" />
- <ClCompile Include="..\..\libjin\Graphics\FontData.cpp" />
+ <ClCompile Include="..\..\libjin\Graphics\TexFont.cpp" />
+ <ClCompile Include="..\..\libjin\Graphics\TTF.cpp" />
<ClCompile Include="..\..\libjin\Graphics\Mesh.cpp" />
<ClCompile Include="..\..\libjin\Graphics\OpenGL.cpp" />
<ClCompile Include="..\..\libjin\Graphics\Shader.cpp" />
@@ -87,11 +87,12 @@
<ClInclude Include="..\..\libjin\Graphics\Canvas.h" />
<ClInclude Include="..\..\libjin\Graphics\Color.h" />
<ClInclude Include="..\..\libjin\Graphics\Drawable.h" />
+ <ClInclude Include="..\..\libjin\Graphics\TTF.h" />
<ClInclude Include="..\..\libjin\Graphics\Font.h" />
- <ClInclude Include="..\..\libjin\Graphics\FontData.h" />
<ClInclude Include="..\..\libjin\Graphics\Graphics.h" />
<ClInclude Include="..\..\libjin\Graphics\Mesh.h" />
<ClInclude Include="..\..\libjin\Graphics\OpenGL.h" />
+ <ClInclude Include="..\..\libjin\Graphics\Page.h" />
<ClInclude Include="..\..\libjin\Graphics\Shader.h" />
<ClInclude Include="..\..\libjin\Graphics\Shaders\base.shader.h" />
<ClInclude Include="..\..\libjin\Graphics\Shaders\default.shader.h" />
@@ -99,6 +100,7 @@
<ClInclude Include="..\..\libjin\Graphics\Shaders\texture.shader.h" />
<ClInclude Include="..\..\libjin\Graphics\Shapes.h" />
<ClInclude Include="..\..\libjin\Graphics\Texture.h" />
+ <ClInclude Include="..\..\libjin\Graphics\TexFont.h" />
<ClInclude Include="..\..\libjin\Graphics\Utf8.h" />
<ClInclude Include="..\..\libjin\Graphics\Window.h" />
<ClInclude Include="..\..\libjin\Input\Event.h" />
diff --git a/build/libjin/libjin.vcxproj.filters b/build/libjin/libjin.vcxproj.filters
index f79e814..cd91c37 100644
--- a/build/libjin/libjin.vcxproj.filters
+++ b/build/libjin/libjin.vcxproj.filters
@@ -99,9 +99,6 @@
<ClCompile Include="..\..\libjin\Graphics\Drawable.cpp">
<Filter>Graphics</Filter>
</ClCompile>
- <ClCompile Include="..\..\libjin\Graphics\Font.cpp">
- <Filter>Graphics</Filter>
- </ClCompile>
<ClCompile Include="..\..\libjin\Graphics\Texture.cpp">
<Filter>Graphics</Filter>
</ClCompile>
@@ -162,9 +159,6 @@
<ClCompile Include="..\..\libjin\Game\Game.cpp">
<Filter>Game</Filter>
</ClCompile>
- <ClCompile Include="..\..\libjin\Graphics\FontData.cpp">
- <Filter>Graphics</Filter>
- </ClCompile>
<ClCompile Include="..\..\libjin\Graphics\Mesh.cpp">
<Filter>Graphics</Filter>
</ClCompile>
@@ -174,6 +168,12 @@
<ClCompile Include="..\..\libjin\Graphics\Utf8.cpp">
<Filter>Graphics</Filter>
</ClCompile>
+ <ClCompile Include="..\..\libjin\Graphics\TTF.cpp">
+ <Filter>Graphics</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\libjin\Graphics\TexFont.cpp">
+ <Filter>Graphics</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\libjin\3rdparty\GLee\GLee.h">
@@ -230,9 +230,6 @@
<ClInclude Include="..\..\libjin\Graphics\Drawable.h">
<Filter>Graphics</Filter>
</ClInclude>
- <ClInclude Include="..\..\libjin\Graphics\Font.h">
- <Filter>Graphics</Filter>
- </ClInclude>
<ClInclude Include="..\..\libjin\Graphics\Graphics.h">
<Filter>Graphics</Filter>
</ClInclude>
@@ -340,9 +337,6 @@
<ClInclude Include="..\..\libjin\Math\Vector4.hpp">
<Filter>Math</Filter>
</ClInclude>
- <ClInclude Include="..\..\libjin\Graphics\FontData.h">
- <Filter>Graphics</Filter>
- </ClInclude>
<ClInclude Include="..\..\libjin\Graphics\OpenGL.h">
<Filter>Graphics</Filter>
</ClInclude>
@@ -367,6 +361,18 @@
<ClInclude Include="..\..\libjin\Graphics\Shaders\texture.shader.h">
<Filter>Graphics\Shaders</Filter>
</ClInclude>
+ <ClInclude Include="..\..\libjin\Graphics\Page.h">
+ <Filter>Graphics</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\libjin\Graphics\TTF.h">
+ <Filter>Graphics</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\libjin\Graphics\Font.h">
+ <Filter>Graphics</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\libjin\Graphics\TexFont.h">
+ <Filter>Graphics</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\libjin\README.md" />
generated by cgit v1.1-26-g67d0 at 2025-05-29 01:43:37 +0000