mass update with poor commit message

Makefile

@@ -18,16 +18,17 @@ default::
 clean:
 	$(ECHO) CLEAN
 	$(Q)rm -rf resources/gen
+	$(Q)jekyll clean
 
 resources/gen/rules.mk: _data/assets.yml _lib/rules.py
 	$(ECHO) RULES
-	$(Q)mkdir resources/gen
+	$(Q)mkdir -p resources/gen
 	$(Q)_lib/rules.py $< > $@
 -include resources/gen/rules.mk
 
 
 .PHONY: publish jekyll
-jekyll:
+jekyll: default
 	$(ECHO) "JEKYLL"
 	$(Q)jekyll build
 

_data/assets.yml

@@ -3,9 +3,9 @@
   stl: gen/main.stl
   images: ['gen/main.png']
 
-- name: Big Featureless Cube
-  notes: "Choice of red color is not well motivated, it was just a chance to send a string as an OpenSCAD parameter.  This color is _NOT_ carried through to the STL viewer, because OpenSCAD STLs do not carry color information.  Since models are zoomed, you can't see the size difference either.  Whoops."
+- name: Monolith from 2001
+  notes: ""
   scad: main.scad
-  flags: -Dsize=100 -Dcolor="red"
-  stl: gen/big.stl
-  images: ['gen/big.png']
+  flags: -Dsize=[1,4,9]
+  stl: gen/monolith.stl
+  images: ['gen/monolith.png']

_layouts/base.html

@@ -35,14 +35,15 @@
    </div>
    
   </div>
+  <hr>
   <div id="footer">
    <div class="container">
-    <a class="pull-right" href="#">Back to top</a>
     <p>
     
-    This 3D printable project is offered under <a href="{{ relative }}LICENSE.html">an open source license</a>
+    This 3D printable project is offered under <a href="{{ relative }}LICENSE.html">an open source license</a>.  The site is built with software under <a href="{{ relative }}other-licenses.html">various open source licenses</a>.
     
     </p>
+    <a class="pull-right" href="#">Back to top</a>
    </div>
   </div>
  </body>

_lib/docimport.py

@@ -20,7 +20,6 @@ fd.write(b"data <<EOF" + b"\n")
 fd.write(b"Docs built at " + version.encode('utf-8') + b"\n")
 fd.write(b"EOF" + b"\n")
 
-files = glob.glob("_site/*")
 for root, dirs, files in os.walk("_site"):
     for fn in files:
         fn = os.path.join(root, fn)

other-licenses.md

@@ -0,0 +1,11 @@
+---
+layout: base
+title: Web Site Licenses
+---
+
+This website is built on various open source technologies:
+
+ - [Jekyll](https://github.com/jekyll/jekyll/blob/master/LICENSE) [MIT]
+ - [Jekyll Codex](https://github.com/jhvanderschee/jekyllcodex/#mit-license) [MIT]
+ - [three.js](https://github.com/mrdoob/three.js/blob/dev/LICENSE) [MIT]
+ - [simple-stl-viewer](https://tonybox.net/posts/simple-stl-viewer/) [MIT]

resources/js/stlviewer.js

@@ -16,10 +16,10 @@ function STLViewer(elem, model) {
 
     var controls = new THREE.OrbitControls(camera, renderer.domElement);
     controls.enableDamping = true;
-    controls.rotateSpeed = 0.05;
+    controls.rotateSpeed = 0.7;
     controls.dampingFactor = 0.1;
-    controls.enableZoom = false;
-    controls.enablePan = false;
+    controls.enableZoom = true;
+    controls.enablePan = true;
     controls.autoRotate = true;
     controls.autoRotateSpeed = 0.75;
 
@@ -32,7 +32,7 @@ function STLViewer(elem, model) {
         // Determine the color
         var colorString = elem.getAttribute("data-color")
         if(colorString != null) { var color = new THREE.Color(colorString); }
-        else { var color = 0xff5533 }
+        else { var color = 0xffff33 }
         
         // Set up the material
         var material = new THREE.MeshPhongMaterial({ color: color, specular: 100, shininess: 100 });

resources/main.scad

@@ -1,5 +1,3 @@
 size = 10;
-color = "blue";
 
-color(color)
 cube(size);