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

Make SepLinePos part of program struct

Browse Source
This commit is contained in:
bloeys
2022-08-01 03:30:46 +04:00
parent 06599748eb
commit 05fb837400
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main.go
View File

@ -97,6 +97,8 @@ type program struct {
Settings *Settings Settings *Settings
frameStartTime time.Time frameStartTime time.Time
SepLinePos gglm.Vec3
} }
const ( const (
@ -264,8 +266,6 @@ func (p *program) Update() {
p.MainUpdate() p.MainUpdate()
} }
var sepLinePos = gglm.NewVec3(0, 0, 0)
func (p *program) MainUpdate() { func (p *program) MainUpdate() {
if input.KeyClicked(sdl.K_RETURN) || input.KeyClicked(sdl.K_KP_ENTER) { if input.KeyClicked(sdl.K_RETURN) || input.KeyClicked(sdl.K_KP_ENTER) {
@ -314,7 +314,7 @@ func (p *program) MainUpdate() {
} }
// Line separator // Line separator
sepLinePos.SetY(2 * p.GlyphRend.Atlas.LineHeight) p.SepLinePos.SetY(2 * p.GlyphRend.Atlas.LineHeight)
// Draw textBuf // Draw textBuf
gw, gh := p.GridSize() gw, gh := p.GridSize()
@ -326,7 +326,7 @@ func (p *program) MainUpdate() {
// Draw cmd buf // Draw cmd buf
p.lastCmdCharPos.SetX(0) p.lastCmdCharPos.SetX(0)
p.lastCmdCharPos.SetY(sepLinePos.Y() - p.GlyphRend.Atlas.LineHeight) p.lastCmdCharPos.SetY(p.SepLinePos.Y() - p.GlyphRend.Atlas.LineHeight)
p.lastCmdCharPos.Data = p.SyntaxHighlightAndDraw(p.cmdBuf[:p.cmdBufLen], *p.lastCmdCharPos).Data p.lastCmdCharPos.Data = p.SyntaxHighlightAndDraw(p.cmdBuf[:p.cmdBufLen], *p.lastCmdCharPos).Data
} }
@ -709,7 +709,7 @@ func (p *program) Render() {
p.DebugRender() p.DebugRender()
sizeX := float32(p.GlyphRend.ScreenWidth) sizeX := float32(p.GlyphRend.ScreenWidth)
p.rend.Draw(p.gridMesh, gglm.NewTrMatId().Translate(gglm.NewVec3(sizeX/2, sepLinePos.Y(), 0)).Scale(gglm.NewVec3(sizeX, 1, 1)), p.gridMat) p.rend.Draw(p.gridMesh, gglm.NewTrMatId().Translate(gglm.NewVec3(sizeX/2, p.SepLinePos.Y(), 0)).Scale(gglm.NewVec3(sizeX, 1, 1)), p.gridMat)
} }
p.DrawCursor() p.DrawCursor()