@vyr/three-browser 0.0.33 → 0.0.35

package/src/service/inspector/material/ShaderMaterialViewer.vue

@@ -10,7 +10,7 @@
 <script lang="ts" setup>
 import { Ref, ref, watch } from 'vue'
 import { Descriptor } from '@vyr/engine';
-import { ShaderMaterialDescriptor } from '@vyr/three';
+import { ShaderMaterial } from '@vyr/three';
 import { VyrCard, } from '@vyr/design';
 import { BaseFragment, providerDescriptor as builtinProviderDescriptor } from '@vyr/builtin'
 import { language } from '../../../locale'
@@ -20,10 +20,10 @@ import ShaderMaterialFragment from '../../../fragment/material/ShaderMaterialFra
 
 const props = defineProps<{ raw: string, uuid: string }>()
 
-const descriptor = ref(null) as Ref<ShaderMaterialDescriptor | null>
+const descriptor = ref(null) as Ref<ShaderMaterial | null>
 const watchEditItem = (cur: string) => {
     if (!cur) return descriptor.value = null
-    descriptor.value = Descriptor.get<ShaderMaterialDescriptor>(cur)
+    descriptor.value = Descriptor.get<ShaderMaterial>(cur)
 }
 watch(() => props.uuid, watchEditItem, { immediate: true })
 

package/src/service/inspector/material/ShadowMaterialViewer.vue

@@ -10,7 +10,7 @@
 <script lang="ts" setup>
 import { Ref, ref, watch } from 'vue'
 import { Descriptor } from '@vyr/engine';
-import { ShadowMaterialDescriptor } from '@vyr/three';
+import { ShadowMaterial } from '@vyr/three';
 import { VyrCard, } from '@vyr/design';
 import { BaseFragment, providerDescriptor as builtinProviderDescriptor } from '@vyr/builtin'
 import { language } from '../../../locale'
@@ -20,10 +20,10 @@ import ShadowMaterialFragment from '../../../fragment/material/ShadowMaterialFra
 
 const props = defineProps<{ raw: string, uuid: string }>()
 
-const descriptor = ref(null) as Ref<ShadowMaterialDescriptor | null>
+const descriptor = ref(null) as Ref<ShadowMaterial | null>
 const watchEditItem = (cur: string) => {
     if (!cur) return descriptor.value = null
-    descriptor.value = Descriptor.get<ShadowMaterialDescriptor>(cur)
+    descriptor.value = Descriptor.get<ShadowMaterial>(cur)
 }
 watch(() => props.uuid, watchEditItem, { immediate: true })
 

package/src/service/inspector/material/SpriteMaterialViewer.vue

@@ -10,7 +10,7 @@
 <script lang="ts" setup>
 import { Ref, ref, watch } from 'vue'
 import { Descriptor } from '@vyr/engine';
-import { SpriteMaterialDescriptor } from '@vyr/three';
+import { SpriteMaterial } from '@vyr/three';
 import { VyrCard, } from '@vyr/design';
 import { BaseFragment, providerDescriptor as builtinProviderDescriptor } from '@vyr/builtin'
 import { language } from '../../../locale'
@@ -20,10 +20,10 @@ import SpriteMaterialFragment from '../../../fragment/material/SpriteMaterialFra
 
 const props = defineProps<{ raw: string, uuid: string }>()
 
-const descriptor = ref(null) as Ref<SpriteMaterialDescriptor | null>
+const descriptor = ref(null) as Ref<SpriteMaterial | null>
 const watchEditItem = (cur: string) => {
     if (!cur) return descriptor.value = null
-    descriptor.value = Descriptor.get<SpriteMaterialDescriptor>(cur)
+    descriptor.value = Descriptor.get<SpriteMaterial>(cur)
 }
 watch(() => props.uuid, watchEditItem, { immediate: true })
 

package/src/service/inspector/texture/TextureViewer.vue

@@ -9,7 +9,7 @@
 <script lang="ts" setup>
 import { Ref, ref, watch } from 'vue'
 import { Descriptor } from '@vyr/engine';
-import { MeshBasicMaterialDescriptor } from '@vyr/three';
+import { MeshBasicMaterial } from '@vyr/three';
 import { VyrCard } from '@vyr/design';
 import { BaseFragment, providerDescriptor as builtinProviderDescriptor } from '@vyr/builtin'
 import { language } from '../../../locale'
@@ -18,10 +18,10 @@ import TextureFragment from '../../../fragment/texture/TextureFragment.vue';
 
 const props = defineProps<{ raw: string, uuid: string }>()
 
-const descriptor = ref(null) as Ref<MeshBasicMaterialDescriptor | null>
+const descriptor = ref(null) as Ref<MeshBasicMaterial | null>
 const watchEditItem = (cur: string) => {
     if (!cur) return descriptor.value = null
-    descriptor.value = Descriptor.get<MeshBasicMaterialDescriptor>(cur)
+    descriptor.value = Descriptor.get<MeshBasicMaterial>(cur)
 }
 watch(() => props.uuid, watchEditItem, { immediate: true })
 

package/src/service/sidebar/asset/action/AddAnimationAction.ts

@@ -1,12 +1,12 @@
-import { AnimationUnitDescriptor, Descriptor } from "@vyr/engine";
+import { AnimationUnit, Descriptor } from "@vyr/engine";
 import { Action, DataService, runtime } from "@vyr/runtime";
 import { sidebar } from '@vyr/builtin'
 import { AssetService } from "@vyr/service-asset";
-import { AnimationActionDescriptor, ModelDescriptor } from "@vyr/three";
+import { AnimationAction, Model } from "@vyr/three";
 import { language } from '../../../../locale'
 
-class AddAnimationAction extends Action {
-    static id = 'sidebar.asset.AddAnimation'
+export class AddAnimationAction extends Action {
+    static id = 'sidebar.AddAnimation'
     static generate = (label: string, Class: typeof Descriptor) => {
         class ClassAction extends Action {
             static id = Class.type
@@ -15,11 +15,9 @@ class AddAnimationAction extends Action {
                 this.show = false
                 this.disabled = true
                 const dataService = runtime.get<DataService>('data')
-                const navigator = dataService.sidebar.get<sidebar.asset.AssetNavigator>(AssetService.key)
-                if (navigator.status.mouseItem === null) return
                 this.show = true
-                if (Class.type === AnimationActionDescriptor.type) {
-                    if ((navigator.status.mouseItem instanceof ModelDescriptor) === false) return
+                if (Class.type === AnimationAction.type) {
+                    if ((dataService.sidebar.status.mouseItem instanceof Model) === false) return
                 }
                 this.disabled = false
             }
@@ -28,32 +26,25 @@ class AddAnimationAction extends Action {
             }
             execute() {
                 const dataService = runtime.get<DataService>('data')
-                const navigator = dataService.sidebar.get<sidebar.asset.AssetNavigator>(AssetService.key)
-                navigator.status.modifyMode = 'add'
-                navigator.status.modifyContent = new Class({})
-                navigator.status.modifyValue = navigator.status.mouseItem
+                dataService.sidebar.status.modifyMode = 'add'
+                dataService.sidebar.status.modifyContent = new Class({})
+                dataService.sidebar.status.modifyValue = dataService.sidebar.status.mouseItem
             }
         }
         return new ClassAction()
     }
-    label = language.get('sidebar.asset.action.AddAnimation.label')
+    label = language.get('sidebar.action.AddAnimation.label')
     order = 2
     children = [
-        AddAnimationAction.generate(language.get('descriptor.type.AnimationUnit'), AnimationUnitDescriptor),
-        AddAnimationAction.generate(language.get('descriptor.type.AnimationAction'), AnimationActionDescriptor),
+        AddAnimationAction.generate(language.get('descriptor.type.AnimationUnit'), AnimationUnit),
+        AddAnimationAction.generate(language.get('descriptor.type.AnimationAction'), AnimationAction),
     ]
-    active() {
-        const dataService = runtime.get<DataService>('data')
 
-        return dataService.sidebar.active === AssetService.key
-    }
     update() {
         this.show = false
         this.disabled = true
         const dataService = runtime.get<DataService>('data')
-        const navigator = dataService.sidebar.get<sidebar.asset.AssetNavigator>(AssetService.key)
-        if (navigator.status.mouseItem === null) return
-        if (navigator.status.mouseItem === navigator.root) return
+        if (dataService.sidebar.status.mouseItem === dataService.sidebar.root) return
 
         this.show = true
         this.disabled = false
@@ -62,6 +53,4 @@ class AddAnimationAction extends Action {
         return false
     }
     execute() { }
-}
-
-export { AddAnimationAction }
+}

package/src/service/sidebar/asset/action/AddLightAction.ts

@@ -2,11 +2,11 @@ import { Descriptor } from "@vyr/engine";
 import { Action, DataService, runtime } from "@vyr/runtime";
 import { sidebar } from '@vyr/builtin'
 import { AssetService } from "@vyr/service-asset";
-import { AmbientLightDescriptor, DirectionalLightDescriptor, HemisphereLightDescriptor, PointLightDescriptor, RectAreaLightDescriptor, SpotLightDescriptor } from "@vyr/three";
+import { AmbientLight, DirectionalLight, HemisphereLight, PointLight, RectAreaLight, SpotLight } from "@vyr/three";
 import { language } from '../../../../locale'
 
-class AddLightAction extends Action {
-    static id = 'sidebar.asset.AddLight'
+export class AddLightAction extends Action {
+    static id = 'sidebar.AddLight'
     static generate = (label: string, Class: typeof Descriptor) => {
         class ClassAction extends Action {
             static id = `sidebar.${Class.type}`
@@ -15,8 +15,7 @@ class AddLightAction extends Action {
                 this.disabled = true
                 this.show = true
                 const dataService = runtime.get<DataService>('data')
-                const navigator = dataService.sidebar.get<sidebar.asset.AssetNavigator>(AssetService.key)
-                if (navigator.status.mouseItem === null) return
+                if (dataService.sidebar.status.mouseItem === null) return
                 this.disabled = false
             }
             validator() {
@@ -24,36 +23,30 @@ class AddLightAction extends Action {
             }
             execute() {
                 const dataService = runtime.get<DataService>('data')
-                const navigator = dataService.sidebar.get<sidebar.asset.AssetNavigator>(AssetService.key)
-                navigator.status.modifyMode = 'add'
-                navigator.status.modifyContent = new Class()
-                navigator.status.modifyValue = navigator.status.mouseItem
+                dataService.sidebar.status.modifyMode = 'add'
+                dataService.sidebar.status.modifyContent = new Class()
+                dataService.sidebar.status.modifyValue = dataService.sidebar.status.mouseItem
             }
         }
         return new ClassAction()
     }
-    label = language.get('sidebar.asset.action.AddLight.label')
+    label = language.get('sidebar.action.AddLight.label')
     order = 2
     children = [
-        AddLightAction.generate(language.get('descriptor.type.BoxGeometry'), AmbientLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.BoxGeometry'), DirectionalLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.BoxGeometry'), HemisphereLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.BoxGeometry'), PointLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.BoxGeometry'), RectAreaLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.BoxGeometry'), SpotLightDescriptor),
+        AddLightAction.generate(language.get('descriptor.type.AmbientLight'), AmbientLight),
+        AddLightAction.generate(language.get('descriptor.type.DirectionalLight'), DirectionalLight),
+        AddLightAction.generate(language.get('descriptor.type.HemisphereLight'), HemisphereLight),
+        AddLightAction.generate(language.get('descriptor.type.PointLight'), PointLight),
+        AddLightAction.generate(language.get('descriptor.type.RectAreaLight'), RectAreaLight),
+        AddLightAction.generate(language.get('descriptor.type.SpotLight'), SpotLight),
     ]
-    active() {
-        const dataService = runtime.get<DataService>('data')
 
-        return dataService.sidebar.active === AssetService.key
-    }
     update() {
         this.show = false
         this.disabled = true
         const dataService = runtime.get<DataService>('data')
-        const navigator = dataService.sidebar.get<sidebar.asset.AssetNavigator>(AssetService.key)
-        if (navigator.status.mouseItem === null) return
-        if (navigator.status.mouseItem === navigator.root) return
+        if (dataService.sidebar.status.mouseItem === null) return
+        if (dataService.sidebar.status.mouseItem === dataService.sidebar.root) return
 
         this.show = true
         this.disabled = false
@@ -62,6 +55,4 @@ class AddLightAction extends Action {
         return false
     }
     execute() { }
-}
-
-export { AddLightAction }
+}

package/src/service/global/scripts/index.ts

@@ -1,22 +0,0 @@
-import { option } from "@vyr/builtin";
-import { language, executePreset } from "@vyr/three";
-
-const scripts = [
-    {
-        label: language.get(executePreset.GeoMap.drilldown.scriptable as any),
-        value: executePreset.GeoMap.drilldown.scriptable,
-        getDefaultInput: executePreset.GeoMap.drilldown.createExecuteInput,
-        getPropertyOptions: () => {
-            return {
-                dataset: () => {
-                    const { datasets } = option.Preset.getSelectOptions()
-                    return datasets
-                }
-            }
-        }
-    },
-]
-
-export {
-    scripts
-}

package/src/service/sidebar/scene/action/AddAnimationAction.ts

@@ -1,65 +0,0 @@
-import { AnimationUnitDescriptor, Descriptor } from "@vyr/engine";
-import { Action, DataService, runtime } from "@vyr/runtime";
-import { sidebar } from '@vyr/builtin'
-import { AnimationActionDescriptor, ModelDescriptor } from "@vyr/three";
-import { SceneService } from "@vyr/service-scene"
-import { language } from '../../../../locale'
-
-class AddAnimationAction extends Action {
-    static id = 'sidebar.scene.AddAnimation'
-    static generate = (label: string, Class: typeof Descriptor) => {
-        class ClassAction extends Action {
-            static id = Class.type
-            label = label
-            update() {
-                this.show = false
-                this.disabled = true
-                const dataService = runtime.get<DataService>('data')
-                const navigator = dataService.sidebar.get<sidebar.scene.SceneNavigator>(SceneService.key)
-                if (navigator.status.mouseItem === null) return
-                this.show = true
-                if (Class.type === AnimationActionDescriptor.type) {
-                    if ((navigator.status.mouseItem instanceof ModelDescriptor) === false) return
-                }
-                this.disabled = false
-            }
-            validator() {
-                return false
-            }
-            execute() {
-                const dataService = runtime.get<DataService>('data')
-                const navigator = dataService.sidebar.get<sidebar.scene.SceneNavigator>(SceneService.key)
-                navigator.status.modifyMode = 'add'
-                navigator.status.modifyContent = new Class({})
-                navigator.status.modifyValue = navigator.status.mouseItem
-            }
-        }
-        return new ClassAction()
-    }
-    label = language.get('sidebar.scene.action.AddAnimation.label')
-    order = 2
-    children = [
-        AddAnimationAction.generate(language.get('descriptor.type.AnimationUnit'), AnimationUnitDescriptor),
-        AddAnimationAction.generate(language.get('descriptor.type.AnimationAction'), AnimationActionDescriptor),
-    ]
-    active() {
-        const dataService = runtime.get<DataService>('data')
-
-        return dataService.sidebar.active === SceneService.key
-    }
-    update() {
-        this.show = false
-        this.disabled = true
-        const dataService = runtime.get<DataService>('data')
-        const navigator = dataService.sidebar.get<sidebar.scene.SceneNavigator>(SceneService.key)
-        if (navigator.status.mouseItem === null) return
-        this.show = true
-        this.disabled = false
-    }
-    validator() {
-        return false
-    }
-    execute() { }
-}
-
-export { AddAnimationAction }

package/src/service/sidebar/scene/action/AddLightAction.ts

@@ -1,67 +0,0 @@
-import { Descriptor } from "@vyr/engine";
-import { Action, DataService, runtime } from "@vyr/runtime";
-import { sidebar } from '@vyr/builtin'
-import { AmbientLightDescriptor, DirectionalLightDescriptor, HemisphereLightDescriptor, PointLightDescriptor, RectAreaLightDescriptor, SpotLightDescriptor } from '@vyr/three'
-import { SceneService } from "@vyr/service-scene"
-import { language } from '../../../../locale'
-
-class AddLightAction extends Action {
-    static id = 'sidebar.scene.AddLight'
-    static generate = (label: string, Class: typeof Descriptor) => {
-        class ClassAction extends Action {
-            static id = `sidebar.${Class.type}`
-            label = label
-            update() {
-                this.show = false
-                this.disabled = true
-                const dataService = runtime.get<DataService>('data')
-                const navigator = dataService.sidebar.get<sidebar.scene.SceneNavigator>(SceneService.key)
-                this.show = true
-                if (navigator.status.mouseItem === null) return
-                this.disabled = false
-            }
-            validator() {
-                return false
-            }
-            execute() {
-                const dataService = runtime.get<DataService>('data')
-                const navigator = dataService.sidebar.get<sidebar.scene.SceneNavigator>(SceneService.key)
-                navigator.status.modifyMode = 'add'
-                navigator.status.modifyContent = new Class()
-                navigator.status.modifyValue = navigator.status.mouseItem
-            }
-        }
-        return new ClassAction()
-    }
-    label = language.get('sidebar.scene.action.AddLight.label')
-    order = 2
-    children = [
-        AddLightAction.generate(language.get('descriptor.type.AmbientLight'), AmbientLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.DirectionalLight'), DirectionalLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.HemisphereLight'), HemisphereLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.PointLight'), PointLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.RectAreaLight'), RectAreaLightDescriptor),
-        AddLightAction.generate(language.get('descriptor.type.SpotLight'), SpotLightDescriptor),
-    ]
-    active() {
-        const dataService = runtime.get<DataService>('data')
-
-        return dataService.sidebar.active === SceneService.key
-    }
-    update() {
-        this.show = false
-        this.disabled = true
-        const dataService = runtime.get<DataService>('data')
-        const navigator = dataService.sidebar.get<sidebar.scene.SceneNavigator>(SceneService.key)
-        if (navigator.status.mouseItem === null) return
-
-        this.show = true
-        this.disabled = false
-    }
-    validator() {
-        return false
-    }
-    execute() { }
-}
-
-export { AddLightAction }

package/src/service/sidebar/scene/action/index.ts

@@ -1,7 +0,0 @@
-import { AddLightAction } from "./AddLightAction";
-import { AddAnimationAction } from "./AddAnimationAction";
-
-export default [
-    AddLightAction,
-    AddAnimationAction,
-]