Skip to content

Commit

Permalink
update to latest core
Browse files Browse the repository at this point in the history
  • Loading branch information
rcoreilly committed May 2, 2024
1 parent 8f6f24a commit c661b2e
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion egui/gui.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions etime/modes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -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=
Expand Down
1 change: 0 additions & 1 deletion netview/netview.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ringidx/fixlen.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -39,4 +39,4 @@ func (fi *FIx) Shift(n uint32) {
fi.Zi = uint32(fi.Index(n))
}

//gosl: end ringidx
//gosl:end ringidx

0 comments on commit c661b2e

Please sign in to comment.