@vyr/three 0.0.1 → 0.0.2

package/src/preset/execute/GeoMap/drilldown.ts

@@ -1,11 +1,10 @@
-import { Asset, Descriptor, Graphics, RoutineNode, Scriptable, UpdateArgs } from "@vyr/engine"
+import { Asset, Graphics, InteractionNode, Scriptable, ScriptableArgs } from "@vyr/engine"
 import { language } from '../../../locale'
 import { GeoMapDescriptor } from "../../../descriptor"
 
 const scriptable = Asset.createVirtualUrl('preset/GeoMap/drilldown.ts')
-class RoutineScriptable extends Scriptable {
-    async execute(descriptor: Descriptor, graphics: Graphics, args: UpdateArgs) {
-        //@ts-ignore
+class InteractionScriptable extends Scriptable {
+    async execute(graphics: Graphics, args: ScriptableArgs) {
         const { dataset, geoMap } = args.input.user
 
         const data = dataset.value.getData()
@@ -29,7 +28,7 @@ class RoutineScriptable extends Scriptable {
         }
     }
 }
-Asset.provider(scriptable, async () => ({ default: RoutineScriptable }))
+Asset.provider(scriptable, async () => ({ default: InteractionScriptable }))
 
 const createExecuteInput = (args: any = {}) => {
     const input = {
@@ -41,11 +40,11 @@ const createExecuteInput = (args: any = {}) => {
 }
 
 const createExecuteNode = (options: { id: string; position?: any; input?: any }) => {
-    const executeNode: RoutineNode = {
+    const executeNode: InteractionNode = {
         id: options.id,
         label: language.get(scriptable as any),
         position: { x: options?.position?.x ?? 20, y: options?.position?.y ?? 20 },
-        routine: 'Execute',
+        interaction: 'Execute',
         url: scriptable,
         input: createExecuteInput(options.input)
     }

package/src/preset/index.ts

@@ -1,7 +1,7 @@
 import * as executePreset from './execute'
-import * as routinePreset from './routine'
+import * as interactionPreset from './interaction'
 
 export {
     executePreset,
-    routinePreset
+    interactionPreset
 }

package/src/preset/interaction/GeoMap/drilldown.ts

@@ -0,0 +1,26 @@
+import { Asset, InteractionDescriptor } from "@vyr/engine"
+import { GeoMap } from "../../execute"
+
+const url = Asset.createVirtualUrl('preset/GeoMap/drilldown.interaction.json')
+const nodes = {
+    drilldown: 'drilldown',
+}
+let _currentInteraction: InteractionDescriptor | null = null
+const interactionProvider = async () => {
+    if (_currentInteraction === null) {
+        _currentInteraction = new InteractionDescriptor()
+        const drilldownNode = GeoMap.drilldown.createExecuteNode({ id: nodes.drilldown })
+        _currentInteraction.addNode([drilldownNode])
+        _currentInteraction.roots.push(drilldownNode.id)
+    }
+    return _currentInteraction
+}
+
+Asset.provider(url, interactionProvider)
+
+export {
+    url,
+    nodes,
+}
+
+

package/src/utils/geometry/index.ts

@@ -1,5 +1,5 @@
 import { Box3, BufferGeometry, Vector2, Vector3 } from 'three'
-import { Asset, Graphics, JsonAsset, UpdateArgs, Vector2 as V2 } from '@vyr/engine'
+import { Asset, Graphics, JsonAsset, Vector2 as V2 } from '@vyr/engine'
 import { ExtrudeGeometryDescriptor } from '../../descriptor'
 import { GeometryActor } from '../../actor'
 
@@ -63,12 +63,12 @@ const defaultGeometry = () => {
     return _geometry
 }
 
-const getGeometry = (geometry: string, graphics: Graphics, args: UpdateArgs) => {
+const getGeometry = (geometry: string, graphics: Graphics) => {
     const geometryDescriptor = Asset.get(geometry)
     if (geometryDescriptor === null) return defaultGeometry()
 
     const interpreter = graphics.getInterpreter(geometryDescriptor)
-    const actor = interpreter.getActor<GeometryActor<BufferGeometry>>(geometryDescriptor, args)
+    const actor = interpreter.getActor<GeometryActor<BufferGeometry>>(geometryDescriptor)
     return actor.object instanceof BufferGeometry ? actor.object : defaultGeometry()
 }
 

package/src/utils/material/index.ts

@@ -1,5 +1,5 @@
 import { Material, MeshBasicMaterial } from 'three'
-import { Asset, AssetPropertyCollection, Category, Graphics, Port, UpdateArgs } from '@vyr/engine'
+import { Asset, AssetPropertyCollection, Category, Graphics, Port } from '@vyr/engine'
 import { MaterialActor } from '../../actor'
 
 let _material: Material | null = null
@@ -10,22 +10,22 @@ const defaultMaterial = () => {
     return _material
 }
 
-const useMaterial = (material: string, graphics: Graphics, args: UpdateArgs) => {
+const useMaterial = (material: string, graphics: Graphics) => {
     const materialDescriptor = Asset.get(material)
     if (materialDescriptor === null) return defaultMaterial()
 
     const interpreter = graphics.getInterpreter(materialDescriptor)
-    const actor = interpreter.getActor<MaterialActor<Material>>(materialDescriptor, args)
+    const actor = interpreter.getActor<MaterialActor<Material>>(materialDescriptor)
     return actor.object instanceof Material ? actor.object : defaultMaterial()
 }
 
-const getMaterial = (materialValue: string | AssetPropertyCollection, graphics: Graphics, args: UpdateArgs) => {
+const getMaterial = (materialValue: string | AssetPropertyCollection, graphics: Graphics) => {
     if (typeof materialValue === 'string') {
-        return useMaterial(materialValue, graphics, args)
+        return useMaterial(materialValue, graphics)
     } else {
         const materials: Material[] = []
         for (const material of materialValue) {
-            const actor = useMaterial(material.url, graphics, args)
+            const actor = useMaterial(material.url, graphics)
             materials.push(actor)
         }
         return materials

package/src/utils/texture/index.ts

@@ -1,13 +1,13 @@
 import { Material } from 'three'
-import { Asset, Descriptor, Graphics, UpdateArgs } from '@vyr/engine'
+import { Asset, Descriptor, Graphics } from '@vyr/engine'
 import { TextureDescriptor } from '../../descriptor'
 import { TextureActor } from '../../actor'
 
-const setMap = <T extends Descriptor = Descriptor>(material: Material, key: keyof T, descriptor: T, graphics: Graphics, args: UpdateArgs) => {
+const setMap = <T extends Descriptor = Descriptor>(material: Material, key: keyof T, descriptor: T, graphics: Graphics) => {
     const value = descriptor[key] as string
     const texture = Asset.get(value)
     if (texture instanceof TextureDescriptor) {
-        const textureActor = graphics.getActor<TextureActor>(texture, args)
+        const textureActor = graphics.getActor<TextureActor>(texture)
         //@ts-ignore
         material[key] = textureActor.object
     } else {

package/src/preset/routine/GeoMap/drilldown.ts

@@ -1,26 +0,0 @@
-import { Asset, RoutineDescriptor } from "@vyr/engine"
-import { GeoMap } from "../../execute"
-
-const url = Asset.createVirtualUrl('preset/GeoMap/drilldown.routine.json')
-const nodes = {
-    drilldown: 'drilldown',
-}
-let _currentRoutine: RoutineDescriptor | null = null
-const routineProvider = async () => {
-    if (_currentRoutine === null) {
-        _currentRoutine = new RoutineDescriptor()
-        const drilldownNode = GeoMap.drilldown.createExecuteNode({ id: nodes.drilldown })
-        _currentRoutine.addNode([drilldownNode])
-        _currentRoutine.roots.push(drilldownNode.id)
-    }
-    return _currentRoutine
-}
-
-Asset.provider(url, routineProvider)
-
-export {
-    url,
-    nodes,
-}
-
-