Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
2  relativity/js/extendedObject.js
@@ -721,7 +721,7 @@ extendedObject.prototype = {
(!this.COM.endPt || this.COM.endPt[3] > 0)){
scene.h.beginPath();
scene.h.fillStyle = "#777";
- scene.h.fillText(this.label + " (present)",
+ scene.h.fillText(this.label,
xvis + scene.origin[0] + 5,
-5 + scene.origin[2]);
}
View
4 relativity/js/scene.js
@@ -265,9 +265,9 @@ Scene.prototype = {
// Doesn't seem to work in opera 9, not sure why.
if (this.curOptions.showText) {
this.h.fillStyle = "#fff";
- this.h.fillText("x(m)", this.mWidth - 30, this.origin[2] - 10);
+ this.h.fillText("x(m)", this.mWidth - 40, this.origin[2] - 10);
this.h.fillText("t(s)", 5 + this.origin[0], 10);
- this.h.fill();
+ this.h.fillText("Present", 5, this.origin[2] - 10);
}
// Advance every object forward in time, then draw it to the canvas.
View
23 relativity/relativity.css
@@ -194,6 +194,29 @@ header ul li:hover, li.nav-active {
color: #fff;
}
+#help-screen dt, #help-screen dd {
+ display: inline;
+}
+
+#help-screen dt {
+ font-weight: bold;
+ margin: 0.5em 0;
+}
+
+#help-screen dd {
+ margin-left: 0.5em;
+}
+
+#help-screen .close {
+ position: absolute;
+ top: 1em;
+ right: 1em;
+}
+
+#help-screen h3 {
+ margin: 0 0 1em;
+}
+
/** Captions **/
#caption {
View
30 relativity/relativity.html
@@ -86,17 +86,27 @@
</div>
<div id="help-screen">
+ <a class="close" href="#" onclick="$('#help-screen').toggle(); return false">Close</a>
<h3>Keyboard Controls</h3>
- <br> w, a, s and d, or arrow keys: Accelerate
- <br> q and e: Rotate left and right (yaw)
- <br> 3: Show 3D view
- <br> t: Toggle clock display.
- <br> p: Toggle coordinate display.
- <br> Page up/down: Zoom in and out
- <br> space: Fire photon (rasteroids only).
- <br> h: Toggle help screen.
- <br> Press Next to advance to the next step in a demonstration.
- <br> <a href="#" onclick="$('#help-screen').toggle(); return false">Close</a>
+ <dl>
+ <dt>w, a, s and d, or arrow keys</dt>
+ <dd>Accelerate<br/></dd>
+ <dt>q, e</dt>
+ <dd>Rotate left and right (yaw)<br/></dd>
+ <dt>3</dt>
+ <dd>Show 3D view<br/></dd>
+ <dt>t</dt>
+ <dd>Toggle clock display<br/></dd>
+ <dt>p</dt>
+ <dd>Toggle coordinate display<br/></dd>
+ <dt>Page up/down</dt>
+ <dd>Zoom in and out<br/></dd>
+ <dt>Space</dt>
+ <dd>Fire photon (rasteroids only)<br/></dd>
+ <dt>h</dt>
+ <dd>Toggle help screen</dd>
+ </dl>
+ Press Next to advance to the next step in a demonstration.
</div>
<div id="zoom">
<a href="#" id="zoomIn">+</a>

No commit comments for this range

Something went wrong with that request. Please try again.