Merge pull request #58 from PixelsCommander/effects

Fixed loading order

Author: PixelsCommander

demo/ripples.html

@@ -85,12 +85,7 @@
         });
     }
 </script>
-
-
-
-
-
-<script src="../dist/htmlgl.min.js"></script>
-<script src="../dist/htmlgl-effects.min.js"></script>
+<script src="../dist/htmlgl.js"></script>
+<script src="../dist/htmlgl-effects.js"></script>
 </body>
 </html>

dist/htmlgl-effects.js

@@ -8783,10 +8783,7 @@ will produce an inaccurate conversion value. The same issue exists with the cx/c
             this.glChildsReady = 0;
             this.glParent = this.getGlParent();
 
-            if (HTMLGL.GLEffectsManager) {
-                this.effectsManager = new HTMLGL.GLEffectsManager(this);
-            }
-
+            this.initEffects();
             this.bindCallbacks();
             this.transformProperty = this.style.transform !== undefined ? 'transform' : 'WebkitTransform';
             this.init();
@@ -9011,6 +9008,12 @@ will produce an inaccurate conversion value. The same issue exists with the cx/c
         return this.sprite.stage;
     }
 
+    p.initEffects = function () {
+        if (HTMLGL.GLEffectsManager) {
+            this.effectsManager = new HTMLGL.GLEffectsManager(this);
+        }
+    }
+
     HTMLGL.GLElement = document.registerElement(HTMLGL.CUSTOM_ELEMENT_TAG_NAME, {
         prototype: p
     })

dist/htmlgl-effects.min.js

@@ -12,7 +12,7 @@ gulp.task('default', function () {
         .pipe(gulp.dest('dist'));
 
     //Effects add-on
-    gulp.src(['bower_components/tween.js/build/tween.min.js', 'src/gl-effects-manager.js','src/effects/ripples.js'])
+    gulp.src(['bower_components/tween.js/build/tween.min.js', 'src/effects/ripples.js', 'src/gl-effects-manager.js'])
         .pipe(concat(BUNDLE_NAME + '-effects.js'))
         .pipe(gulp.dest('dist'))
         .pipe(uglify(BUNDLE_NAME + '-effects.min.js'))

dist/htmlgl.js

@@ -31,4 +31,9 @@
     }
 
     w.HTMLGL.GLEffectsManager = GLEffectsManager;
+
+    //Reinitialize effects on elements
+    w.HTMLGL.elements.forEach(function(element){
+        element.initEffects();
+    });
 })(window);

dist/htmlgl.min.js

@@ -51,10 +51,7 @@
             this.glChildsReady = 0;
             this.glParent = this.getGlParent();
 
-            if (HTMLGL.GLEffectsManager) {
-                this.effectsManager = new HTMLGL.GLEffectsManager(this);
-            }
-
+            this.initEffects();
             this.bindCallbacks();
             this.transformProperty = this.style.transform !== undefined ? 'transform' : 'WebkitTransform';
             this.init();
@@ -279,6 +276,12 @@
         return this.sprite.stage;
     }
 
+    p.initEffects = function () {
+        if (HTMLGL.GLEffectsManager) {
+            this.effectsManager = new HTMLGL.GLEffectsManager(this);
+        }
+    }
+
     HTMLGL.GLElement = document.registerElement(HTMLGL.CUSTOM_ELEMENT_TAG_NAME, {
         prototype: p
     })