Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 07:18:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgraded all dependencies.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-12-21 20:49:20 +01:00
parent 315bd2ae8c
commit 15ea3f5112
6 changed files with 680 additions and 815 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
package.json
View File

@ -4,16 +4,16 @@
"private": true, "private": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@types/lodash": "^4.14.141", "@types/lodash": "^4.14.149",
"@types/luxon": "^1.15.2", "@types/luxon": "^1.21.0",
"camera-controls": "^1.14.1", "camera-controls": "^1.16.2",
"golden-layout": "^1.5.9", "golden-layout": "^1.5.9",
"javascript-lp-solver": "0.4.17", "javascript-lp-solver": "0.4.17",
"js-logger": "^1.6.0", "js-logger": "^1.6.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"luxon": "^1.19.3", "luxon": "^1.21.3",
"monaco-editor": "^0.18.1", "monaco-editor": "^0.19.0",
"three": "^0.109.0" "three": "^0.111.0"
}, },
"scripts": { "scripts": {
"start": "webpack-dev-server --port 1623 --config webpack.dev.js", "start": "webpack-dev-server --port 1623 --config webpack.dev.js",
@ -24,38 +24,38 @@
"lint": "prettier --check \"{src,assets_generation,test}/**/*.{ts,tsx}\" && echo Linting... && eslint \"{src,assets_generation,test}/**/*.{ts,tsx}\" && echo All code passes the prettier and eslint checks." "lint": "prettier --check \"{src,assets_generation,test}/**/*.{ts,tsx}\" && echo Linting... && eslint \"{src,assets_generation,test}/**/*.{ts,tsx}\" && echo All code passes the prettier and eslint checks."
}, },
"devDependencies": { "devDependencies": {
"@fortawesome/fontawesome-free": "^5.11.2", "@fortawesome/fontawesome-free": "^5.12.0",
"@types/cheerio": "^0.22.11", "@types/cheerio": "^0.22.15",
"@types/jest": "^24.0.18", "@types/jest": "^24.0.24",
"@types/yaml": "^1.0.2", "@types/yaml": "^1.2.0",
"@typescript-eslint/eslint-plugin": "^2.7.0", "@typescript-eslint/eslint-plugin": "^2.12.0",
"@typescript-eslint/parser": "^2.7.0", "@typescript-eslint/parser": "^2.12.0",
"cheerio": "^1.0.0-rc.3", "cheerio": "^1.0.0-rc.3",
"clean-webpack-plugin": "^3.0.0", "clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.0.4", "copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.2.0", "css-loader": "^3.4.0",
"dotenv-webpack": "^1.7.0", "dotenv-webpack": "^1.7.0",
"eslint": "^6.6.0", "eslint": "^6.8.0",
"eslint-config-prettier": "^6.5.0", "eslint-config-prettier": "^6.7.0",
"eslint-plugin-prettier": "^3.1.1", "eslint-plugin-prettier": "^3.1.2",
"file-loader": "^4.2.0", "file-loader": "^5.0.2",
"fork-ts-checker-webpack-plugin": "^1.5.0", "fork-ts-checker-webpack-plugin": "^3.1.1",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"jest": "^24.9.0", "jest": "^24.9.0",
"mini-css-extract-plugin": "^0.8.0", "mini-css-extract-plugin": "^0.9.0",
"monaco-editor-webpack-plugin": "^1.7.0", "monaco-editor-webpack-plugin": "^1.8.1",
"optimize-css-assets-webpack-plugin": "^5.0.3", "optimize-css-assets-webpack-plugin": "^5.0.3",
"prettier": "^1.19.1", "prettier": "^1.19.1",
"terser-webpack-plugin": "^2.1.2", "terser-webpack-plugin": "^2.3.1",
"ts-jest": "^24.1.0", "ts-jest": "^24.2.0",
"ts-loader": "^6.2.0", "ts-loader": "^6.2.1",
"ts-node": "^8.4.1", "ts-node": "^8.5.4",
"typescript": "^3.7.2", "typescript": "^3.7.4",
"webpack": "^4.41.0", "webpack": "^4.41.4",
"webpack-cli": "^3.3.9", "webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.8.1", "webpack-dev-server": "^3.10.1",
"webpack-merge": "^4.2.2", "webpack-merge": "^4.2.2",
"worker-loader": "^2.0.0", "worker-loader": "^2.0.0",
"yaml": "^1.7.0" "yaml": "^1.7.2"
} }
} }

11
src/quest_editor/gui/AsmEditorView.ts
View File

@ -55,9 +55,8 @@ export class AsmEditorView extends ResizableWidget {
editor.create(this.element, { editor.create(this.element, {
theme: "phantasmal-world", theme: "phantasmal-world",
scrollBeyondLastLine: false, scrollBeyondLastLine: false,
autoIndent: true, autoIndent: "full",
fontSize: 13, fontSize: 13,
wordBasedSuggestions: false,
wordWrap: "on", wordWrap: "on",
wrappingIndent: "indent", wrappingIndent: "indent",
renderIndentGuides: false, renderIndentGuides: false,
@ -69,9 +68,13 @@ export class AsmEditorView extends ResizableWidget {
this.history = this.disposable(new EditorHistory(this.editor)); this.history = this.disposable(new EditorHistory(this.editor));
// Commands and actions. // Commands and actions.
this.editor.addCommand(KeyMod.CtrlCmd | KeyCode.KEY_Z, () => {}); this.editor.addCommand(KeyMod.CtrlCmd | KeyCode.KEY_Z, () => {
// Do nothing.
});
this.editor.addCommand(KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z, () => {}); this.editor.addCommand(KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z, () => {
// Do nothing.
});
const quick_command = this.editor.getAction("editor.action.quickCommand"); const quick_command = this.editor.getAction("editor.action.quickCommand");

25
src/viewer/rendering/Model3DRenderer.ts
View File

@ -1,5 +1,4 @@
import { import {
AnimationAction,
AnimationClip, AnimationClip,
AnimationMixer, AnimationMixer,
Clock, Clock,
@ -34,7 +33,6 @@ export class Model3DRenderer extends Renderer implements Disposable {
private animation?: { private animation?: {
mixer: AnimationMixer; mixer: AnimationMixer;
clip: AnimationClip; clip: AnimationClip;
action: AnimationAction;
}; };
private update_animation_time = true; private update_animation_time = true;
@ -75,7 +73,7 @@ export class Model3DRenderer extends Renderer implements Disposable {
this.light_holder.quaternion.copy(this.camera.quaternion); this.light_holder.quaternion.copy(this.camera.quaternion);
super.render(); super.render();
if (this.animation && !this.animation.action.paused) { if (this.animation && !this.animation.mixer.clipAction(this.animation.clip).paused) {
this.update_animation_frame(); this.update_animation_frame();
this.schedule_render(); this.schedule_render();
} }
@ -163,11 +161,10 @@ export class Model3DRenderer extends Renderer implements Disposable {
this.animation = { this.animation = {
mixer, mixer,
clip, clip,
action: mixer.clipAction(clip),
}; };
this.clock.start(); this.clock.start();
this.animation.action.play(); this.animation.mixer.clipAction(this.animation.clip).play();
this.schedule_render(); this.schedule_render();
}; };
@ -180,7 +177,7 @@ export class Model3DRenderer extends Renderer implements Disposable {
private animation_playing_changed = ({ value: playing }: ChangeEvent<boolean>): void => { private animation_playing_changed = ({ value: playing }: ChangeEvent<boolean>): void => {
if (this.animation) { if (this.animation) {
this.animation.action.paused = !playing; this.animation.mixer.clipAction(this.animation.clip).paused = !playing;
if (playing) { if (playing) {
this.clock.start(); this.clock.start();
@ -206,7 +203,8 @@ export class Model3DRenderer extends Renderer implements Disposable {
if (frame < 1) frame = frame_count; if (frame < 1) frame = frame_count;
if (this.update_animation_time) { if (this.update_animation_time) {
this.animation.action.time = (frame - 1) / PSO_FRAME_RATE; this.animation.mixer.clipAction(this.animation.clip).time =
(frame - 1) / PSO_FRAME_RATE;
} }
this.schedule_render(); this.schedule_render();
@ -214,11 +212,14 @@ export class Model3DRenderer extends Renderer implements Disposable {
}; };
private update_animation_frame(): void { private update_animation_frame(): void {
if (this.animation && !this.animation.action.paused) { if (this.animation) {
const time = this.animation.action.time; const action = this.animation.mixer.clipAction(this.animation.clip);
this.update_animation_time = false;
this.model_3d_store.set_animation_frame(time * PSO_FRAME_RATE + 1); if (!action.paused) {
this.update_animation_time = true; this.update_animation_time = false;
this.model_3d_store.set_animation_frame(action.time * PSO_FRAME_RATE + 1);
this.update_animation_time = true;
}
} }
} }
} }

2
webpack.dev.js
View File

@ -55,7 +55,7 @@ module.exports = merge(common, {
], ],
}, },
{ {
test: /\.(png|svg|jpg|gif)$/, test: /\.(gif|jpg|png|svg|ttf)$/,
use: ["file-loader"], use: ["file-loader"],
}, },
], ],

2
webpack.prod.js
View File

@ -42,7 +42,7 @@ module.exports = merge(common, {
use: [MiniCssExtractPlugin.loader, "css-loader"], use: [MiniCssExtractPlugin.loader, "css-loader"],
}, },
{ {
test: /\.(png|svg|jpg|gif)$/, test: /\.(gif|jpg|png|svg|ttf)$/,
use: ["file-loader"], use: ["file-loader"],
}, },
], ],

1395
yarn.lock
View File

File diff suppressed because it is too large Load Diff