[#591] added missing webgl coordinates when building textures out of …

…spritesheet

some redundant code to be removed later.

src/renderable/animationsheet.js

@@ -120,7 +120,7 @@
         addAnimation : function (name, index, animationspeed) {
             this.anim[name] = {
                 name : name,
-                frame : [],
+                frame : {},
                 idx : 0,
                 length : 0,
                 animationspeed: animationspeed || this.animationspeed,
@@ -135,21 +135,28 @@
                 });
             }
 
+            // # of frames
+            var counter = 0;
             // set each frame configuration (offset, size, etc..)
             for (var i = 0, len = index.length; i < len; i++) {
                 if (typeof(index[i]) === "number") {
-                    this.anim[name].frame[i] = this.textureAtlas[index[i]];
+                    if (typeof (this.textureAtlas[index[i]]) !== "undefined") {
+                        // TODO: adding the cache source coordinates add undefined entries in webGL mode
+                        this.anim[name].frame["" + i] = this.textureAtlas[index[i]];
+                        counter++;
+                    }
                 } else { // string
                     if (this.atlasIndices === null) {
                         throw new me.Renderable.Error(
                             "string parameters for addAnimation are not allowed for standard spritesheet based Texture"
                         );
                     } else {
                         this.anim[name].frame[i] = this.textureAtlas[this.atlasIndices[index[i]]];
+                        counter++;
                     }
                 }
             }
-            this.anim[name].length = this.anim[name].frame.length;
+            this.anim[name].length = counter;
         },
 
         /**
@@ -230,7 +237,7 @@
          */
         setAnimationFrame : function (idx) {
             this.current.idx = (idx || 0) % this.current.length;
-            var frame = this.current.frame[this.current.idx];
+            var frame = this.current.frame["" + this.current.idx];
             this.offset = frame.offset;
             this.width = frame.width;
             this.height = frame.height;

src/video/canvas/texture.js

@@ -154,7 +154,7 @@
          * @ignore
          */
         buildFromSpriteSheet : function (data) {
-            var atlas = []; // changing to {} breaks everything !
+            var atlas = {};
             var image = data.region || data.image;
             var spacing = data.spacing || 0;
             var margin = data.margin || 0;
@@ -180,7 +180,7 @@
             }
             // build the local atlas
             for (var frame = 0, count = spritecount.x * spritecount.y; frame < count ; frame++) {
-                atlas[frame] = {
+                atlas["" + frame] = {
                     name: "" + frame,
                     offset: new me.Vector2d(
                         margin + (spacing + data.framewidth) * (frame % spritecount.x) + offsetX,

src/video/webgl/texture.js

@@ -40,7 +40,36 @@
                 var key = s.x + "," + s.y + "," + w + "," + h;
                 atlas[key] = atlas[frame];
             });
+            return atlas;
+        },
+
+        buildFromSpriteSheet : function (data) {
+            var image = data.region || data.image;
+            var w = image.width;
+            var h = image.height;
+
+            var atlas = this._super(me.CanvasRenderer.prototype.Texture, "buildFromSpriteSheet", [ data ]);
+
+            // TODO : duplicated !
+            Object.keys(atlas).forEach(function (frame) {
+                // Source coordinates
+                var s = atlas["" + frame].offset;
+                var sw = atlas["" + frame].width;
+                var sh = atlas["" + frame].height;
 
+                // ST texture coordinates
+                atlas["" + frame].stMap = new Float32Array([
+                    s.x / w,        // Left
+                    s.y / h,        // Top
+                    (s.x + sw) / w, // Right
+                    (s.y + sh) / h  // Bottom
+                ]);
+
+                // Cache source coordinates
+                // TODO: Remove this when the Batcher only accepts a region name
+                var key = s.x + "," + s.y + "," + w + "," + h;
+                atlas[key] = atlas["" + frame];
+            });
             return atlas;
         },