chore(): Merge pull request jscad#269 from kaosat-dev/merge-dev-master

Release: merge dev into master

.babelrc

@@ -0,0 +1,5 @@
+{
+  "presets": [
+    "es2015"
+  ]
+}

.gitignore

@@ -0,0 +1,3 @@
+node_modules/
+components
+.DS_Store

js/lib/sax-js-1.1.5/.travis.yml → .travis.yml

@@ -1,7 +1,5 @@
-sudo: false
 language: node_js
 node_js:
-  - '0.10'
-  - '0.12'
-  - '4'
-  - '5'
+  - "6"
+  - "7"
+sudo: false

CHANGELOG.md

@@ -0,0 +1,97 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## 0.6.0 (2017-05-xx)
+total rework of application and library structure:
+- modular, smaller codebase (node.js modules) instead of monolithic files
+- actual npm package, dependency managment now done correctly via package.json
+- shared browser/Node.js code base
+- split out CSG.js scad-api, formats handling etc to seperate repositories
+- moved all repositories to the [jscad organization](https://github.com/jscad)
+- default stl output is now in binary format (more efficient)
+- lots more internal changes and improvements
+
+## 0.5.2 (2017-10-01)
+updated documentation links by Z3 Dev, updated Ace editor to 1.2.4, fixed AMF export to set colors only when provided, enhanced Processor constructor to support Viewer options, added big.html to provide an example of using Processor and Viewer options, enhanced Processor to retain multiple returned objects, fixed difference() and intersection() functions for CAG by fischman
+
+## 0.5.1 (2016-06-27)
+refactored AMF import and export, enhanced STL import by adding support for MM colors by Z3 Dev,added local storage by Robert Starkey
+
+## 0.5.0 (2016-05-01)
+ added SVG import and export, added options to Processor and View classes, allow more flexibility in HTML by Z3 Dev
+
+## 0.4.0 (2016-02-25)
+refactored, functionality split up into more files, mostly done by Z3 Dev
+
+## 0.3.1 (2015-10-23)
+including new parameter options by Z3 Dev
+
+## 0.3.0 (2015-07-02)
+  format.js (Stefan Baumann), and Blob.js/openjscad improved by Z3 Dev
+
+## 0.2.4 (2015-05-20)
+  renumbering, latest csg.js from http://joostn.github.com/OpenJsCad/ adapted
+
+## 0.024 (2015-04-08)
+  dev branch opened
+
+## 0.023 (2015-02-14)
+  bumping version based on openscad.js
+
+## 0.020 (2015-02-04)
+  browser window resizing done properly, thanks to Z3 devs via pull request
+
+## 0.019 (2015-01-07)
+  various pull requests from github merged again
+
+## 0.018 (2014-10-05)
+  various pull requests from github merged
+
+## 0.017 (2013-04-11)
+  alpha channel supported in color() and .setColor()
+
+## 0.016 (2013-04-07)
+  csg.js: solidFromSlices() and .setColor() on polygon level, and examples by Eduard Bespalov
+
+## 0.015 (2013-04-05)
+  rudimentary AMF export and import, web and cli
+
+## 0.014 (2013-04-03)
+  multiple files via drag & drop, developing locally
+
+## 0.013 (2013-04-01)
+  include() on web-online & drag & drop (but not off-line) and cli (server-side)
+
+## 0.012 (2013-03-20)
+  improved UI (slider from the left)
+
+## 0.011 (2013-03-28)
+  added support for rectangular_extrude(), rotate_extrude() and torus()
+
+## 0.010 (2013-03-22)
+  leave .scad file intact, and translate on-the-fly
+
+## 0.009 (2013-03-20)
+  OpenSCAD .scad syntax support included via [openscad-openjscad-translator](https://github.com/garyhodgson/openscad-openjscad-translator) module, on web and cli; and experimental .stl import support (binary & ascii)
+
+## 0.008 (2013-03-15)
+  circle(), square(), polygon() partially and linear_extrude() implemented (openscad-like)
+
+## 0.007 (2013-03-14)
+  integrating jQuery for new features; draggable hint window
+
+## 0.006 (2013-03-12)
+  included examples available in the web-frontend direct
+
+## 0.005 (2013-03-12)
+  supporting webgui parameters as of original OpenJsCad (see examples/example030.jscad)
+
+## 0.004 (2013-03-11)
+  openscad.js: many improvements, more OpenSCAD-like functions
+
+## 0.003 (2013-03-10)
+  solidify the functionality (few bug fixes)
+
+## 0.001 (2013-03-10)
+  initial version

CONTRIBUTING.md

@@ -1,18 +1,83 @@
-OpenJSCAD.org is a volunteer effort. We welcome and encourage anyone to pitch in but please take a moment to read the following guidelines.
+## OpenJSCAD.org
 
-* If you want to submit a bug report please make sure to follow the [Reporting Issues to OpenJSCAD.org](https://github.com/Spiritdude/OpenJSCAD.org/wiki/Reporting-Issues-to-OpenJSCAD.org) guide. Bug reports are accepted as [Issues](https://github.com/Spiritdude/OpenJSCAD.org/issues/) via GitHub.
+## OpenJSCAD.org Website Components - Contributing Guide
 
-* If you want to submit a change or a patch, please read the [Contributing to OpenJSCAD.org](https://github.com/Spiritdude/OpenJSCAD.org/wiki/Contributing-to-OpenJSCAD.org) guide. New contributions are accepted as [Pull Requests](https://github.com/Spiritdude/OpenJSCAD.org/pulls/) via GithHub.
+These components are part of the JSCAD Organization, and is maintained by a group of volunteers. We welcome and encourage anyone to pitch in but please take a moment to read the following guidelines.
 
-* We only accept bug reports and pull requests on GitHub*.
+* If you want to submit a bug report please make sure to follow the [Reporting Issues](https://github.com/jscad/csg.js/wiki/Reporting-Issues) guide. Bug reports are accepted as [Issues](https://github.com/jscad/OpenJSCAD.org/issues/) via GitHub.
 
-* If you want to contribute to OpenJSCAD.org documentation, you can start immediately as new contributions are accepted on Wikibooks via the online [OpenJSCAD User Guide](https://en.wikibooks.org/wiki/OpenJSCAD_User_Guide).
+* If you want to submit a change or a patch, please read the contents below on how to make changes. New contributions are accepted as [Pull Requests](https://github.com/jscad/OpenJSCAD.org/pulls/) via GithHub.
 
-* If you have a question about how to use OpenJSCAD.org, please start a conversation at the [OpenJSCAD.org User Group](https://plus.google.com/communities/114958480887231067224). Please read the [OpenJSCAD.org User Guide](https://github.com/Spiritdude/OpenJSCAD.org/wiki/User-Guide) beforehand.
+* We only accept bug reports and pull requests on **GitHub**.
 
-* If you have a change or new feature in mind, please start a converstation with the [Core Developers](https://plus.google.com/communities/114958480887231067224) and start contributing changes.
+* If you have a question about how to use OpenJSCAD, then please start a conversation at the [OpenJSCAD.org User Group](https://plus.google.com/communities/114958480887231067224). You might find the answer in the [OpenJSCAD.org User Guide](https://github.com/Spiritdude/OpenJSCAD.org/wiki/User-Guide).
 
-Thanks! :heart: :heart: :heart:
+* If you have a change or new feature in mind, please start a conversation with the [Core Developers](https://plus.google.com/communities/114958480887231067224) and start contributing changes.
 
-The OpenJSCAD.org Core Developers
+Thanks!
+
+The JSCAD Organization
+
+## Making Changes
+
+First, we suggest that you fork this GIT repository. This will keep your changes separate from the fast lane.  And make pull requests easier.
+
+Once forked, clone your copy of the OpenJSCAD.org components.
+```
+git clone https://github.com/myusername/OpenJSCAD.org.git
+cd OpenJSCAD.org
+```
+
+**We suggest downloading NPM. This will allow you to generate API documents, and run test suites.**
+
+Once you have NPM, install all the dependencies for development.
+```
+npm install
+```
+And, run the test cases to verify the library is functional.
+```
+npm test
+```
+Next, start a small webserver to run the website. (Note: The web pages will automatically reload if changes are made.)
+```
+npm run start-dev
+```
+
+The project is structured as:
+- *.css : style sheets for the pages
+- index.html : main page with all features enabled
+- viewer-minimal.html : example of how to use just the veiwer
+- viewer-options.html : example of how to control the viewer options
+- dist/*.js : specific BAR files that are built fort each page
+- src/
+  - *.js : ??
+  - cli/*.js : ??
+  - core/*.js : ??
+  - io/*.js : ??
+  - jscad/*.js : ??
+  - ui/
+    - *.js : ??
+    - viewer/*.js : ??
+  - utils/*.js : various utiliity functions
+
+You can now make changes to the library, as well as the test suites.
+
+If you intend to contribute changes back to JSCAD then please be sure to create test cases.
+
+Done? Great! Push the changes back to the fork.
+```
+git commit changed-file
+git add test/new-test-suite.js
+git commit test/new-test-suite.js
+git push
+```
+Finally, you can review your changes via GitHub, and create a pull request. 
+
+TIPS for successful pull requests:
+- Commit often, and comment well
+- Follow the [JavaScript Standard Style](https://github.com/feross/standard)
+- Create test cases for all changes
+- Verify that all tests suites pass
+
+WOW! Thanks for the cool code.
 

Makefile

@@ -1,21 +1,31 @@
-VERSION = 0.5.2
-LIB = /usr/local/lib/openjscad/
-NODE_MODULES = /usr/local/lib/node_modules/
+VERSION = 0.6.0
+PREFIX = /usr/local
+BIN = $(PREFIX)/bin/
+LIB = $(PREFIX)/lib/openjscad/
+NODE_MODULES = $(PREFIX)/lib/node_modules/
 
 all::
-	@echo "make install deinstall tests clean" 
+	@echo "make install deinstall tests clean"
 
 install::
-	test -d ${NODE_MODULES}/openscad-openjscad-translator || sudo npm -g install openscad-openjscad-translator
-	#test -d ${NODE_MODULES}/jquery || sudo npm -g install jquery
-	sudo scp openjscad /usr/local/bin/
-	sudo mkdir -p ${LIB}
-	sudo scp *.js ${LIB}
+	test -d ${NODE_MODULES}/openscad-openjscad-translator || npm -g install openscad-openjscad-translator
+	#test -d ${NODE_MODULES}/jquery || npm -g install jquery
+	scp openjscad $(BIN)
+	mkdir -p ${LIB}
+	scp openjscad.js ${LIB}
+	scp openscad.js ${LIB}
+	scp Blob.js ${LIB}
+	scp formats.js ${LIB}
+	scp lightgl.js ${LIB}
+	scp csg.js ${LIB}
+	scp openscad-openjscad-translator.js ${LIB}
+	scp underscore.js ${LIB}
 	mkdir -p cache; chmod a+rw cache
-                                
+
 deinstall::
-	sudo rm -rf ${NODE_MODULES}/openscad-openjscad-translator
-	sudo rm -f ${LIB}/*.js 
+	rm -rf ${NODE_MODULES}openscad-openjscad-translator
+	rm $(BIN)/openjscad
+	rm -rf ${LIB}
 
 tests::
 	openjscad examples/logo.jscad
@@ -42,7 +52,7 @@ clean::
 	cd examples/platonics && make clean
 	cd examples/include-test && make clean
 
-# TODO:                                        
+# TODO:
 # - locally submodule of openscad-openjscad-translator, see http://git-scm.com/book/en/Git-Tools-Submodules
 
 # --- developers only below
@@ -71,15 +81,15 @@ master-to-dev::
 	git checkout dev
 	git merge master
 
-dist::	
+dist::
 	cd ..; tar cfz Backup/openjscad.org-${VERSION}.tar.gz "--exclude=*.git/*" OpenJSCAD.org/
 
-backup::	
+backup::
 	scp ../Backup/openjscad.org-${VERSION}.tar.gz the-labs.com:Backup/
 
 edit::
 	dee4 index.html Makefile LICENSE README.md *.css *.js openjscad
 
 live::
 	# -- do not enable --delete as it will destroy stats folder
-	rsync -av --exclude=.git --exclude=cache/ ./ delta:Sites/openjscad.org/ 
+	rsync -av --exclude=.git --exclude=cache/ ./ delta:Sites/openjscad.org/