Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
545 commits
Select commit Hold shift + click to select a range
349fd0e
Revert use of cloud-edition path
hobinjk-ptc Jun 16, 2022
a5f36bb
Merge pull request #37 from ptcrealitylab/cloud-edition
hobinjk-ptc Jun 16, 2022
6171aef
Add destination to discoverProviders
hobinjk-ptc Jun 22, 2022
a75ffd8
Discard messages not meant for us
hobinjk-ptc Jun 22, 2022
85618f0
Turn off depthWrite for transparent material
hobinjk-ptc Jun 22, 2022
d81b07f
Scale down patch mesh sampling density
hobinjk-ptc Jun 27, 2022
90f58f0
adds support for avatar objects (creates one after world gltf model l…
benptc Jun 27, 2022
e3bbbb9
optimize VirtualCamera to stop animating when it is within 0.00001 of…
benptc Jun 28, 2022
5d8ff2c
update VirtualCamera to use API for setting cameraSceneNode position,…
benptc Jun 30, 2022
a241e86
Add persistence for patches across page refreshes
hobinjk-ptc Jun 30, 2022
3beff18
Paper over possible race condition in startup
hobinjk-ptc Jun 30, 2022
056ae88
Connect consumer to consumer through audio channels
hobinjk-ptc Jun 30, 2022
49456d2
Add guard on missing idToSocket dest
hobinjk-ptc Jun 30, 2022
99afedf
update FPS stats to show in top right corner
benptc Jul 7, 2022
781683c
VirtualCamera sets threejs camera position
benptc Jul 7, 2022
9c0bd0c
updates camera following based on new threejs coordinates
benptc Jul 7, 2022
ca319c9
Pass floorOffset to desktopCamera
hobinjk-ptc Jul 7, 2022
09e50cc
Also filter consumers
hobinjk-ptc Jul 8, 2022
d1c49a4
Merge pull request #40 from ptcrealitylab/three-js-camera-paradigm
benptc Jul 11, 2022
82a446d
Use virtualizer mesh in first person view; Allow switching camera sha…
hobinjk-ptc Jul 8, 2022
32c9940
Further simplify first person shader
hobinjk-ptc Jul 8, 2022
8e573a4
Merge branch 'main' into avatar-objects-merge
benptc Jul 11, 2022
63703bb
set USE_ICOSAHEDRON=false in multiclientUI.js to make other remote op…
benptc Jul 12, 2022
74d3721
adds SHIFT keyboard shortcut to trigger laser beam
benptc Jul 12, 2022
086359e
turnoff camera smoothing when in first person
benptc Jul 12, 2022
cadab56
Merge pull request #42 from ptcrealitylab/avatar-objects-merge
benptc Jul 12, 2022
cda882b
Default stats to hidden; Fix mixed tabs and spaces
hobinjk-ptc Jul 12, 2022
4100b02
updates settingtoggle to use new options
benptc Jul 12, 2022
8a8c3e3
Merge pull request #43 from ptcrealitylab/update-settings-parameter
benptc Jul 12, 2022
0888e89
first attempts (unsuccessful) about making camera follow curve follow…
benptc Jul 14, 2022
069a585
almost working stabilized camera
benptc Jul 14, 2022
910c7b1
after a lot of messy work, got the camera to follow a stabilized vert…
benptc Jul 14, 2022
a0916f9
significant cleanup to camera following code
benptc Jul 15, 2022
b434099
further cleanup VirtualCamera.js
benptc Jul 15, 2022
0f7a002
further cleanup desktopCamera.js
benptc Jul 15, 2022
a465e74
final cleanup of camera follow improvements
benptc Jul 15, 2022
19d94a3
fixup previous commit
benptc Jul 15, 2022
cbb3599
adds Follow Next Target and Follow Previous Target menu items (Left a…
benptc Jul 18, 2022
f4de9b1
explicitly turnoff 2d render when jump to non-first-person perspective
benptc Jul 18, 2022
160b545
address reviewer commits
benptc Jul 18, 2022
1d855dd
Merge pull request #44 from ptcrealitylab/follow-curve-up-vector
benptc Jul 18, 2022
b259621
Merge branch 'main' into follow-switch-target
benptc Jul 18, 2022
ca88fe3
Merge pull request #45 from ptcrealitylab/follow-switch-target
benptc Jul 18, 2022
afca3fe
make groundplane show in grey by default on remote operator
benptc Jul 21, 2022
520f599
snap camera target to virtualizer position when you rotate/pan to sto…
benptc Jul 21, 2022
027c80a
robust solution to snap camera focus to a point 1 meter in front of t…
benptc Jul 21, 2022
e5dfde2
Merge pull request #46 from ptcrealitylab/groundplane-color
benptc Jul 21, 2022
d488f5a
clarify potentially misleading comment
benptc Jul 21, 2022
62371ae
Merge pull request #47 from ptcrealitylab/improve-camera-follow-break…
benptc Jul 22, 2022
6de4b69
Add load marker element
hobinjk-ptc Jul 22, 2022
a9c786e
Only add new providers
hobinjk-ptc Jul 22, 2022
2570e94
use new avatar detection function
benptc Jul 25, 2022
a14b25e
Merge pull request #48 from ptcrealitylab/fix-avatar-flakiness
benptc Jul 25, 2022
8294843
remove keyboard shortcut to make P key show/hide groundplane anchors,…
benptc Jul 26, 2022
0450026
Merge pull request #49 from ptcrealitylab/remove-old-key-shortcut
benptc Jul 26, 2022
a51f751
adds Develop Menu that you can show/hide from the help menu. Adds Sho…
benptc Jul 27, 2022
5a459e2
Merge pull request #50 from ptcrealitylab/menubar-updates
benptc Jul 27, 2022
ae0a1a9
update for new avatar namespace
benptc Jul 29, 2022
51576f9
Merge pull request #51 from ptcrealitylab/avatar-refactor
benptc Aug 2, 2022
a97b3e0
Make patch code more resilient
hobinjk-ptc Aug 2, 2022
bd6520f
Add pref for old fullscreen color canvas behavior
hobinjk-ptc Aug 3, 2022
fd7af4b
Default to no spaghetti
hobinjk-ptc Aug 3, 2022
dcbc111
Bring back local websocket for poses
hobinjk-ptc Aug 3, 2022
f32c690
Support wsShim of root
hobinjk-ptc Aug 3, 2022
7596823
Fix typo
hobinjk-ptc Aug 4, 2022
8fb9118
Add RVL encoding support
hobinjk-ptc Aug 4, 2022
42b0d3f
Add png fallback to webrtc channel's depth support
hobinjk-ptc Aug 5, 2022
2d83d19
Allow working on alpha.toolboxedge.net and other subdomains
hobinjk-ptc Aug 8, 2022
736e423
Use full-range rgb depth representation
hobinjk-ptc Aug 8, 2022
c1cd8eb
Disable clicking to show PiP
hobinjk-ptc Aug 8, 2022
f231abf
trigger the new network/discovery.js to process heartbeats
benptc Aug 16, 2022
f432d16
Add support for leaveNetwork command
hobinjk-ptc Aug 16, 2022
497740f
Pref off nearly all debugging
hobinjk-ptc Aug 16, 2022
9816c60
Use builtin three-mesh-bvh
hobinjk-ptc Aug 17, 2022
663ee3a
Merge branch 'main' into refactor-discovery
benptc Aug 17, 2022
0282459
Merge pull request #57 from ptcrealitylab/refactor-discovery
benptc Aug 22, 2022
8d93390
Support new RVL frame format
hobinjk-ptc Aug 22, 2022
7929473
Fix sceneNode case
hobinjk-ptc Aug 22, 2022
5ed77c4
Fix SceneNode case
hobinjk-ptc Aug 22, 2022
5a6c12c
Filter out 0 length messages
hobinjk-ptc Aug 22, 2022
df9dfa3
Add OpenRelay TURN as a stopgap for special networks
hobinjk-ptc Aug 24, 2022
1806f2c
Support Voxelizer as optional service
hobinjk-ptc Aug 24, 2022
d659f3b
suppress rendering of tools until world mesh has loaded
benptc Aug 25, 2022
bea58d9
use object rendering suppression flag while mesh is loading, to be co…
benptc Aug 25, 2022
afdf218
Merge branch 'main' into suppress-early-rendering
benptc Aug 25, 2022
a81f92e
Merge pull request #60 from ptcrealitylab/suppress-early-rendering
benptc Aug 25, 2022
9cc6c58
Switch to turn.meta.ptc.io
hobinjk-ptc Aug 25, 2022
8209273
Clean up code
hobinjk-ptc Aug 25, 2022
7ecabb0
Re-enable first person shader
hobinjk-ptc Aug 25, 2022
b1ad075
Skip matrix buffering when using RVL frame
hobinjk-ptc Aug 25, 2022
9653003
Only update textures when updating matrix
hobinjk-ptc Aug 25, 2022
17a7982
Drive update of virtualcamera using CameraVis when in 1st person mode
hobinjk-ptc Aug 25, 2022
7e36f66
Use custom camera control in first person CameraVis
hobinjk-ptc Aug 26, 2022
c158441
Limit max depth
hobinjk-ptc Aug 26, 2022
cf6e2ba
Update for three r142
hobinjk-ptc Aug 30, 2022
15e4ae9
Reuse existing webrtc connection in initConnection
hobinjk-ptc Sep 8, 2022
15147c6
Deduplicate idToSocket during broadcast
hobinjk-ptc Sep 8, 2022
299e9c8
Refine connection reuse logic
hobinjk-ptc Sep 8, 2022
83f86e7
update getWorldPosition for new three.js version
benptc Sep 12, 2022
cb4f5d1
Exit first person camera on mouse input
hobinjk-ptc Sep 12, 2022
8b28432
Convert rawDepth units in voxelizer
hobinjk-ptc Sep 14, 2022
c193bd9
Manually hide side bones since humans don't have bones there
hobinjk-ptc Sep 14, 2022
bd2b95f
Fix typos; Add missing joints to soup
hobinjk-ptc Sep 14, 2022
b0c7b79
Use correct aspect ratio for debug depth cube
hobinjk-ptc Sep 14, 2022
697eb19
Use depth width and height over rgb dimensions to reflect design
hobinjk-ptc Sep 14, 2022
683d184
Re-enable texture filtering/smoothing
hobinjk-ptc Sep 14, 2022
3f8618f
Lint: Remove unused variable
hobinjk-ptc Sep 14, 2022
a64cdc9
Add lenience to normal-based alpha component
hobinjk-ptc Sep 14, 2022
c1be8cb
Pretend cameravis textures are video textures to trigger fast upload …
hobinjk-ptc Sep 14, 2022
0220769
Mark data channel as arraybuffer
hobinjk-ptc Sep 14, 2022
012c299
Refine skeleton history line visualization
hobinjk-ptc Sep 15, 2022
4a096f4
Remove old cameras during coordinator update
hobinjk-ptc Oct 7, 2022
4920ec9
Use unreliable data channel
hobinjk-ptc Oct 7, 2022
ccb5d92
Make loading sequence more robust
hobinjk-ptc Oct 7, 2022
56b6465
Remove arbitrary 100ms delay
hobinjk-ptc Oct 7, 2022
543ce78
Swap debug logs to use console.debug
hobinjk-ptc Oct 11, 2022
1934af5
Clean up unused variables
hobinjk-ptc Oct 11, 2022
1a00ed6
Reduce log verbosity and add context to logs
hobinjk-ptc Oct 11, 2022
e1990c8
scale down the blue icon in the center of the screen if you get too c…
benptc Oct 19, 2022
adcdb0e
removes event.preventDefault from KeyboardListener.js
benptc Oct 20, 2022
9676f87
Merge pull request #71 from ptcrealitylab/keyboard-event-capture
benptc Oct 20, 2022
8dc8696
Merge pull request #70 from ptcrealitylab/limit-center-icon-scale
benptc Oct 20, 2022
2c3ae05
Move all human pose rendering to userinterface
hobinjk-ptc Oct 20, 2022
1da3ecc
Update voxelizer to use true octtree for additions and removals
hobinjk-ptc Oct 18, 2022
fdeed44
Add menu commands for clone feature; Update naming of history line fu…
hobinjk-ptc Oct 25, 2022
72dc959
Fix resolve after reject
hobinjk-ptc Nov 2, 2022
d83b36b
Add so many safeguards for out-of-order initialization of RO modules
hobinjk-ptc Nov 2, 2022
846e527
Fix lint errors
hobinjk-ptc Nov 2, 2022
9537ce7
Ensures remote operator only loads the world object of the server it …
dangond-ptc Nov 8, 2022
d3c5bcb
Missed a comment
dangond-ptc Nov 8, 2022
7a4e08c
Improve isDesktop logic
hobinjk-ptc Nov 3, 2022
41350df
Fixed camera disposal not working if it was the last camera in the scene
dangond-ptc Nov 15, 2022
eb384c2
avoid unnecessary closure creation
dangond-ptc Nov 15, 2022
b6ab330
Merge pull request #78 from ptcrealitylab/expired-cameravis-bugfix
dangond-ptc Nov 15, 2022
3990ed9
increase near plane from 0.1 to 10 to fix flickering renderer bug
benptc Nov 22, 2022
f97e979
Add spatial audio
hobinjk-ptc Nov 8, 2022
d7afb1e
Always enable UndoPatch menu item
hobinjk-ptc Nov 21, 2022
05260eb
Adjust desktopRenderer to only attach to menubar when available
hobinjk-ptc Nov 22, 2022
7a127cf
Gracefully fallback if missing ffmpeg-installer
hobinjk-ptc Nov 22, 2022
7eb2626
Merge pull request #80 from ptcrealitylab/fix-near-plane
benptc Nov 22, 2022
377fa37
Revert "Add spatial audio"
hobinjk-ptc Nov 28, 2022
d7bbca8
CameraVis historyLine uses MeshPath instead of MeshLine
benptc Nov 22, 2022
e2106c7
swaps CameraVis path to SpaghettiMeshPath
benptc Nov 30, 2022
216d168
fixup spaghettiMeshPath
benptc Nov 30, 2022
38b26b4
address reviewer comments
benptc Dec 1, 2022
f5293fd
Merge pull request #81 from ptcrealitylab/mesh-path
benptc Dec 1, 2022
b8d81f2
sets cone center and direction based on CameraVis
benptc Dec 1, 2022
c0266d4
passes frustum planes to area target shader
benptc Dec 2, 2022
81028cb
properly interact with frustum shader
benptc Dec 6, 2022
8820531
begin refactor
benptc Dec 6, 2022
49edadc
cleanup multiple culling frustums
benptc Dec 7, 2022
4b69173
properly remove frustum when cameravis disconnects
benptc Dec 8, 2022
7bbadb2
Merge pull request #82 from ptcrealitylab/shader-frustum-refactor
benptc Dec 9, 2022
0e8e1c7
Adjust z offset based on fraction of depth in addition to baseline
hobinjk-ptc Nov 30, 2022
eb4054f
Add support for depthMin and depthMax uniforms
hobinjk-ptc Nov 30, 2022
790e403
Add green border to CameraVis pointclouds
hobinjk-ptc Nov 30, 2022
09f1792
Add proof-of-concept overwrought patch loading animation
hobinjk-ptc Nov 30, 2022
a6e64c5
Trim trailing whitespace
hobinjk-ptc Nov 30, 2022
d121695
Add Visual Diff lens and ability to switch camera lenses
hobinjk-ptc Dec 1, 2022
2fe7354
Only swap canvas dimensions when necessary
hobinjk-ptc Dec 1, 2022
933f65e
Remove most of depth adjustment
hobinjk-ptc Dec 9, 2022
c1ae58d
Remove alphaDepth adjustment
hobinjk-ptc Dec 9, 2022
4de4e42
Speed up patch loading animation
hobinjk-ptc Dec 9, 2022
a775173
CameraVis stores maxDepthMeters on each update
benptc Dec 9, 2022
936375a
Add "delete all tools" function in the Developer Menu
Steve-KX-RL Dec 13, 2022
4ff83c9
Add a flying camera
Steve-KX-RL Dec 13, 2022
6e58d84
Merge branch 'main' of https://github.com/ptcrealitylab/vuforia-spati…
Steve-KX-RL Dec 13, 2022
4d31351
Add mute/unmute to WebRTCCoordinator; Keep reference to WebRTCCoordin…
hobinjk-ptc Jan 31, 2023
7dcd7af
Add noise supression to microphone stream
hobinjk-ptc Feb 10, 2023
18565a0
Increase mic gain
hobinjk-ptc Feb 10, 2023
cc6e4dc
adjust the drop distance for new tools to be placed at the camera foc…
benptc Feb 13, 2023
28ea1fe
document newFrameDistanceMultiplier statement
benptc Feb 13, 2023
8889c71
Merge pull request #88 from ptcrealitylab/drop-tools-at-camerafocus
benptc Feb 13, 2023
83a18a9
Changes for Analytics Settings UI
dangond-ptc Mar 1, 2023
538c522
Renamed settings ui toggle
dangond-ptc Mar 2, 2023
f572b48
Merge pull request #89 from ptcrealitylab/analyticsUI
dangond-ptc Mar 2, 2023
7eefdf3
updates to use userinterface isDesktop function instead of a duplicat…
benptc Mar 3, 2023
60f16a2
Merge pull request #90 from ptcrealitylab/isDesktop
benptc Mar 3, 2023
13b7347
mute/unmute implementation for remote operator by intercepting appFun…
benptc Mar 3, 2023
4fb4d90
Merge pull request #91 from ptcrealitylab/mute-microphone
benptc Mar 3, 2023
c425b87
set new primaryWorld based on ?world query item, and trust the networ…
benptc Mar 6, 2023
274cf87
Merge pull request #92 from ptcrealitylab/properly-set-primary-world
benptc Mar 7, 2023
11e24ca
fix warning if muting when no audio established
benptc Mar 7, 2023
8d718bb
Merge pull request #93 from ptcrealitylab/fix-mute-warning
benptc Mar 7, 2023
cb3f086
add a constant to set the CONNECTION_TIMEOUT_MS for the cameraVis, an…
benptc Mar 8, 2023
e06eb28
adds MenuBar item to toggle DarkMode on/off (defaults to dark mode)
benptc Mar 21, 2023
f4f15f8
recalculates projection matrix when onWindowResized is triggered
benptc Mar 22, 2023
5da7c53
Merge pull request #96 from ptcrealitylab/dark-mode-support
benptc Mar 22, 2023
dc9973c
Merge pull request #97 from ptcrealitylab/window-resize
benptc Mar 22, 2023
cb221ca
Remote operator off-center camera
Steve-KX-RL Mar 24, 2023
f12d61b
Support initializing CameraVis with avatar-provided accent color
hobinjk-ptc Mar 29, 2023
024c54f
Allow setting cameravis color later when data available
hobinjk-ptc Mar 29, 2023
139206d
Human tracking multiple cameras (#100)
ptc-mklaudiny Apr 3, 2023
bfa56be
Off center camera gui updates based on last comments
Steve-KX-RL Apr 11, 2023
66673b5
Prevent from zooming too close
Steve-KX-RL Apr 11, 2023
4d6da30
Added normal/fly mode switching prompt at top of the screen
Steve-KX-RL Apr 11, 2023
3b7b5f3
Merge remote-tracking branch 'origin/main' into Steve-Remote-Operator…
Steve-KX-RL Apr 11, 2023
6a9919e
Normal/fly mode prompt visual iteration + Fly mode pointerlock update
Steve-KX-RL Apr 12, 2023
58a1378
removes E shortcut key from ToggleAnalyticsSettings
benptc Apr 13, 2023
ebdf7dc
change cameraTargetElement to rotateCenterElement, for the new off ce…
Steve-KX-RL Apr 14, 2023
db3723d
Update desktopCamera.js
Steve-KX-RL Apr 14, 2023
8e6f562
Remote-operator-fly-mode-ESC-key-fix
Steve-KX-RL Apr 18, 2023
89a4c1c
Zooming fixed & added keyboard G prompt
Steve-KX-RL Apr 18, 2023
bd6e4ec
default view frustums to disabled; toggle in View menu turns on frust…
benptc Apr 18, 2023
937cf43
Merge pull request #103 from ptcrealitylab/disable-frustum-cutout
benptc Apr 19, 2023
64be2f4
Retrieve camera intrinsics from RVL to make CameraVis more accurate
hobinjk-ptc Apr 19, 2023
64bcdb8
Use camera-provided width and height; Use focalLength with correct units
hobinjk-ptc Apr 20, 2023
ac3efb0
Merge pull request #98 from ptcrealitylab/Steve-Remote-Operator-Off-C…
benptc Apr 20, 2023
2cde69b
Merge branch 'main' into Steve-rotateCenterElement-update
benptc Apr 21, 2023
89918ac
Merge pull request #101 from ptcrealitylab/Steve-rotateCenterElement-…
benptc Apr 21, 2023
6089962
Merge remote-tracking branch 'origin/main' into Remote-operator-fly-m…
Steve-KX-RL Apr 21, 2023
c3afc38
Merge pull request #105 from ptcrealitylab/ESC-key-G-focus-Zooming-ou…
benptc Apr 21, 2023
daa3aa1
Add borderEnabled uniform to CameraVis shader for patches
hobinjk-ptc Apr 26, 2023
4e497ed
Fix width vs height typo
hobinjk-ptc Apr 26, 2023
422f2aa
Update patch loading animation to one inspired by a certain movie
hobinjk-ptc Apr 26, 2023
e33eae0
Allow Undo Patch to work even when localStorage persistence fails
hobinjk-ptc Apr 26, 2023
12fa2c3
Make this.patches an object
hobinjk-ptc Apr 27, 2023
dff05f6
Camera spaghetti now selectable and compatible with new spaghetti system
dangond-ptc May 1, 2023
107d9bb
Merge pull request #109 from ptcrealitylab/camera-spaghetti-update
dangond-ptc May 3, 2023
7154d7a
Fixed remote operator following camera position below bug
Steve-KX-RL May 5, 2023
46fab7a
Merge pull request #110 from ptcrealitylab/Fix-camera-following-posit…
Steve-KX-RL May 5, 2023
94f1380
Fixed orbiting bug
Steve-KX-RL May 8, 2023
088a008
Merge pull request #111 from ptcrealitylab/orbiting-bug-fix
Steve-KX-RL May 9, 2023
d10d317
Treat CameraVis border transparency+culling the same as the rest of t…
hobinjk-ptc May 8, 2023
93cdc9d
Add menu item to delete all patches
hobinjk-ptc May 8, 2023
cebbe50
Clean up code
hobinjk-ptc May 8, 2023
8ff9838
Made following camera tilting angle more responsive to the phone
Steve-KX-RL May 9, 2023
1d7cf7e
Merge pull request #114 from ptcrealitylab/following-camera-angle-fix
benptc May 9, 2023
405c41c
Menu shortcuts no longer trigger when modifiers held
dangond-ptc May 25, 2023
475814e
Add full keyboard modifier support to Menu Items
dangond-ptc May 25, 2023
4f67fb1
Merge pull request #116 from ptcrealitylab/menuModifierShortcuts
dangond-ptc May 25, 2023
224cda6
Added ability to save and load camera positions
dangond-ptc May 25, 2023
a5806f3
bugfix
dangond-ptc May 25, 2023
0a5f404
Merge pull request #117 from ptcrealitylab/saveCameraPosition
dangond-ptc May 25, 2023
af4af1f
Updates isDesktop() to !isARMode() to make the model load on mobile s…
benptc May 26, 2023
4faf823
begin adding multitouch controls to ipad browser, disable default mul…
benptc May 26, 2023
c2676ca
Fine tune Virtual Camera focus parameters
Steve-KX-RL May 26, 2023
6b9119d
Merge pull request #118 from ptcrealitylab/Fine-tune-virtual-camera-f…
Steve-KX-RL May 26, 2023
e9adc4b
Fixed a bug - need to convert principal point from image Y-axis botto…
ptc-mklaudiny May 25, 2023
def70ca
Fix issue with being unable to load first camera position after refresh
dangond-ptc May 30, 2023
b9eed94
cleanup touch listeners and performance improvements for mobile remot…
benptc May 31, 2023
a35d3db
Merge branch 'main' into mobile-remote-operator
benptc May 31, 2023
d6ac0dd
cleanup
benptc May 31, 2023
f72823a
respond to reviewer comments
benptc Jun 1, 2023
21c7042
Merge pull request #119 from benptc/mobile-remote-operator
benptc Jun 1, 2023
b17c6dd
Fix a bug where mouse wheel (not touchpad) scrolls so fast that camer…
Steve-KX-RL Jun 1, 2023
7c5b374
Merge pull request #120 from ptcrealitylab/mouse-wheel-zooming-bug-fix
Steve-KX-RL Jun 1, 2023
1e26681
Fixed camera panning slow speed after rotating
Steve-KX-RL Jun 12, 2023
3eebd9c
Merge pull request #121 from ptcrealitylab/camera-panning-speed-bug-fix
Steve-KX-RL Jun 13, 2023
c146a8e
Update VirtualCamera.js
Steve-KX-RL Jun 14, 2023
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
33 changes: 33 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
module.exports = {
'env': {
'browser': true,
'es6': true
},
'extends': 'eslint:recommended',
'globals': {
'Stats': 'readonly',

'realityEditor': 'writable',
'createNameSpace': 'writable',
'globalStates': 'writable',
'objects': 'writable'
},
'parserOptions': {
'ecmaVersion': 2018,
sourceType: 'module',
},
'rules': {
'no-prototype-builtins': 'off',
'no-redeclare': [
'error',
{'builtinGlobals': false}
],
'no-unused-vars': [
'error',
{
'varsIgnorePattern': '^_',
'argsIgnorePattern': '^_',
},
],
}
};
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# idea editing tools
.idea

# osx directory files
.DS_Store

# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
363 changes: 363 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

36 changes: 35 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,35 @@
# vuforia-spatial-remote-operator-addon
## Read First
The Vuforia Spatial Toolbox and Vuforia Spatial Edge Server make up a shared research platform for exploring spatial computing as a community. This research platform is not an out of the box production-ready enterprise solution. Please read the [MPL 2.0 license](LICENSE) before use.

Join the conversations in our [discourse forum](https://forum.spatialtoolbox.vuforia.com) if you have questions, ideas want to collaborate or just say hi.


# vuforia-spatial-remote-operator-addon

The Remote Operator is an add-on for [Vuforia Spatial Toolbox](https://github.com/ptcrealitylab/vuforia-spatial-toolbox-ios) that makes it compatible with the [Vuforia Spatial Toolbox Virtualizer](https://github.com/ptcrealitylab/vuforia-spatial-toolbox-virtualizer) Unity project. The result is a browser-based web app that combines a live volumetric capture of a space with mixed reality content.

Full installation instructions are in the Vuforia Spatial Toolbox Virtualizer [README](https://github.com/ptcrealitylab/Vuforia-Spatial-Toolbox-Virtualizer#vuforia-spatial-toolbox-virtualizer).

This add-on contains two hardware interfaces:
1. `virtualizer`: This interface provides a websocket-based communication layer between the Vuforia Spatial Edge Server and the Unity application.
2. `remoteOperatorUI`: This interface will serve the Remote Operator web app on `localhost:8081`.

The add-on also contains some `content_scripts` that will modify the [Vuforia Spatial Toolbox User Interface](https://github.com/ptcrealitylab/vuforia-spatial-toolbox-userinterface) to be able to run in a desktop browser environment in addition to on a mobile AR device.

**Special Setup instructions:**
1. Make sure to turn on both of these hardware interfaces in the "Manage Hardware Interfaces" tab of your Edge Server's web interface (`localhost:8080`)
2. The `remoteOperatorUI` interface needs to be configured with a path to a local copy of the [Vuforia Spatial Toolbox User Interface](https://github.com/ptcrealitylab/vuforia-spatial-toolbox-userinterface) repository. Click on the yellow gear on the `remoteOperatorUI` interface to view its configurations, and type in the path (e.g. `/Users/Benjamin/Documents/vuforia-spatial-toolbox-userinterface`) and hit save.
3. After configuring, restart your edge server to serve the web app on port 8081.
4. In order to see any tools in the pocket menu of the Remote Operator, you need to have an activated "World Object" on your server. Click "Add World Object" on localhost:8080 and give it a target to activate it.

**Using the Remote Operator:**
1. Objects, Tools, and Nodes will only appear in the Remote Operator if they have been localized against a World Object. To do this, make sure you have a World Object set up on your edge server and give it an Image Target or Area Target. With your Vuforia Spatial Toolbox iOS app, look at that target first and then look at the other Objects in your space. This will save their locations (relative to the World Object's origin) in the edge server. The World Object's position will be treated as the (0,0,0) position in your Unity project, and all localized Object, Tools, and Nodes will be rendered relative to that.
2. The Remote Operator background will be blank until you connect to an Virtualizer. It will attempt to discover the possible Virtualizers in this network. Make sure your Unity project is running. Click on the drop-down menu in the top left to select a Virtualizer to connect to. Once connected, this Virtualizer must be designated as the "Primary Virtualizer". Go into the Settings menu (click the gear icon) and type in the IP address of the computer running the Unity project into the "Primary Virtualizer IP" field (e.g. `192.168.0.12`) and toggle this mode on. You should now see the video stream in the background.
3. To control the camera of the Remote Operator:
- `Right-click`: Rotate Camera
- `Shift + Right-click`: Pan Camera
- `Scroll Wheel`: Zoom
- `V`: Toggle visibility of extra UI
4. You can select multiple Virtualizers running on two different computers to receive a combined volumetric video for a larger area. Click on both Virtualizers in the drop-down menu to connect to them both, and ensure that one of them is set as the Primary Virtualizer.

Please use the [forum](https://forum.spatialtoolbox.vuforia.com) for any questions.
51 changes: 51 additions & 0 deletions content_resources/calendarButton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions content_resources/cameraPan.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions content_resources/cameraRotate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions content_resources/cameraZoom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions content_resources/hideTimelineButton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions content_resources/pauseButton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions content_resources/playButton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions content_resources/seekButton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions content_resources/showTimelineButton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions content_resources/speedButton_128x.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions content_resources/speedButton_16x.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions content_resources/speedButton_1x.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading