From 3c3c0e8904baaabdf1293ad74726cf484822490d Mon Sep 17 00:00:00 2001 From: lordwelch Date: Tue, 6 Feb 2018 20:48:54 -0800 Subject: [PATCH] Revert "remove gl crap" This reverts commit 7cf75e4630b77c42504b0a07e0b72d8bdba27b4e. possibly getting back to a recoverable state after the next revert --- main.go | 14 ++++++++++++-- qrc.go | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index fabfa03..13ec643 100644 --- a/main.go +++ b/main.go @@ -104,8 +104,8 @@ func run() error { return nil } -func (sv service) Init(uint num) { - if num == 0 { +func (sv service) Init(int num) { + if num <= 0 { num = 1 } @@ -231,6 +231,16 @@ func (cl *Cell) Select() { } +/*func (cl *Cell) Texture() glbase.Texture { + fmt.Println("index: ", cl.index, " ", cl.img.tex) + fmt.Println("error tex:", gl.GetError()) + if cl.img.tex == 0 { + cl.img.tex = newTexture(*cl.getImage(monWidth, monHeight)) + fmt.Println("new texture", cl.img.tex) + } + return cl.img.tex +}*/ + //not really needed func (cl Cell) String() string { return fmt.Sprintf("Index: %d \nText: %s\n", cl.index, cl.text) diff --git a/qrc.go b/qrc.go index f44d17d..8272b55 100644 --- a/qrc.go +++ b/qrc.go @@ -13,7 +13,7 @@ import ( func init() { var r *qml.Resources var err error - if true /*os.Getenv("QRC_REPACK") == "1"*/ { + if true/*os.Getenv("QRC_REPACK") == "1"*/ { err = qrcRepackResources() if err != nil { panic("cannot repack qrc resources: " + err.Error())