[papert commit] r120 - in trunk: . static

[codesite...@google.com]

Author: thomas.figg
Date: Sun Jan 25 22:45:03 2009
New Revision: 120

Modified:
trunk/index.html.tmpl
trunk/static/logo.js
trunk/static/papert.css
trunk/static/speech.html
trunk/static/turtle.js

Log:
show turtle and hide turtle, as well as turtle improvements

Modified: trunk/index.html.tmpl
==============================================================================
--- trunk/index.html.tmpl (original)
+++ trunk/index.html.tmpl Sun Jan 25 22:45:03 2009
@@ -122,7 +122,7 @@
<div class="inner">
<div id="textOutput"></div>
<div id="turtle">
- <embed id='sprite' src="/static/turtle.svg"/>
+ <embed width="20" height="20" id='sprite'
src="/static/turtle.svg"/>
</div>
<canvas id="canvas">
Your browser doesn't support canvas tags. Please upgrade to a recent
version of Firefox or Opera.

Modified: trunk/static/logo.js
==============================================================================
--- trunk/static/logo.js (original)
+++ trunk/static/logo.js Sun Jan 25 22:45:03 2009
@@ -180,6 +180,9 @@
this.turtle.penwidth(a[0]);
});

+ this.addTurtleCommand('hideturtle',0,['ht']);
+ this.addTurtleCommand('showturtle',0,['st']);
+
this.addTurtleCommand('clearscreen',0,['cs','clear']);
this.addTurtleCommand('clean',0,null);

Modified: trunk/static/papert.css
==============================================================================
--- trunk/static/papert.css (original)
+++ trunk/static/papert.css Sun Jan 25 22:45:03 2009
@@ -36,6 +36,7 @@
margin-right: 10px;
height: 200px;
width:100%;
+ z-index: 10;
}

@@ -67,9 +68,9 @@

#turtle {
margin: 10px 0 10px 0;
+ height: 20px;
+ width: 20px;
position: absolute;
- width: 15px;
- height: 15px;
font-size: 20px;
background-color: transparent;
}

Modified: trunk/static/speech.html
==============================================================================
--- trunk/static/speech.html (original)
+++ trunk/static/speech.html Sun Jan 25 22:45:03 2009
@@ -113,7 +113,7 @@
<div class="inner">
<div id="textOutput"></div>
<div id="turtle">
- <embed id='sprite' src="/static/turtle.svg"/>
+ <embed width="20" height="20" id='sprite'
src="/static/turtle.svg"/>
</div>
<canvas id="canvas">
Your browser doesn't support canvas tags. Please upgrade to a recent
version of Firefox or Opera.

Modified: trunk/static/turtle.js
==============================================================================
--- trunk/static/turtle.js (original)
+++ trunk/static/turtle.js Sun Jan 25 22:45:03 2009
@@ -18,15 +18,31 @@
this.turtle = turtle;
this.sprite = document.getElementById('sprite').getSVGDocument();
this.sprite = this.sprite.getElementById('sprite');
+ this.visible = true;
this.setup();
}
}

+Turtle.prototype.hideturtle = function() {
+ this.visible = false;
+ this.update();
+}
+
+Turtle.prototype.showturtle = function() {
+ this.visible = true;
+ this.update();
+}
+
+
Turtle.prototype.update = function() {
- this.turtle.style.left = parseInt(this._left + this.x -10) + "px";
- this.turtle.style.top = parseInt(this._top + this.y-20) + "px";
- this.sprite.setAttribute('transform','rotate('+(this.angle)+' 10 10)');
- //this.turtle.style.top =;
+ if (this.visible && this.x >=0 && this.y >= 0 && this.x <= this.max_x
&& this.y <= this.max_y) {
+ this.turtle.style.left = parseInt(this._left + this.x -10) + "px";
+ this.turtle.style.top = parseInt(this._top + this.y-20) + "px";
+ this.sprite.setAttribute('transform','rotate('+(this.angle)+' 10
10)');
+ } else {
+ this.turtle.style.left = "-10px";
+ this.turtle.style.top = "-10px";
+ }
}

@@ -239,6 +255,8 @@
};
DelayTurtle.prototype.backward = function(d) { this.forward(-d)};

+DelayTurtle.prototype.showturtle = function() {
this.addCommand(this.turtle.showturtle,arguments)};
+DelayTurtle.prototype.hideturtle = function() {
this.addCommand(this.turtle.hideturtle,arguments)};
DelayTurtle.prototype.right = function() {
this.addCommand(this.turtle.right,arguments)};
DelayTurtle.prototype.left = function() {
this.addCommand(this.turtle.left,arguments)};
DelayTurtle.prototype.reset = function() {
this.addCommand(this.turtle.reset,arguments)};