From c661b2e29ea3d87ed3a83777edb59e9d0130988d Mon Sep 17 00:00:00 2001 From: "Randall C. O'Reilly" Date: Thu, 2 May 2024 14:31:06 -0700 Subject: [PATCH] update to latest core --- egui/gui.go | 2 +- etime/modes.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- netview/netview.go | 1 - ringidx/fixlen.go | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/egui/gui.go b/egui/gui.go index c21c434..a1d307c 100644 --- a/egui/gui.go +++ b/egui/gui.go @@ -13,7 +13,7 @@ import ( "cogentcore.org/core/views" "github.com/emer/emergent/v2/etime" "github.com/emer/emergent/v2/netview" - // _ "github.com/emer/gosl/v2/slboolview" // include to get gui views + // _ "cogentcore.org/core/vgpu/gosl/slboolview" // include to get gui views ) // GUI manages all standard elements of a simulation Graphical User Interface diff --git a/etime/modes.go b/etime/modes.go index 105299b..d6f10ba 100644 --- a/etime/modes.go +++ b/etime/modes.go @@ -6,7 +6,7 @@ package etime //go:generate core generate -//gosl: start etime +//gosl:start etime // Modes are evaluation modes (Training, Testing, etc) type Modes int32 //enums:enum @@ -34,7 +34,7 @@ const ( Debug ) -//gosl: end etime +//gosl:end etime // ModeFromString returns Mode int value from string name func ModeFromString(str string) Modes { diff --git a/go.mod b/go.mod index 70e00fd..f3cc906 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/emer/emergent/v2 go 1.22 require ( - cogentcore.org/core v0.1.3-0.20240501194413-e11b28b7c75f + cogentcore.org/core v0.1.3-0.20240502210800-24088d100118 github.com/BurntSushi/toml v1.3.2 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 github.com/iancoleman/strcase v0.3.0 diff --git a/go.sum b/go.sum index 67ba4c9..6a8990c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cogentcore.org/core v0.1.3-0.20240501194413-e11b28b7c75f h1:XePwDfrk5zPYJSjrpmapCH503fDrI31LroENLPht8C0= -cogentcore.org/core v0.1.3-0.20240501194413-e11b28b7c75f/go.mod h1:civGK+IuQZjq53w8eSxupM6fRyDB7m/irEeVKztMPB8= +cogentcore.org/core v0.1.3-0.20240502210800-24088d100118 h1:/xdfdarsDrFtWu73Bxr54ZTrhH3AQNcsQjMI/5CImqU= +cogentcore.org/core v0.1.3-0.20240502210800-24088d100118/go.mod h1:civGK+IuQZjq53w8eSxupM6fRyDB7m/irEeVKztMPB8= github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4 h1:6lx9xzJAhdjq0LvVfbITeC3IH9Fzvo1aBahyPu2FuG8= github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4/go.mod h1:FChzXi1izqzdPb6BiNZmcZLGyTYiT61iGx9Rxx9GNeI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= diff --git a/netview/netview.go b/netview/netview.go index 9e128f3..5084840 100644 --- a/netview/netview.go +++ b/netview/netview.go @@ -690,7 +690,6 @@ func (nv *NetView) ViewConfig() { // ViewDefaults are the default 3D view params func (nv *NetView) ViewDefaults() { se := nv.SceneXYZ() - se.Defaults() se.Camera.Pose.Pos.Set(0, 1.5, 2.5) // more "top down" view shows more of layers // vs.Camera.Pose.Pos.Set(0, 1, 2.75) // more "head on" for larger / deeper networks se.Camera.Near = 0.1 diff --git a/ringidx/fixlen.go b/ringidx/fixlen.go index cba2080..f0975b9 100644 --- a/ringidx/fixlen.go +++ b/ringidx/fixlen.go @@ -4,7 +4,7 @@ package ringidx -//gosl: start ringidx +//gosl:start ringidx // FIx is a fixed-length ring index structure -- does not grow // or shrink dynamically. @@ -39,4 +39,4 @@ func (fi *FIx) Shift(n uint32) { fi.Zi = uint32(fi.Index(n)) } -//gosl: end ringidx +//gosl:end ringidx