Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add XRExperience to babylon.js #104

Open
wants to merge 862 commits into
base: testbranch
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
862 commits
Select commit Hold shift + click to select a range
16fbcf5
Convert singleton class to a static class
Gigabyte5671 Jun 27, 2023
9d57111
Remove unnecessary "pre-scene"
Gigabyte5671 Jun 27, 2023
cd3aad4
Memoize nametag textures, materials, and meshes
Gigabyte5671 Jun 27, 2023
880812c
Remove unnecessary uses of `eslint-disable`
Gigabyte5671 Jun 27, 2023
523c794
Decouple nametag scale and visibility from parent node
Gigabyte5671 Jun 27, 2023
4f40394
Remove explicit port from Quasar config to silence dev-server port wa…
Gigabyte5671 Jun 27, 2023
f46a36a
Use consistent spacing for type annotations
Gigabyte5671 Jun 27, 2023
608504f
Use consistent spacing for type annotations
Gigabyte5671 Jun 27, 2023
c7fdcf5
Clarify error handling variable names
Gigabyte5671 Jun 27, 2023
2374474
Fix typo
Gigabyte5671 Jun 27, 2023
611bdac
Use consistent spacing for type annotations
Gigabyte5671 Jun 27, 2023
9a14030
Remove unused `VVector3` and `VVector4` types
Gigabyte5671 Jun 27, 2023
d4c3ca3
Remove unused imports
Gigabyte5671 Jun 27, 2023
3e2e9e1
Document AvatarMapper methods
Gigabyte5671 Jun 28, 2023
09125d6
Document DefaultModels methods
Gigabyte5671 Jun 28, 2023
1ed4ef1
Fix typo
Gigabyte5671 Jun 28, 2023
ed85b3a
Reduce the use of `eslint-disable` comments
Gigabyte5671 Jun 28, 2023
181c24b
Update API interface names
Gigabyte5671 Jun 28, 2023
4c5d8f4
Move `findErrorMessage` function to Debugging
Gigabyte5671 Jun 28, 2023
0a103df
Refactor the debug logger
Gigabyte5671 Jun 28, 2023
b2d587c
Allow the log history to be downloaded as a file
Gigabyte5671 Jun 28, 2023
e7db35b
Refactor the MetaverseOps module
Gigabyte5671 Jun 28, 2023
038a434
Rename MetaverseOps module to API
Gigabyte5671 Jun 28, 2023
54ce189
Remove keyboard input logic from VScene
Gigabyte5671 Jun 28, 2023
e3bc5bf
Refactor and document the Domain module
Gigabyte5671 Jul 12, 2023
d5218c4
Refactor and document the Metaverse module
Gigabyte5671 Jul 12, 2023
2945978
Update the AudioIO module
Gigabyte5671 Jul 17, 2023
eae123d
Tidy `avatar\DefaultModels.ts` and `avatar\StoreInterface.ts`
Gigabyte5671 Jul 17, 2023
7572213
Begin tidying the UI components
Gigabyte5671 Jul 17, 2023
7d90921
Tidy and document the Utility module
Gigabyte5671 Jul 17, 2023
e84fde3
Begin tidying and documenting the Scene module
Gigabyte5671 Jul 17, 2023
0836aea
Tidy and document the Places module
Gigabyte5671 Jul 17, 2023
a4c0eec
Fix regressions
Gigabyte5671 Jul 17, 2023
6d3e7f6
Begin tidying and documenting the Object module
Gigabyte5671 Jul 18, 2023
b8654df
A bit more tidying
Gigabyte5671 Jul 18, 2023
618e383
Restore `_` syntax for private class members
Gigabyte5671 Jul 18, 2023
8ae5fbf
Fix regression: multiple default rendering pipelines
Gigabyte5671 Jul 19, 2023
6c8ca15
Fix material memos
Gigabyte5671 Jul 20, 2023
4a4d6c9
Prevent creating a duplicate MainCamera
Gigabyte5671 Jul 20, 2023
e03555f
Allow the ambient light intensity to be set to `0`
Gigabyte5671 Jul 20, 2023
699bdaf
Allow configurable numbers to be set to `0`
Gigabyte5671 Jul 20, 2023
0b044d0
Ensure skybox disposal removes old materials
Gigabyte5671 Jul 20, 2023
deed257
Update the scene's environment intensity along with the zone's ambien…
Gigabyte5671 Jul 20, 2023
3427ad4
Add a toggleable FPS counter
Gigabyte5671 Jul 21, 2023
2fe71b5
Fix regression: broken capsule collider
Gigabyte5671 Jul 21, 2023
8e61a67
Fix regression: multiple control-handlers attached to the scene
Gigabyte5671 Jul 21, 2023
31ef29e
Fix typos
Gigabyte5671 Jul 21, 2023
0c65bed
Simplify unnecessary direct comparisons with `true`
Gigabyte5671 Jul 21, 2023
7e35ddf
Fix typo
Gigabyte5671 Jul 21, 2023
ff63410
Fix typo
Gigabyte5671 Jul 21, 2023
b22a09a
Fix many typos
Gigabyte5671 Jul 22, 2023
61eb0d1
Fix typo in file name
Gigabyte5671 Jul 22, 2023
c6801bd
Merge pull request #179 from vircadia/fix/refactor-and-document
digisomni Jul 22, 2023
e0578b7
Hack in basic Igloo cam support. (buggy)
digisomni Aug 7, 2023
b7968e5
Try diff method of igloo setting.
digisomni Aug 7, 2023
5e21011
Update peer dependencies
Gigabyte5671 Sep 3, 2023
473deda
Create Hysteresis utility class
Gigabyte5671 Sep 4, 2023
1833ff9
Provide easier access to the active SceneController instance
Gigabyte5671 Sep 4, 2023
e7f313a
Update the local avatar's nametag position with the hip bone position
Gigabyte5671 Sep 4, 2023
a943334
Merge Places module into the Metaverse module
Gigabyte5671 Sep 5, 2023
1beb5e8
Merge the Object module into the Entity module
Gigabyte5671 Sep 8, 2023
8b41fbb
Revert "Merge the Object module into the Entity module"
Gigabyte5671 Sep 13, 2023
87198ef
Reduce the use of type assertions
Gigabyte5671 Sep 14, 2023
569e707
Update attribution
Gigabyte5671 Sep 14, 2023
b0af5bd
Update other players' nametag positions with their avatar's hip bone …
Gigabyte5671 Sep 14, 2023
89598c2
Update the camera's position with the avatar's hip bone position
Gigabyte5671 Sep 14, 2023
8b8606c
Remove unused logic, blank lines
Gigabyte5671 Sep 14, 2023
6f9103c
Add camera bobbing setting to the Graphics menu
Gigabyte5671 Sep 14, 2023
f725017
Create a type definition for the IglooCamera constructor
Gigabyte5671 Sep 15, 2023
f4941e1
Extend the window interface with the global Igloo types
Gigabyte5671 Sep 15, 2023
e5f1b84
Update IglooCamera usage
Gigabyte5671 Sep 15, 2023
ddae3f2
Update comment
Gigabyte5671 Sep 15, 2023
f5dda88
Merge pull request #182 from vircadia/fix/add-igloo-types
digisomni Sep 16, 2023
20dd0c7
Add camera bobbing setting to the Controls menu
Gigabyte5671 Sep 17, 2023
8721884
Merge branch 'master' into fix/avatar-attachment-positions
Gigabyte5671 Sep 17, 2023
5baa8cb
Merge pull request #181 from vircadia/fix/avatar-attachment-positions
digisomni Sep 17, 2023
d731e26
Create a build script to copy web-workers from the SDK to the app
Gigabyte5671 Sep 18, 2023
30a6987
Simplify nested conditionals
Gigabyte5671 Sep 18, 2023
7cbf99a
Only sync bookmarks & control settings between tabs
Gigabyte5671 Sep 19, 2023
13b6101
Merge pull request #183 from vircadia/fix/audio
digisomni Sep 19, 2023
5c56673
Merge branch 'master' into fix/localstorage-conflicts
digisomni Sep 19, 2023
b437531
Merge pull request #184 from vircadia/fix/localstorage-conflicts
digisomni Sep 22, 2023
6bba08e
Merge branch 'master' into dev/use-local-web-sdk
digisomni Sep 25, 2023
df56751
Merge pull request #178 from ctrlaltdavid/dev/use-local-web-sdk
digisomni Sep 25, 2023
5699e91
Update package.json
digisomni Sep 25, 2023
a106142
Update linting + lint.
digisomni Sep 26, 2023
2e9cc93
Rename files.
digisomni Sep 26, 2023
1a8616f
Initial LODManager.
digisomni Sep 26, 2023
edb28dd
Merge branch 'master' into feature/lod
digisomni Sep 26, 2023
a258ddd
Update contributors.
digisomni Sep 26, 2023
be694eb
State of config.
digisomni Sep 28, 2023
1e9e11e
Fix LOD.
digisomni Sep 29, 2023
cf0c729
Update types.
digisomni Sep 29, 2023
af6f9ae
Update types further.
digisomni Sep 29, 2023
6e5275f
Add baseUrl config by env.
digisomni Sep 30, 2023
c6d765b
Update eslint.
digisomni Sep 30, 2023
30f27c1
Update README.md
digisomni Sep 30, 2023
9d4548a
Further improvements.
digisomni Oct 1, 2023
f0ae8c7
Refactor and upgrade LOD manager. Needs further refactor.
digisomni Oct 1, 2023
b1bf21e
Merge pull request #187 from vircadia/fix/base-url
digisomni Oct 1, 2023
b34ee66
Merge branch 'master' into feature/lod
digisomni Oct 1, 2023
e610ffc
Refactor LOD further.
digisomni Oct 1, 2023
a6aa3ee
Fix typo.
digisomni Oct 1, 2023
82790c6
Remove comment.
digisomni Oct 2, 2023
ef90db7
Fix bug adding all meshes as root meshes.
digisomni Oct 2, 2023
ab6fae5
Fix error log -> debug log.
digisomni Oct 2, 2023
12816bc
Fix bug in capturing suffixes.
digisomni Oct 2, 2023
5ed1bd3
Remove theoretically unnecessary check preventing instanced meshes us…
digisomni Oct 2, 2023
59e9354
Eh.
digisomni Oct 2, 2023
e49d1fa
Merge pull request #188 from vircadia/master
Gigabyte5671 Oct 3, 2023
dd73f9b
Fix the microphone level meter
Gigabyte5671 Oct 3, 2023
7be0184
Fix bug with LOD hide + allow instanced in all cases.
digisomni Oct 3, 2023
6b14ab5
Merge pull request #189 from vircadia/fix/audio
digisomni Oct 3, 2023
f90567f
Merge branch 'master' into feature/lod
digisomni Oct 3, 2023
e7893d6
Update LOD hide to only apply to roots.
digisomni Oct 4, 2023
ec5a255
Make `kbd` element styles global
Gigabyte5671 Oct 9, 2023
50104d0
Show hint messages on the loading screen
Gigabyte5671 Oct 9, 2023
44bda5a
Allow the hints to be disabled
Gigabyte5671 Oct 9, 2023
ad55521
Fix contrast issue on light mode
Gigabyte5671 Oct 9, 2023
7e7bf64
Fix build errors
Gigabyte5671 Oct 9, 2023
759075a
Simplify logic
Gigabyte5671 Oct 9, 2023
2b814d6
Improve type-safety
Gigabyte5671 Oct 9, 2023
005c129
Add TODO.
digisomni Oct 9, 2023
0daf566
Merge pull request #191 from vircadia/feature/loading-screen-hints
digisomni Oct 9, 2023
1525f03
Initialize Tauri wrapper
Gigabyte5671 Oct 10, 2023
8cd7c41
Generate app icons
Gigabyte5671 Oct 10, 2023
4f6e483
Fix invalid Cargo configuration
Gigabyte5671 Oct 10, 2023
c7fb73a
Adjust the Quasar dev server config when running the desktop wrapper
Gigabyte5671 Oct 10, 2023
4b0c755
Create install, dev, and build scripts for the desktop wrapper
Gigabyte5671 Oct 10, 2023
c536b86
Update tauri.conf.json
Gigabyte5671 Oct 10, 2023
802b8ee
Increase the density of the header bar
Gigabyte5671 Oct 10, 2023
c126e63
Simplify overlay toggling logic
Gigabyte5671 Oct 10, 2023
1dfb841
Don't open the chat & menu by default when in the desktop app
Gigabyte5671 Oct 10, 2023
ad3d420
Add a preloader
Gigabyte5671 Oct 12, 2023
1b88cf2
Style adjustments
Gigabyte5671 Oct 12, 2023
b0e3971
Style adjustments
Gigabyte5671 Oct 12, 2023
199a214
Create a workflow to test the desktop build
Gigabyte5671 Oct 12, 2023
2e5bda0
Update build_test_desktop.yml
Gigabyte5671 Oct 12, 2023
7004a09
Update build_test_desktop.yml
Gigabyte5671 Oct 12, 2023
60ffb0e
Update build_test_desktop.yml
Gigabyte5671 Oct 12, 2023
19ef7cb
Update build_test_desktop.yml
Gigabyte5671 Oct 12, 2023
5ca3922
Update build_test_desktop.yml
Gigabyte5671 Oct 12, 2023
c4c778b
Add rule.
digisomni Oct 15, 2023
fd99486
Upgrade to Babylon.js 6.24.0.
digisomni Oct 15, 2023
fbd4f41
Lint.
digisomni Oct 16, 2023
7f8c2a5
Dummy file.
digisomni Oct 17, 2023
b3222c1
Update editor settings.
digisomni Oct 17, 2023
ac53f55
Ling + fix nametag billboard bug.
digisomni Oct 17, 2023
5070729
Apply potential fix for billboard rotation on LODs.
digisomni Oct 17, 2023
0357a4d
Update to latest Web SDK and remove old vircadia-web-sdk.d.ts file
ctrlaltdavid Oct 17, 2023
0349998
Merge pull request #185 from vircadia/feature/lod
digisomni Oct 17, 2023
bf364ba
Merge branch 'master' into pr/194
digisomni Oct 17, 2023
378f36a
Merge pull request #194 from ctrlaltdavid/fix/sdk-types
digisomni Oct 17, 2023
b33da17
Fix build lint error.
digisomni Oct 17, 2023
277d751
Update version.
digisomni Oct 17, 2023
2414297
Fix naming issue.
digisomni Oct 17, 2023
bff70d2
Fix metadata parsing in the case of parent TransformNodes.
digisomni Oct 18, 2023
13d7b57
Attempt another filename fix.
digisomni Oct 18, 2023
b4d23d3
Merge branch 'master' into feature/lod
digisomni Oct 18, 2023
b2b9c8e
Attempt another fix.
digisomni Oct 18, 2023
90c00d1
Attempt another fix.
digisomni Oct 18, 2023
feb9299
Testing.
digisomni Oct 19, 2023
d2a1047
Update PR deploy.
digisomni Oct 19, 2023
6bb2439
Remove testing debug logs.
digisomni Oct 19, 2023
12dc00c
Remove further unnecessary debug logs.
digisomni Oct 19, 2023
0818106
Merge pull request #196 from vircadia/feature/perf-improvements
digisomni Oct 20, 2023
50c79f2
Fix domain server not being told the metaverse server URL
ctrlaltdavid Oct 20, 2023
5ba8cdd
Merge pull request #197 from ctrlaltdavid/fix/metaverse-url
digisomni Oct 20, 2023
87fe6c7
Merge pull request #195 from vircadia/feature/lod
digisomni Oct 21, 2023
3cf201f
Simplify workflow names
Gigabyte5671 Oct 24, 2023
bc2ca21
Clarify environment variable name
Gigabyte5671 Oct 24, 2023
54d8530
Remove some static assets
Gigabyte5671 Oct 24, 2023
360e48b
Install the desktop dependencies with a `postinstall` script
Gigabyte5671 Oct 24, 2023
f9a6aa7
Add the `vircadia-assets` repo as a submodule
Gigabyte5671 Oct 24, 2023
deb29c4
Fix broken asset links
Gigabyte5671 Oct 24, 2023
df95ac9
Update the `vircadia-assets` submodule
Gigabyte5671 Oct 24, 2023
5592dc8
Don't lint the `vircadia-assets` submodule
Gigabyte5671 Oct 24, 2023
86ca936
Fix broken asset links
Gigabyte5671 Oct 24, 2023
f9f029c
Retrieve avatar models from the `vircadia-assets` submodule
Gigabyte5671 Oct 24, 2023
5ed3ed5
Update the `vircadia-assets` submodule
Gigabyte5671 Oct 24, 2023
0e885aa
Merge branch 'master' into feature/desktop-wrapper
Gigabyte5671 Oct 24, 2023
e7680a2
Update build_desktop.yml
Gigabyte5671 Oct 24, 2023
3bbc271
Update README.md
Gigabyte5671 Oct 24, 2023
f7e7bec
Update package-lock.json
Gigabyte5671 Oct 24, 2023
e27b550
Reduce the number of warnings coming from `LODManager.ts`
Gigabyte5671 Oct 24, 2023
05705e3
Fix invisible nametag corners
Gigabyte5671 Oct 24, 2023
b83a14d
Merge pull request #192 from vircadia/feature/desktop-wrapper
digisomni Oct 24, 2023
c3e407f
Rename NametagEntity to LabelEntity for clarity
Gigabyte5671 Oct 24, 2023
55c963f
Housekeeping
Gigabyte5671 Oct 24, 2023
1162454
Fix avatar labels turning grey when display name changes
Gigabyte5671 Oct 24, 2023
5f8539f
Add a link to the Tauri prerequisites
Gigabyte5671 Oct 24, 2023
6147c84
Fix scripts, update README.
Oct 25, 2023
19b801d
Update video src.
Oct 25, 2023
b8119a3
Merge pull request #200 from vircadia/update/labels
digisomni Oct 25, 2023
7899e97
Update GHA.
Oct 25, 2023
ec5a0ed
Reduce the vertex count of LabelEntities
Gigabyte5671 Oct 26, 2023
98f1c00
Update README.md
Gigabyte5671 Nov 9, 2023
c9aa255
Update desktop build workflow
Gigabyte5671 Nov 9, 2023
e82156e
Update README.md
Gigabyte5671 Nov 9, 2023
32f4c12
Lint and styling.
digisomni Nov 14, 2023
917826e
Fix my avatar being unnecessarily reloaded.
digisomni Nov 14, 2023
b09080e
Merge pull request #210 from vircadia/fix/optimize-perf-domain-switch
digisomni Nov 25, 2023
c0bb0e9
Revert "Fix my avatar being unnecessarily reloaded."
digisomni Nov 30, 2023
7b30aaa
Add test file, glTF works.
digisomni Feb 7, 2024
209325b
WIP
digisomni Feb 8, 2024
0162a5d
Init v0.1 of LightmapManager.
digisomni Feb 8, 2024
1ba840b
Fix warnings, kind of.
digisomni Feb 8, 2024
62d2db2
Fix types and typos in LODManager causing issues. Disable some eslint…
digisomni Feb 9, 2024
5ce7546
Fix further typos on refactor of LODManager.
digisomni Feb 9, 2024
dde0d3d
Fix lightmap and metadata handling in general; fix warnings.
digisomni Feb 10, 2024
70b4d0f
Update metadata and props handling for Lightmaps.
digisomni Feb 11, 2024
d79cb1d
Fix typo.
digisomni Feb 11, 2024
3751503
Merge pull request #212 from vircadia/feature/lightmap_support
digisomni Feb 22, 2024
b268715
WebRTC ICE servers configuration option.
Mar 4, 2024
16e3c53
Updated package-lock.json.
Mar 4, 2024
710008e
Update vers.
digisomni Mar 4, 2024
f79f771
Merge pull request #214 from namark/ice_server_config
digisomni Mar 4, 2024
b8fc2df
Setup local file testing instructions.
digisomni Mar 22, 2024
c98a20b
Fixed Metaverse API requests with JSON body.
Apr 4, 2024
2f84163
Fixed Metaverse user registration request format.
Apr 4, 2024
527315b
Merge pull request #215 from namark/metaverse-registration-fix
digisomni Apr 4, 2024
e33ee6c
Toolbar button to release web entity input focus.
Apr 11, 2024
5fdc491
Merge branch 'master' into pr/217
digisomni Apr 11, 2024
59a8daf
Bump package versions.
digisomni Apr 11, 2024
8932cf8
Fix typo, add placeholder funcs.
digisomni Apr 11, 2024
4a6c79a
Remove interactivity control for scene.
digisomni Apr 11, 2024
2269ddd
Fix for web entity release button visibility.
Apr 11, 2024
86f6a56
Update button styling + lint.
digisomni Apr 11, 2024
2ae2e36
Merge pull request #217 from namark/release-web-entity-button
digisomni Apr 11, 2024
56ae9b3
Add test for switching lightmap modes with "u" key.
digisomni Apr 18, 2024
cbf0bc9
Revisions to handling [WIP].
digisomni Apr 26, 2024
d4f8484
Update.
digisomni Apr 26, 2024
0a052f5
Update lightmap manager.
digisomni May 1, 2024
53710db
Merge pull request #218 from vircadia/feature/light-handling
digisomni May 2, 2024
34853b6
Test workflow.
digisomni May 14, 2024
76896af
Bump Quasar versions.
digisomni May 14, 2024
68f5ba9
Merge pull request #219 from vircadia/feature/bump-versions
digisomni May 15, 2024
d5c3561
Update README.md
digisomni May 15, 2024
a4d6310
Added a config variable for hiding in world position and rotation fro…
Jun 11, 2024
119b466
Lint.
digisomni Jun 13, 2024
be3a734
Merge pull request #220 from namark/setting-to-hide-in-world-location
digisomni Jun 13, 2024
f929740
Fix bug causing collisions to default to "none" due to undefined shap…
digisomni Jun 15, 2024
357324e
Bump package-lock.json with new Babylon vers.
digisomni Jun 15, 2024
fc0f4ea
Fix vircadia world submodule.
digisomni Jun 15, 2024
5111acb
Merge pull request #221 from vircadia/fix/model-shape-types-physics
digisomni Jun 15, 2024
e10bfc1
Remove forum link.
digisomni Jul 3, 2024
62f31f2
Upgrade packages, slight housekeeping.
digisomni Jul 8, 2024
d127ef7
2024.1.2: Major package bumps, theme fixes, begin addition of Vircadi…
digisomni Sep 6, 2024
bea1e0b
Feature/2024.2.0 (#225)
digisomni Sep 30, 2024
3b58c6f
2024.2.1 (#226)
digisomni Oct 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
.eslintrc.js
postcss.config.js
quasar.config.js
/.quasar
/build_scripts
/dist
/src/libs
/node_modules
/public/assets
/src/*.d.ts
/src-bex/www
/src-capacitor
/src-cordova
/.quasar
/node_modules
.eslintrc.js
babel.config.js
/src-ssr
quasar.conf.js
/src/libs
vircadia-web-sdk
817 changes: 399 additions & 418 deletions .eslintrc.js

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions .github/workflows/build_desktop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: '🖥️ Desktop Build'
on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
workflow_dispatch:

jobs:
desktop-build:
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-20.04, windows-latest]

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 20.x

- name: Install Rust
uses: dtolnay/rust-toolchain@stable

- name: Install Dependencies (Ubuntu Only)
if: matrix.platform == 'ubuntu-20.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf

- name: Install Dependencies
run: npm ci

- name: Build
env:
NODE_OPTIONS: "--max_old_space_size=4096"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VRCA_DESKTOP_MODE: build
run: cd desktop && npm run tauri build

- name: Upload Build
uses: actions/upload-artifact@v3
with:
name: build-desktop-${{ matrix.platform }}-${{ github.event.number }}
path: |
${{ runner.workspace }}/vircadia-web/desktop/src-tauri/target/release/bundle/**/*.app
${{ runner.workspace }}/vircadia-web/desktop/src-tauri/target/release/bundle/**/*.dmg
${{ runner.workspace }}/vircadia-web/desktop/src-tauri/target/release/bundle/**/*.deb
${{ runner.workspace }}/vircadia-web/desktop/src-tauri/target/release/bundle/**/*.AppImage
${{ runner.workspace }}/vircadia-web/desktop/src-tauri/target/release/bundle/**/*.msi
${{ runner.workspace }}/vircadia-web/desktop/src-tauri/target/release/bundle/**/*.exe
if-no-files-found: error
34 changes: 34 additions & 0 deletions .github/workflows/build_web.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Test the latest changes.
name: ⚙️ Web Build
on:
# Triggers the workflow on PRs in "master" and push events in every branch except "master".
push:
branches-ignore:
- master
pull_request:
branches: [ "master" ]

# Allows this workflow to be run manually from the Actions tab.
workflow_dispatch:

jobs:
web-build:
name: ⚒️ Build
runs-on: ubuntu-latest
steps:
- name: 🚚 Get latest code
uses: actions/checkout@v3
with:
submodules: recursive

- uses: actions/setup-node@master
with:
node-version: 20.x

- name: 📥 Install project dependencies
run: npm install

- name: ⚒️ Build the project
env:
NODE_OPTIONS: "--max_old_space_size=4096"
run: npm run build
41 changes: 41 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Automatically deploy the latest changes to the FTP server.
on:
# Triggers the workflow on push events but only for the "master" branch.
push:
branches: [ "master" ]

# Allows this workflow to be run manually from the Actions tab.
workflow_dispatch:

name: 🚀 Auto-Deploy
jobs:
web-deploy:
name: 🎉 Deploy
runs-on: ubuntu-latest
steps:
- name: 🚚 Get latest code
uses: actions/checkout@v3
with:
submodules: recursive

- uses: actions/setup-node@master
with:
node-version: 20.x

- name: 📥 Install project dependencies
run: npm install

- name: ⚒️ Build the project
env:
NODE_OPTIONS: "--max_old_space_size=4096"
run: npm run build

- name: 📂 Sync files
uses: SamKirkland/[email protected]
with:
server: ftp.vircadia.com
username: ${{ secrets.ftp_username }}
password: ${{ secrets.ftp_password }}
local-dir: dist/spa/
server-dir: /
dry-run: false
26 changes: 26 additions & 0 deletions .github/workflows/pr_to_master_clean.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Automatically deploy the latest changes of a branch to the FTP server.
on:
# Triggers the workflow on PRs in "master"
pull_request:
branches: [ "master" ]
types: [ "closed" ]

# Allows this workflow to be run manually from the Actions tab.
workflow_dispatch:


name: 🧹 PR Auto-Deploy Cleanup
jobs:
web-deploy-cleanup:
name: 🧹 PR Auto-Deploy Cleanup
runs-on: ubuntu-latest
steps:
- name: 🧹 Clean files and folder
uses: StephanThierry/[email protected]
with:
host: ftp.vircadia.com
user: ${{ secrets.ftp_username }}
password: ${{ secrets.ftp_password }}
remoteDirectories: "/${{ github.head_ref }}"
workingDir: "/staging"
ignoreSSL: "1"
42 changes: 42 additions & 0 deletions .github/workflows/pr_to_master_deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Automatically deploy the latest changes of a branch to the FTP server.
on:
# Triggers the workflow on PRs in "master"
pull_request:
branches: [ "master" ]

# Allows this workflow to be run manually from the Actions tab.
workflow_dispatch:

name: 🚀 PR Auto-Deploy
jobs:
web-deploy:
name: 🎉 Deploy
runs-on: ubuntu-latest
steps:
- name: 🚚 Get latest code
uses: actions/checkout@v3
with:
submodules: recursive

- uses: actions/setup-node@master
with:
node-version: 20.x

- name: 📥 Install project dependencies
run: npm install

- name: ⚒️ Build the project
env:
NODE_OPTIONS: "--max_old_space_size=4096"
VRCA_HOSTED_URL: "https://app.vircadia.com/staging/${{ github.head_ref }}/"
run: npm run build

- name: 📂 Sync files
uses: SamKirkland/[email protected]
with:
server: ftp.vircadia.com
username: ${{ secrets.ftp_username }}
password: ${{ secrets.ftp_password }}
local-dir: dist/spa/
server-dir: /staging/${{ github.head_ref }}/
dry-run: false
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ node_modules
.quasar
/dist

# Web workers copied from dependencies.
/public/js

# Cordova related directories and files
/src-cordova/node_modules
/src-cordova/platforms
Expand All @@ -26,9 +29,36 @@ yarn-debug.log*
yarn-error.log*

# Editor directories and files
/.vs
.idea
*.suo
*.ntvs*
*.njsproj
*.sln
VERSION.json

# Ignore BabylonJS_Docs folder
/BabylonJS_Docs/
public/local-assets/cityscape2048f.png
public/local-assets/Collisions_10-25-2023.glb
public/local-assets/Decor_10-25-2023.glb
public/local-assets/Foliage_10-25-2023.glb
public/local-assets/FurnitureCulling_10-25-2023.glb
public/local-assets/Headquarters_10-25-2023.glb
public/local-assets/Hologram_10-25-2023.glb
public/local-assets/LandscapeTilesLOD_10-25-2023.glb
public/local-assets/LandscapeTrimLOD_10-25-2023.glb
public/local-assets/LandscapeWalkwayLOD_10-25-2023.glb
public/local-assets/OuterWrap_10-25-2023.glb
public/local-assets/Path_10-25-2023.glb
public/local-assets/Reflections1k.hdr
public/local-assets/SitObjects_10-25-2023.glb
public/local-assets/SitObjectsNoSit_10-25-2023.glb
public/local-assets/Water_10-25-2023.glb
public/local-assets/Waterfalls_10-25-2023.glb
src/modules/directory_structure.txt
public/local-assets/Skybox2k.png
public/local-assets/Reflections4.hdr
public/local-assets/monkey.glb
public/local-assets/Cylinder.glb
public/local-assets/Meters.glb
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "public/assets"]
path = public/assets
url = https://github.com/vircadia/vircadia-assets.git
[submodule "src/vircadia-world"]
path = src/vircadia-world
url = https://github.com/vircadia/vircadia-world.git
41 changes: 0 additions & 41 deletions .grenrc.js

This file was deleted.

3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# pnpm-related options
shamefully-hoist=true
strict-peer-dependencies=false
8 changes: 0 additions & 8 deletions .postcssrc.js

This file was deleted.

6 changes: 0 additions & 6 deletions .prettierrc

This file was deleted.

6 changes: 4 additions & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"octref.vetur"
"editorconfig.editorconfig",
"vue.volar",
"wayou.vscode-todo-highlight"
],
"unwantedRecommendations": [
"octref.vetur",
"hookyqr.beautify",
"dbaeumer.jshint",
"ms-vscode.vscode-typescript-tslint-plugin"
Expand Down
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// 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": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:9000",
"webRoot": "${workspaceFolder}"
}
]
}
23 changes: 16 additions & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
{
"vetur.validation.template": false,
"vetur.format.enable": false,
"eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
"typescript.tsdk": "node_modules/typescript/lib",
"vetur.experimental.templateInterpolationService": true
}
{
"editor.formatOnSave": true,
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.codeActionsOnSave": ["source.fixAll.eslint"],
"eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
"typescript.tsdk": "node_modules/typescript/lib",
"[typescript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
Loading
Loading