reversing changes and push

lautr3k · 25ae5bae9227e829553aed4af8b5bc69aae6d2f6 · kloknibor committed Oct 21, 2016 · Oct 21, 2016 · 25ae5ba
1 parent 1a994f6
commit 25ae5bae9227e829553aed4af8b5bc69aae6d2f6
Unified Split

Showing with 9 additions and 3 deletions.

+2 −1 css/main.css

+1 −1 index.html

+6 −1 js/slacer/viewer.js
diff --git a/css/main.css b/css/main.css
@@ -24,6 +24,7 @@
     background-color: #eeeeee;
     border: 1px dashed #cccccc;
 }
+
 /*
 #sidebar .panel-body {
     padding-bottom: 0;
@@ -76,7 +77,7 @@
     top: 51px;
     bottom: 0;
     right: 0;
-    background-color: #f5f5f5;
+    /* background-color: #f5f5f5; */
     border-left: 1px solid #eeeeee;
 }
 
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>SLAcer.js (bêta)</title>
+        <title>Printflow3D</title>
         <link rel="stylesheet" type="text/css" href="/slacer/vendor/jquery-ui/jquery-ui.min.css" />
         <link rel="stylesheet" type="text/css" href="/slacer/vendor/bootstrap-slider/css/bootstrap-slider.min.css" />
         <link rel="stylesheet" type="text/css" href="/slacer/vendor/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css" />
diff --git a/js/slacer/viewer.js b/js/slacer/viewer.js
@@ -32,7 +32,12 @@ var SLAcer = SLAcer || {};
         // create main objects
         self.scene    = new THREE.Scene();
         self.camera   = new THREE.PerspectiveCamera();
-        self.renderer = new THREE.WebGLRenderer({ antialias: self.settings.antialias });
+        self.renderer = new THREE.WebGLRenderer({ 
+		antialias: self.settings.antialias, 
+		alpha: true
+		});
+		
+		self.renderer.setClearColor( 0xff00ff, 0);
 
         // assign camera settings
         _.assign(self.camera, self.settings.camera);