feat(editor): begin implement "picking and outline"

add interact package;
gameview-render add OutlinePass;
gameview-render add related api;
update scenegraph;
update script interact api;

contributes/meta3d-action-run/gulpfile.js

@@ -7,6 +7,10 @@ var bundle = require("meta3d-tool-bundle-to-custom")
 gulp.task("publish_local_env_bundle", function (done) {
     let filePath = "./src/Main.ts"
 
+    console.log(
+    bundle.bundle( bundle.getLocalModulePath( filePath), fs.readFileSync(filePath, "utf-8"))
+    )
+    return
     publish.publishBundledContribute(
         "local",
         path.join(__dirname, "package.json"),

contributes/meta3d-action-run/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-action-run",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "publisher": "meta3d",
     "displayName": "meta3d-action-run",
     "repoLink": "",

contributes/meta3d-action-run/src/Main.ts

@@ -8,7 +8,7 @@ import { service as gameViewRenderService } from "meta3d-editor-gameview-render-
 import { eventName, inputData } from "meta3d-action-run-protocol/src/EventType"
 // import { service as eventSourcingService } from "meta3d-event-sourcing-protocol/src/service/ServiceType"
 // import { runGameViewRenderOnlyOnce } from "meta3d-gameview-render-utils/src/GameViewRenderUtils"
-import { execEventHandle } from "meta3d-script-utils/src/Main"
+import { execEventHandle, getViewServiceForEditor } from "meta3d-script-utils/src/Main"
 import { runGameViewRenderOnlyOnce } from "meta3d-gameview-render-utils/src/GameViewRenderUtils"
 
 let _markIsRun = (meta3dState: meta3dState, api: api, isRun: boolean) => {
@@ -85,15 +85,15 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
                     meta3dState = _markIsRun(meta3dState, api, true)
                     meta3dState = _startGameViewRender(meta3dState, api)
 
-                    return execEventHandle(meta3dState, api, "onInit")
+                    return execEventHandle(meta3dState, api, "onInit", getViewServiceForEditor(meta3dState, api))
                 }, (meta3dState) => {
                     meta3dState = _markIsRun(meta3dState, api, false)
                     meta3dState = _stopGameViewRender(meta3dState, api)
 
                     meta3dState = api.restore(meta3dState, api.nullable.getExn(api.action.getActionState<state>(meta3dState, actionName)).meta3dStateBeforeRun)
 
 
-                    return execEventHandle(meta3dState, api, "onStop").then(meta3dState => {
+                    return execEventHandle(meta3dState, api, "onStop", getViewServiceForEditor(meta3dState, api)).then(meta3dState => {
                         return runGameViewRenderOnlyOnce(meta3dState, api, api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")))
                     })
                 }))

defaults/meta3d-commonlib/src/log/Log.res

@@ -1,5 +1,6 @@
 @val @scope("console") external consoleTrace: unit => unit = "trace"
 @val @scope("console") external consoleDebug: string => unit = "debug"
+@val @scope("console") external consoleError: string => unit = "error"
 
 let printForDebug = value => {
   value->Obj.magic->Js.Json.stringify->Js.log
@@ -16,6 +17,10 @@ let printListForDebug = list => {
   list
 }
 
+let error = message => {
+  consoleError(message)
+}
+
 let logForDebug = value => {
   Js.log(value)
 

doc/jiehuo.org

@@ -0,0 +1,81 @@
+* TODO add interact package
+
+TODO add Input, Picking
+
+
+* TODO update scenegraph
+
+
+* TODO gameview-render add OutlinePass 
+
+* TODO gameview-render add related api
+
+
+
+
+* TODO update scenegraph
+
+
+
+* TODO script interact api 
+
+
+* DONE publish and update 
+
+
+* TODO run test
+
+
+** TODO picking to print
+
+TODO add getViewRect, setSelectionObjects to script api
+
+
+** TODO show outline
+
+
+** TODO pass publish engine
+
+
+* TODO need update
+
+
+TODO e,c,p:
+gameview-render c and p
+# meta3d-action-run
+interact p
+scenegraph
+event
+run
+
+
+
+TODO packages:
+# gameview-render
+# editor
+
+
+
+
+* TODO future
+
+
+** TODO add Collider component
+
+maintain boundingSphere, boundingBox
+
+
+
+
+** TODO sceneview add picking
+
+
+
+** TODO sceneview add outline
+
+
+
+
+
+# ** TODO add MeshRender component
+

lerna.json

@@ -51,6 +51,8 @@
 		"packages/core/protocols/contribute_protocols/*",
 		"packages/core/extensions/*",
 		"packages/core/contributes/*",
+		"packages/interact/extensions/*",
+		"packages/interact/protocols/extension_protocols/*",
 		"extensions/*",
 		"contributes/*",
 		"defaults/*",

package.json

@@ -91,6 +91,8 @@
 		"packages/core/protocols/contribute_protocols/*",
 		"packages/core/extensions/*",
 		"packages/core/contributes/*",
+		"packages/interact/extensions/*",
+		"packages/interact/protocols/extension_protocols/*",
 		"extensions/*",
 		"contributes/*",
 		"defaults/*",

packages/core/contributes/meta3d-pipeline-root/dist/static/js/main.js

@@ -1 +1,118 @@
-(()=>{"use strict";var e={667:(e,t)=>{t.dup=function(e){return e.slice(0)},t.sub=function(e,t,n){for(var r=new Array(n),o=0,i=t;o<n;)r[o]=e[i],o=o+1|0,i=i+1|0;return r},t.concat=function(e){var t=function(e,t){for(;;){var n=t,r=e;if(!n)return r;t=n.tl,e=n.hd.length+r|0}}(0,e),n=new Array(t);return function(e,t,n){for(;;){var r=n,o=t;if(!r)return;for(var i=r.hd,a=i.length,u=o,c=0;c<a;)e[u]=i[c],u=u+1|0,c=c+1|0;n=r.tl,t=u}}(n,0,e),n},t.make=function(e,t){for(var n=new Array(e),r=0;r<e;++r)n[r]=t;return n},t.make_float=function(e){for(var t=new Array(e),n=0;n<e;++n)t[n]=0;return t},t.blit=function(e,t,n,r,o){if(r<=t)for(var i=0;i<o;++i)n[i+r|0]=e[i+t|0];else for(var a=o-1|0;a>=0;--a)n[a+r|0]=e[a+t|0]},t.get=function(e,t){if(t<0||t>=e.length)throw{RE_EXN_ID:"Invalid_argument",_1:"index out of bounds",Error:new Error};return e[t]},t.set=function(e,t,n){if(t<0||t>=e.length)throw{RE_EXN_ID:"Invalid_argument",_1:"index out of bounds",Error:new Error};e[t]=n}},451:(e,t,n)=>{var r=n(864);t.execFunc=function(e,t){return r.getState(t.getStatesFunc(e)).mostService.callFunc((function(t){return e}))}},743:(e,t,n)=>{var r=n(864);t.execFunc=function(e,t){return r.getState(t.getStatesFunc(e)).mostService.callFunc((function(t){return e}))}},39:(e,t,n)=>{var r=n(864);t.execFunc=function(e,t){return r.getState(t.getStatesFunc(e)).mostService.callFunc((function(t){return e}))}},864:(e,t,n)=>{var r=n(667),o=n(272);t.getState=function(e){return r.get(e,o.pipelineName)}},272:(e,t)=>{var n={Init:"init",Update:"update",Render:"render"},r={Init:"init_root_meta3d",Update:"update_root_meta3d",Render:"render_root_meta3d"},o=[{name:n.Init,groups:[{name:"first_root_meta3d",link:"concat",elements:[{name:r.Init,type_:"job",is_set_state:!0}]}],first_group:"first_root_meta3d"},{name:n.Update,groups:[{name:"first_root_meta3d",link:"concat",elements:[{name:r.Update,type_:"job",is_set_state:!0}]}],first_group:"first_root_meta3d"},{name:n.Render,groups:[{name:"first_root_meta3d",link:"concat",elements:[{name:r.Render,type_:"job",is_set_state:!0}]}],first_group:"first_root_meta3d"}];t.pipelineName="Root",t.pipeline=n,t.job=r,t.allPipelineData=o}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}var r={};(()=>{var e=r,t=n(451),o=n(743),i=n(39),a=n(272);function u(e,n){return n===a.job.Init?t.execFunc:n===a.job.Update?i.execFunc:n===a.job.Render?o.execFunc:null}function c(e){}e._getExecFunc=u,e._init=c,e.getContribute=function(e){return{pipelineName:a.pipelineName,createStateFunc:function(t,n){return{mostService:e.getExtensionService(t,"meta3d-bs-most-protocol")}},initFunc:c,getExecFunc:u,allPipelineData:a.allPipelineData,restoreFunc:null,deepCopyFunc:null}}})(),window.Contribute=r})();
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+/******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	var __webpack_modules__ = ({
+
+/***/ "../../../../node_modules/rescript/lib/js/caml_array.js":
+/*!**************************************************************!*\
+  !*** ../../../../node_modules/rescript/lib/js/caml_array.js ***!
+  \**************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+eval("\n\n\nfunction sub(x, offset, len) {\n  var result = new Array(len);\n  var j = 0;\n  var i = offset;\n  while(j < len) {\n    result[j] = x[i];\n    j = j + 1 | 0;\n    i = i + 1 | 0;\n  };\n  return result;\n}\n\nfunction len(_acc, _l) {\n  while(true) {\n    var l = _l;\n    var acc = _acc;\n    if (!l) {\n      return acc;\n    }\n    _l = l.tl;\n    _acc = l.hd.length + acc | 0;\n    continue ;\n  };\n}\n\nfunction fill(arr, _i, _l) {\n  while(true) {\n    var l = _l;\n    var i = _i;\n    if (!l) {\n      return ;\n    }\n    var x = l.hd;\n    var l$1 = x.length;\n    var k = i;\n    var j = 0;\n    while(j < l$1) {\n      arr[k] = x[j];\n      k = k + 1 | 0;\n      j = j + 1 | 0;\n    };\n    _l = l.tl;\n    _i = k;\n    continue ;\n  };\n}\n\nfunction concat(l) {\n  var v = len(0, l);\n  var result = new Array(v);\n  fill(result, 0, l);\n  return result;\n}\n\nfunction set(xs, index, newval) {\n  if (index < 0 || index >= xs.length) {\n    throw {\n          RE_EXN_ID: \"Invalid_argument\",\n          _1: \"index out of bounds\",\n          Error: new Error()\n        };\n  }\n  xs[index] = newval;\n}\n\nfunction get(xs, index) {\n  if (index < 0 || index >= xs.length) {\n    throw {\n          RE_EXN_ID: \"Invalid_argument\",\n          _1: \"index out of bounds\",\n          Error: new Error()\n        };\n  }\n  return xs[index];\n}\n\nfunction make(len, init) {\n  var b = new Array(len);\n  for(var i = 0; i < len; ++i){\n    b[i] = init;\n  }\n  return b;\n}\n\nfunction make_float(len) {\n  var b = new Array(len);\n  for(var i = 0; i < len; ++i){\n    b[i] = 0;\n  }\n  return b;\n}\n\nfunction blit(a1, i1, a2, i2, len) {\n  if (i2 <= i1) {\n    for(var j = 0; j < len; ++j){\n      a2[j + i2 | 0] = a1[j + i1 | 0];\n    }\n    return ;\n  }\n  for(var j$1 = len - 1 | 0; j$1 >= 0; --j$1){\n    a2[j$1 + i2 | 0] = a1[j$1 + i1 | 0];\n  }\n}\n\nfunction dup(prim) {\n  return prim.slice(0);\n}\n\nexports.dup = dup;\nexports.sub = sub;\nexports.concat = concat;\nexports.make = make;\nexports.make_float = make_float;\nexports.blit = blit;\nexports.get = get;\nexports.set = set;\n/* No side effect */\n\n\n//# sourceURL=webpack://Contribute/../../../../node_modules/rescript/lib/js/caml_array.js?");
+
+/***/ }),
+
+/***/ "./lib/js/src/Main.bs.js":
+/*!*******************************!*\
+  !*** ./lib/js/src/Main.bs.js ***!
+  \*******************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+eval("\n\nvar InitJob$Meta3dPipelineRoot = __webpack_require__(/*! ./jobs/InitJob.bs.js */ \"./lib/js/src/jobs/InitJob.bs.js\");\nvar RenderJob$Meta3dPipelineRoot = __webpack_require__(/*! ./jobs/RenderJob.bs.js */ \"./lib/js/src/jobs/RenderJob.bs.js\");\nvar UpdateJob$Meta3dPipelineRoot = __webpack_require__(/*! ./jobs/UpdateJob.bs.js */ \"./lib/js/src/jobs/UpdateJob.bs.js\");\nvar StateType$Meta3dPipelineRootProtocol = __webpack_require__(/*! meta3d-pipeline-root-protocol/lib/js/src/StateType.bs.js */ \"../../protocols/contribute_protocols/meta3d-pipeline-root-protocol/lib/js/src/StateType.bs.js\");\n\nfunction _getExecFunc(_pipelineName, jobName) {\n  if (jobName === StateType$Meta3dPipelineRootProtocol.job.Init) {\n    return InitJob$Meta3dPipelineRoot.execFunc;\n  } else if (jobName === StateType$Meta3dPipelineRootProtocol.job.Update) {\n    return UpdateJob$Meta3dPipelineRoot.execFunc;\n  } else if (jobName === StateType$Meta3dPipelineRootProtocol.job.Render) {\n    return RenderJob$Meta3dPipelineRoot.execFunc;\n  } else {\n    return null;\n  }\n}\n\nfunction _init(_state) {\n  \n}\n\nfunction getContribute(api) {\n  return {\n          pipelineName: StateType$Meta3dPipelineRootProtocol.pipelineName,\n          createStateFunc: (function (meta3dState, param) {\n              var mostService = api.getExtensionService(meta3dState, \"meta3d-bs-most-protocol\");\n              return {\n                      mostService: mostService\n                    };\n            }),\n          initFunc: _init,\n          getExecFunc: _getExecFunc,\n          allPipelineData: StateType$Meta3dPipelineRootProtocol.allPipelineData,\n          restoreFunc: null,\n          deepCopyFunc: null\n        };\n}\n\nexports._getExecFunc = _getExecFunc;\nexports._init = _init;\nexports.getContribute = getContribute;\n/* InitJob-Meta3dPipelineRoot Not a pure module */\n\n\n//# sourceURL=webpack://Contribute/./lib/js/src/Main.bs.js?");
+
+/***/ }),
+
+/***/ "./lib/js/src/jobs/InitJob.bs.js":
+/*!***************************************!*\
+  !*** ./lib/js/src/jobs/InitJob.bs.js ***!
+  \***************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+eval("\n\nvar Utils$Meta3dPipelineRoot = __webpack_require__(/*! ./Utils.bs.js */ \"./lib/js/src/jobs/Utils.bs.js\");\n\nfunction execFunc(meta3dState, param) {\n  var match = Utils$Meta3dPipelineRoot.getState(param.getStatesFunc(meta3dState));\n  return match.mostService.callFunc(function (param) {\n              return meta3dState;\n            });\n}\n\nexports.execFunc = execFunc;\n/* Utils-Meta3dPipelineRoot Not a pure module */\n\n\n//# sourceURL=webpack://Contribute/./lib/js/src/jobs/InitJob.bs.js?");
+
+/***/ }),
+
+/***/ "./lib/js/src/jobs/RenderJob.bs.js":
+/*!*****************************************!*\
+  !*** ./lib/js/src/jobs/RenderJob.bs.js ***!
+  \*****************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+eval("\n\nvar Utils$Meta3dPipelineRoot = __webpack_require__(/*! ./Utils.bs.js */ \"./lib/js/src/jobs/Utils.bs.js\");\n\nfunction execFunc(meta3dState, param) {\n  var match = Utils$Meta3dPipelineRoot.getState(param.getStatesFunc(meta3dState));\n  return match.mostService.callFunc(function (param) {\n              return meta3dState;\n            });\n}\n\nexports.execFunc = execFunc;\n/* Utils-Meta3dPipelineRoot Not a pure module */\n\n\n//# sourceURL=webpack://Contribute/./lib/js/src/jobs/RenderJob.bs.js?");
+
+/***/ }),
+
+/***/ "./lib/js/src/jobs/UpdateJob.bs.js":
+/*!*****************************************!*\
+  !*** ./lib/js/src/jobs/UpdateJob.bs.js ***!
+  \*****************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+eval("\n\nvar Utils$Meta3dPipelineRoot = __webpack_require__(/*! ./Utils.bs.js */ \"./lib/js/src/jobs/Utils.bs.js\");\n\nfunction execFunc(meta3dState, param) {\n  var match = Utils$Meta3dPipelineRoot.getState(param.getStatesFunc(meta3dState));\n  return match.mostService.callFunc(function (param) {\n              return meta3dState;\n            });\n}\n\nexports.execFunc = execFunc;\n/* Utils-Meta3dPipelineRoot Not a pure module */\n\n\n//# sourceURL=webpack://Contribute/./lib/js/src/jobs/UpdateJob.bs.js?");
+
+/***/ }),
+
+/***/ "./lib/js/src/jobs/Utils.bs.js":
+/*!*************************************!*\
+  !*** ./lib/js/src/jobs/Utils.bs.js ***!
+  \*************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+eval("\n\nvar Caml_array = __webpack_require__(/*! rescript/lib/js/caml_array.js */ \"../../../../node_modules/rescript/lib/js/caml_array.js\");\nvar StateType$Meta3dPipelineRootProtocol = __webpack_require__(/*! meta3d-pipeline-root-protocol/lib/js/src/StateType.bs.js */ \"../../protocols/contribute_protocols/meta3d-pipeline-root-protocol/lib/js/src/StateType.bs.js\");\n\nfunction getState(states) {\n  return Caml_array.get(states, StateType$Meta3dPipelineRootProtocol.pipelineName);\n}\n\nexports.getState = getState;\n/* StateType-Meta3dPipelineRootProtocol Not a pure module */\n\n\n//# sourceURL=webpack://Contribute/./lib/js/src/jobs/Utils.bs.js?");
+
+/***/ }),
+
+/***/ "../../protocols/contribute_protocols/meta3d-pipeline-root-protocol/lib/js/src/StateType.bs.js":
+/*!*****************************************************************************************************!*\
+  !*** ../../protocols/contribute_protocols/meta3d-pipeline-root-protocol/lib/js/src/StateType.bs.js ***!
+  \*****************************************************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+eval("\n\n\nvar pipeline = {\n  Init: \"init\",\n  Update: \"update\",\n  Render: \"render\"\n};\n\nvar job = {\n  Init: \"init_root_meta3d\",\n  Update: \"update_root_meta3d\",\n  Render: \"render_root_meta3d\"\n};\n\nvar allPipelineData = [\n  {\n    name: pipeline.Init,\n    groups: [{\n        name: \"first_root_meta3d\",\n        link: \"concat\",\n        elements: [{\n            name: job.Init,\n            type_: \"job\",\n            is_set_state: true\n          }]\n      }],\n    first_group: \"first_root_meta3d\"\n  },\n  {\n    name: pipeline.Update,\n    groups: [{\n        name: \"first_root_meta3d\",\n        link: \"concat\",\n        elements: [{\n            name: job.Update,\n            type_: \"job\",\n            is_set_state: true\n          }]\n      }],\n    first_group: \"first_root_meta3d\"\n  },\n  {\n    name: pipeline.Render,\n    groups: [{\n        name: \"first_root_meta3d\",\n        link: \"concat\",\n        elements: [{\n            name: job.Render,\n            type_: \"job\",\n            is_set_state: true\n          }]\n      }],\n    first_group: \"first_root_meta3d\"\n  }\n];\n\nvar pipelineName = \"Root\";\n\nexports.pipelineName = pipelineName;\nexports.pipeline = pipeline;\nexports.job = job;\nexports.allPipelineData = allPipelineData;\n/* allPipelineData Not a pure module */\n\n\n//# sourceURL=webpack://Contribute/../../protocols/contribute_protocols/meta3d-pipeline-root-protocol/lib/js/src/StateType.bs.js?");
+
+/***/ })
+
+/******/ 	});
+/************************************************************************/
+/******/ 	// The module cache
+/******/ 	var __webpack_module_cache__ = {};
+/******/ 	
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/ 		// Check if module is in cache
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = __webpack_module_cache__[moduleId] = {
+/******/ 			// no module.id needed
+/******/ 			// no module.loaded needed
+/******/ 			exports: {}
+/******/ 		};
+/******/ 	
+/******/ 		// Execute the module function
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+/******/ 	
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/ 	
+/************************************************************************/
+/******/ 	
+/******/ 	// startup
+/******/ 	// Load entry module and return exports
+/******/ 	// This entry module can't be inlined because the eval devtool is used.
+/******/ 	var __webpack_exports__ = __webpack_require__("./lib/js/src/Main.bs.js");
+/******/ 	window.Contribute = __webpack_exports__;
+/******/ 	
+/******/ })()
+;

packages/core/contributes/meta3d-pipeline-root/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meta3d-pipeline-root",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "publisher": "meta3d",
     "protocol": {
         "name": "meta3d-pipeline-root-protocol"
@@ -16,8 +16,8 @@
     },
     "keywords": [],
     "dependencies": {
-        "meta3d-core-protocol": "^1.2.0",
-        "meta3d-pipeline-root-protocol": "^1.2.0",
+        "meta3d-core-protocol": "^1.3.0",
+        "meta3d-pipeline-root-protocol": "^1.3.0",
         "meta3d-type": "^1.3.0",
         "rescript": "^10.0.1"
     },