Adapts libraries to style guide

diff --git a/lib/serpentity.js b/lib/serpentity.js
index c5ccc97f584cd0d3fd5c8f0f77206f3d809d58f5..1360f92aafffcb594b6542d6f130a70580945304 100644 (file)
--- a/lib/serpentity.js
+++ b/lib/serpentity.js
@@ -243,6 +243,4 @@ if (typeof module !== 'undefined' && this.module !== module) {
   Serpentity.System = require('./serpentity/system.js');
 
   module.exports = Serpentity;
   Serpentity.System = require('./serpentity/system.js');
 
   module.exports = Serpentity;

-} else {
-  window.Serpentity = Serpentity;

 }
 }

diff --git a/lib/serpentity/entity.js b/lib/serpentity/entity.js
index 28951589afb6034f9cd6b778b079b609f4bd34b1..add823e422fdf1a831ff40759e5dcaa686f6b14d 100644 (file)
--- a/lib/serpentity/entity.js
+++ b/lib/serpentity/entity.js
@@ -43,8 +43,7 @@ let Entity = class Entity {
    * returns the component associated with that key
    */
   getComponent (componentClass) {
    * returns the component associated with that key
    */
   getComponent (componentClass) {

-    let position;
-    position = this._componentKeys.indexOf(componentClass);
+    let position = this._componentKeys.indexOf(componentClass);

     if (position >= 0) {
       return this._components[position];
     }
     if (position >= 0) {
       return this._components[position];
     }

diff --git a/lib/serpentity/node.js b/lib/serpentity/node.js
index db33f171d677b5c5e439380809b555496dee7a3d..fa0af75ebaaca70792c1ca3ab3fe150cc529d517 100644 (file)
--- a/lib/serpentity/node.js
+++ b/lib/serpentity/node.js
@@ -13,19 +13,18 @@ let Node = class Node {
    * false otherwise
    */
   static matches (entity) {
    * false otherwise
    */
   static matches (entity) {

-    let property, types;
+    let types = this.types;

 
 

-    types = this.types;
+    for (let typeName in types) {
+      if (types.hasOwnProperty(typeName)) {

 
 

-    for (property in types) {
-      if (types.hasOwnProperty(property)) {
-        let matched, type;
+        let matched = false;
+        let type = types[typeName];

 
 

-        matched = false;
-        type = types[property];

         if (entity.hasComponent(type)) {
           matched = true;
         }
         if (entity.hasComponent(type)) {
           matched = true;
         }

+

         if (!matched) {
           return false;
         }
         if (!matched) {
           return false;
         }

diff --git a/lib/serpentity/node_collection.js b/lib/serpentity/node_collection.js
index f5b1794a8a88f8fdf79255581a4871c9354f0d5d..7c519912364c3a7559b8f0131a27ce90db66f909 100644 (file)
--- a/lib/serpentity/node_collection.js
+++ b/lib/serpentity/node_collection.js
@@ -28,15 +28,15 @@ let NodeCollection = class NodeCollection {
   add (entity) {
 
     if (this.type.matches(entity) && !this._entityExists(entity)) {
   add (entity) {
 
     if (this.type.matches(entity) && !this._entityExists(entity)) {

-      let node, types, property;

 
 

-      node = new this.type({});
+      let node = new this.type({});
+      let types = this.type.types;
+

       node.entity = entity;
       node.entity = entity;

-      types = this.type.types;

 
 

-      for (property in types) {
-        if (types.hasOwnProperty(property)) {
-          node[property] = entity.getComponent(types[property]);
+      for (let typeName in types) {
+        if (types.hasOwnProperty(typeName)) {
+          node[typeName] = entity.getComponent(types[typeName]);

         }
       }
 
         }
       }
 


@@ -54,9 +54,8 @@ let NodeCollection = class NodeCollection {
    * returns true if it was removed, false otherwise.
    */
   remove (entity) {
    * returns true if it was removed, false otherwise.
    */
   remove (entity) {

-    let found;
+    let 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;


@@ -75,10 +74,9 @@ let NodeCollection = class NodeCollection {
    * Checks whether we already have nodes for this entity.
    */
   _entityExists (entity) {
    * Checks whether we already have nodes for this entity.
    */
   _entityExists (entity) {

-    let found, node;
+    let found = false;

 
 

-    found = false;
-    for (node of this.nodes) {
+    for (let node of this.nodes) {

       if (node.entity === entity) {
         found = true;
       }
       if (node.entity === entity) {
         found = true;
       }