@vyr/engine 0.0.19 → 0.0.20

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@vyr/engine",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@vyr/locale": "0.0.19",
+    "@vyr/locale": "0.0.20",
     "tinycolor2": "1.6.0"
   },
   "devDependencies": {

package/src/asset/Asset.ts

@@ -1,7 +1,7 @@
 import { language } from "../locale"
 import { Category } from "../Category"
 import { AsyncTask } from "../AsyncTask"
-import { DatasetDescriptor, Descriptor, ServiceSchedulerDescriptor } from "../descriptor"
+import { Descriptor, ServiceSchedulerDescriptor } from "../descriptor"
 import { InteractionDescriptor, Scriptable, ScriptableArgs } from "../interaction"
 import { AssetGraph } from "./AssetGraph"
 import { Engine } from "../Engine"
@@ -239,14 +239,7 @@ Asset.register(Category.texture, factoryDescriptor)
 Asset.register(Category.prefab, factoryDescriptor)
 Asset.register(Category.interaction, factoryDescriptor)
 Asset.register(Category.scene, factoryDescriptor)
-
-const factoryDataset = async (url: string) => {
-    const asset = await factoryDescriptor(url) as DatasetDescriptor
-    // if (asset.auto) await asset.fetch()
-
-    return asset
-}
-Asset.register(Category.dataset, factoryDataset)
+Asset.register(Category.dataset, factoryDescriptor)
 
 const factoryJson = async (url: string) => {
     const res = await Asset.fetch(Asset.joinUrl(url))

package/src/interaction/Scriptable.ts

@@ -28,6 +28,10 @@ class Scriptable<T extends ScriptableArgs<any, any, any> = ScriptableArgs> {
         this.uuid = url
     }
 
+    getInputValue(key: string, input: ScriptableInput) {
+        return input?.user?.[key]?.value ?? input.default[key].value
+    }
+
     /**脚本的准备事件，该方法在脚本被实例化后立即执行
      * 
      * 一般在该事件中进行脚本的准备工作，如从服务端获取资源或数据

package/src/preset/execute/dataset/update.ts

@@ -9,7 +9,7 @@ const scriptable = Asset.createVirtualUrl('preset/dataset/update.ts')
 class ExecuteScriptable extends Scriptable {
     async execute(graphics: Graphics, args: ScriptableArgs) {
         const { input, result } = args
-        const dataset = input?.user?.dataset.value ?? input.default.dataset.value
+        const dataset = this.getInputValue('dataset', input)
 
         const previous = result.get(input.previous)
         const datasetDescriptor = Asset.get<DatasetDescriptor>(dataset)

package/src/preset/execute/graphics/invoke.ts

@@ -8,8 +8,8 @@ const scriptable = Asset.createVirtualUrl('preset/graphics/invoke.ts')
 class ExecuteScriptable extends Scriptable {
     async execute(graphics: Graphics, args: ScriptableArgs) {
         const { input } = args
-        const interaction = input?.user?.interaction.value ?? input.default.interaction.value
-        const target = input?.user?.target.value ?? input.default.target.value
+        const interaction = this.getInputValue('interaction', input)
+        const target = this.getInputValue('target', input)
         const targetDescriptor = Descriptor.get<Descriptor>(target)
         if (interaction && targetDescriptor) {
             graphics.invoke(interaction, targetDescriptor)

package/src/preset/execute/net/http.ts

@@ -22,9 +22,9 @@ class ExecuteScriptable extends Scriptable {
 
     async execute(graphics: Graphics, args: ScriptableArgs) {
         const { input, result } = args
-        let url = input?.user?.url.value ?? input.default.url.value
-        const type: string = input?.user?.type.value ?? input.default.type.value
-        const data: string = input?.user?.data.value ?? input.default.data.value
+        let url = this.getInputValue('url', input)
+        const type = this.getInputValue('type', input)
+        const data = this.getInputValue('data', input)
 
         const requestData: { [k: string]: any } = {}
         const keys: string[] = []

package/src/preset/execute/scheduler/switch.ts

@@ -7,7 +7,7 @@ import { Graphics } from "../../../graphics";
 const scriptable = Asset.createVirtualUrl('preset/scheduler/switch.ts')
 class ExecuteScriptable extends Scriptable {
     async execute(graphics: Graphics, args: ScriptableArgs) {
-        const scene = args.input?.user?.scene.value
+        const scene = this.getInputValue('scene', args.input)
         if (!scene) return
         await Asset.loadAll(scene)
         await Asset.compileDataset(scene, graphics.engine)

package/src/utils/AssetProvider.ts

@@ -1,5 +1,5 @@
 import { InteractionDescriptor, InteractionNode, InteractionProperty } from "../interaction"
-import { Descriptor, DynamicDescriptor, PrefabInstanceDescriptor, HTMLDescriptor, StyleDescriptor } from "../descriptor"
+import { Descriptor, DynamicDescriptor, PrefabInstanceDescriptor, HTMLDescriptor, StyleDescriptor, DatasetDescriptor, DivDescriptor } from "../descriptor"
 import { AssetGraph, Port } from "../asset"
 import { Category } from "../Category"
 
@@ -37,6 +37,18 @@ const DescriptorProvider = (descriptor: Descriptor, port: Port) => {
     if (descriptor.dataset) port.edges.push({ key: 'dataset', category: Category.dataset, asset: descriptor.dataset })
 }
 
+const DatasetDescriptorProvider = (descriptor: DatasetDescriptor, port: Port) => {
+    if (descriptor.dataConfigs.length > 0) {
+        for (let i = 0; i < descriptor.dataConfigs.length; i++) {
+            const dataConfig = descriptor.dataConfigs[i]
+            if (dataConfig.url && dataConfig.url.startsWith('/') && dataConfig.url.endsWith('.json')) {
+                port.edges.push({ key: `dataConfig[${i}].url`, category: Category.json, asset: dataConfig.url })
+            }
+        }
+    }
+    if (descriptor.dataset) port.edges.push({ key: 'dataset', category: Category.dataset, asset: descriptor.dataset })
+}
+
 const StyleDescriptorProvider = (descriptor: StyleDescriptor, port: Port) => {
     if (descriptor.inherit) port.edges.push({ key: 'inherit', category: Category.style, asset: descriptor.inherit })
 }
@@ -57,6 +69,10 @@ const HTMLDescriptorProvider = (descriptor: HTMLDescriptor, port: Port) => {
     if (descriptor.style) port.edges.push({ key: 'style', category: Category.style, asset: descriptor.style })
 }
 
+const DivDescriptorProvider = (descriptor: DivDescriptor, port: Port) => {
+    if (descriptor.backroundIamge) port.edges.push({ key: 'backroundIamge', category: Category.image, asset: descriptor.backroundIamge })
+}
+
 const DynamicDescriptorProvider = (descriptor: DynamicDescriptor, port: Port) => {
     if (descriptor.url) port.edges.push({ key: 'url', category: Category.prefab, asset: descriptor.url })
 }
@@ -66,8 +82,10 @@ const PrefabInstanceDescriptorProvider = (descriptor: PrefabInstanceDescriptor,
 }
 
 AssetGraph.register(Descriptor.type, DescriptorProvider)
+AssetGraph.register(DatasetDescriptor.type, DatasetDescriptorProvider)
 AssetGraph.register(StyleDescriptor.type, StyleDescriptorProvider)
 AssetGraph.register(InteractionDescriptor.type, InteractionDescriptorProvider)
 AssetGraph.register(HTMLDescriptor.type, HTMLDescriptorProvider)
+AssetGraph.register(DivDescriptor.type, DivDescriptorProvider)
 AssetGraph.register(DynamicDescriptor.type, DynamicDescriptorProvider)
 AssetGraph.register(PrefabInstanceDescriptor.type, PrefabInstanceDescriptorProvider)