Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-23 13:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/photonstorm/phaser

Browse source
This commit is contained in:
Richard Davey 2018-09-03 13:13:52 +01:00
commit 0399ca178e
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gameobjects/GameObject.js
View file

@ -5,7 +5,7 @@
*/ */
var Class = require('../utils/Class'); var Class = require('../utils/Class');
var Components = require('./components'); var ComponentsToJSON = require('./components/ToJSON');
var DataManager = require('../data/DataManager'); var DataManager = require('../data/DataManager');
var EventEmitter = require('eventemitter3'); var EventEmitter = require('eventemitter3');
@ -440,7 +440,7 @@ var GameObject = new Class({
*/ */
toJSON: function () toJSON: function ()
{ {
return Components.ToJSON(this); return ComponentsToJSON(this);
}, },
/** /**

28
src/gameobjects/graphics/Graphics.js
View file

@ -7,8 +7,16 @@
var BaseCamera = require('../../cameras/2d/BaseCamera.js'); var BaseCamera = require('../../cameras/2d/BaseCamera.js');
var Class = require('../../utils/Class'); var Class = require('../../utils/Class');
var Commands = require('./Commands'); var Commands = require('./Commands');
var Components = require('../components'); var ComponentsAlpha = require('../components/Alpha');
var Ellipse = require('../../geom/ellipse/'); var ComponentsBlendMode = require('../components/BlendMode');
var ComponentsDepth = require('../components/Depth');
var ComponentsMask = require('../components/Mask');
var ComponentsPipeline = require('../components/Pipeline');
var ComponentsTransform = require('../components/Transform');
var ComponentsVisible = require('../components/Visible');
var ComponentsScrollFactor = require('../components/ScrollFactor');
var Ellipse = require('../../geom/ellipse/Ellipse');
var GameObject = require('../GameObject'); var GameObject = require('../GameObject');
var GetFastValue = require('../../utils/object/GetFastValue'); var GetFastValue = require('../../utils/object/GetFastValue');
var GetValue = require('../../utils/object/GetValue'); var GetValue = require('../../utils/object/GetValue');
@ -117,14 +125,14 @@ var Graphics = new Class({
Extends: GameObject, Extends: GameObject,
Mixins: [ Mixins: [
Components.Alpha, ComponentsAlpha,
Components.BlendMode, ComponentsBlendMode,
Components.Depth, ComponentsDepth,
Components.Mask, ComponentsMask,
Components.Pipeline, ComponentsPipeline,
Components.Transform, ComponentsTransform,
Components.Visible, ComponentsVisible,
Components.ScrollFactor, ComponentsScrollFactor,
Render Render
], ],