fix(editor): fix export single event->import it bug

description has these bugs: has Aux Scene->Scene; name miss; light has one child; game view's Camera change; (fix(action): fix action->bundle duplicate bug)
Meta3D-Technology · Dec 19, 2023 · 88a81bd · 88a81bd
1 parent fb84fb6
commit 88a81bd
Show file tree

Hide file tree

Showing 39 changed files with 128 additions and 69 deletions.
diff --git a/.cz-config.js b/.cz-config.js
@@ -17,6 +17,7 @@ module.exports = {
   scopes: [
     { name: "editor" },
     { name: "engine" },
+    { name: "extension" },
     { name: "platform" },
     { name: "services" },
     { name: "templates" },

diff --git a/contributes/meta3d-action-add-cube/package.json b/contributes/meta3d-action-add-cube/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-add-cube",
-    "version": "0.21.4",
+    "version": "0.21.5",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "displayName": "add-cube",
     "repoLink": "https://github.com/Meta3D-Technology/Meta3D/tree/master/contributes/meta3d-action-add-cube",

diff --git a/contributes/meta3d-action-add-cube/src/Main.ts b/contributes/meta3d-action-add-cube/src/Main.ts
@@ -37,7 +37,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                             state.addedGameObjects.push(addedGameObject)
                     })
 
-                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
+                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState,api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
                 }, (meta3dState) => {
                     let {
                         addedGameObjects,

diff --git a/contributes/meta3d-action-add-glb-to-scene/package.json b/contributes/meta3d-action-add-glb-to-scene/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-add-glb-to-scene",
-    "version": "0.21.4",
+    "version": "0.21.5",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "repoLink": "",
     "protocol": {

diff --git a/contributes/meta3d-action-add-glb-to-scene/src/Main.ts b/contributes/meta3d-action-add-glb-to-scene/src/Main.ts
@@ -7,7 +7,6 @@ import { eventName, inputData } from "meta3d-action-drop-glb-to-sceneview-protoc
 // import { service as converterGameViewService } from "meta3d-scenegraph-converter-three-gameview-protocol/src/service/ServiceType"
 // import { service as runEngineGameViewService } from "meta3d-editor-run-engine-gameview-protocol/src/service/ServiceType"
 // import { service as assetService } from "meta3d-asset-protocol/src/service/ServiceType"
-// import { getExn, isNullable } from "meta3d-commonlib-ts/src/NullableUtils"
 // import { getActionState, setElementStateField } from "meta3d-ui-utils/src/ElementStateUtils"
 // import { getState, setState } from "./Utils"
 import { disposeGameObjectAndAllChildren } from "meta3d-dispose-utils/src/DisposeGameObjectUtils"
@@ -59,7 +58,7 @@ export let getContribute: getContributeMeta3D<actionContribute<dropAssetFileUIDa
                                     state.importedGameObjects.push(importedGameObject)
                             })
 
-                            return runGameViewRenderOnlyOnce(meta3dState, editorWholeService)
+                            return runGameViewRenderOnlyOnce(meta3dState,api, editorWholeService)
                         })
                 }, (meta3dState) => {
                     let {

diff --git a/contributes/meta3d-action-clone-gameobject/package.json b/contributes/meta3d-action-clone-gameobject/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-clone-gameobject",
-    "version": "0.21.3",
+    "version": "0.21.4",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "repoLink": "",
     "protocol": {

diff --git a/contributes/meta3d-action-clone-gameobject/src/Main.ts b/contributes/meta3d-action-clone-gameobject/src/Main.ts
@@ -39,7 +39,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                         allClonedGameObjects: state.allClonedGameObjects.push(api.immutable.createListOfData( clonedGameObjects)),
                     })
 
-                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
+                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState,api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
                 }, (meta3dState) => {
                     let {
                         allClonedGameObjects,

diff --git a/contributes/meta3d-action-dispose-gameobject/package.json b/contributes/meta3d-action-dispose-gameobject/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-dispose-gameobject",
-    "version": "0.21.3",
+    "version": "0.21.4",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "repoLink": "",
     "protocol": {

diff --git a/contributes/meta3d-action-dispose-gameobject/src/Main.ts b/contributes/meta3d-action-dispose-gameobject/src/Main.ts
@@ -75,7 +75,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                     meta3dState = api.action.setActionState(meta3dState, actionName, {
                         ...state,
                         allSelectedGameObjects: state.allSelectedGameObjects.push(selectedGameObject),
-                        allDisposedGameObjectData: state.allDisposedGameObjectData.push(api.immutable.createListOfData( disposedGameObjectData)),
+                        allDisposedGameObjectData: state.allDisposedGameObjectData.push(api.immutable.createListOfData(disposedGameObjectData)),
                     })
 
                     meta3dState = api.action.setActionState(meta3dState, selectSceneTreeNodeActionName, {
@@ -102,7 +102,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                     })
 
 
-                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
+                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
                 }, (meta3dState) => {
                     let {
                         allSelectedGameObjects,

diff --git a/contributes/meta3d-action-import-single-event/src/Main.ts b/contributes/meta3d-action-import-single-event/src/Main.ts
@@ -4,7 +4,6 @@ import { eventSourcingService } from "meta3d-event-protocol/src/service/ServiceT
 import { uiData, actionName, state } from "meta3d-action-import-single-event-protocol"
 import { eventName, inputData } from "meta3d-action-import-single-event-protocol/src/EventType"
 // import { service as eventSourcingService } from "meta3d-event-sourcing-protocol/src/service/ServiceType"
-// import { api.nullable.getExn } from "meta3d-commonlib-ts/src/NullableUtils"
 // import { service as importSceneService } from "meta3d-import-scene-protocol/src/service/ServiceType"
 // import { service as assetService } from "meta3d-asset-protocol/src/service/ServiceType"
 // import { service as runEngineGameViewService } from "meta3d-editor-run-engine-gameview-protocol/src/service/ServiceType"
@@ -38,7 +37,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
 
                         // meta3dState = assetService.importAsset(meta3dState, assetFile)
 
-                        return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
+                        return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState,api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
                     })
                 }, (meta3dState) => {
                     return Promise.resolve(meta3dState)

diff --git a/contributes/meta3d-action-run/src/Main.ts b/contributes/meta3d-action-run/src/Main.ts
@@ -61,7 +61,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
         init: (meta3dState) => {
             let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
 
-            // meta3dState = runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")))
+            // meta3dState = runGameViewRenderOnlyOnce(meta3dState,api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")))
 
             return new Promise((resolve, reject) => {
                 resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState) => {

diff --git a/contributes/meta3d-action-select-scenetree-node/package.json b/contributes/meta3d-action-select-scenetree-node/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-select-scenetree-node",
-    "version": "0.21.3",
+    "version": "0.21.4",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "repoLink": "",
     "protocol": {

diff --git a/contributes/meta3d-action-select-scenetree-node/src/Main.ts b/contributes/meta3d-action-select-scenetree-node/src/Main.ts
@@ -49,9 +49,9 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                 resolve(eventSourcingService.addEvent<inputData>(meta3dState, {
                     name: eventName,
                     inputData: [
-                        findSelectedGameObject(buildHierachyGameObjects([],
+                        findSelectedGameObject(api, buildHierachyGameObjects(api, [],
                             editorWholeService,
-                            meta3dState, getAllTopGameObjects(meta3dState, editorWholeService)), api.nullable.getExn(uiData))
+                            meta3dState, getAllTopGameObjects(api, meta3dState, editorWholeService)), api.nullable.getExn(uiData))
                     ]
                 }))
             })

diff --git a/contributes/meta3d-action-set-gameobjectname/src/Main.ts b/contributes/meta3d-action-set-gameobjectname/src/Main.ts
@@ -32,7 +32,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                         allGameObjectNameData: state.allGameObjectNameData.push([gameObject, oldName]),
                     })
 
-                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
+                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState,api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
                 }, (meta3dState) => {
                     let {
                         allGameObjectNameData

diff --git a/contributes/meta3d-action-set-localeulerangle/src/Main.ts b/contributes/meta3d-action-set-localeulerangle/src/Main.ts
@@ -36,7 +36,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                         allLocalEulerAngleData: state.allLocalEulerAngleData.push([gameObject, oldLocalEulerAngle]),
                     })
 
-                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
+                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState,api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
                 }, (meta3dState) => {
                     let {
                         allLocalEulerAngleData

diff --git a/contributes/meta3d-action-set-localposition/src/Main.ts b/contributes/meta3d-action-set-localposition/src/Main.ts
@@ -36,7 +36,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                         allLocalPositionData: state.allLocalPositionData.push([gameObject, oldLocalPosition]),
                     })
 
-                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
+                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState,api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
                 }, (meta3dState) => {
                     let {
                         allLocalPositionData

diff --git a/contributes/meta3d-action-set-localscale/src/Main.ts b/contributes/meta3d-action-set-localscale/src/Main.ts
@@ -36,7 +36,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                         allLocalScaleData: state.allLocalScaleData.push([gameObject, oldLocalScale]),
                     })
 
-                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
+                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState,api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
                 }, (meta3dState) => {
                     let {
                         allLocalScaleData

diff --git a/contributes/meta3d-action-set-parent/package.json b/contributes/meta3d-action-set-parent/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-set-parent",
-    "version": "0.21.3",
+    "version": "0.21.7",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "repoLink": "",
     "protocol": {

diff --git a/contributes/meta3d-action-set-parent/src/Main.ts b/contributes/meta3d-action-set-parent/src/Main.ts
@@ -39,7 +39,7 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                     })
 
 
-                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
+                    return Promise.resolve(runGameViewRenderOnlyOnce(meta3dState, api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol"))))
                 }, (meta3dState) => {
                     let state = api.nullable.getExn(api.action.getActionState<state>(meta3dState, actionName))
                     let {
@@ -79,15 +79,15 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
 
                 let { source, target } = uiData
 
-                let hierachyGameObjects = buildHierachyGameObjects([],
+                let hierachyGameObjects = buildHierachyGameObjects(api, [],
                     editorWholeService,
-                    meta3dState, getAllTopGameObjects(meta3dState, editorWholeService))
+                    meta3dState, getAllTopGameObjects(api, meta3dState, editorWholeService))
 
                 resolve(eventSourcingService.addEvent<inputData>(meta3dState, {
                     name: eventName,
                     inputData: [{
-                        source: findSelectedGameObject(hierachyGameObjects, source),
-                        target: target.length == 0 ? null : findSelectedGameObject(hierachyGameObjects, target)
+                        source: findSelectedGameObject(api, hierachyGameObjects, source),
+                        target: target.length == 0 ? null : findSelectedGameObject(api, hierachyGameObjects, target)
                     }]
                 }))
             })

diff --git a/contributes/meta3d-input-scenetree/package.json b/contributes/meta3d-input-scenetree/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-input-scenetree",
-    "version": "0.21.3",
+    "version": "0.21.5",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "description": "",
     "protocol": {

diff --git a/contributes/meta3d-input-scenetree/src/Main.ts b/contributes/meta3d-input-scenetree/src/Main.ts
@@ -1,23 +1,23 @@
-import { state as meta3dState, getContribute as getContributeMeta3D } from "meta3d-type"
+import { state as meta3dState, getContribute as getContributeMeta3D, api } from "meta3d-type"
 import { data, nodeType } from "meta3d-input-tree-protocol"
 import { inputContribute } from "meta3d-editor-whole-protocol/src/service/ServiceType"
 import { hierachyGameObjects, getAllTopGameObjects, buildHierachyGameObjects } from "meta3d-scenetree-utils/src/SceneTreeUtils"
 import { service } from "meta3d-editor-whole-protocol/src/service/ServiceType"
-import { getWithDefault } from "meta3d-commonlib-ts/src/NullableUtils"
 
 let _convertToTreeData = (
+    api: api,
     editorWholeService: service,
     meta3dState: meta3dState, hierachyGameObjects: hierachyGameObjects,
 ): data => {
     let { gameObject } = editorWholeService.scene(meta3dState)
 
     return hierachyGameObjects.map(([gameObject_, children]) => {
         return [
-            getWithDefault(gameObject.getGameObjectName(meta3dState, gameObject_), ""),
+            api.nullable.getWithDefault(gameObject.getGameObjectName(meta3dState, gameObject_), ""),
             gameObject.hasBasicCameraView(meta3dState, gameObject_) && gameObject.hasPerspectiveCameraProjection(meta3dState, gameObject_) ? nodeType.Type1 :
                 gameObject.hasDirectionLight(meta3dState, gameObject_) ? nodeType.Type2 :
                     nodeType.Type3,
-            _convertToTreeData(editorWholeService, meta3dState, children)
+            _convertToTreeData(api, editorWholeService, meta3dState, children)
         ]
     })
 }
@@ -28,11 +28,12 @@ export let getContribute: getContributeMeta3D<inputContribute<data>> = (api) =>
         func: (meta3dState) => {
             let editorWholeService = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol"))
 
-            let hierachyGameObjects = buildHierachyGameObjects([],
+            let hierachyGameObjects = buildHierachyGameObjects(api,[],
                 editorWholeService,
-                meta3dState, getAllTopGameObjects(meta3dState, editorWholeService))
+                meta3dState, getAllTopGameObjects(api, meta3dState, editorWholeService))
 
             return Promise.resolve(_convertToTreeData(
+                api,
                 editorWholeService,
                 meta3dState, hierachyGameObjects
             ))

diff --git a/doc/1.0.0-beta1_3.org b/doc/1.0.0-beta1_3.org
@@ -316,6 +316,44 @@ TODO fix message
 TODO add all ui controls
 
 
+TODO fix: wheel event not work
+
+# TODO fix: dispose gameObject error
+
+# TODO fix: import: cube: position,color not the same
+TODO fix: export single event:
+# another Aux Scene 
+# name miss
+//Cube name change
+# light has one child
+# Camera change
+
+
+TODO update and publish:
+engine-whole
+editor-whole
+asset
+three
+
+
+
+TODO test publish
+
+
+
+
+TODO not newest ui control?
+
+
+
+
+TODO test controller
+
+TODO test asset
+
+TODO test inspector
+
+
 
 # * TODO 更新extension    
 

diff --git a/packages/asset/extensions/meta3d-load-glb/package.json b/packages/asset/extensions/meta3d-load-glb/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-load-glb",
-    "version": "0.21.4",
+    "version": "0.21.5",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "protocol": {
         "name": "meta3d-load-glb-protocol"

diff --git a/packages/asset/extensions/meta3d-load-glb/src/three/GLTFLoader.js b/packages/asset/extensions/meta3d-load-glb/src/three/GLTFLoader.js
@@ -698,7 +698,14 @@ class GLTFLightsExtension {
 			case 'directional':
 				lightNode = new DirectionalLight(color);
 				lightNode.target.position.set(0, 0, - 1);
-				lightNode.add(lightNode.target);
+
+
+				/*! edit by Meta3D
+				* 
+				*/
+				// lightNode.add(lightNode.target);
+
+
 				break;
 
 			case 'point':

diff --git a/packages/editor-whole/extensions/meta3d-editor-webgl1-three-whole/package.json b/packages/editor-whole/extensions/meta3d-editor-webgl1-three-whole/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-editor-webgl1-three-whole",
-    "version": "0.21.5",
+    "version": "0.21.6",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "protocol": {
         "name": "meta3d-editor-whole-protocol"

diff --git a/packages/editor-whole/extensions/meta3d-editor-webgl1-three-whole/src/SyncUtils.ts b/packages/editor-whole/extensions/meta3d-editor-webgl1-three-whole/src/SyncUtils.ts
@@ -64,7 +64,7 @@ export let sync = (meta3dState: meta3dState, api: api) => {
         ).then(meta3dState => {
             return eventSourcingService.replaceAllEvents(meta3dState, allEvents.slice(0, allEvents.count() - events.count()))
         }).then(meta3dState => {
-            return runGameViewRenderOnlyOnce(meta3dState, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")))
+            return runGameViewRenderOnlyOnce(meta3dState,api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")))
         })
         // .then(meta3dState => {
         // 	return eventSourcingService.cleanAllNeedEvents(meta3dState)

diff --git a/packages/editor-whole/extensions/meta3d-export-scene/package.json b/packages/editor-whole/extensions/meta3d-export-scene/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-export-scene",
-    "version": "0.21.4",
+    "version": "0.21.5",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "protocol": {
         "name": "meta3d-export-scene-protocol"

diff --git a/packages/editor-whole/extensions/meta3d-export-scene/src/three/GLTFExporter.js b/packages/editor-whole/extensions/meta3d-export-scene/src/three/GLTFExporter.js
@@ -317,9 +317,7 @@ const PATH_PROPERTIES = {
 };
 
 
-/*! edit by Meta3D
-* 
-*/
+/*! edit by Meta3D */
 // const DEFAULT_SPECULAR_COLOR = new Color();
 var DEFAULT_SPECULAR_COLOR = null;
 
@@ -2405,7 +2403,6 @@ class GLTFWriter {
 		for (let i = 0; i < input.length; i++) {
 
 			if (input[i] instanceof Scene) {
-
 				this.processScene(input[i]);
 
 			} else {

diff --git a/packages/editor-whole/extensions/meta3d-import-scene/package.json b/packages/editor-whole/extensions/meta3d-import-scene/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-import-scene",
-    "version": "0.21.4",
+    "version": "0.21.5",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "displayName": "meta3d-import-scene",
     "protocol": {