From 701ee97c666546e302d205b4a91cb3b734733ead Mon Sep 17 00:00:00 2001
From: bloeys <bloeys@outlook.com>
Date: Sat, 2 Jul 2022 10:15:53 +0400
Subject: [PATCH] Reduce padding 4->2

---
 glyphs/font_atlas.go | 7 +++++--
 glyphs/glyphs.go     | 4 ++--
 main.go              | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/glyphs/font_atlas.go b/glyphs/font_atlas.go
index 49cdf98..85c6999 100755
--- a/glyphs/font_atlas.go
+++ b/glyphs/font_atlas.go
@@ -70,8 +70,8 @@ func NewFontAtlasFromFont(f *truetype.Font, face font.Face, pointSize uint) (*Fo
 	atlasSizeX := 512
 	atlasSizeY := 512
 
-	const charPaddingX = 4
-	const charPaddingY = 4
+	const charPaddingX = 2
+	const charPaddingY = 2
 	charAdvFixed, _ := face.GlyphAdvance('L')
 	charAdv := charAdvFixed.Ceil() + charPaddingX
 
@@ -149,6 +149,9 @@ func NewFontAtlasFromFont(f *truetype.Font, face font.Face, pointSize uint) (*Fo
 			Width:    glyphWidth,
 		}
 
+		// z := atlas.Glyphs[g]
+		// fmt.Printf("c=%s; u=%f, v=%f, sizeU=%f, sizeV=%f; x=%d, y=%d, w=%f, h=%f\n", string(g), z.U, z.V, z.SizeU, z.SizeV, int(z.U*atlasSizeXF32), int(z.V*atlasSizeYF32), z.SizeU*atlasSizeXF32, z.SizeV*atlasSizeYF32)
+
 		drawer.DrawString(string(g))
 		drawer.Dot.X += charPaddingXFixed
 
diff --git a/glyphs/glyphs.go b/glyphs/glyphs.go
index 1a63b55..c73aff6 100755
--- a/glyphs/glyphs.go
+++ b/glyphs/glyphs.go
@@ -186,8 +186,8 @@ func (gr *GlyphRend) updateFontAtlasTexture(fontFile string) error {
 	gl.BindTexture(gl.TEXTURE_2D, atlasTex.TexID)
 	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)
 	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE)
-	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR)
-	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
+	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST)
+	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST)
 	gl.BindTexture(gl.TEXTURE_2D, 0)
 
 	return nil
diff --git a/main.go b/main.go
index f13bcbd..f9b0ce6 100755
--- a/main.go
+++ b/main.go
@@ -66,7 +66,7 @@ func main() {
 		rend:      rend,
 		imguiInfo: nmageimgui.NewImGUI(),
 
-		FontSize: 14,
+		FontSize: 20,
 	}
 
 	p.win.EventCallbacks = append(p.win.EventCallbacks, func(e sdl.Event) {
@@ -91,7 +91,7 @@ func (p *program) Init() {
 	if err != nil {
 		panic("Failed to get display DPI. Err: " + err.Error())
 	}
-	fmt.Println("DPI:", dpi)
+	fmt.Printf("DPI: %f, font size: %d\n", dpi, p.FontSize)
 
 	w, h := p.win.SDLWin.GetSize()
 	p.GlyphRend, err = glyphs.NewGlyphRend("./res/fonts/Consolas.ttf", &truetype.Options{Size: float64(p.FontSize), DPI: p.Dpi, SubPixelsX: subPixelX, SubPixelsY: subPixelY}, w, h)