Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
6bb90f2
Modernizing old JS code for compatibility with newer threejs and d3 l…
iMammal Oct 23, 2022
4620f34
Continuing to Modernize old JS code for compatibility with newer thre…
iMammal Oct 23, 2022
9a2bb58
Continuing to Modernize old JS code for compatibility with newer thre…
iMammal Oct 24, 2022
d407c58
After upgrading threejs library, adding back in node selection and ed…
iMammal Oct 24, 2022
965b11c
After upgrading threejs library, continue modernizing: Upgraded contr…
iMammal Oct 25, 2022
0feccd4
After upgrading threejs library, continue modernizing: Added package.…
iMammal Oct 25, 2022
84d1c3d
Changes by thamm for modernizing code with NPM, and new threejs, etc.
iMammal Oct 25, 2022
79538c4
After upgrading threejs library, continue modernizing: Added package.…
iMammal Oct 25, 2022
210a547
skybox fixed. next error is in vreffect.
thammersmith Oct 25, 2022
0804403
bypassed enough code to get render to happen. next controls.
thammersmith Oct 27, 2022
ef9ba1b
fixed toggle menu button
thammersmith Oct 27, 2022
2551056
Controls and skybox working
thammersmith Oct 28, 2022
fb977b4
cline on node to show connects working
thammersmith Oct 28, 2022
c65d0f8
Fix all buttons and sliders that broke with new three.js and node. Su…
iMammal Oct 30, 2022
ca27a42
Everything VR is commented out. Left the commented code in for refere…
iMammal Oct 30, 2022
069d55e
createLegend on Init, rather than updates
iMammal Oct 30, 2022
16a26d3
Import xrButton class from WebXR examples and add Enter VR buttons to…
iMammal Nov 13, 2022
5dc6445
Check for immersive VR support and configure XR Buttom accordingly.
iMammal Nov 13, 2022
7fe9819
xrButton toggles between Enter VR and Exit VR
iMammal Nov 13, 2022
92c235d
Ugly canvas hack to get headset transform matrix logging to console.
iMammal Nov 14, 2022
e5a6686
Converting to "Inline" VR experience. Broken Buttons only ever say "E…
iMammal Nov 14, 2022
be0c6f4
Fixed "Enter VR" buttons.
iMammal Nov 15, 2022
af4ddf0
Commented out first WebXR attempt and implemented a simpler one that …
iMammal Nov 15, 2022
9e03be9
Added simple left and right controllers rendered as lines with select…
iMammal Nov 15, 2022
64aaf07
Added Controller Grip Rendering
iMammal Nov 15, 2022
ca0336c
updated draw pointer function.
thammersmith Nov 16, 2022
14b22ed
removed stray dash
thammersmith Nov 16, 2022
ad956ba
Log console message for Touch Controller button state.
iMammal Nov 16, 2022
88497a6
Merge remote-tracking branch 'origin/Dev-WebXR-x3' into Dev-WebXR-x3
iMammal Nov 16, 2022
8f26a7a
removed stray dash
thammersmith Nov 16, 2022
a9ca47b
updated getpointed object to work from controller instead of camera p…
thammersmith Nov 16, 2022
9a09060
removed stray 0
thammersmith Nov 16, 2022
53f5818
re-enabled xrcontrollermodelfactory
thammersmith Nov 16, 2022
3829518
enabled correct xrcontrollermodelfactory
thammersmith Nov 16, 2022
0c67717
added frame rate limiter to animation loop
thammersmith Nov 16, 2022
408363c
moved frame rate limiter to animatepv
thammersmith Nov 16, 2022
068ca51
removed frame rate limiter commented out until usable
thammersmith Nov 16, 2022
332207b
working selection from xr controller
thammersmith Nov 17, 2022
fa53b39
still no movement
thammersmith Nov 17, 2022
25b67f0
movement
thammersmith Nov 17, 2022
8990a10
tweaks to control switching
thammersmith Nov 17, 2022
6224d28
tweaks to control switching
thammersmith Nov 17, 2022
9b3f7c0
Put some binary logic in the updateNodeMoveOver() to get mouse and VR…
iMammal Nov 19, 2022
5f7bdfb
Cleaned up node selection with stateful trigger logic.
iMammal Nov 19, 2022
f252521
Added comments to updateNodeMoveOver() for new hover/point logic
iMammal Nov 19, 2022
2d0e010
Enable node pointed-at action for both VR controllers
iMammal Nov 19, 2022
ed3d771
working with xr inputs
thammersmith Nov 24, 2022
caec371
xr camera tied to controllers
thammersmith Nov 24, 2022
7ada6a3
some tweaks to movement
thammersmith Dec 10, 2022
98730da
more tweaks to movement, still can't 'pull up'
thammersmith Dec 10, 2022
a20ecbe
movement seems to be okish
thammersmith Dec 10, 2022
31f0693
slightly better then okish
thammersmith Dec 10, 2022
a092984
Added local http-server nodejs entry point and instructions for runni…
iMammal Jan 16, 2023
7b766fe
Added a second slider for separate control of Sphere and Box Glyph si…
iMammal Mar 11, 2023
e5f5c8d
Added two more sliders for independent control of sphere and box glyp…
iMammal Mar 11, 2023
215c70f
Split the left and right viewport glyph scaling controls to the left …
iMammal Mar 11, 2023
0c959f2
Added Ipsalateral and Contralateral checkboxes to limit edge display …
iMammal Mar 11, 2023
f32080d
Decoupled ColorCoding Menu for Left and Right Indemendent Control. To…
iMammal Mar 12, 2023
8d835a4
Add Left Color Sync to for Active Group. Todo: Sync Region States and…
iMammal Mar 12, 2023
c81ef79
Implemented Region State Sync on Left Color Coding Sync
iMammal Mar 13, 2023
59a5789
Implement Locking of Left ColorCoding and Region Activity States to R…
iMammal Mar 13, 2023
4efb469
Added Left and Right Lock checkboxes for Syncronized Box and Sphere C…
iMammal Mar 13, 2023
160a147
Added Cross-Viewport Sphere and Box locks and Three-Way and All-Way S…
iMammal Mar 13, 2023
3551a78
Enable Right Side Search Panel for Node Indeces or Region Name Substr…
iMammal Mar 18, 2023
f1485fe
Extended Search field to search both viewports and select found nodes…
iMammal Mar 20, 2023
abf88d8
Added second "Contralateral" Threshold slider that apprears when both…
iMammal Mar 21, 2023
1d8b872
Exclude NodeInfoPanel from Right-Click Toggle and change into to sel…
iMammal Mar 21, 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
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################

/.vs/NeuroCave/FileContentIndex/27839cb6-f38a-4914-a88d-ac8ef9d3e8ec.vsidx
/.vs/NeuroCave/FileContentIndex/42c85120-e77b-4fde-8880-d78adcb8b13f.vsidx
/.vs/NeuroCave/FileContentIndex
/.vs/NeuroCave/v17
/.vs/NeuroCave/config
/.vs
26 changes: 20 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta charset="UTF-8">
<title>NeuroCave</title>
</head>
<script type="text/javascript" src="js/external-libraries/queue.js"></script>
<script type="text/javascript" src="js/external-libraries/papaparse.min.js"></script>
<script type="text/javascript" src="./public/main.js"></script>

<script>

// loadVisualization = function (folderName) {
Expand Down Expand Up @@ -64,13 +64,27 @@ <h2>Demo For Samsung Gear (under test)</h2>

<div class = "menu" id = 'full'>
<h2>Use your own data:</h2>
In order to use your own data, follow these instructions:
In order to use your own data on your own computer, follow these instructions:

<h3> Setup and Run NeuroCave on your own computer:</h3>
<ul style="list-style-type:circle">
<li><a href="https://github.com/CreativeCodingLab/NeuroCave/archive/master.zip">Download</a> <b>NeuroCave</b> to
your local drive</li>
<li> Install NodeJS:
<p> Windows/MacOS/Source:
<a href="https://nodejs.org/en/download/">Download | Node.js (nodejs.org) </a>
<p> RedHat,Centos,Fedora,Amazon Linux, etc.: sudo dnf install nodejs
<p> Ubuntu,Debian,Raspbian,etc.: sudo apt install nodejs
<li> Install Dependecy Packages:
<p> npm install d3 http-server mathjs papaparse queue three @babel/core "babel-loader" path webpack webpack-cli
<li> Start Neurocave in "local" mode
<p> npm run local
<li>Run the local version of NeuroCave by Navigating the browser to one of the "Available on:" links in the above command's output </li>
</ul>
<h3> Import your own Data into your local NeuroCave server:</h3>
<ul style="list-style-type:circle">
<li>In the local copy, put the folder containing your data in <b>.\NeuroCave\data\</b>. Your data should follow the description in
<a href="https://github.com/CreativeCodingLab/NeuroCave#how-to-use-it">here</a>. </li>
<li>Run the local version of the <b>'index.html'</b> file</li>
<li>Browse for the folder using the below <b>'Browse'</b> button</li>
<li>Choose an <b>Atlas</b>. You could create your own Atlas following the instructions in
<a href="https://github.com/CreativeCodingLab/NeuroCave#creating-an-atlas">here</a>. </li>
Expand All @@ -90,7 +104,7 @@ <h2>Use your own data:</h2>
<script type="text/Javascript">
var list = null;
var atlas = null;
// it is assumed all data folder should have an index.txt file describing its contents
// it is assumed all data folders should have an index.txt file describing its contents
var lookForAtlases = function (callback) {
Papa.parse("data/index.txt", {
download: true,
Expand Down Expand Up @@ -152,4 +166,4 @@ <h2>Use your own data:</h2>
</script>

</body>
</html>
</html>
Loading