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

Basic drawing of cmd buffer through glyph grid

Browse Source
This commit is contained in:
bloeys
2022-09-25 05:18:06 +04:00
parent 32f086242c
commit 86dc7c4b4e
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main.go
View File

@ -337,10 +337,9 @@ func (nt *nterm) MainUpdate() {
nt.DrawTextAnsiCodesOnGlyphGrid(v1) nt.DrawTextAnsiCodesOnGlyphGrid(v1)
nt.DrawTextAnsiCodesOnGlyphGrid(v2) nt.DrawTextAnsiCodesOnGlyphGrid(v2)
nt.glyphGrid.ClearRow(nt.glyphGrid.SizeY - 1) nt.glyphGrid.Write(nt.cmdBuf[:nt.cmdBufLen], &nt.Settings.DefaultFgColor, &nt.Settings.DefaultBgColor)
nt.glyphGrid.ClearRow(nt.glyphGrid.SizeY - 2)
nt.glyphGrid.ClearRow(nt.glyphGrid.SizeY - 3)
// @TODO: This should probably be its own function to blit the glyph grid
for y := 0; y < len(nt.glyphGrid.Tiles); y++ { for y := 0; y < len(nt.glyphGrid.Tiles); y++ {
row := nt.glyphGrid.Tiles[y] row := nt.glyphGrid.Tiles[y]
@ -356,11 +355,6 @@ func (nt *nterm) MainUpdate() {
} }
nt.GlyphRend.OptValues.BgColor.Data = nt.Settings.DefaultBgColor.Data nt.GlyphRend.OptValues.BgColor.Data = nt.Settings.DefaultBgColor.Data
// Draw cmd buf
nt.lastCmdCharPos.SetX(0)
nt.lastCmdCharPos.SetY(nt.SepLinePos.Y() - nt.GlyphRend.Atlas.LineHeight)
nt.lastCmdCharPos.Data = nt.SyntaxHighlightAndDraw(nt.cmdBuf[:nt.cmdBufLen], *nt.lastCmdCharPos).Data
if input.KeyClicked(sdl.K_F4) { if input.KeyClicked(sdl.K_F4) {
nt.glyphGrid.Print() nt.glyphGrid.Print()
println(nt.glyphGrid.SizeX, nt.glyphGrid.SizeY) println(nt.glyphGrid.SizeX, nt.glyphGrid.SizeY)
@ -473,6 +467,7 @@ func (nt *nterm) DrawTextAnsiCodesOnGlyphGrid(bs []byte) {
} }
} }
// @TODO: Rewrite to draw on glyph grid
func (nt *nterm) SyntaxHighlightAndDraw(text []rune, pos gglm.Vec3) gglm.Vec3 { func (nt *nterm) SyntaxHighlightAndDraw(text []rune, pos gglm.Vec3) gglm.Vec3 {
startIndex := 0 startIndex := 0