switch to WebGPU instead of Vulkan for 3D / 2D rendering.

base/elide/elide.go

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-/*
-Package elide provides basic text eliding functions.
-*/
+// Package elide provides basic text eliding functions.
 package elide
 
+import "strings"
+
 // End elides from the end of the string if it is longer than given
 // size parameter.  The resulting string will not exceed sz in length,
 // with space reserved for … at the end.
@@ -31,3 +31,16 @@ func Middle(s string, sz int) string {
 	rest := en - mid
 	return s[:mid] + "…" + s[n-rest:]
 }
+
+// AppName elides the given app name to be twelve characters or less
+// by removing word(s) from the middle of the string if necessary and possible.
+func AppName(s string) string {
+	if len(s) <= 12 {
+		return s
+	}
+	words := strings.Fields(s)
+	if len(words) < 3 {
+		return s
+	}
+	return words[0] + " " + words[len(words)-1]
+}

base/ordmap/ordmap.go

@@ -11,7 +11,7 @@ The implementation is fully visible and the API provides a minimal
 subset of methods, compared to other implementations that are heavier,
 so that additional functionality can be added as needed.
 
-The slice structure holds the Key and Val for items as they are added,
+The slice structure holds the Key and Value for items as they are added,
 enabling direct updating of the corresponding map, which holds the
 index into the slice.  Adding and access are fast, while deleting
 and inserting are relatively slow, requiring updating of the index map,

base/vcs/files.go

@@ -4,8 +4,6 @@
 
 package vcs
 
-//go:generate core generate
-
 import (
 	"os"
 	"path/filepath"

base/vcs/git.go

@@ -21,6 +21,10 @@ type GitRepo struct {
 	vcs.GitRepo
 }
 
+func (gr *GitRepo) Type() Types {
+	return Git
+}
+
 func (gr *GitRepo) Files() (Files, error) {
 	f := make(Files)
 

base/vcs/svn.go

@@ -21,6 +21,10 @@ type SvnRepo struct {
 	vcs.SvnRepo
 }
 
+func (gr *SvnRepo) Type() Types {
+	return Svn
+}
+
 func (gr *SvnRepo) CharToStat(stat byte) FileStatus {
 	switch stat {
 	case 'M', 'R':

base/vcs/vcs.go

@@ -16,12 +16,25 @@ import (
 	"github.com/Masterminds/vcs"
 )
 
+type Types int32 //enums:enum -accept-lower
+
+const (
+	NoVCS Types = iota
+	Git
+	Svn
+	Bzr
+	Hg
+)
+
 // Repo provides an interface extending [vcs.Repo]
 // (https://github.com/Masterminds/vcs)
 // with support for file status information and operations.
 type Repo interface {
 	vcs.Repo
 
+	// Type returns the type of repo we are using
+	Type() Types
+
 	// Files returns a map of the current files and their status.
 	Files() (Files, error)
 
@@ -104,19 +117,19 @@ func NewRepo(remote, local string) (Repo, error) {
 }
 
 // DetectRepo attempts to detect the presence of a repository at the given
-// directory path -- returns type of repository if found, else vcs.NoVCS.
+// directory path -- returns type of repository if found, else NoVCS.
 // Very quickly just looks for signature file name:
 // .git for git
-// .svn for svn -- but note that this will find any subdir in svn repo
-func DetectRepo(path string) vcs.Type {
+// .svn for svn -- but note that this will find any subdir in svn rep.o
+func DetectRepo(path string) Types {
 	if fsx.HasFile(path, ".git") {
-		return vcs.Git
+		return Git
 	}
 	if fsx.HasFile(path, ".svn") {
-		return vcs.Svn
+		return Svn
 	}
 	// todo: rest later..
-	return vcs.NoVCS
+	return NoVCS
 }
 
 // relPath return the path relative to the repository LocalPath()

cmd/core/cmd/log.go

@@ -25,7 +25,7 @@ func Log(c *config.Config) error { //types:add
 		}
 	}
 	// we are logging continiously so we can't buffer, and we must be verbose
-	err := exec.Verbose().SetBuffer(false).Run("adb", "logcat", "*:"+c.Log.All, "Go:D", "GoLog:D")
+	err := exec.Verbose().SetBuffer(false).Run("adb", "logcat", "*:"+c.Log.All, "Go:D", "GoLog:D", "GoLogWGPU:D")
 	if err != nil {
 		return fmt.Errorf("erroring getting logs: %w", err)
 	}

cmd/core/cmd/registry_notwindows.go

@@ -0,0 +1,7 @@
+//go:build !windows
+
+package cmd
+
+func windowsRegistryAddPath(path string) error {
+	return nil // no-op
+}

cmd/core/cmd/registry_windows.go

@@ -0,0 +1,42 @@
+// Copyright (c) 2024, Cogent Core. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cmd
+
+import (
+	"fmt"
+	"strings"
+
+	"cogentcore.org/core/base/logx"
+	"golang.org/x/sys/windows/registry"
+)
+
+// windowsRegistryAddPath adds the given filepath to the system path in the
+// Windows registry. If you are adding multiple paths, put a semicolon between
+// them, but do NOT add a leading or trailing semicolon; these will be handled
+// automatically.
+func windowsRegistryAddPath(path string) error {
+	k, err := registry.OpenKey(registry.LOCAL_MACHINE, `System\CurrentControlSet\Control\Session Manager\Environment`, registry.QUERY_VALUE|registry.SET_VALUE)
+	if err != nil {
+		return err
+	}
+	defer k.Close()
+
+	s, _, err := k.GetStringValue("Path")
+	if err != nil {
+		return err
+	}
+	scpath := ";" + path + ";"
+	if strings.Contains(s, scpath) {
+		fmt.Printf("Path %s already in existing Path: %s\n", path, s)
+		return nil
+	}
+	s += path + ";"
+	err = k.SetStringValue("Path", s)
+	if err != nil {
+		return err
+	}
+	logx.PrintfDebug("Path %q added to system PATH\n", path)
+	return nil
+}

cmd/core/cmd/setup.go

@@ -12,11 +12,8 @@ import (
 	"cogentcore.org/core/base/exec"
 	"cogentcore.org/core/base/logx"
 	"cogentcore.org/core/cmd/core/config"
-	"github.com/mitchellh/go-homedir"
 )
 
-const vulkanVersion = "1.3.283.0"
-
 // Setup installs platform-specific dependencies for the current platform.
 // It only needs to be called once per system.
 func Setup(c *config.Config) error { //types:add
@@ -32,27 +29,6 @@ func Setup(c *config.Config) error { //types:add
 		} else {
 			logx.PrintlnWarn("xcode tools already installed")
 		}
-		if _, err := exec.LookPath("vulkaninfo"); err == nil {
-			logx.PrintlnWarn("vulkan already installed")
-			return nil
-		}
-		err = vc.Run("curl", "-OL", "https://sdk.lunarg.com/sdk/download/"+vulkanVersion+"/mac/vulkansdk-macos-"+vulkanVersion+".dmg")
-		if err != nil {
-			return err
-		}
-		err = exec.Run("sudo", "hdiutil", "attach", "vulkansdk-macos-"+vulkanVersion+".dmg")
-		if err != nil {
-			return err
-		}
-		home, err := homedir.Dir()
-		if err != nil {
-			return err
-		}
-		root := filepath.Join(home, "VulkanSDK", vulkanVersion)
-		err = vc.Run("sudo", "/Volumes/vulkansdk-macos-"+vulkanVersion+"/InstallVulkan.app/Contents/MacOS/InstallVulkan", "--root", root, "--accept-licenses", "--default-answer", "--confirm-command", "install", "com.lunarg.vulkan.core", "com.lunarg.vulkan.usr", "com.lunarg.vulkan.sdl2", "com.lunarg.vulkan.glm", "com.lunarg.vulkan.volk", "com.lunarg.vulkan.vma")
-		if err != nil {
-			return err
-		}
 		return nil
 	case "linux":
 		_, err := exec.LookPath("apt-get")
@@ -61,7 +37,7 @@ func Setup(c *config.Config) error { //types:add
 			if err != nil {
 				return err
 			}
-			return vc.Run("sudo", "apt-get", "install", "libgl1-mesa-dev", "xorg-dev")
+			return vc.Run("sudo", "apt-get", "install", "-f", "-y", "libgl1-mesa-dev", "libegl1-mesa-dev", "mesa-vulkan-drivers", "xorg-dev")
 		}
 		_, err = exec.LookPath("dnf")
 		if err == nil {
@@ -70,19 +46,19 @@ func Setup(c *config.Config) error { //types:add
 		return fmt.Errorf("unknown Linux distro (apt-get and dnf not found); file an issue at https://github.com/cogentcore/core/issues")
 	case "windows":
 		if _, err := exec.LookPath("gcc"); err != nil {
-			err := vc.Run("curl", "-OL", "https://github.com/jmeubank/tdm-gcc/releases/download/v10.3.0-tdm64-2/tdm64-gcc-10.3.0-2.exe")
+			err := vc.Run("curl", "-OL", "https://github.com/skeeto/w64devkit/releases/download/v2.0.0/w64devkit-x64-2.0.0.exe")
 			if err != nil {
 				return err
 			}
-			path, err := filepath.Abs("tdm64-gcc-10.3.0-2.exe")
+			path, err := filepath.Abs("w64devkit-x64-2.0.0.exe")
 			if err != nil {
 				return err
 			}
-			err = vc.Run(path)
+			err = vc.Run(path, "x", "-oC:", "-aoa")
 			if err != nil {
 				return err
 			}
-			err = exec.Run("cmd.exe", "/c", `cd C:\TDM-GCC-64 && mingwvars.bat`)
+			err = windowsRegistryAddPath(`C:\w64devkit\bin`)
 			if err != nil {
 				return err
 			}

cmd/core/config/config.go

@@ -68,8 +68,8 @@ type Config struct { //types:add
 	// the configuration information for web
 	Web Web `cmd:"build,install,run,pack"`
 
-	// the configuration options for the log command
-	Log Log `cmd:"log"`
+	// the configuration options for the log and run commands
+	Log Log `cmd:"log,run"`
 
 	// the configuration options for the generate command
 	Generate Generate `cmd:"generate"`

cmd/core/config/web.go

@@ -23,6 +23,10 @@ type Web struct { //types:add
 	// and serve it as a gzip-encoded file in the run command.
 	Gzip bool
 
+	// GenerateHTML is whether to generate an HTML version of app content for
+	// preview and SEO purposes.
+	GenerateHTML bool `default:"true"`
+
 	// The page language.
 	//
 	// DEFAULT: en.

cmd/core/mobile/build_androidapp.go

@@ -18,6 +18,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"cogentcore.org/core/base/elide"
 	"cogentcore.org/core/base/exec"
 	"cogentcore.org/core/base/logx"
 	"cogentcore.org/core/cmd/core/config"
@@ -54,7 +55,7 @@ func goAndroidBuild(c *config.Config, pkg *packages.Package, targets []config.Pl
 		buf.WriteString(`<?xml version="1.0" encoding="utf-8"?>`)
 		err := manifestTmpl.Execute(buf, manifestTmplData{
 			JavaPkgPath: c.ID,
-			Name:        c.Name,
+			Name:        elide.AppName(c.Name),
 			LibName:     libName,
 		})
 		if err != nil {