Skip to content

Commit 87b0ea7

Browse files
yyc-gityyc-git
committed
feat(editor): continue "add unit mod editor"
begin "select model";
1 parent 888f0fa commit 87b0ea7

337 files changed

Lines changed: 3388 additions & 398 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎contributes/meta3d-action-mod-unit-close-select-model-modal/.gitignore‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
.DS_Store
2+
.merlin
3+
.log
4+
.ninja_log
5+
.cmi
6+
.ast
7+
.cmt
8+
.bsdeps
9+
.compiler.log
10+
11+
.idea/
12+
.vscode/
13+
jest_0/
14+
reference/
15+
node_modules/
16+
mine/
17+
dist/
18+
lib/bs/
19+
.bs.js
20+
.gen.tsx
21+
lib/js/
22+
lib/es6_global/
23+
24+
coverage
25+
26+
dist/
27+
28+
npm-debug
29+
30+
.bsb.lock
31+
32+
yarn.lock
33+

‎contributes/meta3d-action-mod-unit-close-select-model-modal/gulpfile.js‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
var gulp = require("gulp");
2+
var path = require("path");
3+
var fs = require("fs");
4+
var publish = require("meta3d-tool-publish")
5+
var bundle = require("meta3d-tool-bundle-to-custom")
6+
var clipboard = require('clipboardy')
7+
8+
gulp.task("publish_local_env_bundle", function (done) {
9+
let filePath = "./src/Main.ts"
10+
11+
let bundleContent = bundle.bundle(
12+
bundle.getLocalModulePath(
13+
filePath
14+
),
15+
fs.readFileSync(filePath, "utf-8")
16+
)
17+
18+
let clipedBundleContent = `import { api } from "meta3d-type"
19+
import { service as editorWholeService } from "meta3d-editor-whole-protocol/src/service/ServiceType"
20+
` + bundleContent
21+
clipedBundleContent = clipedBundleContent.replace(/getContribute\s\=\s\(api\)/g, "getContribute = (api:api)")
22+
23+
clipboard.default.writeSync(
24+
clipedBundleContent
25+
)
26+
27+
28+
29+
publish.publishBundledContribute(
30+
"local",
31+
path.join(__dirname, "package.json"),
32+
bundleContent
33+
).then(() => {
34+
done()
35+
})
36+
});
37+
38+
39+
40+
// gulp.task("publish_local_env", function (done) {
41+
// publish.publishContribute(
42+
// "local",
43+
// path.join(__dirname, "package.json"),
44+
// path.join(__dirname, "dist/static/js", "main.js")
45+
// ).then(() => {
46+
// done()
47+
// })
48+
// });

‎contributes/meta3d-action-mod-unit-close-select-model-modal/loader.d.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// declare module 'asset-loader!*' {
2+
// // const contents: { default: string }
3+
// const contents: string
4+
// // const contents: ArrayBuffer
5+
// export = contents
6+
// }
7+
8+
declare module '*' {
9+
// const contents: { default: string }
10+
const contents: string
11+
// const contents: ArrayBuffer
12+
export = contents
13+
}

‎contributes/meta3d-action-mod-unit-close-select-model-modal/package.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"name": "meta3d-action-mod-unit-close-select-model-modal",
3+
"version": "1.3.2",
4+
"publisher": "meta3d",
5+
"protocol": {
6+
"name": "meta3d-action-mod-unit-close-select-model-modal-protocol"
7+
},
8+
"license": "MIT",
9+
"scripts": {
10+
"watch": "tsc -w -noEmit",
11+
"webpack": "webpack --config webpack.config.js",
12+
"meta3d:publish_dev_auto": "yarn version --patch --no-git-tag-version && yarn meta3d:publish_dev",
13+
"meta3d:publish_dev": "cross-env NODE_ENV=development npm run webpack && gulp publish_local_env_bundle"
14+
},
15+
"keywords": [],
16+
"dependencies": {
17+
"meta3d-action-mod-unit-close-select-model-modal-protocol": "^1.3.0",
18+
"meta3d-editor-whole-protocol": "^1.3.0",
19+
"meta3d-type": "^1.3.0"
20+
},
21+
"devDependencies": {
22+
"clean-webpack-plugin": "^4.0.0",
23+
"clipboardy": "^5.0.2",
24+
"cross-env": "^7.0.3",
25+
"cz-customizable": "^6.3.0",
26+
"gulp": "^4.0.2",
27+
"meta3d-tool-publish": "^1.3.0",
28+
"source-map-loader": "^3.0.0",
29+
"ts-loader": "^9.2.6",
30+
"typescript": "^5.1.0",
31+
"webpack": "^5.62.1",
32+
"webpack-cli": "^4.9.1"
33+
}
34+
}

‎contributes/meta3d-action-mod-unit-close-select-model-modal/src/Main.ts‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import { state as meta3dState, getContribute as getContributeMeta3D, api } from "meta3d-type"
2+
import { actionContribute, service as editorWholeService } from "meta3d-editor-whole-protocol/src/service/ServiceType"
3+
import { actionName, state, uiData } from "meta3d-action-mod-unit-close-select-model-modal-protocol"
4+
import { eventName, inputData } from "meta3d-action-mod-unit-close-select-model-modal-protocol/src/EventType"
5+
import { actionName as initActionName, state as initState } from "meta3d-action-mod-unit-init-protocol"
6+
7+
8+
export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> = (api) => {
9+
return {
10+
actionName: actionName,
11+
init: (meta3dState) => {
12+
let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
13+
14+
return new Promise((resolve, reject) => {
15+
resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState) => {
16+
meta3dState = api.action.setActionState<initState>(meta3dState, initActionName, {
17+
...api.nullable.getExn(api.action.getActionState<initState>(meta3dState, initActionName)),
18+
isShowModelModal: false
19+
})
20+
21+
return Promise.resolve(meta3dState)
22+
}, (meta3dState) => {
23+
return Promise.resolve(meta3dState)
24+
}))
25+
})
26+
},
27+
handler: (meta3dState, uiData) => {
28+
return new Promise<meta3dState>((resolve, reject) => {
29+
let eventSourcingService = api.nullable.getExn(api.getPackageService<editorWholeService>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState).eventSourcing(meta3dState)
30+
31+
resolve(eventSourcingService.addEvent<inputData>(meta3dState, {
32+
name: eventName,
33+
isOnlyRead: true,
34+
inputData: []
35+
}))
36+
})
37+
},
38+
createState: () => {
39+
return null
40+
}
41+
}
42+
}

‎contributes/meta3d-action-mod-unit-close-select-model-modal/tsconfig.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"compilerOptions": {
3+
"target": "ES6",
4+
"module": "ES6",
5+
"moduleResolution": "node",
6+
"sourceMap": true,
7+
"resolveJsonModule": true,
8+
"esModuleInterop": true,
9+
"jsx": "react",
10+
// "noEmit": true,
11+
// "noUnusedLocals": true,
12+
// "noUnusedParameters": true,
13+
"noImplicitReturns": true,
14+
"lib": [
15+
"DOM",
16+
"ESNext",
17+
],
18+
"types": [
19+
"node"
20+
],
21+
// "strict": true
22+
},
23+
"include": [
24+
"./src",
25+
"./loader.d.ts"
26+
]
27+
}

‎contributes/meta3d-action-mod-unit-close-select-model-modal/webpack.config.js‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
const path = require('path');
2+
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
3+
4+
module.exports = {
5+
entry: "./src/Main.ts",
6+
mode: process.env.NODE_ENV.trim() == 'production' ? 'production' : 'development',
7+
output: {
8+
path: path.resolve(__dirname, 'dist'),
9+
filename: 'static/js/[name].js',
10+
library: {
11+
name: 'Contribute',
12+
type: 'window',
13+
},
14+
},
15+
16+
// Enable sourcemaps for debugging webpack's output.
17+
// devtool: "source-map",
18+
19+
resolve: {
20+
extensions: ['.ts', '.tsx', '.js', '.jsx', '.scss'],
21+
modules: ['node_modules']
22+
},
23+
24+
module: {
25+
rules: [
26+
// All files with a '.ts' or '.tsx' extension will be handled by 'awesome-typescript-loader'.
27+
{
28+
test: /\.tsx?$/,
29+
exclude: /node_modules/,
30+
use: "ts-loader"
31+
},
32+
// All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
33+
{
34+
enforce: 'pre',
35+
test: /\.js$/,
36+
loader: "source-map-loader"
37+
},
38+
{
39+
test: /index.html|meta3d.js|basis_transcoder.js|draco_decoder.js|draco_encoder.js/,
40+
type: 'asset/inline',
41+
generator: {
42+
dataUrl: content => {
43+
return content.toString()
44+
}
45+
}
46+
},
47+
// {
48+
// test: /meta3d.js/,
49+
// type: 'asset/inline',
50+
// generator: {
51+
// dataUrl: content => {
52+
// return content.toString()
53+
// }
54+
// }
55+
// },
56+
// {
57+
// test: /basis_transcoder.js/,
58+
// type: 'asset/inline',
59+
// generator: {
60+
// dataUrl: content => {
61+
// return content.toString()
62+
// }
63+
// }
64+
// },
65+
// {
66+
// test: /draco_decoder.js/,
67+
// type: 'asset/inline',
68+
// generator: {
69+
// dataUrl: content => {
70+
// return content.toString()
71+
// }
72+
// }
73+
// },
74+
// {
75+
// test: /draco_encoder.js/,
76+
// type: 'asset/inline',
77+
// generator: {
78+
// dataUrl: content => {
79+
// return content.toString()
80+
// }
81+
// }
82+
// },
83+
]
84+
},
85+
plugins: [
86+
/**
87+
* All files inside webpack's output.path directory will be removed once, but the
88+
* directory itself will not be. If using webpack 4+'s default configuration,
89+
* everything under <PROJECT_DIR>/dist/ will be removed.
90+
* Use cleanOnceBeforeBuildPatterns to override this behavior.
91+
*
92+
* During rebuilds, all webpack assets that are not used anymore
93+
* will be removed automatically.
94+
*
95+
* See `Options and Defaults` for information
96+
*/
97+
new CleanWebpackPlugin(),
98+
// new HtmlWebpackPlugin({
99+
// template: './user.html',
100+
// filename: 'user.html',
101+
// }),
102+
],
103+
// When importing a module whose path matches one of the following, just
104+
// assume a corresponding global variable exists and use that instead.
105+
// This is important because it allows us to avoid bundling all of our
106+
// dependencies, which allows browsers to cache those libraries between builds.
107+
externals: {
108+
}
109+
};

‎contributes/meta3d-action-mod-unit-init/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "meta3d-action-mod-unit-init",
3-
"version": "1.3.2",
3+
"version": "1.3.3",
44
"publisher": "meta3d",
55
"protocol": {
66
"name": "meta3d-action-mod-unit-init-protocol"

‎contributes/meta3d-action-mod-unit-init/src/Main.ts‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ import { actionContribute, service as editorWholeService } from "meta3d-editor-w
44
import { actionName, state, uiData } from "meta3d-action-mod-unit-init-protocol"
55
import { eventName, inputData } from "meta3d-action-mod-unit-init-protocol/src/EventType"
66
// import { actionName as infoActionName, state as infoState } from "meta3d-action-mod-unit-info-protocol"
7-
import { getAllModelData } from "./asset-lib/unit-model/Main"
7+
import { getAllModelData, getModelSnapshotPath } from "./asset-lib/unit-model/Main"
88
// import { getData } from "./CareerFeatureData"
99
// import { getRandomFloat, getRandomInteger, randomSelect, convertDecimalToPercent, getDecimal } from "./NumberUtils"
1010
// import { actionName as languageActionName, state as languageState } from "meta3d-action-mod-language-protocol"
11+
import { reducePromise } from "meta3d-structure-utils/src/ArrayUtils"
12+
import { imageSrcToBase64 } from "meta3d-file-ts-utils/src/ImageUtils"
1113

1214
// let _buildAllDefaultCareerFeatures = (api: api) => {
1315
// // let modAPI = _buildFakeModAPI()
@@ -89,7 +91,39 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
8991

9092
return new Promise((resolve, reject) => {
9193
resolve(eventSourcingService.on<inputData>(meta3dState, eventName, 0, (meta3dState,) => {
92-
return Promise.resolve(meta3dState)
94+
return reducePromise(
95+
Array.from(api.immutable.createMapOfData(getAllModelData()).entries()),
96+
(result, [category, models]) => {
97+
return reducePromise(
98+
models,
99+
(result, modelData) => {
100+
return new Promise((resolve, reject) => {
101+
imageSrcToBase64(
102+
resolve,
103+
reject,
104+
getModelSnapshotPath(category, modelData.model)
105+
)
106+
}).then((imageBase64) => {
107+
return result.concat({
108+
...modelData,
109+
snapshotImageBase64: imageBase64,
110+
})
111+
})
112+
},
113+
[]
114+
).then(newModels => {
115+
return result.set(category, newModels)
116+
})
117+
},
118+
api.immutable.createMap()
119+
).then(newAllModelData => {
120+
meta3dState = api.action.setActionState(meta3dState, actionName, {
121+
...api.nullable.getExn(api.action.getActionState<state>(meta3dState, actionName)),
122+
allModelData: newAllModelData
123+
})
124+
125+
return meta3dState
126+
})
93127
}, (meta3dState) => {
94128
return Promise.resolve(meta3dState)
95129
}))
@@ -109,7 +143,10 @@ export let getContribute: getContributeMeta3D<actionContribute<uiData, state>> =
109143
},
110144
createState: () => {
111145
return {
112-
allModelData: api.immutable.createMapOfData(getAllModelData()),
146+
// allModelData: api.immutable.createMapOfData(getAllModelData()),
147+
allModelData: api.immutable.createMap(),
148+
selectedModelIndex: api.nullable.getEmpty(),
149+
isShowModelModal: false,
113150
}
114151
}
115152
}

0 commit comments

Comments
 (0)