.gitignore

@@ -2,4 +2,4 @@
 go.mod
 go.sum
 pixelgl
-*.so
+pixelgl.so

.plugin

@@ -1 +0,0 @@
-// plugin

Makefile

@@ -1,32 +1,11 @@
-VERSION = $(shell git describe --tags)
+all: plugin
-BUILDTIME = $(shell date +%Y.%m.%d)
+	ldd ../pixelgl.so
-
-all: clean goimports plugin
-	#ldd pixelgl.so
-
-deps:
-	sudo apt install libxxf86vm-dev libxxf86vm1
 
 plugin:
-	LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/ GO111MODULE=off go build -v -x -buildmode=plugin -o pixelgl.so
+	go build -v -x -buildmode=plugin -o pixelgl.so
-
-install:
-	rm -f pixelgo.so
-	go build -v -x -buildmode=plugin -o ~/go/lib/pixelgl-${VERSION}.so
-	cd ~/go/lib && ln -f -s pixelgl-${VERSION}.so pixelgl.so
-
-clean:
-	rm -f pixelgl pixelgl.so
-
-full-plugin:
-	GO111MODULE=off go build -v -x -buildmode=plugin -o pixelgl.so
-
-full-install:
-	GO111MODULE=off go build -v -x -buildmode=plugin -o pixelgl.so
 
 standalone:
-	GO111MODULE=off go build -v -x
+	go build -v -x
-	./pixelgl
 
 check-git-clean:
 	@git diff-index --quiet HEAD -- || (echo "Git repository is dirty, please commit your changes first"; exit 1)

action.go

@@ -7,13 +7,12 @@ package main
 */
 
 import (
-	"go.wit.com/lib/protobuf/guipb"
 	"go.wit.com/log"
 	"go.wit.com/toolkits/tree"
 	"go.wit.com/widget"
 )
 
-func newAdd(n *tree.Node) {
+func Add(n *tree.Node) {
 	log.Log(INFO, "Add() END =", n.WidgetType, n.String())
 	if n == nil {
 		log.Warn("Tree Error: Add() sent n == nil")
@@ -59,7 +58,7 @@ func newaction(n *tree.Node, atype widget.ActionType) {
 		// w.disableColor()
 	case widget.Delete:
 		log.Info("newaction() DeleteNode()")
-		// n.DeleteNode()
+		n.DeleteNode()
 	case widget.ToolkitClose:
 		log.Info("newaction() toolkit closed. are the channels cleand up?")
 		return
@@ -69,15 +68,15 @@ func newaction(n *tree.Node, atype widget.ActionType) {
 	log.Log(INFO, "newaction() END", atype, n.String())
 }
 
-func setTitle(n *tree.Node, s string) {
+func SetTitle(n *tree.Node, s string) {
-	setText(n, s)
+	SetText(n, s)
 }
 
-func setLabel(n *tree.Node, s string) {
+func SetLabel(n *tree.Node, s string) {
-	setText(n, s)
+	SetText(n, s)
 }
 
-func setText(n *tree.Node, s string) {
+func SetText(n *tree.Node, s string) {
 	if n == nil {
 		log.Warn("Tree Error: Add() sent n == nil")
 		return
@@ -91,7 +90,7 @@ func setText(n *tree.Node, s string) {
 	log.Info("SetText()", n.WidgetType, n.String())
 }
 
-func addText(n *tree.Node, s string) {
+func AddText(n *tree.Node, s string) {
 	if n == nil {
 		log.Warn("Tree Error: Add() sent n == nil")
 		return
@@ -104,23 +103,3 @@ func addText(n *tree.Node, s string) {
 	// w := n.TK.(*guiWidget)
 	// w.AddText(s)
 }
-
-func enableWidget(n *tree.Node) {
-	log.Info("do enable() here")
-}
-
-func disableWidget(n *tree.Node) {
-	log.Info("do enable() here")
-}
-
-func setChecked(n *tree.Node, b bool) {
-	log.Info("do enable() here")
-}
-
-func showTable(n *guipb.Table) {
-	log.Info("do enable() here")
-}
-
-func toolkitClose() {
-	log.Info("do enable() here")
-}

main.go

@@ -9,11 +9,10 @@ package main
 
 import (
 	"embed"
-	"io/fs"
-	"os"
 
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/log"
+	"go.wit.com/toolkits/tree"
 
 	"github.com/faiface/pixel/pixelgl"
 	// "github.com/gookit/config"
@@ -23,23 +22,16 @@ import (
 var VERSION string
 var BUILDTIME string
 
-var PLUGIN string = "pixelgl"
+//go:embed *.glsl
-
+var glFile embed.FS
-//go:embed resources/*
-var resources embed.FS
-
 var pp *arg.Parser
 
-// the glsl file
+func init() {
-var glslFile string
-
-func initPlugin() {
 	pp = arg.MustParse(&argv)
 
 	log.Log(INFO, "Init()")
 
-	me.myTree = initTree()
+	me.myTree = tree.New()
-	/*
 	me.myTree.PluginName = "nocui"
 	//	me.myTree.ActionFromChannel = doAction
 
@@ -49,7 +41,6 @@ func initPlugin() {
 	me.myTree.SetLabel = SetLabel
 	me.myTree.SetText = SetText
 	me.myTree.AddText = AddText
-	*/
 
 	me.exit = false
 
@@ -59,7 +50,6 @@ func initPlugin() {
 
 	go simpleStdin()
 
-	glslFile = loadGLSL(argv.Filename)
 	// I think this doesn't work as a goroutine because
 	// opengl closes. This plugin probably has to wait
 	// until there is some sort of protobuf + socket interface
@@ -76,34 +66,3 @@ func main() {
 	// parseConfig()
 	pixelgl.Run(run)
 }
-
-// LoadFileToString loads the contents of a file into a string
-func loadGLSL(filename string) string {
-	var err error
-	var data []byte
-
-	//
-	data, err = os.ReadFile(filename)
-	if err == nil {
-		log.Println("found embedded file:", filename)
-		return string(data)
-	}
-	data, err = fs.ReadFile(resources, filename)
-	if len(data) == 0 {
-		log.Info("still could not find file", filename, err)
-	} else {
-		return string(data)
-	}
-
-	filename = "resources/seascape.glsl"
-	log.Println("did not find  embedded file:", filename, err)
-	data, err = fs.ReadFile(resources, filename)
-	if len(data) == 0 {
-		log.Info("still could not find file", filename)
-		os.Exit(-1)
-	}
-
-	// return a string of the data to feed into
-	// canvas.SetFragmentShader(file)
-	return string(data)
-}

psutil.go

@@ -1,8 +1,12 @@
 package main
 
 import (
+	"io/fs"
+	"io/ioutil"
+
 	"github.com/faiface/pixel"
 	"github.com/faiface/pixel/pixelgl"
+	"go.wit.com/log"
 )
 
 // Pixel Shader utility functions
@@ -40,3 +44,20 @@ func CenterWindow(win *pixelgl.Window) {
 		),
 	)
 }
+
+// LoadFileToString loads the contents of a file into a string
+func LoadFileToString(filename string) (string, error) {
+	embedf, err1 := fs.ReadFile(glFile, filename)
+	if err1 == nil {
+		log.Println("found embedded file:", filename)
+		return string(embedf), nil
+	} else {
+		log.Println("did not find  embedded file:", filename)
+		log.Println("err", err1)
+	}
+	b, err := ioutil.ReadFile("/tmp/" + filename)
+	if err != nil {
+		return "", err
+	}
+	return string(b), nil
+}

seascape.go

@@ -32,6 +32,12 @@ func run() {
 	// I am putting all shader example initializing stuff here for
 	// easier reference to those learning to use this functionality
 
+	fragSource, err := LoadFileToString(argv.Filename)
+
+	if err != nil {
+		panic(err)
+	}
+
 	var uMouse mgl32.Vec4
 	var uTime float32
 	var glDrift float32 = argv.GLdrift
@@ -46,7 +52,7 @@ func run() {
 		"uDrift", &glDrift,
 	)
 
-	canvas.SetFragmentShader(glslFile)
+	canvas.SetFragmentShader(fragSource)
 
 	start := time.Now()
 

structs.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"sync"
-
 	"go.wit.com/toolkits/tree"
 )
 
@@ -15,8 +13,8 @@ type guiWidget struct {
 	val map[string]int
 }
 
-var initOnce sync.Once // run initPlugin() only once
+// It's probably a terrible idea to call this 'me'
-var me toolkitConfig   // It's probably a terrible idea to call this 'me'
+var me toolkitConfig
 
 type toolkitConfig struct {
 	treeRoot *tree.Node // the base of the binary tree. it should have id == 0

tree.go

@@ -0,0 +1,24 @@
+package main
+
+/*
+	This is reference code for toolkit developers
+*/
+
+import (
+	"go.wit.com/widget"
+)
+
+// Other goroutines must use this to access the GUI
+//
+// You can not acess / process the GUI thread directly from
+// other goroutines. This is due to the nature of how
+// Linux, MacOS and Windows work (they all work differently. suprise. surprise.)
+//
+// this sets the channel to send user events back from the plugin
+func Callback(guiCallback chan widget.Action) {
+	me.myTree.Callback(guiCallback)
+}
+
+func PluginChannel() chan widget.Action {
+	return me.myTree.PluginChannel()
+}

treeInit.go

@@ -1,72 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-/*
-	DO NOT EDIT THIS FILE
-
-	this file is the same for every GUI toolkit plugin
-	when you are making a new GUI toolkit plugin for
-	a specific toolkit, you just need to define these
-	functions.
-
-	for example, in the "gocui" toolkit, the functions
-	below are what triggers the "gocui" GO package
-	to draw labels, buttons, windows, etc
-
-	If you are starting out trying to make a new GUI toolkit,
-	all you have to do is copy this file over. Then
-	work on making these functions. addWidget(), setText(), etc.
-
-	That's it!
-*/
-
-package main
-
-/*
-	This is reference code for toolkit developers
-
-	This is how information is passed in GO back to the application
-	via the GO 'plugin' concept
-
-	TODO: switch this to protocol buffers
-*/
-
-import (
-	"go.wit.com/toolkits/tree"
-	"go.wit.com/widget"
-)
-
-// Other goroutines must use this to access the GUI
-//
-// You can not acess / process the GUI thread directly from
-// other goroutines. This is due to the nature of how
-// Linux, MacOS and Windows work (they all work differently. suprise. surprise.)
-//
-// this sets the channel to send user events back from the plugin
-func Callback(guiCallback chan widget.Action) {
-	me.myTree.Callback(guiCallback)
-}
-
-func PluginChannel() chan widget.Action {
-	initOnce.Do(initPlugin)
-	return me.myTree.PluginChannel()
-}
-
-func initTree() *tree.TreeInfo {
-	t := tree.New()
-	t.PluginName = PLUGIN
-	t.Add = newAdd
-	t.SetTitle = setTitle
-	t.SetLabel = setLabel
-	t.SetText = setText
-	t.AddText = addText
-
-	t.Enable = enableWidget
-	t.Disable = disableWidget
-
-	t.SetChecked = setChecked
-	t.ToolkitClose = toolkitClose
-	t.ShowTable = showTable
-
-	return t
-}