start getting sims to run on web platform without true parallel

emer · Aug 15, 2024 · a3618be · a3618be
1 parent ac258bd
commit a3618be
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/egui/loopctrl.go b/egui/loopctrl.go
@@ -10,6 +10,7 @@ import (
 	"cogentcore.org/core/icons"
 	"cogentcore.org/core/styles"
 	"cogentcore.org/core/styles/abilities"
+	"cogentcore.org/core/system"
 	"cogentcore.org/core/tree"
 	"github.com/emer/emergent/v2/etime"
 	"github.com/emer/emergent/v2/looper"
@@ -40,10 +41,15 @@ func (gui *GUI) AddLooperCtrl(p *tree.Plan, loops *looper.Manager, modes []etime
 				if !gui.IsRunning {
 					gui.IsRunning = true
 					tb.Restyle()
-					go func() {
+					f := func() {
 						loops.Run(mode)
 						gui.Stopped()
-					}()
+					}
+					if core.TheApp.Platform() == system.Web {
+						f()
+					} else {
+						go f()
+					}
 				}
 			})
 		})
@@ -68,11 +74,16 @@ func (gui *GUI) AddLooperCtrl(p *tree.Plan, loops *looper.Manager, modes []etime
 				if !gui.IsRunning {
 					gui.IsRunning = true
 					tb.Restyle()
-					go func() {
+					f := func() {
 						stack := loops.Stacks[mode]
 						loops.Step(mode, stepN[stack.StepLevel.String()], stack.StepLevel)
 						gui.Stopped()
-					}()
+					}
+					if core.TheApp.Platform() == system.Web {
+						f()
+					} else {
+						go f()
+					}
 				}
 			})
 		})

diff --git a/netview/netview.go b/netview/netview.go
@@ -28,6 +28,7 @@ import (
 	"cogentcore.org/core/math32/minmax"
 	"cogentcore.org/core/styles"
 	"cogentcore.org/core/styles/abilities"
+	"cogentcore.org/core/system"
 	"cogentcore.org/core/texteditor"
 	"cogentcore.org/core/tree"
 	"cogentcore.org/core/types"
@@ -227,6 +228,10 @@ func (nv *NetView) GoUpdateView() {
 	se.SetNeedsRender()
 	sw.NeedsRender()
 	sw.Scene.AsyncUnlock()
+	if core.TheApp.Platform() == system.Web {
+		fmt.Println("nv rendering")
+		sw.WidgetBase.Scene.RenderUpdateWindow()
+	}
 }
 
 // UpdateView updates the display based on last recorded state of network.

diff --git a/patgen/configvocabpats_test.go b/patgen/configvocabpats_test.go
@@ -311,7 +311,7 @@ func TestVocab(t *testing.T) {
 [5 2 2]:       0       0       0       1       0       0 
 `
 	// fmt.Println("Input Pats")
-	// fmt.Println(dt.ColumnByName("Input").Shape().Sizes)
+	// fmt.Println(dt.ColumnByName("Input").Shape.Sizes)
 	// fmt.Println(dt.ColumnByName("Input").String())
 	assert.Equal(t, []int{6, 3, 2, 3, 3}, dt.ColumnByName("Input").Shape().Sizes)
 	assert.Equal(t, exip, dt.ColumnByName("Input").String())
@@ -374,7 +374,7 @@ func TestVocab(t *testing.T) {
 `
 
 	// fmt.Println("ECout Pats")
-	// fmt.Println(dt.ColumnByName("ECout").Shape().Sizes)
+	// fmt.Println(dt.ColumnByName("ECout").Shape.Sizes)
 	// fmt.Println(dt.ColumnByName("ECout").String())
 
 	assert.Equal(t, []int{6, 3, 2, 3, 3}, dt.ColumnByName("ECout").Shape().Sizes)