Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <bryan@olenepal.org>2009-09-04 04:04:46 (GMT)
committer root <bryan@olenepal.org>2009-09-04 04:04:46 (GMT)
commit99c54a8ca97c379f191b068c652a4df795fa2265 (patch)
treecfc82d5261bea4abed77078a6ff955c47a12266b
parent122ecd00112941ccde74932aef01c93d1b5c7cdb (diff)
fixed summing error accidentally added by me in addding_up
-rwxr-xr-xexamples/adding_up_to_10/assets/generic/images/ball_37x37.pngbin0 -> 2745 bytes
-rwxr-xr-xexamples/adding_up_to_10/assets/generic/images/banana_37x37.pngbin0 -> 2063 bytes
-rwxr-xr-x[-rw-r--r--]examples/adding_up_to_10/js/lesson.js21
-rwxr-xr-x[-rw-r--r--]jsdoc/files.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/index.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/$.karma.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/JSDOC.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KButton.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KGraphic.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KGroup.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KMedia.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KObject-KButton.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KObject-KRectangle.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KObject-KShape.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KObject-KSound.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KObject.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KRectangle.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KShape.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/KSound.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/Karma#geometry.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/Karma#graphics.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/Karma#math.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/Karma.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/_global_.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/init.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/src/JSDOC.js.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/src/js_a.js.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/src/js_jquery.karma-0.3.js.html0
-rwxr-xr-x[-rw-r--r--]jsdoc/symbols/src/js_jquery.karma-0.4.js.html0
29 files changed, 9 insertions, 12 deletions
diff --git a/examples/adding_up_to_10/assets/generic/images/ball_37x37.png b/examples/adding_up_to_10/assets/generic/images/ball_37x37.png
new file mode 100755
index 0000000..4388283
--- /dev/null
+++ b/examples/adding_up_to_10/assets/generic/images/ball_37x37.png
Binary files differ
diff --git a/examples/adding_up_to_10/assets/generic/images/banana_37x37.png b/examples/adding_up_to_10/assets/generic/images/banana_37x37.png
new file mode 100755
index 0000000..90728e6
--- /dev/null
+++ b/examples/adding_up_to_10/assets/generic/images/banana_37x37.png
Binary files differ
diff --git a/examples/adding_up_to_10/js/lesson.js b/examples/adding_up_to_10/js/lesson.js
index 349098d..f1fddd0 100644..100755
--- a/examples/adding_up_to_10/js/lesson.js
+++ b/examples/adding_up_to_10/js/lesson.js
@@ -3,14 +3,14 @@ $(document).ready(function(){
var k = $.karma ({container: "#karma-main", lang: "es-MX"});
k.init({
images: [
- {id: "ball", file: "ball.png", localized : false },
- {id: "ballon", file: "ballon.png", localized : false },
- {id: "banana", file: "banana.png", localized : false },
- {id: "chilli", file: "chilli.png", localized : false },
+ {id: "ball", file: "ball_37x37.png", localized : false },
+ /*{id: "ballon", file: "ballon.png", localized : false },**/
+ {id: "banana", file: "banana_37x37.png", localized : false },
+ /*{id: "chilli", file: "chilli.png", localized : false },
{id: "fish" , file: "fish.png", localized : false },
{id: "flower", file: "flower.png", localized : false },
{id: "happyMonkey", file: "happyMonkey.jpg", localized : false },
- {id: "scorebox", file: "scorebox.png", localized : false }
+ {id: "scorebox", file: "scorebox.png", localized : false } */
]
,
sounds: [
@@ -45,11 +45,11 @@ k.main(function() {
- var imgNames = ["ball", "ballon", "banana", "chilli", "fish", "flower" ];
+ var imgNames = ["ball", "banana", /* "ballon","chilli", "fish", "flower"*/ ];
//game logic
var total, level=0, time, n0, n1, correct;
var maskd=200;
- var d=140;
+ var d=170;
var choices=[];
var score = 0;
var startTimerY = 105;
@@ -130,8 +130,6 @@ k.main(function() {
var pos = [];
var x, y, flag;
- pos.push( { "x":x, "y": y } );
- k.library.images[ imgId ].draw(ctx, x, y )
for (var i=0; i<n; i++) {
do {
@@ -139,8 +137,7 @@ k.main(function() {
x = k.math.rand( 0, d );
y = k.math.rand( 0, d );
for ( var j=0; j<pos.length; j++) {
- if ( k.geometry.distance2( pos[j], {"x": x, "y": y} )
- < 80 ) {
+ if ( k.geometry.distance2( pos[j], {"x": x, "y": y} ) < 200 ) {
flag = true;
break;
}
@@ -175,7 +172,7 @@ k.main(function() {
buttons[ 2 ] = { "canvas": bottomRtCanvas, "id": 2};
$.each(buttons, function( key, item ) {
- this["canvas"].addEventListener('click', function( ev ) {
+ item.canvas.addEventListener('click', function( ev ) {
if ( choices[ item.id ] === total){
score = score + 1;
k.library.sounds[ "correct" ].play();
diff --git a/jsdoc/files.html b/jsdoc/files.html
index a060477..a060477 100644..100755
--- a/jsdoc/files.html
+++ b/jsdoc/files.html
diff --git a/jsdoc/index.html b/jsdoc/index.html
index 867469f..867469f 100644..100755
--- a/jsdoc/index.html
+++ b/jsdoc/index.html
diff --git a/jsdoc/symbols/$.karma.html b/jsdoc/symbols/$.karma.html
index 8b97acf..8b97acf 100644..100755
--- a/jsdoc/symbols/$.karma.html
+++ b/jsdoc/symbols/$.karma.html
diff --git a/jsdoc/symbols/JSDOC.html b/jsdoc/symbols/JSDOC.html
index 35bb326..35bb326 100644..100755
--- a/jsdoc/symbols/JSDOC.html
+++ b/jsdoc/symbols/JSDOC.html
diff --git a/jsdoc/symbols/KButton.html b/jsdoc/symbols/KButton.html
index 8525ef8..8525ef8 100644..100755
--- a/jsdoc/symbols/KButton.html
+++ b/jsdoc/symbols/KButton.html
diff --git a/jsdoc/symbols/KGraphic.html b/jsdoc/symbols/KGraphic.html
index becf747..becf747 100644..100755
--- a/jsdoc/symbols/KGraphic.html
+++ b/jsdoc/symbols/KGraphic.html
diff --git a/jsdoc/symbols/KGroup.html b/jsdoc/symbols/KGroup.html
index 803b77c..803b77c 100644..100755
--- a/jsdoc/symbols/KGroup.html
+++ b/jsdoc/symbols/KGroup.html
diff --git a/jsdoc/symbols/KMedia.html b/jsdoc/symbols/KMedia.html
index 65483fb..65483fb 100644..100755
--- a/jsdoc/symbols/KMedia.html
+++ b/jsdoc/symbols/KMedia.html
diff --git a/jsdoc/symbols/KObject-KButton.html b/jsdoc/symbols/KObject-KButton.html
index 6edf89c..6edf89c 100644..100755
--- a/jsdoc/symbols/KObject-KButton.html
+++ b/jsdoc/symbols/KObject-KButton.html
diff --git a/jsdoc/symbols/KObject-KRectangle.html b/jsdoc/symbols/KObject-KRectangle.html
index 270f7f0..270f7f0 100644..100755
--- a/jsdoc/symbols/KObject-KRectangle.html
+++ b/jsdoc/symbols/KObject-KRectangle.html
diff --git a/jsdoc/symbols/KObject-KShape.html b/jsdoc/symbols/KObject-KShape.html
index a5cb395..a5cb395 100644..100755
--- a/jsdoc/symbols/KObject-KShape.html
+++ b/jsdoc/symbols/KObject-KShape.html
diff --git a/jsdoc/symbols/KObject-KSound.html b/jsdoc/symbols/KObject-KSound.html
index d9feb72..d9feb72 100644..100755
--- a/jsdoc/symbols/KObject-KSound.html
+++ b/jsdoc/symbols/KObject-KSound.html
diff --git a/jsdoc/symbols/KObject.html b/jsdoc/symbols/KObject.html
index 482fc31..482fc31 100644..100755
--- a/jsdoc/symbols/KObject.html
+++ b/jsdoc/symbols/KObject.html
diff --git a/jsdoc/symbols/KRectangle.html b/jsdoc/symbols/KRectangle.html
index 600a65d..600a65d 100644..100755
--- a/jsdoc/symbols/KRectangle.html
+++ b/jsdoc/symbols/KRectangle.html
diff --git a/jsdoc/symbols/KShape.html b/jsdoc/symbols/KShape.html
index cbafccf..cbafccf 100644..100755
--- a/jsdoc/symbols/KShape.html
+++ b/jsdoc/symbols/KShape.html
diff --git a/jsdoc/symbols/KSound.html b/jsdoc/symbols/KSound.html
index 40e6878..40e6878 100644..100755
--- a/jsdoc/symbols/KSound.html
+++ b/jsdoc/symbols/KSound.html
diff --git a/jsdoc/symbols/Karma#geometry.html b/jsdoc/symbols/Karma#geometry.html
index c51d159..c51d159 100644..100755
--- a/jsdoc/symbols/Karma#geometry.html
+++ b/jsdoc/symbols/Karma#geometry.html
diff --git a/jsdoc/symbols/Karma#graphics.html b/jsdoc/symbols/Karma#graphics.html
index dd26739..dd26739 100644..100755
--- a/jsdoc/symbols/Karma#graphics.html
+++ b/jsdoc/symbols/Karma#graphics.html
diff --git a/jsdoc/symbols/Karma#math.html b/jsdoc/symbols/Karma#math.html
index cedffb5..cedffb5 100644..100755
--- a/jsdoc/symbols/Karma#math.html
+++ b/jsdoc/symbols/Karma#math.html
diff --git a/jsdoc/symbols/Karma.html b/jsdoc/symbols/Karma.html
index ab80ea6..ab80ea6 100644..100755
--- a/jsdoc/symbols/Karma.html
+++ b/jsdoc/symbols/Karma.html
diff --git a/jsdoc/symbols/_global_.html b/jsdoc/symbols/_global_.html
index 4d6b4ce..4d6b4ce 100644..100755
--- a/jsdoc/symbols/_global_.html
+++ b/jsdoc/symbols/_global_.html
diff --git a/jsdoc/symbols/init.html b/jsdoc/symbols/init.html
index e88e59d..e88e59d 100644..100755
--- a/jsdoc/symbols/init.html
+++ b/jsdoc/symbols/init.html
diff --git a/jsdoc/symbols/src/JSDOC.js.html b/jsdoc/symbols/src/JSDOC.js.html
index 6ef5f20..6ef5f20 100644..100755
--- a/jsdoc/symbols/src/JSDOC.js.html
+++ b/jsdoc/symbols/src/JSDOC.js.html
diff --git a/jsdoc/symbols/src/js_a.js.html b/jsdoc/symbols/src/js_a.js.html
index 8af5caa..8af5caa 100644..100755
--- a/jsdoc/symbols/src/js_a.js.html
+++ b/jsdoc/symbols/src/js_a.js.html
diff --git a/jsdoc/symbols/src/js_jquery.karma-0.3.js.html b/jsdoc/symbols/src/js_jquery.karma-0.3.js.html
index eb4ab82..eb4ab82 100644..100755
--- a/jsdoc/symbols/src/js_jquery.karma-0.3.js.html
+++ b/jsdoc/symbols/src/js_jquery.karma-0.3.js.html
diff --git a/jsdoc/symbols/src/js_jquery.karma-0.4.js.html b/jsdoc/symbols/src/js_jquery.karma-0.4.js.html
index 188cf21..188cf21 100644..100755
--- a/jsdoc/symbols/src/js_jquery.karma-0.4.js.html
+++ b/jsdoc/symbols/src/js_jquery.karma-0.4.js.html