Skip to content

Commit

Permalink
Merge pull request #4 from BLaZeKiLL/wip/editor-bindings
Browse files Browse the repository at this point in the history 
Editor bindings
  • Loading branch information
@BLaZeKiLL
BLaZeKiLL authored Jan 26, 2024
2 parents 9170671 + dc5885f commit 9fc2e2e
Show file tree
Hide file tree
Showing 35 changed files with 687 additions and 477 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
uses: dtolnay/rust-toolchain@stable
with:
targets: wasm32-unknown-unknown

- name: Setup Rust Cache
uses: Swatinem/rust-cache@v2

- name: Setup Wasm Pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

Expand Down Expand Up @@ -64,4 +64,4 @@ jobs:
steps:
- name: Deploy
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v2
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
uses: dtolnay/rust-toolchain@stable
with:
targets: wasm32-unknown-unknown

- name: Setup Rust Cache
uses: Swatinem/rust-cache@v2

- name: Setup Wasm Pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

Expand All @@ -43,4 +43,4 @@ jobs:
uses: actions/upload-pages-artifact@v2
with:
# this should match the `pages` option in your adapter-static options
path: 'build/'
path: 'build/'
308 changes: 133 additions & 175 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
@@ -1,176 +1,134 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'wgpu-hello'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=wgpu-hello"
],
"filter": {
"name": "wgpu-hello",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'wgpu-hello'",
"cargo": {
"args": [
"build",
"--bin=wgpu-hello",
"--package=wgpu-hello"
],
"filter": {
"name": "wgpu-hello",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'wgpu-hello'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=wgpu-hello",
"--package=wgpu-hello"
],
"filter": {
"name": "wgpu-hello",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'wgpu-compute'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=wgpu-compute"
],
"filter": {
"name": "wgpu-compute",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'wgpu-compute'",
"cargo": {
"args": [
"build",
"--bin=wgpu-compute",
"--package=wgpu-compute"
],
"filter": {
"name": "wgpu-compute",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'wgpu-compute'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=wgpu-compute",
"--package=wgpu-compute"
],
"filter": {
"name": "wgpu-compute",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'webray'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=webray"
],
"filter": {
"name": "webray",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'webray'",
"cargo": {
"args": [
"build",
"--bin=webray",
"--package=webray"
],
"filter": {
"name": "webray",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'webray'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=webray",
"--package=webray"
],
"filter": {
"name": "webray",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
}
]
}
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'wgpu-hello'",
"cargo": {
"args": ["test", "--no-run", "--lib", "--package=wgpu-hello"],
"filter": {
"name": "wgpu-hello",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'wgpu-hello'",
"cargo": {
"args": ["build", "--bin=wgpu-hello", "--package=wgpu-hello"],
"filter": {
"name": "wgpu-hello",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'wgpu-hello'",
"cargo": {
"args": ["test", "--no-run", "--bin=wgpu-hello", "--package=wgpu-hello"],
"filter": {
"name": "wgpu-hello",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'wgpu-compute'",
"cargo": {
"args": ["test", "--no-run", "--lib", "--package=wgpu-compute"],
"filter": {
"name": "wgpu-compute",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'wgpu-compute'",
"cargo": {
"args": ["build", "--bin=wgpu-compute", "--package=wgpu-compute"],
"filter": {
"name": "wgpu-compute",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'wgpu-compute'",
"cargo": {
"args": ["test", "--no-run", "--bin=wgpu-compute", "--package=wgpu-compute"],
"filter": {
"name": "wgpu-compute",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'webray'",
"cargo": {
"args": ["test", "--no-run", "--lib", "--package=webray"],
"filter": {
"name": "webray",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'webray'",
"cargo": {
"args": ["build", "--bin=webray", "--package=webray"],
"filter": {
"name": "webray",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'webray'",
"cargo": {
"args": ["test", "--no-run", "--bin=webray", "--package=webray"],
"filter": {
"name": "webray",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
}
]
}
10 changes: 3 additions & 7 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"cSpell.words": [
"wgpu",
"winit",
"webray"
],
"cSpell.words": ["wgpu", "winit", "webray"],

"rust-analyzer.cargo.target": "wasm32-unknown-unknown",
}
"rust-analyzer.cargo.target": "wasm32-unknown-unknown"
}
5 changes: 3 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
"version": "0.0.1",
"private": true,
"scripts": {
"start": "yarn build && yarn preview",
"wasm": "wasm-pack build ./webray --out-dir ../src/lib/wasm/webray",
"dev": "yarn wasm && vite",
"build": "yarn wasm && vite build",
"preview": "vite preview",
"wasm": "wasm-pack build ./webray --out-dir ../src/lib/wasm/webray",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"test": "vitest",
"lint": "prettier --check . && eslint .",
"format": "prettier --write ."
},
"devDependencies": {
"@floating-ui/dom": "^1.6.0",
"@iconify/json": "^2.2.174",
"@skeletonlabs/skeleton": "^2.7.1",
"@skeletonlabs/tw-plugin": "^0.3.1",
Expand Down
Loading

0 comments on commit 9fc2e2e

Please sign in to comment.