Merge branch 'development' of https://github.com/EinsteinsWorkshop/BlocksCAD into development

Conflicts:
	blockscad/blockscad.js

fixing blockscad version after merging field_lock

TODO

@@ -14,7 +14,7 @@ FEATURES TO ADD AND FIX AND STUFF
 [x]Text (and strings)
 [ ]Draft
 [ ]Minkowski Sum
-[ ]Switch to three.js
+[x]Switch to three.js
 [ ]Transparency (like openscad's #, or alpha channel in color)
 [ ]Internationalization support (bring back from blockly)
 [ ]Simplified mode (elementary-friendly, hiding distracting fancy stuff)

blockly/blocks/primitives.js

@@ -47,7 +47,8 @@ Blockly.Blocks['cylinder'] = {
         .setAlign(Blockly.ALIGN_RIGHT);
     // handle backwards compatibility for cylinders created before locking.
     if (Blockscad.inputVersion == null || Blockscad.inputVersion == "1.0.0"
-        || Blockscad.inputVersion == "1.0.1" || Blockscad.inputVersion == "1.1.0") {
+        || Blockscad.inputVersion == "1.0.1" || Blockscad.inputVersion == "1.1.0" ||
+         Blockscad.inputVersion == "1.1.1") {
       this.appendDummyInput()
           .setAlign(Blockly.ALIGN_RIGHT)
           .appendField(new Blockly.FieldCheckbox("FALSE", null,

blockscad/blockscad.js

@@ -30,7 +30,11 @@ BlocklyStorage = BlocklyStorage || {};
 var Blockly = Blockly || {};
 var BSUtils = BSUtils || {};
 
+<<<<<<< HEAD
 Blockscad.version = "1.1.2";
+=======
+Blockscad.version = "1.1.0";
+>>>>>>> e7bc1d5e0bc263a28330659122a11cb3e4963441
 
 Blockscad.offline = true;
 
@@ -170,7 +174,7 @@ Blockscad.init = function() {
     // toggle whether or not we draw the axes, then redraw
     Blockscad.drawAxes = (Blockscad.drawAxes + 1) % 2;
     $( '#axesButton' ).toggleClass("btn-pushed");
-    gProcessor.viewer.onDraw();
+    gProcessor.viewer.toggleAxes();
   });
 
   // can I bind a click to a tab?

blockscad/blockscad_build.py

@@ -56,7 +56,7 @@ class Gen_compressed(threading.Thread):
 
     # Read in all the source files.
     filenames = ['storage.js','utils.js','blockscad.js', 'FileSaver.js', 
-                 'text.js','lightgl.js','toolbox.js','deflate.js', 'stl.js']
+                 'text.js','three.min.js','OrbitControls.js','toolbox.js','deflate.js', 'stl.js']
     for filename in filenames:
       f = open(filename)
       print filename
@@ -79,7 +79,7 @@ class Gen_compressed(threading.Thread):
       ]
 
     # Read in all the source files.
-    filenames = ['viewer.js', 'csg.js', 'formats.js']
+    filenames = ['threeViewer.js', 'csg.js', 'formats.js']
     for filename in filenames:
       f = open(filename)
       print filename
@@ -165,4 +165,4 @@ def file_lookup(name):
   n = int(name[6:])
   return filenames[n]
 if __name__ == '__main__':
-  Gen_compressed('').start()
+  Gen_compressed('').start()
\ No newline at end of file

blockscad/viewer.js

@@ -8,9 +8,15 @@
 var Blockscad =  Blockscad || {};
 var CSG = CSG || {};
 var CAG = CAG || {};
+/**
+ * A viewer is a WebGL canvas that lets the user view a mesh. The user can tumble it around by dragging the mouse.
+ * @constructor
+ * @param {string} containerelement - selector of the doom element wich will contain the viewer
+ * @param {int} width - width of the viewer
+ * @param {int} height - width of the viewer
+ * @param {int} initialdepth - ??
+ */
 
-// A viewer is a WebGL canvas that lets the user view a mesh. The user can
-// tumble it around by dragging the mouse.
 Blockscad.Viewer = function(containerelement, width, height, initialdepth) {
   var gl = GL.create();
   this.gl = gl;

index.html

@@ -9,10 +9,9 @@
   <title>BlocksCAD</title>
   <!-- compressed javascript files for non-debug stuff -->
 
-      <!--<script type="text/javascript" src="blockly/blockly_compressed.js"></script>
-      <script type="text/javascript" src="blockly/blocks_compressed.js"></script>-->
+      <script type="text/javascript" src="blockly/blockly_compressed.js"></script>
+      <script type="text/javascript" src="blockly/blocks_compressed.js"></script>
 
-  <!-- Jquery -->
   <script src="jquery/jquery-1.11.3.js"></script>
   <script src="jquery/jquery-ui.min.js"></script> 
   <script src="jquery/jquery.hammer.js"></script>
@@ -21,7 +20,7 @@
   <link rel="stylesheet" href="bootstrap/bootstrap-3.3.4-dist/css/bootstrap.min.css">
   <link rel="stylesheet" href="bootstrap/bootstrap-3.3.4-dist/css/bootstrap-theme.min.css">
   <script src="bootstrap/bootstrap-3.3.4-dist/js/bootstrap.min.js"></script>
- 
+<!-- 
   <script type="text/javascript" src="blockly/blockly_uncompressed.js"></script>
   <script type="text/javascript" src="blockly/blocks/colour.js"></script>
   <script type="text/javascript" src="blockly/blocks/geom_set_ops.js"></script>
@@ -33,14 +32,14 @@
   <script type="text/javascript" src="blockly/blocks/procedures.js"></script>
   <script type="text/javascript" src="blockly/blocks/text.js"></script>
   <script type="text/javascript" src="blockly/blocks/variables.js"></script>
-  
+  -->
 
   <script type="text/javascript" src="blockly/openscad_compressed.js"></script>
   <!-- eventually, the generated stuff should go in a different file.  But for now, lets include this: -->
   <!--<script type="text/javascript" src="generated/en.js"></script>-->
   <!--<script type"text/javascript" src="blockly/generators/openscad/extra.js"></script>-->
 
-
+<!--
   <script type="text/javascript" src="blockscad/utils.js"></script>
   <script type="text/javascript" src="blockscad/storage.js"></script>
   <script type="text/javascript" src="blockscad/FileSaver.js"></script>
@@ -51,19 +50,19 @@
   <script type="text/javascript" src="blockscad/toolbox.js"></script>
   <script type="text/javascript" src="blockscad/text.js"></script>
   <script src="blockscad/lightgl.js"></script>
+-->
 
-
-  <!--
   <script type="text/javascript" src="backend_compressed.js"></script> 
-  -->
+  
   <!-- viewer stuff -->
-  <!--<script type="text/javascript" src="blockscad/viewer_compressed.js"></script>-->
-  <script type="text/javascript" src="blockscad/csg.js"></script>
+  <script type="text/javascript" src="blockscad/viewer_compressed.js"></script>
+<!--  <script type="text/javascript" src="blockscad/csg.js"></script>
   <script type="text/javascript" src="blockscad/formats.js"></script>
   <script type="text/javascript" src="blockscad/viewer.js"></script>
+  -->
   
-  <!--<script src="blockscad/blockscad_compressed.js"></script>-->
-  
+  <script src="blockscad/blockscad_compressed.js"></script>
+    
   <script src="blockscad/underscore.js"></script>
   <script src="blockscad/openscad-openjscad-translator.js"></script>
   <!-- end viewer stuff -->
@@ -580,7 +579,7 @@
     </div>
     <div class="modal-body">
       <div>
-        <p>Version 1.0.1 (2015/09/01)</p>
+        <p>Version 1.1.0 (2015/09/18)</p>
         <br>
         <p>Want to help? <a href="https://github.com/EinsteinsWorkshop/BlocksCAD">Get involved!</a></p>
         <p>Have feedback? <a href="mailto://blockscad@einsteinsworkshop.com">blockscad@einsteinsworkshop.com</a>
@@ -606,3 +605,4 @@
 </body>
 
 </html>
+