bloeys/nterm
1
0
Fork 0
mirror of https://github.com/bloeys/nterm.git synced 2025-12-29 14:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce padding 4->2

Browse Source
This commit is contained in:
bloeys
2022-07-02 10:15:53 +04:00
parent 56a6e0868b
commit 701ee97c66
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glyphs/font_atlas.go
View File

@ -70,8 +70,8 @@ func NewFontAtlasFromFont(f *truetype.Font, face font.Face, pointSize uint) (*Fo
atlasSizeX := 512 atlasSizeX := 512
atlasSizeY := 512 atlasSizeY := 512
const charPaddingX = 4 const charPaddingX = 2
const charPaddingY = 4 const charPaddingY = 2
charAdvFixed, _ := face.GlyphAdvance('L') charAdvFixed, _ := face.GlyphAdvance('L')
charAdv := charAdvFixed.Ceil() + charPaddingX charAdv := charAdvFixed.Ceil() + charPaddingX
@ -149,6 +149,9 @@ func NewFontAtlasFromFont(f *truetype.Font, face font.Face, pointSize uint) (*Fo
Width: glyphWidth, 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.DrawString(string(g))
drawer.Dot.X += charPaddingXFixed drawer.Dot.X += charPaddingXFixed

4
glyphs/glyphs.go
View File

@ -186,8 +186,8 @@ func (gr *GlyphRend) updateFontAtlasTexture(fontFile string) error {
gl.BindTexture(gl.TEXTURE_2D, atlasTex.TexID) 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_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_WRAP_T, gl.CLAMP_TO_EDGE)
gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR) gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST)
gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR) gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST)
gl.BindTexture(gl.TEXTURE_2D, 0) gl.BindTexture(gl.TEXTURE_2D, 0)
return nil return nil

4
main.go
View File

@ -66,7 +66,7 @@ func main() {
rend: rend, rend: rend,
imguiInfo: nmageimgui.NewImGUI(), imguiInfo: nmageimgui.NewImGUI(),
FontSize: 14, FontSize: 20,
} }
p.win.EventCallbacks = append(p.win.EventCallbacks, func(e sdl.Event) { p.win.EventCallbacks = append(p.win.EventCallbacks, func(e sdl.Event) {
@ -91,7 +91,7 @@ func (p *program) Init() {
if err != nil { if err != nil {
panic("Failed to get display DPI. Err: " + err.Error()) 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() 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) p.GlyphRend, err = glyphs.NewGlyphRend("./res/fonts/Consolas.ttf", &truetype.Options{Size: float64(p.FontSize), DPI: p.Dpi, SubPixelsX: subPixelX, SubPixelsY: subPixelY}, w, h)