Merge pull request #200 from MarcellPerger1/fix-scripts-directory

Split `scripts` directory into multiple sub-directories

Author: MarcellPerger1

.github/workflows/main.yml

@@ -30,9 +30,7 @@ jobs:
       - run: npm install
       - name: Run tests
         id: run_tests
-        run: |
-          chmod +x ./scripts/test.sh
-          npm test -- --colors;
+        run: npm test -- --colors
       - name: Check if need to upload diff
         if: ${{ always() }}
         id: check_output
@@ -73,7 +71,7 @@ jobs:
       - name: Run eslint
         run: ./node_modules/.bin/eslint --max-warnings 0 ./
       - name: Run custom linters
-        run: node ./scripts/find_bad_import.js
+        run: node ./scripts/lint/find_bad_import.js
 
   check_formatted:
     runs-on: ubuntu-latest
@@ -119,13 +117,11 @@ jobs:
       - name: Install npm pacakges
         run: npm ci
       - name: Build libs
-        run: |
-          chmod +x ./scripts/build_libs.sh
-          ./scripts/build_libs.sh
+        run: npm run build:libs
       - name: Build `.ts` files
-        run: chmod +x ./scripts/build_ts.sh && ./scripts/build_ts.sh
+        run: npm run build:ts
       - name: Generate texture atlas
-        run: node ./scripts/make_atlas.js
+        run: npm run build:atlas
 
       - name: Commit texture atlas
         uses: stefanzweifel/git-auto-commit-action@v5

.prettierrc.yaml

@@ -1 +1,2 @@
 trailingComma: es5
+experimentalTernaries: true

configs/default.json

@@ -76,11 +76,11 @@
   },
   "shader": {
     "$class": "ShaderConfig",
-    "vsPath": "./shaders/vertex-shader.glsl",
-    "fsPath": "./shaders/fragment-shader.glsl",
+    "vsPath": "./src/shaders/display/vertex.glsl",
+    "fsPath": "./src/shaders/display/fragment.glsl",
     "picking": {
-      "vsPath": "./shaders/picking/vertex.glsl",
-      "fsPath": "./shaders/picking/fragment.glsl"
+      "vsPath": "./src/shaders/picking/vertex.glsl",
+      "fsPath": "./src/shaders/picking/fragment.glsl"
     }
   },
   "atlas": {

index.html

@@ -32,8 +32,10 @@
   <link rel="modulepreload" href=src/utils/object_utils.js>
   <link rel="prefetch" href="configs/config.json" as="fetch">
   <link rel="prefetch" href="configs/default.json" as="fetch">
-  <link rel="prefetch" href="shaders/fragment-shader.glsl" as="fetch">
-  <link rel="prefetch" href="shaders/vertex-shader.glsl" as="fetch">
+  <link rel="prefetch" href="src/shaders/display/fragment.glsl" as="fetch">
+  <link rel="prefetch" href="src/shaders/display/vertex.glsl" as="fetch">
+  <link rel="prefetch" href="src/shaders/picking/fragment.glsl" as="fetch">
+  <link rel="prefetch" href="src/shaders/picking/vertex.glsl" as="fetch">
   <link rel="prefetch" href="res/atlas-index.json" as="fetch">
   <link rel="prefetch" href="res/atlas.png" as="image">
   <!-- <script src="https://benvanik.github.io/WebGL-Inspector/core/embed.js" defer></script> -->

package-lock.json

@@ -11,7 +11,7 @@
     "@types/jest-image-snapshot": "^6.2.0",
     "canvas": "^2.11.2",
     "eslint": "^8.11.0",
-    "eslint-plugin-custom-rules": "file:scripts/eslint-plugin-custom-rules",
+    "eslint-plugin-custom-rules": "file:scripts/lint/eslint-plugin-custom-rules",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^28.6.0",
     "istanbul-lib-coverage": "^3.2.0",
@@ -27,18 +27,18 @@
     "v8-to-istanbul": "^9.1.0"
   },
   "scripts": {
-    "test": "chmod +x ./scripts/test.sh && ./scripts/test.sh",
-    "test:update": "./scripts/update_new_tests.sh",
-    "test:update:all": "./scripts/update_tests.sh",
-    "test:update:all+prune": "./scripts/update_tests_prune.sh",
-    "coverage": "chmod +x ./scripts/coverage.sh && ./scripts/coverage.sh",
-    "coverage:filtered": "chmod +x ./scripts/coverage-filtered.sh && ./scripts/coverage-filtered.sh",
-    "lint": "chmod +x ./scripts/linter.sh && ./scripts/linter.sh",
-    "format": "chmod +x ./scripts/format.sh && ./scripts/format.sh",
-    "format_check": "chmod +x ./scripts/format_check.sh && ./scripts/format_check.sh",
-    "build:atlas": "node ./scripts/make_atlas.js",
-    "build:ts": "./scripts/build_ts.sh",
-    "build:libs": "./scripts/build_libs.sh",
+    "test": "./scripts/test/test.sh",
+    "test:update": "./scripts/test/update_new.sh",
+    "test:update:all": "./scripts/test/update_all.sh",
+    "test:update:all+prune": "./scripts/test/update_all_prune.sh",
+    "coverage": "./scripts/test/cov/coverage.sh",
+    "coverage:filtered": "./scripts/test/cov/coverage-filtered.sh",
+    "lint": "./scripts/lint/linter.sh",
+    "format": "./scripts/format/format.sh",
+    "format_check": "./scripts/format/format_check.sh",
+    "build:atlas": "node ./scripts/build/make_atlas.js",
+    "build:ts": "./scripts/build/build_ts.sh",
+    "build:libs": "./scripts/build/build_libs.sh",
     "build:all": "npm run build:libs && npm run build:ts && npm run build:atlas"
   },
   "keywords": [