remove for now

Signed-off-by: Jeff Carr <jcarr@wit.com>

.gitignore

@@ -1,3 +1,5 @@
 *.swp
 go.mod
 go.sum
+pixelgl
+*.so

.plugin

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

Makefile

@@ -1,12 +1,32 @@
-all: plugin
+VERSION = $(shell git describe --tags)
-	ldd ../pixelgl.so
+BUILDTIME = $(shell date +%Y.%m.%d)
+
+all: clean goimports plugin
+	#ldd pixelgl.so
+
+deps:
+	sudo apt install libxxf86vm-dev libxxf86vm1
 
 plugin:
-	GO111MODULE=off go build -v -x -buildmode=plugin -o ../pixelgl.so
+	LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/ GO111MODULE=off 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 install -v -x
+	GO111MODULE=off go build -v -x
-	pixelgl
+	./pixelgl
 
 check-git-clean:
 	@git diff-index --quiet HEAD -- || (echo "Git repository is dirty, please commit your changes first"; exit 1)

README.md

@@ -3,3 +3,5 @@
 Package gui implements a abstraction layer for Go visual elements.
 
 This is a sample plugin. It's a skeleton intended to be used when making a new toolkit plugin.
+
+# github.com/faiface/pixel-examples/community/seascape-shader/

action.go

@@ -7,12 +7,13 @@ package main
 */
 
 import (
+	"go.wit.com/lib/protobuf/guipb"
 	"go.wit.com/log"
 	"go.wit.com/toolkits/tree"
 	"go.wit.com/widget"
 )
 
-func Add(n *tree.Node) {
+func newAdd(n *tree.Node) {
 	log.Log(INFO, "Add() END =", n.WidgetType, n.String())
 	if n == nil {
 		log.Warn("Tree Error: Add() sent n == nil")
@@ -58,7 +59,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
@@ -68,15 +69,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
@@ -90,7 +91,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
@@ -103,3 +104,23 @@ 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")
+}

args.go

@@ -28,3 +28,33 @@ func init() {
 
 	ERROR = log.NewFlag("ERROR", true, full, short, "toolkit errors")
 }
+
+var argv args
+
+type args struct {
+	Width    float64 `arg:"--width"   default:"640"        help:"window width"`
+	Height   float64 `arg:"--height"  default:"480"        help:"window height"`
+	Filename string  `arg:"--filename"                     help:"what .glsl file to render"`
+	DryRun   bool    `arg:"--dry-run"                      help:"show what would be run"`
+	GLdrift  float32 `arg:"--drift"   default:"0.01"       help:"how fast things move around"`
+	// Fetch     bool   `arg:"--git-fetch"      default:"false" help:"run 'git fetch' on all your repos"`
+}
+
+func (args) Version() string {
+	return "go-clone " + VERSION + "    Built on " + BUILDTIME
+}
+
+func (a args) Description() string {
+	return `
+git clone go repositories
+
+Examples:
+	go-clone go.wit.com/apps/go-clone              # simply try to git clone this
+	go-clone --recursive go.wit.com/apps/go-clone  # recursively clone all the dependancies
+	go-clone --auto-work go.wit.com/apps/go-clone  # if you are using a go.work file, recreate the go.work file
+	go-clone --go-reset                            # recreate every go.mod and go.sum file
+	go-clone --git-pull                            # run 'git pull' in every repo
+	go-clone --build                               # build every binary package
+	go-clone --install                             # install every binary package
+`
+}

config.go

@@ -1,84 +0,0 @@
-package main
-
-/*
-	This simply parses the command line arguments using the default golang
-	package called 'flag'. This can be used as a simple template to parse
-	command line arguments in other programs.
-
-	It puts everything in the 'config' package which I think is a good
-	wrapper around the 'flags' package and doesn't need a whole mess of
-	global variables
-*/
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"os"
-
-	"github.com/gookit/config"
-)
-
-var customUsage = func() {
-	fmt.Fprintf(flag.CommandLine.Output(), "Usage of %s:\n", os.Args[0])
-	flag.PrintDefaults()
-
-	fmt.Println("")
-	fmt.Println("EXAMPLES:")
-	fmt.Println("")
-	fmt.Println(os.Args[0] + " --width 1024 --height 768 --drift .1 --filename seascape.glsl")
-	fmt.Println(os.Args[0] + " --width 640 --height 480 --filename planetfall.glsl")
-	fmt.Println("")
-}
-
-func parseFlags() {
-	var version string
-	var race bool
-	var filename string
-	var width int
-	var height int
-	var glDrift float64
-	var guiJunk string
-
-	flag.StringVar(&version, "version", "v0.1", "Set compiled in version string")
-
-	flag.StringVar(&filename, "filename", "seascape.glsl", "path to GLSL file")
-	flag.StringVar(&guiJunk, "gui", "something", "redo all this code")
-	flag.IntVar(&width, "width", 1024, "Width of the OpenGL Window")
-	flag.IntVar(&height, "height", 768, "Height of the OpenGL Window")
-
-	flag.Float64Var(&glDrift, "drift", 0.01, "Speed of the gradual camera drift")
-	flag.BoolVar(&race, "race", race, "Use race detector")
-
-	// Set the output if something fails to stdout rather than stderr
-	flag.CommandLine.SetOutput(os.Stdout)
-
-	flag.Usage = customUsage
-	flag.Parse()
-
-	if flag.Parsed() {
-		log.Println("flag.Parse() worked")
-	} else {
-		log.Println("flag.Parse() failed")
-	}
-
-	// keys := []string{"filename", "width", "height", "drift"}
-	// keys := []string{"width", "height", "drift"}
-
-	//	keys := []string{"height"}
-	//	config.LoadFlags(keys)
-
-	config.Set("width", width)
-	config.Set("height", height)
-	config.Set("glDrift", glDrift)
-	config.Set("filename", filename)
-}
-
-func parseConfig() {
-	config.WithOptions(config.ParseEnv)
-	parseFlags()
-
-	// config.LoadOSEnv([]string{"MAIL"})
-	// config.LoadOSEnv([]string{"USER"})
-	// config.LoadOSEnv([]string{"BUILDDEBUG"})
-}

main.go

@@ -9,21 +9,37 @@ 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"
+	// "github.com/gookit/config"
 )
 
-//go:embed *.glsl
+// sent via -ldflags
-var glFile embed.FS
+var VERSION string
+var BUILDTIME string
+
+var PLUGIN string = "pixelgl"
+
+//go:embed resources/*
+var resources embed.FS
+
+var pp *arg.Parser
+
+// the glsl file
+var glslFile string
+
+func initPlugin() {
+	pp = arg.MustParse(&argv)
 
-func init() {
 	log.Log(INFO, "Init()")
 
-	me.myTree = tree.New()
+	me.myTree = initTree()
+	/*
 		me.myTree.PluginName = "nocui"
 		//	me.myTree.ActionFromChannel = doAction
 
@@ -33,6 +49,7 @@ func init() {
 		me.myTree.SetLabel = SetLabel
 		me.myTree.SetText = SetText
 		me.myTree.AddText = AddText
+	*/
 
 	me.exit = false
 
@@ -42,12 +59,7 @@ func init() {
 
 	go simpleStdin()
 
-	config.Set("width", 640)
+	glslFile = loadGLSL(argv.Filename)
-	config.Set("height", 480)
-	config.Set("glDrift", 0.01)
-	// config.Set("filename", "planetfall.glsl")
-	config.Set("filename", "seascape.glsl")
-
 	// 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
@@ -60,11 +72,38 @@ func init() {
 // I assume it's for testing the code in a stand alone way
 func main() {
 
-	config.Set("width", 1024)
-	config.Set("height", 768)
-	config.Set("glDrift", 0.01)
-	config.Set("filename", "planetfall.glsl")
 	// This parses the command line arguments
 	// 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,12 +1,8 @@
 package main
 
 import (
-	"io/fs"
-	"io/ioutil"
-
 	"github.com/faiface/pixel"
 	"github.com/faiface/pixel/pixelgl"
-	"go.wit.com/log"
 )
 
 // Pixel Shader utility functions
@@ -44,20 +40,3 @@ 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

@@ -5,20 +5,17 @@ import (
 
 	"github.com/go-gl/mathgl/mgl32"
 
-	"log"
-
 	"github.com/faiface/pixel"
 	"github.com/faiface/pixel/pixelgl"
-	"github.com/gookit/config"
 	"golang.org/x/image/colornames"
 )
 
 func run() {
 	// Set up window configs
-	log.Println("width = ", config.Int("width"), "height = ", config.String("height"))
 	cfg := pixelgl.WindowConfig{ // Default: 1024 x 768
 		Title: "Golang GLSL",
-		Bounds: pixel.R(0, 0, config.Float("width"), config.Float("height")),
+		// Bounds: pixel.R(0, 0, float64(width), float64(height)),
+		Bounds: pixel.R(0, 0, argv.Width, argv.Height),
 		VSync:  true,
 	}
 
@@ -35,17 +32,9 @@ func run() {
 	// I am putting all shader example initializing stuff here for
 	// easier reference to those learning to use this functionality
 
-	log.Println("Load GSGL file = ", config.String("filename"))
-	fragSource, err := LoadFileToString(config.String("filename"))
-
-	if err != nil {
-		panic(err)
-	}
-
 	var uMouse mgl32.Vec4
 	var uTime float32
-	log.Println("glDrift = ", config.String("glDrift"))
+	var glDrift float32 = argv.GLdrift
-	var glDrift float32 = float32(config.Float("glDrift"))
 
 	canvas := win.Canvas()
 	uResolution := mgl32.Vec2{float32(win.Bounds().W()), float32(win.Bounds().H())}
@@ -57,7 +46,7 @@ func run() {
 		"uDrift", &glDrift,
 	)
 
-	canvas.SetFragmentShader(fragSource)
+	canvas.SetFragmentShader(glslFile)
 
 	start := time.Now()
 

structs.go

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

tree.go

@@ -1,24 +0,0 @@
-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

@@ -0,0 +1,72 @@
+// 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
+}