Reuse resource set

cmd/rallymka/app_cgo.go

@@ -36,7 +36,7 @@ func runApplication() error {
 	cfg.SetFullscreen(false) // TODO: Enable
 	cfg.SetMaximized(true)   // TODO: Remove
 	cfg.SetMinSize(1024, 576)
-	cfg.SetVSync(false) // FIXME: V-sync causes slow resource loading.
+	cfg.SetVSync(true)
 	cfg.SetIcon("resources/ui/images/icon.png")
 	cfg.SetMaximized(true)
 	return glapp.Run(cfg, app.NewLayeredController(gameController, uiController))

internal/ui/bootstrap.go

@@ -12,8 +12,11 @@ import (
 )
 
 func BootstrapApplication(window *ui.Window, gameController *game.Controller) {
+	engine := gameController.Engine()
+	resourceSet := engine.CreateResourceSet()
 	co.RegisterContext(global.Context{
-		Engine: gameController.Engine(),
+		Engine:      engine,
+		ResourceSet: resourceSet,
 	})
 	co.Initialize(window, co.New(Bootstrap, nil))
 }

internal/ui/controller/play.go

@@ -1,16 +1,18 @@
 package controller
 
 import (
+	"runtime"
+
 	"github.com/mokiat/gomath/dprec"
 	"github.com/mokiat/gomath/sprec"
 	"github.com/mokiat/lacking/app"
 	"github.com/mokiat/lacking/game"
 	"github.com/mokiat/lacking/game/ecs"
 	"github.com/mokiat/lacking/game/graphics"
 	"github.com/mokiat/lacking/game/physics"
+	"github.com/mokiat/lacking/game/physics/collision"
 	"github.com/mokiat/lacking/game/preset"
 	"github.com/mokiat/lacking/ui"
-	"github.com/mokiat/lacking/util/shape"
 	"github.com/mokiat/rally-mka/internal/game/data"
 )
 
@@ -193,6 +195,7 @@ func (c *PlayController) Start(environment data.Environment, controller data.Con
 		Zoom:           1.0,
 	})
 
+	runtime.GC()
 	c.engine.ResetDeltaTime()
 }
 
@@ -266,13 +269,11 @@ func (c *PlayController) createVehicleDefinition() *preset.CarDefinition {
 		AngularDragFactor:      0.0,
 		RestitutionCoefficient: 0.0,
 		CollisionGroup:         collisionGroup,
-		CollisionShapes: []physics.CollisionShape{
-			shape.NewPlacement[shape.Shape](
-				shape.NewTransform(
-					dprec.NewVec3(0.0, 0.3, -0.4),
-					dprec.IdentityQuat(),
-				),
-				shape.NewStaticBox(1.6, 1.4, 4.0),
+		CollisionBoxes: []collision.Box{
+			collision.NewBox(
+				dprec.NewVec3(0.0, 0.3, -0.4),
+				dprec.IdentityQuat(),
+				dprec.NewVec3(1.6, 1.4, 4.0),
 			),
 		},
 	})
@@ -284,11 +285,8 @@ func (c *PlayController) createVehicleDefinition() *preset.CarDefinition {
 		AngularDragFactor:      0.0,
 		RestitutionCoefficient: 0.0,
 		CollisionGroup:         collisionGroup,
-		CollisionShapes: []physics.CollisionShape{
-			shape.NewPlacement[shape.Shape](
-				shape.IdentityTransform(),
-				shape.NewStaticSphere(0.25),
-			),
+		CollisionSpheres: []collision.Sphere{
+			collision.NewSphere(dprec.ZeroVec3(), 0.25),
 		},
 	})
 
@@ -347,15 +345,3 @@ func (c *PlayController) createVehicleDefinition() *preset.CarDefinition {
 
 	return carDef
 }
-
-// func (h *playLifecycle) OnKeyboardEvent(element *ui.Element, event ui.KeyboardEvent) bool {
-// 	return h.carSystem.OnKeyboardEvent(event) || h.cameraStandSystem.OnKeyboardEvent(event)
-// }
-
-// func (h *playLifecycle) OnMouseEvent(element *ui.Element, event ui.MouseEvent) bool {
-// 	// bounds := element.Bounds()
-// 	// viewport := graphics.NewViewport(bounds.X, bounds.Y, bounds.Width, bounds.Height)
-// 	// camera := h.gfxScene.ActiveCamera()
-// 	// return h.vehicleSystem.OnMouseEvent(event, viewport, camera, h.gfxScene)
-// 	return false
-// }

internal/ui/global/context.go

@@ -3,5 +3,6 @@ package global
 import "github.com/mokiat/lacking/game"
 
 type Context struct {
-	Engine *game.Engine
+	Engine      *game.Engine
+	ResourceSet *game.ResourceSet
 }

internal/ui/view/home_screen.go

@@ -33,7 +33,8 @@ type HomeScreenPresenter struct {
 	Data       HomeScreenData `co:"data"`
 	Invalidate func()         `co:"invalidate"`
 
-	engine *game.Engine
+	engine      *game.Engine
+	resourceSet *game.ResourceSet
 
 	loadingModel *model.Loading
 	homeModel    *model.Home
@@ -48,6 +49,7 @@ func (p *HomeScreenPresenter) OnCreate() {
 	co.InjectContext(&globalContext)
 
 	p.engine = globalContext.Engine
+	p.resourceSet = globalContext.ResourceSet
 	p.loadingModel = p.Data.Loading
 	p.homeModel = p.Data.Home
 	p.playModel = p.Data.Play
@@ -540,8 +542,7 @@ func (p *HomeScreenPresenter) onNightClicked() {
 }
 
 func (p *HomeScreenPresenter) onStartClicked() {
-	resourceSet := p.engine.CreateResourceSet()
-	promise := data.LoadPlayData(p.engine, resourceSet, p.homeModel.Environment(), p.homeModel.Controller())
+	promise := data.LoadPlayData(p.engine, p.resourceSet, p.homeModel.Environment(), p.homeModel.Controller())
 	p.playModel.SetData(promise)
 
 	p.loadingModel.SetPromise(promise)

internal/ui/view/intro_screen.go

@@ -24,7 +24,9 @@ var IntroScreen = co.Define(func(props co.Properties, scope co.Scope) co.Instanc
 		globalContext = co.GetContext[global.Context]()
 		screenData    = co.GetData[IntroScreenData](props)
 
-		engine       = globalContext.Engine
+		engine      = globalContext.Engine
+		resourceSet = globalContext.ResourceSet
+
 		homeModel    = screenData.Home
 		loadingModel = screenData.LoadingModel
 	)
@@ -37,7 +39,6 @@ var IntroScreen = co.Define(func(props co.Properties, scope co.Scope) co.Instanc
 	})
 
 	co.Once(func() {
-		resourceSet := engine.CreateResourceSet()
 		homeModel.SetData(data.LoadHomeData(engine, resourceSet))
 	})