Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
yomotsu committed Feb 12, 2025
2 parents e64d5bd + 75d368a commit e37cbfa
Show file tree
Hide file tree
Showing 8 changed files with 2,321 additions and 1,729 deletions.
4 changes: 2 additions & 2 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"src/**/*": "npx eslint --ext .ts --fix"
}
"src/**/*": "npx eslint src --fix"
}
122 changes: 122 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
import globals from "globals";
import tsPlugin from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import styPlugin from "@stylistic/eslint-plugin";

// https://www.npmjs.com/package/eslint-config-mdcs
const mdcs = {
globals: {
THREE: "readonly",
console: "writable",
},

rules: {
"array-bracket-spacing": [
"error",
"always",
{ singleValue: true, arraysInArrays: false }
],
"block-spacing": [ "error", "always" ],
"brace-style": [ "error", "1tbs", { allowSingleLine: true } ],
"comma-spacing": [ "error", { before: false, after: true } ],
"comma-style": [ "error", "last" ],
"computed-property-spacing": [ "error", "always" ],
"eol-last": [ "error", "always" ],
"func-call-spacing": [ "error", "never" ],
"indent": [ "error", "tab", { SwitchCase: 1 } ],
"key-spacing": [ "error", { beforeColon: false } ],
"new-parens": "error",
"no-trailing-spaces": [ "error", { skipBlankLines: false } ],
"no-whitespace-before-property": "error",
"object-curly-spacing": [ "error", "always" ],
"padded-blocks": [
"error",
{
blocks: "always",
switches: "always",
classes: "always"
}
],
"semi": [
"error",
"always",
{ "omitLastInOneLineBlock": true }
],
"semi-spacing": [ "error", { before: false, after: true } ],
"space-before-blocks": [ "error", {
functions: "always",
keywords: "always",
classes: "always"
} ],
"space-before-function-paren": [
"error",
{
anonymous: "always",
named: "never",
asyncArrow: "ignore"
}
],
"space-in-parens": [ "error", "always" ],
"space-infix-ops": [ "error" ],
"space-unary-ops": [
"error",
{
words: true,
nonwords: true,
overrides: {}
}
],
"keyword-spacing": [ "error", { before: true, after: true } ],
"padding-line-between-statements": [
"error",
{ blankLine: "always", prev: "block-like", next: "*" }
],
"no-multi-spaces": "error",
"no-undef": "warn",
"no-unused-vars": "warn",
"no-extra-semi": "warn"
}
};

export default [
{
files: [ "src/**/*.ts" ],
// ignores: [],
languageOptions: {
parser: tsParser,
globals: {
...globals.browser,
...globals.node,
...mdcs.globals,
},
},

plugins: {
"@typescript-eslint": tsPlugin,
"@stylistic": styPlugin,
},

rules: {
...mdcs.rules,
"no-unused-vars": 0,
"@typescript-eslint/no-unused-vars": 1,
"indent": 0,
"@stylistic/indent": [
"error",
"tab",
{
SwitchCase: 1,
flatTernaryExpressions: true,
},
],
"no-multi-spaces": [ 0 ],
"no-trailing-spaces": [
"error",
{
ignoreComments: true,
},
],
"key-spacing": [ 0 ],
},
},
];
19 changes: 17 additions & 2 deletions examples/config.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<select onchange="cameraControls.mouseButtons.left = CameraControls.ACTION[ this.value ]">
<option value="ROTATE" selected>CameraControls.ACTION.ROTATE</option>
<option value="TRUCK">CameraControls.ACTION.TRUCK</option>
<option value="SCREEN_PAN">CameraControls.ACTION.SCREEN_PAN</option>
<option value="FORWARD_ROTATE">CameraControls.ACTION.FORWARD_ROTATE</option>
<option value="OFFSET">CameraControls.ACTION.OFFSET</option>
<option value="DOLLY">CameraControls.ACTION.DOLLY</option>
<option value="ZOOM">CameraControls.ACTION.ZOOM</option>
Expand All @@ -28,6 +30,8 @@
<select onchange="cameraControls.mouseButtons.middle = CameraControls.ACTION[ this.value ]">
<option value="ROTATE">CameraControls.ACTION.ROTATE</option>
<option value="TRUCK">CameraControls.ACTION.TRUCK</option>
<option value="SCREEN_PAN">CameraControls.ACTION.SCREEN_PAN</option>
<option value="FORWARD_ROTATE">CameraControls.ACTION.FORWARD_ROTATE</option>
<option value="OFFSET">CameraControls.ACTION.OFFSET</option>
<option value="DOLLY" selected>CameraControls.ACTION.DOLLY</option>
<option value="ZOOM">CameraControls.ACTION.ZOOM</option>
Expand All @@ -38,6 +42,8 @@
<select onchange="cameraControls.mouseButtons.right = CameraControls.ACTION[ this.value ]">
<option value="ROTATE">CameraControls.ACTION.ROTATE</option>
<option value="TRUCK" selected>CameraControls.ACTION.TRUCK</option>
<option value="SCREEN_PAN">CameraControls.ACTION.SCREEN_PAN</option>
<option value="FORWARD_ROTATE">CameraControls.ACTION.FORWARD_ROTATE</option>
<option value="OFFSET">CameraControls.ACTION.OFFSET</option>
<option value="DOLLY">CameraControls.ACTION.DOLLY</option>
<option value="ZOOM">CameraControls.ACTION.ZOOM</option>
Expand All @@ -48,6 +54,8 @@
<select onchange="cameraControls.mouseButtons.wheel = CameraControls.ACTION[ this.value ]">
<option value="ROTATE">CameraControls.ACTION.ROTATE</option>
<option value="TRUCK">CameraControls.ACTION.TRUCK</option>
<option value="SCREEN_PAN">CameraControls.ACTION.SCREEN_PAN</option>
<option value="FORWARD_ROTATE">CameraControls.ACTION.FORWARD_ROTATE</option>
<option value="OFFSET">CameraControls.ACTION.OFFSET</option>
<option value="DOLLY" selected>CameraControls.ACTION.DOLLY</option>
<option value="ZOOM">CameraControls.ACTION.ZOOM</option>
Expand All @@ -57,8 +65,9 @@

cameraControls.touches.one =
<select onchange="cameraControls.touches.one = CameraControls.ACTION[ this.value ]">
<option value="ROTATE" selected>CameraControls.ACTION.TOUCH_ROTATE</option>
<option value="TRUCK">CameraControls.ACTION.TOUCH_TRUCK</option>
<option value="TOUCH_ROTATE" selected>CameraControls.ACTION.TOUCH_ROTATE</option>
<option value="TOUCH_TRUCK">CameraControls.ACTION.TOUCH_TRUCK</option>
<option value="TOUCH_SCREEN_PAN">CameraControls.ACTION.TOUCH_SCREEN_PAN</option>
<option value="OFFSET">CameraControls.ACTION.OFFSET</option>
<option value="DOLLY">CameraControls.ACTION.DOLLY</option>
<option value="ZOOM">CameraControls.ACTION.ZOOM</option>
Expand All @@ -68,30 +77,36 @@
cameraControls.touches.two =
<select onchange="cameraControls.touches.two = CameraControls.ACTION[ this.value ]">
<option value="TOUCH_DOLLY_TRUCK" selected>CameraControls.ACTION.TOUCH_DOLLY_TRUCK</option>
<option value="TOUCH_DOLLY_SCREEN_PAN">CameraControls.ACTION.TOUCH_DOLLY_SCREEN_PAN</option>
<option value="TOUCH_DOLLY_OFFSET">CameraControls.ACTION.TOUCH_DOLLY_OFFSET</option>
<option value="TOUCH_DOLLY_ROTATE">CameraControls.ACTION.TOUCH_DOLLY_ROTATE</option>
<option value="TOUCH_ZOOM_TRUCK">CameraControls.ACTION.TOUCH_ZOOM_TRUCK</option>
<option value="TOUCH_ZOOM_SCREEN_PAN">CameraControls.ACTION.TOUCH_ZOOM_SCREEN_PAN</option>
<option value="TOUCH_ZOOM_OFFSET">CameraControls.ACTION.TOUCH_ZOOM_OFFSET</option>
<option value="TOUCH_ZOOM_ROTATE">CameraControls.ACTION.TOUCH_ZOOM_ROTATE</option>
<option value="TOUCH_DOLLY">CameraControls.ACTION.TOUCH_DOLLY</option>
<option value="TOUCH_ZOOM">CameraControls.ACTION.TOUCH_ZOOM</option>
<option value="TOUCH_ROTATE">CameraControls.ACTION.TOUCH_ROTATE</option>
<option value="TOUCH_TRUCK">CameraControls.ACTION.TOUCH_TRUCK</option>
<option value="TOUCH_SCREEN_PAN">CameraControls.ACTION.TOUCH_SCREEN_PAN</option>
<option value="TOUCH_OFFSET">CameraControls.ACTION.TOUCH_OFFSET</option>
</select>
<br>
cameraControls.touches.three =
<select onchange="cameraControls.touches.three = CameraControls.ACTION[ this.value ]">
<option value="TOUCH_DOLLY_TRUCK">CameraControls.ACTION.TOUCH_DOLLY_TRUCK</option>
<option value="TOUCH_DOLLY_SCREEN_PAN">CameraControls.ACTION.TOUCH_DOLLY_SCREEN_PAN</option>
<option value="TOUCH_DOLLY_OFFSET">CameraControls.ACTION.TOUCH_DOLLY_OFFSET</option>
<option value="TOUCH_DOLLY_ROTATE">CameraControls.ACTION.TOUCH_DOLLY_ROTATE</option>
<option value="TOUCH_ZOOM_TRUCK">CameraControls.ACTION.TOUCH_ZOOM_TRUCK</option>
<option value="TOUCH_ZOOM_SCREEN_PAN">CameraControls.ACTION.TOUCH_ZOOM_SCREEN_PAN</option>
<option value="TOUCH_ZOOM_OFFSET">CameraControls.ACTION.TOUCH_ZOOM_OFFSET</option>
<option value="TOUCH_ZOOM_ROTATE">CameraControls.ACTION.TOUCH_ZOOM_ROTATE</option>
<option value="TOUCH_DOLLY">CameraControls.ACTION.TOUCH_DOLLY</option>
<option value="TOUCH_ZOOM">CameraControls.ACTION.TOUCH_ZOOM</option>
<option value="TOUCH_ROTATE">CameraControls.ACTION.TOUCH_ROTATE</option>
<option value="TOUCH_TRUCK" selected>CameraControls.ACTION.TOUCH_TRUCK</option>
<option value="TOUCH_SCREEN_PAN">CameraControls.ACTION.TOUCH_SCREEN_PAN</option>
<option value="TOUCH_OFFSET">CameraControls.ACTION.TOUCH_OFFSET</option>
</select>
</div>
Expand Down
Loading

0 comments on commit e37cbfa

Please sign in to comment.