check if window exists

InventivetalentDev · Mar 20, 2019 · 3e132e6 · 3e132e6
1 parent e5b3ddf
commit 3e132e6
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 45 deletions.
diff --git a/dist/all.js b/dist/all.js
diff --git a/dist/all.min.js b/dist/all.min.js
diff --git a/dist/entity.js b/dist/entity.js
diff --git a/dist/entity.min.js b/dist/entity.min.js
diff --git a/dist/gui.js b/dist/gui.js
diff --git a/dist/gui.min.js b/dist/gui.min.js
diff --git a/dist/model.js b/dist/model.js
diff --git a/dist/model.min.js b/dist/model.min.js
diff --git a/dist/skin.js b/dist/skin.js
diff --git a/dist/skin.min.js b/dist/skin.min.js
diff --git a/server/index.js b/server/index.js
diff --git a/src/combined/index.js b/src/combined/index.js
@@ -59,11 +59,13 @@ function attachTo(self, target) {
 
 CombinedRender.prototype.constructor = CombinedRender;
 
-window.CombinedRender = CombinedRender;
+if(typeof window !== "undefined") {
+    window.CombinedRender = CombinedRender;
 
 // Add the other render classes here, because adding them as separate scripts bugs out THREE.js
-window.GuiRender = GuiRender;
-window.ModelRender = ModelRender;
-window.SkinRender = SkinRender;
+    window.GuiRender = GuiRender;
+    window.ModelRender = ModelRender;
+    window.SkinRender = SkinRender;
+}
 
 export default CombinedRender;
diff --git a/src/entity/index.js b/src/entity/index.js
@@ -326,7 +326,7 @@ let mergeParents_ = function (model, stack, resolve, reject) {
 
 };
 
-
-window.EntityRender = EntityRender;
+if (typeof window !== "undefined")
+    window.EntityRender = EntityRender;
 
 export default EntityRender;
diff --git a/src/gui/index.js b/src/gui/index.js
@@ -209,9 +209,11 @@ class GuiRender extends Render {
     };
 }
 
+GuiRender.Positions = guiPositions;
+GuiRender.Helper = guiHelper;
+
+if (typeof window !== "undefined")
+    window.GuiRender = GuiRender;
 
-window.GuiRender = GuiRender;
-window.GuiRender.Positions = guiPositions;
-window.GuiRender.Helper = guiHelper;
 
 export default GuiRender;
diff --git a/src/model/index.js b/src/model/index.js
@@ -936,10 +936,7 @@ function rotateAboutPoint(obj, point, axis, theta) {
     obj.rotateOnAxis(axis, theta); // rotate the OBJECT
 }
 
-
-window.ModelRender = ModelRender;
-window.ModelConverter = ModelConverter;
-window.ModelRender.cache = {
+ModelRender.cache = {
     loadedTextures: loadedTextureCache,
     mergedModels: mergedModelCache,
     instanceCount: modelInstances,
@@ -964,6 +961,11 @@ window.ModelRender.cache = {
         deleteObjectProperties(instanceCache);
     }
 };
+ModelRender.ModelConverter = ModelConverter;
 
+if (typeof window !== "undefined") {
+    window.ModelRender = ModelRender;
+    window.ModelConverter = ModelConverter;
+}
 
 export default ModelRender;
diff --git a/src/skin/index.js b/src/skin/index.js
@@ -578,6 +578,7 @@ function getJSON(url, callback) {
     xhr.send();
 }
 
-window.SkinRender = SkinRender;
+if (typeof window !== "undefined")
+    window.SkinRender = SkinRender;
 
 export default SkinRender;