Groot/jmonkey-test
1
0
Fork 0
forked from nova/jmonkey-test
Code Issues Pull Requests Projects Releases Wiki Activity

Execute on called at one place instead of many

Browse Source
This commit is contained in:
Rohan Sircar 2021-01-10 12:36:04 +05:30
parent 6ccbf7e11d
commit 978215b510
3 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/scala/wow/doge/mygame/MainApp.scala
View File

@ -101,7 +101,10 @@ class MainApp(
bulletAppState <- Task(new BulletAppState()) bulletAppState <- Task(new BulletAppState())
_ <- Task(stateManager.attach(bulletAppState)) _ <- Task(stateManager.attach(bulletAppState))
_ <- logger.info("Initializing console stream") _ <- logger.info("Initializing console stream")
_ <- wire[MainAppDelegate].init(gameApp.scheduler) _ <-
wire[MainAppDelegate]
.init(gameApp.scheduler)
.executeOn(gameApp.scheduler)
} yield gameAppFib } yield gameAppFib
} }
@ -165,7 +168,6 @@ class MainAppDelegate(
rootNode, rootNode,
bulletAppState.physicsSpace bulletAppState.physicsSpace
) )
.executeOn(appScheduler)
_ <- createPlayerController(appScheduler) _ <- createPlayerController(appScheduler)
.absorbWith(e => DummyException("boom")) .absorbWith(e => DummyException("boom"))
.onErrorRestart(3) .onErrorRestart(3)
@ -240,22 +242,11 @@ class MainAppDelegate(
def createTestNpc( def createTestNpc(
appScheduler: monix.execution.Scheduler, appScheduler: monix.execution.Scheduler,
npcName: String npcName: String
) = ) = {
// : IO[PlayerController.Error, Unit] =
{
val initialPos = ImVector3f(50, 5, 0) val initialPos = ImVector3f(50, 5, 0)
// val modelPath = os.rel / "Models" / "Jaime" / "Jaime.j3o"
val npcPhysicsControl = new BetterCharacterControl(1.5f, 6f, 1f) val npcPhysicsControl = new BetterCharacterControl(1.5f, 6f, 1f)
// (1f, 2.1f, 10f) // (1f, 2.1f, 10f)
.withJumpForce(ImVector3f(0, 5f, 0)) .withJumpForce(ImVector3f(0, 5f, 0))
// val npcMovementActor = AkkaUtils.spawnActorL2(
// new NpcMovementActor2.Props(
// initialPos,
// tickEventBus,
// npcPhysicsControl
// ).behavior,
// s"${npcName}-npcMovementActor"
// )
val mbNpcNode = PlayerController.Defaults.defaultNpcNode( val mbNpcNode = PlayerController.Defaults.defaultNpcNode(
assetManager, assetManager,
initialPos, initialPos,

4
src/main/scala/wow/doge/mygame/game/GameApp.scala
View File

@ -93,7 +93,7 @@ object GameApp {
def resource( def resource(
logger: Logger[Task], logger: Logger[Task],
jmeScheduler: Scheduler, jmeThread: Scheduler,
schedulers: Schedulers schedulers: Schedulers
) = ) =
Resource.make( Resource.make(
@ -112,7 +112,7 @@ object GameApp {
app.setSettings(settings) app.setSettings(settings)
} }
gameApp <- Task(new GameApp(logger, app)) gameApp <- Task(new GameApp(logger, app))
fib <- gameApp.start.executeOn(jmeScheduler).start fib <- gameApp.start.executeOn(jmeThread).start
_ <- Task.fromCancelablePromise(startSignal) _ <- Task.fromCancelablePromise(startSignal)
} yield gameApp -> fib } yield gameApp -> fib
)(_._2.cancel) )(_._2.cancel)

2
src/main/scala/wow/doge/mygame/game/entities/player/PlayerController.scala
View File

@ -96,7 +96,7 @@ object PlayerController {
} }
} yield ()) } yield ())
.onErrorHandleWith(e => IO.raiseError(GenericError(e.getMessage()))) .onErrorHandleWith(e => IO.raiseError(GenericError(e.getMessage())))
.executeOn(appScheduler) // .executeOn(appScheduler)
} }
def apply( def apply(