From 000cff292ec8a9f0c9303bb756d143410063468f Mon Sep 17 00:00:00 2001
From: Idrian <u15078729@tuks.co.za>
Date: Wed, 23 Aug 2017 21:14:13 +0200
Subject: [PATCH] #9 #7 fixed chrome eventlistener error

---
 build/RuleApplyer.ts |  6 ++++--
 build/main.ts        |  3 ++-
 build/voxc.js        | 10 +++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build/RuleApplyer.ts b/build/RuleApplyer.ts
index bba6e65..4ac0d91 100644
--- a/build/RuleApplyer.ts
+++ b/build/RuleApplyer.ts
@@ -269,9 +269,10 @@ class RuleInterpreter
                 var shapeFound : boolean = false;
                 if(this.ruleFile.Rules[i].Shape != null)
                 {
+                    var thisShape = this.ruleFile.Rules[i].Shape.toLowerCase();
                     for(var g=0;g<this.Shapes.length;g++)
                         {
-                            if(this.ruleFile.Rules[i].Shape.toLowerCase() == this.Shapes[g].ShapeName.toLowerCase())
+                            if(thisShape == this.Shapes[g].ShapeName.toLowerCase())
                                 {
                                     GEO = this.Shapes[g].ShapeGEO;
                                     shapeFound = true;
@@ -293,7 +294,8 @@ class RuleInterpreter
                // console.log("Textures","map",texture,"bmap",bumpTexture);
                 MAT = new THREE.MeshPhongMaterial({ map : texture, bumpMap : bumpTexture, bumpScale  :  1.0}); 
                // MAT.color.setHex(this.ruleFile.Rules[i].Color);
-                MAT.side = THREE.DoubleSide;
+               if(thisShape == "ring" || thisShape == "plane" || thisShape == "circle")
+               { MAT.side = THREE.DoubleSide;}
                  this.ruleSets.push({Color : this.ruleFile.Rules[i].Color, Geometry : GEO, Material : MAT});
             }
        
diff --git a/build/main.ts b/build/main.ts
index 2f0662b..f659438 100644
--- a/build/main.ts
+++ b/build/main.ts
@@ -294,7 +294,8 @@ let arrayToMesh = new ArrayToMesh(model);
     var converterOne : fileReader;
  
     var useME : boolean = true;
-    objUpload.addEventListener("input", function(){
+    objUpload.addEventListener("change", function(){
+        console.log("I am here");
         var OBJFile : File = objUpload.files[0];
         useME = false;
         converterOne = new fileReader(OBJFile,doRest,[demo_canvas,converterOne_canvas,ruleApplyer,arrayToMesh]);
diff --git a/build/voxc.js b/build/voxc.js
index e2d0034..bbde61b 100644
--- a/build/voxc.js
+++ b/build/voxc.js
@@ -1587,8 +1587,9 @@ class RuleInterpreter {
             var MAT;
             var shapeFound = false;
             if (this.ruleFile.Rules[i].Shape != null) {
+                var thisShape = this.ruleFile.Rules[i].Shape.toLowerCase();
                 for (var g = 0; g < this.Shapes.length; g++) {
-                    if (this.ruleFile.Rules[i].Shape.toLowerCase() == this.Shapes[g].ShapeName.toLowerCase()) {
+                    if (thisShape == this.Shapes[g].ShapeName.toLowerCase()) {
                         GEO = this.Shapes[g].ShapeGEO;
                         shapeFound = true;
                         break;
@@ -1607,7 +1608,9 @@ class RuleInterpreter {
             // console.log("Textures","map",texture,"bmap",bumpTexture);
             MAT = new THREE.MeshPhongMaterial({ map: texture, bumpMap: bumpTexture, bumpScale: 1.0 });
             // MAT.color.setHex(this.ruleFile.Rules[i].Color);
-            MAT.side = THREE.DoubleSide;
+            if (thisShape == "ring" || thisShape == "plane" || thisShape == "circle") {
+                MAT.side = THREE.DoubleSide;
+            }
             this.ruleSets.push({ Color: this.ruleFile.Rules[i].Color, Geometry: GEO, Material: MAT });
         }
         //console.log("Rule-set",this.ruleSets);
@@ -1953,7 +1956,8 @@ window.onload = () => {
     var objUpload = document.getElementById("objfile");
     var converterOne;
     var useME = true;
-    objUpload.addEventListener("input", function () {
+    objUpload.addEventListener("change", function () {
+        console.log("I am here");
         var OBJFile = objUpload.files[0];
         useME = false;
         converterOne = new ObjToArray_1.fileReader(OBJFile, doRest, [demo_canvas, converterOne_canvas, ruleApplyer, arrayToMesh]);