From: Ben Beltran Date: Mon, 28 Mar 2016 05:34:33 +0000 (-0600) Subject: Adds new dist files X-Git-Tag: 1.0.0^2~1 X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/refs/heads/es6-refactor?hp=4c329508c3a6c56076c110cd4397fef0a219f7ce Adds new dist files --- diff --git a/dist/serpentity.js b/dist/serpentity.js index 8871985..8257ad2 100644 --- a/dist/serpentity.js +++ b/dist/serpentity.js @@ -93,9 +93,15 @@ Systems are called on every update, and they use components through nodes. Just run `engine.update(dt)` in your game loop :D */ -let Serpentity = class Serpentity { - constructor (config) { +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +var Serpentity = function () { + function Serpentity(config) { + _classCallCheck(this, Serpentity); + this.systems = []; this.entities = []; this._nodeCollections = []; @@ -110,132 +116,156 @@ let Serpentity = class Serpentity { * * returns true if added succesfully, false if already added */ - addSystem (system, priority) { - let lastIndex, found; - - if (this.systems.indexOf(system) >= 0) { - return false; - } - system.priority = priority; - found = false; - lastIndex = 0; + _createClass(Serpentity, [{ + key: 'addSystem', + value: function addSystem(system, priority) { + var lastIndex = void 0, + found = void 0; - this.systems.some(function findPriority(existingSystem, i) { - lastIndex = i; - if (existingSystem.priority >= system.priority) { - found = true; - return true; + if (this.systems.indexOf(system) >= 0) { + return false; } - }); - if (!found) { - lastIndex += 1; - } + system.priority = priority; - this.systems.splice(lastIndex, 0, system); - system.added(this); - return true; - } + found = false; + lastIndex = 0; - /* - * Removes a system from the engine, so its update method will no - * longer will be called. Triggers the removed hook. - * - * returns true if removed succesfully, false if already added - */ - removeSystem (system) { - let position; + this.systems.some(function findPriority(existingSystem, i) { + lastIndex = i; + if (existingSystem.priority >= system.priority) { + found = true; + return true; + } + }); + + if (!found) { + lastIndex += 1; + } - position = this.systems.indexOf(system); - if (position >= 0) { - this.systems[position].removed(this); - this.systems.splice(position, 1); + this.systems.splice(lastIndex, 0, system); + system.added(this); return true; } - return false; - } + /* + * Removes a system from the engine, so its update method will no + * longer will be called. Triggers the removed hook. + * + * returns true if removed succesfully, false if already added + */ + + }, { + key: 'removeSystem', + value: function removeSystem(system) { + var position = void 0; + + position = this.systems.indexOf(system); + if (position >= 0) { + this.systems[position].removed(this); + this.systems.splice(position, 1); + return true; + } - /* - * Adds an entity to the engine, adds to existing node collections - * - * returns true if added, false if already there - */ - addEntity (entity) { - if (this.entities.indexOf(entity) >= 0) { return false; } - this.entities.push(entity); - - this._nodeCollections.forEach(function (collection) { - collection.add(entity); - }); - - return true; - } - /* - * Removes entity from system, removing from all node collections - * - * returns true if removed, false if not present - */ - removeEntity (entity) { - let position; + /* + * Adds an entity to the engine, adds to existing node collections + * + * returns true if added, false if already there + */ + + }, { + key: 'addEntity', + value: function addEntity(entity) { + if (this.entities.indexOf(entity) >= 0) { + return false; + } + this.entities.push(entity); - position = this.entities.indexOf(entity); - if (position >= 0) { this._nodeCollections.forEach(function (collection) { - collection.remove(entity); + collection.add(entity); }); - this.entities.splice(position, 1); return true; } - return false; - } + /* + * Removes entity from system, removing from all node collections + * + * returns true if removed, false if not present + */ - /* - * Given a Node Class, retrieves a list of all the nodes for each - * applicable entity. - */ - getNodes (nodeType) { - let position, nodeCollection; + }, { + key: 'removeEntity', + value: function removeEntity(entity) { + var position = void 0; + + position = this.entities.indexOf(entity); + if (position >= 0) { + this._nodeCollections.forEach(function (collection) { + collection.remove(entity); + }); - position = this._nodeCollectionKeys.indexOf(nodeType); + this.entities.splice(position, 1); + return true; + } - if (position >= 0) { - return this._nodeCollections[position].nodes; + return false; } - nodeCollection = new Serpentity.NodeCollection({ - type : nodeType - }); + /* + * Given a Node Class, retrieves a list of all the nodes for each + * applicable entity. + */ - this._nodeCollectionKeys.push(nodeType); - this._nodeCollections.push(nodeCollection); + }, { + key: 'getNodes', + value: function getNodes(nodeType) { + var position = void 0, + nodeCollection = void 0; - this.entities.forEach(function (entity) { - nodeCollection.add(entity); - }); + position = this._nodeCollectionKeys.indexOf(nodeType); - return nodeCollection.nodes; - } + if (position >= 0) { + return this._nodeCollections[position].nodes; + } - /* - * Calls update for every loaded system. - */ - update (dt) { - this.systems.forEach(function (system) { - system.update(dt); - }); - } -}; + nodeCollection = new Serpentity.NodeCollection({ + type: nodeType + }); + + this._nodeCollectionKeys.push(nodeType); + this._nodeCollections.push(nodeCollection); + + this.entities.forEach(function (entity) { + nodeCollection.add(entity); + }); + + return nodeCollection.nodes; + } + + /* + * Calls update for every loaded system. + */ + + }, { + key: 'update', + value: function update(dt) { + this.systems.forEach(function (system) { + system.update(dt); + }); + } + }]); + + return Serpentity; +}(); // Add namespaced objects. -if (typeof module !== 'undefined' && this.module !== module) { +if (typeof module !== 'undefined' && undefined.module !== module) { Serpentity.Component = require('./serpentity/component.js'); Serpentity.Entity = require('./serpentity/entity.js'); Serpentity.Node = require('./serpentity/node.js'); @@ -243,10 +273,7 @@ if (typeof module !== 'undefined' && this.module !== module) { Serpentity.System = require('./serpentity/system.js'); module.exports = Serpentity; -} else { - window.Serpentity = Serpentity; } - 'use strict'; /* global Serpentity */ @@ -256,8 +283,14 @@ if (typeof module !== 'undefined' && this.module !== module) { * to hold components. */ -let Entity = class Entity { - constructor (config) { +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +var Entity = function () { + function Entity(config) { + _classCallCheck(this, Entity); + this._componentKeys = []; this._components = []; @@ -269,43 +302,54 @@ let Entity = class Entity { * * returns true if added, false if already present */ - addComponent (component) { - if (this._componentKeys.indexOf(component.constructor) >= 0) { - return false; - } - this._componentKeys.push(component.constructor); - this._components.push(component); - return true; - } - /* - * returns true if component is included, false otherwise - */ - hasComponent (componentClass) { - if (this._componentKeys.indexOf(componentClass) >= 0) { + + _createClass(Entity, [{ + key: 'addComponent', + value: function addComponent(component) { + if (this._componentKeys.indexOf(component.constructor) >= 0) { + return false; + } + this._componentKeys.push(component.constructor); + this._components.push(component); return true; } - return false; - } - /* - * returns the component associated with that key - */ - getComponent (componentClass) { - let position; - position = this._componentKeys.indexOf(componentClass); - if (position >= 0) { - return this._components[position]; + /* + * returns true if component is included, false otherwise + */ + + }, { + key: 'hasComponent', + value: function hasComponent(componentClass) { + if (this._componentKeys.indexOf(componentClass) >= 0) { + return true; + } + return false; } - } -}; -if (typeof module !== 'undefined' && this.module !== module) { + /* + * returns the component associated with that key + */ + + }, { + key: 'getComponent', + value: function getComponent(componentClass) { + var position = this._componentKeys.indexOf(componentClass); + if (position >= 0) { + return this._components[position]; + } + } + }]); + + return Entity; +}(); + +if (typeof module !== 'undefined' && undefined.module !== module) { module.exports = Entity; } else { Serpentity.Entity = Entity; } - 'use strict'; /* global Serpentity */ @@ -314,48 +358,59 @@ if (typeof module !== 'undefined' && this.module !== module) { * A node describes a set of components in order to describe entities * that include them. */ -let Node = class Node { - /* - * Returns true if the given entity matches the defined protocol, - * false otherwise - */ - static matches (entity) { - let property, types; +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - types = this.types; +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - for (property in types) { - if (types.hasOwnProperty(property)) { - let matched, type; +var Node = function () { + _createClass(Node, null, [{ + key: 'matches', - matched = false; - type = types[property]; - if (entity.hasComponent(type)) { - matched = true; - } - if (!matched) { - return false; + + /* + * Returns true if the given entity matches the defined protocol, + * false otherwise + */ + value: function matches(entity) { + var types = this.types; + + for (var typeName in types) { + if (types.hasOwnProperty(typeName)) { + + var matched = false; + var type = types[typeName]; + + if (entity.hasComponent(type)) { + matched = true; + } + + if (!matched) { + return false; + } } } + + return true; } + }]); - return true; - } + function Node(config) { + _classCallCheck(this, Node); - constructor (config) { this.types = {}; Object.assign(this, config || {}); } -}; -if (typeof module !== 'undefined' && this.module !== module) { + return Node; +}(); + +if (typeof module !== 'undefined' && undefined.module !== module) { module.exports = Node; } else { Serpentity.Node = Node; } - 'use strict'; /* global Serpentity */ @@ -368,9 +423,14 @@ if (typeof module !== 'undefined' && this.module !== module) { * instances of that class. */ -let NodeCollection = class NodeCollection { +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +var NodeCollection = function () { + function NodeCollection(config) { + _classCallCheck(this, NodeCollection); - constructor (config) { this.nodes = []; this.type = null; @@ -383,75 +443,106 @@ let NodeCollection = class NodeCollection { * * Returns true if added, false otherwise. */ - add (entity) { - if (this.type.matches(entity) && !this._entityExists(entity)) { - let node, types, property; - node = new this.type({}); - node.entity = entity; - types = this.type.types; + _createClass(NodeCollection, [{ + key: 'add', + value: function add(entity) { - for (property in types) { - if (types.hasOwnProperty(property)) { - node[property] = entity.getComponent(types[property]); + if (this.type.matches(entity) && !this._entityExists(entity)) { + + var node = new this.type({}); + var types = this.type.types; + + node.entity = entity; + + for (var typeName in types) { + if (types.hasOwnProperty(typeName)) { + node[typeName] = entity.getComponent(types[typeName]); + } } - } - this.nodes.push(node); + this.nodes.push(node); - return true; + return true; + } + + return false; } - return false; - } + /* + * Removes an entity by removing its related node from the list of nodes + * + * returns true if it was removed, false otherwise. + */ - /* - * Removes an entity by removing its related node from the list of nodes - * - * returns true if it was removed, false otherwise. - */ - remove (entity) { - let found; + }, { + key: 'remove', + value: function remove(entity) { + var found = -1; - found = -1; - this.nodes.forEach(function (node, i) { - if (node.entity === entity) { - found = i; + this.nodes.forEach(function (node, i) { + if (node.entity === entity) { + found = i; + } + }); + + if (found >= 0) { + this.nodes.splice(found, 1); + return true; } - }); - if (found >= 0) { - this.nodes.splice(found, 1); - return true; + return false; } - return false; - } + /* + * Checks whether we already have nodes for this entity. + */ - /* - * Checks whether we already have nodes for this entity. - */ - _entityExists (entity) { - let found, node; + }, { + key: '_entityExists', + value: function _entityExists(entity) { + var found = false; + + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; + + try { + for (var _iterator = this.nodes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var node = _step.value; - found = false; - for (node of this.nodes) { - if (node.entity === entity) { - found = true; + if (node.entity === entity) { + found = true; + } + } + } catch (err) { + _didIteratorError = true; + _iteratorError = err; + } finally { + try { + if (!_iteratorNormalCompletion && _iterator.return) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } + } } + + return found; } + }]); - return found; - } -}; + return NodeCollection; +}(); -if (typeof module !== 'undefined' && this.module !== module) { +if (typeof module !== 'undefined' && undefined.module !== module) { module.exports = NodeCollection; } else { Serpentity.NodeCollection = NodeCollection; } - 'use strict'; /* global Serpentity */ @@ -463,18 +554,19 @@ if (typeof module !== 'undefined' && this.module !== module) { * components can be any class whatsoever. */ -let Component = class Component { - constructor (config) { - Object.assign(this, config || {}); - } +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +var Component = function Component(config) { + _classCallCheck(this, Component); + + Object.assign(this, config || {}); }; -if (typeof module !== 'undefined' && this.module !== module) { +if (typeof module !== 'undefined' && undefined.module !== module) { module.exports = Component; } else { Serpentity.Component = Component; } - 'use strict'; /* global Serpentity */ @@ -487,35 +579,55 @@ if (typeof module !== 'undefined' && this.module !== module) { * three methods. They are shown here to document the interface. */ -let System = class System { +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - /* - * This will be run when the system is added to the engine - */ - added () { +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +var System = function () { + function System() { + _classCallCheck(this, System); + } + + _createClass(System, [{ + key: 'added', + + + /* + * This will be run when the system is added to the engine + */ + value: function added() {} // Override with added(engine) // Receives an instance of the serpentity engine - } - /* - * This will be run when the system is removed from the engine - */ - removed () { + + /* + * This will be run when the system is removed from the engine + */ + + }, { + key: 'removed', + value: function removed() {} // Override with removed(engine) // Receives an instance of the serpentity engine - } - /* - * This will run every time the engine's update method is called - */ - update () { - // Override with update(dt) - // Receives a delta of the time - } -}; -if (typeof module !== 'undefined' && this.module !== module) { + /* + * This will run every time the engine's update method is called + */ + + }, { + key: 'update', + value: function update() { + // Override with update(dt) + // Receives a delta of the time + } + }]); + + return System; +}(); + +if (typeof module !== 'undefined' && undefined.module !== module) { module.exports = System; } else { Serpentity.System = System; -} +} \ No newline at end of file diff --git a/dist/serpentity.min.js b/dist/serpentity.min.js new file mode 100644 index 0000000..abf6ba1 --- /dev/null +++ b/dist/serpentity.min.js @@ -0,0 +1 @@ +"use strict";function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function e(e,t){for(var n=0;n=0?!1:(e.priority=t,o=!1,n=0,this.systems.some(function(t,i){return n=i,t.priority>=e.priority?(o=!0,!0):void 0}),o||(n+=1),this.systems.splice(n,0,e),e.added(this),!0)}},{key:"removeSystem",value:function(e){var t=void 0;return t=this.systems.indexOf(e),t>=0?(this.systems[t].removed(this),this.systems.splice(t,1),!0):!1}},{key:"addEntity",value:function(e){return this.entities.indexOf(e)>=0?!1:(this.entities.push(e),this._nodeCollections.forEach(function(t){t.add(e)}),!0)}},{key:"removeEntity",value:function(e){var t=void 0;return t=this.entities.indexOf(e),t>=0?(this._nodeCollections.forEach(function(t){t.remove(e)}),this.entities.splice(t,1),!0):!1}},{key:"getNodes",value:function(t){var n=void 0,o=void 0;return n=this._nodeCollectionKeys.indexOf(t),n>=0?this._nodeCollections[n].nodes:(o=new e.NodeCollection({type:t}),this._nodeCollectionKeys.push(t),this._nodeCollections.push(o),this.entities.forEach(function(e){o.add(e)}),o.nodes)}},{key:"update",value:function(e){this.systems.forEach(function(t){t.update(e)})}}]),e}();"undefined"!=typeof module&&(void 0).module!==module&&(Serpentity.Component=require("./serpentity/component.js"),Serpentity.Entity=require("./serpentity/entity.js"),Serpentity.Node=require("./serpentity/node.js"),Serpentity.NodeCollection=require("./serpentity/node_collection.js"),Serpentity.System=require("./serpentity/system.js"),module.exports=Serpentity);var _createClass=function(){function e(e,t){for(var n=0;n=0?!1:(this._componentKeys.push(e.constructor),this._components.push(e),!0)}},{key:"hasComponent",value:function(e){return!!(this._componentKeys.indexOf(e)>=0)}},{key:"getComponent",value:function(e){var t=this._componentKeys.indexOf(e);return t>=0?this._components[t]:void 0}}]),e}();"undefined"!=typeof module&&(void 0).module!==module?module.exports=Entity:Serpentity.Entity=Entity;var _createClass=function(){function e(e,t){for(var n=0;n=0?(this.nodes.splice(t,1),!0):!1}},{key:"_entityExists",value:function(e){var t=!1,n=!0,o=!1,i=void 0;try{for(var s,r=this.nodes[Symbol.iterator]();!(n=(s=r.next()).done);n=!0){var a=s.value;a.entity===e&&(t=!0)}}catch(l){o=!0,i=l}finally{try{!n&&r["return"]&&r["return"]()}finally{if(o)throw i}}return t}}]),e}();"undefined"!=typeof module&&(void 0).module!==module?module.exports=NodeCollection:Serpentity.NodeCollection=NodeCollection;var Component=function e(t){_classCallCheck(this,e),Object.assign(this,t||{})};"undefined"!=typeof module&&(void 0).module!==module?module.exports=Component:Serpentity.Component=Component;var _createClass=function(){function e(e,t){for(var n=0;n