@vyr/three-browser 0.0.32 → 0.0.35

package/src/service/footer/action/geometry/index.ts

@@ -1,10 +1,9 @@
 import { Action, DataService, runtime } from "@vyr/runtime";
-import { Category, Descriptor } from "@vyr/engine";
-import { defineScheme } from '@vyr/service-rpc';
-import { BoxGeometryDescriptor, BufferGeometryDescriptor, CircleGeometryDescriptor, CylinderGeometryDescriptor, ExtrudeGeometryDescriptor, PlaneGeometryDescriptor, RingGeometryDescriptor, SphereGeometryDescriptor, SurfaceGeometryDescriptor, TubeGeometryDescriptor } from "@vyr/three";
+import { Suffix, Descriptor } from "@vyr/engine";
+import { BoxGeometry, BufferGeometry, CircleGeometry, CylinderGeometry, ExtrudeGeometry, PlaneGeometry, RingGeometry, SphereGeometry, SurfaceGeometry, TubeGeometry } from "@vyr/three";
 import { language } from '../../../../locale'
 
-class AddGeometryAction extends Action {
+export class AddGeometryAction extends Action {
     static id = 'footer.AddGeometry'
     static generate = (label: string, Class: typeof Descriptor) => {
         class ClassAction extends Action {
@@ -23,7 +22,7 @@ class AddGeometryAction extends Action {
                 dataService.footer.status.modifyMode = 'add'
                 dataService.footer.status.modifyModeAdd = 'file'
                 dataService.footer.status.modifyContent = new Class().serialization()
-                dataService.footer.status.modifySuffix = Category.geometrySuffix
+                dataService.footer.status.modifySuffix = Suffix.geometrySuffix
                 dataService.footer.status.modifyValue = modifyValue
             }
         }
@@ -35,16 +34,16 @@ class AddGeometryAction extends Action {
     constructor() {
         super()
         this.children.push(
-            AddGeometryAction.generate(language.get('descriptor.type.BoxGeometry'), BoxGeometryDescriptor),
-            AddGeometryAction.generate(language.get('descriptor.type.CircleGeometry'), CircleGeometryDescriptor),
-            AddGeometryAction.generate(language.get('descriptor.type.CylinderGeometry'), CylinderGeometryDescriptor),
-            AddGeometryAction.generate(language.get('descriptor.type.PlaneGeometry'), PlaneGeometryDescriptor),
-            AddGeometryAction.generate(language.get('descriptor.type.RingGeometry'), RingGeometryDescriptor),
-            AddGeometryAction.generate(language.get('descriptor.type.SphereGeometry'), SphereGeometryDescriptor),
-            AddGeometryAction.generate(language.get('descriptor.type.ExtrudeGeometry'), ExtrudeGeometryDescriptor),
-            AddGeometryAction.generate(language.get('descriptor.type.SurfaceGeometry'), SurfaceGeometryDescriptor),
-            AddGeometryAction.generate(language.get('descriptor.type.TubeGeometry'), TubeGeometryDescriptor),
-            AddGeometryAction.generate(language.get('descriptor.type.BufferGeometry'), BufferGeometryDescriptor),
+            AddGeometryAction.generate(language.get('descriptor.type.BoxGeometry'), BoxGeometry),
+            AddGeometryAction.generate(language.get('descriptor.type.CircleGeometry'), CircleGeometry),
+            AddGeometryAction.generate(language.get('descriptor.type.CylinderGeometry'), CylinderGeometry),
+            AddGeometryAction.generate(language.get('descriptor.type.PlaneGeometry'), PlaneGeometry),
+            AddGeometryAction.generate(language.get('descriptor.type.RingGeometry'), RingGeometry),
+            AddGeometryAction.generate(language.get('descriptor.type.SphereGeometry'), SphereGeometry),
+            AddGeometryAction.generate(language.get('descriptor.type.ExtrudeGeometry'), ExtrudeGeometry),
+            AddGeometryAction.generate(language.get('descriptor.type.SurfaceGeometry'), SurfaceGeometry),
+            AddGeometryAction.generate(language.get('descriptor.type.TubeGeometry'), TubeGeometry),
+            AddGeometryAction.generate(language.get('descriptor.type.BufferGeometry'), BufferGeometry),
         )
     }
     update() {
@@ -54,10 +53,8 @@ class AddGeometryAction extends Action {
         const dataService = runtime.get<DataService>('data')
         if (dataService.footer.status.mouseRegion === 'directory') {
             if (dataService.footer.status.mouseItem === null) return
-            if (dataService.footer.status.mouseItem.scheme !== defineScheme.static) return
         } else if (dataService.footer.status.mouseRegion === 'manifest') {
             if (dataService.footer.status.mouseItem !== null) return
-            if (dataService.footer.directory.scheme !== defineScheme.static) return
         }
 
         this.show = true
@@ -68,6 +65,4 @@ class AddGeometryAction extends Action {
         return false
     }
     execute() { }
-}
-
-export { AddGeometryAction }
+}

package/src/service/footer/action/material/index.ts

@@ -1,10 +1,9 @@
 import { Action, DataService, runtime } from "@vyr/runtime";
-import { Category, Descriptor } from "@vyr/engine";
-import { defineScheme } from '@vyr/service-rpc'
-import { MeshBasicMaterialDescriptor, MeshPhongMaterialDescriptor, MeshStandardMaterialDescriptor, PointsMaterialDescriptor, ShaderMaterialDescriptor, ShadowMaterialDescriptor, SpriteMaterialDescriptor } from "@vyr/three";
+import { Suffix, Descriptor } from "@vyr/engine";
+import { MeshBasicMaterial, MeshPhongMaterial, MeshStandardMaterial, PointsMaterial, ShaderMaterial, ShadowMaterial, SpriteMaterial } from "@vyr/three";
 import { language } from '../../../../locale'
 
-class AddMaterialAction extends Action {
+export class AddMaterialAction extends Action {
     static id = 'footer.AddMaterial'
     static generate = (label: string, Class: typeof Descriptor) => {
         class ClassAction extends Action {
@@ -23,7 +22,7 @@ class AddMaterialAction extends Action {
                 dataService.footer.status.modifyMode = 'add'
                 dataService.footer.status.modifyModeAdd = 'file'
                 dataService.footer.status.modifyContent = new Class().serialization()
-                dataService.footer.status.modifySuffix = Category.materialSuffix
+                dataService.footer.status.modifySuffix = Suffix.materialSuffix
                 dataService.footer.status.modifyValue = modifyValue
             }
         }
@@ -35,13 +34,13 @@ class AddMaterialAction extends Action {
     constructor() {
         super()
         this.children.push(
-            AddMaterialAction.generate(language.get('descriptor.type.MeshBasicMaterial'), MeshBasicMaterialDescriptor),
-            AddMaterialAction.generate(language.get('descriptor.type.MeshPhongMaterial'), MeshPhongMaterialDescriptor),
-            AddMaterialAction.generate(language.get('descriptor.type.MeshStandardMaterial'), MeshStandardMaterialDescriptor),
-            AddMaterialAction.generate(language.get('descriptor.type.PointsMaterial'), PointsMaterialDescriptor),
-            AddMaterialAction.generate(language.get('descriptor.type.SpriteMaterial'), SpriteMaterialDescriptor),
-            AddMaterialAction.generate(language.get('descriptor.type.ShadowMaterial'), ShadowMaterialDescriptor),
-            AddMaterialAction.generate(language.get('descriptor.type.ShaderMaterial'), ShaderMaterialDescriptor),
+            AddMaterialAction.generate(language.get('descriptor.type.MeshBasicMaterial'), MeshBasicMaterial),
+            AddMaterialAction.generate(language.get('descriptor.type.MeshPhongMaterial'), MeshPhongMaterial),
+            AddMaterialAction.generate(language.get('descriptor.type.MeshStandardMaterial'), MeshStandardMaterial),
+            AddMaterialAction.generate(language.get('descriptor.type.PointsMaterial'), PointsMaterial),
+            AddMaterialAction.generate(language.get('descriptor.type.SpriteMaterial'), SpriteMaterial),
+            AddMaterialAction.generate(language.get('descriptor.type.ShadowMaterial'), ShadowMaterial),
+            AddMaterialAction.generate(language.get('descriptor.type.ShaderMaterial'), ShaderMaterial),
         )
     }
 
@@ -52,10 +51,8 @@ class AddMaterialAction extends Action {
         const dataService = runtime.get<DataService>('data')
         if (dataService.footer.status.mouseRegion === 'directory') {
             if (dataService.footer.status.mouseItem === null) return
-            if (dataService.footer.status.mouseItem.scheme !== defineScheme.static) return
         } else if (dataService.footer.status.mouseRegion === 'manifest') {
             if (dataService.footer.status.mouseItem !== null) return
-            if (dataService.footer.directory.scheme !== defineScheme.static) return
         }
 
         this.show = true
@@ -65,6 +62,4 @@ class AddMaterialAction extends Action {
         return false
     }
     execute() { }
-}
-
-export { AddMaterialAction }
+}

package/src/service/footer/action/texture/index.ts

@@ -1,10 +1,9 @@
 import { runtime, Action, DataService } from '@vyr/runtime'
-import { Category, Descriptor } from '@vyr/engine'
-import { defineScheme } from '@vyr/service-rpc'
-import { TextureDescriptor } from '@vyr/three'
+import { Suffix, Descriptor } from '@vyr/engine'
+import { Texture } from '@vyr/three'
 import { language } from '../../../../locale'
 
-class AddTextureAction extends Action {
+export class AddTextureAction extends Action {
     static id = 'footer.AddTexture'
     static generate = (label: string, Class: typeof Descriptor) => {
         class ClassAction extends Action {
@@ -23,7 +22,7 @@ class AddTextureAction extends Action {
                 dataService.footer.status.modifyMode = 'add'
                 dataService.footer.status.modifyModeAdd = 'file'
                 dataService.footer.status.modifyContent = new Class().serialization()
-                dataService.footer.status.modifySuffix = Category.textureSuffix
+                dataService.footer.status.modifySuffix = Suffix.textureSuffix
                 dataService.footer.status.modifyValue = modifyValue
             }
         }
@@ -35,7 +34,7 @@ class AddTextureAction extends Action {
     constructor() {
         super()
         this.children.push(
-            AddTextureAction.generate(language.get('descriptor.type.Texture'), TextureDescriptor)
+            AddTextureAction.generate(language.get('descriptor.type.Texture'), Texture)
         )
     }
     update() {
@@ -45,10 +44,8 @@ class AddTextureAction extends Action {
         const dataService = runtime.get<DataService>('data')
         if (dataService.footer.status.mouseRegion === 'directory') {
             if (dataService.footer.status.mouseItem === null) return
-            if (dataService.footer.status.mouseItem.scheme !== defineScheme.static) return
         } else if (dataService.footer.status.mouseRegion === 'manifest') {
             if (dataService.footer.status.mouseItem !== null) return
-            if (dataService.footer.directory.scheme !== defineScheme.static) return
         }
 
         this.show = true
@@ -58,6 +55,4 @@ class AddTextureAction extends Action {
         return false
     }
     execute() { }
-}
-
-export { AddTextureAction }
+}

package/src/service/global/index.ts

@@ -1 +0,0 @@
-export * from './scripts'

package/src/service/index.ts

@@ -1,15 +1,13 @@
 import { SetupService } from '@vyr/service'
 import { ShortcutkeyService, InspectorService, runtime, DataService } from '@vyr/runtime'
-import { NodeDescriptor } from '@vyr/engine'
-import { SceneServiceDescriptor, GeoMapDescriptor, HTMLConvertDescriptor, InstancedMeshDescriptor, MeshDescriptor, ModelDescriptor, OrthographicCameraDescriptor, ParticleDescriptor, PerspectiveCameraDescriptor, PointsDescriptor, SpriteDescriptor, TextDescriptor } from '@vyr/three'
+import { Node } from '@vyr/engine'
+import { Scene3DService, GeoMap, HTMLConvert, InstancedMesh, Mesh, Model, OrthographicCamera, Particle, PerspectiveCamera, Points, Sprite, Text3D } from '@vyr/three'
 import { language } from '../locale'
-import sidebarSceneAction from './sidebar/scene/action'
 import sidebarAssetAction from './sidebar/asset/action'
 import inspectorViewer from './inspector'
 import footerAction from './footer/action'
-import * as global from './global'
 
-const setup: SetupService['setup'] = async () => {
+export const setup: SetupService['setup'] = async () => {
     const dataService = runtime.get<DataService>('data')
     const shortcutkeyService = runtime.get<ShortcutkeyService>('shortcutkey')
 
@@ -17,63 +15,38 @@ const setup: SetupService['setup'] = async () => {
     for (const Action of footerAction) footer.add(new Action())
 
     const sidebar = shortcutkeyService.get('sidebar')
-    const collection = [...sidebarSceneAction, ...sidebarAssetAction]
+    const collection = [...sidebarAssetAction]
     for (const Action of collection) sidebar.add(new Action())
 
-    const addServiceAction = sidebar.get('sidebar.scene.AddService')
+    const addServiceAction = sidebar.get('sidebar.AddService')
     if (addServiceAction) {
         //@ts-ignore
         const generate = addServiceAction.generate
         addServiceAction.children.push(
-            generate(language.get('descriptor.type.SceneService'), SceneServiceDescriptor),
-            // generate(language.get('descriptor.type.ComposerService'), ComposerServiceDescriptor),
+            generate(language.get('descriptor.type.Scene3DService'), Scene3DService),
+            // generate(language.get('descriptor.type.ComposerService'), ComposerService),
         )
     }
 
-    const sceneAddNodeAction = sidebar.get('sidebar.scene.AddNode')
-    if (sceneAddNodeAction) {
-        //@ts-ignore
-        const generate = sceneAddNodeAction.generate
-        sceneAddNodeAction.children.push(
-            generate(language.get('descriptor.type.Node'), NodeDescriptor),
-            generate(language.get('descriptor.type.Text'), TextDescriptor),
-            generate(language.get('descriptor.type.Points'), PointsDescriptor),
-            generate(language.get('descriptor.type.Mesh'), MeshDescriptor),
-            generate(language.get('descriptor.type.InstancedMesh'), InstancedMeshDescriptor),
-            generate(language.get('descriptor.type.Sprite'), SpriteDescriptor),
-            generate(language.get('descriptor.type.Particle'), ParticleDescriptor),
-            generate(language.get('descriptor.type.GeoMap'), GeoMapDescriptor),
-            generate(language.get('descriptor.type.Model'), ModelDescriptor),
-            generate(language.get('descriptor.type.HTMLConvert'), HTMLConvertDescriptor),
-            // generate(language.get('descriptor.type.Pass'), PassDescriptor),
-            generate(language.get('descriptor.type.PerspectiveCamera'), PerspectiveCameraDescriptor),
-            generate(language.get('descriptor.type.OrthographicCamera'), OrthographicCameraDescriptor),
-        )
-    }
-
-    const assetAddNodeAction = sidebar.get('sidebar.asset.AddNode')
+    const assetAddNodeAction = sidebar.get('sidebar.AddNode')
     if (assetAddNodeAction) {
         //@ts-ignore
         const generate = assetAddNodeAction.generate
         assetAddNodeAction.children.push(
-            generate(language.get('descriptor.type.Node'), NodeDescriptor),
-            generate(language.get('descriptor.type.Text'), TextDescriptor),
-            generate(language.get('descriptor.type.Points'), PointsDescriptor),
-            generate(language.get('descriptor.type.Mesh'), MeshDescriptor),
-            generate(language.get('descriptor.type.InstancedMesh'), InstancedMeshDescriptor),
-            generate(language.get('descriptor.type.Sprite'), SpriteDescriptor),
-            generate(language.get('descriptor.type.Particle'), ParticleDescriptor),
-            generate(language.get('descriptor.type.GeoMap'), GeoMapDescriptor),
-            generate(language.get('descriptor.type.Model'), ModelDescriptor),
-            generate(language.get('descriptor.type.HTMLConvert'), HTMLConvertDescriptor),
-            // generate(language.get('descriptor.type.Pass'), PassDescriptor),
+            generate(language.get('descriptor.type.Node'), Node),
+            generate(language.get('descriptor.type.Text3D'), Text3D),
+            generate(language.get('descriptor.type.Points'), Points),
+            generate(language.get('descriptor.type.Mesh'), Mesh),
+            generate(language.get('descriptor.type.InstancedMesh'), InstancedMesh),
+            generate(language.get('descriptor.type.Sprite'), Sprite),
+            generate(language.get('descriptor.type.Particle'), Particle),
+            generate(language.get('descriptor.type.GeoMap'), GeoMap),
+            generate(language.get('descriptor.type.Model'), Model),
+            generate(language.get('descriptor.type.HTMLConvert'), HTMLConvert),
+            // generate(language.get('descriptor.type.Pass'), Pass),
         )
     }
 
     const inspectorService = runtime.get<InspectorService>('inspector')
     for (const viewer of inspectorViewer) inspectorService.set(viewer.type, viewer.import)
-
-    for (const script of global.scripts) dataService.addScripte(script)
-}
-
-export { setup }
+}

package/src/service/inspector/GeoMapViewer.vue

@@ -9,7 +9,7 @@
 <script lang="ts" setup>
 import { Ref, ref, watch } from 'vue'
 import { Descriptor } from '@vyr/engine';
-import { GeoMapDescriptor } from '@vyr/three';
+import { GeoMap } 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 NodeFragment from '../../fragment/NodeFragment.vue';
 import GeoMapFragment from '../../fragment/GeoMapFragment.vue';
 
 const props = defineProps<{ raw: string, uuid: string }>()
-const descriptor = ref(null) as Ref<GeoMapDescriptor | null>
+const descriptor = ref(null) as Ref<GeoMap | null>
 const watchEditItem = (cur: string) => {
     if (!cur) return descriptor.value = null
-    descriptor.value = Descriptor.get<GeoMapDescriptor>(cur)
+    descriptor.value = Descriptor.get<GeoMap>(cur)
 }
 watch(() => props.uuid, watchEditItem, { immediate: true })
 

package/src/service/inspector/HTMLConvertViewer.vue

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

package/src/service/inspector/InstanceMeshViewer.vue

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

package/src/service/inspector/MeshViewer.vue

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

package/src/service/inspector/ModelViewer.vue

@@ -10,7 +10,7 @@
 <script lang="ts" setup>
 import { Ref, ref, watch } from 'vue'
 import { Descriptor } from '@vyr/engine';
-import { ModelDescriptor } from '@vyr/three';
+import { Model } 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 ModelFragment from '../../fragment/ModelFragment.vue';
 
 const props = defineProps<{ raw: string, uuid: string }>()
 
-const descriptor = ref(null) as Ref<ModelDescriptor | null>
+const descriptor = ref(null) as Ref<Model | null>
 const watchEditItem = (cur: string) => {
     if (!cur) return descriptor.value = null
-    descriptor.value = Descriptor.get<ModelDescriptor>(cur)
+    descriptor.value = Descriptor.get<Model>(cur)
 }
 watch(() => props.uuid, watchEditItem, { immediate: true })
 

package/src/service/inspector/NodeViewer.vue

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

package/src/service/inspector/ParticleViewer.vue

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

package/src/service/inspector/PerspectiveCameraViewer.vue

@@ -15,7 +15,7 @@ import { onBeforeUnmount, Ref, ref, watch } from 'vue'
 import { runtime, RemoteService } from '@vyr/runtime';
 import { Job } from '@vyr/remote'
 import { Descriptor } from '@vyr/engine';
-import { PerspectiveCameraDescriptor } from '@vyr/three';
+import { PerspectiveCamera } from '@vyr/three';
 import { VyrCard, } from '@vyr/design';
 import { BaseFragment, providerDescriptor as builtinProviderDescriptor } from '@vyr/builtin'
 import { language } from '../../locale'
@@ -24,10 +24,10 @@ import NodeFragment from '../../fragment/NodeFragment.vue';
 
 const props = defineProps<{ raw: string, uuid: string }>()
 
-const descriptor = ref(null) as Ref<PerspectiveCameraDescriptor | null>
+const descriptor = ref(null) as Ref<PerspectiveCamera | null>
 const watchEditItem = (cur: string) => {
     if (!cur) return descriptor.value = null
-    descriptor.value = Descriptor.get<PerspectiveCameraDescriptor>(cur)
+    descriptor.value = Descriptor.get<PerspectiveCamera>(cur)
 }
 watch(() => props.uuid, watchEditItem, { immediate: true })
 

package/src/service/inspector/PointsViewer.vue

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

package/src/service/inspector/ServiceViewer.vue

@@ -1,7 +1,6 @@
 <template>
     <vyr-card v-if="descriptor" :title="language.get(`descriptor.type.${descriptor.type}` as any)" :scroll="true">
         <base-fragment :raw="raw"></base-fragment>
-        <HTML-fragment :raw="raw"></HTML-fragment>
         <vyr-row>
             <vyr-label :label="language.get('inspector.Service.shadowMap.type')">
                 <vyr-col>
@@ -17,44 +16,13 @@
             </vyr-label>
         </vyr-row>
         <vyr-row>
-            <vyr-label :label="language.get('inspector.Service.background')">
+            <vyr-label :label="language.get('inspector.Service.backgroundMap')">
                 <vyr-col>
-                    <vyr-input v-model="descriptor.background" :clearable="true" dragkey="background"
+                    <vyr-input v-model="descriptor.backgroundMap" :clearable="true" dragkey="backgroundMap"
                         :draggable="draggable" trigger="blur"></vyr-input>
                 </vyr-col>
             </vyr-label>
         </vyr-row>
-        <!-- <template v-if="isComposer(descriptor)">
-            <vyr-row>
-                <vyr-label :label="language.get('inspector.Service.multisampling')">
-                    <vyr-col>
-                        <vyr-input-number v-model="descriptor.multisampling" :allow-null="false"
-                            :min="0"></vyr-input-number>
-                    </vyr-col>
-                </vyr-label>
-            </vyr-row>
-            <vyr-row>
-                <vyr-label :label="language.get('inspector.Service.frameBufferType')">
-                    <vyr-col>
-                        <vyr-select v-model="descriptor.frameBufferType" :data="Texture.ftypeOptions"></vyr-select>
-                    </vyr-col>
-                </vyr-label>
-            </vyr-row>
-            <vyr-row>
-                <vyr-label :label="language.get('inspector.Service.depthBuffer')">
-                    <vyr-col>
-                        <vyr-select v-model="descriptor.depthBuffer" :data="option.booleanOptions"></vyr-select>
-                    </vyr-col>
-                </vyr-label>
-            </vyr-row>
-            <vyr-row>
-                <vyr-label :label="language.get('inspector.Service.stencilBuffer')">
-                    <vyr-col>
-                        <vyr-select v-model="descriptor.stencilBuffer" :data="option.booleanOptions"></vyr-select>
-                    </vyr-col>
-                </vyr-label>
-            </vyr-row>
-        </template> -->
     </vyr-card>
 </template>
 
@@ -62,19 +30,19 @@
 <script lang="ts" setup>
 import { computed, Ref, ref, watch } from 'vue'
 import { Descriptor } from '@vyr/engine';
-import { SceneServiceDescriptor } from '@vyr/three';
-import { VyrCard, VyrRow, VyrLabel, VyrCol, VyrSelect, VyrInput, VyrInputNumber } from '@vyr/design';
-import { BaseFragment, HTMLFragment, option, providerDescriptor as builtinProviderDescriptor } from '@vyr/builtin'
-import { Shadow, Texture } from '../../option'
+import { Scene3DService } from '@vyr/three';
+import { VyrCard, VyrRow, VyrLabel, VyrCol, VyrSelect, VyrInput } from '@vyr/design';
+import { BaseFragment, providerDescriptor as builtinProviderDescriptor } from '@vyr/builtin'
+import { Shadow } from '../../option'
 import { language } from '../../locale'
 import { providerDescriptor } from '../../common';
 import { DraggableService, runtime } from '@vyr/runtime';
 
 const props = defineProps<{ raw: string, uuid: string }>()
-const descriptor = ref(null) as Ref<SceneServiceDescriptor | null>
+const descriptor = ref(null) as Ref<Scene3DService | null>
 const watchEditItem = (cur: string) => {
     if (!cur) return descriptor.value = null
-    descriptor.value = Descriptor.get<SceneServiceDescriptor>(cur)
+    descriptor.value = Descriptor.get<Scene3DService>(cur)
 }
 watch(() => props.uuid, watchEditItem, { immediate: true })
 
@@ -84,8 +52,8 @@ builtinProviderDescriptor(descriptor)
 const draggableService = runtime.get<DraggableService>('draggable')
 const draggable = computed(() => draggableService.get(draggableService.key.inspector))
 
-// const isComposer = (descriptor: Descriptor): descriptor is ComposerServiceDescriptor => {
-//     return descriptor instanceof ComposerServiceDescriptor
+// const isComposer = (descriptor: Descriptor): descriptor is ComposerService => {
+//     return descriptor instanceof ComposerService
 // }
 </script>
 

package/src/service/inspector/SpriteViewer.vue

@@ -10,7 +10,7 @@
 <script lang="ts" setup>
 import { Ref, ref, watch } from 'vue'
 import { Descriptor } from '@vyr/engine';
-import { SpriteDescriptor } from '@vyr/three';
+import { Sprite } 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 SpriteFragment from '../../fragment/SpriteFragment.vue';
 
 const props = defineProps<{ raw: string, uuid: string }>()
 
-const descriptor = ref(null) as Ref<SpriteDescriptor | null>
+const descriptor = ref(null) as Ref<Sprite | null>
 const watchEditItem = (cur: string) => {
     if (!cur) return descriptor.value = null
-    descriptor.value = Descriptor.get<SpriteDescriptor>(cur)
+    descriptor.value = Descriptor.get<Sprite>(cur)
 }
 watch(() => props.uuid, watchEditItem, { immediate: true })