From 173fd99c5feb7328ab464bfe829a8c2417bd7ab9 Mon Sep 17 00:00:00 2001 From: Turanszki Janos Date: Sat, 9 Nov 2019 22:04:25 +0000 Subject: [PATCH] font update --- WickedEngine/fontPS.hlsl | 2 +- WickedEngine/wiFont.cpp | 2 +- WickedEngine/wiVersion.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WickedEngine/fontPS.hlsl b/WickedEngine/fontPS.hlsl index ba6215b10..4197c86a7 100644 --- a/WickedEngine/fontPS.hlsl +++ b/WickedEngine/fontPS.hlsl @@ -12,5 +12,5 @@ struct VertextoPixel float4 main(VertextoPixel PSIn) : SV_TARGET { - return texture_font.Sample(sampler_font, PSIn.tex).rrrr * g_xFont_Color; + return texture_font.SampleLevel(sampler_font, PSIn.tex, 0).rrrr * g_xFont_Color; } diff --git a/WickedEngine/wiFont.cpp b/WickedEngine/wiFont.cpp index 5165b8d88..31935df95 100644 --- a/WickedEngine/wiFont.cpp +++ b/WickedEngine/wiFont.cpp @@ -270,7 +270,7 @@ void wiFont::Initialize() device->CreateBlendState(&bd, &blendState); SamplerDesc samplerDesc; - samplerDesc.Filter = FILTER_MIN_MAG_MIP_LINEAR; + samplerDesc.Filter = FILTER_MIN_MAG_LINEAR_MIP_POINT; samplerDesc.AddressU = TEXTURE_ADDRESS_BORDER; samplerDesc.AddressV = TEXTURE_ADDRESS_BORDER; samplerDesc.AddressW = TEXTURE_ADDRESS_BORDER; diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 34b5167cc..ad43b63c1 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 31; // minor bug fixes, alterations, refactors, updates - const int revision = 6; + const int revision = 7; long GetVersion()