@vyr/three-remote 0.0.1 → 0.0.3

package/package.json

@@ -1,23 +1 @@
-{
-  "name": "@vyr/three-remote",
-  "version": "0.0.1",
-  "description": "",
-  "main": "./src/index.ts",
-  "author": "",
-  "sideEffects": true,
-  "license": "MIT",
-  "dependencies": {
-    "@vyr/locale": "0.0.1",
-    "@vyr/engine": "0.0.1",
-    "@vyr/remote": "0.0.1",
-    "@vyr/three": "0.0.1"
-  },
-  "files": [
-    "package.json",
-    "src/"
-  ],
-  "vyr": {
-    "type": "remote",
-    "order": 1000
-  }
-}
+{"name":"@vyr/three-remote","version":"0.0.3","description":"","main":"./src/index.ts","author":"","sideEffects":true,"license":"MIT","dependencies":{"@vyr/locale":"0.0.3","@vyr/engine":"0.0.3","@vyr/remote":"0.0.3","@vyr/three":"0.0.3"},"files":["package.json","src/"],"vyr":{"type":"remote","order":1000}}

package/src/ChangeScriptable.ts

@@ -1,11 +1,10 @@
 import { Descriptor, Graphics, Scriptable, ServiceDescriptor } from "@vyr/engine";
-import { TransformControllerChangeArgs, TransformControllerDescriptor } from '@vyr/three'
+import { TransformControllerChangeArgs } from '@vyr/three'
 import { RemoteProcess, Job } from '@vyr/remote'
 import { cache } from "./Cache"
 
 class ChangeScriptable extends Scriptable {
-
-    execute(descriptor: TransformControllerDescriptor, graphics: Graphics, args: TransformControllerChangeArgs) {
+    execute(graphics: Graphics, args: TransformControllerChangeArgs) {
         const process = RemoteProcess.get(graphics.engine)
         if (process === null) return
 

package/src/RemoteExecutor.ts

@@ -1,4 +1,4 @@
-import { Asset, Descriptor, DeserializationObject, HTMLDescriptor, NodeDescriptor, PrefabeDescriptor, ServiceDescriptor, ServiceSchedulerDescriptor, Unit, UpdateArgs, Vector3 as _V3 } from '@vyr/engine'
+import { Asset, Descriptor, DeserializationObject, HTMLDescriptor, NodeDescriptor, PrefabeDescriptor, ServiceDescriptor, ServiceSchedulerDescriptor, Unit, Vector3 as _V3 } from '@vyr/engine'
 import { GeometryDescriptor, MaterialDescriptor, MeshDescriptor, NodeActor, OrbitControllerActor, OrbitControllerDescriptor, ParticleDescriptor, PerspectiveCameraDescriptor, PointsDescriptor, PointsMaterialDescriptor, SceneServiceDescriptor, SpriteDescriptor, SpriteMaterialDescriptor, TextureDescriptor, TransformControllerDescriptor, THREE } from '@vyr/three'
 import { RemoteExecutor as _RemoteExecutor, Job, RemoteProcess } from '@vyr/remote'
 import { checkParentValidity, flyTo, getControllerByService, getGraphics, getTransformEvent, lookAt, resize, updateModelByScheduler, updateOtherUpdateJob } from './utils'
@@ -111,14 +111,13 @@ class RemoteExecutor extends _RemoteExecutor {
         if (descriptor instanceof PerspectiveCameraDescriptor) {
             const controller = getControllerByService(descriptor)
             if (controller === null || controller.orbit === null) return
-            const args = { delta: 0 }
-            const camera = graphics.getActor<NodeActor>(descriptor, args)
+            const camera = graphics.getActor<NodeActor>(descriptor)
             camera.object.updateMatrixWorld(true)
             const forward = camera.object.getWorldDirection(new THREE.Vector3())
             const lookAtPosition = new THREE.Vector3()
                 .copy(camera.object.position)
                 .add(forward.multiplyScalar(1)).negate()
-            const orbitActor = graphics.getActor<OrbitControllerActor>(controller.orbit, args)
+            const orbitActor = graphics.getActor<OrbitControllerActor>(controller.orbit)
             orbitActor.controls.setLookAt(
                 camera.object.position.x,
                 camera.object.position.y,
@@ -260,7 +259,7 @@ class RemoteExecutor extends _RemoteExecutor {
             }
         }
     }
-    onUpdateScheduler(unit: Unit, args: UpdateArgs) {
+    onUpdateScheduler(unit: Unit) {
         const descriptor = Descriptor.get<Descriptor>(unit.uuid)
         const service = cache.transformCollection.getByMap<TransformControllerDescriptor>(descriptor)
             ?? cache.orbitCollection.getByMap<OrbitControllerDescriptor>(descriptor)
@@ -270,12 +269,12 @@ class RemoteExecutor extends _RemoteExecutor {
             window['__VYR_RUNTIME.DISABLED_INPUT'] = false
         }
 
-        super.onUpdateScheduler(unit, args)
+        super.onUpdateScheduler(unit)
     }
 
     enhance(process: RemoteProcess) {
-        super.enhance(process, (scheduler) => {
-            Object.defineProperty(scheduler, 'camera', { get() { return cache.camera.uuid }, set() { } })
+        super.enhance(process, (graphics) => {
+            Object.defineProperty(graphics.scheduler, 'camera', { get() { return cache.camera.uuid }, set() { } })
         })
     }
 

package/src/utils/flyto.ts

@@ -1,16 +1,16 @@
-import { CameraDescriptor, Graphics, Descriptor, NodeDescriptor, ServiceDescriptor, ServiceSchedulerDescriptor, UpdateArgs, Vector3 as _V3 } from "@vyr/engine"
+import { CameraDescriptor, Graphics, Descriptor, NodeDescriptor, ServiceDescriptor, ServiceSchedulerDescriptor, Vector3 as _V3 } from "@vyr/engine"
 import { NodeActor, OrbitControllerActor, OrbitControllerDescriptor, TransformControllerDescriptor, THREE } from "@vyr/three"
 import { RemoteProcess } from "@vyr/remote"
 import { cache } from "../Cache"
 
 const rawVector3 = new THREE.Vector3(0, 0, 0)
 const emptyBox = new THREE.Box3()
-const getBox3 = (descriptor: Descriptor, graphics: Graphics, args: UpdateArgs) => {
+const getBox3 = (descriptor: Descriptor, graphics: Graphics) => {
     const box3 = new THREE.Box3()
     // const ignore: Descriptor[] = []
     // if (instance) ignore.push(instance.orbit, instance.transform)
     descriptor.traverse(sub => {
-        const actor = graphics.getActor<NodeActor<THREE.Object3D>>(sub, args)
+        const actor = graphics.getActor<NodeActor<THREE.Object3D>>(sub)
         if (actor instanceof NodeActor) {
             if (actor.object.visible === false) return true
             box3.expandByObject(actor.object)
@@ -28,13 +28,13 @@ const getControllerByService = (target: Descriptor) => {
     }
     return null
 }
-const getFlyInfo = (descriptor: Descriptor, graphics: Graphics, args: UpdateArgs) => {
-    const box3 = getBox3(descriptor, graphics, args)
+const getFlyInfo = (descriptor: Descriptor, graphics: Graphics) => {
+    const box3 = getBox3(descriptor, graphics)
 
     if (box3.equals(emptyBox)) return null
 
     const sphere = box3.getBoundingSphere(new THREE.Sphere())
-    const cameraActor = graphics.getActor<NodeActor<THREE.PerspectiveCamera>>(cache.camera, args)
+    const cameraActor = graphics.getActor<NodeActor<THREE.PerspectiveCamera>>(cache.camera)
 
     const fov = THREE.MathUtils.degToRad(cameraActor.object.fov)
     const fovHorizontal = 2 * Math.atan(Math.tan(fov / 2) * cameraActor.object.aspect)
@@ -53,15 +53,15 @@ const getFlyInfo = (descriptor: Descriptor, graphics: Graphics, args: UpdateArgs
         lookAt: sphere.center
     }
 }
-const flyToTarget = (descriptor: Descriptor, graphics: Graphics, args: UpdateArgs, orbit: OrbitControllerDescriptor | null) => {
-    const flyInfo = getFlyInfo(descriptor, graphics, args)
+const flyToTarget = (descriptor: Descriptor, graphics: Graphics, orbit: OrbitControllerDescriptor | null) => {
+    const flyInfo = getFlyInfo(descriptor, graphics)
     if (flyInfo === null) return
 
     cache.camera.position.set(flyInfo.position.x, flyInfo.position.y, flyInfo.position.z)
     cache.camera.setNeedsUpdate()
     if (!orbit) return
 
-    const orbitActor = graphics.getActor<OrbitControllerActor>(orbit, args)
+    const orbitActor = graphics.getActor<OrbitControllerActor>(orbit)
     orbitActor.controls.setLookAt(
         flyInfo.position.x,
         flyInfo.position.y,
@@ -85,17 +85,16 @@ const flyTo = (uuid: string, process: RemoteProcess) => {
     }
 
     const graphics = process.engine.getGraphics(process.scheduler)
-    const args = { delta: 0 }
 
     if (services.length === 0) {
         const controller = getControllerByService(descriptor)
         if (controller === null) return
-        flyToTarget(descriptor, graphics, args, controller.orbit)
+        flyToTarget(descriptor, graphics, controller.orbit)
     } else {
         for (const service of services) {
             const controller = getControllerByService(service)
             if (controller === null) return
-            flyToTarget(descriptor, graphics, args, controller.orbit)
+            flyToTarget(descriptor, graphics, controller.orbit)
         }
     }
 }

package/src/utils/index.ts

@@ -58,7 +58,7 @@ const resize = (process: RemoteProcess) => {
         const graphics = process.engine.getGraphics(process.scheduler)
         if (graphics == null) return
         const interpreter = graphics.getInterpreter(cache.camera)
-        const actor = interpreter.getActor<NodeActor<THREE.PerspectiveCamera>>(cache.camera, { delta: 0 })
+        const actor = interpreter.getActor<NodeActor<THREE.PerspectiveCamera>>(cache.camera)
         actor.object.aspect = process.engine.DOM.clientWidth / process.engine.DOM.clientHeight
         actor.object.updateProjectionMatrix()
     }
@@ -67,13 +67,12 @@ const resize = (process: RemoteProcess) => {
 const lookAt = (target: Descriptor, process: RemoteProcess) => {
     const controller = getControllerByService(target)
     if (controller === null) return
-    const args = { delta: 0 }
     const graphics = process.engine.getGraphics(process.scheduler)
-    const flyInfo = getFlyInfo(target, graphics, args)
+    const flyInfo = getFlyInfo(target, graphics)
     if (flyInfo === null) return
     if (!controller.orbit) return
 
-    const orbitActor = graphics.getActor<OrbitControllerActor>(controller.orbit, args)
+    const orbitActor = graphics.getActor<OrbitControllerActor>(controller.orbit)
     orbitActor.controls.setTarget(
         flyInfo.lookAt.x,
         flyInfo.lookAt.y,

package/src/utils/update.ts

@@ -19,9 +19,8 @@ const updateAnimationAction = async (uuid: string, url: string, process: RemoteP
 
 const updateSceneService = (target: SceneServiceDescriptor, deserialization: DeserializationObject<SceneServiceDescriptor>, process: RemoteProcess) => {
     if (target.shadowMapType === deserialization.shadowMapType) return
-    const args = { delta: 0 }
     const graphics = process.engine.getGraphics(process.scheduler)
-    const actor = graphics.getActor<SceneServiceActor>(target, args)
+    const actor = graphics.getActor<SceneServiceActor>(target)
     if (actor === null) return
     actor.pipeline.resetState()
     actor.scene.traverse(sub => {
@@ -64,11 +63,10 @@ const updateModelByScheduler = (scheduler: ServiceSchedulerDescriptor, process:
 
 const updateTexture = (target: TextureDescriptor, deserialization: DeserializationObject<TextureDescriptor>, process: RemoteProcess) => {
     if (target.url === deserialization.url) return
-    const args = { delta: 0 }
     const graphics = process.engine.getGraphics(process.scheduler)
     const unit = graphics.getUnit(target.uuid)
     if (unit === null) return
-    graphics.doFree(unit, args)
+    graphics.doFree(unit)
     graphics.addRoot(unit.queue.url, target)
     observer.trigger('updateDeps', { self: target.uuid })
 }