Merge branch 'gl-shaders-testing'

# Conflicts: # electron.vite.config.ts # package-lock.json # package.json # src/renderer/src/App.tsx # src/renderer/src/components/LayersSidebar.tsx # src/renderer/src/components/MousePosition.tsx # src/renderer/src/components/Toolbar.tsx # src/renderer/src/components/sidebar/LayerListItem.tsx # src/renderer/src/renderer/graphics.ts # src/renderer/src/renderer/index.ts # tsconfig.web.json # vite.config.ts
hpcreery · Apr 4, 2024 · 2a3873f · 2a3873f
2 parents 6b1e15d + 892bae3
commit 2a3873f
Show file tree

Hide file tree

Showing 131 changed files with 81,996 additions and 14,960 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -20,8 +20,8 @@ module.exports = {
     'plugin:react/recommended',
     'plugin:react/jsx-runtime',
     'plugin:@typescript-eslint/recommended',
-    'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:prettier/recommended'
+    'plugin:@typescript-eslint/eslint-recommended'
+    // 'plugin:prettier/recommended'
   ],
   rules: {
     '@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': 'allow-with-description' }],
@@ -31,13 +31,14 @@ module.exports = {
     '@typescript-eslint/no-explicit-any': ['off'], //'error',
     '@typescript-eslint/no-non-null-assertion': 'off',
     '@typescript-eslint/no-var-requires': 'off',
-    'linebreak-style': ['error', 'unix'],
-    'prettier/prettier': [
-      'error',
-      {
-        endOfLine: 'auto'
-      }
-    ]
+    // 'linebreak-style': ['error', 'unix'],
+    '@typescript-eslint/no-empty-interface': 'off',
+    // 'prettier/prettier': [
+    //   'error',
+    //   {
+    //     endOfLine: 'auto'
+    //   }
+    // ]
   },
   overrides: [
     {

diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,7 @@ dist
 out
 *.log*
 
+# Shader Builds
+src/renderer/src/shaders/build
+
 .DS_Store
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,3 +1,5 @@
 {
-  "recommendations": ["dbaeumer.vscode-eslint"]
-}
+  "recommendations": [
+    "dbaeumer.vscode-eslint"
+  ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,9 @@
       "windows": {
         "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite.cmd"
       },
-      "runtimeArgs": ["--sourcemap"],
+      "runtimeArgs": [
+        "--sourcemap"
+      ],
       "env": {
         "REMOTE_DEBUGGING_PORT": "9222"
       }
@@ -30,10 +32,13 @@
   "compounds": [
     {
       "name": "Debug All",
-      "configurations": ["Debug Main Process", "Debug Renderer Process"],
+      "configurations": [
+        "Debug Main Process",
+        "Debug Renderer Process"
+      ],
       "presentation": {
         "order": 1
       }
     }
   ]
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "vscode.typescript-language-features"
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -9,7 +9,12 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.formatOnSave": true,
-  "cSpell.words": ["Comlink", "Pixi", "uncull"],
-  "vue.codeActions.enabled": false
+  "editor.formatOnSave": false,
+  "cSpell.words": [
+    "Comlink",
+    "Pixi",
+    "uncull"
+  ],
+  "vue.codeActions.enabled": false,
+  "files.eol": "\n"
 }
diff --git a/README.md b/README.md
@@ -24,13 +24,28 @@ GRX is designed to be an easy to use online gerber viewer. Under the hood, GRX u
 - 👍 Easy to use
 - 🤏 Touchscreen Friendly
 - 🖥 Cross Platform and Available Everywhere
-- 📄 Supports Gerber X2 (X3 coming soon!)
-- 📈 Supports Excellon
+
+## Supported Artwork Formats
+
+- [x] Gerber RS-274X
+  - [x] X1
+  - [ ] X2 ( coming soon! )
+  - [ ] X3
+- [ ] NC
+  - [ ] XNC
+  - [ ] IPC-NC-349
+  - [ ] Excellon
+  - [ ] Sieb & Meyer
+- [x] GDSII
+- [ ] ODB++
+- [ ] IPC-2581
+- [ ] DXF
+- [ ] OASIS
 
 ## Tools
 
 - [Electron](https://electronjs.org/)
 - [React](https://reactjs.org/)
-- [PixiJS](https://www.pixijs.com/)
+- [regl](http://regl.party/)
 - [Typescript](https://www.typescriptlang.org/)
 - [Tracespace (forked)](https://github.com/hpcreery/tracespace)
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
@@ -2,7 +2,8 @@ import { resolve } from 'path'
 import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 import react from '@vitejs/plugin-react'
 import { comlink } from 'vite-plugin-comlink'
-import glsl from 'vite-plugin-glsl'
+// import glsl from 'vite-plugin-glsl'
+import glslify from 'rollup-plugin-glslify'
 
 export default defineConfig({
   main: {
@@ -14,16 +15,32 @@ export default defineConfig({
   renderer: {
     resolve: {
       alias: {
-        '@renderer': resolve('src/renderer/src')
+        '@src': resolve('src/renderer/src'),
+        '@lib': resolve('src/renderer/lib'),
       }
     },
     define: {
       __APP_VERSION__: JSON.stringify(process.env.npm_package_version)
     },
-    plugins: [react(), comlink(), glsl()],
+    plugins: [
+      react(),
+      comlink(),
+      glslify({
+        compress: false,
+        // @ts-ignore - glslify options are not typed
+        transform: ['glslify-import']
+      })
+    ],
     worker: {
       format: 'es',
-      plugins: [comlink(), glsl()]
+      plugins: () => [
+        comlink(),
+        glslify({
+          compress: false,
+          // @ts-ignore - glslify options are not typed
+          transform: ['glslify-import']
+        })
+      ]
     }
   }
 })