Testing out new Bounds component and Class getter mods.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '4d6475f0-fa3c-11e6-ae9b-c374376ab063'
+build: '55224080-fa4e-11e6-841c-31e712585627'
 };
 module.exports = CHECKSUM;

v3/src/components/Bounds.js

@@ -0,0 +1,55 @@
+
+//  Bounds Component
+
+var Bounds = {
+
+    fizzpop: {
+        atari: true,
+        model: 520
+    },
+
+    bounds: {
+
+        /**
+        * The amount the Game Object is visually offset from its x coordinate.
+        * This is the same as `width * anchor.x`.
+        * It will only be > 0 if anchor.x is not equal to zero.
+        *
+        * @property {number} offsetX
+        * @readOnly
+        */
+        offsetX: {
+            
+            get: function ()
+            {
+                console.log('ox get');
+                console.log(this);
+                // return 123;
+                return this.anchorX * this.width;
+            }
+
+        },
+
+        /**
+        * The amount the Game Object is visually offset from its y coordinate.
+        * This is the same as `height * anchor.y`.
+        * It will only be > 0 if anchor.y is not equal to zero.
+        *
+        * @property {number} offsetY
+        * @readOnly
+        */
+        offsetY: {
+            
+            get: function ()
+            {
+                // return 456;
+                return this.anchorY * this.height;
+            }
+
+        }
+
+    }
+
+};
+
+module.exports = Bounds;

v3/src/components/Transform.js

@@ -21,9 +21,6 @@ var Transform = {
     anchorX: 0,
     anchorY: 0,
 
-    offsetX: 0,
-    offsetY: 0,
-
     scaleX: {
 
         get: function ()

v3/src/components/index.js

@@ -2,6 +2,7 @@ module.exports = {
 
     Alpha: require('./Alpha'),
     BlendMode: require('./BlendMode'),
+    Bounds: require('./Bounds'),
     Children: require('./Children'),
     Color: require('./Color'),
     Data: require('./Data'),

v3/src/gameobjects/image/Image.js

@@ -7,14 +7,15 @@ var ImageRender = require('./ImageRender');
 var Image = new Class({
 
     Mixins: [
-        Components.Transform,
-        Components.Texture,
-        Components.Size,
         Components.Alpha,
         Components.BlendMode,
+        Components.Bounds,
+        Components.GetBounds,
         Components.ScaleMode,
+        Components.Size,
+        Components.Texture,
+        Components.Transform,
         Components.Visible,
-        Components.GetBounds,
         ImageRender
     ],
 

v3/src/gameobjects/index.js

@@ -1,21 +1,21 @@
 //  Required, but don't need Phaser level exports
 //  (maybe these should be Phaser export level?)
 
-require('./blitter/BlitterFactory');
-require('./container/ContainerFactory');
+// require('./blitter/BlitterFactory');
+// require('./container/ContainerFactory');
 require('./image/ImageFactory');
-require('./sprite/SpriteFactory');
-require('./text/BitmapTextFactory');
+// require('./sprite/SpriteFactory');
+// require('./text/BitmapTextFactory');
 
 //  Phaser.GameObjects
 
 module.exports = {
 
     Factory: require('./FactoryContainer'),
 
-    Blitter: require('./blitter/Blitter'),
-    Container: require('./container/Container'),
+    // Blitter: require('./blitter/Blitter'),
+    // Container: require('./container/Container'),
     Image: require('./image/Image'),
-    Sprite: require('./sprite/Sprite')
+    // Sprite: require('./sprite/Sprite')
 
 };

v3/src/utils/Class.js

@@ -17,7 +17,7 @@ function getProperty (definition, k, isClassDescriptor)
         def = def.value;
     }
 
-    //  This might be a regular property, or it may be a getter/setter the user defined in a class.
+    //  This might be a regular property, or it may be a getter / setter the user defined in a class.
     if (def && hasGetterOrSetter(def))
     {
         if (typeof def.enumerable === 'undefined')
@@ -34,7 +34,14 @@ function getProperty (definition, k, isClassDescriptor)
     }
     else
     {
-        return false;
+        // if (typeof definition[k] === 'object')
+        // {
+        //     return -1;
+        // }
+        // else
+        // {
+            return false;
+        // }
     }
 }
 
@@ -60,7 +67,7 @@ function hasNonConfigurable (obj, k)
     return false;
 }
 
-function extend (ctor, definition, isClassDescriptor, extend)
+function extend (ctor, definition, isClassDescriptor, extendCallback)
 {
     for (var k in definition)
     {
@@ -69,13 +76,78 @@ function extend (ctor, definition, isClassDescriptor, extend)
             continue;
         }
 
+        if (typeof definition[k] === 'object')
+        {
+             // Here goes nothing ...
+            extend(ctor, def, false, extendCallback);
+        }
+
         var def = getProperty(definition, k, isClassDescriptor);
 
-        if (def !== false)
+        //  Object ...
+
+        if (def === -1)
+        {
+            console.log(k, def);
+
+            //  Iterate the object, and see if any children are getters / setters
+            //  https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
+
+            def = definition[k];
+
+            var entry = {};
+
+            entry[k] = {};
+
+            // ctor.prototype[k] = {};
+            // Object.defineProperty(ctor.prototype, k, { value: {} });
+
+            console.log('iterating', def);
+
+            for (var key in def)
+            {
+                var child = def[key];
+
+                console.log('->', key, child);
+
+                if (child && hasGetterOrSetter(child))
+                {
+                    if (typeof child.enumerable === 'undefined')
+                    {
+                        child.enumerable = true;
+                    }
+
+                    if (typeof child.configurable === 'undefined')
+                    {
+                        child.configurable = true;
+                    }
+
+                    Object.defineProperty(entry[k], key, child);
+                }
+                else
+                {
+                    Object.defineProperty(entry[k], key, {
+                        value: child,
+                        writable: true,
+                        configurable: true,
+                        enumerable: true
+                    });
+
+                    // ctor.prototype[k][key] = { value: child };
+                }
+            }
+
+            // ctor.prototype[k] = def;
+
+            console.dir(entry);
+
+            Object.defineProperties(ctor.prototype, entry);
+        }
+        else if (def !== false)
         {
             //  If Extends is used, we will check its prototype to see if the final variable exists.
 
-            var parent = extend || ctor;
+            var parent = extendCallback || ctor;
 
             if (hasNonConfigurable(parent.prototype, k))
             {
@@ -104,6 +176,8 @@ function extend (ctor, definition, isClassDescriptor, extend)
 
 function mixin (myClass, mixins)
 {
+    console.log(myClass);
+
     if (!mixins)
     {
         return;