Moved Text out of 'static' folder, as it doesn't need to be in there

Author: photonstorm

src/gameobjects/index.js

@@ -39,7 +39,7 @@ var GameObjects = {
     Rope: require('./rope/Rope'),
     Sprite: require('./sprite/Sprite'),
 
-    Text: require('./text/static/Text'),
+    Text: require('./text/Text'),
     GetTextSize: require('./text/GetTextSize'),
     MeasureText: require('./text/MeasureText'),
     TextStyle: require('./text/TextStyle'),
@@ -80,7 +80,7 @@ var GameObjects = {
         Rope: require('./rope/RopeFactory'),
         Sprite: require('./sprite/SpriteFactory'),
         StaticBitmapText: require('./bitmaptext/static/BitmapTextFactory'),
-        Text: require('./text/static/TextFactory'),
+        Text: require('./text/TextFactory'),
         TileSprite: require('./tilesprite/TileSpriteFactory'),
         Zone: require('./zone/ZoneFactory'),
         Video: require('./video/VideoFactory'),
@@ -111,7 +111,7 @@ var GameObjects = {
         Rope: require('./rope/RopeCreator'),
         Sprite: require('./sprite/SpriteCreator'),
         StaticBitmapText: require('./bitmaptext/static/BitmapTextCreator'),
-        Text: require('./text/static/TextCreator'),
+        Text: require('./text/TextCreator'),
         TileSprite: require('./tilesprite/TileSpriteCreator'),
         Zone: require('./zone/ZoneCreator'),
         Video: require('./video/VideoCreator')

src/gameobjects/text/static/Text.js src/gameobjects/text/Text.jssrc/gameobjects/text/static/Text.js renamed to src/gameobjects/text/Text.js

@@ -4,17 +4,17 @@
  * @license      {@link https://opensource.org/licenses/MIT|MIT License}
  */
 
-var AddToDOM = require('../../../dom/AddToDOM');
-var CanvasPool = require('../../../display/canvas/CanvasPool');
-var Class = require('../../../utils/Class');
-var Components = require('../../components');
-var GameEvents = require('../../../core/events');
-var GameObject = require('../../GameObject');
-var GetTextSize = require('../GetTextSize');
-var GetValue = require('../../../utils/object/GetValue');
-var RemoveFromDOM = require('../../../dom/RemoveFromDOM');
+var AddToDOM = require('../../dom/AddToDOM');
+var CanvasPool = require('../../display/canvas/CanvasPool');
+var Class = require('../../utils/Class');
+var Components = require('../components');
+var GameEvents = require('../../core/events');
+var GameObject = require('../GameObject');
+var GetTextSize = require('./GetTextSize');
+var GetValue = require('../../utils/object/GetValue');
+var RemoveFromDOM = require('../../dom/RemoveFromDOM');
 var TextRender = require('./TextRender');
-var TextStyle = require('../TextStyle');
+var TextStyle = require('./TextStyle');
 
 /**
  * @classdesc

…bjects/text/static/TextCanvasRenderer.js …c/gameobjects/text/TextCanvasRenderer.jssrc/gameobjects/text/static/TextCanvasRenderer.js renamed to src/gameobjects/text/TextCanvasRenderer.js src/gameobjects/text/static/TextCanvasRenderer.js renamed to src/gameobjects/text/TextCanvasRenderer.js

@@ -4,9 +4,9 @@
  * @license      {@link https://opensource.org/licenses/MIT|MIT License}
  */
 
-var BuildGameObject = require('../../BuildGameObject');
-var GameObjectCreator = require('../../GameObjectCreator');
-var GetAdvancedValue = require('../../../utils/object/GetAdvancedValue');
+var BuildGameObject = require('../BuildGameObject');
+var GameObjectCreator = require('../GameObjectCreator');
+var GetAdvancedValue = require('../../utils/object/GetAdvancedValue');
 var Text = require('./Text');
 
 /**

…c/gameobjects/text/static/TextCreator.js src/gameobjects/text/TextCreator.jssrc/gameobjects/text/static/TextCreator.js renamed to src/gameobjects/text/TextCreator.js src/gameobjects/text/static/TextCreator.js renamed to src/gameobjects/text/TextCreator.js

@@ -5,17 +5,17 @@
  */
 
 var Text = require('./Text');
-var GameObjectFactory = require('../../GameObjectFactory');
+var GameObjectFactory = require('../GameObjectFactory');
 
 /**
  * Creates a new Text Game Object and adds it to the Scene.
- * 
+ *
  * A Text Game Object.
- * 
+ *
  * Text objects work by creating their own internal hidden Canvas and then renders text to it using
  * the standard Canvas `fillText` API. It then creates a texture from this canvas which is rendered
  * to your game during the render pass.
- * 
+ *
  * Because it uses the Canvas API you can take advantage of all the features this offers, such as
  * applying gradient fills to the text, or strokes, shadows and more. You can also use custom fonts
  * loaded externally, such as Google or TypeKit Web fonts.
@@ -26,7 +26,7 @@ var GameObjectFactory = require('../../GameObjectFactory');
  *
  * See {@link http://www.jordanm.co.uk/tinytype this compatibility table} for the available default fonts
  * across mobile browsers.
- * 
+ *
  * A note on performance: Every time the contents of a Text object changes, i.e. changing the text being
  * displayed, or the style of the text, it needs to remake the Text canvas, and if on WebGL, re-upload the
  * new texture to the GPU. This can be an expensive operation if used often, or with large quantities of

…c/gameobjects/text/static/TextFactory.js src/gameobjects/text/TextFactory.jssrc/gameobjects/text/static/TextFactory.js renamed to src/gameobjects/text/TextFactory.js src/gameobjects/text/static/TextFactory.js renamed to src/gameobjects/text/TextFactory.js

@@ -4,8 +4,8 @@
  * @license      {@link https://opensource.org/licenses/MIT|MIT License}
  */
 
-var renderWebGL = require('../../../utils/NOOP');
-var renderCanvas = require('../../../utils/NOOP');
+var renderWebGL = require('../../utils/NOOP');
+var renderCanvas = require('../../utils/NOOP');
 
 if (typeof WEBGL_RENDERER)
 {

src/gameobjects/text/static/TextRender.js src/gameobjects/text/TextRender.jssrc/gameobjects/text/static/TextRender.js renamed to src/gameobjects/text/TextRender.js

@@ -4,7 +4,7 @@
  * @license      {@link https://opensource.org/licenses/MIT|MIT License}
  */
 
-var Utils = require('../../../renderer/webgl/Utils');
+var Utils = require('../../renderer/webgl/Utils');
 
 /**
  * Renders this Game Object with the WebGL Renderer to the given Camera.