Skip to content

Commit 28693ab

Browse files
greggmanphemavax
authored andcommitted
update multi-monitor aquarium
1 parent 7e17fcc commit 28693ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+563
-10775
lines changed

aquarium/README.html

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,17 @@ <h2>Running across multiple machines</h2>
4444

4545
<iframe width="800" height="450" src="https://www.youtube.com/embed/64TcBiqmVko?rel=0" frameborder="0" allowfullscreen></iframe>
4646

47-
<p>To run it across multiple machines each machine must be running a browser that supports WebGL and WebSockets. Chromium for example. Next, the clocks of the 5 machines must be in sync. Then start the server. <a href="../server/README.html">See here for instructions</a>. Finally run the Aquarium with a URL in the following format.</p>
47+
<p>To run it across multiple machines each machine must be running a browser that supports WebGL and WebSockets.
48+
Chromium for example. Next, the clocks of the 5 machines must be in sync. Then start the server. <a href="../server/README.html">See here for instructions</a>. Finally run the Aquarium with a URL in the following format.</p>
4849
<pre>http://address_of_server:port_of_server/aquarium/aquarium.html?settings={net:{sync:true,rotYMult:mult}}</pre>
4950
<p>Where <i>address_of_server</i> is the domain name or ip address of the server, <i>port_of_server</i> is the port of the server, and <i>mult</i> is 0 for the center machine, positive for machines to the right of the server and negative for machines to the left.</p>
5051
<p>In other words, if the server is "myserver.com" and your running on port 8080 and you had 5 machines, A, B, C, D, E in that order left to right and you wanted machine C to be the master the URLs would for each machine would be:</p>
5152
<pre>
52-
Machine A: http://myserver.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:false,slave:true,fovMult:1.0,rotYMult:-2}}
53-
Machine B: http://myserver.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:false,slave:true,fovMult:1.0,rotYMult:-1}}
54-
Machine C: http://myserver.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:true,slave:false,fovMult:1.0,rotYMult:0}}
55-
Machine D: http://myserver.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:false,slave:true,fovMult:1.0,rotYMult:-1}}
56-
Machine E: http://myserver.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:false,slave:true,fovMult:1.0,rotYMult:-2}}
53+
Machine A: http://&lt;ipaddressofserver&gt;.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:false,slave:true,fovMult:1.0,rotYMult:-2}}
54+
Machine B: http://&lt;ipaddressofserver&gt;.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:false,slave:true,fovMult:1.0,rotYMult:-1}}
55+
Machine C: http://&lt;ipaddressofserver&gt;.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:true,slave:false,fovMult:1.0,rotYMult:0}}
56+
Machine D: http://&lt;ipaddressofserver&gt;.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:false,slave:true,fovMult:1.0,rotYMult:-1}}
57+
Machine E: http://&lt;ipaddressofserver&gt;.com:8080/aquarium/aquarium.html?settings={net:{sync:true,ui:false,slave:true,fovMult:1.0,rotYMult:-2}}
5758
</pre>
5859
<p>At that point, settings changed on the master should be propagated to the slaves.</p>
5960
<h3>Options:</h3>
@@ -68,24 +69,20 @@ <h3>Options:</h3>
6869
<tr><td>offsetMult:</td><td>number</td><td><p>Amount to multiply the offset by. Think of offset as a per machine setting and offsetMult as a global setting.</p></tr>
6970
</table>
7071
<h3>Terse Setup</h3>
71-
<p>These steps worked for me as of 2011/10/13</p>
72-
<p>On Windows 7</p>
72+
<p>These steps worked for me as of 2017/12/1</p>
73+
<p>On macOS</p>
7374
<ol>
7475
<li>download the source</li>
75-
<li>download node.js binary for windows from <a href="http://nodejs.org/#download">http://nodejs.org/#download</a><br/>
76-
Mine was 0.5.9</li>
77-
<li>cd to the root folder of the samples (ie, "cd webglsamples")</li>
78-
<li>open a command prompt and type &lt;path_to_node.js&gt;/node.exe server\server.js<br/><br/>
79-
80-
On my system it was<br/>
81-
f:\Users\gman\Downloads\node.exe server\server.js<br/><br/>
82-
83-
You'll probably get firefall warning from windows. Allow it.</li>
84-
<li>Start Chrome 14 or newer<br/><br/>
85-
Note: it doesn't have to be Chrome 14 but it does have to be a browser that supports WebSockets draft-8, 9 or 10</li>
76+
<li>install node.js from <a href="http://nodejs.org/">http://nodejs.org/</a><br/>
77+
Mine was 8.9.1</li>
78+
<li>
79+
<li>cd to the server folder of the samples (ie, "cd webglsamples/server")</li>
80+
<li>install node deps by typing "npm install"</li>
81+
<li>type node server.js</li>
82+
<li>Start Chrome or Firefox</li>
8683
<li>Make the window horizontally about 1/2 the size of your monitor or less</li>
8784

88-
<li>Make a new tab. Pull it off the window so you now have 2 chrome
85+
<li>Make a new tab. Pull it off the window so you now have 2 browser
8986
windows and arrange the 2 windows (which would both be the same size now)
9087
side by side</li>
9188

aquarium/aquarium_server.py

Lines changed: 0 additions & 201 deletions
This file was deleted.

aquarium/build_system.pyc

-3.44 KB
Binary file not shown.

aquarium/start_server.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)