Add support for setting CuraEngine version from CMake

This would prevent the g-code flavour from being recognised in RepRap machines.

.gitignore

@@ -18,3 +18,8 @@ build/*
 NUL
 CuraEngine.layout
 CuraEngine.cbp
+documentation/html/*
+documentation/latex/*
+
+*kdev*
+*.kate-swp

CMakeLists.txt

@@ -0,0 +1,109 @@
+project(CuraEngine)
+
+cmake_minimum_required(VERSION 2.8.12)
+
+find_package(Arcus REQUIRED)
+
+if(NOT ${CMAKE_VERSION} VERSION_LESS 3.1)
+    set(CMAKE_CXX_STANDARD 11)
+else()
+    set(CMAKE_CXX_FLAGS "-std=c++11")
+endif()
+
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+
+set(CURA_ENGINE_VERSION "master" CACHE STRING "Version name of Cura")
+
+# Add a compiler flag to check the output for insane values if we are in debug mode.
+if(CMAKE_BUILD_TYPE MATCHES DEBUG)
+	message("Building debug release of CuraEngine.")
+	add_definitions(-DASSERT_INSANE_OUTPUT)
+endif()
+
+# Add warnings
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+
+if(NOT APPLE AND NOT WIN32)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++")
+endif()
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR} libs)
+
+add_library(clipper STATIC libs/clipper/clipper.cpp)
+
+set(engine_SRCS # Except main.cpp.
+    src/bridge.cpp
+    src/comb.cpp
+    src/commandSocket.cpp
+    src/FffGcodeWriter.cpp
+    src/FffPolygonGenerator.cpp
+    src/FffProcessor.cpp
+    src/gcodeExport.cpp
+    src/gcodePlanner.cpp
+    src/infill.cpp
+    src/inset.cpp
+    src/layerPart.cpp
+    src/MergeInfillLines.cpp
+    src/mesh.cpp
+    src/MeshGroup.cpp
+    src/multiVolumes.cpp
+    src/pathOrderOptimizer.cpp
+    src/PrimeTower.cpp
+    src/Progress.cpp
+    src/raft.cpp
+    src/settingRegistry.cpp
+    src/settings.cpp
+    src/skin.cpp
+    src/skirt.cpp
+    src/sliceDataStorage.cpp
+    src/slicer.cpp
+    src/support.cpp
+    src/timeEstimate.cpp
+    src/wallOverlap.cpp
+    src/Weaver.cpp
+    src/Wireframe2gcode.cpp
+
+    src/utils/gettime.cpp
+    src/utils/logoutput.cpp
+    src/utils/polygonUtils.cpp
+    src/utils/polygon.cpp
+)
+
+# List of tests. For each test there must be a file tests/${NAME}.cpp and a file tests/${NAME}.h.
+set(engine_TEST
+    LinearAlg2DTest
+)
+
+# Generating ProtoBuf protocol.
+protobuf_generate_cpp(engine_PB_SRCS engine_PB_HEADERS Cura.proto)
+
+# Compiling CuraEngine itself.
+add_executable(CuraEngine ${engine_SRCS} src/main.cpp ${engine_PB_SRCS})
+target_link_libraries(CuraEngine clipper Arcus)
+
+set_target_properties(CuraEngine PROPERTIES COMPILE_DEFINITIONS "VERSION=\"${CURA_ENGINE_VERSION}\"")
+
+if (UNIX)
+    target_link_libraries(CuraEngine pthread)
+endif()
+
+# Compiling the test environment.
+if (BUILD_TESTS)
+    add_library(CuraEngineLibrary ${engine_SRCS} ${engine_PB_SRCS})
+    if (UNIX)
+        target_link_libraries(CuraEngineLibrary pthread)
+    endif()
+    enable_testing()
+    foreach (test ${engine_TEST})
+        add_executable(${test} tests/main.cpp tests/${test}.cpp)
+        target_link_libraries(${test} CuraEngineLibrary)
+        target_link_libraries(${test} cppunit)
+        add_test(${test} ${test})
+    endforeach()
+endif()
+
+# Installing CuraEngine.
+include(GNUInstallDirs)
+install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR})
+include(CPackConfig.cmake)
+

CPackConfig.cmake

@@ -0,0 +1,27 @@
+set(CPACK_PACKAGE_VENDOR "Ultimaker")
+set(CPACK_PACKAGE_CONTACT "Arjen Hiemstra <a.hiemstra@ultimaker.com>")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Cura Engine")
+set(CPACK_PACKAGE_VERSION_MAJOR 15)
+set(CPACK_PACKAGE_VERSION_MINOR 05)
+set(CPACK_PACKAGE_VERSION_PATCH 90)
+set(CPACK_GENERATOR "DEB;RPM")
+
+set(RPM_REQUIRES
+    "arcus >= 15.05.90"
+    "protobuf >= 3.0.0"
+    "libstdc++6 >= 4.9.0"
+    "libgcc1 >= 4.9.0"
+)
+string(REPLACE ";" "," RPM_REQUIRES "${RPM_REQUIRES}")
+set(CPACK_RPM_PACKAGE_REQUIRES ${RPM_REQUIRES})
+
+set(DEB_DEPENDS
+    "arcus (>= 15.05.90)"
+    "protobuf (>= 3.0.0)"
+    "libstdc++6 (>= 4.9.0)"
+    "libgcc1 (>= 4.9.0)"
+)
+string(REPLACE ";" ", " DEB_DEPENDS "${DEB_DEPENDS}")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DEB_DEPENDS})
+
+include(CPack)

Changelog.md

@@ -0,0 +1,14 @@
+Changelog CuraEngine
+====================
+
+
+
+
+- Feature: infill_wipe_dist. Add a travel move after an infill line in order to let it stick better to the walls.
+- Feature: Draft Protection Screen. A shell similar to the ooze shield providing protection from gusts of wind and acting similar to a heated chamber
+
+
+Release 15.06.01
+-----
+
+- [Not documented]

Cura.proto

@@ -0,0 +1,100 @@
+syntax = "proto3";
+
+package cura.proto;
+
+
+message ObjectList 
+{
+    repeated Object objects = 1;
+    repeated Setting settings = 2;
+}
+
+// typeid 1
+message Slice
+{
+    repeated ObjectList object_lists = 1;
+}
+
+message Object 
+{
+    int64 id = 1;
+    bytes vertices = 2; //An array of 3 floats.
+    bytes normals = 3; //An array of 3 floats.
+    bytes indices = 4; //An array of ints.
+    repeated Setting settings = 5; // Setting override per object, overruling the global settings.
+}
+
+// typeid 3
+message Progress 
+{
+    float amount = 1;
+}
+
+// typeid 2
+message SlicedObjectList 
+{
+    repeated SlicedObject objects = 1;
+}
+
+message SlicedObject 
+{
+    int64 id = 1;
+
+    repeated Layer layers = 2;
+}
+
+message Layer {
+    int32 id = 1;
+
+    float height = 2;
+    float thickness = 3;
+
+    repeated Polygon polygons = 4;
+}
+
+message Polygon {
+    enum Type {
+        NoneType = 0;
+        Inset0Type = 1;
+        InsetXType = 2;
+        SkinType = 3;
+        SupportType = 4;
+        SkirtType = 5;
+        InfillType = 6;
+        SupportInfillType = 7;
+        MoveCombingType = 8;
+        MoveRetractionType = 9;
+    }
+    Type type = 1;
+    bytes points = 2;
+    float line_width = 3;
+}
+
+// typeid 4
+message GCodeLayer {
+    int64 id = 1;
+    bytes data = 2;
+}
+
+// typeid 5
+message ObjectPrintTime {
+    int64 id = 1;
+    float time = 2;
+    float material_amount = 3;
+}
+
+// typeid 6
+message SettingList {
+    repeated Setting settings = 1;
+}
+
+message Setting {
+    string name = 1;
+
+    bytes value = 2;
+}
+
+// typeid 7
+message GCodePrefix {
+    bytes data = 2;
+}

Makefile

@@ -1,89 +0,0 @@
-#
-# Makefile for CuraEngine
-#
-
-BUILD_DIR = build
-SRC_DIR = src
-LIBS_DIR = libs
-
-BUILD_TYPE = RELEASE
-
-VERSION ?= DEV
-CXX ?= g++
-CFLAGS += -c -Wall -Wextra -Wold-style-cast -Woverloaded-virtual -std=c++11 -DVERSION=\"$(VERSION)\" -isystem libs
-
-ifeq ($(BUILD_TYPE),DEBUG)
-	CFLAGS+=-ggdb -Og -g
-endif
-ifeq ($(BUILD_TYPE),PROFILE)
-	CFLAGS+= -pg
-endif
-ifeq ($(BUILD_TYPE),RELEASE)
-	CFLAGS+= -O3 -fomit-frame-pointer
-endif
-
-LDFLAGS += -Lbuild/ -lclipper
-
-SOURCES_RAW = bridge.cpp comb.cpp gcodeExport.cpp infill.cpp inset.cpp layerPart.cpp main.cpp optimizedModel.cpp pathOrderOptimizer.cpp polygonOptimizer.cpp raft.cpp settings.cpp skin.cpp skirt.cpp slicer.cpp support.cpp timeEstimate.cpp
-SOURCES_RAW += modelFile/modelFile.cpp utils/gettime.cpp utils/logoutput.cpp utils/socket.cpp
-SOURCES = $(addprefix $(SRC_DIR)/,$(SOURCES_RAW))
-
-OBJECTS_RAW = $(SOURCES_RAW:.cpp=.o)
-OBJECTS = $(addprefix $(BUILD_DIR)/,$(OBJECTS_RAW))
-
-DIRS = $(sort $(dir $(OBJECTS)))
-
-EXECUTABLE = $(BUILD_DIR)/CuraEngine
-
-ifeq ($(OS),Windows_NT)
-	#For windows make it large address aware, which allows the process to use more then 2GB of memory.
-	EXECUTABLE := $(EXECUTABLE).exe
-	CFLAGS += -march=pentium4 -flto
-	LDFLAGS += -Wl,--large-address-aware -lm -lwsock32 -flto
-	MKDIR_PREFIX = mkdir -p
-else
-	MKDIR_PREFIX = mkdir -p
-	UNAME := $(shell uname)
-	ifeq ($(UNAME), Linux)
-		OPEN_HTML=firefox
-		ifeq ($(BUILD_TYPE),DEBUG)
-			LDFLAGS += --static
-		else
-			CFLAGS += -flto
-			LDFLAGS += --static -flto
-		endif
-	endif
-	ifeq ($(UNAME), OpenBSD)
-		LDFLAGS += -lm -lpthread
-	endif
-	ifeq ($(UNAME), Darwin)
-		OPEN_HTML=open
-		#For MacOS force to build
-		CFLAGS += -force_cpusubtype_ALL -mmacosx-version-min=10.6 -arch x86_64 -arch i386
-		LDFLAGS += -force_cpusubtype_ALL -mmacosx-version-min=10.6 -arch x86_64 -arch i386
-	endif
-endif
-
-all: $(DIRS) $(SOURCES) $(EXECUTABLE)
-
-$(BUILD_DIR)/libclipper.a: $(LIBS_DIR)/clipper/clipper.cpp
-	$(CXX) $(CFLAGS) -o $(BUILD_DIR)/libclipper.a $(LIBS_DIR)/clipper/clipper.cpp
-
-$(EXECUTABLE): $(OBJECTS) $(BUILD_DIR)/libclipper.a
-	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
-
-$(DIRS):
-	-@$(MKDIR_PREFIX) $(DIRS)
-
-$(BUILD_DIR)/%.o: $(SRC_DIR)/%.cpp
-	$(CXX) $(CFLAGS) $< -o $@
-
-test: $(EXECUTABLE)
-	python tests/runtest.py $(abspath $(EXECUTABLE))
-
-## clean stuff
-clean:
-	rm -f $(EXECUTABLE) $(OBJECTS) $(BUILD_DIR)/libclipper.a
-
-help:
-	@cat Makefile |grep \#\#| grep \: |cut -d\# -f3

README.md

@@ -3,9 +3,9 @@ CuraEngine
 The CuraEngine is a C++ console application for 3D printing GCode generation. It has been made as a better and faster alternative to the old Skeinforge engine.
 
 The CuraEngine is pure C++ and uses Clipper from http://www.angusj.com/delphi/clipper.php
-There are no external dependences and Clipper is included in the source code without modifications.
+Furthermore it depends on libArcus by Ultimaker, which can be found at http://github.com/Ultimaker/libArcus
 
-This is just a console application for GCode generation. For a full graphical application look at https://github.com/daid/Cura which is the graphical frontend for CuraEngine.
+This is just a console application for GCode generation. For a full graphical application look at https://github.com/Ultimaker/Cura which is the graphical frontend for CuraEngine.
 
 The CuraEngine can be used seperately or in other applications. Feel free to add it to your application. But please take note of the License.
 
@@ -16,6 +16,48 @@ Terms of the license can be found in the LICENSE file. Or at http://www.gnu.org/
 
 But in general it boils down to: You need to share the source of any CuraEngine modifications if you make an application with the CuraEngine. (Even if you make a web-based slicer, you still need to share the source!)
 
+How to Install
+==============
+1. Clone the repository from https://github.com/Ultimaker/CuraEngine.git (the URL at the right hand side of this page).
+2. Install Protobuf (see below)
+3. Install libArcus (see https://github.com/Ultimaker/libArcus)
+
+In order to compile CuraEngine, either use CMake or start a project in your preferred IDE. 
+CMake compilation:
+
+1. Navigate to the CuraEngine directory and execute the following commands
+2. $ mkdir build && cd build
+3. $ cmake ..
+4. $ make
+
+Project files generation:
+1. Navigate to the CuraEngine directory and execute the following commands
+2. cmake . -G "CodeBlocks - Unix Makefiles"
+3. (for a list of supported IDE's see http://www.cmake.org/Wiki/CMake_Generator_Specific_Information#Code::Blocks_Generator)
+
+Installing Protobuf
+-------------------
+1. Be sure to have libtool installed.
+2. Download protobuf from https://github.com/google/protobuf/ (download ZIP and unZIP at desired location, or clone the repo) The protocol buffer is used for communication between the CuraEngine and the GUI.
+3. Before installing protobuf, change autogen.sh : comment line 18 to line 38 using '#'s. This removes the dependency on gtest-1.7.0.
+4. Run autogen.sh from the protobuf directory: 
+   $ ./autogen.sh
+5. $ ./configure
+6. $ make
+7. $ make install     # Requires superused priviliges.
+8. (In case the shared library cannot be loaded, you can try "sudo ldconfig" on Linux systems)
+
+Running
+=======
+Other than running CuraEngine from a frontend, such as Ultimaker/Cura, one can run CuraEngine from the command line.
+For that one needs a settings JSON file, which can be found in the Ultimaker/Cura repository.
+An example run for an UM2 machine looks as follows:
+* Navigate to the CuraEngine directory and execute the following
+```
+./build/CuraEngine slice -v -j ../Cura/resources/machines/dual_extrusion_printer.json -o "output/test.gcode" -e1 -s infill_line_distance=0 -e0 -l "/model_1.stl" -e1 -l "fully_filled_model.stl" 
+```
+
+Run `CuraEngine help` for a general description of how to use the CuraEngine tool.
 
 Internals
 =========
@@ -78,4 +120,4 @@ The GCode generation is quite a large bit of code. As a lot is going on here. Im
 * PathOrderOptimizer: This piece of code needs to solve a TravelingSalesmanProblem. Given a list of polygons/lines it tries to find the best order in which to print them. It currently does this by finding the closest next polygon to print.
 * Infill: This code generates a group of lines from an area. This is the code that generates the actuall infill pattern. There is also a concentric infill function, which is currently not used.
 * Comb: The combing code is the code that tries to avoid holes when moving the head around without printing. This code also detects when it fails. The final GCode generator uses the combing code while generating the final GCode. So they interact closely.
-* GCodeExport: The GCode export is a 2 step process. First it collects all the paths for a layer that it needs to print, this includes all moves, prints, extrusion widths. And then it generates the final GCode. This is the only piece of code that has knowledge about GCode keywords and syntax;meshmdhfdhfdhf to generate a different flavor of GCode it will be the only piece that needs adjustment. All volumatric calculations also happen here.
+* GCodeExport: The GCode export is a 2 step process. First it collects all the paths for a layer that it needs to print, this includes all moves, prints, extrusion widths. And then it generates the final GCode. This is the only piece of code that has knowledge about GCode keywords and syntax to generate a different flavor of GCode it will be the only piece that needs adjustment. All volumatric calculations also happen here.

documentation/Link_to_index.html

@@ -0,0 +1 @@
+html/index.html

documentation/code_conventions.md

@@ -0,0 +1,126 @@
+Code Conventions
+=======
+Note that the code convention described here have not all yet been fully implemented.
+
+Bracketing and indenting
+-----
+~~~~~~~~~~~~~~~{.cpp}
+if (condition) // brackets always on new lines
+{ // allways a bracket after an if, for, while, etc.
+    // indent always with 4 spaces, never with tabs
+}
+else // else on new line
+{
+    // more code
+}
+~~~~~~~~~~~~~~~
+
+Naming conventions
+------
+ * variables: lower_case_with_underscores
+ * functions: loweCamelCase
+ * classes: UpperCamelCase
+ * macros: UPPER_CASE_WITH_UNDERSCORES
+~~~~~~~~~~~~~~~{.cpp}
+#define UPPER_CASE_MACRO 1
+
+class UpperCamelCase
+{
+private:
+    MemberVariableObject with_underscores;
+public:
+    MemberVariableObject with_underscores;
+
+public:
+    UpperCamelCase();
+    ~UpperCamelCase();
+    
+    // start with input variable(s) and end with output variable(s)
+    void lowerCamelCaseFunctions(ParamObject& also_with_underscores)
+    {
+        LocalObject under_scores;
+    }
+private:
+    void putFunctionsAndVariablesInSeperatePublicPrivateBlocks();
+};
+~~~~~~~~~~~~~~~
+
+Ordering
+----
+~~~~~~~~~~~~~~~{.cpp}
+class Example
+{
+    // start with input variable(s) and end with output parameter(s) 
+    void function1(ParamObject& input_variable, int setting_parameter, ParamObject2& return_parameter)
+    {
+        function2();
+        function3();
+    }
+    
+    // place functions called solely by one other function below it chronologically
+    void function2();
+    
+    void function3();
+};
+~~~~~~~~~~~~~~~
+
+Documentation
+----
+We use [Doxygen](www.doxygen.org/) to generate documentation. Try to keep your documentation in doxygen style.
+
+Here's a small example:
+~~~~~~~~~~~~~~~{.cpp}
+/ *!
+ * Doxygen style comments!
+ *
+ * \param param1 explanation may refer to another \p param2
+ * /
+void function(int param1, int param2)
+{
+    // non-doxygen style comments on implementation details
+}
+
+int member; //!< inline doxygen comment on the entry to the left
+~~~~~~~~~~~~~~~
+
+Files
+--------
+For a file Foo.h (UpperCamelCase):
+~~~~~~~~~~~~~~~{.cpp}
+#ifndef FOO_H
+#define FOO_H
+// [content]
+#endif//FOO_H
+~~~~~~~~~~~~~~~
+
+
+Other
+----
+~~~~~~~~~~~~~~~{.cpp}
+#include <all>
+#include <includes>
+#include <on>
+#include <top>
+
+#include <first_system_includes>
+
+#include <then_library_includes>
+
+#include "finally_local_includes"
+
+enum class EnumExample 
+{
+    ELEM0 = 0,
+    ELEM1 = 1
+};
+~~~~~~~~~~~~~~~
+
+Illegal syntax
+----
+~~~~~~~~~~~~~~~{.cpp}
+void function()
+{
+    if (condition)
+        single_line_outside_code_block(); // always use braces!
+}; // unneccesary semicolon after function definition is not allowed
+~~~~~~~~~~~~~~~

documentation/glossary.md

@@ -0,0 +1,12 @@
+Glossary
+========
+
+
+Term/Synonyms | Meaning
+--- | ---
+Extruder Train | The whole of a feeder, bowden tube and a nozzle
+Island/Part | isolated/unconnected part in 2D slice
+Inset | perimeter, the perimeters which are laid down around the infill
+Slicing | The act of extracting the contours of the object at a certain height (not the whole process which would also include gcode generation etc.)
+Tower (support) | A strut to reinforce parts of the support which would otherwise be unstable.
+Weaver / Neith / WirePrint | A non-layer-wise form of printing 'in thin air'

documentation/mainpage.md

@@ -0,0 +1,10 @@
+CuraEngine {#mainpage}
+=======
+
+This is the documentation for CuraEngine, the back-end slicer of Cura.
+
+[Overview](documentation/overview.md)
+
+[Glossary](documentation/glossary.md)
+
+[Code Conventions](documentation/code_conventions.md)

documentation/overview.md

@@ -0,0 +1,68 @@
+Overview
+========
+
+Internals
+---------
+
+The Cura Engine is structured as mainly .h files. This is not standard for an C++ project. However, using less cpp files makes the optimizer work harder and removes linking error issues. It's partialy a result of lazyness but also for optimalizations.
+
+The .h files contain different steps called from the main.cpp file. The main.cpp file contains the global slicing logic.
+
+The slicing process follows the following global steps:
+* Load 3D model
+* Analize and fix 3D model
+* Slice 3D model into 2D layers
+* Build LayerParts from sliced layers
+* Generate Insets
+* Generate up/down skins areas
+* Generate sparse infill areas
+* Generate GCode for each layer
+
+Each step has more logic in it. But this is a general overview.
+All data for the engine is stored in the "SliceDataStorage". It's important to remember that only the data from the previous step is valid.
+
+Coordinates are stored in 64bit integers as microns in the code. So if you see a value of 1000 then this mean 1mm of distance. This is because Clipper works on 64bit integers and microns give a high enough resolution without limiting the size too much. Note that there are some bits and pieces of code that need to be careful about 64bit overflows, especially calculating lengths sqrt(x*x+y*y) can cause overflows.
+
+OptimizedModel
+--------------
+The OptimizedModel is a 3D model stored with vertex<->face relations. This gives touching face relations which are used later on to slice into layers faster.
+
+Slicer
+------
+While usually the whole GCode generation process is called Slicing. The slicer in the CuraEngine is the piece of code that generates layers. Each layer has closed 2D polygons.
+These polygons are generated in a 2 step process. First all triangles are cut into lines per layer, for each layer a "line segment" is added to that layer.
+Next all these line-segments are connected to eachother to make Polygons. The vertex<->face relations of the OptimizedModel help to make this process fast, as there is a huge chance that 2 connecting faces also make 2 connecting line-segments.
+This code also fixes up small holes in the 3D model, so your model doesn't need to be perfect Manifold. It also accounts for incorrect normals, so it can flip around line-segments to fit end-to-end.
+
+After the Slicer we have closed Polygons which can be used in Clipper, as Clipper can only opperate on closed 2D polygons.
+
+LayerParts
+----------
+An important concept to grasp is the LayerParts. LayerParts are seperate parts inside a single layer. For example, if you have a cube. Then each layer has a single LayerPart. However, if you have a table, then the layers which build the legs have a LayerPart per leg, and thus there will be 4 LayerParts.
+A LayerPart is a seperated area inside a single layer which does not touch any other LayerParts. Most operations run on LayerParts as it reduces the amount of data to process. During GCode generation handling each LayerPart as an own step makes sure you never travel between LayerParts and thus reducing the amount of external travel.
+LayerParts are generated after the Slicer step.
+
+To generate the LayerParts Clipper is used. A Clipper union with extended results gives a list of Polygons with holes in them. Each polygon is a LayerPart, and the holes are added to this LayerPart.
+
+Polygons
+--------
+Holes are polygons in counter-clockwise (or at-least, in the other direction) and the polygons are guaranteed to be "even-odd", so every crossing of polygon lines will switch from "fill" to "empty".
+
+Insets
+------
+Insets are also called "Perimeters" or "Loops" sometimes. Generating the insets is only a small bit of code, as Clipper does most of the heavy lifting.
+
+Up/Down skin
+------------
+The skin code generates the fully filled areas, it does this with some heavy boolean Clipper action. The skin step uses data from different layers to get the job done. Check the code for details.
+The sparse infill area code is almost the same as the skin code. With the difference that it keeps the other areas and uses different offsets.
+
+Note that these steps generate the areas, not the actual infill lines. The infill line paths are generated later on. So the result of this step are list of Polygons which are the areas that need to be filled.
+
+GCode generation
+----------------
+The GCode generation is quite a large bit of code. As a lot is going on here. Important bits here are:
+* PathOrderOptimizer: This piece of code needs to solve a TravelingSalesmanProblem. Given a list of polygons/lines it tries to find the best order in which to print them. It currently does this by finding the closest next polygon to print.
+* Infill: This code generates a group of lines from an area. This is the code that generates the actuall infill pattern. There is also a concentric infill function, which is currently not used.
+* Comb: The combing code is the code that tries to avoid holes when moving around the head without printing. This code also detects when it fails. The final GCode generator uses the combing code while generating the final GCode. So they interact closely.
+* GCodeExport: The GCode export is a 2 step process. First it collects all the paths for a layer that it needs to print, this includes all moves, prints, extrusion widths. And then it generates the final GCode. This is the only piece of code that has knowledge about GCode, and to generate a different flavor of GCode it will be the only piece that needs adjustment. All volumatric calculations also happen here.

libs/rapidjson/allocators.h

@@ -0,0 +1,249 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ALLOCATORS_H_
+#define RAPIDJSON_ALLOCATORS_H_
+
+#include "rapidjson.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// Allocator
+
+/*! \class rapidjson::Allocator
+    \brief Concept for allocating, resizing and freeing memory block.
+    
+    Note that Malloc() and Realloc() are non-static but Free() is static.
+    
+    So if an allocator need to support Free(), it needs to put its pointer in 
+    the header of memory block.
+
+\code
+concept Allocator {
+    static const bool kNeedFree;    //!< Whether this allocator needs to call Free().
+
+    // Allocate a memory block.
+    // \param size of the memory block in bytes.
+    // \returns pointer to the memory block.
+    void* Malloc(size_t size);
+
+    // Resize a memory block.
+    // \param originalPtr The pointer to current memory block. Null pointer is permitted.
+    // \param originalSize The current size in bytes. (Design issue: since some allocator may not book-keep this, explicitly pass to it can save memory.)
+    // \param newSize the new size in bytes.
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
+
+    // Free a memory block.
+    // \param pointer to the memory block. Null pointer is permitted.
+    static void Free(void *ptr);
+};
+\endcode
+*/
+
+///////////////////////////////////////////////////////////////////////////////
+// CrtAllocator
+
+//! C-runtime library allocator.
+/*! This class is just wrapper for standard C library memory routines.
+    \note implements Allocator concept
+*/
+class CrtAllocator {
+public:
+    static const bool kNeedFree = true;
+    void* Malloc(size_t size) { 
+        if (size) //  behavior of malloc(0) is implementation defined.
+            return std::malloc(size);
+        else
+            return NULL; // standardize to returning NULL.
+    }
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) { (void)originalSize; return std::realloc(originalPtr, newSize); }
+    static void Free(void *ptr) { std::free(ptr); }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// MemoryPoolAllocator
+
+//! Default memory allocator used by the parser and DOM.
+/*! This allocator allocate memory blocks from pre-allocated memory chunks. 
+
+    It does not free memory blocks. And Realloc() only allocate new memory.
+
+    The memory chunks are allocated by BaseAllocator, which is CrtAllocator by default.
+
+    User may also supply a buffer as the first chunk.
+
+    If the user-buffer is full then additional chunks are allocated by BaseAllocator.
+
+    The user-buffer is not deallocated by this allocator.
+
+    \tparam BaseAllocator the allocator type for allocating memory chunks. Default is CrtAllocator.
+    \note implements Allocator concept
+*/
+template <typename BaseAllocator = CrtAllocator>
+class MemoryPoolAllocator {
+public:
+    static const bool kNeedFree = false;    //!< Tell users that no need to call Free() with this allocator. (concept Allocator)
+
+    //! Constructor with chunkSize.
+    /*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
+        \param baseAllocator The allocator for allocating memory chunks.
+    */
+    MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) : 
+        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
+    {
+    }
+
+    //! Constructor with user-supplied buffer.
+    /*! The user buffer will be used firstly. When it is full, memory pool allocates new chunk with chunk size.
+
+        The user buffer will not be deallocated when this allocator is destructed.
+
+        \param buffer User supplied buffer.
+        \param size Size of the buffer in bytes. It must at least larger than sizeof(ChunkHeader).
+        \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
+        \param baseAllocator The allocator for allocating memory chunks.
+    */
+    MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
+        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
+    {
+        RAPIDJSON_ASSERT(buffer != 0);
+        RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
+        chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
+        chunkHead_->capacity = size - sizeof(ChunkHeader);
+        chunkHead_->size = 0;
+        chunkHead_->next = 0;
+    }
+
+    //! Destructor.
+    /*! This deallocates all memory chunks, excluding the user-supplied buffer.
+    */
+    ~MemoryPoolAllocator() {
+        Clear();
+        RAPIDJSON_DELETE(ownBaseAllocator_);
+    }
+
+    //! Deallocates all memory chunks, excluding the user-supplied buffer.
+    void Clear() {
+        while(chunkHead_ != 0 && chunkHead_ != userBuffer_) {
+            ChunkHeader* next = chunkHead_->next;
+            baseAllocator_->Free(chunkHead_);
+            chunkHead_ = next;
+        }
+    }
+
+    //! Computes the total capacity of allocated memory chunks.
+    /*! \return total capacity in bytes.
+    */
+    size_t Capacity() const {
+        size_t capacity = 0;
+        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
+            capacity += c->capacity;
+        return capacity;
+    }
+
+    //! Computes the memory blocks allocated.
+    /*! \return total used bytes.
+    */
+    size_t Size() const {
+        size_t size = 0;
+        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
+            size += c->size;
+        return size;
+    }
+
+    //! Allocates a memory block. (concept Allocator)
+    void* Malloc(size_t size) {
+        if (!size)
+            return NULL;
+
+        size = RAPIDJSON_ALIGN(size);
+        if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
+            AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size);
+
+        void *buffer = reinterpret_cast<char *>(chunkHead_ + 1) + chunkHead_->size;
+        chunkHead_->size += size;
+        return buffer;
+    }
+
+    //! Resizes a memory block (concept Allocator)
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
+        if (originalPtr == 0)
+            return Malloc(newSize);
+
+        // Do not shrink if new size is smaller than original
+        if (originalSize >= newSize)
+            return originalPtr;
+
+        // Simply expand it if it is the last allocation and there is sufficient space
+        if (originalPtr == (char *)(chunkHead_ + 1) + chunkHead_->size - originalSize) {
+            size_t increment = static_cast<size_t>(newSize - originalSize);
+            increment = RAPIDJSON_ALIGN(increment);
+            if (chunkHead_->size + increment <= chunkHead_->capacity) {
+                chunkHead_->size += increment;
+                return originalPtr;
+            }
+        }
+
+        // Realloc process: allocate and copy memory, do not free original buffer.
+        void* newBuffer = Malloc(newSize);
+        RAPIDJSON_ASSERT(newBuffer != 0);   // Do not handle out-of-memory explicitly.
+        if (originalSize)
+            std::memcpy(newBuffer, originalPtr, originalSize);
+        return newBuffer;
+    }
+
+    //! Frees a memory block (concept Allocator)
+    static void Free(void *ptr) { (void)ptr; } // Do nothing
+
+private:
+    //! Copy constructor is not permitted.
+    MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
+    //! Copy assignment operator is not permitted.
+    MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
+
+    //! Creates a new chunk.
+    /*! \param capacity Capacity of the chunk in bytes.
+    */
+    void AddChunk(size_t capacity) {
+        if (!baseAllocator_)
+            ownBaseAllocator_ = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator());
+        ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(sizeof(ChunkHeader) + capacity));
+        chunk->capacity = capacity;
+        chunk->size = 0;
+        chunk->next = chunkHead_;
+        chunkHead_ =  chunk;
+    }
+
+    static const int kDefaultChunkCapacity = 64 * 1024; //!< Default chunk capacity.
+
+    //! Chunk header for perpending to each chunk.
+    /*! Chunks are stored as a singly linked list.
+    */
+    struct ChunkHeader {
+        size_t capacity;    //!< Capacity of the chunk in bytes (excluding the header itself).
+        size_t size;        //!< Current size of allocated memory in bytes.
+        ChunkHeader *next;  //!< Next chunk in the linked list.
+    };
+
+    ChunkHeader *chunkHead_;    //!< Head of the chunk linked-list. Only the head chunk serves allocation.
+    size_t chunk_capacity_;     //!< The minimum capacity of chunk when they are allocated.
+    void *userBuffer_;          //!< User supplied buffer.
+    BaseAllocator* baseAllocator_;  //!< base allocator for allocating memory chunks.
+    BaseAllocator* ownBaseAllocator_;   //!< base allocator created by this object.
+};
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_ENCODINGS_H_

libs/rapidjson/encodedstream.h

@@ -0,0 +1,261 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ENCODEDSTREAM_H_
+#define RAPIDJSON_ENCODEDSTREAM_H_
+
+#include "rapidjson.h"
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Input byte stream wrapper with a statically bound encoding.
+/*!
+    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
+    \tparam InputByteStream Type of input byte stream. For example, FileReadStream.
+*/
+template <typename Encoding, typename InputByteStream>
+class EncodedInputStream {
+    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+public:
+    typedef typename Encoding::Ch Ch;
+
+    EncodedInputStream(InputByteStream& is) : is_(is) { 
+        current_ = Encoding::TakeBOM(is_);
+    }
+
+    Ch Peek() const { return current_; }
+    Ch Take() { Ch c = current_; current_ = Encoding::Take(is_); return c; }
+    size_t Tell() const { return is_.Tell(); }
+
+    // Not implemented
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    EncodedInputStream(const EncodedInputStream&);
+    EncodedInputStream& operator=(const EncodedInputStream&);
+
+    InputByteStream& is_;
+    Ch current_;
+};
+
+//! Output byte stream wrapper with statically bound encoding.
+/*!
+    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
+    \tparam InputByteStream Type of input byte stream. For example, FileWriteStream.
+*/
+template <typename Encoding, typename OutputByteStream>
+class EncodedOutputStream {
+    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+public:
+    typedef typename Encoding::Ch Ch;
+
+    EncodedOutputStream(OutputByteStream& os, bool putBOM = true) : os_(os) { 
+        if (putBOM)
+            Encoding::PutBOM(os_);
+    }
+
+    void Put(Ch c) { Encoding::Put(os_, c);  }
+    void Flush() { os_.Flush(); }
+
+    // Not implemented
+    Ch Peek() const { RAPIDJSON_ASSERT(false); }
+    Ch Take() { RAPIDJSON_ASSERT(false);  }
+    size_t Tell() const { RAPIDJSON_ASSERT(false);  return 0; }
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    EncodedOutputStream(const EncodedOutputStream&);
+    EncodedOutputStream& operator=(const EncodedOutputStream&);
+
+    OutputByteStream& os_;
+};
+
+#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
+
+//! Input stream wrapper with dynamically bound encoding and automatic encoding detection.
+/*!
+    \tparam CharType Type of character for reading.
+    \tparam InputByteStream type of input byte stream to be wrapped.
+*/
+template <typename CharType, typename InputByteStream>
+class AutoUTFInputStream {
+    RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+public:
+    typedef CharType Ch;
+
+    //! Constructor.
+    /*!
+        \param is input stream to be wrapped.
+        \param type UTF encoding type if it is not detected from the stream.
+    */
+    AutoUTFInputStream(InputByteStream& is, UTFType type = kUTF8) : is_(&is), type_(type), hasBOM_(false) {
+        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);        
+        DetectType();
+        static const TakeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Take) };
+        takeFunc_ = f[type_];
+        current_ = takeFunc_(*is_);
+    }
+
+    UTFType GetType() const { return type_; }
+    bool HasBOM() const { return hasBOM_; }
+
+    Ch Peek() const { return current_; }
+    Ch Take() { Ch c = current_; current_ = takeFunc_(*is_); return c; }
+    size_t Tell() const { return is_->Tell(); }
+
+    // Not implemented
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    AutoUTFInputStream(const AutoUTFInputStream&);
+    AutoUTFInputStream& operator=(const AutoUTFInputStream&);
+
+    // Detect encoding type with BOM or RFC 4627
+    void DetectType() {
+        // BOM (Byte Order Mark):
+        // 00 00 FE FF  UTF-32BE
+        // FF FE 00 00  UTF-32LE
+        // FE FF        UTF-16BE
+        // FF FE        UTF-16LE
+        // EF BB BF     UTF-8
+
+        const unsigned char* c = (const unsigned char *)is_->Peek4();
+        if (!c)
+            return;
+
+        unsigned bom = c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24);
+        hasBOM_ = false;
+        if (bom == 0xFFFE0000)                  { type_ = kUTF32BE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
+        else if (bom == 0x0000FEFF)             { type_ = kUTF32LE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
+        else if ((bom & 0xFFFF) == 0xFFFE)      { type_ = kUTF16BE; hasBOM_ = true; is_->Take(); is_->Take();                           }
+        else if ((bom & 0xFFFF) == 0xFEFF)      { type_ = kUTF16LE; hasBOM_ = true; is_->Take(); is_->Take();                           }
+        else if ((bom & 0xFFFFFF) == 0xBFBBEF)  { type_ = kUTF8;    hasBOM_ = true; is_->Take(); is_->Take(); is_->Take();              }
+
+        // RFC 4627: Section 3
+        // "Since the first two characters of a JSON text will always be ASCII
+        // characters [RFC0020], it is possible to determine whether an octet
+        // stream is UTF-8, UTF-16 (BE or LE), or UTF-32 (BE or LE) by looking
+        // at the pattern of nulls in the first four octets."
+        // 00 00 00 xx  UTF-32BE
+        // 00 xx 00 xx  UTF-16BE
+        // xx 00 00 00  UTF-32LE
+        // xx 00 xx 00  UTF-16LE
+        // xx xx xx xx  UTF-8
+
+        if (!hasBOM_) {
+            unsigned pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
+            switch (pattern) {
+            case 0x08: type_ = kUTF32BE; break;
+            case 0x0A: type_ = kUTF16BE; break;
+            case 0x01: type_ = kUTF32LE; break;
+            case 0x05: type_ = kUTF16LE; break;
+            case 0x0F: type_ = kUTF8;    break;
+            default: break; // Use type defined by user.
+            }
+        }
+
+        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
+        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
+        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
+    }
+
+    typedef Ch (*TakeFunc)(InputByteStream& is);
+    InputByteStream* is_;
+    UTFType type_;
+    Ch current_;
+    TakeFunc takeFunc_;
+    bool hasBOM_;
+};
+
+//! Output stream wrapper with dynamically bound encoding and automatic encoding detection.
+/*!
+    \tparam CharType Type of character for writing.
+    \tparam InputByteStream type of output byte stream to be wrapped.
+*/
+template <typename CharType, typename OutputByteStream>
+class AutoUTFOutputStream {
+    RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+public:
+    typedef CharType Ch;
+
+    //! Constructor.
+    /*!
+        \param os output stream to be wrapped.
+        \param type UTF encoding type.
+        \param putBOM Whether to write BOM at the beginning of the stream.
+    */
+    AutoUTFOutputStream(OutputByteStream& os, UTFType type, bool putBOM) : os_(&os), type_(type) {
+        RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);
+
+        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
+        if (type_ == kUTF16LE || type_ == kUTF16BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
+        if (type_ == kUTF32LE || type_ == kUTF32BE) RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
+
+        static const PutFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Put) };
+        putFunc_ = f[type_];
+
+        if (putBOM)
+            PutBOM();
+    }
+
+    UTFType GetType() const { return type_; }
+
+    void Put(Ch c) { putFunc_(*os_, c); }
+    void Flush() { os_->Flush(); } 
+
+    // Not implemented
+    Ch Peek() const { RAPIDJSON_ASSERT(false); }
+    Ch Take() { RAPIDJSON_ASSERT(false); }
+    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    AutoUTFOutputStream(const AutoUTFOutputStream&);
+    AutoUTFOutputStream& operator=(const AutoUTFOutputStream&);
+
+    void PutBOM() { 
+        typedef void (*PutBOMFunc)(OutputByteStream&);
+        static const PutBOMFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(PutBOM) };
+        f[type_](*os_);
+    }
+
+    typedef void (*PutFunc)(OutputByteStream&, Ch);
+
+    OutputByteStream* os_;
+    UTFType type_;
+    PutFunc putFunc_;
+};
+
+#undef RAPIDJSON_ENCODINGS_FUNC
+
+RAPIDJSON_NAMESPACE_END
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_FILESTREAM_H_

libs/rapidjson/encodings.h

@@ -0,0 +1,625 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ENCODINGS_H_
+#define RAPIDJSON_ENCODINGS_H_
+
+#include "rapidjson.h"
+
+#ifdef _MSC_VER
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
+RAPIDJSON_DIAG_OFF(4702)  // unreachable code
+#elif defined(__GNUC__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+RAPIDJSON_DIAG_OFF(overflow)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// Encoding
+
+/*! \class rapidjson::Encoding
+    \brief Concept for encoding of Unicode characters.
+
+\code
+concept Encoding {
+    typename Ch;    //! Type of character. A "character" is actually a code unit in unicode's definition.
+
+    enum { supportUnicode = 1 }; // or 0 if not supporting unicode
+
+    //! \brief Encode a Unicode codepoint to an output stream.
+    //! \param os Output stream.
+    //! \param codepoint An unicode codepoint, ranging from 0x0 to 0x10FFFF inclusively.
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint);
+
+    //! \brief Decode a Unicode codepoint from an input stream.
+    //! \param is Input stream.
+    //! \param codepoint Output of the unicode codepoint.
+    //! \return true if a valid codepoint can be decoded from the stream.
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint);
+
+    //! \brief Validate one Unicode codepoint from an encoded stream.
+    //! \param is Input stream to obtain codepoint.
+    //! \param os Output for copying one codepoint.
+    //! \return true if it is valid.
+    //! \note This function just validating and copying the codepoint without actually decode it.
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os);
+
+    // The following functions are deal with byte streams.
+
+    //! Take a character from input byte stream, skip BOM if exist.
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is);
+
+    //! Take a character from input byte stream.
+    template <typename InputByteStream>
+    static Ch Take(InputByteStream& is);
+
+    //! Put BOM to output byte stream.
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os);
+
+    //! Put a character to output byte stream.
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, Ch c);
+};
+\endcode
+*/
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF8
+
+//! UTF-8 encoding.
+/*! http://en.wikipedia.org/wiki/UTF-8
+    http://tools.ietf.org/html/rfc3629
+    \tparam CharType Code unit for storing 8-bit UTF-8 data. Default is char.
+    \note implements Encoding concept
+*/
+template<typename CharType = char>
+struct UTF8 {
+    typedef CharType Ch;
+
+    enum { supportUnicode = 1 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        if (codepoint <= 0x7F) 
+            os.Put(static_cast<Ch>(codepoint & 0xFF));
+        else if (codepoint <= 0x7FF) {
+            os.Put(static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
+        }
+        else if (codepoint <= 0xFFFF) {
+            os.Put(static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            os.Put(static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | ((unsigned char)c & 0x3Fu)
+#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
+#define TAIL() COPY(); TRANS(0x70)
+        Ch c = is.Take();
+        if (!(c & 0x80)) {
+            *codepoint = (unsigned char)c;
+            return true;
+        }
+
+        unsigned char type = GetRange((unsigned char)c);
+        *codepoint = (0xFF >> type) & (unsigned char)c;
+        bool result = true;
+        switch (type) {
+        case 2: TAIL(); return result;
+        case 3: TAIL(); TAIL(); return result;
+        case 4: COPY(); TRANS(0x50); TAIL(); return result;
+        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
+        case 6: TAIL(); TAIL(); TAIL(); return result;
+        case 10: COPY(); TRANS(0x20); TAIL(); return result;
+        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
+        default: return false;
+        }
+#undef COPY
+#undef TRANS
+#undef TAIL
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+#define COPY() os.Put(c = is.Take())
+#define TRANS(mask) result &= ((GetRange((unsigned char)c) & mask) != 0)
+#define TAIL() COPY(); TRANS(0x70)
+        Ch c;
+        COPY();
+        if (!(c & 0x80))
+            return true;
+
+        bool result = true;
+        switch (GetRange((unsigned char)c)) {
+        case 2: TAIL(); return result;
+        case 3: TAIL(); TAIL(); return result;
+        case 4: COPY(); TRANS(0x50); TAIL(); return result;
+        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
+        case 6: TAIL(); TAIL(); TAIL(); return result;
+        case 10: COPY(); TRANS(0x20); TAIL(); return result;
+        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
+        default: return false;
+        }
+#undef COPY
+#undef TRANS
+#undef TAIL
+    }
+
+    static unsigned char GetRange(unsigned char c) {
+        // Referring to DFA of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+        // With new mapping 1 -> 0x10, 7 -> 0x20, 9 -> 0x40, such that AND operation can test multiple types.
+        static const unsigned char type[] = {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
+            0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
+            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+            8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+            10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
+        };
+        return type[c];
+    }
+
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        Ch c = Take(is);
+        if ((unsigned char)c != 0xEFu) return c;
+        c = is.Take();
+        if ((unsigned char)c != 0xBBu) return c;
+        c = is.Take();
+        if ((unsigned char)c != 0xBFu) return c;
+        c = is.Take();
+        return c;
+    }
+
+    template <typename InputByteStream>
+    static Ch Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        return is.Take();
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(0xEFu); os.Put(0xBBu); os.Put(0xBFu);
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, Ch c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(c));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF16
+
+//! UTF-16 encoding.
+/*! http://en.wikipedia.org/wiki/UTF-16
+    http://tools.ietf.org/html/rfc2781
+    \tparam CharType Type for storing 16-bit UTF-16 data. Default is wchar_t. C++11 may use char16_t instead.
+    \note implements Encoding concept
+
+    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
+    For streaming, use UTF16LE and UTF16BE, which handle endianness.
+*/
+template<typename CharType = wchar_t>
+struct UTF16 {
+    typedef CharType Ch;
+    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 2);
+
+    enum { supportUnicode = 1 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        if (codepoint <= 0xFFFF) {
+            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
+            os.Put(static_cast<typename OutputStream::Ch>(codepoint));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            unsigned v = codepoint - 0x10000;
+            os.Put(static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
+            os.Put((v & 0x3FF) | 0xDC00);
+        }
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
+        Ch c = is.Take();
+        if (c < 0xD800 || c > 0xDFFF) {
+            *codepoint = c;
+            return true;
+        }
+        else if (c <= 0xDBFF) {
+            *codepoint = (c & 0x3FF) << 10;
+            c = is.Take();
+            *codepoint |= (c & 0x3FF);
+            *codepoint += 0x10000;
+            return c >= 0xDC00 && c <= 0xDFFF;
+        }
+        return false;
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        Ch c;
+        os.Put(c = is.Take());
+        if (c < 0xD800 || c > 0xDFFF)
+            return true;
+        else if (c <= 0xDBFF) {
+            os.Put(c = is.Take());
+            return c >= 0xDC00 && c <= 0xDFFF;
+        }
+        return false;
+    }
+};
+
+//! UTF-16 little endian encoding.
+template<typename CharType = wchar_t>
+struct UTF16LE : UTF16<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return (unsigned short)c == 0xFEFFu ? Take(is) : c;
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = (unsigned char)is.Take();
+        c |= (unsigned char)is.Take() << 8;
+        return c;
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(0xFFu); os.Put(0xFEu);
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(c & 0xFFu);
+        os.Put((c >> 8) & 0xFFu);
+    }
+};
+
+//! UTF-16 big endian encoding.
+template<typename CharType = wchar_t>
+struct UTF16BE : UTF16<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return (unsigned short)c == 0xFEFFu ? Take(is) : c;
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = (unsigned char)is.Take() << 8;
+        c |= (unsigned char)is.Take();
+        return c;
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(0xFEu); os.Put(0xFFu);
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put((c >> 8) & 0xFFu);
+        os.Put(c & 0xFFu);
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF32
+
+//! UTF-32 encoding. 
+/*! http://en.wikipedia.org/wiki/UTF-32
+    \tparam CharType Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
+    \note implements Encoding concept
+
+    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
+    For streaming, use UTF32LE and UTF32BE, which handle endianness.
+*/
+template<typename CharType = unsigned>
+struct UTF32 {
+    typedef CharType Ch;
+    RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 4);
+
+    enum { supportUnicode = 1 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
+        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+        os.Put(codepoint);
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
+        Ch c = is.Take();
+        *codepoint = c;
+        return c <= 0x10FFFF;
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
+        Ch c;
+        os.Put(c = is.Take());
+        return c <= 0x10FFFF;
+    }
+};
+
+//! UTF-32 little endian enocoding.
+template<typename CharType = unsigned>
+struct UTF32LE : UTF32<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return (unsigned)c == 0x0000FEFFu ? Take(is) : c;
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = (unsigned char)is.Take();
+        c |= (unsigned char)is.Take() << 8;
+        c |= (unsigned char)is.Take() << 16;
+        c |= (unsigned char)is.Take() << 24;
+        return c;
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(0xFFu); os.Put(0xFEu); os.Put(0x00u); os.Put(0x00u);
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(c & 0xFFu);
+        os.Put((c >> 8) & 0xFFu);
+        os.Put((c >> 16) & 0xFFu);
+        os.Put((c >> 24) & 0xFFu);
+    }
+};
+
+//! UTF-32 big endian encoding.
+template<typename CharType = unsigned>
+struct UTF32BE : UTF32<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return (unsigned)c == 0x0000FEFFu ? Take(is) : c; 
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = (unsigned char)is.Take() << 24;
+        c |= (unsigned char)is.Take() << 16;
+        c |= (unsigned char)is.Take() << 8;
+        c |= (unsigned char)is.Take();
+        return c;
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(0x00u); os.Put(0x00u); os.Put(0xFEu); os.Put(0xFFu);
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put((c >> 24) & 0xFFu);
+        os.Put((c >> 16) & 0xFFu);
+        os.Put((c >> 8) & 0xFFu);
+        os.Put(c & 0xFFu);
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// ASCII
+
+//! ASCII encoding.
+/*! http://en.wikipedia.org/wiki/ASCII
+    \tparam CharType Code unit for storing 7-bit ASCII data. Default is char.
+    \note implements Encoding concept
+*/
+template<typename CharType = char>
+struct ASCII {
+    typedef CharType Ch;
+
+    enum { supportUnicode = 0 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_ASSERT(codepoint <= 0x7F);
+        os.Put(static_cast<Ch>(codepoint & 0xFF));
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+        unsigned char c = static_cast<unsigned char>(is.Take());
+        *codepoint = c;
+        return c <= 0X7F;
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+        unsigned char c = is.Take();
+        os.Put(c);
+        return c <= 0x7F;
+    }
+
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        Ch c = Take(is);
+        return c;
+    }
+
+    template <typename InputByteStream>
+    static Ch Take(InputByteStream& is) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        return is.Take();
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        (void)os;
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, Ch c) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(c));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// AutoUTF
+
+//! Runtime-specified UTF encoding type of a stream.
+enum UTFType {
+    kUTF8 = 0,      //!< UTF-8.
+    kUTF16LE = 1,   //!< UTF-16 little endian.
+    kUTF16BE = 2,   //!< UTF-16 big endian.
+    kUTF32LE = 3,   //!< UTF-32 little endian.
+    kUTF32BE = 4    //!< UTF-32 big endian.
+};
+
+//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
+/*! \note This class can be used with AutoUTFInputtStream and AutoUTFOutputStream, which provides GetType().
+*/
+template<typename CharType>
+struct AutoUTF {
+    typedef CharType Ch;
+
+    enum { supportUnicode = 1 };
+
+#define RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
+
+    template<typename OutputStream>
+    RAPIDJSON_FORCEINLINE static void Encode(OutputStream& os, unsigned codepoint) {
+        typedef void (*EncodeFunc)(OutputStream&, unsigned);
+        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Encode) };
+        (*f[os.GetType()])(os, codepoint);
+    }
+
+    template <typename InputStream>
+    RAPIDJSON_FORCEINLINE static bool Decode(InputStream& is, unsigned* codepoint) {
+        typedef bool (*DecodeFunc)(InputStream&, unsigned*);
+        static const DecodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Decode) };
+        return (*f[is.GetType()])(is, codepoint);
+    }
+
+    template <typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+        typedef bool (*ValidateFunc)(InputStream&, OutputStream&);
+        static const ValidateFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(Validate) };
+        return (*f[is.GetType()])(is, os);
+    }
+
+#undef RAPIDJSON_ENCODINGS_FUNC
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Transcoder
+
+//! Encoding conversion.
+template<typename SourceEncoding, typename TargetEncoding>
+struct Transcoder {
+    //! Take one Unicode codepoint from source encoding, convert it to target encoding and put it to the output stream.
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
+        unsigned codepoint;
+        if (!SourceEncoding::Decode(is, &codepoint))
+            return false;
+        TargetEncoding::Encode(os, codepoint);
+        return true;
+    }
+
+    //! Validate one Unicode codepoint from an encoded stream.
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+        return Transcode(is, os);   // Since source/target encoding is different, must transcode.
+    }
+};
+
+//! Specialization of Transcoder with same source and target encoding.
+template<typename Encoding>
+struct Transcoder<Encoding, Encoding> {
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
+        os.Put(is.Take());  // Just copy one code unit. This semantic is different from primary template class.
+        return true;
+    }
+    
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+        return Encoding::Validate(is, os);  // source/target encoding are the same
+    }
+};
+
+RAPIDJSON_NAMESPACE_END
+
+#if defined(__GNUC__) || defined(_MSV_VER)
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_ENCODINGS_H_

libs/rapidjson/error/en.h

@@ -0,0 +1,65 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ERROR_EN_H__
+#define RAPIDJSON_ERROR_EN_H__
+
+#include "error.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Maps error code of parsing into error message.
+/*!
+    \ingroup RAPIDJSON_ERRORS
+    \param parseErrorCode Error code obtained in parsing.
+    \return the error message.
+    \note User can make a copy of this function for localization.
+        Using switch-case is safer for future modification of error codes.
+*/
+inline const RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErrorCode) {
+    switch (parseErrorCode) {
+        case kParseErrorNone:                           return RAPIDJSON_ERROR_STRING("No error.");
+
+        case kParseErrorDocumentEmpty:                  return RAPIDJSON_ERROR_STRING("The document is empty.");
+        case kParseErrorDocumentRootNotSingular:        return RAPIDJSON_ERROR_STRING("The document root must not follow by other values.");
+    
+        case kParseErrorValueInvalid:                   return RAPIDJSON_ERROR_STRING("Invalid value.");
+    
+        case kParseErrorObjectMissName:                 return RAPIDJSON_ERROR_STRING("Missing a name for object member.");
+        case kParseErrorObjectMissColon:                return RAPIDJSON_ERROR_STRING("Missing a colon after a name of object member.");
+        case kParseErrorObjectMissCommaOrCurlyBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or '}' after an object member.");
+    
+        case kParseErrorArrayMissCommaOrSquareBracket:  return RAPIDJSON_ERROR_STRING("Missing a comma or ']' after an array element.");
+
+        case kParseErrorStringUnicodeEscapeInvalidHex:  return RAPIDJSON_ERROR_STRING("Incorrect hex digit after \\u escape in string.");
+        case kParseErrorStringUnicodeSurrogateInvalid:  return RAPIDJSON_ERROR_STRING("The surrogate pair in string is invalid.");
+        case kParseErrorStringEscapeInvalid:            return RAPIDJSON_ERROR_STRING("Invalid escape character in string.");
+        case kParseErrorStringMissQuotationMark:        return RAPIDJSON_ERROR_STRING("Missing a closing quotation mark in string.");
+        case kParseErrorStringInvalidEncoding:          return RAPIDJSON_ERROR_STRING("Invalid encoding in string.");
+
+        case kParseErrorNumberTooBig:                   return RAPIDJSON_ERROR_STRING("Number too big to be stored in double.");
+        case kParseErrorNumberMissFraction:             return RAPIDJSON_ERROR_STRING("Miss fraction part in number.");
+        case kParseErrorNumberMissExponent:             return RAPIDJSON_ERROR_STRING("Miss exponent in number.");
+
+        case kParseErrorTermination:                    return RAPIDJSON_ERROR_STRING("Terminate parsing due to Handler error.");
+        case kParseErrorUnspecificSyntaxError:          return RAPIDJSON_ERROR_STRING("Unspecific syntax error.");
+
+        default:
+            return RAPIDJSON_ERROR_STRING("Unknown error.");
+    }
+}
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_ERROR_EN_H__

libs/rapidjson/error/error.h

@@ -0,0 +1,144 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ERROR_ERROR_H__
+#define RAPIDJSON_ERROR_ERROR_H__
+
+/*! \file error.h */
+
+/*! \defgroup RAPIDJSON_ERRORS RapidJSON error handling */
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_ERROR_CHARTYPE
+
+//! Character type of error messages.
+/*! \ingroup RAPIDJSON_ERRORS
+    The default character type is \c char.
+    On Windows, user can define this macro as \c TCHAR for supporting both
+    unicode/non-unicode settings.
+*/
+#ifndef RAPIDJSON_ERROR_CHARTYPE
+#define RAPIDJSON_ERROR_CHARTYPE char
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_ERROR_STRING
+
+//! Macro for converting string literial to \ref RAPIDJSON_ERROR_CHARTYPE[].
+/*! \ingroup RAPIDJSON_ERRORS
+    By default this conversion macro does nothing.
+    On Windows, user can define this macro as \c _T(x) for supporting both
+    unicode/non-unicode settings.
+*/
+#ifndef RAPIDJSON_ERROR_STRING
+#define RAPIDJSON_ERROR_STRING(x) x
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// ParseErrorCode
+
+//! Error code of parsing.
+/*! \ingroup RAPIDJSON_ERRORS
+    \see GenericReader::Parse, GenericReader::GetParseErrorCode
+*/
+enum ParseErrorCode {
+    kParseErrorNone = 0,                        //!< No error.
+
+    kParseErrorDocumentEmpty,                   //!< The document is empty.
+    kParseErrorDocumentRootNotSingular,         //!< The document root must not follow by other values.
+
+    kParseErrorValueInvalid,                    //!< Invalid value.
+
+    kParseErrorObjectMissName,                  //!< Missing a name for object member.
+    kParseErrorObjectMissColon,                 //!< Missing a colon after a name of object member.
+    kParseErrorObjectMissCommaOrCurlyBracket,   //!< Missing a comma or '}' after an object member.
+
+    kParseErrorArrayMissCommaOrSquareBracket,   //!< Missing a comma or ']' after an array element.
+
+    kParseErrorStringUnicodeEscapeInvalidHex,   //!< Incorrect hex digit after \\u escape in string.
+    kParseErrorStringUnicodeSurrogateInvalid,   //!< The surrogate pair in string is invalid.
+    kParseErrorStringEscapeInvalid,             //!< Invalid escape character in string.
+    kParseErrorStringMissQuotationMark,         //!< Missing a closing quotation mark in string.
+    kParseErrorStringInvalidEncoding,           //!< Invalid encoding in string.
+
+    kParseErrorNumberTooBig,                    //!< Number too big to be stored in double.
+    kParseErrorNumberMissFraction,              //!< Miss fraction part in number.
+    kParseErrorNumberMissExponent,              //!< Miss exponent in number.
+
+    kParseErrorTermination,                     //!< Parsing was terminated.
+    kParseErrorUnspecificSyntaxError            //!< Unspecific syntax error.
+};
+
+//! Result of parsing (wraps ParseErrorCode)
+/*!
+    \ingroup RAPIDJSON_ERRORS
+    \code
+        Document doc;
+        ParseResult ok = doc.Parse("[42]");
+        if (!ok) {
+            fprintf(stderr, "JSON parse error: %s (%u)",
+                    GetParseError_En(ok.Code()), ok.Offset());
+            exit(EXIT_FAILURE);
+        }
+    \endcode
+    \see GenericReader::Parse, GenericDocument::Parse
+*/
+struct ParseResult {
+
+    //! Default constructor, no error.
+    ParseResult() : code_(kParseErrorNone), offset_(0) {}
+    //! Constructor to set an error.
+    ParseResult(ParseErrorCode code, size_t offset) : code_(code), offset_(offset) {}
+
+    //! Get the error code.
+    ParseErrorCode Code() const { return code_; }
+    //! Get the error offset, if \ref IsError(), 0 otherwise.
+    size_t Offset() const { return offset_; }
+
+    //! Conversion to \c bool, returns \c true, iff !\ref IsError().
+    operator bool() const { return !IsError(); }
+    //! Whether the result is an error.
+    bool IsError() const { return code_ != kParseErrorNone; }
+
+    bool operator==(const ParseResult& that) const { return code_ == that.code_; }
+    bool operator==(ParseErrorCode code) const { return code_ == code; }
+    friend bool operator==(ParseErrorCode code, const ParseResult & err) { return code == err.code_; }
+
+    //! Reset error code.
+    void Clear() { Set(kParseErrorNone); }
+    //! Update error code and offset.
+    void Set(ParseErrorCode code, size_t offset = 0) { code_ = code; offset_ = offset; }
+
+private:
+    ParseErrorCode code_;
+    size_t offset_;
+};
+
+//! Function pointer type of GetParseError().
+/*! \ingroup RAPIDJSON_ERRORS
+
+    This is the prototype for \c GetParseError_X(), where \c X is a locale.
+    User can dynamically change locale in runtime, e.g.:
+\code
+    GetParseErrorFunc GetParseError = GetParseError_En; // or whatever
+    const RAPIDJSON_ERROR_CHARTYPE* s = GetParseError(document.GetParseErrorCode());
+\endcode
+*/
+typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetParseErrorFunc)(ParseErrorCode);
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_ERROR_ERROR_H__

libs/rapidjson/filereadstream.h

@@ -0,0 +1,88 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_FILEREADSTREAM_H_
+#define RAPIDJSON_FILEREADSTREAM_H_
+
+#include "rapidjson.h"
+#include <cstdio>
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! File byte stream for input using fread().
+/*!
+    \note implements Stream concept
+*/
+class FileReadStream {
+public:
+    typedef char Ch;    //!< Character type (byte).
+
+    //! Constructor.
+    /*!
+        \param fp File pointer opened for read.
+        \param buffer user-supplied buffer.
+        \param bufferSize size of buffer in bytes. Must >=4 bytes.
+    */
+    FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
+        RAPIDJSON_ASSERT(fp_ != 0);
+        RAPIDJSON_ASSERT(bufferSize >= 4);
+        Read();
+    }
+
+    Ch Peek() const { return *current_; }
+    Ch Take() { Ch c = *current_; Read(); return c; }
+    size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
+
+    // Not implemented
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+    // For encoding detection only.
+    const Ch* Peek4() const {
+        return (current_ + 4 <= bufferLast_) ? current_ : 0;
+    }
+
+private:
+    void Read() {
+        if (current_ < bufferLast_)
+            ++current_;
+        else if (!eof_) {
+            count_ += readCount_;
+            readCount_ = fread(buffer_, 1, bufferSize_, fp_);
+            bufferLast_ = buffer_ + readCount_ - 1;
+            current_ = buffer_;
+
+            if (readCount_ < bufferSize_) {
+                buffer_[readCount_] = '\0';
+                ++bufferLast_;
+                eof_ = true;
+            }
+        }
+    }
+
+    std::FILE* fp_;
+    Ch *buffer_;
+    size_t bufferSize_;
+    Ch *bufferLast_;
+    Ch *current_;
+    size_t readCount_;
+    size_t count_;  //!< Number of characters read
+    bool eof_;
+};
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_FILESTREAM_H_

libs/rapidjson/filewritestream.h

@@ -0,0 +1,91 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_FILEWRITESTREAM_H_
+#define RAPIDJSON_FILEWRITESTREAM_H_
+
+#include "rapidjson.h"
+#include <cstdio>
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Wrapper of C file stream for input using fread().
+/*!
+    \note implements Stream concept
+*/
+class FileWriteStream {
+public:
+    typedef char Ch;    //!< Character type. Only support char.
+
+    FileWriteStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
+        RAPIDJSON_ASSERT(fp_ != 0);
+    }
+
+    void Put(char c) { 
+        if (current_ >= bufferEnd_)
+            Flush();
+
+        *current_++ = c;
+    }
+
+    void PutN(char c, size_t n) {
+        size_t avail = static_cast<size_t>(bufferEnd_ - current_);
+        while (n > avail) {
+            std::memset(current_, c, avail);
+            current_ += avail;
+            Flush();
+            n -= avail;
+            avail = static_cast<size_t>(bufferEnd_ - current_);
+        }
+
+        if (n > 0) {
+            std::memset(current_, c, n);
+            current_ += n;
+        }
+    }
+
+    void Flush() {
+        if (current_ != buffer_) {
+            fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
+            current_ = buffer_;
+        }
+    }
+
+    // Not implemented
+    char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
+    char Take() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
+    char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    FileWriteStream(const FileWriteStream&);
+    FileWriteStream& operator=(const FileWriteStream&);
+
+    std::FILE* fp_;
+    char *buffer_;
+    char *bufferEnd_;
+    char *current_;
+};
+
+//! Implement specialized version of PutN() with memset() for better performance.
+template<>
+inline void PutN(FileWriteStream& stream, char c, size_t n) {
+    stream.PutN(c, n);
+}
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_FILESTREAM_H_

libs/rapidjson/internal/biginteger.h

@@ -0,0 +1,280 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_BIGINTEGER_H_
+#define RAPIDJSON_BIGINTEGER_H_
+
+#include "../rapidjson.h"
+
+#if defined(_MSC_VER) && defined(_M_AMD64)
+#include <intrin.h> // for _umul128
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+class BigInteger {
+public:
+    typedef uint64_t Type;
+
+    BigInteger(const BigInteger& rhs) : count_(rhs.count_) {
+        std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
+    }
+
+    explicit BigInteger(uint64_t u) : count_(1) {
+        digits_[0] = u;
+    }
+
+    BigInteger(const char* decimals, size_t length) : count_(1) {
+        RAPIDJSON_ASSERT(length > 0);
+        digits_[0] = 0;
+        size_t i = 0;
+        const size_t kMaxDigitPerIteration = 19;  // 2^64 = 18446744073709551616 > 10^19
+        while (length >= kMaxDigitPerIteration) {
+            AppendDecimal64(decimals + i, decimals + i + kMaxDigitPerIteration);
+            length -= kMaxDigitPerIteration;
+            i += kMaxDigitPerIteration;
+        }
+
+        if (length > 0)
+            AppendDecimal64(decimals + i, decimals + i + length);
+    }
+
+    BigInteger& operator=(uint64_t u) {
+        digits_[0] = u;            
+        count_ = 1;
+        return *this;
+    }
+
+    BigInteger& operator+=(uint64_t u) {
+        Type backup = digits_[0];
+        digits_[0] += u;
+        for (size_t i = 0; i < count_ - 1; i++) {
+            if (digits_[i] >= backup)
+                return *this; // no carry
+            backup = digits_[i + 1];
+            digits_[i + 1] += 1;
+        }
+
+        // Last carry
+        if (digits_[count_ - 1] < backup)
+            PushBack(1);
+
+        return *this;
+    }
+
+    BigInteger& operator*=(uint64_t u) {
+        if (u == 0) return *this = 0;
+        if (u == 1) return *this;
+        if (*this == 1) return *this = u;
+
+        uint64_t k = 0;
+        for (size_t i = 0; i < count_; i++) {
+            uint64_t hi;
+            digits_[i] = MulAdd64(digits_[i], u, k, &hi);
+            k = hi;
+        }
+        
+        if (k > 0)
+            PushBack(k);
+
+        return *this;
+    }
+
+    BigInteger& operator*=(uint32_t u) {
+        if (u == 0) return *this = 0;
+        if (u == 1) return *this;
+        if (*this == 1) return *this = u;
+
+        uint32_t k = 0;
+        for (size_t i = 0; i < count_; i++) {
+            const uint64_t c = digits_[i] >> 32;
+            const uint64_t d = digits_[i] & 0xFFFFFFFF;
+            const uint64_t uc = u * c;
+            const uint64_t ud = u * d;
+            const uint64_t p0 = ud + k;
+            const uint64_t p1 = uc + (p0 >> 32);
+            digits_[i] = (p0 & 0xFFFFFFFF) | (p1 << 32);
+            k = p1 >> 32;
+        }
+        
+        if (k > 0)
+            PushBack(k);
+
+        return *this;
+    }
+
+    BigInteger& operator<<=(size_t shift) {
+        if (IsZero() || shift == 0) return *this;
+
+        size_t offset = shift / kTypeBit;
+        size_t interShift = shift % kTypeBit;
+        RAPIDJSON_ASSERT(count_ + offset <= kCapacity);
+
+        if (interShift == 0) {
+            std::memmove(&digits_[count_ - 1 + offset], &digits_[count_ - 1], count_ * sizeof(Type));
+            count_ += offset;
+        }
+        else {
+            digits_[count_] = 0;
+            for (size_t i = count_; i > 0; i--)
+                digits_[i + offset] = (digits_[i] << interShift) | (digits_[i - 1] >> (kTypeBit - interShift));
+            digits_[offset] = digits_[0] << interShift;
+            count_ += offset;
+            if (digits_[count_])
+                count_++;
+        }
+
+        std::memset(digits_, 0, offset * sizeof(Type));
+
+        return *this;
+    }
+
+    bool operator==(const BigInteger& rhs) const {
+        return count_ == rhs.count_ && std::memcmp(digits_, rhs.digits_, count_ * sizeof(Type)) == 0;
+    }
+
+    bool operator==(const Type rhs) const {
+        return count_ == 1 && digits_[0] == rhs;
+    }
+
+    BigInteger& MultiplyPow5(unsigned exp) {
+        static const uint32_t kPow5[12] = {
+            5,
+            5 * 5,
+            5 * 5 * 5,
+            5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5
+        };
+        if (exp == 0) return *this;
+        for (; exp >= 27; exp -= 27) *this *= RAPIDJSON_UINT64_C2(0X6765C793, 0XFA10079D); // 5^27
+        for (; exp >= 13; exp -= 13) *this *= static_cast<uint32_t>(1220703125u); // 5^13
+        if (exp > 0)                 *this *= kPow5[exp - 1];
+        return *this;
+    }
+
+    // Compute absolute difference of this and rhs.
+    // Assume this != rhs
+    bool Difference(const BigInteger& rhs, BigInteger* out) const {
+        int cmp = Compare(rhs);
+        RAPIDJSON_ASSERT(cmp != 0);
+        const BigInteger *a, *b;  // Makes a > b
+        bool ret;
+        if (cmp < 0) { a = &rhs; b = this; ret = true; }
+        else         { a = this; b = &rhs; ret = false; }
+
+        Type borrow = 0;
+        for (size_t i = 0; i < a->count_; i++) {
+            Type d = a->digits_[i] - borrow;
+            if (i < b->count_)
+                d -= b->digits_[i];
+            borrow = (d > a->digits_[i]) ? 1 : 0;
+            out->digits_[i] = d;
+            if (d != 0)
+                out->count_ = i + 1;
+        }
+
+        return ret;
+    }
+
+    int Compare(const BigInteger& rhs) const {
+        if (count_ != rhs.count_)
+            return count_ < rhs.count_ ? -1 : 1;
+
+        for (size_t i = count_; i-- > 0;)
+            if (digits_[i] != rhs.digits_[i])
+                return digits_[i] < rhs.digits_[i] ? -1 : 1;
+
+        return 0;
+    }
+
+    size_t GetCount() const { return count_; }
+    Type GetDigit(size_t index) const { RAPIDJSON_ASSERT(index < count_); return digits_[index]; }
+    bool IsZero() const { return count_ == 1 && digits_[0] == 0; }
+
+private:
+    void AppendDecimal64(const char* begin, const char* end) {
+        uint64_t u = ParseUint64(begin, end);
+        if (IsZero())
+            *this = u;
+        else {
+            unsigned exp = static_cast<unsigned>(end - begin);
+            (MultiplyPow5(exp) <<= exp) += u;   // *this = *this * 10^exp + u
+        }
+    }
+
+    void PushBack(Type digit) {
+        RAPIDJSON_ASSERT(count_ < kCapacity);
+        digits_[count_++] = digit;
+    }
+
+    static uint64_t ParseUint64(const char* begin, const char* end) {
+        uint64_t r = 0;
+        for (const char* p = begin; p != end; ++p) {
+            RAPIDJSON_ASSERT(*p >= '0' && *p <= '9');
+            r = r * 10 + (*p - '0');
+        }
+        return r;
+    }
+
+    // Assume a * b + k < 2^128
+    static uint64_t MulAdd64(uint64_t a, uint64_t b, uint64_t k, uint64_t* outHigh) {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+        uint64_t low = _umul128(a, b, outHigh) + k;
+        if (low < k)
+            (*outHigh)++;
+        return low;
+#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+        __extension__ typedef unsigned __int128 uint128;
+        uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
+        p += k;
+        *outHigh = p >> 64;
+        return static_cast<uint64_t>(p);
+#else
+        const uint64_t a0 = a & 0xFFFFFFFF, a1 = a >> 32, b0 = b & 0xFFFFFFFF, b1 = b >> 32;
+        uint64_t x0 = a0 * b0, x1 = a0 * b1, x2 = a1 * b0, x3 = a1 * b1;
+        x1 += (x0 >> 32); // can't give carry
+        x1 += x2;
+        if (x1 < x2)
+            x3 += (static_cast<uint64_t>(1) << 32);
+        uint64_t lo = (x1 << 32) + (x0 & 0xFFFFFFFF);
+        uint64_t hi = x3 + (x1 >> 32);
+
+        lo += k;
+        if (lo < k)
+            hi++;
+        *outHigh = hi;
+        return lo;
+#endif
+    }
+
+    static const size_t kBitCount = 3328;  // 64bit * 54 > 10^1000
+    static const size_t kCapacity = kBitCount / sizeof(Type);
+    static const size_t kTypeBit = sizeof(Type) * 8;
+
+    Type digits_[kCapacity];
+    size_t count_;
+};
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_BIGINTEGER_H_

libs/rapidjson/internal/diyfp.h

@@ -0,0 +1,247 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
+// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
+// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
+
+#ifndef RAPIDJSON_DIYFP_H_
+#define RAPIDJSON_DIYFP_H_
+
+#if defined(_MSC_VER)
+#include <intrin.h>
+#if defined(_M_AMD64)
+#pragma intrinsic(_BitScanReverse64)
+#endif
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+struct DiyFp {
+    DiyFp() {}
+
+    DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {}
+
+    explicit DiyFp(double d) {
+        union {
+            double d;
+            uint64_t u64;
+        } u = { d };
+
+        int biased_e = (u.u64 & kDpExponentMask) >> kDpSignificandSize;
+        uint64_t significand = (u.u64 & kDpSignificandMask);
+        if (biased_e != 0) {
+            f = significand + kDpHiddenBit;
+            e = biased_e - kDpExponentBias;
+        } 
+        else {
+            f = significand;
+            e = kDpMinExponent + 1;
+        }
+    }
+
+    DiyFp operator-(const DiyFp& rhs) const {
+        return DiyFp(f - rhs.f, e);
+    }
+
+    DiyFp operator*(const DiyFp& rhs) const {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+        uint64_t h;
+        uint64_t l = _umul128(f, rhs.f, &h);
+        if (l & (uint64_t(1) << 63)) // rounding
+            h++;
+        return DiyFp(h, e + rhs.e + 64);
+#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+        __extension__ typedef unsigned __int128 uint128;
+        uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
+        uint64_t h = p >> 64;
+        uint64_t l = static_cast<uint64_t>(p);
+        if (l & (uint64_t(1) << 63)) // rounding
+            h++;
+        return DiyFp(h, e + rhs.e + 64);
+#else
+        const uint64_t M32 = 0xFFFFFFFF;
+        const uint64_t a = f >> 32;
+        const uint64_t b = f & M32;
+        const uint64_t c = rhs.f >> 32;
+        const uint64_t d = rhs.f & M32;
+        const uint64_t ac = a * c;
+        const uint64_t bc = b * c;
+        const uint64_t ad = a * d;
+        const uint64_t bd = b * d;
+        uint64_t tmp = (bd >> 32) + (ad & M32) + (bc & M32);
+        tmp += 1U << 31;  /// mult_round
+        return DiyFp(ac + (ad >> 32) + (bc >> 32) + (tmp >> 32), e + rhs.e + 64);
+#endif
+    }
+
+    DiyFp Normalize() const {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+        unsigned long index;
+        _BitScanReverse64(&index, f);
+        return DiyFp(f << (63 - index), e - (63 - index));
+#elif defined(__GNUC__) && __GNUC__ >= 4
+        int s = __builtin_clzll(f);
+        return DiyFp(f << s, e - s);
+#else
+        DiyFp res = *this;
+        while (!(res.f & (static_cast<uint64_t>(1) << 63))) {
+            res.f <<= 1;
+            res.e--;
+        }
+        return res;
+#endif
+    }
+
+    DiyFp NormalizeBoundary() const {
+        DiyFp res = *this;
+        while (!(res.f & (kDpHiddenBit << 1))) {
+            res.f <<= 1;
+            res.e--;
+        }
+        res.f <<= (kDiySignificandSize - kDpSignificandSize - 2);
+        res.e = res.e - (kDiySignificandSize - kDpSignificandSize - 2);
+        return res;
+    }
+
+    void NormalizedBoundaries(DiyFp* minus, DiyFp* plus) const {
+        DiyFp pl = DiyFp((f << 1) + 1, e - 1).NormalizeBoundary();
+        DiyFp mi = (f == kDpHiddenBit) ? DiyFp((f << 2) - 1, e - 2) : DiyFp((f << 1) - 1, e - 1);
+        mi.f <<= mi.e - pl.e;
+        mi.e = pl.e;
+        *plus = pl;
+        *minus = mi;
+    }
+
+    double ToDouble() const {
+        union {
+            double d;
+            uint64_t u64;
+        }u;
+        const uint64_t be = (e == kDpDenormalExponent && (f & kDpHiddenBit) == 0) ? 0 : 
+            static_cast<uint64_t>(e + kDpExponentBias);
+        u.u64 = (f & kDpSignificandMask) | (be << kDpSignificandSize);
+        return u.d;
+    }
+
+    static const int kDiySignificandSize = 64;
+    static const int kDpSignificandSize = 52;
+    static const int kDpExponentBias = 0x3FF + kDpSignificandSize;
+    static const int kDpMaxExponent = 0x7FF - kDpExponentBias;
+    static const int kDpMinExponent = -kDpExponentBias;
+    static const int kDpDenormalExponent = -kDpExponentBias + 1;
+    static const uint64_t kDpExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
+    static const uint64_t kDpSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
+    static const uint64_t kDpHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
+
+    uint64_t f;
+    int e;
+};
+
+inline DiyFp GetCachedPowerByIndex(size_t index) {
+    // 10^-348, 10^-340, ..., 10^340
+    static const uint64_t kCachedPowers_F[] = {
+        RAPIDJSON_UINT64_C2(0xfa8fd5a0, 0x081c0288), RAPIDJSON_UINT64_C2(0xbaaee17f, 0xa23ebf76),
+        RAPIDJSON_UINT64_C2(0x8b16fb20, 0x3055ac76), RAPIDJSON_UINT64_C2(0xcf42894a, 0x5dce35ea),
+        RAPIDJSON_UINT64_C2(0x9a6bb0aa, 0x55653b2d), RAPIDJSON_UINT64_C2(0xe61acf03, 0x3d1a45df),
+        RAPIDJSON_UINT64_C2(0xab70fe17, 0xc79ac6ca), RAPIDJSON_UINT64_C2(0xff77b1fc, 0xbebcdc4f),
+        RAPIDJSON_UINT64_C2(0xbe5691ef, 0x416bd60c), RAPIDJSON_UINT64_C2(0x8dd01fad, 0x907ffc3c),
+        RAPIDJSON_UINT64_C2(0xd3515c28, 0x31559a83), RAPIDJSON_UINT64_C2(0x9d71ac8f, 0xada6c9b5),
+        RAPIDJSON_UINT64_C2(0xea9c2277, 0x23ee8bcb), RAPIDJSON_UINT64_C2(0xaecc4991, 0x4078536d),
+        RAPIDJSON_UINT64_C2(0x823c1279, 0x5db6ce57), RAPIDJSON_UINT64_C2(0xc2109436, 0x4dfb5637),
+        RAPIDJSON_UINT64_C2(0x9096ea6f, 0x3848984f), RAPIDJSON_UINT64_C2(0xd77485cb, 0x25823ac7),
+        RAPIDJSON_UINT64_C2(0xa086cfcd, 0x97bf97f4), RAPIDJSON_UINT64_C2(0xef340a98, 0x172aace5),
+        RAPIDJSON_UINT64_C2(0xb23867fb, 0x2a35b28e), RAPIDJSON_UINT64_C2(0x84c8d4df, 0xd2c63f3b),
+        RAPIDJSON_UINT64_C2(0xc5dd4427, 0x1ad3cdba), RAPIDJSON_UINT64_C2(0x936b9fce, 0xbb25c996),
+        RAPIDJSON_UINT64_C2(0xdbac6c24, 0x7d62a584), RAPIDJSON_UINT64_C2(0xa3ab6658, 0x0d5fdaf6),
+        RAPIDJSON_UINT64_C2(0xf3e2f893, 0xdec3f126), RAPIDJSON_UINT64_C2(0xb5b5ada8, 0xaaff80b8),
+        RAPIDJSON_UINT64_C2(0x87625f05, 0x6c7c4a8b), RAPIDJSON_UINT64_C2(0xc9bcff60, 0x34c13053),
+        RAPIDJSON_UINT64_C2(0x964e858c, 0x91ba2655), RAPIDJSON_UINT64_C2(0xdff97724, 0x70297ebd),
+        RAPIDJSON_UINT64_C2(0xa6dfbd9f, 0xb8e5b88f), RAPIDJSON_UINT64_C2(0xf8a95fcf, 0x88747d94),
+        RAPIDJSON_UINT64_C2(0xb9447093, 0x8fa89bcf), RAPIDJSON_UINT64_C2(0x8a08f0f8, 0xbf0f156b),
+        RAPIDJSON_UINT64_C2(0xcdb02555, 0x653131b6), RAPIDJSON_UINT64_C2(0x993fe2c6, 0xd07b7fac),
+        RAPIDJSON_UINT64_C2(0xe45c10c4, 0x2a2b3b06), RAPIDJSON_UINT64_C2(0xaa242499, 0x697392d3),
+        RAPIDJSON_UINT64_C2(0xfd87b5f2, 0x8300ca0e), RAPIDJSON_UINT64_C2(0xbce50864, 0x92111aeb),
+        RAPIDJSON_UINT64_C2(0x8cbccc09, 0x6f5088cc), RAPIDJSON_UINT64_C2(0xd1b71758, 0xe219652c),
+        RAPIDJSON_UINT64_C2(0x9c400000, 0x00000000), RAPIDJSON_UINT64_C2(0xe8d4a510, 0x00000000),
+        RAPIDJSON_UINT64_C2(0xad78ebc5, 0xac620000), RAPIDJSON_UINT64_C2(0x813f3978, 0xf8940984),
+        RAPIDJSON_UINT64_C2(0xc097ce7b, 0xc90715b3), RAPIDJSON_UINT64_C2(0x8f7e32ce, 0x7bea5c70),
+        RAPIDJSON_UINT64_C2(0xd5d238a4, 0xabe98068), RAPIDJSON_UINT64_C2(0x9f4f2726, 0x179a2245),
+        RAPIDJSON_UINT64_C2(0xed63a231, 0xd4c4fb27), RAPIDJSON_UINT64_C2(0xb0de6538, 0x8cc8ada8),
+        RAPIDJSON_UINT64_C2(0x83c7088e, 0x1aab65db), RAPIDJSON_UINT64_C2(0xc45d1df9, 0x42711d9a),
+        RAPIDJSON_UINT64_C2(0x924d692c, 0xa61be758), RAPIDJSON_UINT64_C2(0xda01ee64, 0x1a708dea),
+        RAPIDJSON_UINT64_C2(0xa26da399, 0x9aef774a), RAPIDJSON_UINT64_C2(0xf209787b, 0xb47d6b85),
+        RAPIDJSON_UINT64_C2(0xb454e4a1, 0x79dd1877), RAPIDJSON_UINT64_C2(0x865b8692, 0x5b9bc5c2),
+        RAPIDJSON_UINT64_C2(0xc83553c5, 0xc8965d3d), RAPIDJSON_UINT64_C2(0x952ab45c, 0xfa97a0b3),
+        RAPIDJSON_UINT64_C2(0xde469fbd, 0x99a05fe3), RAPIDJSON_UINT64_C2(0xa59bc234, 0xdb398c25),
+        RAPIDJSON_UINT64_C2(0xf6c69a72, 0xa3989f5c), RAPIDJSON_UINT64_C2(0xb7dcbf53, 0x54e9bece),
+        RAPIDJSON_UINT64_C2(0x88fcf317, 0xf22241e2), RAPIDJSON_UINT64_C2(0xcc20ce9b, 0xd35c78a5),
+        RAPIDJSON_UINT64_C2(0x98165af3, 0x7b2153df), RAPIDJSON_UINT64_C2(0xe2a0b5dc, 0x971f303a),
+        RAPIDJSON_UINT64_C2(0xa8d9d153, 0x5ce3b396), RAPIDJSON_UINT64_C2(0xfb9b7cd9, 0xa4a7443c),
+        RAPIDJSON_UINT64_C2(0xbb764c4c, 0xa7a44410), RAPIDJSON_UINT64_C2(0x8bab8eef, 0xb6409c1a),
+        RAPIDJSON_UINT64_C2(0xd01fef10, 0xa657842c), RAPIDJSON_UINT64_C2(0x9b10a4e5, 0xe9913129),
+        RAPIDJSON_UINT64_C2(0xe7109bfb, 0xa19c0c9d), RAPIDJSON_UINT64_C2(0xac2820d9, 0x623bf429),
+        RAPIDJSON_UINT64_C2(0x80444b5e, 0x7aa7cf85), RAPIDJSON_UINT64_C2(0xbf21e440, 0x03acdd2d),
+        RAPIDJSON_UINT64_C2(0x8e679c2f, 0x5e44ff8f), RAPIDJSON_UINT64_C2(0xd433179d, 0x9c8cb841),
+        RAPIDJSON_UINT64_C2(0x9e19db92, 0xb4e31ba9), RAPIDJSON_UINT64_C2(0xeb96bf6e, 0xbadf77d9),
+        RAPIDJSON_UINT64_C2(0xaf87023b, 0x9bf0ee6b)
+    };
+    static const int16_t kCachedPowers_E[] = {
+        -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007,  -980,
+        -954,  -927,  -901,  -874,  -847,  -821,  -794,  -768,  -741,  -715,
+        -688,  -661,  -635,  -608,  -582,  -555,  -529,  -502,  -475,  -449,
+        -422,  -396,  -369,  -343,  -316,  -289,  -263,  -236,  -210,  -183,
+        -157,  -130,  -103,   -77,   -50,   -24,     3,    30,    56,    83,
+        109,   136,   162,   189,   216,   242,   269,   295,   322,   348,
+        375,   402,   428,   455,   481,   508,   534,   561,   588,   614,
+        641,   667,   694,   720,   747,   774,   800,   827,   853,   880,
+        907,   933,   960,   986,  1013,  1039,  1066
+    };
+    return DiyFp(kCachedPowers_F[index], kCachedPowers_E[index]);
+}
+    
+inline DiyFp GetCachedPower(int e, int* K) {
+
+    //int k = static_cast<int>(ceil((-61 - e) * 0.30102999566398114)) + 374;
+    double dk = (-61 - e) * 0.30102999566398114 + 347;  // dk must be positive, so can do ceiling in positive
+    int k = static_cast<int>(dk);
+    if (dk - k > 0.0)
+        k++;
+
+    unsigned index = static_cast<unsigned>((k >> 3) + 1);
+    *K = -(-348 + static_cast<int>(index << 3));    // decimal exponent no need lookup table
+
+    return GetCachedPowerByIndex(index);
+}
+
+inline DiyFp GetCachedPower10(int exp, int *outExp) {
+     unsigned index = (exp + 348) / 8;
+     *outExp = -348 + index * 8;
+     return GetCachedPowerByIndex(index);
+ }
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_DIYFP_H_

libs/rapidjson/internal/dtoa.h

@@ -0,0 +1,217 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
+// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
+// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
+
+#ifndef RAPIDJSON_DTOA_
+#define RAPIDJSON_DTOA_
+
+#include "itoa.h" // GetDigitsLut()
+#include "diyfp.h"
+#include "ieee754.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uint64_t ten_kappa, uint64_t wp_w) {
+    while (rest < wp_w && delta - rest >= ten_kappa &&
+           (rest + ten_kappa < wp_w ||  /// closer
+            wp_w - rest > rest + ten_kappa - wp_w)) {
+        buffer[len - 1]--;
+        rest += ten_kappa;
+    }
+}
+
+inline unsigned CountDecimalDigit32(uint32_t n) {
+    // Simple pure C++ implementation was faster than __builtin_clz version in this situation.
+    if (n < 10) return 1;
+    if (n < 100) return 2;
+    if (n < 1000) return 3;
+    if (n < 10000) return 4;
+    if (n < 100000) return 5;
+    if (n < 1000000) return 6;
+    if (n < 10000000) return 7;
+    if (n < 100000000) return 8;
+    // Will not reach 10 digits in DigitGen()
+    //if (n < 1000000000) return 9;
+    //return 10;
+    return 9;
+}
+
+inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
+    static const uint32_t kPow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
+    const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
+    const DiyFp wp_w = Mp - W;
+    uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
+    uint64_t p2 = Mp.f & (one.f - 1);
+    int kappa = CountDecimalDigit32(p1); // kappa in [0, 9]
+    *len = 0;
+
+    while (kappa > 0) {
+        uint32_t d = 0;
+        switch (kappa) {
+            case  9: d = p1 /  100000000; p1 %=  100000000; break;
+            case  8: d = p1 /   10000000; p1 %=   10000000; break;
+            case  7: d = p1 /    1000000; p1 %=    1000000; break;
+            case  6: d = p1 /     100000; p1 %=     100000; break;
+            case  5: d = p1 /      10000; p1 %=      10000; break;
+            case  4: d = p1 /       1000; p1 %=       1000; break;
+            case  3: d = p1 /        100; p1 %=        100; break;
+            case  2: d = p1 /         10; p1 %=         10; break;
+            case  1: d = p1;              p1 =           0; break;
+            default:;
+        }
+        if (d || *len)
+            buffer[(*len)++] = static_cast<char>('0' + static_cast<char>(d));
+        kappa--;
+        uint64_t tmp = (static_cast<uint64_t>(p1) << -one.e) + p2;
+        if (tmp <= delta) {
+            *K += kappa;
+            GrisuRound(buffer, *len, delta, tmp, static_cast<uint64_t>(kPow10[kappa]) << -one.e, wp_w.f);
+            return;
+        }
+    }
+
+    // kappa = 0
+    for (;;) {
+        p2 *= 10;
+        delta *= 10;
+        char d = static_cast<char>(p2 >> -one.e);
+        if (d || *len)
+            buffer[(*len)++] = static_cast<char>('0' + d);
+        p2 &= one.f - 1;
+        kappa--;
+        if (p2 < delta) {
+            *K += kappa;
+            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * kPow10[-kappa]);
+            return;
+        }
+    }
+}
+
+inline void Grisu2(double value, char* buffer, int* length, int* K) {
+    const DiyFp v(value);
+    DiyFp w_m, w_p;
+    v.NormalizedBoundaries(&w_m, &w_p);
+
+    const DiyFp c_mk = GetCachedPower(w_p.e, K);
+    const DiyFp W = v.Normalize() * c_mk;
+    DiyFp Wp = w_p * c_mk;
+    DiyFp Wm = w_m * c_mk;
+    Wm.f++;
+    Wp.f--;
+    DigitGen(W, Wp, Wp.f - Wm.f, buffer, length, K);
+}
+
+inline char* WriteExponent(int K, char* buffer) {
+    if (K < 0) {
+        *buffer++ = '-';
+        K = -K;
+    }
+
+    if (K >= 100) {
+        *buffer++ = static_cast<char>('0' + static_cast<char>(K / 100));
+        K %= 100;
+        const char* d = GetDigitsLut() + K * 2;
+        *buffer++ = d[0];
+        *buffer++ = d[1];
+    }
+    else if (K >= 10) {
+        const char* d = GetDigitsLut() + K * 2;
+        *buffer++ = d[0];
+        *buffer++ = d[1];
+    }
+    else
+        *buffer++ = static_cast<char>('0' + static_cast<char>(K));
+
+    return buffer;
+}
+
+inline char* Prettify(char* buffer, int length, int k) {
+    const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
+
+    if (length <= kk && kk <= 21) {
+        // 1234e7 -> 12340000000
+        for (int i = length; i < kk; i++)
+            buffer[i] = '0';
+        buffer[kk] = '.';
+        buffer[kk + 1] = '0';
+        return &buffer[kk + 2];
+    }
+    else if (0 < kk && kk <= 21) {
+        // 1234e-2 -> 12.34
+        std::memmove(&buffer[kk + 1], &buffer[kk], length - kk);
+        buffer[kk] = '.';
+        return &buffer[length + 1];
+    }
+    else if (-6 < kk && kk <= 0) {
+        // 1234e-6 -> 0.001234
+        const int offset = 2 - kk;
+        std::memmove(&buffer[offset], &buffer[0], length);
+        buffer[0] = '0';
+        buffer[1] = '.';
+        for (int i = 2; i < offset; i++)
+            buffer[i] = '0';
+        return &buffer[length + offset];
+    }
+    else if (length == 1) {
+        // 1e30
+        buffer[1] = 'e';
+        return WriteExponent(kk - 1, &buffer[2]);
+    }
+    else {
+        // 1234e30 -> 1.234e33
+        std::memmove(&buffer[2], &buffer[1], length - 1);
+        buffer[1] = '.';
+        buffer[length + 1] = 'e';
+        return WriteExponent(kk - 1, &buffer[0 + length + 2]);
+    }
+}
+
+inline char* dtoa(double value, char* buffer) {
+    Double d(value);
+    if (d.IsZero()) {
+        if (d.Sign())
+            *buffer++ = '-';     // -0.0, Issue #289
+        buffer[0] = '0';
+        buffer[1] = '.';
+        buffer[2] = '0';
+        return &buffer[3];
+    }
+    else {
+        if (value < 0) {
+            *buffer++ = '-';
+            value = -value;
+        }
+        int length, K;
+        Grisu2(value, buffer, &length, &K);
+        return Prettify(buffer, length, K);
+    }
+}
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_DTOA_

libs/rapidjson/internal/ieee754.h

@@ -0,0 +1,77 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_IEEE754_
+#define RAPIDJSON_IEEE754_
+
+#include "../rapidjson.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+class Double {
+public:
+    Double() {}
+    Double(double d) : d(d) {}
+    Double(uint64_t u) : u(u) {}
+
+    double Value() const { return d; }
+    uint64_t Uint64Value() const { return u; }
+
+    double NextPositiveDouble() const {
+        RAPIDJSON_ASSERT(!Sign());
+        return Double(u + 1).Value();
+    }
+
+    bool Sign() const { return (u & kSignMask) != 0; }
+    uint64_t Significand() const { return u & kSignificandMask; }
+    int Exponent() const { return ((u & kExponentMask) >> kSignificandSize) - kExponentBias; }
+
+    bool IsNan() const { return (u & kExponentMask) == kExponentMask && Significand() != 0; }
+    bool IsInf() const { return (u & kExponentMask) == kExponentMask && Significand() == 0; }
+    bool IsNormal() const { return (u & kExponentMask) != 0 || Significand() == 0; }
+    bool IsZero() const { return (u & (kExponentMask | kSignificandMask)) == 0; }
+
+    uint64_t IntegerSignificand() const { return IsNormal() ? Significand() | kHiddenBit : Significand(); }
+    int IntegerExponent() const { return (IsNormal() ? Exponent() : kDenormalExponent) - kSignificandSize; }
+    uint64_t ToBias() const { return (u & kSignMask) ? ~u + 1 : u | kSignMask; }
+
+    static unsigned EffectiveSignificandSize(int order) {
+        if (order >= -1021)
+            return 53;
+        else if (order <= -1074)
+            return 0;
+        else
+            return order + 1074;
+    }
+
+private:
+    static const int kSignificandSize = 52;
+    static const int kExponentBias = 0x3FF;
+    static const int kDenormalExponent = 1 - kExponentBias;
+    static const uint64_t kSignMask = RAPIDJSON_UINT64_C2(0x80000000, 0x00000000);
+    static const uint64_t kExponentMask = RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
+    static const uint64_t kSignificandMask = RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
+    static const uint64_t kHiddenBit = RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
+
+    union {
+        double d;
+        uint64_t u;
+    };
+};
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_IEEE754_

libs/rapidjson/internal/itoa.h

@@ -0,0 +1,304 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_ITOA_
+#define RAPIDJSON_ITOA_
+
+#include "../rapidjson.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+inline const char* GetDigitsLut() {
+    static const char cDigitsLut[200] = {
+        '0','0','0','1','0','2','0','3','0','4','0','5','0','6','0','7','0','8','0','9',
+        '1','0','1','1','1','2','1','3','1','4','1','5','1','6','1','7','1','8','1','9',
+        '2','0','2','1','2','2','2','3','2','4','2','5','2','6','2','7','2','8','2','9',
+        '3','0','3','1','3','2','3','3','3','4','3','5','3','6','3','7','3','8','3','9',
+        '4','0','4','1','4','2','4','3','4','4','4','5','4','6','4','7','4','8','4','9',
+        '5','0','5','1','5','2','5','3','5','4','5','5','5','6','5','7','5','8','5','9',
+        '6','0','6','1','6','2','6','3','6','4','6','5','6','6','6','7','6','8','6','9',
+        '7','0','7','1','7','2','7','3','7','4','7','5','7','6','7','7','7','8','7','9',
+        '8','0','8','1','8','2','8','3','8','4','8','5','8','6','8','7','8','8','8','9',
+        '9','0','9','1','9','2','9','3','9','4','9','5','9','6','9','7','9','8','9','9'
+    };
+    return cDigitsLut;
+}
+
+inline char* u32toa(uint32_t value, char* buffer) {
+    const char* cDigitsLut = GetDigitsLut();
+
+    if (value < 10000) {
+        const uint32_t d1 = (value / 100) << 1;
+        const uint32_t d2 = (value % 100) << 1;
+        
+        if (value >= 1000)
+            *buffer++ = cDigitsLut[d1];
+        if (value >= 100)
+            *buffer++ = cDigitsLut[d1 + 1];
+        if (value >= 10)
+            *buffer++ = cDigitsLut[d2];
+        *buffer++ = cDigitsLut[d2 + 1];
+    }
+    else if (value < 100000000) {
+        // value = bbbbcccc
+        const uint32_t b = value / 10000;
+        const uint32_t c = value % 10000;
+        
+        const uint32_t d1 = (b / 100) << 1;
+        const uint32_t d2 = (b % 100) << 1;
+        
+        const uint32_t d3 = (c / 100) << 1;
+        const uint32_t d4 = (c % 100) << 1;
+        
+        if (value >= 10000000)
+            *buffer++ = cDigitsLut[d1];
+        if (value >= 1000000)
+            *buffer++ = cDigitsLut[d1 + 1];
+        if (value >= 100000)
+            *buffer++ = cDigitsLut[d2];
+        *buffer++ = cDigitsLut[d2 + 1];
+        
+        *buffer++ = cDigitsLut[d3];
+        *buffer++ = cDigitsLut[d3 + 1];
+        *buffer++ = cDigitsLut[d4];
+        *buffer++ = cDigitsLut[d4 + 1];
+    }
+    else {
+        // value = aabbbbcccc in decimal
+        
+        const uint32_t a = value / 100000000; // 1 to 42
+        value %= 100000000;
+        
+        if (a >= 10) {
+            const unsigned i = a << 1;
+            *buffer++ = cDigitsLut[i];
+            *buffer++ = cDigitsLut[i + 1];
+        }
+        else
+            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
+
+        const uint32_t b = value / 10000; // 0 to 9999
+        const uint32_t c = value % 10000; // 0 to 9999
+        
+        const uint32_t d1 = (b / 100) << 1;
+        const uint32_t d2 = (b % 100) << 1;
+        
+        const uint32_t d3 = (c / 100) << 1;
+        const uint32_t d4 = (c % 100) << 1;
+        
+        *buffer++ = cDigitsLut[d1];
+        *buffer++ = cDigitsLut[d1 + 1];
+        *buffer++ = cDigitsLut[d2];
+        *buffer++ = cDigitsLut[d2 + 1];
+        *buffer++ = cDigitsLut[d3];
+        *buffer++ = cDigitsLut[d3 + 1];
+        *buffer++ = cDigitsLut[d4];
+        *buffer++ = cDigitsLut[d4 + 1];
+    }
+    return buffer;
+}
+
+inline char* i32toa(int32_t value, char* buffer) {
+    uint32_t u = static_cast<uint32_t>(value);
+    if (value < 0) {
+        *buffer++ = '-';
+        u = ~u + 1;
+    }
+
+    return u32toa(u, buffer);
+}
+
+inline char* u64toa(uint64_t value, char* buffer) {
+    const char* cDigitsLut = GetDigitsLut();
+    const uint64_t  kTen8 = 100000000;
+    const uint64_t  kTen9 = kTen8 * 10;
+    const uint64_t kTen10 = kTen8 * 100;
+    const uint64_t kTen11 = kTen8 * 1000;
+    const uint64_t kTen12 = kTen8 * 10000;
+    const uint64_t kTen13 = kTen8 * 100000;
+    const uint64_t kTen14 = kTen8 * 1000000;
+    const uint64_t kTen15 = kTen8 * 10000000;
+    const uint64_t kTen16 = kTen8 * kTen8;
+    
+    if (value < kTen8) {
+        uint32_t v = static_cast<uint32_t>(value);
+        if (v < 10000) {
+            const uint32_t d1 = (v / 100) << 1;
+            const uint32_t d2 = (v % 100) << 1;
+            
+            if (v >= 1000)
+                *buffer++ = cDigitsLut[d1];
+            if (v >= 100)
+                *buffer++ = cDigitsLut[d1 + 1];
+            if (v >= 10)
+                *buffer++ = cDigitsLut[d2];
+            *buffer++ = cDigitsLut[d2 + 1];
+        }
+        else {
+            // value = bbbbcccc
+            const uint32_t b = v / 10000;
+            const uint32_t c = v % 10000;
+            
+            const uint32_t d1 = (b / 100) << 1;
+            const uint32_t d2 = (b % 100) << 1;
+            
+            const uint32_t d3 = (c / 100) << 1;
+            const uint32_t d4 = (c % 100) << 1;
+            
+            if (value >= 10000000)
+                *buffer++ = cDigitsLut[d1];
+            if (value >= 1000000)
+                *buffer++ = cDigitsLut[d1 + 1];
+            if (value >= 100000)
+                *buffer++ = cDigitsLut[d2];
+            *buffer++ = cDigitsLut[d2 + 1];
+            
+            *buffer++ = cDigitsLut[d3];
+            *buffer++ = cDigitsLut[d3 + 1];
+            *buffer++ = cDigitsLut[d4];
+            *buffer++ = cDigitsLut[d4 + 1];
+        }
+    }
+    else if (value < kTen16) {
+        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
+        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
+        
+        const uint32_t b0 = v0 / 10000;
+        const uint32_t c0 = v0 % 10000;
+        
+        const uint32_t d1 = (b0 / 100) << 1;
+        const uint32_t d2 = (b0 % 100) << 1;
+        
+        const uint32_t d3 = (c0 / 100) << 1;
+        const uint32_t d4 = (c0 % 100) << 1;
+
+        const uint32_t b1 = v1 / 10000;
+        const uint32_t c1 = v1 % 10000;
+        
+        const uint32_t d5 = (b1 / 100) << 1;
+        const uint32_t d6 = (b1 % 100) << 1;
+        
+        const uint32_t d7 = (c1 / 100) << 1;
+        const uint32_t d8 = (c1 % 100) << 1;
+
+        if (value >= kTen15)
+            *buffer++ = cDigitsLut[d1];
+        if (value >= kTen14)
+            *buffer++ = cDigitsLut[d1 + 1];
+        if (value >= kTen13)
+            *buffer++ = cDigitsLut[d2];
+        if (value >= kTen12)
+            *buffer++ = cDigitsLut[d2 + 1];
+        if (value >= kTen11)
+            *buffer++ = cDigitsLut[d3];
+        if (value >= kTen10)
+            *buffer++ = cDigitsLut[d3 + 1];
+        if (value >= kTen9)
+            *buffer++ = cDigitsLut[d4];
+        if (value >= kTen8)
+            *buffer++ = cDigitsLut[d4 + 1];
+        
+        *buffer++ = cDigitsLut[d5];
+        *buffer++ = cDigitsLut[d5 + 1];
+        *buffer++ = cDigitsLut[d6];
+        *buffer++ = cDigitsLut[d6 + 1];
+        *buffer++ = cDigitsLut[d7];
+        *buffer++ = cDigitsLut[d7 + 1];
+        *buffer++ = cDigitsLut[d8];
+        *buffer++ = cDigitsLut[d8 + 1];
+    }
+    else {
+        const uint32_t a = static_cast<uint32_t>(value / kTen16); // 1 to 1844
+        value %= kTen16;
+        
+        if (a < 10)
+            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
+        else if (a < 100) {
+            const uint32_t i = a << 1;
+            *buffer++ = cDigitsLut[i];
+            *buffer++ = cDigitsLut[i + 1];
+        }
+        else if (a < 1000) {
+            *buffer++ = static_cast<char>('0' + static_cast<char>(a / 100));
+            
+            const uint32_t i = (a % 100) << 1;
+            *buffer++ = cDigitsLut[i];
+            *buffer++ = cDigitsLut[i + 1];
+        }
+        else {
+            const uint32_t i = (a / 100) << 1;
+            const uint32_t j = (a % 100) << 1;
+            *buffer++ = cDigitsLut[i];
+            *buffer++ = cDigitsLut[i + 1];
+            *buffer++ = cDigitsLut[j];
+            *buffer++ = cDigitsLut[j + 1];
+        }
+        
+        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
+        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
+        
+        const uint32_t b0 = v0 / 10000;
+        const uint32_t c0 = v0 % 10000;
+        
+        const uint32_t d1 = (b0 / 100) << 1;
+        const uint32_t d2 = (b0 % 100) << 1;
+        
+        const uint32_t d3 = (c0 / 100) << 1;
+        const uint32_t d4 = (c0 % 100) << 1;
+        
+        const uint32_t b1 = v1 / 10000;
+        const uint32_t c1 = v1 % 10000;
+        
+        const uint32_t d5 = (b1 / 100) << 1;
+        const uint32_t d6 = (b1 % 100) << 1;
+        
+        const uint32_t d7 = (c1 / 100) << 1;
+        const uint32_t d8 = (c1 % 100) << 1;
+        
+        *buffer++ = cDigitsLut[d1];
+        *buffer++ = cDigitsLut[d1 + 1];
+        *buffer++ = cDigitsLut[d2];
+        *buffer++ = cDigitsLut[d2 + 1];
+        *buffer++ = cDigitsLut[d3];
+        *buffer++ = cDigitsLut[d3 + 1];
+        *buffer++ = cDigitsLut[d4];
+        *buffer++ = cDigitsLut[d4 + 1];
+        *buffer++ = cDigitsLut[d5];
+        *buffer++ = cDigitsLut[d5 + 1];
+        *buffer++ = cDigitsLut[d6];
+        *buffer++ = cDigitsLut[d6 + 1];
+        *buffer++ = cDigitsLut[d7];
+        *buffer++ = cDigitsLut[d7 + 1];
+        *buffer++ = cDigitsLut[d8];
+        *buffer++ = cDigitsLut[d8 + 1];
+    }
+    
+    return buffer;
+}
+
+inline char* i64toa(int64_t value, char* buffer) {
+    uint64_t u = static_cast<uint64_t>(value);
+    if (value < 0) {
+        *buffer++ = '-';
+        u = ~u + 1;
+    }
+
+    return u64toa(u, buffer);
+}
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_ITOA_

libs/rapidjson/internal/meta.h

@@ -0,0 +1,183 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_INTERNAL_META_H_
+#define RAPIDJSON_INTERNAL_META_H_
+
+#ifndef RAPIDJSON_RAPIDJSON_H_
+#error <rapidjson.h> not yet included. Do not include this file directly.
+#endif
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+#if defined(_MSC_VER)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(6334)
+#endif
+
+#if RAPIDJSON_HAS_CXX11_TYPETRAITS
+#include <type_traits>
+#endif
+
+//@cond RAPIDJSON_INTERNAL
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+// Helper to wrap/convert arbitrary types to void, useful for arbitrary type matching
+template <typename T> struct Void { typedef void Type; };
+
+///////////////////////////////////////////////////////////////////////////////
+// BoolType, TrueType, FalseType
+//
+template <bool Cond> struct BoolType {
+    static const bool Value = Cond;
+    typedef BoolType Type;
+};
+typedef BoolType<true> TrueType;
+typedef BoolType<false> FalseType;
+
+
+///////////////////////////////////////////////////////////////////////////////
+// SelectIf, BoolExpr, NotExpr, AndExpr, OrExpr
+//
+
+template <bool C> struct SelectIfImpl { template <typename T1, typename T2> struct Apply { typedef T1 Type; }; };
+template <> struct SelectIfImpl<false> { template <typename T1, typename T2> struct Apply { typedef T2 Type; }; };
+template <bool C, typename T1, typename T2> struct SelectIfCond : SelectIfImpl<C>::template Apply<T1,T2> {};
+template <typename C, typename T1, typename T2> struct SelectIf : SelectIfCond<C::Value, T1, T2> {};
+
+template <bool Cond1, bool Cond2> struct AndExprCond : FalseType {};
+template <> struct AndExprCond<true, true> : TrueType {};
+template <bool Cond1, bool Cond2> struct OrExprCond : TrueType {};
+template <> struct OrExprCond<false, false> : FalseType {};
+
+template <typename C> struct BoolExpr : SelectIf<C,TrueType,FalseType>::Type {};
+template <typename C> struct NotExpr  : SelectIf<C,FalseType,TrueType>::Type {};
+template <typename C1, typename C2> struct AndExpr : AndExprCond<C1::Value, C2::Value>::Type {};
+template <typename C1, typename C2> struct OrExpr  : OrExprCond<C1::Value, C2::Value>::Type {};
+
+
+///////////////////////////////////////////////////////////////////////////////
+// AddConst, MaybeAddConst, RemoveConst
+template <typename T> struct AddConst { typedef const T Type; };
+template <bool Constify, typename T> struct MaybeAddConst : SelectIfCond<Constify, const T, T> {};
+template <typename T> struct RemoveConst { typedef T Type; };
+template <typename T> struct RemoveConst<const T> { typedef T Type; };
+
+
+///////////////////////////////////////////////////////////////////////////////
+// IsSame, IsConst, IsMoreConst, IsPointer
+//
+template <typename T, typename U> struct IsSame : FalseType {};
+template <typename T> struct IsSame<T, T> : TrueType {};
+
+template <typename T> struct IsConst : FalseType {};
+template <typename T> struct IsConst<const T> : TrueType {};
+
+template <typename CT, typename T>
+struct IsMoreConst
+    : AndExpr<IsSame<typename RemoveConst<CT>::Type, typename RemoveConst<T>::Type>,
+              BoolType<IsConst<CT>::Value >= IsConst<T>::Value> >::Type {};
+
+template <typename T> struct IsPointer : FalseType {};
+template <typename T> struct IsPointer<T*> : TrueType {};
+
+///////////////////////////////////////////////////////////////////////////////
+// IsBaseOf
+//
+#if RAPIDJSON_HAS_CXX11_TYPETRAITS
+
+template <typename B, typename D> struct IsBaseOf
+    : BoolType< ::std::is_base_of<B,D>::value> {};
+
+#else // simplified version adopted from Boost
+
+template<typename B, typename D> struct IsBaseOfImpl {
+    RAPIDJSON_STATIC_ASSERT(sizeof(B) != 0);
+    RAPIDJSON_STATIC_ASSERT(sizeof(D) != 0);
+
+    typedef char (&Yes)[1];
+    typedef char (&No) [2];
+
+    template <typename T>
+    static Yes Check(const D*, T);
+    static No  Check(const B*, int);
+
+    struct Host {
+        operator const B*() const;
+        operator const D*();
+    };
+
+    enum { Value = (sizeof(Check(Host(), 0)) == sizeof(Yes)) };
+};
+
+template <typename B, typename D> struct IsBaseOf
+    : OrExpr<IsSame<B, D>, BoolExpr<IsBaseOfImpl<B, D> > >::Type {};
+
+#endif // RAPIDJSON_HAS_CXX11_TYPETRAITS
+
+
+//////////////////////////////////////////////////////////////////////////
+// EnableIf / DisableIf
+//
+template <bool Condition, typename T = void> struct EnableIfCond  { typedef T Type; };
+template <typename T> struct EnableIfCond<false, T> { /* empty */ };
+
+template <bool Condition, typename T = void> struct DisableIfCond { typedef T Type; };
+template <typename T> struct DisableIfCond<true, T> { /* empty */ };
+
+template <typename Condition, typename T = void>
+struct EnableIf : EnableIfCond<Condition::Value, T> {};
+
+template <typename Condition, typename T = void>
+struct DisableIf : DisableIfCond<Condition::Value, T> {};
+
+// SFINAE helpers
+struct SfinaeTag {};
+template <typename T> struct RemoveSfinaeTag;
+template <typename T> struct RemoveSfinaeTag<SfinaeTag&(*)(T)> { typedef T Type; };
+
+#define RAPIDJSON_REMOVEFPTR_(type) \
+    typename ::RAPIDJSON_NAMESPACE::internal::RemoveSfinaeTag \
+        < ::RAPIDJSON_NAMESPACE::internal::SfinaeTag&(*) type>::Type
+
+#define RAPIDJSON_ENABLEIF(cond) \
+    typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
+        <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
+
+#define RAPIDJSON_DISABLEIF(cond) \
+    typename ::RAPIDJSON_NAMESPACE::internal::DisableIf \
+        <RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
+
+#define RAPIDJSON_ENABLEIF_RETURN(cond,returntype) \
+    typename ::RAPIDJSON_NAMESPACE::internal::EnableIf \
+        <RAPIDJSON_REMOVEFPTR_(cond), \
+         RAPIDJSON_REMOVEFPTR_(returntype)>::Type
+
+#define RAPIDJSON_DISABLEIF_RETURN(cond,returntype) \
+    typename ::RAPIDJSON_NAMESPACE::internal::DisableIf \
+        <RAPIDJSON_REMOVEFPTR_(cond), \
+         RAPIDJSON_REMOVEFPTR_(returntype)>::Type
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+//@endcond
+
+#if defined(__GNUC__) || defined(_MSC_VER)
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_INTERNAL_META_H_

libs/rapidjson/internal/pow10.h

@@ -0,0 +1,53 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_POW10_
+#define RAPIDJSON_POW10_
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+//! Computes integer powers of 10 in double (10.0^n).
+/*! This function uses lookup table for fast and accurate results.
+    \param n non-negative exponent. Must <= 308.
+    \return 10.0^n
+*/
+inline double Pow10(int n) {
+    static const double e[] = { // 1e-0...1e308: 309 * 8 bytes = 2472 bytes
+        1e+0,  
+        1e+1,  1e+2,  1e+3,  1e+4,  1e+5,  1e+6,  1e+7,  1e+8,  1e+9,  1e+10, 1e+11, 1e+12, 1e+13, 1e+14, 1e+15, 1e+16, 1e+17, 1e+18, 1e+19, 1e+20, 
+        1e+21, 1e+22, 1e+23, 1e+24, 1e+25, 1e+26, 1e+27, 1e+28, 1e+29, 1e+30, 1e+31, 1e+32, 1e+33, 1e+34, 1e+35, 1e+36, 1e+37, 1e+38, 1e+39, 1e+40,
+        1e+41, 1e+42, 1e+43, 1e+44, 1e+45, 1e+46, 1e+47, 1e+48, 1e+49, 1e+50, 1e+51, 1e+52, 1e+53, 1e+54, 1e+55, 1e+56, 1e+57, 1e+58, 1e+59, 1e+60,
+        1e+61, 1e+62, 1e+63, 1e+64, 1e+65, 1e+66, 1e+67, 1e+68, 1e+69, 1e+70, 1e+71, 1e+72, 1e+73, 1e+74, 1e+75, 1e+76, 1e+77, 1e+78, 1e+79, 1e+80,
+        1e+81, 1e+82, 1e+83, 1e+84, 1e+85, 1e+86, 1e+87, 1e+88, 1e+89, 1e+90, 1e+91, 1e+92, 1e+93, 1e+94, 1e+95, 1e+96, 1e+97, 1e+98, 1e+99, 1e+100,
+        1e+101,1e+102,1e+103,1e+104,1e+105,1e+106,1e+107,1e+108,1e+109,1e+110,1e+111,1e+112,1e+113,1e+114,1e+115,1e+116,1e+117,1e+118,1e+119,1e+120,
+        1e+121,1e+122,1e+123,1e+124,1e+125,1e+126,1e+127,1e+128,1e+129,1e+130,1e+131,1e+132,1e+133,1e+134,1e+135,1e+136,1e+137,1e+138,1e+139,1e+140,
+        1e+141,1e+142,1e+143,1e+144,1e+145,1e+146,1e+147,1e+148,1e+149,1e+150,1e+151,1e+152,1e+153,1e+154,1e+155,1e+156,1e+157,1e+158,1e+159,1e+160,
+        1e+161,1e+162,1e+163,1e+164,1e+165,1e+166,1e+167,1e+168,1e+169,1e+170,1e+171,1e+172,1e+173,1e+174,1e+175,1e+176,1e+177,1e+178,1e+179,1e+180,
+        1e+181,1e+182,1e+183,1e+184,1e+185,1e+186,1e+187,1e+188,1e+189,1e+190,1e+191,1e+192,1e+193,1e+194,1e+195,1e+196,1e+197,1e+198,1e+199,1e+200,
+        1e+201,1e+202,1e+203,1e+204,1e+205,1e+206,1e+207,1e+208,1e+209,1e+210,1e+211,1e+212,1e+213,1e+214,1e+215,1e+216,1e+217,1e+218,1e+219,1e+220,
+        1e+221,1e+222,1e+223,1e+224,1e+225,1e+226,1e+227,1e+228,1e+229,1e+230,1e+231,1e+232,1e+233,1e+234,1e+235,1e+236,1e+237,1e+238,1e+239,1e+240,
+        1e+241,1e+242,1e+243,1e+244,1e+245,1e+246,1e+247,1e+248,1e+249,1e+250,1e+251,1e+252,1e+253,1e+254,1e+255,1e+256,1e+257,1e+258,1e+259,1e+260,
+        1e+261,1e+262,1e+263,1e+264,1e+265,1e+266,1e+267,1e+268,1e+269,1e+270,1e+271,1e+272,1e+273,1e+274,1e+275,1e+276,1e+277,1e+278,1e+279,1e+280,
+        1e+281,1e+282,1e+283,1e+284,1e+285,1e+286,1e+287,1e+288,1e+289,1e+290,1e+291,1e+292,1e+293,1e+294,1e+295,1e+296,1e+297,1e+298,1e+299,1e+300,
+        1e+301,1e+302,1e+303,1e+304,1e+305,1e+306,1e+307,1e+308
+    };
+    RAPIDJSON_ASSERT(n >= 0 && n <= 308);
+    return e[n];
+}
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_POW10_

libs/rapidjson/internal/stack.h

@@ -0,0 +1,177 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_INTERNAL_STACK_H_
+#define RAPIDJSON_INTERNAL_STACK_H_
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+///////////////////////////////////////////////////////////////////////////////
+// Stack
+
+//! A type-unsafe stack for storing different types of data.
+/*! \tparam Allocator Allocator for allocating stack memory.
+*/
+template <typename Allocator>
+class Stack {
+public:
+    // Optimization note: Do not allocate memory for stack_ in constructor.
+    // Do it lazily when first Push() -> Expand() -> Resize().
+    Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator_(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
+        RAPIDJSON_ASSERT(stackCapacity > 0);
+    }
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    Stack(Stack&& rhs)
+        : allocator_(rhs.allocator_),
+          ownAllocator_(rhs.ownAllocator_),
+          stack_(rhs.stack_),
+          stackTop_(rhs.stackTop_),
+          stackEnd_(rhs.stackEnd_),
+          initialCapacity_(rhs.initialCapacity_)
+    {
+        rhs.allocator_ = 0;
+        rhs.ownAllocator_ = 0;
+        rhs.stack_ = 0;
+        rhs.stackTop_ = 0;
+        rhs.stackEnd_ = 0;
+        rhs.initialCapacity_ = 0;
+    }
+#endif
+
+    ~Stack() {
+        Destroy();
+    }
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    Stack& operator=(Stack&& rhs) {
+        if (&rhs != this)
+        {
+            Destroy();
+
+            allocator_ = rhs.allocator_;
+            ownAllocator_ = rhs.ownAllocator_;
+            stack_ = rhs.stack_;
+            stackTop_ = rhs.stackTop_;
+            stackEnd_ = rhs.stackEnd_;
+            initialCapacity_ = rhs.initialCapacity_;
+
+            rhs.allocator_ = 0;
+            rhs.ownAllocator_ = 0;
+            rhs.stack_ = 0;
+            rhs.stackTop_ = 0;
+            rhs.stackEnd_ = 0;
+            rhs.initialCapacity_ = 0;
+        }
+        return *this;
+    }
+#endif
+
+    void Clear() { stackTop_ = stack_; }
+
+    void ShrinkToFit() { 
+        if (Empty()) {
+            // If the stack is empty, completely deallocate the memory.
+            Allocator::Free(stack_);
+            stack_ = 0;
+            stackTop_ = 0;
+            stackEnd_ = 0;
+        }
+        else
+            Resize(GetSize());
+    }
+
+    // Optimization note: try to minimize the size of this function for force inline.
+    // Expansion is run very infrequently, so it is moved to another (probably non-inline) function.
+    template<typename T>
+    RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
+         // Expand the stack if needed
+        if (stackTop_ + sizeof(T) * count >= stackEnd_)
+            Expand<T>(count);
+
+        T* ret = reinterpret_cast<T*>(stackTop_);
+        stackTop_ += sizeof(T) * count;
+        return ret;
+    }
+
+    template<typename T>
+    T* Pop(size_t count) {
+        RAPIDJSON_ASSERT(GetSize() >= count * sizeof(T));
+        stackTop_ -= count * sizeof(T);
+        return reinterpret_cast<T*>(stackTop_);
+    }
+
+    template<typename T>
+    T* Top() { 
+        RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
+        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
+    }
+
+    template<typename T>
+    T* Bottom() { return (T*)stack_; }
+
+    Allocator& GetAllocator() { return *allocator_; }
+    bool Empty() const { return stackTop_ == stack_; }
+    size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); }
+    size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); }
+
+private:
+    template<typename T>
+    void Expand(size_t count) {
+        // Only expand the capacity if the current stack exists. Otherwise just create a stack with initial capacity.
+        size_t newCapacity;
+        if (stack_ == 0) {
+            if (!allocator_)
+                ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
+            newCapacity = initialCapacity_;
+        } else {
+            newCapacity = GetCapacity();
+            newCapacity += (newCapacity + 1) / 2;
+        }
+        size_t newSize = GetSize() + sizeof(T) * count;
+        if (newCapacity < newSize)
+            newCapacity = newSize;
+
+        Resize(newCapacity);
+    }
+
+    void Resize(size_t newCapacity) {
+        const size_t size = GetSize();  // Backup the current size
+        stack_ = (char*)allocator_->Realloc(stack_, GetCapacity(), newCapacity);
+        stackTop_ = stack_ + size;
+        stackEnd_ = stack_ + newCapacity;
+    }
+
+    void Destroy() {
+        Allocator::Free(stack_);
+        RAPIDJSON_DELETE(ownAllocator_); // Only delete if it is owned by the stack
+    }
+
+    // Prohibit copy constructor & assignment operator.
+    Stack(const Stack&);
+    Stack& operator=(const Stack&);
+
+    Allocator* allocator_;
+    Allocator* ownAllocator_;
+    char *stack_;
+    char *stackTop_;
+    char *stackEnd_;
+    size_t initialCapacity_;
+};
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_STACK_H_

libs/rapidjson/internal/strfunc.h

@@ -0,0 +1,37 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_INTERNAL_STRFUNC_H_
+#define RAPIDJSON_INTERNAL_STRFUNC_H_
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+//! Custom strlen() which works on different character types.
+/*! \tparam Ch Character type (e.g. char, wchar_t, short)
+    \param s Null-terminated input string.
+    \return Number of characters in the string. 
+    \note This has the same semantics as strlen(), the return value is not number of Unicode codepoints.
+*/
+template <typename Ch>
+inline SizeType StrLen(const Ch* s) {
+    const Ch* p = s;
+    while (*p) ++p;
+    return SizeType(p - s);
+}
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_INTERNAL_STRFUNC_H_

libs/rapidjson/internal/strtod.h

@@ -0,0 +1,265 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_STRTOD_
+#define RAPIDJSON_STRTOD_
+
+#include "../rapidjson.h"
+#include "ieee754.h"
+#include "biginteger.h"
+#include "diyfp.h"
+#include "pow10.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+inline double FastPath(double significand, int exp) {
+    if (exp < -308)
+        return 0.0;
+    else if (exp >= 0)
+        return significand * internal::Pow10(exp);
+    else
+        return significand / internal::Pow10(-exp);
+}
+
+inline double StrtodNormalPrecision(double d, int p) {
+    if (p < -308) {
+        // Prevent expSum < -308, making Pow10(p) = 0
+        d = FastPath(d, -308);
+        d = FastPath(d, p + 308);
+    }
+    else
+        d = FastPath(d, p);
+    return d;
+}
+
+template <typename T>
+inline T Min3(T a, T b, T c) {
+    T m = a;
+    if (m > b) m = b;
+    if (m > c) m = c;
+    return m;
+}
+
+inline int CheckWithinHalfULP(double b, const BigInteger& d, int dExp) {
+    const Double db(b);
+    const uint64_t bInt = db.IntegerSignificand();
+    const int bExp = db.IntegerExponent();
+    const int hExp = bExp - 1;
+
+    int dS_Exp2 = 0, dS_Exp5 = 0, bS_Exp2 = 0, bS_Exp5 = 0, hS_Exp2 = 0, hS_Exp5 = 0;
+
+    // Adjust for decimal exponent
+    if (dExp >= 0) {
+        dS_Exp2 += dExp;
+        dS_Exp5 += dExp;
+    }
+    else {
+        bS_Exp2 -= dExp;
+        bS_Exp5 -= dExp;
+        hS_Exp2 -= dExp;
+        hS_Exp5 -= dExp;
+    }
+
+    // Adjust for binary exponent
+    if (bExp >= 0)
+        bS_Exp2 += bExp;
+    else {
+        dS_Exp2 -= bExp;
+        hS_Exp2 -= bExp;
+    }
+
+    // Adjust for half ulp exponent
+    if (hExp >= 0)
+        hS_Exp2 += hExp;
+    else {
+        dS_Exp2 -= hExp;
+        bS_Exp2 -= hExp;
+    }
+
+    // Remove common power of two factor from all three scaled values
+    int common_Exp2 = Min3(dS_Exp2, bS_Exp2, hS_Exp2);
+    dS_Exp2 -= common_Exp2;
+    bS_Exp2 -= common_Exp2;
+    hS_Exp2 -= common_Exp2;
+
+    BigInteger dS = d;
+    dS.MultiplyPow5(dS_Exp5) <<= dS_Exp2;
+
+    BigInteger bS(bInt);
+    bS.MultiplyPow5(bS_Exp5) <<= bS_Exp2;
+
+    BigInteger hS(1);
+    hS.MultiplyPow5(hS_Exp5) <<= hS_Exp2;
+
+    BigInteger delta(0);
+    dS.Difference(bS, &delta);
+
+    return delta.Compare(hS);
+}
+
+inline bool StrtodFast(double d, int p, double* result) {
+    // Use fast path for string-to-double conversion if possible
+    // see http://www.exploringbinary.com/fast-path-decimal-to-floating-point-conversion/
+    if (p > 22  && p < 22 + 16) {
+        // Fast Path Cases In Disguise
+        d *= internal::Pow10(p - 22);
+        p = 22;
+    }
+
+    if (p >= -22 && p <= 22 && d <= 9007199254740991.0) { // 2^53 - 1
+        *result = FastPath(d, p);
+        return true;
+    }
+    else
+        return false;
+}
+
+// Compute an approximation and see if it is within 1/2 ULP
+inline bool StrtodDiyFp(const char* decimals, size_t length, size_t decimalPosition, int exp, double* result) {
+    uint64_t significand = 0;
+    size_t i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
+    for (; i < length; i++) {
+        if (significand  >  RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) ||
+            (significand == RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > '5'))
+            break;
+        significand = significand * 10 + (decimals[i] - '0');
+    }
+    
+    if (i < length && decimals[i] >= '5') // Rounding
+        significand++;
+
+    size_t remaining = length - i;
+    const unsigned kUlpShift = 3;
+    const unsigned kUlp = 1 << kUlpShift;
+    int error = (remaining == 0) ? 0 : kUlp / 2;
+
+    DiyFp v(significand, 0);
+    v = v.Normalize();
+    error <<= -v.e;
+
+    const int dExp = (int)decimalPosition - (int)i + exp;
+
+    int actualExp;
+    DiyFp cachedPower = GetCachedPower10(dExp, &actualExp);
+    if (actualExp != dExp) {
+        static const DiyFp kPow10[] = {
+            DiyFp(RAPIDJSON_UINT64_C2(0xa0000000, 00000000), -60),  // 10^1
+            DiyFp(RAPIDJSON_UINT64_C2(0xc8000000, 00000000), -57),  // 10^2
+            DiyFp(RAPIDJSON_UINT64_C2(0xfa000000, 00000000), -54),  // 10^3
+            DiyFp(RAPIDJSON_UINT64_C2(0x9c400000, 00000000), -50),  // 10^4
+            DiyFp(RAPIDJSON_UINT64_C2(0xc3500000, 00000000), -47),  // 10^5
+            DiyFp(RAPIDJSON_UINT64_C2(0xf4240000, 00000000), -44),  // 10^6
+            DiyFp(RAPIDJSON_UINT64_C2(0x98968000, 00000000), -40)   // 10^7
+        };
+        int adjustment = dExp - actualExp - 1;
+        RAPIDJSON_ASSERT(adjustment >= 0 && adjustment < 7);
+        v = v * kPow10[adjustment];
+        if (length + adjustment > 19) // has more digits than decimal digits in 64-bit
+            error += kUlp / 2;
+    }
+
+    v = v * cachedPower;
+
+    error += kUlp + (error == 0 ? 0 : 1);
+
+    const int oldExp = v.e;
+    v = v.Normalize();
+    error <<= oldExp - v.e;
+
+    const unsigned effectiveSignificandSize = Double::EffectiveSignificandSize(64 + v.e);
+    unsigned precisionSize = 64 - effectiveSignificandSize;
+    if (precisionSize + kUlpShift >= 64) {
+        unsigned scaleExp = (precisionSize + kUlpShift) - 63;
+        v.f >>= scaleExp;
+        v.e += scaleExp; 
+        error = (error >> scaleExp) + 1 + kUlp;
+        precisionSize -= scaleExp;
+    }
+
+    DiyFp rounded(v.f >> precisionSize, v.e + precisionSize);
+    const uint64_t precisionBits = (v.f & ((uint64_t(1) << precisionSize) - 1)) * kUlp;
+    const uint64_t halfWay = (uint64_t(1) << (precisionSize - 1)) * kUlp;
+    if (precisionBits >= halfWay + error)
+        rounded.f++;
+
+    *result = rounded.ToDouble();
+
+    return halfWay - error >= precisionBits || precisionBits >= halfWay + error;
+}
+
+inline double StrtodBigInteger(double approx, const char* decimals, size_t length, size_t decimalPosition, int exp) {
+    const BigInteger dInt(decimals, length);
+    const int dExp = (int)decimalPosition - (int)length + exp;
+    Double a(approx);
+    int cmp = CheckWithinHalfULP(a.Value(), dInt, dExp);
+    if (cmp < 0)
+        return a.Value();  // within half ULP
+    else if (cmp == 0) {
+        // Round towards even
+        if (a.Significand() & 1)
+            return a.NextPositiveDouble();
+        else
+            return a.Value();
+    }
+    else // adjustment
+        return a.NextPositiveDouble();
+}
+
+inline double StrtodFullPrecision(double d, int p, const char* decimals, size_t length, size_t decimalPosition, int exp) {
+    RAPIDJSON_ASSERT(d >= 0.0);
+    RAPIDJSON_ASSERT(length >= 1);
+
+    double result;
+    if (StrtodFast(d, p, &result))
+        return result;
+
+    // Trim leading zeros
+    while (*decimals == '0' && length > 1) {
+        length--;
+        decimals++;
+        decimalPosition--;
+    }
+
+    // Trim trailing zeros
+    while (decimals[length - 1] == '0' && length > 1) {
+        length--;
+        decimalPosition--;
+        exp++;
+    }
+
+    // Trim right-most digits
+    const int kMaxDecimalDigit = 780;
+    if ((int)length > kMaxDecimalDigit) {
+        int delta = (int(length) - kMaxDecimalDigit);
+        exp += delta;
+        decimalPosition -= delta;
+        length = kMaxDecimalDigit;
+    }
+
+    // If too small, underflow to zero
+    if (int(length) + exp < -324)
+        return 0.0;
+
+    if (StrtodDiyFp(decimals, length, decimalPosition, exp, &result))
+        return result;
+
+    // Use approximation from StrtodDiyFp and make adjustment with BigInteger comparison
+    return StrtodBigInteger(result, decimals, length, decimalPosition, exp);
+}
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_STRTOD_

libs/rapidjson/license.txt

@@ -0,0 +1,57 @@
+Tencent is pleased to support the open source community by making RapidJSON available. 
+ 
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
+
+If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
+If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON.
+A copy of the MIT License is included in this file.
+
+Other dependencies and licenses:
+
+Open Source Software Licensed Under the BSD License:
+--------------------------------------------------------------------
+
+The msinttypes r29 
+Copyright (c) 2006-2013 Alexander Chemeris 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Open Source Software Licensed Under the JSON License:
+--------------------------------------------------------------------
+
+json.org 
+Copyright (c) 2002 JSON.org
+All Rights Reserved.
+
+JSON_checker
+Copyright (c) 2002 JSON.org
+All Rights Reserved.
+
+	
+Terms of the JSON License:
+---------------------------------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Terms of the MIT License:
+--------------------------------------------------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

libs/rapidjson/memorybuffer.h

@@ -0,0 +1,70 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_MEMORYBUFFER_H_
+#define RAPIDJSON_MEMORYBUFFER_H_
+
+#include "rapidjson.h"
+#include "internal/stack.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Represents an in-memory output byte stream.
+/*!
+    This class is mainly for being wrapped by EncodedOutputStream or AutoUTFOutputStream.
+
+    It is similar to FileWriteBuffer but the destination is an in-memory buffer instead of a file.
+
+    Differences between MemoryBuffer and StringBuffer:
+    1. StringBuffer has Encoding but MemoryBuffer is only a byte buffer. 
+    2. StringBuffer::GetString() returns a null-terminated string. MemoryBuffer::GetBuffer() returns a buffer without terminator.
+
+    \tparam Allocator type for allocating memory buffer.
+    \note implements Stream concept
+*/
+template <typename Allocator = CrtAllocator>
+struct GenericMemoryBuffer {
+    typedef char Ch; // byte
+
+    GenericMemoryBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
+
+    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
+    void Flush() {}
+
+    void Clear() { stack_.Clear(); }
+    void ShrinkToFit() { stack_.ShrinkToFit(); }
+    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
+    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
+
+    const Ch* GetBuffer() const {
+        return stack_.template Bottom<Ch>();
+    }
+
+    size_t GetSize() const { return stack_.GetSize(); }
+
+    static const size_t kDefaultCapacity = 256;
+    mutable internal::Stack<Allocator> stack_;
+};
+
+typedef GenericMemoryBuffer<> MemoryBuffer;
+
+//! Implement specialized version of PutN() with memset() for better performance.
+template<>
+inline void PutN(MemoryBuffer& memoryBuffer, char c, size_t n) {
+    std::memset(memoryBuffer.stack_.Push<char>(n), c, n * sizeof(c));
+}
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_MEMORYBUFFER_H_

libs/rapidjson/memorystream.h

@@ -0,0 +1,61 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_MEMORYSTREAM_H_
+#define RAPIDJSON_MEMORYSTREAM_H_
+
+#include "rapidjson.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Represents an in-memory input byte stream.
+/*!
+    This class is mainly for being wrapped by EncodedInputStream or AutoUTFInputStream.
+
+    It is similar to FileReadBuffer but the source is an in-memory buffer instead of a file.
+
+    Differences between MemoryStream and StringStream:
+    1. StringStream has encoding but MemoryStream is a byte stream.
+    2. MemoryStream needs size of the source buffer and the buffer don't need to be null terminated. StringStream assume null-terminated string as source.
+    3. MemoryStream supports Peek4() for encoding detection. StringStream is specified with an encoding so it should not have Peek4().
+    \note implements Stream concept
+*/
+struct MemoryStream {
+    typedef char Ch; // byte
+
+    MemoryStream(const Ch *src, size_t size) : src_(src), begin_(src), end_(src + size), size_(size) {}
+
+    Ch Peek() const { return (src_ == end_) ? '\0' : *src_; }
+    Ch Take() { return (src_ == end_) ? '\0' : *src_++; }
+    size_t Tell() const { return static_cast<size_t>(src_ - begin_); }
+
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+    // For encoding detection only.
+    const Ch* Peek4() const {
+        return Tell() + 4 <= size_ ? src_ : 0;
+    }
+
+    const Ch* src_;     //!< Current read position.
+    const Ch* begin_;   //!< Original head of the string.
+    const Ch* end_;     //!< End of stream.
+    size_t size_;       //!< Size of the stream.
+};
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_MEMORYBUFFER_H_

libs/rapidjson/msinttypes/inttypes.h

@@ -0,0 +1,316 @@
+// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2013 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. Neither the name of the product nor the names of its contributors may
+//      be used to endorse or promote products derived from this software
+//      without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+// The above software in this distribution may have been modified by 
+// THL A29 Limited ("Tencent Modifications"). 
+// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_INTTYPES_H_ // [
+#define _MSC_INTTYPES_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include "stdint.h"
+
+// miloyip: VC supports inttypes.h since VC2013
+#if _MSC_VER >= 1800
+#include <inttypes.h>
+#else
+
+// 7.8 Format conversion of integer types
+
+typedef struct {
+   intmax_t quot;
+   intmax_t rem;
+} imaxdiv_t;
+
+// 7.8.1 Macros for format specifiers
+
+#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
+
+// The fprintf macros for signed integers are:
+#define PRId8       "d"
+#define PRIi8       "i"
+#define PRIdLEAST8  "d"
+#define PRIiLEAST8  "i"
+#define PRIdFAST8   "d"
+#define PRIiFAST8   "i"
+
+#define PRId16       "hd"
+#define PRIi16       "hi"
+#define PRIdLEAST16  "hd"
+#define PRIiLEAST16  "hi"
+#define PRIdFAST16   "hd"
+#define PRIiFAST16   "hi"
+
+#define PRId32       "I32d"
+#define PRIi32       "I32i"
+#define PRIdLEAST32  "I32d"
+#define PRIiLEAST32  "I32i"
+#define PRIdFAST32   "I32d"
+#define PRIiFAST32   "I32i"
+
+#define PRId64       "I64d"
+#define PRIi64       "I64i"
+#define PRIdLEAST64  "I64d"
+#define PRIiLEAST64  "I64i"
+#define PRIdFAST64   "I64d"
+#define PRIiFAST64   "I64i"
+
+#define PRIdMAX     "I64d"
+#define PRIiMAX     "I64i"
+
+#define PRIdPTR     "Id"
+#define PRIiPTR     "Ii"
+
+// The fprintf macros for unsigned integers are:
+#define PRIo8       "o"
+#define PRIu8       "u"
+#define PRIx8       "x"
+#define PRIX8       "X"
+#define PRIoLEAST8  "o"
+#define PRIuLEAST8  "u"
+#define PRIxLEAST8  "x"
+#define PRIXLEAST8  "X"
+#define PRIoFAST8   "o"
+#define PRIuFAST8   "u"
+#define PRIxFAST8   "x"
+#define PRIXFAST8   "X"
+
+#define PRIo16       "ho"
+#define PRIu16       "hu"
+#define PRIx16       "hx"
+#define PRIX16       "hX"
+#define PRIoLEAST16  "ho"
+#define PRIuLEAST16  "hu"
+#define PRIxLEAST16  "hx"
+#define PRIXLEAST16  "hX"
+#define PRIoFAST16   "ho"
+#define PRIuFAST16   "hu"
+#define PRIxFAST16   "hx"
+#define PRIXFAST16   "hX"
+
+#define PRIo32       "I32o"
+#define PRIu32       "I32u"
+#define PRIx32       "I32x"
+#define PRIX32       "I32X"
+#define PRIoLEAST32  "I32o"
+#define PRIuLEAST32  "I32u"
+#define PRIxLEAST32  "I32x"
+#define PRIXLEAST32  "I32X"
+#define PRIoFAST32   "I32o"
+#define PRIuFAST32   "I32u"
+#define PRIxFAST32   "I32x"
+#define PRIXFAST32   "I32X"
+
+#define PRIo64       "I64o"
+#define PRIu64       "I64u"
+#define PRIx64       "I64x"
+#define PRIX64       "I64X"
+#define PRIoLEAST64  "I64o"
+#define PRIuLEAST64  "I64u"
+#define PRIxLEAST64  "I64x"
+#define PRIXLEAST64  "I64X"
+#define PRIoFAST64   "I64o"
+#define PRIuFAST64   "I64u"
+#define PRIxFAST64   "I64x"
+#define PRIXFAST64   "I64X"
+
+#define PRIoMAX     "I64o"
+#define PRIuMAX     "I64u"
+#define PRIxMAX     "I64x"
+#define PRIXMAX     "I64X"
+
+#define PRIoPTR     "Io"
+#define PRIuPTR     "Iu"
+#define PRIxPTR     "Ix"
+#define PRIXPTR     "IX"
+
+// The fscanf macros for signed integers are:
+#define SCNd8       "d"
+#define SCNi8       "i"
+#define SCNdLEAST8  "d"
+#define SCNiLEAST8  "i"
+#define SCNdFAST8   "d"
+#define SCNiFAST8   "i"
+
+#define SCNd16       "hd"
+#define SCNi16       "hi"
+#define SCNdLEAST16  "hd"
+#define SCNiLEAST16  "hi"
+#define SCNdFAST16   "hd"
+#define SCNiFAST16   "hi"
+
+#define SCNd32       "ld"
+#define SCNi32       "li"
+#define SCNdLEAST32  "ld"
+#define SCNiLEAST32  "li"
+#define SCNdFAST32   "ld"
+#define SCNiFAST32   "li"
+
+#define SCNd64       "I64d"
+#define SCNi64       "I64i"
+#define SCNdLEAST64  "I64d"
+#define SCNiLEAST64  "I64i"
+#define SCNdFAST64   "I64d"
+#define SCNiFAST64   "I64i"
+
+#define SCNdMAX     "I64d"
+#define SCNiMAX     "I64i"
+
+#ifdef _WIN64 // [
+#  define SCNdPTR     "I64d"
+#  define SCNiPTR     "I64i"
+#else  // _WIN64 ][
+#  define SCNdPTR     "ld"
+#  define SCNiPTR     "li"
+#endif  // _WIN64 ]
+
+// The fscanf macros for unsigned integers are:
+#define SCNo8       "o"
+#define SCNu8       "u"
+#define SCNx8       "x"
+#define SCNX8       "X"
+#define SCNoLEAST8  "o"
+#define SCNuLEAST8  "u"
+#define SCNxLEAST8  "x"
+#define SCNXLEAST8  "X"
+#define SCNoFAST8   "o"
+#define SCNuFAST8   "u"
+#define SCNxFAST8   "x"
+#define SCNXFAST8   "X"
+
+#define SCNo16       "ho"
+#define SCNu16       "hu"
+#define SCNx16       "hx"
+#define SCNX16       "hX"
+#define SCNoLEAST16  "ho"
+#define SCNuLEAST16  "hu"
+#define SCNxLEAST16  "hx"
+#define SCNXLEAST16  "hX"
+#define SCNoFAST16   "ho"
+#define SCNuFAST16   "hu"
+#define SCNxFAST16   "hx"
+#define SCNXFAST16   "hX"
+
+#define SCNo32       "lo"
+#define SCNu32       "lu"
+#define SCNx32       "lx"
+#define SCNX32       "lX"
+#define SCNoLEAST32  "lo"
+#define SCNuLEAST32  "lu"
+#define SCNxLEAST32  "lx"
+#define SCNXLEAST32  "lX"
+#define SCNoFAST32   "lo"
+#define SCNuFAST32   "lu"
+#define SCNxFAST32   "lx"
+#define SCNXFAST32   "lX"
+
+#define SCNo64       "I64o"
+#define SCNu64       "I64u"
+#define SCNx64       "I64x"
+#define SCNX64       "I64X"
+#define SCNoLEAST64  "I64o"
+#define SCNuLEAST64  "I64u"
+#define SCNxLEAST64  "I64x"
+#define SCNXLEAST64  "I64X"
+#define SCNoFAST64   "I64o"
+#define SCNuFAST64   "I64u"
+#define SCNxFAST64   "I64x"
+#define SCNXFAST64   "I64X"
+
+#define SCNoMAX     "I64o"
+#define SCNuMAX     "I64u"
+#define SCNxMAX     "I64x"
+#define SCNXMAX     "I64X"
+
+#ifdef _WIN64 // [
+#  define SCNoPTR     "I64o"
+#  define SCNuPTR     "I64u"
+#  define SCNxPTR     "I64x"
+#  define SCNXPTR     "I64X"
+#else  // _WIN64 ][
+#  define SCNoPTR     "lo"
+#  define SCNuPTR     "lu"
+#  define SCNxPTR     "lx"
+#  define SCNXPTR     "lX"
+#endif  // _WIN64 ]
+
+#endif // __STDC_FORMAT_MACROS ]
+
+// 7.8.2 Functions for greatest-width integer types
+
+// 7.8.2.1 The imaxabs function
+#define imaxabs _abs64
+
+// 7.8.2.2 The imaxdiv function
+
+// This is modified version of div() function from Microsoft's div.c found
+// in %MSVC.NET%\crt\src\div.c
+#ifdef STATIC_IMAXDIV // [
+static
+#else // STATIC_IMAXDIV ][
+_inline
+#endif // STATIC_IMAXDIV ]
+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
+{
+   imaxdiv_t result;
+
+   result.quot = numer / denom;
+   result.rem = numer % denom;
+
+   if (numer < 0 && result.rem > 0) {
+      // did division wrong; must fix up
+      ++result.quot;
+      result.rem -= denom;
+   }
+
+   return result;
+}
+
+// 7.8.2.3 The strtoimax and strtoumax functions
+#define strtoimax _strtoi64
+#define strtoumax _strtoui64
+
+// 7.8.2.4 The wcstoimax and wcstoumax functions
+#define wcstoimax _wcstoi64
+#define wcstoumax _wcstoui64
+
+#endif // _MSC_VER >= 1800
+
+#endif // _MSC_INTTYPES_H_ ]

libs/rapidjson/msinttypes/stdint.h

@@ -0,0 +1,300 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2013 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. Neither the name of the product nor the names of its contributors may
+//      be used to endorse or promote products derived from this software
+//      without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+// The above software in this distribution may have been modified by 
+// THL A29 Limited ("Tencent Modifications"). 
+// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+// miloyip: Originally Visual Studio 2010 uses its own stdint.h. However it generates warning with INT64_C(), so change to use this file for vs2010.
+#if _MSC_VER >= 1600 // [
+#include <stdint.h>
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+#undef INT8_C
+#undef INT16_C
+#undef INT32_C
+#undef INT64_C
+#undef UINT8_C
+#undef UINT16_C
+#undef UINT32_C
+#undef UINT64_C
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
+// Check out Issue 9 for the details.
+#ifndef INTMAX_C //   [
+#  define INTMAX_C   INT64_C
+#endif // INTMAX_C    ]
+#ifndef UINTMAX_C //  [
+#  define UINTMAX_C  UINT64_C
+#endif // UINTMAX_C   ]
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+#else // ] _MSC_VER >= 1700 [
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
+// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#ifdef __cplusplus
+extern "C" {
+#endif
+#  include <wchar.h>
+#ifdef __cplusplus
+}
+#endif
+
+// Define _W64 macros to mark types changing their size, like intptr_t.
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+
+// Visual Studio 6 and Embedded Visual C++ 4 doesn't
+// realize that, e.g. char has the same size as __int8
+// so we give up on __intX for them.
+#if (_MSC_VER < 1300)
+   typedef signed char       int8_t;
+   typedef signed short      int16_t;
+   typedef signed int        int32_t;
+   typedef unsigned char     uint8_t;
+   typedef unsigned short    uint16_t;
+   typedef unsigned int      uint32_t;
+#else
+   typedef signed __int8     int8_t;
+   typedef signed __int16    int16_t;
+   typedef signed __int32    int32_t;
+   typedef unsigned __int8   uint8_t;
+   typedef unsigned __int16  uint16_t;
+   typedef unsigned __int32  uint32_t;
+#endif
+typedef signed __int64       int64_t;
+typedef unsigned __int64     uint64_t;
+
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef signed __int64    intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef _W64 signed int   intptr_t;
+   typedef _W64 unsigned int uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
+// Check out Issue 9 for the details.
+#ifndef INTMAX_C //   [
+#  define INTMAX_C   INT64_C
+#endif // INTMAX_C    ]
+#ifndef UINTMAX_C //  [
+#  define UINTMAX_C  UINT64_C
+#endif // UINTMAX_C   ]
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+#endif // _MSC_VER >= 1600 ]
+
+#endif // _MSC_STDINT_H_ ]

libs/rapidjson/prettywriter.h

@@ -0,0 +1,207 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_PRETTYWRITER_H_
+#define RAPIDJSON_PRETTYWRITER_H_
+
+#include "writer.h"
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Writer with indentation and spacing.
+/*!
+    \tparam OutputStream Type of ouptut os.
+    \tparam SourceEncoding Encoding of source string.
+    \tparam TargetEncoding Encoding of output stream.
+    \tparam StackAllocator Type of allocator for allocating memory of stack.
+*/
+template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator>
+class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> {
+public:
+    typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;
+    typedef typename Base::Ch Ch;
+
+    //! Constructor
+    /*! \param os Output stream.
+        \param allocator User supplied allocator. If it is null, it will create a private one.
+        \param levelDepth Initial capacity of stack.
+    */
+    PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
+        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
+
+    //! Set custom indentation.
+    /*! \param indentChar       Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
+        \param indentCharCount  Number of indent characters for each indentation level.
+        \note The default indentation is 4 spaces.
+    */
+    PrettyWriter& SetIndent(Ch indentChar, unsigned indentCharCount) {
+        RAPIDJSON_ASSERT(indentChar == ' ' || indentChar == '\t' || indentChar == '\n' || indentChar == '\r');
+        indentChar_ = indentChar;
+        indentCharCount_ = indentCharCount;
+        return *this;
+    }
+
+    /*! @name Implementation of Handler
+        \see Handler
+    */
+    //@{
+
+    bool Null()                 { PrettyPrefix(kNullType);   return Base::WriteNull(); }
+    bool Bool(bool b)           { PrettyPrefix(b ? kTrueType : kFalseType); return Base::WriteBool(b); }
+    bool Int(int i)             { PrettyPrefix(kNumberType); return Base::WriteInt(i); }
+    bool Uint(unsigned u)       { PrettyPrefix(kNumberType); return Base::WriteUint(u); }
+    bool Int64(int64_t i64)     { PrettyPrefix(kNumberType); return Base::WriteInt64(i64); }
+    bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::WriteUint64(u64);  }
+    bool Double(double d)       { PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
+
+    bool String(const Ch* str, SizeType length, bool copy = false) {
+        (void)copy;
+        PrettyPrefix(kStringType);
+        return Base::WriteString(str, length);
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    bool String(const std::basic_string<Ch>& str) {
+        return String(str.data(), SizeType(str.size()));
+    }
+#endif
+
+    bool StartObject() {
+        PrettyPrefix(kObjectType);
+        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(false);
+        return Base::WriteStartObject();
+    }
+
+    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
+	
+    bool EndObject(SizeType memberCount = 0) {
+        (void)memberCount;
+        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
+        RAPIDJSON_ASSERT(!Base::level_stack_.template Top<typename Base::Level>()->inArray);
+        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
+
+        if (!empty) {
+            Base::os_->Put('\n');
+            WriteIndent();
+        }
+        bool ret = Base::WriteEndObject();
+        (void)ret;
+        RAPIDJSON_ASSERT(ret == true);
+        if (Base::level_stack_.Empty()) // end of json text
+            Base::os_->Flush();
+        return true;
+    }
+
+    bool StartArray() {
+        PrettyPrefix(kArrayType);
+        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(true);
+        return Base::WriteStartArray();
+    }
+
+    bool EndArray(SizeType memberCount = 0) {
+        (void)memberCount;
+        RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
+        RAPIDJSON_ASSERT(Base::level_stack_.template Top<typename Base::Level>()->inArray);
+        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
+
+        if (!empty) {
+            Base::os_->Put('\n');
+            WriteIndent();
+        }
+        bool ret = Base::WriteEndArray();
+        (void)ret;
+        RAPIDJSON_ASSERT(ret == true);
+        if (Base::level_stack_.Empty()) // end of json text
+            Base::os_->Flush();
+        return true;
+    }
+
+    //@}
+
+    /*! @name Convenience extensions */
+    //@{
+
+    //! Simpler but slower overload.
+    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
+    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
+
+    //@}
+protected:
+    void PrettyPrefix(Type type) {
+        (void)type;
+        if (Base::level_stack_.GetSize() != 0) { // this value is not at root
+            typename Base::Level* level = Base::level_stack_.template Top<typename Base::Level>();
+
+            if (level->inArray) {
+                if (level->valueCount > 0) {
+                    Base::os_->Put(','); // add comma if it is not the first element in array
+                    Base::os_->Put('\n');
+                }
+                else
+                    Base::os_->Put('\n');
+                WriteIndent();
+            }
+            else {  // in object
+                if (level->valueCount > 0) {
+                    if (level->valueCount % 2 == 0) {
+                        Base::os_->Put(',');
+                        Base::os_->Put('\n');
+                    }
+                    else {
+                        Base::os_->Put(':');
+                        Base::os_->Put(' ');
+                    }
+                }
+                else
+                    Base::os_->Put('\n');
+
+                if (level->valueCount % 2 == 0)
+                    WriteIndent();
+            }
+            if (!level->inArray && level->valueCount % 2 == 0)
+                RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
+            level->valueCount++;
+        }
+        else {
+            RAPIDJSON_ASSERT(!Base::hasRoot_);  // Should only has one and only one root.
+            Base::hasRoot_ = true;
+        }
+    }
+
+    void WriteIndent()  {
+        size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;
+        PutN(*Base::os_, indentChar_, count);
+    }
+
+    Ch indentChar_;
+    unsigned indentCharCount_;
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    PrettyWriter(const PrettyWriter&);
+    PrettyWriter& operator=(const PrettyWriter&);
+};
+
+RAPIDJSON_NAMESPACE_END
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_RAPIDJSON_H_

libs/rapidjson/rapidjson.h

@@ -0,0 +1,620 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_RAPIDJSON_H_
+#define RAPIDJSON_RAPIDJSON_H_
+
+/*!\file rapidjson.h
+    \brief common definitions and configuration
+
+    \see RAPIDJSON_CONFIG
+ */
+
+/*! \defgroup RAPIDJSON_CONFIG RapidJSON configuration
+    \brief Configuration macros for library features
+
+    Some RapidJSON features are configurable to adapt the library to a wide
+    variety of platforms, environments and usage scenarios.  Most of the
+    features can be configured in terms of overriden or predefined
+    preprocessor macros at compile-time.
+
+    Some additional customization is available in the \ref RAPIDJSON_ERRORS APIs.
+
+    \note These macros should be given on the compiler command-line
+          (where applicable)  to avoid inconsistent values when compiling
+          different translation units of a single application.
+ */
+
+#include <cstdlib>  // malloc(), realloc(), free(), size_t
+#include <cstring>  // memset(), memcpy(), memmove(), memcmp()
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_NAMESPACE_(BEGIN|END)
+/*! \def RAPIDJSON_NAMESPACE
+    \ingroup RAPIDJSON_CONFIG
+    \brief   provide custom rapidjson namespace
+
+    In order to avoid symbol clashes and/or "One Definition Rule" errors
+    between multiple inclusions of (different versions of) RapidJSON in
+    a single binary, users can customize the name of the main RapidJSON
+    namespace.
+
+    In case of a single nesting level, defining \c RAPIDJSON_NAMESPACE
+    to a custom name (e.g. \c MyRapidJSON) is sufficient.  If multiple
+    levels are needed, both \ref RAPIDJSON_NAMESPACE_BEGIN and \ref
+    RAPIDJSON_NAMESPACE_END need to be defined as well:
+
+    \code
+    // in some .cpp file
+    #define RAPIDJSON_NAMESPACE my::rapidjson
+    #define RAPIDJSON_NAMESPACE_BEGIN namespace my { namespace rapidjson {
+    #define RAPIDJSON_NAMESPACE_END   } }
+    #include "rapidjson/..."
+    \endcode
+
+    \see rapidjson
+ */
+/*! \def RAPIDJSON_NAMESPACE_BEGIN
+    \ingroup RAPIDJSON_CONFIG
+    \brief   provide custom rapidjson namespace (opening expression)
+    \see RAPIDJSON_NAMESPACE
+*/
+/*! \def RAPIDJSON_NAMESPACE_END
+    \ingroup RAPIDJSON_CONFIG
+    \brief   provide custom rapidjson namespace (closing expression)
+    \see RAPIDJSON_NAMESPACE
+*/
+#ifndef RAPIDJSON_NAMESPACE
+#define RAPIDJSON_NAMESPACE rapidjson
+#endif
+#ifndef RAPIDJSON_NAMESPACE_BEGIN
+#define RAPIDJSON_NAMESPACE_BEGIN namespace RAPIDJSON_NAMESPACE {
+#endif
+#ifndef RAPIDJSON_NAMESPACE_END
+#define RAPIDJSON_NAMESPACE_END }
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_NO_INT64DEFINE
+
+/*! \def RAPIDJSON_NO_INT64DEFINE
+    \ingroup RAPIDJSON_CONFIG
+    \brief Use external 64-bit integer types.
+
+    RapidJSON requires the 64-bit integer types \c int64_t and  \c uint64_t types
+    to be available at global scope.
+
+    If users have their own definition, define RAPIDJSON_NO_INT64DEFINE to
+    prevent RapidJSON from defining its own types.
+*/
+#ifndef RAPIDJSON_NO_INT64DEFINE
+//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
+#ifdef _MSC_VER
+#include "msinttypes/stdint.h"
+#include "msinttypes/inttypes.h"
+#else
+// Other compilers should have this.
+#include <stdint.h>
+#include <inttypes.h>
+#endif
+//!@endcond
+#ifdef RAPIDJSON_DOXYGEN_RUNNING
+#define RAPIDJSON_NO_INT64DEFINE
+#endif
+#endif // RAPIDJSON_NO_INT64TYPEDEF
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_FORCEINLINE
+
+#ifndef RAPIDJSON_FORCEINLINE
+//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
+#if defined(_MSC_VER) && !defined(NDEBUG)
+#define RAPIDJSON_FORCEINLINE __forceinline
+#elif defined(__GNUC__) && __GNUC__ >= 4 && !defined(NDEBUG)
+#define RAPIDJSON_FORCEINLINE __attribute__((always_inline))
+#else
+#define RAPIDJSON_FORCEINLINE
+#endif
+//!@endcond
+#endif // RAPIDJSON_FORCEINLINE
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_ENDIAN
+#define RAPIDJSON_LITTLEENDIAN  0   //!< Little endian machine
+#define RAPIDJSON_BIGENDIAN     1   //!< Big endian machine
+
+//! Endianness of the machine.
+/*!
+    \def RAPIDJSON_ENDIAN
+    \ingroup RAPIDJSON_CONFIG
+
+    GCC 4.6 provided macro for detecting endianness of the target machine. But other
+    compilers may not have this. User can define RAPIDJSON_ENDIAN to either
+    \ref RAPIDJSON_LITTLEENDIAN or \ref RAPIDJSON_BIGENDIAN.
+
+    Default detection implemented with reference to
+    \li https://gcc.gnu.org/onlinedocs/gcc-4.6.0/cpp/Common-Predefined-Macros.html
+    \li http://www.boost.org/doc/libs/1_42_0/boost/detail/endian.hpp
+*/
+#ifndef RAPIDJSON_ENDIAN
+// Detect with GCC 4.6's macro
+#  ifdef __BYTE_ORDER__
+#    if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
+#    elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
+#    else
+#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
+#    endif // __BYTE_ORDER__
+// Detect with GLIBC's endian.h
+#  elif defined(__GLIBC__)
+#    include <endian.h>
+#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#      define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
+#    elif (__BYTE_ORDER == __BIG_ENDIAN)
+#      define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
+#    else
+#      error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.
+#   endif // __GLIBC__
+// Detect with _LITTLE_ENDIAN and _BIG_ENDIAN macro
+#  elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
+#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
+#  elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
+#    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
+// Detect with architecture macros
+#  elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
+#    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
+#  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
+#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
+#  elif defined(RAPIDJSON_DOXYGEN_RUNNING)
+#    define RAPIDJSON_ENDIAN
+#  else
+#    error Unknown machine endianess detected. User needs to define RAPIDJSON_ENDIAN.   
+#  endif
+#endif // RAPIDJSON_ENDIAN
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_64BIT
+
+//! Whether using 64-bit architecture
+#ifndef RAPIDJSON_64BIT
+#if defined(__LP64__) || defined(_WIN64)
+#define RAPIDJSON_64BIT 1
+#else
+#define RAPIDJSON_64BIT 0
+#endif
+#endif // RAPIDJSON_64BIT
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_ALIGN
+
+//! Data alignment of the machine.
+/*! \ingroup RAPIDJSON_CONFIG
+    \param x pointer to align
+
+    Some machines require strict data alignment. Currently the default uses 4 bytes
+    alignment. User can customize by defining the RAPIDJSON_ALIGN function macro.,
+*/
+#ifndef RAPIDJSON_ALIGN
+#define RAPIDJSON_ALIGN(x) ((x + 3u) & ~3u)
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_UINT64_C2
+
+//! Construct a 64-bit literal by a pair of 32-bit integer.
+/*!
+    64-bit literal with or without ULL suffix is prone to compiler warnings.
+    UINT64_C() is C macro which cause compilation problems.
+    Use this macro to define 64-bit constants by a pair of 32-bit integer.
+*/
+#ifndef RAPIDJSON_UINT64_C2
+#define RAPIDJSON_UINT64_C2(high32, low32) ((static_cast<uint64_t>(high32) << 32) | static_cast<uint64_t>(low32))
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_SSE2/RAPIDJSON_SSE42/RAPIDJSON_SIMD
+
+/*! \def RAPIDJSON_SIMD
+    \ingroup RAPIDJSON_CONFIG
+    \brief Enable SSE2/SSE4.2 optimization.
+
+    RapidJSON supports optimized implementations for some parsing operations
+    based on the SSE2 or SSE4.2 SIMD extensions on modern Intel-compatible
+    processors.
+
+    To enable these optimizations, two different symbols can be defined;
+    \code
+    // Enable SSE2 optimization.
+    #define RAPIDJSON_SSE2
+
+    // Enable SSE4.2 optimization.
+    #define RAPIDJSON_SSE42
+    \endcode
+
+    \c RAPIDJSON_SSE42 takes precedence, if both are defined.
+
+    If any of these symbols is defined, RapidJSON defines the macro
+    \c RAPIDJSON_SIMD to indicate the availability of the optimized code.
+*/
+#if defined(RAPIDJSON_SSE2) || defined(RAPIDJSON_SSE42) \
+    || defined(RAPIDJSON_DOXYGEN_RUNNING)
+#define RAPIDJSON_SIMD
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_NO_SIZETYPEDEFINE
+
+#ifndef RAPIDJSON_NO_SIZETYPEDEFINE
+/*! \def RAPIDJSON_NO_SIZETYPEDEFINE
+    \ingroup RAPIDJSON_CONFIG
+    \brief User-provided \c SizeType definition.
+
+    In order to avoid using 32-bit size types for indexing strings and arrays,
+    define this preprocessor symbol and provide the type rapidjson::SizeType
+    before including RapidJSON:
+    \code
+    #define RAPIDJSON_NO_SIZETYPEDEFINE
+    namespace rapidjson { typedef ::std::size_t SizeType; }
+    #include "rapidjson/..."
+    \endcode
+
+    \see rapidjson::SizeType
+*/
+#ifdef RAPIDJSON_DOXYGEN_RUNNING
+#define RAPIDJSON_NO_SIZETYPEDEFINE
+#endif
+RAPIDJSON_NAMESPACE_BEGIN
+//! Size type (for string lengths, array sizes, etc.)
+/*! RapidJSON uses 32-bit array/string indices even on 64-bit platforms,
+    instead of using \c size_t. Users may override the SizeType by defining
+    \ref RAPIDJSON_NO_SIZETYPEDEFINE.
+*/
+typedef unsigned SizeType;
+RAPIDJSON_NAMESPACE_END
+#endif
+
+// always import std::size_t to rapidjson namespace
+RAPIDJSON_NAMESPACE_BEGIN
+using std::size_t;
+RAPIDJSON_NAMESPACE_END
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_ASSERT
+
+//! Assertion.
+/*! \ingroup RAPIDJSON_CONFIG
+    By default, rapidjson uses C \c assert() for internal assertions.
+    User can override it by defining RAPIDJSON_ASSERT(x) macro.
+
+    \note Parsing errors are handled and can be customized by the
+          \ref RAPIDJSON_ERRORS APIs.
+*/
+#ifndef RAPIDJSON_ASSERT
+#include <cassert>
+#define RAPIDJSON_ASSERT(x) assert(x)
+#endif // RAPIDJSON_ASSERT
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_STATIC_ASSERT
+
+// Adopt from boost
+#ifndef RAPIDJSON_STATIC_ASSERT
+//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
+RAPIDJSON_NAMESPACE_BEGIN
+template <bool x> struct STATIC_ASSERTION_FAILURE;
+template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
+template<int x> struct StaticAssertTest {};
+RAPIDJSON_NAMESPACE_END
+
+#define RAPIDJSON_JOIN(X, Y) RAPIDJSON_DO_JOIN(X, Y)
+#define RAPIDJSON_DO_JOIN(X, Y) RAPIDJSON_DO_JOIN2(X, Y)
+#define RAPIDJSON_DO_JOIN2(X, Y) X##Y
+
+#if defined(__GNUC__)
+#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
+#else
+#define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE 
+#endif
+//!@endcond
+
+/*! \def RAPIDJSON_STATIC_ASSERT
+    \brief (Internal) macro to check for conditions at compile-time
+    \param x compile-time condition
+    \hideinitializer
+ */
+#define RAPIDJSON_STATIC_ASSERT(x) \
+    typedef ::RAPIDJSON_NAMESPACE::StaticAssertTest< \
+      sizeof(::RAPIDJSON_NAMESPACE::STATIC_ASSERTION_FAILURE<bool(x) >)> \
+    RAPIDJSON_JOIN(StaticAssertTypedef, __LINE__) RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// Helpers
+
+//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
+
+#define RAPIDJSON_MULTILINEMACRO_BEGIN do {  
+#define RAPIDJSON_MULTILINEMACRO_END \
+} while((void)0, 0)
+
+// adopted from Boost
+#define RAPIDJSON_VERSION_CODE(x,y,z) \
+  (((x)*100000) + ((y)*100) + (z))
+
+// token stringification
+#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)
+#define RAPIDJSON_DO_STRINGIFY(x) #x
+
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_DIAG_PUSH/POP, RAPIDJSON_DIAG_OFF
+
+#if defined(__GNUC__)
+#define RAPIDJSON_GNUC \
+    RAPIDJSON_VERSION_CODE(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__)
+#endif
+
+#if defined(__clang__) || (defined(RAPIDJSON_GNUC) && RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,2,0))
+
+#define RAPIDJSON_PRAGMA(x) _Pragma(RAPIDJSON_STRINGIFY(x))
+#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(GCC diagnostic x)
+#define RAPIDJSON_DIAG_OFF(x) \
+    RAPIDJSON_DIAG_PRAGMA(ignored RAPIDJSON_STRINGIFY(RAPIDJSON_JOIN(-W,x)))
+
+// push/pop support in Clang and GCC>=4.6
+#if defined(__clang__) || (defined(RAPIDJSON_GNUC) && RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0))
+#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
+#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
+#else // GCC >= 4.2, < 4.6
+#define RAPIDJSON_DIAG_PUSH /* ignored */
+#define RAPIDJSON_DIAG_POP /* ignored */
+#endif
+
+#elif defined(_MSC_VER)
+
+// pragma (MSVC specific)
+#define RAPIDJSON_PRAGMA(x) __pragma(x)
+#define RAPIDJSON_DIAG_PRAGMA(x) RAPIDJSON_PRAGMA(warning(x))
+
+#define RAPIDJSON_DIAG_OFF(x) RAPIDJSON_DIAG_PRAGMA(disable: x)
+#define RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PRAGMA(push)
+#define RAPIDJSON_DIAG_POP  RAPIDJSON_DIAG_PRAGMA(pop)
+
+#else
+
+#define RAPIDJSON_DIAG_OFF(x) /* ignored */
+#define RAPIDJSON_DIAG_PUSH   /* ignored */
+#define RAPIDJSON_DIAG_POP    /* ignored */
+
+#endif // RAPIDJSON_DIAG_*
+
+///////////////////////////////////////////////////////////////////////////////
+// C++11 features
+
+#ifndef RAPIDJSON_HAS_CXX11_RVALUE_REFS
+#if defined(__clang__)
+#define RAPIDJSON_HAS_CXX11_RVALUE_REFS __has_feature(cxx_rvalue_references) && \
+    (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__) && __GLIBCXX__ >= 20080306)
+#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
+      (defined(_MSC_VER) && _MSC_VER >= 1600)
+
+#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
+#else
+#define RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
+#endif
+#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
+
+#ifndef RAPIDJSON_HAS_CXX11_NOEXCEPT
+#if defined(__clang__)
+#define RAPIDJSON_HAS_CXX11_NOEXCEPT __has_feature(cxx_noexcept)
+#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
+//    (defined(_MSC_VER) && _MSC_VER >= ????) // not yet supported
+#define RAPIDJSON_HAS_CXX11_NOEXCEPT 1
+#else
+#define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
+#endif
+#endif
+#if RAPIDJSON_HAS_CXX11_NOEXCEPT
+#define RAPIDJSON_NOEXCEPT noexcept
+#else
+#define RAPIDJSON_NOEXCEPT /* noexcept */
+#endif // RAPIDJSON_HAS_CXX11_NOEXCEPT
+
+// no automatic detection, yet
+#ifndef RAPIDJSON_HAS_CXX11_TYPETRAITS
+#define RAPIDJSON_HAS_CXX11_TYPETRAITS 0
+#endif
+
+//!@endcond
+
+///////////////////////////////////////////////////////////////////////////////
+// new/delete
+
+#ifndef RAPIDJSON_NEW
+///! customization point for global \c new
+#define RAPIDJSON_NEW(x) new x
+#endif
+#ifndef RAPIDJSON_DELETE
+///! customization point for global \c delete
+#define RAPIDJSON_DELETE(x) delete x
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// Allocators and Encodings
+
+#include "allocators.h"
+#include "encodings.h"
+
+/*! \namespace rapidjson
+    \brief main RapidJSON namespace
+    \see RAPIDJSON_NAMESPACE
+*/
+RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+//  Stream
+
+/*! \class rapidjson::Stream
+    \brief Concept for reading and writing characters.
+
+    For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
+
+    For write-only stream, only need to implement Put() and Flush().
+
+\code
+concept Stream {
+    typename Ch;    //!< Character type of the stream.
+
+    //! Read the current character from stream without moving the read cursor.
+    Ch Peek() const;
+
+    //! Read the current character from stream and moving the read cursor to next character.
+    Ch Take();
+
+    //! Get the current read cursor.
+    //! \return Number of characters read from start.
+    size_t Tell();
+
+    //! Begin writing operation at the current read pointer.
+    //! \return The begin writer pointer.
+    Ch* PutBegin();
+
+    //! Write a character.
+    void Put(Ch c);
+
+    //! Flush the buffer.
+    void Flush();
+
+    //! End the writing operation.
+    //! \param begin The begin write pointer returned by PutBegin().
+    //! \return Number of characters written.
+    size_t PutEnd(Ch* begin);
+}
+\endcode
+*/
+
+//! Provides additional information for stream.
+/*!
+    By using traits pattern, this type provides a default configuration for stream.
+    For custom stream, this type can be specialized for other configuration.
+    See TEST(Reader, CustomStringStream) in readertest.cpp for example.
+*/
+template<typename Stream>
+struct StreamTraits {
+    //! Whether to make local copy of stream for optimization during parsing.
+    /*!
+        By default, for safety, streams do not use local copy optimization.
+        Stream that can be copied fast should specialize this, like StreamTraits<StringStream>.
+    */
+    enum { copyOptimization = 0 };
+};
+
+//! Put N copies of a character to a stream.
+template<typename Stream, typename Ch>
+inline void PutN(Stream& stream, Ch c, size_t n) {
+    for (size_t i = 0; i < n; i++)
+        stream.Put(c);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// StringStream
+
+//! Read-only string stream.
+/*! \note implements Stream concept
+*/
+template <typename Encoding>
+struct GenericStringStream {
+    typedef typename Encoding::Ch Ch;
+
+    GenericStringStream(const Ch *src) : src_(src), head_(src) {}
+
+    Ch Peek() const { return *src_; }
+    Ch Take() { return *src_++; }
+    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
+
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+    const Ch* src_;     //!< Current read position.
+    const Ch* head_;    //!< Original head of the string.
+};
+
+template <typename Encoding>
+struct StreamTraits<GenericStringStream<Encoding> > {
+    enum { copyOptimization = 1 };
+};
+
+//! String stream with UTF8 encoding.
+typedef GenericStringStream<UTF8<> > StringStream;
+
+///////////////////////////////////////////////////////////////////////////////
+// InsituStringStream
+
+//! A read-write string stream.
+/*! This string stream is particularly designed for in-situ parsing.
+    \note implements Stream concept
+*/
+template <typename Encoding>
+struct GenericInsituStringStream {
+    typedef typename Encoding::Ch Ch;
+
+    GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
+
+    // Read
+    Ch Peek() { return *src_; }
+    Ch Take() { return *src_++; }
+    size_t Tell() { return static_cast<size_t>(src_ - head_); }
+
+    // Write
+    void Put(Ch c) { RAPIDJSON_ASSERT(dst_ != 0); *dst_++ = c; }
+
+    Ch* PutBegin() { return dst_ = src_; }
+    size_t PutEnd(Ch* begin) { return static_cast<size_t>(dst_ - begin); }
+    void Flush() {}
+
+    Ch* Push(size_t count) { Ch* begin = dst_; dst_ += count; return begin; }
+    void Pop(size_t count) { dst_ -= count; }
+
+    Ch* src_;
+    Ch* dst_;
+    Ch* head_;
+};
+
+template <typename Encoding>
+struct StreamTraits<GenericInsituStringStream<Encoding> > {
+    enum { copyOptimization = 1 };
+};
+
+//! Insitu string stream with UTF8 encoding.
+typedef GenericInsituStringStream<UTF8<> > InsituStringStream;
+
+///////////////////////////////////////////////////////////////////////////////
+// Type
+
+//! Type of JSON value
+enum Type {
+    kNullType = 0,      //!< null
+    kFalseType = 1,     //!< false
+    kTrueType = 2,      //!< true
+    kObjectType = 3,    //!< object
+    kArrayType = 4,     //!< array 
+    kStringType = 5,    //!< string
+    kNumberType = 6     //!< number
+};
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_RAPIDJSON_H_

libs/rapidjson/stringbuffer.h

@@ -0,0 +1,93 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_STRINGBUFFER_H_
+#define RAPIDJSON_STRINGBUFFER_H_
+
+#include "rapidjson.h"
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+#include <utility> // std::move
+#endif
+
+#include "internal/stack.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Represents an in-memory output stream.
+/*!
+    \tparam Encoding Encoding of the stream.
+    \tparam Allocator type for allocating memory buffer.
+    \note implements Stream concept
+*/
+template <typename Encoding, typename Allocator = CrtAllocator>
+class GenericStringBuffer {
+public:
+    typedef typename Encoding::Ch Ch;
+
+    GenericStringBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
+
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericStringBuffer(GenericStringBuffer&& rhs) : stack_(std::move(rhs.stack_)) {}
+    GenericStringBuffer& operator=(GenericStringBuffer&& rhs) {
+        if (&rhs != this)
+            stack_ = std::move(rhs.stack_);
+        return *this;
+    }
+#endif
+
+    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
+    void Flush() {}
+
+    void Clear() { stack_.Clear(); }
+    void ShrinkToFit() {
+        // Push and pop a null terminator. This is safe.
+        *stack_.template Push<Ch>() = '\0';
+        stack_.ShrinkToFit();
+        stack_.template Pop<Ch>(1);
+    }
+    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
+    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
+
+    const Ch* GetString() const {
+        // Push and pop a null terminator. This is safe.
+        *stack_.template Push<Ch>() = '\0';
+        stack_.template Pop<Ch>(1);
+
+        return stack_.template Bottom<Ch>();
+    }
+
+    size_t GetSize() const { return stack_.GetSize(); }
+
+    static const size_t kDefaultCapacity = 256;
+    mutable internal::Stack<Allocator> stack_;
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    GenericStringBuffer(const GenericStringBuffer&);
+    GenericStringBuffer& operator=(const GenericStringBuffer&);
+};
+
+//! String buffer with UTF8 encoding
+typedef GenericStringBuffer<UTF8<> > StringBuffer;
+
+//! Implement specialized version of PutN() with memset() for better performance.
+template<>
+inline void PutN(GenericStringBuffer<UTF8<> >& stream, char c, size_t n) {
+    std::memset(stream.stack_.Push<char>(n), c, n * sizeof(c));
+}
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_STRINGBUFFER_H_

libs/rapidjson/writer.h

@@ -0,0 +1,395 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_WRITER_H_
+#define RAPIDJSON_WRITER_H_
+
+#include "rapidjson.h"
+#include "internal/stack.h"
+#include "internal/strfunc.h"
+#include "internal/dtoa.h"
+#include "internal/itoa.h"
+#include "stringbuffer.h"
+#include <new>      // placement new
+
+#if RAPIDJSON_HAS_STDSTRING
+#include <string>
+#endif
+
+#ifdef _MSC_VER
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! JSON writer
+/*! Writer implements the concept Handler.
+    It generates JSON text by events to an output os.
+
+    User may programmatically calls the functions of a writer to generate JSON text.
+
+    On the other side, a writer can also be passed to objects that generates events, 
+
+    for example Reader::Parse() and Document::Accept().
+
+    \tparam OutputStream Type of output stream.
+    \tparam SourceEncoding Encoding of source string.
+    \tparam TargetEncoding Encoding of output stream.
+    \tparam StackAllocator Type of allocator for allocating memory of stack.
+    \note implements Handler concept
+*/
+template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator>
+class Writer {
+public:
+    typedef typename SourceEncoding::Ch Ch;
+
+    //! Constructor
+    /*! \param os Output stream.
+        \param stackAllocator User supplied allocator. If it is null, it will create a private one.
+        \param levelDepth Initial capacity of stack.
+    */
+    explicit
+    Writer(OutputStream& os, StackAllocator* stackAllocator = 0, size_t levelDepth = kDefaultLevelDepth) : 
+        os_(&os), level_stack_(stackAllocator, levelDepth * sizeof(Level)), hasRoot_(false) {}
+
+    explicit
+    Writer(StackAllocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) :
+        os_(0), level_stack_(allocator, levelDepth * sizeof(Level)), hasRoot_(false) {}
+
+    //! Reset the writer with a new stream.
+    /*!
+        This function reset the writer with a new stream and default settings,
+        in order to make a Writer object reusable for output multiple JSONs.
+
+        \param os New output stream.
+        \code
+        Writer<OutputStream> writer(os1);
+        writer.StartObject();
+        // ...
+        writer.EndObject();
+
+        writer.Reset(os2);
+        writer.StartObject();
+        // ...
+        writer.EndObject();
+        \endcode
+    */
+    void Reset(OutputStream& os) {
+        os_ = &os;
+        hasRoot_ = false;
+        level_stack_.Clear();
+    }
+
+    //! Checks whether the output is a complete JSON.
+    /*!
+        A complete JSON has a complete root object or array.
+    */
+    bool IsComplete() const {
+        return hasRoot_ && level_stack_.Empty();
+    }
+
+    /*!@name Implementation of Handler
+        \see Handler
+    */
+    //@{
+
+    bool Null()                 { Prefix(kNullType);   return WriteNull(); }
+    bool Bool(bool b)           { Prefix(b ? kTrueType : kFalseType); return WriteBool(b); }
+    bool Int(int i)             { Prefix(kNumberType); return WriteInt(i); }
+    bool Uint(unsigned u)       { Prefix(kNumberType); return WriteUint(u); }
+    bool Int64(int64_t i64)     { Prefix(kNumberType); return WriteInt64(i64); }
+    bool Uint64(uint64_t u64)   { Prefix(kNumberType); return WriteUint64(u64); }
+
+    //! Writes the given \c double value to the stream
+    /*!
+        \param d The value to be written.
+        \return Whether it is succeed.
+    */
+    bool Double(double d)       { Prefix(kNumberType); return WriteDouble(d); }
+
+    bool String(const Ch* str, SizeType length, bool copy = false) {
+        (void)copy;
+        Prefix(kStringType);
+        return WriteString(str, length);
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    bool String(const std::basic_string<Ch>& str) {
+        return String(str.data(), SizeType(str.size()));
+    }
+#endif
+
+    bool StartObject() {
+        Prefix(kObjectType);
+        new (level_stack_.template Push<Level>()) Level(false);
+        return WriteStartObject();
+    }
+
+    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
+	
+    bool EndObject(SizeType memberCount = 0) {
+        (void)memberCount;
+        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
+        RAPIDJSON_ASSERT(!level_stack_.template Top<Level>()->inArray);
+        level_stack_.template Pop<Level>(1);
+        bool ret = WriteEndObject();
+        if (level_stack_.Empty())   // end of json text
+            os_->Flush();
+        return ret;
+    }
+
+    bool StartArray() {
+        Prefix(kArrayType);
+        new (level_stack_.template Push<Level>()) Level(true);
+        return WriteStartArray();
+    }
+
+    bool EndArray(SizeType elementCount = 0) {
+        (void)elementCount;
+        RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
+        RAPIDJSON_ASSERT(level_stack_.template Top<Level>()->inArray);
+        level_stack_.template Pop<Level>(1);
+        bool ret = WriteEndArray();
+        if (level_stack_.Empty())   // end of json text
+            os_->Flush();
+        return ret;
+    }
+    //@}
+
+    /*! @name Convenience extensions */
+    //@{
+
+    //! Simpler but slower overload.
+    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
+    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
+
+    //@}
+
+protected:
+    //! Information for each nested level
+    struct Level {
+        Level(bool inArray_) : valueCount(0), inArray(inArray_) {}
+        size_t valueCount;  //!< number of values in this level
+        bool inArray;       //!< true if in array, otherwise in object
+    };
+
+    static const size_t kDefaultLevelDepth = 32;
+
+    bool WriteNull()  {
+        os_->Put('n'); os_->Put('u'); os_->Put('l'); os_->Put('l'); return true;
+    }
+
+    bool WriteBool(bool b)  {
+        if (b) {
+            os_->Put('t'); os_->Put('r'); os_->Put('u'); os_->Put('e');
+        }
+        else {
+            os_->Put('f'); os_->Put('a'); os_->Put('l'); os_->Put('s'); os_->Put('e');
+        }
+        return true;
+    }
+
+    bool WriteInt(int i) {
+        char buffer[11];
+        const char* end = internal::i32toa(i, buffer);
+        for (const char* p = buffer; p != end; ++p)
+            os_->Put(*p);
+        return true;
+    }
+
+    bool WriteUint(unsigned u) {
+        char buffer[10];
+        const char* end = internal::u32toa(u, buffer);
+        for (const char* p = buffer; p != end; ++p)
+            os_->Put(*p);
+        return true;
+    }
+
+    bool WriteInt64(int64_t i64) {
+        char buffer[21];
+        const char* end = internal::i64toa(i64, buffer);
+        for (const char* p = buffer; p != end; ++p)
+            os_->Put(*p);
+        return true;
+    }
+
+    bool WriteUint64(uint64_t u64) {
+        char buffer[20];
+        char* end = internal::u64toa(u64, buffer);
+        for (char* p = buffer; p != end; ++p)
+            os_->Put(*p);
+        return true;
+    }
+
+    bool WriteDouble(double d) {
+        char buffer[25];
+        char* end = internal::dtoa(d, buffer);
+        for (char* p = buffer; p != end; ++p)
+            os_->Put(*p);
+        return true;
+    }
+
+    bool WriteString(const Ch* str, SizeType length)  {
+        static const char hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+        static const char escape[256] = {
+#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            //0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'b', 't', 'n', 'u', 'f', 'r', 'u', 'u', // 00
+            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', // 10
+              0,   0, '"',   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20
+            Z16, Z16,                                                                       // 30~4F
+              0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,'\\',   0,   0,   0, // 50
+            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16                                // 60~FF
+#undef Z16
+        };
+
+        os_->Put('\"');
+        GenericStringStream<SourceEncoding> is(str);
+        while (is.Tell() < length) {
+            const Ch c = is.Peek();
+            if (!TargetEncoding::supportUnicode && (unsigned)c >= 0x80) {
+                // Unicode escaping
+                unsigned codepoint;
+                if (!SourceEncoding::Decode(is, &codepoint))
+                    return false;
+                os_->Put('\\');
+                os_->Put('u');
+                if (codepoint <= 0xD7FF || (codepoint >= 0xE000 && codepoint <= 0xFFFF)) {
+                    os_->Put(hexDigits[(codepoint >> 12) & 15]);
+                    os_->Put(hexDigits[(codepoint >>  8) & 15]);
+                    os_->Put(hexDigits[(codepoint >>  4) & 15]);
+                    os_->Put(hexDigits[(codepoint      ) & 15]);
+                }
+                else {
+                    RAPIDJSON_ASSERT(codepoint >= 0x010000 && codepoint <= 0x10FFFF);
+                    // Surrogate pair
+                    unsigned s = codepoint - 0x010000;
+                    unsigned lead = (s >> 10) + 0xD800;
+                    unsigned trail = (s & 0x3FF) + 0xDC00;
+                    os_->Put(hexDigits[(lead >> 12) & 15]);
+                    os_->Put(hexDigits[(lead >>  8) & 15]);
+                    os_->Put(hexDigits[(lead >>  4) & 15]);
+                    os_->Put(hexDigits[(lead      ) & 15]);
+                    os_->Put('\\');
+                    os_->Put('u');
+                    os_->Put(hexDigits[(trail >> 12) & 15]);
+                    os_->Put(hexDigits[(trail >>  8) & 15]);
+                    os_->Put(hexDigits[(trail >>  4) & 15]);
+                    os_->Put(hexDigits[(trail      ) & 15]);                    
+                }
+            }
+            else if ((sizeof(Ch) == 1 || (unsigned)c < 256) && escape[(unsigned char)c])  {
+                is.Take();
+                os_->Put('\\');
+                os_->Put(escape[(unsigned char)c]);
+                if (escape[(unsigned char)c] == 'u') {
+                    os_->Put('0');
+                    os_->Put('0');
+                    os_->Put(hexDigits[(unsigned char)c >> 4]);
+                    os_->Put(hexDigits[(unsigned char)c & 0xF]);
+                }
+            }
+            else
+                if (!Transcoder<SourceEncoding, TargetEncoding>::Transcode(is, *os_))
+                    return false;
+        }
+        os_->Put('\"');
+        return true;
+    }
+
+    bool WriteStartObject() { os_->Put('{'); return true; }
+    bool WriteEndObject()   { os_->Put('}'); return true; }
+    bool WriteStartArray()  { os_->Put('['); return true; }
+    bool WriteEndArray()    { os_->Put(']'); return true; }
+
+    void Prefix(Type type) {
+        (void)type;
+        if (level_stack_.GetSize() != 0) { // this value is not at root
+            Level* level = level_stack_.template Top<Level>();
+            if (level->valueCount > 0) {
+                if (level->inArray) 
+                    os_->Put(','); // add comma if it is not the first element in array
+                else  // in object
+                    os_->Put((level->valueCount % 2 == 0) ? ',' : ':');
+            }
+            if (!level->inArray && level->valueCount % 2 == 0)
+                RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
+            level->valueCount++;
+        }
+        else {
+            RAPIDJSON_ASSERT(!hasRoot_);    // Should only has one and only one root.
+            hasRoot_ = true;
+        }
+    }
+
+    OutputStream* os_;
+    internal::Stack<StackAllocator> level_stack_;
+    bool hasRoot_;
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    Writer(const Writer&);
+    Writer& operator=(const Writer&);
+};
+
+// Full specialization for StringStream to prevent memory copying
+
+template<>
+inline bool Writer<StringBuffer>::WriteInt(int i) {
+    char *buffer = os_->Push(11);
+    const char* end = internal::i32toa(i, buffer);
+    os_->Pop(11 - (end - buffer));
+    return true;
+}
+
+template<>
+inline bool Writer<StringBuffer>::WriteUint(unsigned u) {
+    char *buffer = os_->Push(10);
+    const char* end = internal::u32toa(u, buffer);
+    os_->Pop(10 - (end - buffer));
+    return true;
+}
+
+template<>
+inline bool Writer<StringBuffer>::WriteInt64(int64_t i64) {
+    char *buffer = os_->Push(21);
+    const char* end = internal::i64toa(i64, buffer);
+    os_->Pop(21 - (end - buffer));
+    return true;
+}
+
+template<>
+inline bool Writer<StringBuffer>::WriteUint64(uint64_t u) {
+    char *buffer = os_->Push(20);
+    const char* end = internal::u64toa(u, buffer);
+    os_->Pop(20 - (end - buffer));
+    return true;
+}
+
+template<>
+inline bool Writer<StringBuffer>::WriteDouble(double d) {
+    char *buffer = os_->Push(25);
+    char* end = internal::dtoa(d, buffer);
+    os_->Pop(25 - (end - buffer));
+    return true;
+}
+
+RAPIDJSON_NAMESPACE_END
+
+#ifdef _MSC_VER
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_RAPIDJSON_H_

meta/new settings master

@@ -0,0 +1,130 @@
+[ problem ]
+gantry_height introduced by Jaime while there already was machine_nozzle_gantry_distance
+
+
+[ RENAMES ]
+raft_base_linewidth > raft_base_line_width
+raft_interface_linewidth > raft_interface_line_width
+fill_overlap > infill_overlap
+fill_pattern > infill_pattern
+fill_sparse_combine > infill_sparse_combine
+fill_sparse_density > infill_sparse_density
+fill_sparse_thickness > infill_sparse_thickness
+support_fill_rate > support_infill_rate
+
+
+[ SPLITS ]
+raft_line_spacing > raft_base_line_spacing   (, raft_interface_line_spacing, raft_surface_line_spacing)
+wall_overlap_avoid_enabled > remove_overlapping_walls_enabled (, remove_overlapping_walls_0_enabled, remove_overlapping_walls_x_enabled)
+
+retraction_minimal_extrusion > retraction_extrusion_window (+ retraction_count_max = 1)
+
+magic_mesh_surface_mode : false >> "Normal"
+magic_mesh_surface_mode : true >> "Surface"
+
+
+[ NEW ]
+alternate_extra_perimeter
+
+coasting_enable
+coasting_min_volume
+coasting_min_volume_move
+coasting_min_volume_retract
+coasting_speed
+coasting_speed_move
+coasting_speed_retract
+coasting_volume
+coasting_volume_move
+coasting_volume_retract
+
+fill_perimeter_gaps
+
+draft_shield_dist
+draft_shield_enabled
+draft_shield_height
+draft_shield_height_limitation
+
+infill_wipe_dist
+
+line_width (was wall_line_width)
+
+machine_extruder_count
+
+machine_head_polygon
+machine_head_with_fans_polygon
+machine_heat_zone_length
+
+magic_mesh_surface_mode
+
+meshfix_extensive_stitching
+meshfix_keep_open_polygons
+meshfix_union_all
+meshfix_union_all_remove_holes
+
+print_sequence
+
+raft_base_line_spacing	(from raft_line_spacing)
+raft_base_line_width
+raft_fan_speed
+raft_interface_fan_speed
+raft_interface_line_spacing
+raft_interface_speed
+raft_speed
+raft_surface_fan_speed
+raft_surface_line_spacing
+raft_surface_line_width
+raft_surface_speed
+raft_surface_thickness
+remove_overlapping_walls_0_enabled
+remove_overlapping_walls_enabled
+remove_overlapping_walls_x_enabled
+
+retraction_count_max
+retraction_extrusion_window  (from retraction_minimal_extrusion)
+retraction_extra_prime_amount
+
+skin_alternate_rotation
+
+speed_support_lines
+speed_support_roof
+
+support_conical_angle
+support_conical_enabled
+support_conical_min_width
+support_offset
+support_roof_enable
+support_roof_height
+support_roof_line_width
+
+travel_avoid_distance
+travel_avoid_other_parts
+travel_compensate_overlapping_walls_enabled
+
+z_seam_type
+
+
+[ DUAL EXTRUSION ]
+extruder_nr
+machine_use_extruder_offset_to_offset_coords
+machine_nozzle_offset_x
+machine_nozzle_offset_y
+machine_extruder_start_code
+machine_extruder_start_pos_abs
+machine_extruder_start_pos_x
+machine_extruder_start_pos_y
+machine_extruder_end_pos_abs
+machine_extruder_end_pos_x
+machine_extruder_end_pos_y
+machine_extruder_end_code
+prime_tower_enable
+prime_tower_size
+prime_tower_position_x
+prime_tower_position_y
+prime_tower_flow
+prime_tower_wipe_enabled
+ooze_shield_enabled
+ooze_shield_angle
+ooze_shield_dist
+
+
+

src/ExtruderTrain.h

@@ -0,0 +1,23 @@
+#ifndef EXTRUDER_TRAIN_H
+#define EXTRUDER_TRAIN_H
+
+#include "settings.h"
+
+namespace cura 
+{
+    
+class ExtruderTrain : public SettingsBase
+{
+    int extruder_nr;
+public:
+    int getExtruderNr() { return extruder_nr; }
+    
+    ExtruderTrain(SettingsBaseVirtual* settings, int extruder_nr)
+    : SettingsBase(settings)
+    , extruder_nr(extruder_nr)
+    { }
+    
+};
+
+}//namespace cura
+#endif // EXTRUDER_TRAIN_H

src/FffGcodeWriter.cpp

@@ -0,0 +1,996 @@
+
+#include <list>
+
+#include "FffGcodeWriter.h"
+#include "FffProcessor.h"
+#include "Progress.h"
+#include "wallOverlap.h"
+
+namespace cura
+{
+
+
+void FffGcodeWriter::writeGCode(SliceDataStorage& storage, TimeKeeper& time_keeper)
+{
+    PrimeTower primetower();
+    
+    gcode.preSetup(storage.meshgroup);
+    
+    if (meshgroup_number == 1)
+    {
+        gcode.resetTotalPrintTimeAndFilament();
+    }
+    
+    if (command_socket)
+        command_socket->beginGCode();
+
+    setConfigCoasting(storage);
+
+    setConfigRetraction(storage);
+
+    if (meshgroup_number == 1)
+    {
+        processStartingCode(storage);
+    }
+    else
+    {
+        processNextMeshGroupCode(storage);
+    }
+    meshgroup_number++;
+
+    size_t total_layers = 0;
+    for (SliceMeshStorage& mesh : storage.meshes)
+    {
+        total_layers = std::max(total_layers, mesh.layers.size());
+    }
+    
+    gcode.writeLayerCountComment(total_layers);
+
+    bool has_raft = getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT;
+    if (has_raft)
+    {
+        processRaft(storage, total_layers);
+    }
+    
+    for (int extruder = 0; extruder < storage.meshgroup->getExtruderCount(); extruder++)
+        last_prime_tower_poly_printed[extruder] = -1; // layer 0 has its prime tower printed during the brim (?)
+    
+    for(unsigned int layer_nr=0; layer_nr<total_layers; layer_nr++)
+    {
+        processLayer(storage, layer_nr, total_layers, has_raft);
+    }
+
+    Progress::messageProgressStage(Progress::Stage::FINISH, &time_keeper, command_socket);
+    
+    gcode.writeFanCommand(0);
+
+    //Store the object height for when we are printing multiple objects, as we need to clear every one of them when moving to the next position.
+    max_object_height = std::max(max_object_height, storage.model_max.z);
+    
+    if (command_socket)
+    {
+        command_socket->sendGCodeLayer();
+        command_socket->endSendSlicedObject();
+    }
+}
+
+
+void FffGcodeWriter::setConfigCoasting(SliceDataStorage& storage) 
+{
+    for (int extr = 0; extr < storage.meshgroup->getExtruderCount(); extr++)
+    {
+        storage.coasting_config.emplace_back();
+        ExtruderTrain* train = storage.meshgroup->getExtruderTrain(extr);
+        CoastingConfig& coasting_config = storage.coasting_config.back();
+        coasting_config.coasting_enable = train->getSettingBoolean("coasting_enable"); 
+        coasting_config.coasting_volume_move = train->getSettingInCubicMillimeters("coasting_volume_move"); 
+        coasting_config.coasting_min_volume_move = train->getSettingInCubicMillimeters("coasting_min_volume_move"); 
+        coasting_config.coasting_speed_move = train->getSettingInPercentage("coasting_speed_move") / 100.0; 
+        coasting_config.coasting_volume_retract = train->getSettingInCubicMillimeters("coasting_volume_retract");
+        coasting_config.coasting_min_volume_retract = train->getSettingInCubicMillimeters("coasting_min_volume_retract");
+        coasting_config.coasting_speed_retract = train->getSettingInPercentage("coasting_speed_retract") / 100.0;
+    }
+}
+
+void FffGcodeWriter::setConfigRetraction(SliceDataStorage& storage) 
+{
+    storage.retraction_config.amount = (storage.getSettingBoolean("retraction_enable"))? INT2MM(getSettingInMicrons("retraction_amount")) : 0;
+    storage.retraction_config.primeAmount = INT2MM(getSettingInMicrons("retraction_extra_prime_amount"));
+    storage.retraction_config.speed = getSettingInMillimetersPerSecond("retraction_retract_speed");
+    storage.retraction_config.primeSpeed = getSettingInMillimetersPerSecond("retraction_prime_speed");
+    storage.retraction_config.zHop = getSettingInMicrons("retraction_hop");
+    storage.retraction_config.retraction_min_travel_distance = getSettingInMicrons("retraction_min_travel");
+    storage.retraction_config.retraction_extrusion_window = getSettingInMicrons("retraction_extrusion_window");
+    storage.retraction_config.retraction_count_max = getSettingInMicrons("retraction_count_max");
+    
+    int extruder_count = storage.meshgroup->getExtruderCount();
+    for (int extruder = 0; extruder < extruder_count; extruder++)
+    {
+        ExtruderTrain* train = storage.meshgroup->getExtruderTrain(extruder);
+        storage.retraction_config_per_extruder[extruder].amount = (train->getSettingBoolean("retraction_enable"))? INT2MM(train->getSettingInMicrons("retraction_amount")) : 0;
+        storage.retraction_config_per_extruder[extruder].primeAmount = INT2MM(train->getSettingInMicrons("retraction_extra_prime_amount"));
+        storage.retraction_config_per_extruder[extruder].speed = train->getSettingInMillimetersPerSecond("retraction_retract_speed");
+        storage.retraction_config_per_extruder[extruder].primeSpeed = train->getSettingInMillimetersPerSecond("retraction_prime_speed");
+        storage.retraction_config_per_extruder[extruder].zHop = train->getSettingInMicrons("retraction_hop");
+        storage.retraction_config_per_extruder[extruder].retraction_min_travel_distance = train->getSettingInMicrons("retraction_min_travel");
+        storage.retraction_config_per_extruder[extruder].retraction_extrusion_window = train->getSettingInMicrons("retraction_extrusion_window");
+        storage.retraction_config_per_extruder[extruder].retraction_count_max = train->getSettingInMicrons("retraction_count_max");
+    }
+    for(SliceMeshStorage& mesh : storage.meshes)
+    {
+        mesh.retraction_config.amount = (mesh.getSettingBoolean("retraction_enable"))? INT2MM(mesh.getSettingInMicrons("retraction_amount")) : 0;
+        mesh.retraction_config.primeAmount = INT2MM(mesh.getSettingInMicrons("retraction_extra_prime_amount"));
+        mesh.retraction_config.speed = mesh.getSettingInMillimetersPerSecond("retraction_retract_speed");
+        mesh.retraction_config.primeSpeed = mesh.getSettingInMillimetersPerSecond("retraction_prime_speed");
+        mesh.retraction_config.zHop = mesh.getSettingInMicrons("retraction_hop");
+        mesh.retraction_config.retraction_min_travel_distance = mesh.getSettingInMicrons("retraction_min_travel");
+        mesh.retraction_config.retraction_extrusion_window = mesh.getSettingInMicrons("retraction_extrusion_window");
+        mesh.retraction_config.retraction_count_max = mesh.getSettingInMicrons("retraction_count_max");
+    }
+}
+
+void FffGcodeWriter::setConfigSkirt(SliceDataStorage& storage, int layer_thickness)
+{
+    for (int extruder = 0; extruder < storage.meshgroup->getExtruderCount(); extruder++)
+    {
+        SettingsBase* train = storage.meshgroup->getExtruderTrain(extruder);
+        storage.skirt_config[extruder].setSpeed(train->getSettingInMillimetersPerSecond("skirt_speed"));
+        storage.skirt_config[extruder].setLineWidth(train->getSettingInMicrons("skirt_line_width"));
+        storage.skirt_config[extruder].setFlow(train->getSettingInPercentage("material_flow"));
+        storage.skirt_config[extruder].setLayerHeight(layer_thickness);
+    }
+}
+
+void FffGcodeWriter::setConfigSupport(SliceDataStorage& storage, int layer_thickness)
+{
+    storage.support_config.setLineWidth(getSettingInMicrons("support_line_width"));
+    storage.support_config.setSpeed(getSettingInMillimetersPerSecond("speed_support_lines"));
+    storage.support_config.setFlow(storage.meshgroup->getExtruderTrain(getSettingAsIndex("support_extruder_nr"))->getSettingInPercentage("material_flow"));
+    storage.support_config.setLayerHeight(layer_thickness);
+    
+    storage.support_roof_config.setLineWidth(getSettingInMicrons("support_roof_line_width"));
+    storage.support_roof_config.setSpeed(getSettingInMillimetersPerSecond("speed_support_roof"));
+    storage.support_roof_config.setFlow(storage.meshgroup->getExtruderTrain(getSettingAsIndex("support_roof_extruder_nr"))->getSettingInPercentage("material_flow"));
+    storage.support_roof_config.setLayerHeight(layer_thickness);
+}
+
+void FffGcodeWriter::setConfigInsets(SliceMeshStorage& mesh, int layer_thickness)
+{
+    mesh.inset0_config.setLineWidth(mesh.getSettingInMicrons("wall_line_width_0"));
+    mesh.inset0_config.setSpeed(mesh.getSettingInMillimetersPerSecond("speed_wall_0"));
+    mesh.inset0_config.setFlow(mesh.getSettingInPercentage("material_flow"));
+    mesh.inset0_config.setLayerHeight(layer_thickness);
+
+    mesh.insetX_config.setLineWidth(mesh.getSettingInMicrons("wall_line_width_x"));
+    mesh.insetX_config.setSpeed(mesh.getSettingInMillimetersPerSecond("speed_wall_x"));
+    mesh.insetX_config.setFlow(mesh.getSettingInPercentage("material_flow"));
+    mesh.insetX_config.setLayerHeight(layer_thickness);
+}
+
+void FffGcodeWriter::setConfigSkin(SliceMeshStorage& mesh, int layer_thickness)
+{
+    mesh.skin_config.setLineWidth(mesh.getSettingInMicrons("skin_line_width"));
+    mesh.skin_config.setSpeed(mesh.getSettingInMillimetersPerSecond("speed_topbottom"));
+    mesh.skin_config.setFlow(mesh.getSettingInPercentage("material_flow"));
+    mesh.skin_config.setLayerHeight(layer_thickness);
+}
+
+void FffGcodeWriter::setConfigInfill(SliceMeshStorage& mesh, int layer_thickness)
+{
+    for(unsigned int idx=0; idx<MAX_INFILL_COMBINE; idx++)
+    {
+        mesh.infill_config[idx].setLineWidth(mesh.getSettingInMicrons("infill_line_width") * (idx + 1));
+        mesh.infill_config[idx].setSpeed(mesh.getSettingInMillimetersPerSecond("speed_infill"));
+        mesh.infill_config[idx].setFlow(mesh.getSettingInPercentage("material_flow"));
+        mesh.infill_config[idx].setLayerHeight(layer_thickness);
+    }
+}
+
+void FffGcodeWriter::processStartingCode(SliceDataStorage& storage)
+{
+    if (!command_socket)
+    {
+        std::ostringstream prefix;
+        prefix << "FLAVOR:" << toString(gcode.getFlavor());
+        gcode.writeComment(prefix.str().c_str());
+        if (gcode.getFlavor() == EGCodeFlavor::ULTIGCODE)
+        {
+            gcode.writeComment("TIME:666");
+            gcode.writeComment("MATERIAL:666");
+            gcode.writeComment("MATERIAL2:-1");
+        }
+    }
+    if (gcode.getFlavor() != EGCodeFlavor::ULTIGCODE)
+    {
+        if (getSettingBoolean("machine_heated_bed") && getSettingInDegreeCelsius("material_bed_temperature") > 0)
+            gcode.writeBedTemperatureCommand(getSettingInDegreeCelsius("material_bed_temperature"), true);
+        
+        for(SliceMeshStorage& mesh : storage.meshes)
+            if (mesh.getSettingInDegreeCelsius("material_print_temperature") > 0)
+                gcode.writeTemperatureCommand(mesh.getSettingAsIndex("extruder_nr"), mesh.getSettingInDegreeCelsius("material_print_temperature"));
+        for(SliceMeshStorage& mesh : storage.meshes)
+            if (mesh.getSettingInDegreeCelsius("material_print_temperature") > 0)
+                gcode.writeTemperatureCommand(mesh.getSettingAsIndex("extruder_nr"), mesh.getSettingInDegreeCelsius("material_print_temperature"), true);
+    }
+    
+    gcode.writeCode(getSettingString("machine_start_gcode").c_str());
+
+    gcode.writeComment("Generated with Cura_SteamEngine " VERSION);
+    if (gcode.getFlavor() == EGCodeFlavor::BFB)
+    {
+        gcode.writeComment("enable auto-retraction");
+        std::ostringstream tmp;
+        tmp << "M227 S" << (getSettingInMicrons("retraction_amount") * 2560 / 1000) << " P" << (getSettingInMicrons("retraction_amount") * 2560 / 1000);
+        gcode.writeLine(tmp.str().c_str());
+    }
+}
+
+void FffGcodeWriter::processNextMeshGroupCode(SliceDataStorage& storage)
+{
+    gcode.writeFanCommand(0);
+    gcode.resetExtrusionValue();
+    gcode.setZ(max_object_height + 5000);
+    gcode.writeMove(gcode.getPositionXY(), getSettingInMillimetersPerSecond("speed_travel"), 0);
+    gcode.writeMove(Point(storage.model_min.x, storage.model_min.y), getSettingInMillimetersPerSecond("speed_travel"), 0);
+}
+    
+void FffGcodeWriter::processRaft(SliceDataStorage& storage, unsigned int total_layers)
+{
+    int extruder_nr = getSettingAsIndex("adhesion_extruder_nr");
+    ExtruderTrain* train = storage.meshgroup->getExtruderTrain(extruder_nr);
+    
+    bool retraction_combing = true; 
+    
+    int n_raft_surface_layers = train->getSettingAsCount("raft_surface_layers");
+    
+    { // raft base layer
+        GCodePathConfig raft_base_config(&storage.retraction_config_per_extruder[extruder_nr], "SUPPORT");
+        raft_base_config.setSpeed(getSettingInMillimetersPerSecond("raft_base_speed"));
+        raft_base_config.setLineWidth(getSettingInMicrons("raft_base_line_width"));
+        raft_base_config.setLayerHeight(getSettingInMicrons("raft_base_thickness"));
+        raft_base_config.setFlow(train->getSettingInPercentage("material_flow"));
+        
+        int layer_nr = -n_raft_surface_layers - 2;
+        gcode.writeLayerComment(layer_nr);
+        gcode.writeComment("RAFT");
+        int64_t z = getSettingInMicrons("raft_base_thickness");
+        gcode.setZ(z);
+        GCodePlanner gcode_layer(command_socket, gcode, storage, z, &storage.retraction_config_per_extruder[extruder_nr], train->getSettingInMillimetersPerSecond("speed_travel"), retraction_combing, layer_nr, train->getSettingInMicrons("machine_nozzle_size"), train->getSettingBoolean("travel_avoid_other_parts"), train->getSettingInMicrons("travel_avoid_distance"));
+        gcode_layer.setCombing(false);
+        if (getSettingAsIndex("adhesion_extruder_nr") > 0)
+            gcode_layer.setExtruder(extruder_nr);
+        if (command_socket)
+            command_socket->sendLayerInfo(layer_nr, z, raft_base_config.getLayerHeight());
+        gcode_layer.addPolygonsByOptimizer(storage.raftOutline, &raft_base_config);
+
+        Polygons raftLines;
+        int offset_from_poly_outline = 0;
+        generateLineInfill(storage.raftOutline, offset_from_poly_outline, raftLines, train->getSettingInMicrons("raft_base_line_width"), train->getSettingInMicrons("raft_base_line_spacing"), train->getSettingInPercentage("infill_overlap"), 0);
+        gcode_layer.addLinesByOptimizer(raftLines, &raft_base_config);
+        sendPolygons(SupportType, layer_nr, raftLines, raft_base_config.getLineWidth());
+
+        gcode.writeFanCommand(train->getSettingInPercentage("raft_base_fan_speed"));
+        gcode_layer.writeGCode(false, train->getSettingInMicrons("raft_base_thickness"));
+    }
+
+    { // raft interface layer
+        GCodePathConfig raft_interface_config(&storage.retraction_config_per_extruder[extruder_nr], "SUPPORT");
+        raft_interface_config.setSpeed(getSettingInMillimetersPerSecond("raft_interface_speed"));
+        raft_interface_config.setLineWidth(getSettingInMicrons("raft_interface_line_width"));
+        raft_interface_config.setLayerHeight(getSettingInMicrons("raft_interface_thickness"));
+        raft_interface_config.setFlow(train->getSettingInPercentage("material_flow"));
+        
+        int layer_nr = -n_raft_surface_layers - 1;
+        gcode.writeLayerComment(layer_nr);
+        gcode.writeComment("RAFT");
+        int64_t z = train->getSettingInMicrons("raft_base_thickness") + train->getSettingInMicrons("raft_interface_thickness");
+        gcode.setZ(z);
+        GCodePlanner gcode_layer(command_socket, gcode, storage, z, &storage.retraction_config_per_extruder[extruder_nr], train->getSettingInMillimetersPerSecond("speed_travel"), retraction_combing, layer_nr, train->getSettingInMicrons("machine_nozzle_size"), train->getSettingBoolean("travel_avoid_other_parts"), train->getSettingInMicrons("travel_avoid_distance"));
+        gcode_layer.setCombing(false);
+        if (command_socket)
+            command_socket->sendLayerInfo(layer_nr, z, raft_interface_config.getLayerHeight());
+        
+        Polygons raftLines;
+        int offset_from_poly_outline = 0;
+        generateLineInfill(storage.raftOutline, offset_from_poly_outline, raftLines, train->getSettingInMicrons("raft_interface_line_width"), train->getSettingInMicrons("raft_interface_line_spacing"), train->getSettingInPercentage("infill_overlap"), train->getSettingAsCount("raft_surface_layers") > 0 ? 45 : 90);
+        gcode_layer.addLinesByOptimizer(raftLines, &raft_interface_config);
+        sendPolygons(SupportType, layer_nr, raftLines, raft_interface_config.getLineWidth());
+
+        gcode_layer.writeGCode(false, train->getSettingInMicrons("raft_interface_thickness"));
+    }
+
+    
+    GCodePathConfig raft_surface_config(&storage.retraction_config_per_extruder[extruder_nr], "SUPPORT");
+    raft_surface_config.setSpeed(getSettingInMillimetersPerSecond("raft_surface_speed"));
+    raft_surface_config.setLineWidth(getSettingInMicrons("raft_surface_line_width"));
+    raft_surface_config.setLayerHeight(getSettingInMicrons("raft_surface_thickness"));
+    raft_surface_config.setFlow(train->getSettingInPercentage("material_flow"));
+
+    for (int raftSurfaceLayer=1; raftSurfaceLayer <= n_raft_surface_layers; raftSurfaceLayer++)
+    { // raft surface layers
+        int layer_nr = -n_raft_surface_layers + raftSurfaceLayer - 1;
+        gcode.writeLayerComment(-1);
+        gcode.writeComment("RAFT");
+        int64_t z = train->getSettingInMicrons("raft_base_thickness") + train->getSettingInMicrons("raft_interface_thickness") + train->getSettingInMicrons("raft_surface_thickness")*raftSurfaceLayer;
+        gcode.setZ(z);
+        GCodePlanner gcode_layer(command_socket, gcode, storage, z, &storage.retraction_config_per_extruder[extruder_nr], train->getSettingInMillimetersPerSecond("speed_travel"), retraction_combing, layer_nr, train->getSettingInMicrons("machine_nozzle_size"), train->getSettingBoolean("travel_avoid_other_parts"), train->getSettingInMicrons("travel_avoid_distance"));
+        gcode_layer.setCombing(false);
+        if (command_socket)
+            command_socket->sendLayerInfo(layer_nr, z, raft_surface_config.getLayerHeight());
+        
+        Polygons raft_lines;
+        int offset_from_poly_outline = 0;
+        generateLineInfill(storage.raftOutline, offset_from_poly_outline, raft_lines, train->getSettingInMicrons("raft_surface_line_width"), train->getSettingInMicrons("raft_surface_line_spacing"), train->getSettingInPercentage("infill_overlap"), 90 * raftSurfaceLayer);
+        gcode_layer.addLinesByOptimizer(raft_lines, &raft_surface_config);
+        sendPolygons(SupportType, layer_nr, raft_lines, raft_surface_config.getLineWidth());
+
+        gcode_layer.writeGCode(false, train->getSettingInMicrons("raft_interface_thickness"));
+    }
+}
+
+void FffGcodeWriter::processLayer(SliceDataStorage& storage, unsigned int layer_nr, unsigned int total_layers, bool has_raft)
+{
+    Progress::messageProgress(Progress::Stage::EXPORT, layer_nr+1, total_layers, command_socket);
+
+    int layer_thickness = getSettingInMicrons("layer_height");
+    if (layer_nr == 0 && !has_raft)
+    {
+        layer_thickness = getSettingInMicrons("layer_height_0");
+    }
+    
+    
+
+    setConfigSkirt(storage, layer_thickness);
+
+    setConfigSupport(storage, layer_thickness);
+    
+    storage.primeTower.setConfigs(storage.meshgroup, storage.retraction_config_per_extruder, layer_thickness);
+    
+    for(SliceMeshStorage& mesh : storage.meshes)
+    {
+        setConfigInsets(mesh, layer_thickness);
+        setConfigSkin(mesh, layer_thickness);
+        setConfigInfill(mesh, layer_thickness);
+    }
+
+    processInitialLayersSpeedup(storage, layer_nr);
+
+    gcode.writeLayerComment(layer_nr);
+
+    int64_t comb_offset_from_outlines = storage.meshgroup->getExtruderTrain(gcode.getExtruderNr())->getSettingInMicrons("machine_nozzle_size") * 2; // TODO: only used when there is no second wall.
+    int64_t z = storage.meshes[0].layers[layer_nr].printZ;
+    GCodePlanner gcode_layer(command_socket, gcode, storage, z, &storage.retraction_config, getSettingInMillimetersPerSecond("speed_travel"), getSettingBoolean("retraction_combing"), layer_nr, comb_offset_from_outlines, getSettingBoolean("travel_avoid_other_parts"), getSettingInMicrons("travel_avoid_distance"));      
+    gcode.setZ(z);
+    gcode.resetStartPosition();
+    
+    if (layer_nr == 0)
+    {
+        int start_extruder = 0; // TODO: make settable
+        gcode_layer.setExtruder(start_extruder);
+        processSkirt(storage, gcode_layer, start_extruder);
+    }
+    
+    int extruder_nr_before = gcode_layer.getExtruder();
+    addSupportToGCode(storage, gcode_layer, layer_nr, extruder_nr_before, true);
+
+    processOozeShield(storage, gcode_layer, layer_nr);
+    
+    processDraftShield(storage, gcode_layer, layer_nr);
+
+    //Figure out in which order to print the meshes, do this by looking at the current extruder and preferer the meshes that use that extruder.
+    std::vector<unsigned int> mesh_order = calculateMeshOrder(storage, gcode_layer.getExtruder());
+    gcode_layer.setCombing(true);
+    for(unsigned int mesh_idx : mesh_order)
+    {
+        SliceMeshStorage* mesh = &storage.meshes[mesh_idx];
+        if (mesh->getSettingAsSurfaceMode("magic_mesh_surface_mode") == ESurfaceMode::SURFACE)
+        {
+            gcode_layer.setCombing(false);
+            addMeshLayerToGCode_meshSurfaceMode(storage, mesh, gcode_layer, layer_nr);
+        }
+        else
+        {
+            gcode_layer.setCombing(true); // needed when the last mesh was spiralized
+            addMeshLayerToGCode(storage, mesh, gcode_layer, layer_nr);
+        }
+    }
+    gcode_layer.setCombing(false);
+    
+    addSupportToGCode(storage, gcode_layer, layer_nr, extruder_nr_before, false);
+
+    { // add prime tower if it hasn't already been added
+        // print the prime tower if it hasn't been printed yet
+        int prev_extruder = gcode_layer.getExtruder(); // most likely the same extruder as we are extruding with now
+        addPrimeTower(storage, gcode_layer, layer_nr, prev_extruder);
+    }
+    processFanSpeedAndMinimalLayerTime(storage, gcode_layer, layer_nr);
+    
+    gcode_layer.writeGCode(getSettingBoolean("cool_lift_head"), layer_nr > 0 ? getSettingInMicrons("layer_height") : getSettingInMicrons("layer_height_0"));
+    if (command_socket)
+        command_socket->sendGCodeLayer();
+}
+
+void FffGcodeWriter::processInitialLayersSpeedup(SliceDataStorage& storage, unsigned int layer_nr)
+{
+    double initial_speedup_layers = getSettingAsCount("speed_slowdown_layers");
+    if (static_cast<int>(layer_nr) < initial_speedup_layers)
+    {
+        double initial_layer_speed = getSettingInMillimetersPerSecond("speed_layer_0");
+        storage.support_config.smoothSpeed(initial_layer_speed, layer_nr, initial_speedup_layers);
+        for(SliceMeshStorage& mesh : storage.meshes)
+        {
+            initial_layer_speed = mesh.getSettingInMillimetersPerSecond("speed_layer_0");
+            mesh.inset0_config.smoothSpeed(initial_layer_speed, layer_nr, initial_speedup_layers);
+            mesh.insetX_config.smoothSpeed(initial_layer_speed, layer_nr, initial_speedup_layers);
+            mesh.skin_config.smoothSpeed(initial_layer_speed, layer_nr, initial_speedup_layers);
+            for(unsigned int idx=0; idx<MAX_INFILL_COMBINE; idx++)
+            {
+                mesh.infill_config[idx].smoothSpeed(initial_layer_speed, layer_nr, initial_speedup_layers);
+            }
+        }
+    }
+}
+
+void FffGcodeWriter::processSkirt(SliceDataStorage& storage, GCodePlanner& gcode_layer, unsigned int extruder_nr)
+{
+    gcode_layer.setCombing(false);
+    Polygons& skirt = storage.skirt[extruder_nr];
+    if (skirt.size() > 0)
+    {
+        gcode_layer.addTravel(skirt[skirt.size()-1].closestPointTo(gcode.getPositionXY()));
+    }
+    gcode_layer.addPolygonsByOptimizer(skirt, &storage.skirt_config[extruder_nr]);
+    
+}
+
+void FffGcodeWriter::processOozeShield(SliceDataStorage& storage, GCodePlanner& gcode_layer, unsigned int layer_nr)
+{
+    if (storage.oozeShield.size() > 0)
+    {
+        gcode_layer.setCombing(false);
+        gcode_layer.addPolygonsByOptimizer(storage.oozeShield[layer_nr], &storage.skirt_config[0]); // TODO: skirt config idx should correspond to ooze shield extruder nr
+    }
+}
+
+void FffGcodeWriter::processDraftShield(SliceDataStorage& storage, GCodePlanner& gcode_layer, unsigned int layer_nr)
+{
+    if (storage.draft_protection_shield.size() == 0)
+    {
+        return;
+    }
+    
+    int draft_shield_height = getSettingInMicrons("draft_shield_height");
+    int layer_height_0 = getSettingInMicrons("layer_height_0");
+    int layer_height = getSettingInMicrons("layer_height");
+    
+    int max_screen_layer = (draft_shield_height - layer_height_0) / layer_height + 1;
+    
+    if (int(layer_nr) > max_screen_layer)
+    {
+        return;
+    }
+    
+    gcode_layer.setCombing(false);
+    gcode_layer.addPolygonsByOptimizer(storage.draft_protection_shield, &storage.skirt_config[0]); // TODO: skirt config idx should correspond to draft shield extruder nr
+    
+}
+
+std::vector<unsigned int> FffGcodeWriter::calculateMeshOrder(SliceDataStorage& storage, int current_extruder)
+{
+    std::vector<unsigned int> ret;
+    std::list<unsigned int> add_list;
+    for(unsigned int mesh_idx = 0; mesh_idx < storage.meshes.size(); mesh_idx++)
+        add_list.push_back(mesh_idx);
+
+    int add_extruder_nr = current_extruder;
+    while(add_list.size() > 0)
+    {
+        for(auto add_it = add_list.begin(); add_it != add_list.end(); )
+        {
+            if (storage.meshes[*add_it].getSettingAsIndex("extruder_nr") == add_extruder_nr)
+            {
+                ret.push_back(*add_it);
+                add_it = add_list.erase(add_it);
+            } 
+            else 
+            {
+                ++add_it;
+            }
+        }
+        if (add_list.size() > 0)
+            add_extruder_nr = storage.meshes[*add_list.begin()].getSettingAsIndex("extruder_nr");
+    }
+    return ret;
+}
+
+void FffGcodeWriter::addMeshLayerToGCode_meshSurfaceMode(SliceDataStorage& storage, SliceMeshStorage* mesh, GCodePlanner& gcode_layer, int layer_nr)
+{
+    if (layer_nr > mesh->layer_nr_max_filled_layer)
+    {
+        return;
+    }
+    
+    setExtruder_addPrime(storage, gcode_layer, layer_nr, mesh->getSettingAsIndex("extruder_nr"));
+
+    SliceLayer* layer = &mesh->layers[layer_nr];
+
+
+    Polygons polygons;
+    for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
+    {
+        polygons.add(layer->parts[partNr].outline);
+    }
+    if (mesh->getSettingBoolean("magic_spiralize")) 
+        mesh->inset0_config.spiralize = true;
+
+    gcode_layer.addPolygonsByOptimizer(polygons, &mesh->inset0_config);
+    
+    addMeshOpenPolyLinesToGCode(storage, mesh, gcode_layer, layer_nr);
+}
+
+void FffGcodeWriter::addMeshOpenPolyLinesToGCode(SliceDataStorage& storage, SliceMeshStorage* mesh, GCodePlanner& gcode_layer, int layer_nr)
+{
+    SliceLayer* layer = &mesh->layers[layer_nr];
+    
+    Polygons lines;
+    for(PolygonRef polyline : layer->openPolyLines)
+    {
+        for(unsigned int point_idx = 1; point_idx<polyline.size(); point_idx++)
+        {
+            Polygon p;
+            p.add(polyline[point_idx-1]);
+            p.add(polyline[point_idx]);
+            lines.add(p);
+        }
+    }
+    gcode_layer.addLinesByOptimizer(lines, &mesh->inset0_config);
+    
+}
+
+void FffGcodeWriter::addMeshLayerToGCode(SliceDataStorage& storage, SliceMeshStorage* mesh, GCodePlanner& gcode_layer, int layer_nr)
+{
+    if (layer_nr > mesh->layer_nr_max_filled_layer)
+    {
+        return;
+    }
+    
+    SliceLayer* layer = &mesh->layers[layer_nr];
+
+    if (layer->parts.size() == 0)
+    {
+        return;
+    }
+    
+    setExtruder_addPrime(storage, gcode_layer, layer_nr, mesh->getSettingAsIndex("extruder_nr"));
+
+    
+    EZSeamType z_seam_type = mesh->getSettingAsZSeamType("z_seam_type");
+    PathOrderOptimizer part_order_optimizer(gcode.getStartPositionXY(), z_seam_type);
+    for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
+    {
+        part_order_optimizer.addPolygon(layer->parts[partNr].insets[0][0]);
+    }
+    part_order_optimizer.optimize();
+
+    bool skin_alternate_rotation = mesh->getSettingBoolean("skin_alternate_rotation") && ( mesh->getSettingAsCount("top_layers") >= 4 || mesh->getSettingAsCount("bottom_layers") >= 4 );
+    
+    for(int order_idx : part_order_optimizer.polyOrder)
+    {
+        SliceLayerPart& part = layer->parts[order_idx];
+
+        int infill_angle = 45;
+        if (layer_nr & 1)
+            infill_angle += 90;
+        int infill_line_width =  mesh->infill_config[0].getLineWidth();
+        
+        int infill_line_distance = mesh->getSettingInMicrons("infill_line_distance");
+        double infill_overlap = mesh->getSettingInPercentage("infill_overlap");
+        
+        if (mesh->getSettingBoolean("infill_before_walls"))
+        {
+            processMultiLayerInfill(gcode_layer, mesh, part, layer_nr, infill_line_distance, infill_overlap, infill_angle, infill_line_width);
+            processSingleLayerInfill(gcode_layer, mesh, part, layer_nr, infill_line_distance, infill_overlap, infill_angle, infill_line_width);
+        }
+        
+        processInsets(gcode_layer, mesh, part, layer_nr, z_seam_type);
+
+        if (!mesh->getSettingBoolean("infill_before_walls"))
+        {
+            processMultiLayerInfill(gcode_layer, mesh, part, layer_nr, infill_line_distance, infill_overlap, infill_angle, infill_line_width);
+            processSingleLayerInfill(gcode_layer, mesh, part, layer_nr, infill_line_distance, infill_overlap, infill_angle, infill_line_width);
+        }
+
+        if (skin_alternate_rotation && ( layer_nr / 2 ) & 1)
+            infill_angle -= 45;
+        
+        int64_t skin_overlap = 0;
+        processSkin(gcode_layer, mesh, part, layer_nr, skin_overlap, infill_angle, mesh->skin_config.getLineWidth());    
+        
+        //After a layer part, make sure the nozzle is inside the comb boundary, so we do not retract on the perimeter.
+        if (!mesh->getSettingBoolean("magic_spiralize") || static_cast<int>(layer_nr) < mesh->getSettingAsCount("bottom_layers"))
+            gcode_layer.moveInsideCombBoundary(mesh->getSettingInMicrons("machine_nozzle_size") * 1);
+    }
+    if (mesh->getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::NORMAL)
+    {
+        addMeshOpenPolyLinesToGCode(storage, mesh, gcode_layer, layer_nr);
+    }
+}
+
+
+            
+
+
+void FffGcodeWriter::processMultiLayerInfill(GCodePlanner& gcode_layer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, int infill_line_distance, double infill_overlap, int infill_angle, int extrusion_width)
+{
+    if (infill_line_distance > 0)
+    {
+        //Print the thicker infill lines first. (double or more layer thickness, infill combined with previous layers)
+        for(unsigned int n=1; n<part.infill_area.size(); n++)
+        {
+            Infill infill_comp(mesh->getSettingAsFillMethod("infill_pattern"), part.infill_area[n], 0, false, extrusion_width, infill_line_distance, infill_overlap, infill_angle, false, false);
+            Polygons infill_polygons;
+            Polygons infill_lines;
+            infill_comp.generate(infill_polygons, infill_lines, nullptr);
+            gcode_layer.addPolygonsByOptimizer(infill_polygons, &mesh->infill_config[n]);
+            gcode_layer.addLinesByOptimizer(infill_lines, &mesh->infill_config[n]);
+            sendPolygons(InfillType, layer_nr, infill_lines, extrusion_width);
+        }
+    }
+}
+
+void FffGcodeWriter::processSingleLayerInfill(GCodePlanner& gcode_layer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, int infill_line_distance, double infill_overlap, int infill_angle, int extrusion_width)
+{
+    
+    if (infill_line_distance == 0 || part.infill_area.size() == 0)
+    {
+        return;
+    }
+        
+    //Combine the 1 layer thick infill with the top/bottom skin and print that as one thing.
+    Polygons infill_polygons;
+    Polygons infill_lines;
+    
+    EFillMethod pattern = mesh->getSettingAsFillMethod("infill_pattern");
+    Infill infill_comp(pattern, part.infill_area[0], 0, false, extrusion_width, infill_line_distance, infill_overlap, infill_angle, false, false);
+    infill_comp.generate(infill_polygons, infill_lines, nullptr);
+    gcode_layer.addPolygonsByOptimizer(infill_polygons, &mesh->infill_config[0]);
+    if (pattern == EFillMethod::GRID || pattern == EFillMethod::LINES || pattern == EFillMethod::TRIANGLES)
+    {
+        gcode_layer.addLinesByOptimizer(infill_lines, &mesh->infill_config[0], mesh->getSettingInMicrons("infill_wipe_dist")); 
+    }
+    else 
+    {
+        gcode_layer.addLinesByOptimizer(infill_lines, &mesh->infill_config[0]); 
+    }
+    sendPolygons(InfillType, layer_nr, infill_lines, extrusion_width);
+}
+
+void FffGcodeWriter::processInsets(GCodePlanner& gcode_layer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, EZSeamType z_seam_type)
+{
+    bool compensate_overlap = mesh->getSettingBoolean("travel_compensate_overlapping_walls_enabled");
+    if (mesh->getSettingAsCount("wall_line_count") > 0)
+    {
+        if (mesh->getSettingBoolean("magic_spiralize"))
+        {
+            if (static_cast<int>(layer_nr) >= mesh->getSettingAsCount("bottom_layers"))
+                mesh->inset0_config.spiralize = true;
+            if (static_cast<int>(layer_nr) == mesh->getSettingAsCount("bottom_layers") && part.insets.size() > 0)
+                gcode_layer.addPolygonsByOptimizer(part.insets[0], &mesh->insetX_config);
+        }
+        for(int inset_number=part.insets.size()-1; inset_number>-1; inset_number--)
+        {
+            if (inset_number == 0)
+            {
+                if (!compensate_overlap)
+                {
+                    gcode_layer.addPolygonsByOptimizer(part.insets[0], &mesh->inset0_config, nullptr, z_seam_type);
+                }
+                else
+                {
+                    Polygons& outer_wall = part.insets[0];
+                    WallOverlapComputation wall_overlap_computation(outer_wall, mesh->getSettingInMicrons("wall_line_width_0"));
+                    gcode_layer.addPolygonsByOptimizer(outer_wall, &mesh->inset0_config, &wall_overlap_computation, z_seam_type);
+                }
+            }
+            else
+            {
+                gcode_layer.addPolygonsByOptimizer(part.insets[inset_number], &mesh->insetX_config);
+            }
+        }
+    }
+}
+
+
+void FffGcodeWriter::processSkin(GCodePlanner& gcode_layer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, double infill_overlap, int infill_angle, int extrusion_width)
+{
+    for(SkinPart& skin_part : part.skin_parts) // TODO: optimize parts order
+    {
+        Polygons skin_polygons;
+        Polygons skin_lines;
+        
+        EFillMethod pattern = mesh->getSettingAsFillMethod("top_bottom_pattern");
+        int bridge = -1;
+        if (layer_nr > 0)
+            bridge = bridgeAngle(skin_part.outline, &mesh->layers[layer_nr-1]);
+        if (bridge > -1)
+        {
+            pattern = EFillMethod::LINES;
+        } 
+        Polygons* inner_skin_outline = nullptr;
+        int offset_from_inner_skin_outline = 0;
+        if (pattern == EFillMethod::CONCENTRIC)
+        {
+            offset_from_inner_skin_outline = -extrusion_width/2;
+        }
+        else
+        {
+            for (Polygons& skin_perimeter : skin_part.insets)
+            {
+                sendPolygons(SkinType, layer_nr, skin_perimeter, mesh->skin_config.getLineWidth());
+                gcode_layer.addPolygonsByOptimizer(skin_perimeter, &mesh->skin_config); // add polygons to gcode in inward order
+            }
+            if (skin_part.insets.size() > 0)
+            {
+                inner_skin_outline = &skin_part.insets.back();
+                offset_from_inner_skin_outline = -extrusion_width/2;
+                if (mesh->getSettingAsFillPerimeterGapMode("fill_perimeter_gaps") != FillPerimeterGapMode::NOWHERE)
+                {
+                    generateLineInfill(skin_part.perimeterGaps, 0, skin_lines, extrusion_width, extrusion_width, 0, infill_angle);
+                }
+            } 
+        }
+        
+        if (inner_skin_outline == nullptr)
+        {
+            inner_skin_outline = &skin_part.outline;
+        }
+        
+        Infill infill_comp(pattern, *inner_skin_outline, offset_from_inner_skin_outline, mesh->getSettingBoolean("remove_overlapping_walls_x_enabled"), extrusion_width, extrusion_width, infill_overlap, infill_angle, false, false);
+        infill_comp.generate(skin_polygons, skin_lines, &part.perimeterGaps);
+        
+        gcode_layer.addPolygonsByOptimizer(skin_polygons, &mesh->skin_config);
+        gcode_layer.addLinesByOptimizer(skin_lines, &mesh->skin_config);
+        sendPolygons(SkinType, layer_nr, skin_polygons, mesh->skin_config.getLineWidth());
+        sendPolygons(SkinType, layer_nr, skin_lines, mesh->skin_config.getLineWidth());
+    }
+    
+    // handle gaps between perimeters etc.
+    if (mesh->getSettingAsFillPerimeterGapMode("fill_perimeter_gaps") != FillPerimeterGapMode::NOWHERE)
+    {
+        Polygons perimeter_gap_lines;
+        generateLineInfill(part.perimeterGaps, 0, perimeter_gap_lines, extrusion_width, extrusion_width, 0, infill_angle);
+        gcode_layer.addLinesByOptimizer(perimeter_gap_lines, &mesh->skin_config);
+    }
+}
+
+void FffGcodeWriter::addSupportToGCode(SliceDataStorage& storage, GCodePlanner& gcode_layer, int layer_nr, int extruder_nr_before, bool before_rest)
+{
+    if (!storage.support.generated || layer_nr > storage.support.layer_nr_max_filled_layer)
+        return; 
+    
+    int support_roof_extruder_nr = getSettingAsIndex("support_roof_extruder_nr");
+    int support_extruder_nr = (layer_nr == 0)? getSettingAsIndex("support_extruder_nr_layer_0") : getSettingAsIndex("support_extruder_nr");
+    
+    bool print_support_before_rest = support_extruder_nr == extruder_nr_before
+                                    || support_roof_extruder_nr == extruder_nr_before;
+    // TODO: always print support after rest when only one nozzle is used for the whole meshgroup
+    
+    if (print_support_before_rest != before_rest)
+        return;
+    
+    gcode_layer.setCombing(false);
+    
+    int current_extruder_nr = gcode_layer.getExtruder();
+    
+    if (storage.support.supportLayers[layer_nr].roofs.size() > 0)
+    {
+        if (support_roof_extruder_nr != support_extruder_nr && support_roof_extruder_nr == current_extruder_nr)
+        {
+            addSupportRoofsToGCode(storage, gcode_layer, layer_nr);
+            addSupportLinesToGCode(storage, gcode_layer, layer_nr);
+        }
+        else 
+        {
+            addSupportLinesToGCode(storage, gcode_layer, layer_nr);
+            addSupportRoofsToGCode(storage, gcode_layer, layer_nr);
+        }
+    }
+    else
+    {
+        addSupportLinesToGCode(storage, gcode_layer, layer_nr);
+    }
+}
+
+void FffGcodeWriter::addSupportLinesToGCode(SliceDataStorage& storage, GCodePlanner& gcode_layer, int layer_nr)
+{
+    if (!storage.support.generated 
+        || layer_nr > storage.support.layer_nr_max_filled_layer 
+        || storage.support.supportLayers[layer_nr].supportAreas.size() == 0)
+    {
+        return;
+    }
+    
+    int support_line_distance = getSettingInMicrons("support_line_distance");
+    int extrusion_width = storage.support_config.getLineWidth();
+    EFillMethod support_pattern = getSettingAsFillMethod("support_pattern");
+    if (layer_nr == 0 && (support_pattern == EFillMethod::LINES || support_pattern == EFillMethod::ZIG_ZAG)) { support_pattern = EFillMethod::GRID; }
+    
+    int support_extruder_nr = (layer_nr == 0)? getSettingAsIndex("support_extruder_nr_layer_0") : getSettingAsIndex("support_extruder_nr");
+    
+    double infill_overlap = storage.meshgroup->getExtruderTrain(support_extruder_nr)->getSettingInPercentage("infill_overlap");
+    
+    setExtruder_addPrime(storage, gcode_layer, layer_nr, support_extruder_nr);
+    
+    Polygons& support = storage.support.supportLayers[layer_nr].supportAreas;
+    
+    std::vector<PolygonsPart> support_islands = support.splitIntoParts();
+
+    PathOrderOptimizer island_order_optimizer(gcode.getPositionXY());
+    for(unsigned int n=0; n<support_islands.size(); n++)
+    {
+        island_order_optimizer.addPolygon(support_islands[n][0]);
+    }
+    island_order_optimizer.optimize();
+
+    for(unsigned int n=0; n<support_islands.size(); n++)
+    {
+        PolygonsPart& island = support_islands[island_order_optimizer.polyOrder[n]];
+
+        int offset_from_outline = 0;
+        Infill infill_comp(support_pattern, island, offset_from_outline, false, extrusion_width, support_line_distance, infill_overlap, 0, getSettingBoolean("support_connect_zigzags"), true);
+        Polygons support_polygons;
+        Polygons support_lines;
+        infill_comp.generate(support_polygons, support_lines, nullptr);
+
+        if (support_pattern == EFillMethod::GRID || support_pattern == EFillMethod::TRIANGLES)
+        {
+            gcode_layer.addPolygonsByOptimizer(island, &storage.support_config);
+            sendPolygons(SupportType, layer_nr, island, storage.support_config.getLineWidth());
+        }
+        gcode_layer.addPolygonsByOptimizer(support_polygons, &storage.support_config);
+        gcode_layer.addLinesByOptimizer(support_lines, &storage.support_config);
+        sendPolygons(SupportInfillType, layer_nr, support_polygons, storage.support_config.getLineWidth());
+        sendPolygons(SupportInfillType, layer_nr, support_lines, storage.support_config.getLineWidth());
+    }
+}
+
+void FffGcodeWriter::addSupportRoofsToGCode(SliceDataStorage& storage, GCodePlanner& gcode_layer, int layer_nr)
+{
+    if (!storage.support.generated 
+        || layer_nr > storage.support.layer_nr_max_filled_layer 
+        || storage.support.supportLayers[layer_nr].roofs.size() == 0)
+    {
+        return;
+    }
+    
+    EFillMethod pattern = getSettingAsFillMethod("support_roof_pattern");
+    int support_line_distance = getSettingInMicrons("support_roof_line_distance");
+    
+    int roof_extruder_nr = getSettingAsIndex("support_roof_extruder_nr");
+    setExtruder_addPrime(storage, gcode_layer, layer_nr, roof_extruder_nr);
+    
+    double fillAngle;
+    if (pattern == EFillMethod::CONCENTRIC)
+    {
+        fillAngle = 0;
+    }
+    else if (getSettingInMicrons("support_roof_height") < 2 * getSettingInMicrons("layer_height") || pattern == EFillMethod::TRIANGLES)
+    {
+        fillAngle = 90; // perpendicular to support lines
+    }
+    else 
+    {
+        fillAngle = 45 + (layer_nr % 2) * 90; // alternate between the two kinds of diagonal:  / and \ .
+    }
+    double infill_overlap = 0;
+    int outline_offset =  0; 
+    
+    Infill infill_comp(pattern, storage.support.supportLayers[layer_nr].roofs, outline_offset, false, storage.support_roof_config.getLineWidth(), support_line_distance, infill_overlap, fillAngle, false, true);
+    Polygons support_polygons;
+    Polygons support_lines;
+    infill_comp.generate(support_polygons, support_lines, nullptr);
+
+    gcode_layer.addPolygonsByOptimizer(support_polygons, &storage.support_roof_config);
+    gcode_layer.addLinesByOptimizer(support_lines, &storage.support_roof_config);
+    sendPolygons(SupportType, layer_nr, support_polygons, storage.support_roof_config.getLineWidth());
+    sendPolygons(SupportType, layer_nr, support_lines, storage.support_roof_config.getLineWidth());
+}
+
+void FffGcodeWriter::setExtruder_addPrime(SliceDataStorage& storage, GCodePlanner& gcode_layer, int layer_nr, int extruder_nr)
+{
+    if (extruder_nr == -1) // an object with extruder_nr==-1 means it will be printed with any current nozzle
+        return;
+    
+    int previous_extruder = gcode_layer.getExtruder();
+    if (previous_extruder == extruder_nr) { return; }
+    bool extruder_changed = gcode_layer.setExtruder(extruder_nr);
+    
+    if (extruder_changed)
+    {
+        if (layer_nr == 0)
+        {
+            processSkirt(storage, gcode_layer, extruder_nr);
+        }
+        else
+        {
+            addPrimeTower(storage, gcode_layer, layer_nr, previous_extruder);
+            
+        }
+    }
+}
+
+void FffGcodeWriter::addPrimeTower(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr, int prev_extruder)
+{
+    
+    if (getSettingInMicrons("prime_tower_size") < 1)
+    {
+        return;
+    }
+    
+    bool prime_tower_dir_outward = getSettingBoolean("prime_tower_dir_outward");
+    bool wipe = getSettingBoolean("prime_tower_wipe_enabled");
+    
+    storage.primeTower.addToGcode(storage, gcodeLayer, gcode, layer_nr, prev_extruder, prime_tower_dir_outward, wipe, last_prime_tower_poly_printed);
+}
+
+void FffGcodeWriter::processFanSpeedAndMinimalLayerTime(SliceDataStorage& storage, GCodePlanner& gcodeLayer, unsigned int layer_nr)
+{ 
+    double travelTime;
+    double extrudeTime;
+    gcodeLayer.getNaiveTimeEstimates(travelTime, extrudeTime);
+    gcodeLayer.forceMinimalLayerTime(getSettingInSeconds("cool_min_layer_time"), getSettingInMillimetersPerSecond("cool_min_speed"), travelTime, extrudeTime);
+
+    // interpolate fan speed (for cool_fan_full_layer and for cool_min_layer_time_fan_speed_max)
+    double fanSpeed = getSettingInPercentage("cool_fan_speed_min");
+    double totalLayerTime = travelTime + extrudeTime;
+    if (totalLayerTime < getSettingInSeconds("cool_min_layer_time"))
+    {
+        fanSpeed = getSettingInPercentage("cool_fan_speed_max");
+    }
+    else if (totalLayerTime < getSettingInSeconds("cool_min_layer_time_fan_speed_max"))
+    { 
+        // when forceMinimalLayerTime didn't change the extrusionSpeedFactor, we adjust the fan speed
+        double minTime = (getSettingInSeconds("cool_min_layer_time"));
+        double maxTime = (getSettingInSeconds("cool_min_layer_time_fan_speed_max"));
+        double fanSpeedMin = getSettingInPercentage("cool_fan_speed_min");
+        double fanSpeedMax = getSettingInPercentage("cool_fan_speed_max");
+        fanSpeed = fanSpeedMax - (fanSpeedMax-fanSpeedMin) * (totalLayerTime - minTime) / (maxTime - minTime);
+    }
+    if (static_cast<int>(layer_nr) < getSettingAsCount("cool_fan_full_layer"))
+    {
+        //Slow down the fan on the layers below the [cool_fan_full_layer], where layer 0 is speed 0.
+        fanSpeed = fanSpeed * layer_nr / getSettingAsCount("cool_fan_full_layer");
+    }
+    gcode.writeFanCommand(fanSpeed);
+}
+
+void FffGcodeWriter::finalize()
+{
+    if (command_socket)
+    {
+        std::ostringstream prefix;
+        prefix << ";FLAVOR:" << toString(gcode.getFlavor()) << "\n";
+        prefix << ";TIME:" << int(gcode.getTotalPrintTime()) << "\n";
+        if (gcode.getFlavor() == EGCodeFlavor::ULTIGCODE)
+        {
+            prefix << ";MATERIAL:" << int(gcode.getTotalFilamentUsed(0)) << "\n";
+            prefix << ";MATERIAL2:" << int(gcode.getTotalFilamentUsed(1)) << "\n";
+        }
+        command_socket->sendGCodePrefix(prefix.str());
+    }
+    
+    gcode.finalize(max_object_height, getSettingInMillimetersPerSecond("speed_travel"), getSettingString("machine_end_gcode").c_str());
+    for(int e=0; e<getSettingAsCount("machine_extruder_count"); e++)
+        gcode.writeTemperatureCommand(e, 0, false);
+    
+    gcode.writeComment("End of Gcode");
+    /*
+    the profile string below can be executed since the M25 doesn't end the gcode on an UMO and when printing via USB.
+    gcode.writeCode("M25 ;Stop reading from this point on.");
+    gcode.writeComment("Cura profile string:");
+    gcode.writeComment(FffProcessor::getInstance()->getAllLocalSettingsString() + FffProcessor::getInstance()->getProfileString());
+    */
+}
+
+
+}//namespace cura

src/FffGcodeWriter.h

@@ -0,0 +1,320 @@
+#ifndef GCODE_WRITER_H
+#define GCODE_WRITER_H
+
+
+#include <fstream>
+#include "utils/gettime.h"
+#include "utils/logoutput.h"
+#include "sliceDataStorage.h"
+#include "raft.h"
+#include "infill.h"
+#include "bridge.h"
+#include "pathOrderOptimizer.h"
+#include "gcodePlanner.h"
+#include "gcodeExport.h"
+#include "commandSocket.h"
+#include "utils/polygonUtils.h"
+#include "PrimeTower.h"
+
+namespace cura 
+{
+
+/*!
+ * Secondary stage in Fused Filament Fabrication processing: The generated polygons are used in the gcode generation.
+ * Some polygons in the SliceDataStorage signify areas which are to be filled with parallel lines, 
+ * while other polygons signify the contours which should be printed.
+ * 
+ * The main function of this class is FffGcodeWriter::writeGCode().
+ */
+class FffGcodeWriter : public SettingsMessenger
+{
+    friend class FffProcessor; // cause WireFrame2Gcode uses the member [gcode] (TODO)
+private:
+    int max_object_height;
+    int meshgroup_number; //!< used for sequential printing of objects
+    GCodeExport gcode;
+    CommandSocket* command_socket;
+    std::ofstream output_file;
+    
+    /*!
+     * Layer number of the last layer in which a prime tower has been printed per extruder train.  
+     * 
+     * This is recorded per extruder to account for a prime tower per extruder, instead of the mixed prime tower.
+     */
+    int last_prime_tower_poly_printed[MAX_EXTRUDERS]; 
+public:
+    FffGcodeWriter(SettingsBase* settings_)
+    : SettingsMessenger(settings_)
+    {
+        meshgroup_number = 1;
+        max_object_height = 0;
+        command_socket = NULL;
+    }
+    void resetFileNumber()
+    {
+        meshgroup_number = 1;
+    }
+
+    void setCommandSocket(CommandSocket* socket)
+    {
+        command_socket = socket;
+    }
+
+    void sendPolygons(PolygonType type, int layer_nr, Polygons& polygons, int line_width)
+    {
+        if (command_socket)
+            command_socket->sendPolygons(type, layer_nr, polygons, line_width);
+    }
+        
+    bool setTargetFile(const char* filename)
+    {
+        output_file.open(filename);
+        if (output_file.is_open())
+        {
+            gcode.setOutputStream(&output_file);
+            return true;
+        }
+        return false;
+    }
+    
+    void setTargetStream(std::ostream* stream)
+    {
+        gcode.setOutputStream(stream);
+    }
+    
+    double getTotalFilamentUsed(int e)
+    {
+        return gcode.getTotalFilamentUsed(e);
+    }
+
+    double getTotalPrintTime()
+    {
+        return gcode.getTotalPrintTime();
+    }
+
+    void writeGCode(SliceDataStorage& storage, TimeKeeper& timeKeeper);
+    
+private:
+    void setConfigCoasting(SliceDataStorage& storage);
+
+    //Setup the retraction parameters.
+    void setConfigRetraction(SliceDataStorage& storage);
+    
+    void setConfigSkirt(SliceDataStorage& storage, int layer_thickness);
+    
+    void setConfigSupport(SliceDataStorage& storage, int layer_thickness);
+    
+    void setConfigInsets(SliceMeshStorage& mesh, int layer_thickness);
+    
+    void setConfigSkin(SliceMeshStorage& mesh, int layer_thickness);
+    
+    void setConfigInfill(SliceMeshStorage& mesh, int layer_thickness);
+    
+    /*!
+     * Set temperatures and perform initial priming.
+     * \param storage Input: where the slice data is stored.
+     */
+    void processStartingCode(SliceDataStorage& storage);
+
+    /*!
+     * Move up and over the just printed model to print the next model.
+     * \param storage Input: where the slice data is stored.
+     */
+    void processNextMeshGroupCode(SliceDataStorage& storage);
+    
+    /*!
+     * Add raft gcode.
+     * \param storage Input: where the slice data is stored.
+     * \param total_layers The total number of layers.
+     */
+    void processRaft(SliceDataStorage& storage, unsigned int total_layers);
+    
+    /*!
+     * Add a layer to the gcode.
+     * \param storage Input: where the slice data is stored.
+     * \param layer_nr The index of the layer to write the gcode of.
+     * \param total_layers The total number of layers.
+     * \param has_raft Whether a raft is used for this print.
+     */
+    void processLayer(SliceDataStorage& storage, unsigned int layer_nr, unsigned int total_layers, bool has_raft);
+    
+    /*!
+     * Interpolate between the initial layer speeds and the eventual speeds.
+     * \param storage Input: where the slice data is stored.
+     * \param layer_nr The index of the layer to write the gcode of.
+     */
+    void processInitialLayersSpeedup(SliceDataStorage& storage, unsigned int layer_nr);
+    
+    /*!
+     * Add the skirt to the gcode.
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param extruder_nr The extrudewr train for which to process the skirt
+     */
+    void processSkirt(SliceDataStorage& storage, GCodePlanner& gcodeLayer, unsigned int extruder_nr);
+    
+    /*!
+     * Adds the ooze shield to the print.
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     */
+    void processOozeShield(SliceDataStorage& storage, GCodePlanner& gcodeLayer, unsigned int layer_nr);
+    
+    /*!
+     * Adds the draft protection screen to the print.
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     */
+    void processDraftShield(SliceDataStorage& storage, GCodePlanner& gcodeLayer, unsigned int layer_nr);
+    
+    /*!
+     * Calculate in which order to print the meshes.
+     * \param storage Input: where the slice data is stored.
+     * \param current_extruder The current extruder with which we last printed
+     * \return A vector of mesh indices ordered on print order.
+     */
+    std::vector<unsigned int> calculateMeshOrder(SliceDataStorage& storage, int current_extruder);
+        
+    /*!
+     * Add a single layer from a single mesh-volume to the GCode in mesh surface mode.
+     * \param storage Input: where the slice data is stored.
+     * \param mesh The mesh to add to the gcode.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     * 
+     */
+    void addMeshLayerToGCode_meshSurfaceMode(SliceDataStorage& storage, SliceMeshStorage* mesh, GCodePlanner& gcodeLayer, int layer_nr);
+    
+    /*!
+     * Add the open polylines from a single layer from a single mesh-volume to the GCode for mesh surface mode.
+     * \param storage Input: where the slice data is stored.
+     * \param mesh The mesh for which to add to the gcode.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     * 
+     */
+    void addMeshOpenPolyLinesToGCode(SliceDataStorage& storage, SliceMeshStorage* mesh, GCodePlanner& gcode_layer, int layer_nr);
+    
+    /*!
+     * Add a single layer from a single mesh-volume to the GCode.
+     * \param storage Input: where the slice data is stored.
+     * \param mesh The mesh to add to the gcode.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     * 
+     */
+    void addMeshLayerToGCode(SliceDataStorage& storage, SliceMeshStorage* mesh, GCodePlanner& gcodeLayer, int layer_nr);
+    
+    /*!
+     * Add thicker (multiple layers) sparse infill for a given part in a layer.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param mesh The mesh for which to add to the gcode.
+     * \param part The part for which to create gcode
+     * \param layer_nr The current layer number.
+     * \param infill_line_distance The distance between the infill lines
+     * \param infill_overlap The fraction of the extrusion width by which the infill overlaps with the wall insets.
+     * \param fillAngle The angle in the XY plane at which the infill is generated.
+     * \param extrusionWidth extrusionWidth
+     */
+    void processMultiLayerInfill(GCodePlanner& gcodeLayer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, int infill_line_distance, double infill_overlap, int fillAngle, int extrusionWidth); 
+    
+    /*!
+     * Add normal sparse infill for a given part in a layer.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param mesh The mesh for which to add to the gcode.
+     * \param part The part for which to create gcode
+     * \param layer_nr The current layer number.
+     * \param infill_line_distance The distance between the infill lines
+     * \param infill_overlap The fraction of the extrusion width by which the infill overlaps with the wall insets.
+     * \param fillAngle The angle in the XY plane at which the infill is generated.
+     * \param extrusionWidth extrusionWidth
+     */
+    void processSingleLayerInfill(GCodePlanner& gcodeLayer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, int infill_line_distance, double infill_overlap, int fillAngle, int extrusionWidth);
+    
+    /*!
+     * Generate the insets for the walls of a given layer part.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param mesh The mesh for which to add to the gcode.
+     * \param part The part for which to create gcode
+     * \param layer_nr The current layer number.
+     * \param z_seam_type dir3ective for where to start the outer paerimeter of a part
+     */
+    void processInsets(GCodePlanner& gcodeLayer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, EZSeamType z_seam_type);
+    
+    
+    /*!
+     * Add the gcode of the top/bottom skin of the given part.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param mesh The mesh for which to add to the gcode.
+     * \param part The part for which to create gcode
+     * \param layer_nr The current layer number.
+     * \param infill_overlap The fraction of the extrusion width by which the infill overlaps with the wall insets.
+     * \param fillAngle The angle in the XY plane at which the infill is generated.
+     * \param extrusionWidth extrusionWidth
+     */
+    void processSkin(cura::GCodePlanner& gcode_layer, cura::SliceMeshStorage* mesh, cura::SliceLayerPart& part, unsigned int layer_nr, double infill_overlap, int infill_angle, int extrusion_width);
+    
+    /*!
+     * Add the support to the gcode of the current layer.
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     * \param extruder_nr_before The extruder number at the start of the layer (before other print parts aka the rest)
+     * \param before_rest Whether the function has been called before adding the rest to the gcode, or after.
+     */
+    void addSupportToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr, int extruder_nr_before, bool before_rest);
+    /*!
+     * Add the support lines/walls to the gcode of the current layer.
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     */
+    void addSupportLinesToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr);
+    /*!
+     * Add the support roofs to the gcode of the current layer.
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     */
+    void addSupportRoofsToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr);
+    
+    /*!
+     * Change to a new extruder, and add the prime tower instructions if the new extruder is different from the last.
+     * 
+     * On layer 0 this function adds the skirt for the nozzle it switches to, instead of the prime tower.
+     * 
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     * \param extruder_nr The extruder to which to switch
+     */
+    void setExtruder_addPrime(SliceDataStorage& storage, GCodePlanner& gcode_layer, int layer_nr, int extruder_nr);
+    
+    /*!
+     * Add the prime tower gcode for the current layer.
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     * \param prev_extruder The current extruder with which we last printed.
+     */
+    void addPrimeTower(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr, int prev_extruder);
+    
+    /*!
+     * Finish the layer by applying speed corrections for minimal layer times and determine the fanSpeed.
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param layer_nr The index of the layer to write the gcode of.
+     */
+    void processFanSpeedAndMinimalLayerTime(SliceDataStorage& storage, GCodePlanner& gcodeLayer, unsigned int layer_nr);
+    
+    /*!
+     * Add the end gcode and set all temperatures to zero.
+     */
+    void finalize();
+};
+
+}//namespace cura
+
+#endif // GCODE_WRITER_H

src/FffPolygonGenerator.cpp

@@ -0,0 +1,505 @@
+#include "FffPolygonGenerator.h"
+
+#include <algorithm>
+
+#include "slicer.h"
+#include "utils/gettime.h"
+#include "utils/logoutput.h"
+#include "MeshGroup.h"
+#include "support.h"
+#include "multiVolumes.h"
+#include "layerPart.h"
+#include "inset.h"
+#include "skirt.h"
+#include "skin.h"
+#include "infill.h"
+#include "raft.h"
+#include "debug.h"
+#include "Progress.h"
+
+namespace cura
+{
+
+    
+bool FffPolygonGenerator::generateAreas(SliceDataStorage& storage, MeshGroup* meshgroup, TimeKeeper& timeKeeper)
+{
+    if (commandSocket)
+        commandSocket->beginSendSlicedObject();
+    
+    if (!sliceModel(meshgroup, timeKeeper, storage)) 
+    {
+        return false;
+    }
+    
+    slices2polygons(storage, timeKeeper);
+    
+    return true;
+}
+
+bool FffPolygonGenerator::sliceModel(MeshGroup* meshgroup, TimeKeeper& timeKeeper, SliceDataStorage& storage) /// slices the model
+{
+    Progress::messageProgressStage(Progress::Stage::SLICING, &timeKeeper, commandSocket);
+    
+    storage.model_min = meshgroup->min();
+    storage.model_max = meshgroup->max();
+    storage.model_size = storage.model_max - storage.model_min;
+
+    log("Slicing model...\n");
+    int initial_layer_thickness = meshgroup->getSettingInMicrons("layer_height_0");
+    if(initial_layer_thickness <= 0) //Initial layer height of 0 is not allowed. Negative layer height is nonsense.
+    {
+        logError("Initial layer height %i is disallowed.",initial_layer_thickness);
+        return false;
+    }
+    int layer_thickness = meshgroup->getSettingInMicrons("layer_height");
+    if(layer_thickness <= 0) //Layer height of 0 is not allowed. Negative layer height is nonsense.
+    {
+        logError("Layer height %i is disallowed.",layer_thickness);
+        return false;
+    }
+    if (meshgroup->getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT) 
+    { 
+        initial_layer_thickness = layer_thickness; 
+    }
+    int initial_slice_z = initial_layer_thickness - layer_thickness / 2;
+    int layer_count = (storage.model_max.z - initial_slice_z) / layer_thickness + 1;
+    if(layer_count <= 0) //Model is shallower than layer_height_0, so not even the first layer is sliced. Return an empty model then.
+    {
+        Progress::messageProgressStage(Progress::Stage::INSET,&timeKeeper,commandSocket); //Continue directly with the inset stage, which will also immediately stop.
+        return true; //This is NOT an error state!
+    }
+
+    std::vector<Slicer*> slicerList;
+    for(unsigned int mesh_idx = 0; mesh_idx < meshgroup->meshes.size(); mesh_idx++)
+    {
+        Mesh& mesh = meshgroup->meshes[mesh_idx];
+        Slicer* slicer = new Slicer(&mesh, initial_slice_z, layer_thickness, layer_count, mesh.getSettingBoolean("meshfix_keep_open_polygons"), mesh.getSettingBoolean("meshfix_extensive_stitching"));
+        slicerList.push_back(slicer);
+        /*
+        for(SlicerLayer& layer : slicer->layers)
+        {
+            //Reporting the outline here slows down the engine quite a bit, so only do so when debugging.
+            //sendPolygons("outline", layer_nr, layer.z, layer.polygonList);
+            //sendPolygons("openoutline", layer_nr, layer.openPolygonList);
+        }
+        */
+        Progress::messageProgress(Progress::Stage::SLICING, mesh_idx + 1, meshgroup->meshes.size(), commandSocket);
+    }
+    
+    log("Layer count: %i\n", layer_count);
+
+    meshgroup->clear();///Clear the mesh face and vertex data, it is no longer needed after this point, and it saves a lot of memory.
+
+    Progress::messageProgressStage(Progress::Stage::PARTS, &timeKeeper, commandSocket);
+    //carveMultipleVolumes(storage.meshes);
+    generateMultipleVolumesOverlap(slicerList, getSettingInMicrons("multiple_mesh_overlap"));
+    
+    storage.meshes.reserve(slicerList.size()); // causes there to be no resize in meshes so that the pointers in sliceMeshStorage._config to retraction_config don't get invalidated.
+    for(unsigned int meshIdx=0; meshIdx < slicerList.size(); meshIdx++)
+    {
+        storage.meshes.emplace_back(&meshgroup->meshes[meshIdx]); // new mesh in storage had settings from the Mesh
+        SliceMeshStorage& meshStorage = storage.meshes.back();
+        Mesh& mesh = storage.meshgroup->meshes[meshIdx];
+        createLayerParts(meshStorage, slicerList[meshIdx], mesh.getSettingBoolean("meshfix_union_all"), mesh.getSettingBoolean("meshfix_union_all_remove_holes"));
+        delete slicerList[meshIdx];
+
+        bool has_raft = meshStorage.getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT;
+        //Add the raft offset to each layer.
+        for(unsigned int layer_nr=0; layer_nr<meshStorage.layers.size(); layer_nr++)
+        {
+            SliceLayer& layer = meshStorage.layers[layer_nr];
+            meshStorage.layers[layer_nr].printZ += 
+                meshStorage.getSettingInMicrons("layer_height_0")
+                - initial_slice_z;
+            if (has_raft)
+            {
+                layer.printZ += 
+                    meshStorage.getSettingInMicrons("raft_base_thickness") 
+                    + meshStorage.getSettingInMicrons("raft_interface_thickness") 
+                    + meshStorage.getSettingAsCount("raft_surface_layers") * getSettingInMicrons("raft_surface_thickness") //raft_surface_thickness") 
+                    + meshStorage.getSettingInMicrons("raft_airgap");
+            }
+    
+ 
+            if (layer.parts.size() > 0 || (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::NORMAL && layer.openPolyLines.size() > 0) )
+            {
+                meshStorage.layer_nr_max_filled_layer = layer_nr; // last set by the highest non-empty layer
+            } 
+                
+            if (commandSocket)
+            {
+                commandSocket->sendLayerInfo(layer_nr, layer.printZ, layer_nr == 0 && !has_raft? meshStorage.getSettingInMicrons("layer_height_0") : meshStorage.getSettingInMicrons("layer_height"));
+            }
+        }
+        
+        Progress::messageProgress(Progress::Stage::PARTS, meshIdx + 1, slicerList.size(), commandSocket);
+    }
+    
+    Progress::messageProgressStage(Progress::Stage::INSET, &timeKeeper, commandSocket);
+    return true;
+}
+
+void FffPolygonGenerator::slices2polygons(SliceDataStorage& storage, TimeKeeper& time_keeper)
+{
+    size_t total_layers = 0;
+    for (SliceMeshStorage& mesh : storage.meshes)
+    {
+        total_layers = std::max<unsigned int>(total_layers, mesh.layers.size());
+    }
+    
+    //layerparts2HTML(storage, "output/output.html");
+    for(unsigned int layer_number = 0; layer_number < total_layers; layer_number++)
+    {
+        processInsets(storage, layer_number);
+        
+        Progress::messageProgress(Progress::Stage::INSET, layer_number+1, total_layers, commandSocket);
+    }
+    
+    removeEmptyFirstLayers(storage, getSettingInMicrons("layer_height"), total_layers);
+    
+    if (total_layers < 1)
+    {
+        log("Stopping process because there are no layers.\n");
+        return;
+    }
+    
+    Progress::messageProgressStage(Progress::Stage::SUPPORT, &time_keeper, commandSocket);  
+            
+    AreaSupport::generateSupportAreas(storage, total_layers, commandSocket);
+    /*
+    if (storage.support.generated)
+    {
+        for (unsigned int layer_idx = 0; layer_idx < total_layers; layer_idx++)
+        {
+            Polygons& support = storage.support.supportLayers[layer_idx].supportAreas;
+            sendPolygons(SupportType, layer_idx, support, getSettingInMicrons("support_line_width"));
+        }
+    }
+    */
+    
+    Progress::messageProgressStage(Progress::Stage::SKIN, &time_keeper, commandSocket);
+    int mesh_max_bottom_layer_count = 0;
+    if (getSettingBoolean("magic_spiralize"))
+    {
+        for(SliceMeshStorage& mesh : storage.meshes)
+        {
+            mesh_max_bottom_layer_count = std::max(mesh_max_bottom_layer_count, mesh.getSettingAsCount("bottom_layers"));
+        }
+    }
+    for(unsigned int layer_number = 0; layer_number < total_layers; layer_number++)
+    {
+        if (!getSettingBoolean("magic_spiralize") || static_cast<int>(layer_number) < mesh_max_bottom_layer_count)    //Only generate up/downskin and infill for the first X layers when spiralize is choosen.
+        {
+            processSkins(storage, layer_number);
+        }
+        Progress::messageProgress(Progress::Stage::SKIN, layer_number+1, total_layers, commandSocket);
+    }
+    
+    unsigned int combined_infill_layers = storage.getSettingInMicrons("infill_sparse_thickness") / std::max(storage.getSettingInMicrons("layer_height"),1); //How many infill layers to combine to obtain the requested sparse thickness.
+    for(SliceMeshStorage& mesh : storage.meshes)
+    {
+        combineInfillLayers(mesh,combined_infill_layers);
+    }
+
+    storage.primeTower.computePrimeTowerMax(storage);
+    storage.primeTower.generatePaths(storage, total_layers);
+    
+    processOozeShield(storage, total_layers);
+        
+    processDraftShield(storage, total_layers);
+    
+    processPlatformAdhesion(storage);
+
+    
+    for(SliceMeshStorage& mesh : storage.meshes)
+    {
+        if (mesh.getSettingBoolean("magic_fuzzy_skin_enabled"))
+        {
+            processFuzzyWalls(mesh);
+        }
+        else if (mesh.getSettingAsCount("wall_line_count") > 0)
+        { // only send polygon data
+            for (unsigned int layer_nr = 0; layer_nr < total_layers; layer_nr++)
+            {
+                SliceLayer* layer = &mesh.layers[layer_nr];
+                for(SliceLayerPart& part : layer->parts)
+                {
+                    sendPolygons(Inset0Type, layer_nr, (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") == ESurfaceMode::SURFACE)? part.outline : part.insets[0], mesh.getSettingInMicrons("wall_line_width_0"));
+                }
+            }
+        }
+    }
+}
+
+void FffPolygonGenerator::processInsets(SliceDataStorage& storage, unsigned int layer_nr) 
+{
+    for(SliceMeshStorage& mesh : storage.meshes)
+    {
+        SliceLayer* layer = &mesh.layers[layer_nr];
+        if (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::SURFACE)
+        {
+            int inset_count = mesh.getSettingAsCount("wall_line_count");
+            if (mesh.getSettingBoolean("magic_spiralize") && static_cast<int>(layer_nr) < mesh.getSettingAsCount("bottom_layers") && layer_nr % 2 == 1)//Add extra insets every 2 layers when spiralizing, this makes bottoms of cups watertight.
+                inset_count += 5;
+            int line_width_x = mesh.getSettingInMicrons("wall_line_width_x");
+            int line_width_0 = mesh.getSettingInMicrons("wall_line_width_0");
+            if (mesh.getSettingBoolean("alternate_extra_perimeter"))
+                inset_count += layer_nr % 2; 
+            generateInsets(layer, mesh.getSettingInMicrons("machine_nozzle_size"), line_width_0, line_width_x, inset_count, mesh.getSettingBoolean("remove_overlapping_walls_0_enabled"), mesh.getSettingBoolean("remove_overlapping_walls_x_enabled"));
+
+            for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
+            {
+                if (layer->parts[partNr].insets.size() > 0)
+                {
+//                     sendPolygons(Inset0Type, layer_nr, layer->parts[partNr].insets[0], line_width_0); // done after processing fuzzy skin
+                    for(unsigned int inset=1; inset<layer->parts[partNr].insets.size(); inset++)
+                        sendPolygons(InsetXType, layer_nr, layer->parts[partNr].insets[inset], line_width_x);
+                }
+            }
+        }
+        if (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::NORMAL)
+        {
+            for (PolygonRef polyline : layer->openPolyLines)
+            {
+                Polygons segments;
+                for (unsigned int point_idx = 1; point_idx < polyline.size(); point_idx++)
+                {
+                    PolygonRef segment = segments.newPoly();
+                    segment.add(polyline[point_idx-1]);
+                    segment.add(polyline[point_idx]);
+                }
+                sendPolygons(Inset0Type, layer_nr, segments, mesh.getSettingInMicrons("wall_line_width_0"));
+            }
+        }
+    }
+}
+
+void FffPolygonGenerator::removeEmptyFirstLayers(SliceDataStorage& storage, int layer_height, unsigned int total_layers)
+{ 
+    int n_empty_first_layers = 0;
+    for (unsigned int layer_idx = 0; layer_idx < total_layers; layer_idx++)
+    { 
+        bool layer_is_empty = true;
+        for (SliceMeshStorage& mesh : storage.meshes)
+        {
+            SliceLayer& layer = mesh.layers[layer_idx];
+            if (layer.parts.size() > 0 || (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::NORMAL && layer.openPolyLines.size() > 0) )
+            {
+                layer_is_empty = false;
+                break;
+            }
+        }
+        
+        if (layer_is_empty) 
+        {
+            n_empty_first_layers++;
+        } else
+        {
+            break;
+        }
+    }
+    
+    if (n_empty_first_layers > 0)
+    {
+        log("Removing %d layers because they are empty\n", n_empty_first_layers);
+        for (SliceMeshStorage& mesh : storage.meshes)
+        {
+            std::vector<SliceLayer>& layers = mesh.layers;
+            layers.erase(layers.begin(), layers.begin() + n_empty_first_layers);
+            for (SliceLayer& layer : layers)
+            {
+                layer.printZ -= n_empty_first_layers * layer_height;
+            }
+        }
+        total_layers -= n_empty_first_layers;
+    }
+}
+  
+void FffPolygonGenerator::processSkins(SliceDataStorage& storage, unsigned int layer_nr) 
+{
+    for(SliceMeshStorage& mesh : storage.meshes)
+    {
+        if (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") == ESurfaceMode::SURFACE) { continue; }
+        
+        int skin_extrusion_width = mesh.getSettingInMicrons("skin_line_width");
+        int innermost_wall_extrusion_width = mesh.getSettingInMicrons("wall_line_width_x");
+        int extrusionWidth_infill = mesh.getSettingInMicrons("infill_line_width");
+        generateSkins(layer_nr, mesh, skin_extrusion_width, mesh.getSettingAsCount("bottom_layers"), mesh.getSettingAsCount("top_layers"), innermost_wall_extrusion_width, mesh.getSettingAsCount("skin_outline_count"), mesh.getSettingBoolean("skin_no_small_gaps_heuristic"), mesh.getSettingBoolean("remove_overlapping_walls_0_enabled"), mesh.getSettingBoolean("remove_overlapping_walls_x_enabled"));
+        if (mesh.getSettingInMicrons("infill_line_distance") > 0)
+        {
+            int infill_skin_overlap = 0;
+            if (mesh.getSettingInMicrons("infill_line_distance") > mesh.getSettingInMicrons("infill_line_width") + 10)
+            {
+                infill_skin_overlap = skin_extrusion_width / 2;
+            }
+            generateInfill(layer_nr, mesh, extrusionWidth_infill, infill_skin_overlap);
+            if (mesh.getSettingAsFillPerimeterGapMode("fill_perimeter_gaps") == FillPerimeterGapMode::SKIN)
+            {
+                generatePerimeterGaps(layer_nr, mesh, skin_extrusion_width, mesh.getSettingAsCount("bottom_layers"), mesh.getSettingAsCount("top_layers"));
+            }
+            else if (mesh.getSettingAsFillPerimeterGapMode("fill_perimeter_gaps") == FillPerimeterGapMode::EVERYWHERE)
+            {
+                generatePerimeterGaps(layer_nr, mesh, skin_extrusion_width, 0, 0);
+            }
+        }
+
+        bool frontend_can_show_polygon_as_filled_polygon = false;
+        if (frontend_can_show_polygon_as_filled_polygon)
+        {
+            SliceLayer& layer = mesh.layers[layer_nr];
+            for(SliceLayerPart& part : layer.parts)
+            {
+//                  sendPolygons(InfillType, layer_nr, part.infill_area[0], extrusionWidth_infill); // sends the outline, not the actual infill
+                for (SkinPart& skin_part : part.skin_parts)
+                {
+                    sendPolygons(SkinType, layer_nr, skin_part.outline, innermost_wall_extrusion_width);
+                }
+            }
+        }
+    }
+}
+
+void FffPolygonGenerator::processOozeShield(SliceDataStorage& storage, unsigned int total_layers)
+{
+    if (!getSettingBoolean("ooze_shield_enabled"))
+    {
+        return;
+    }
+    
+    int ooze_shield_dist = getSettingInMicrons("ooze_shield_dist");
+    
+    for(unsigned int layer_nr=0; layer_nr<total_layers; layer_nr++)
+    {
+        storage.oozeShield.push_back(storage.getLayerOutlines(layer_nr, true).offset(ooze_shield_dist));
+    }
+    
+    int largest_printed_radius = MM2INT(1.0); // TODO: make var a parameter, and perhaps even a setting?
+    for(unsigned int layer_nr=0; layer_nr<total_layers; layer_nr++)
+    {
+        storage.oozeShield[layer_nr] = storage.oozeShield[layer_nr].offset(-largest_printed_radius).offset(largest_printed_radius); 
+    }
+    int allowed_angle_offset = tan(getSettingInAngleRadians("ooze_shield_angle")) * getSettingInMicrons("layer_height");//Allow for a 60deg angle in the oozeShield.
+    for(unsigned int layer_nr=1; layer_nr<total_layers; layer_nr++)
+    {
+        storage.oozeShield[layer_nr] = storage.oozeShield[layer_nr].unionPolygons(storage.oozeShield[layer_nr-1].offset(-allowed_angle_offset));
+    }
+    for(unsigned int layer_nr=total_layers-1; layer_nr>0; layer_nr--)
+    {
+        storage.oozeShield[layer_nr-1] = storage.oozeShield[layer_nr-1].unionPolygons(storage.oozeShield[layer_nr].offset(-allowed_angle_offset));
+    }
+}
+
+void FffPolygonGenerator::processDraftShield(SliceDataStorage& storage, unsigned int total_layers)
+{
+    int draft_shield_height = getSettingInMicrons("draft_shield_height");
+    int draft_shield_dist = getSettingInMicrons("draft_shield_dist");
+    int layer_height_0 = getSettingInMicrons("layer_height_0");
+    int layer_height = getSettingInMicrons("layer_height");
+    
+    if (draft_shield_height < layer_height_0)
+    {
+        return;
+    }
+    
+    unsigned int max_screen_layer = (draft_shield_height - layer_height_0) / layer_height + 1;
+    
+    int layer_skip = 500 / layer_height + 1;
+    
+    Polygons& draft_shield = storage.draft_protection_shield;
+    for (unsigned int layer_nr = 0; layer_nr < total_layers && layer_nr < max_screen_layer; layer_nr += layer_skip)
+    {
+        draft_shield = draft_shield.unionPolygons(storage.getLayerOutlines(layer_nr, true));
+    }
+    
+    storage.draft_protection_shield = draft_shield.convexHull(draft_shield_dist);
+}
+
+void FffPolygonGenerator::processPlatformAdhesion(SliceDataStorage& storage)
+{
+    switch(getSettingAsPlatformAdhesion("adhesion_type"))
+    {
+    case EPlatformAdhesion::SKIRT:
+        if (getSettingInMicrons("draft_shield_height") == 0)
+        { // draft screen replaces skirt
+            generateSkirt(storage, getSettingInMicrons("skirt_gap"), getSettingAsCount("skirt_line_count"), getSettingInMicrons("skirt_minimal_length"));
+        }
+        break;
+    case EPlatformAdhesion::BRIM:
+        generateSkirt(storage, 0, getSettingAsCount("brim_line_count"), getSettingInMicrons("skirt_minimal_length"));
+        break;
+    case EPlatformAdhesion::RAFT:
+        generateRaft(storage, getSettingInMicrons("raft_margin"));
+        break;
+    }
+    
+    Polygons skirt_sent = storage.skirt[0];
+    for (int extruder = 1; extruder < storage.meshgroup->getExtruderCount(); extruder++)
+        skirt_sent.add(storage.skirt[extruder]);
+    sendPolygons(SkirtType, 0, skirt_sent, getSettingInMicrons("skirt_line_width"));
+}
+
+
+void FffPolygonGenerator::processFuzzyWalls(SliceMeshStorage& mesh)
+{
+    if (mesh.getSettingAsCount("wall_line_count") == 0)
+    {
+        return;
+    }
+    int64_t fuzziness = mesh.getSettingInMicrons("magic_fuzzy_skin_thickness");
+    int64_t avg_dist_between_points = mesh.getSettingInMicrons("magic_fuzzy_skin_point_dist");
+    int64_t min_dist_between_points = avg_dist_between_points * 3 / 4; // hardcoded: the point distance may vary between 3/4 and 5/4 the supplied value
+    int64_t range_random_point_dist = avg_dist_between_points / 2;
+    for (unsigned int layer_nr = 0; layer_nr < mesh.layers.size(); layer_nr++)
+    {
+        SliceLayer& layer = mesh.layers[layer_nr];
+        for (SliceLayerPart& part : layer.parts)
+        {
+            Polygons results;
+            Polygons& skin = (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") == ESurfaceMode::SURFACE)? part.outline : part.insets[0];
+            for (PolygonRef poly : skin)
+            {
+                // generate points in between p0 and p1
+                PolygonRef result = results.newPoly();
+                
+                int64_t dist_left_over = rand() % (min_dist_between_points / 2); // the distance to be traversed on the line before making the first new point
+                Point* p0 = &poly.back();
+                for (Point& p1 : poly)
+                { // 'a' is the (next) new point between p0 and p1
+                    Point p0p1 = p1 - *p0;
+                    int64_t p0p1_size = vSize(p0p1);    
+                    int64_t dist_last_point = dist_left_over + p0p1_size * 2; // so that p0p1_size - dist_last_point evaulates to dist_left_over - p0p1_size
+                    for (int64_t p0pa_dist = dist_left_over; p0pa_dist < p0p1_size; p0pa_dist += min_dist_between_points + rand() % range_random_point_dist)
+                    {
+                        int r = rand() % (fuzziness * 2) - fuzziness;
+                        Point perp_to_p0p1 = crossZ(p0p1);
+                        Point fuzz = normal(perp_to_p0p1, r);
+                        Point pa = *p0 + normal(p0p1, p0pa_dist) + fuzz;
+                        result.add(pa);
+                        dist_last_point = p0pa_dist;
+                    }
+                    dist_left_over = p0p1_size - dist_last_point;
+                    
+                    p0 = &p1;
+                }
+                while (result.size() < 3 )
+                {
+                    unsigned int point_idx = poly.size() - 2;
+                    result.add(poly[point_idx]);
+                    if (point_idx == 0) { break; }
+                    point_idx--;
+                }
+                if (result.size() < 3)
+                {
+                    result.clear();
+                    for (Point& p : poly)
+                        result.add(p);
+                }
+            }
+            skin = results;
+            sendPolygons(Inset0Type, layer_nr, skin, mesh.getSettingInMicrons("wall_line_width_0"));
+        }
+    }
+}
+
+
+}//namespace cura

src/FffPolygonGenerator.h

@@ -0,0 +1,142 @@
+#ifndef FFF_AREA_GENERATOR_H
+#define FFF_AREA_GENERATOR_H
+
+
+#include "MeshGroup.h"
+#include "utils/polygonUtils.h"
+#include "utils/gettime.h"
+#include "settings.h"
+#include "sliceDataStorage.h"
+#include "commandSocket.h"
+
+namespace cura
+{
+
+/*!
+ * Primary stage in Fused Filament Fabrication processing: Polygons are generated.
+ * The model is sliced and each slice consists of polygons representing the outlines: the boundaries between inside and outside the object.
+ * After slicing, the layers are processed; for example the wall insets are generated, and the areas which are to be filled with support and infill, which are all represented by polygons.
+ * In this stage nothing other than areas and circular paths are generated, which are both represented by polygons.
+ * No infill lines or support pattern etc. is generated.
+ * 
+ * The main function of this class is FffPolygonGenerator::generateAreas().
+ */
+class FffPolygonGenerator : public SettingsMessenger
+{
+private:
+    CommandSocket* commandSocket;
+public:
+    /*!
+     * Basic constructor; doesn't set the FffAreaGenerator::commandSocket .
+     */
+    FffPolygonGenerator(SettingsBase* settings_)
+    : SettingsMessenger(settings_)
+    , commandSocket(nullptr)
+    {
+    }
+    
+    /*!
+     * Set the FffAreaGenerator::commandSocket
+     */
+    void setCommandSocket(CommandSocket* socket)
+    {
+        commandSocket = socket;
+    }
+    
+
+    /*!
+     * Slice the \p object, process the outline information into inset perimeter polygons, support area polygons, etc. 
+     * 
+     * \param object The object to slice.
+     * \param timeKeeper Object which keeps track of timings of each stage.
+     * \param storage Output parameter: where the outlines are stored. See SliceLayerPart::outline.
+     */
+    bool generateAreas(SliceDataStorage& storage, MeshGroup* object, TimeKeeper& timeKeeper);
+  
+private:
+    /*!
+     * Send polygons over the command socket, if there is one.
+     * \param type The type of polygon to send
+     * \param layer_nr The layer number at which the polygons occur
+     * \param polygons The polygons to be sent
+     */
+    void sendPolygons(PolygonType type, int layer_nr, Polygons& polygons, int line_width)
+    {
+        if (commandSocket)
+            commandSocket->sendPolygons(type, layer_nr, polygons, line_width);
+    }
+    
+    /*!
+     * Slice the \p object and store the outlines in the \p storage.
+     * 
+     * \param object The object to slice.
+     * \param timeKeeper Object which keeps track of timings of each stage.
+     * \param storage Output parameter: where the outlines are stored. See SliceLayerPart::outline.
+     * 
+     * \return Whether the process succeeded (always true).
+     */
+    bool sliceModel(MeshGroup* object, TimeKeeper& timeKeeper, SliceDataStorage& storage); /// slices the model
+
+    /*!
+     * Processes the outline information as stored in the \p storage: generates inset perimeter polygons, support area polygons, etc. 
+     * 
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param timeKeeper Object which keeps track of timings of each stage.
+     */
+    void slices2polygons(SliceDataStorage& storage, TimeKeeper& timeKeeper);
+    
+    /*!
+     * Remove all bottom layers which are empty.
+     * \param storage Input and Ouput parameter: stores all layers
+     * \param layer_height The height of each layer
+     * \param total_layers The total number of layers
+     */
+    void removeEmptyFirstLayers(SliceDataStorage& storage, int layer_height, unsigned int total_layers);
+    
+    /*!
+     * Generate the inset polygons which form the walls.
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param layer_nr The layer for which to generate the insets.
+     */
+    void processInsets(SliceDataStorage& storage, unsigned int layer_nr);
+
+    /*!
+     * Generate the outline of the ooze shield.
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param total_layers The total number of layers 
+     */
+    void processOozeShield(SliceDataStorage& storage, unsigned int total_layers);
+    
+    /*!
+     * Generate the skin areas.
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param layer_nr The layer for which to generate the skin areas.
+     */
+    void processSkins(SliceDataStorage& storage, unsigned int layer_nr); 
+
+    /*!
+     * Generate the polygons where the draft screen should be.
+     * 
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param total_layers The total number of layers 
+     */
+    void processDraftShield(SliceDataStorage& storage, unsigned int total_layers);
+    /*!
+     * Generate the skirt/brim/raft areas/insets.
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     */
+    void processPlatformAdhesion(SliceDataStorage& storage);
+    
+    
+    
+    /*!
+     * Make the outer wall 'fuzzy'
+     */
+    void processFuzzyWalls(SliceMeshStorage& mesh);
+    
+    
+
+    
+};
+}//namespace cura
+#endif // FFF_AREA_GENERATOR_H

src/FffProcessor.cpp

@@ -0,0 +1,101 @@
+#include "FffProcessor.h" 
+
+namespace cura 
+{
+
+FffProcessor FffProcessor::instance; // definition must be in cpp
+
+
+std::string FffProcessor::getAllSettingsString(MeshGroup& meshgroup, bool first_meshgroup)
+{
+    std::stringstream sstream;
+    if (first_meshgroup)
+    {
+        sstream << " -g";
+    }
+    else 
+    {
+        sstream << " --next";
+    }
+    sstream << meshgroup.getAllLocalSettingsString();
+    for (int extruder_nr = 0; extruder_nr < meshgroup.getExtruderCount(); extruder_nr++)
+    {
+        ExtruderTrain* train = meshgroup.getExtruderTrain(extruder_nr);
+        sstream << " -e" << extruder_nr << train->getAllLocalSettingsString();
+    }
+    for (unsigned int mesh_idx = 0; mesh_idx < meshgroup.meshes.size(); mesh_idx++)
+    {
+        Mesh& mesh = meshgroup.meshes[mesh_idx];
+        sstream << " -e" << mesh.getSettingAsCount("extruder_nr") << " -l \"" << mesh_idx << "\"" << mesh.getAllLocalSettingsString();
+    }
+    sstream << "\n";
+    return sstream.str();
+}
+
+bool FffProcessor::processFiles(const std::vector< std::string >& files)
+{
+    time_keeper.restart();
+    MeshGroup* meshgroup = new MeshGroup(this);
+    
+    for(std::string filename : files)
+    {
+        log("Loading %s from disk...\n", filename.c_str());
+
+        FMatrix3x3 matrix;
+        if (!loadMeshIntoMeshGroup(meshgroup, filename.c_str(), matrix))
+        {
+            logError("Failed to load model: %s\n", filename.c_str());
+            return false;
+        }
+    }
+    
+    meshgroup->finalize();
+
+    log("Loaded from disk in %5.3fs\n", time_keeper.restart());
+    return processMeshGroup(meshgroup);
+}
+
+bool FffProcessor::processMeshGroup(MeshGroup* meshgroup)
+{
+    if (SHOW_ALL_SETTINGS) { logWarning(getAllSettingsString(*meshgroup, first_meshgroup).c_str()); }
+    time_keeper.restart();
+    if (!meshgroup)
+        return false;
+
+    TimeKeeper time_keeper_total;
+    
+    if (meshgroup->getSettingBoolean("wireframe_enabled"))
+    {
+        log("starting Neith Weaver...\n");
+                    
+        Weaver w(this);
+        w.weave(meshgroup, command_socket);
+        
+        log("starting Neith Gcode generation...\n");
+        Wireframe2gcode gcoder(w, gcode_writer.gcode, this);
+        gcoder.writeGCode(command_socket);
+        log("finished Neith Gcode generation...\n");
+        
+    } else 
+    {
+        SliceDataStorage storage(meshgroup);
+
+        if (!polygon_generator.generateAreas(storage, meshgroup, time_keeper))
+        {
+            return false;
+        }
+        gcode_writer.setCommandSocket(command_socket);
+        
+        Progress::messageProgressStage(Progress::Stage::EXPORT, &time_keeper, command_socket);
+        gcode_writer.writeGCode(storage, time_keeper);
+    }
+
+    Progress::messageProgress(Progress::Stage::FINISH, 1, 1, command_socket); //Report the GUI that a file has been fully processed.
+    log("Total time elapsed %5.2fs.\n", time_keeper_total.restart());
+
+    profile_string += getAllSettingsString(*meshgroup, first_meshgroup);
+    first_meshgroup = false;
+    return true;
+}
+
+} // namespace cura 

src/FffProcessor.h

@@ -0,0 +1,97 @@
+#ifndef FFF_PROCESSOR_H
+#define FFF_PROCESSOR_H
+
+#include "settings.h"
+#include "FffGcodeWriter.h"
+#include "FffPolygonGenerator.h"
+#include "commandSocket.h"
+#include "Weaver.h"
+#include "Wireframe2gcode.h"
+#include "Progress.h"
+#include "utils/gettime.h"
+#include "utils/NoCopy.h"
+
+#define SHOW_ALL_SETTINGS true
+
+namespace cura {
+
+//FusedFilamentFabrication processor. Singleton class
+class FffProcessor : public SettingsBase , NoCopy
+{
+private:
+    static FffProcessor instance; 
+    
+    FffProcessor()
+    : polygon_generator(this)
+    , gcode_writer(this)
+    , first_meshgroup(true)
+    {
+        command_socket = NULL;
+    }
+public:
+    static FffProcessor* getInstance() 
+    { 
+        return &instance; 
+    }
+    
+private:
+    FffPolygonGenerator polygon_generator;
+    FffGcodeWriter gcode_writer;
+    CommandSocket* command_socket; // TODO: replace all refs to command_socket by CommandSocket::getInstance()
+    
+    bool first_meshgroup;
+    
+    std::string profile_string = "";
+    
+    std::string getAllSettingsString(MeshGroup& meshgroup, bool first_meshgroup);
+    
+public:
+    std::string getProfileString() { return profile_string; }
+    
+    TimeKeeper time_keeper; // TODO: use singleton time keeper
+    
+    void resetFileNumber()
+    {
+        gcode_writer.resetFileNumber();
+    }
+
+    void setCommandSocket(CommandSocket* socket)
+    {
+        command_socket = socket;
+        gcode_writer.setCommandSocket(socket);
+        polygon_generator.setCommandSocket(socket);
+    }
+    
+    bool setTargetFile(const char* filename)
+    {
+        return gcode_writer.setTargetFile(filename);
+    }
+    
+    void setTargetStream(std::ostream* stream)
+    {
+        return gcode_writer.setTargetStream(stream);
+    }
+
+    double getTotalFilamentUsed(int e)
+    {
+        return gcode_writer.getTotalFilamentUsed(e);
+    }
+
+    double getTotalPrintTime()
+    {
+        return gcode_writer.getTotalPrintTime();
+    }
+    
+    void finalize()
+    {
+        gcode_writer.finalize();
+    }
+
+    bool processFiles(const std::vector<std::string> &files);
+    
+    bool processMeshGroup(MeshGroup* meshgroup);
+};
+
+}//namespace cura
+
+#endif//FFF_PROCESSOR_H

src/MergeInfillLines.cpp

@@ -0,0 +1,154 @@
+#include "MergeInfillLines.h"
+
+#include <algorithm> // min
+
+namespace cura
+{
+    
+void MergeInfillLines::writeCompensatedMove(Point& to, double speed, GCodePath& last_path, int64_t new_line_width)
+{
+    double old_line_width = INT2MM(last_path.config->getLineWidth());
+    double new_line_width_mm = INT2MM(new_line_width);
+    double speed_mod = old_line_width / new_line_width_mm;
+    double extrusion_mod = new_line_width_mm / old_line_width;
+    double new_speed = std::min(speed * speed_mod, 150.0); // TODO: hardcoded value: max extrusion speed is 150 mm/s = 9000 mm/min
+    gcode.writeMove(to, new_speed, last_path.getExtrusionMM3perMM() * extrusion_mod);
+}
+    
+bool MergeInfillLines::mergeInfillLines(double speed, unsigned int& path_idx)
+{ //Check for lots of small moves and combine them into one large line
+    Point prev_middle;
+    Point last_middle;
+    int64_t line_width;
+    
+    MergeInfillLines merger(gcode, paths, travelConfig, nozzle_size);
+    
+    if (merger.isConvertible(path_idx, prev_middle, last_middle, line_width, false))
+    {
+        //   path_idx + 3 is the index of the second extrusion move to be converted in combination with the first
+        {
+            GCodePath& move_path = paths[path_idx];
+            for(unsigned int point_idx = 0; point_idx < move_path.points.size() - 1; point_idx++)
+            {
+                gcode.writeMove(move_path.points[point_idx], speed, move_path.getExtrusionMM3perMM());
+            }
+            gcode.writeMove(prev_middle, travelConfig.getSpeed(), 0);
+            GCodePath& last_path = paths[path_idx + 3];
+            
+            writeCompensatedMove(last_middle, speed, last_path, line_width);
+        }
+        
+        path_idx += 2;
+        for (; merger.isConvertible(path_idx, prev_middle, last_middle, line_width, true); path_idx += 2)
+        {
+            GCodePath& last_path = paths[path_idx + 3];
+            writeCompensatedMove(last_middle, speed, last_path, line_width);
+        }
+        path_idx = path_idx + 1; // means that the next path considered is the travel path after the converted extrusion path corresponding to the updated path_idx
+        return true;
+    }
+    return false;
+};
+
+bool MergeInfillLines::isConvertible(unsigned int path_idx_first_move, Point& first_middle, Point& second_middle, int64_t& line_width, bool use_second_middle_as_first)
+{
+    int64_t max_line_width = nozzle_size * 3 / 2;
+    
+    
+    unsigned int idx = path_idx_first_move;
+    if (idx + 3 > paths.size()-1) return false;
+    if (paths[idx+0].config != &travelConfig) return false;
+    if (paths[idx+1].points.size() > 1) return false;
+    if (paths[idx+1].config == &travelConfig) return false;
+//                 if (paths[idx+2].points.size() > 1) return false;
+    if (paths[idx+2].config != &travelConfig) return false;
+    if (paths[idx+3].points.size() > 1) return false;
+    if (paths[idx+3].config == &travelConfig) return false;
+    
+    Point& a = paths[idx+0].points.back(); // first extruded line from
+    Point& b = paths[idx+1].points.back(); // first extruded line to
+    Point& c = paths[idx+2].points.back(); // second extruded line from
+    Point& d = paths[idx+3].points.back(); // second extruded line to
+    Point ab = b - a;
+    Point cd = d - c;
+    
+    int64_t prod = dot(ab,cd);
+    if (std::abs(prod) + 400 < vSize(ab) * vSize(cd)) // 400 = 20*20, where 20 micron is the allowed inaccuracy in the dot product, introduced by the inaccurate point locations of a,b,c,d
+        return false; // extrusion moves not in the same or opposite diraction
+    if (prod < 0) { ab = ab * -1; }
+    
+    
+    Point infill_vector = (cd + ab) / 2;
+    
+    if (!shorterThen(infill_vector, 5 * nozzle_size)) return false; // infill lines too far apart
+                    
+    first_middle = (use_second_middle_as_first)?
+                    second_middle :
+                    (a + b) / 2;
+    second_middle = (c + d) / 2;
+    
+    Point dir_vector_perp = crossZ(second_middle - first_middle);
+    int64_t dir_vector_perp_length = vSize(dir_vector_perp); // == dir_vector_length
+    if (dir_vector_perp_length == 0) return false;
+    if (dir_vector_perp_length > 5 * nozzle_size) return false; // infill lines too far apart
+    
+    
+    line_width = std::abs( dot(dir_vector_perp, infill_vector) / dir_vector_perp_length );
+    if (line_width > max_line_width) return false; // combined lines would be too wide
+    if (line_width == 0) return false; // dot is zero, so lines are in each others extension, not next to eachother
+    
+    { // check whether the two lines are adjacent
+        Point ca = first_middle - c;
+        double ca_size = vSizeMM(ca);
+        double cd_size = vSizeMM(cd);
+        double prod = INT2MM(dot(ca, cd));
+        double fraction = prod / ( ca_size * cd_size );
+        int64_t line2line_dist = MM2INT(cd_size * std::sqrt(1.0 - fraction * fraction));
+        
+        if (line2line_dist + 20 > paths[idx+1].config->getLineWidth()) return false; // there is a gap between the two lines
+    }
+    
+    return true;
+};
+
+     /*   
+void MergeInfillLines::merge(Point& from, Point& p0, Point& p1)
+{ //Check for lots of small moves and combine them into one large line
+    if (path->points.size() == 1 && path->config != &travelConfig); // && shorterThen(from - path->points[0], path->config->getLineWidth() * 2))
+    {
+        Point p0 = path->points[0];
+        unsigned int path_idx_last = path_idx + 1; // index of the last short move 
+        while(path_idx_last < paths.size() && paths[path_idx_last].points.size() == 1 && shorterThen(p0 - paths[path_idx_last].points[0], path->config->getLineWidth() * 2))
+        {
+            p0 = paths[path_idx_last].points[0];
+            path_idx_last ++;
+        }
+        if (paths[path_idx_last-1].config == &travelConfig)
+            path_idx_last --;
+        
+        if (path_idx_last > path_idx + 2)
+        {
+            p0 = from;
+            for(unsigned int path_idx_short = path_idx; path_idx_short < path_idx_last-1; path_idx_short+=2)
+            {
+                int64_t oldLen = vSize(p0 - paths[path_idx_short].points[0]);
+                Point newPoint = (paths[path_idx_short].points[0] + paths[path_idx_short+1].points[0]) / 2;
+                int64_t newLen = vSize(from - newPoint);
+                if (newLen > 0)
+                {
+                    if (oldLen > 0)
+                        gcode.writeMove(newPoint, speed * oldLen / newLen, path->getExtrusionMM3perMM() * newLen / oldLen);
+                    else 
+                        gcode.writeMove(newPoint, speed, path->getExtrusionMM3perMM());
+                }
+            }
+            gcode.writeMove(paths[path_idx_last-1].points[0], speed, path->getExtrusionMM3perMM());
+            path_idx = path_idx_last - 1;
+            continue;
+        }
+    }
+}*/
+     
+     
+     
+}//namespace cura

src/MergeInfillLines.h

@@ -0,0 +1,64 @@
+#ifndef MERGE_INFILL_LINES_H
+#define MERGE_INFILL_LINES_H
+
+#include "utils/intpoint.h"
+#include "gcodeExport.h"
+#include "gcodePlanner.h"
+
+namespace cura
+{
+    
+class MergeInfillLines 
+{
+//     void merge(Point& from, Point& p0, Point& p1);
+    GCodeExport& gcode; //!<  Where to write the combined line to
+    std::vector<GCodePath>& paths; //!< The paths currently under consideration
+    GCodePathConfig& travelConfig; //!< The travel settings used to see whether a path is a travel path or an extrusion path
+    int64_t nozzle_size; //!< The diameter of the hole in the nozzle
+    
+    
+    /*!
+     * Whether the next two extrusion paths are convertible to a single line segment, starting from the end point the of the last travel move at \p path_idx_first_move
+     * \param path_idx_first_move Index into MergeInfillLines::paths to the travel before the two extrusion moves udner consideration
+     * \param first_middle Output parameter: the middle of the first extrusion move
+     * \param second_middle Input/Output parameter: outputs the middle of the second extrusion move; inputs \p first_middle so we don't have to compute it
+     * \param line_width Output parameter: The width of the resulting combined line (the average length of the lines combined)
+     * \param use_second_middle_as_first Whether to use \p second_middle as input parameter for \p first_middle
+     * \return Whether the next two extrusion paths are convertible to a single line segment, starting from the end point the of the last travel move at \p path_idx_first_move
+     */
+    bool isConvertible(unsigned int path_idx_first_move, Point& first_middle, Point& second_middle, int64_t& line_width, bool use_second_middle_as_first);
+    
+    /*!
+     * Write an extrusion move with compensated width and compensated speed so that the material flow will be the same.
+     * 
+     * \param to The point to move to
+     * \param speed The original speed
+     * \param old_path The original path
+     * \param new_line_width The width of the convewrted line (approximately the length of the original line)
+     */
+    void writeCompensatedMove(Point& to, double speed, GCodePath& old_path, int64_t new_line_width);
+public:
+    /*!
+     * Simple constructor only used by MergeInfillLines::isConvertible to easily convey the environment
+     */
+    MergeInfillLines(GCodeExport& gcode, std::vector<GCodePath>& paths,  GCodePathConfig& travelConfig, int64_t nozzle_size) 
+    : gcode(gcode), paths(paths), travelConfig(travelConfig), nozzle_size(nozzle_size) { }
+    
+    /*!
+     * Check for lots of small moves and combine them into one large line.
+     * Updates \p path_idx to the next path which is not combined.
+     * 
+     * \param gcode Where to write the combined line to
+     * \param paths The paths currently under consideration
+     * \param travelConfig The travel settings used to see whether a path is a travel path or an extrusion path
+     * \param nozzle_size The diameter of the hole in the nozzle
+     * \param speed A factor used to scale the movement speed
+     * \param path_idx Input/Output parameter: The current index in \p paths where to start combining and the current index after combining as output parameter.
+     * \return Whether lines have been merged and normal path-to-gcode generation can be skipped for the current resulting \p path_idx .
+     */
+    bool mergeInfillLines(double speed, unsigned int& path_idx);
+    
+};
+
+}//namespace cura
+#endif // MERGE_INFILL_LINES_H

src/MeshGroup.cpp

@@ -0,0 +1,156 @@
+/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
+#include <string.h>
+#include <strings.h>
+#include <stdio.h>
+
+#include "MeshGroup.h"
+#include "utils/logoutput.h"
+#include "utils/string.h"
+
+namespace cura
+{
+
+FILE* binaryMeshBlob = nullptr;
+
+/* Custom fgets function to support Mac line-ends in Ascii STL files. OpenSCAD produces this when used on Mac */
+void* fgets_(char* ptr, size_t len, FILE* f)
+{
+    while(len && fread(ptr, 1, 1, f) > 0)
+    {
+        if (*ptr == '\n' || *ptr == '\r')
+        {
+            *ptr = '\0';
+            return ptr;
+        }
+        ptr++;
+        len--;
+    }
+    return nullptr;
+}
+
+bool loadMeshSTL_ascii(Mesh* mesh, const char* filename, FMatrix3x3& matrix)
+{
+    FILE* f = fopen(filename, "rt");
+    char buffer[1024];
+    FPoint3 vertex;
+    int n = 0;
+    Point3 v0(0,0,0), v1(0,0,0), v2(0,0,0);
+    while(fgets_(buffer, sizeof(buffer), f))
+    {
+        if (sscanf(buffer, " vertex %f %f %f", &vertex.x, &vertex.y, &vertex.z) == 3)
+        {
+            n++;
+            switch(n)
+            {
+            case 1:
+                v0 = matrix.apply(vertex);
+                break;
+            case 2:
+                v1 = matrix.apply(vertex);
+                break;
+            case 3:
+                v2 = matrix.apply(vertex);
+                mesh->addFace(v0, v1, v2);
+                n = 0;
+                break;
+            }
+        }
+    }
+    fclose(f);
+    mesh->finish();
+    return true;
+}
+
+bool loadMeshSTL_binary(Mesh* mesh, const char* filename, FMatrix3x3& matrix)
+{
+    FILE* f = fopen(filename, "rb");
+    char buffer[80];
+    uint32_t faceCount;
+    //Skip the header
+    if (fread(buffer, 80, 1, f) != 1)
+    {
+        fclose(f);
+        return false;
+    }
+    //Read the face count
+    if (fread(&faceCount, sizeof(uint32_t), 1, f) != 1)
+    {
+        fclose(f);
+        return false;
+    }
+    //For each face read:
+    //float(x,y,z) = normal, float(X,Y,Z)*3 = vertexes, uint16_t = flags
+    // Every Face is 50 Bytes: Normal(3*float), Vertices(9*float), 2 Bytes Spacer
+    mesh->faces.reserve(faceCount);
+    mesh->vertices.reserve(faceCount);
+    for(unsigned int i=0;i<faceCount;i++)
+    {
+        if (fread(buffer, 50, 1, f) != 1)
+        {
+            fclose(f);
+            return false;
+        }
+        float *v= ((float*)buffer)+3;
+
+        Point3 v0 = matrix.apply(FPoint3(v[0], v[1], v[2]));
+        Point3 v1 = matrix.apply(FPoint3(v[3], v[4], v[5]));
+        Point3 v2 = matrix.apply(FPoint3(v[6], v[7], v[8]));
+        mesh->addFace(v0, v1, v2);
+    }
+    fclose(f);
+    mesh->finish();
+    return true;
+}
+
+bool loadMeshSTL(Mesh* mesh, const char* filename, FMatrix3x3& matrix)
+{
+    FILE* f = fopen(filename, "r");
+    char buffer[6];
+    if (f == nullptr)
+        return false;
+
+    if (fread(buffer, 5, 1, f) != 1)
+    {
+        fclose(f);
+        return false;
+    }
+    fclose(f);
+
+    buffer[5] = '\0';
+    if (stringcasecompare(buffer, "solid") == 0)
+    {
+        bool load_success = loadMeshSTL_ascii(mesh, filename, matrix);
+        if (!load_success)
+            return false;
+
+        // This logic is used to handle the case where the file starts with
+        // "solid" but is a binary file.
+        if (mesh->faces.size() < 1)
+        {
+            mesh->clear();
+            return loadMeshSTL_binary(mesh, filename, matrix);
+        }
+        return true;
+    }
+    return loadMeshSTL_binary(mesh, filename, matrix);
+}
+
+bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const char* filename, FMatrix3x3& transformation, SettingsBaseVirtual* object_parent_settings)
+{
+    const char* ext = strrchr(filename, '.');
+    if (ext && (strcmp(ext, ".stl") == 0 || strcmp(ext, ".STL") == 0))
+    {
+        if (object_parent_settings)
+        {
+            meshgroup->meshes.emplace_back(object_parent_settings); // make new mesh with [object_parent_settings] as parent settings object
+        }
+        else 
+        {
+            meshgroup->meshes.emplace_back(meshgroup); // make new mesh with [meshgroup] as parent settings object
+        }
+        return loadMeshSTL(&meshgroup->meshes[meshgroup->meshes.size()-1], filename, transformation);
+    }
+    return false;
+}
+
+}//namespace cura

src/MeshGroup.h

@@ -0,0 +1,137 @@
+/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
+#ifndef MESH_GROUP_H
+#define MESH_GROUP_H
+
+#include "mesh.h"
+#include "ExtruderTrain.h"
+
+namespace cura
+{
+    
+/*!
+ * A MeshGroup is a collection with 1 or more 3D meshes.
+ * 
+ * One MeshGroup is a whole which is printed at once.
+ * Generally there is one single MeshGroup, though when using one-at-a-time printing, multiple MeshGroups are processed consecutively.
+ */
+class MeshGroup : public SettingsBase
+{
+    ExtruderTrain* extruders[MAX_EXTRUDERS] = {nullptr};
+    int extruder_count;
+public:
+    int getExtruderCount()
+    {
+        if (extruder_count == -1)
+        {
+            extruder_count = getSettingAsCount("machine_extruder_count");
+        }
+        return extruder_count;
+    }
+
+    MeshGroup(SettingsBaseVirtual* settings_base) 
+    : SettingsBase(settings_base)
+    , extruder_count(-1) 
+    {}
+    
+    ~MeshGroup() 
+    {
+        for (unsigned int extruder = 0; extruder < MAX_EXTRUDERS; extruder++)
+        {
+            if (extruders[extruder])
+            {
+                delete extruders[extruder];
+            }
+        }
+    }
+    
+    ExtruderTrain* getExtruderTrain(unsigned int extruder_nr)
+    {
+        if (!extruders[extruder_nr])
+        {
+            extruders[extruder_nr] = new ExtruderTrain(this, extruder_nr);
+        }
+        return extruders[extruder_nr];
+    }
+    
+    std::vector<Mesh> meshes;
+
+    Point3 min() //! minimal corner of bounding box
+    {
+        if (meshes.size() < 1)
+        {
+            return Point3(0, 0, 0);
+        }
+        Point3 ret = meshes[0].min();
+        for(unsigned int i=1; i<meshes.size(); i++)
+        {
+            Point3 v = meshes[i].min();
+            ret.x = std::min(ret.x, v.x);
+            ret.y = std::min(ret.y, v.y);
+            ret.z = std::min(ret.z, v.z);
+        }
+        return ret;
+    }
+    Point3 max() //! maximal corner of bounding box
+    {
+        if (meshes.size() < 1)
+        {
+            return Point3(0, 0, 0);
+        }
+        Point3 ret = meshes[0].max();
+        for(unsigned int i=1; i<meshes.size(); i++)
+        {
+            Point3 v = meshes[i].max();
+            ret.x = std::max(ret.x, v.x);
+            ret.y = std::max(ret.y, v.y);
+            ret.z = std::max(ret.z, v.z);
+        }
+        return ret;
+    }
+
+    void clear()
+    {
+        for(Mesh& m : meshes)
+        {
+            m.clear();
+        }
+    }
+
+    void finalize()
+    {
+        //If the machine settings have been supplied, offset the given position vertices to the center of vertices (0,0,0) is at the bed center.
+        Point3 meshgroup_offset(0, 0, 0);
+        if (!getSettingBoolean("machine_center_is_zero"))
+        {
+            meshgroup_offset.x = getSettingInMicrons("machine_width") / 2;
+            meshgroup_offset.y = getSettingInMicrons("machine_depth") / 2;
+        }
+        
+        // If a mesh position was given, put the mesh at this position in 3D space. 
+        for(Mesh& mesh : meshes)
+        {
+            Point3 mesh_offset(mesh.getSettingInMicrons("mesh_position_x"), mesh.getSettingInMicrons("mesh_position_y"), mesh.getSettingInMicrons("mesh_position_z"));
+            if (mesh.getSettingBoolean("center_object"))
+            {
+                Point3 object_min = mesh.min();
+                Point3 object_max = mesh.max();
+                Point3 object_size = object_max - object_min;
+                mesh_offset += Point3(-object_min.x - object_size.x / 2, -object_min.y - object_size.y / 2, -object_min.z);
+            }
+            mesh.offset(mesh_offset + meshgroup_offset);
+        }
+    }
+};
+
+/*!
+ * Load a Mesh from file and store it in the \p meshgroup.
+ * 
+ * \param meshgroup The meshgroup where to store the mesh
+ * \param filename The filename of the mesh file
+ * \param transformation The transformation applied to all vertices
+ * \param object_parent_settings (optional) The parent settings object of the new mesh. Defaults to \p meshgroup if none is given.
+ * \return whether the file could be loaded
+ */
+bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const char* filename, FMatrix3x3& transformation, SettingsBaseVirtual* object_parent_settings = nullptr);
+
+}//namespace cura
+#endif//MESH_GROUP_H

src/PrimeTower.cpp

@@ -0,0 +1,287 @@
+#include "PrimeTower.h"
+
+#include "ExtruderTrain.h"
+#include "sliceDataStorage.h"
+#include "gcodeExport.h"
+#include "gcodePlanner.h"
+#include "infill.h"
+
+namespace cura 
+{
+    
+    
+PrimeTower::PrimeTower()
+{
+}
+
+
+
+void PrimeTower::setConfigs(MeshGroup* meshgroup, std::vector<RetractionConfig>& retraction_config_per_extruder, int layer_thickness)
+{
+    
+    extruder_count = meshgroup->getSettingAsCount("machine_extruder_count");
+    
+    for (int extr = 0; extr < extruder_count; extr++)
+    {
+        ExtruderTrain* train = meshgroup->getExtruderTrain(extr);
+        config_per_extruder.emplace_back(&retraction_config_per_extruder[extr], "WALL-INNER");// so that visualization in the old Cura still works (TODO)
+        GCodePathConfig& conf = config_per_extruder.back();
+        
+        conf.setSpeed(train->getSettingInMillimetersPerSecond("speed_prime_tower"));
+        conf.setLineWidth(train->getSettingInMicrons("prime_tower_line_width"));
+        conf.setFlow(train->getSettingInPercentage("prime_tower_flow"));
+        conf.setLayerHeight(layer_thickness);
+    }
+}
+
+    
+
+void PrimeTower::computePrimeTowerMax(SliceDataStorage& storage)
+{ // compute storage.max_object_height_second_to_last_extruder, which is used to determine the highest point in the prime tower
+        
+    extruder_count = storage.getSettingAsCount("machine_extruder_count");
+    
+    int max_object_height_per_extruder[extruder_count];
+    { // compute max_object_height_per_extruder
+        memset(max_object_height_per_extruder, -1, sizeof(max_object_height_per_extruder));
+        for (SliceMeshStorage& mesh : storage.meshes)
+        {
+            max_object_height_per_extruder[mesh.getSettingAsIndex("extruder_nr")] = 
+                std::max(   max_object_height_per_extruder[mesh.getSettingAsIndex("extruder_nr")]
+                        ,   mesh.layer_nr_max_filled_layer  ); 
+        }
+        int support_extruder_nr = storage.getSettingAsIndex("support_extruder_nr"); // TODO: support extruder should be configurable per object
+        max_object_height_per_extruder[support_extruder_nr] = 
+        std::max(   max_object_height_per_extruder[support_extruder_nr]
+                ,   storage.support.layer_nr_max_filled_layer  ); 
+        int support_roof_extruder_nr = storage.getSettingAsIndex("support_roof_extruder_nr"); // TODO: support roof extruder should be configurable per object
+        max_object_height_per_extruder[support_roof_extruder_nr] = 
+        std::max(   max_object_height_per_extruder[support_roof_extruder_nr]
+                ,   storage.support.layer_nr_max_filled_layer  ); 
+    }
+    { // // compute max_object_height_second_to_last_extruder
+        int extruder_max_object_height = 0;
+        for (int extruder_nr = 1; extruder_nr < extruder_count; extruder_nr++)
+        {
+            if (max_object_height_per_extruder[extruder_nr] > max_object_height_per_extruder[extruder_max_object_height])
+            {
+                extruder_max_object_height = extruder_nr;
+            }
+        }
+        int extruder_second_max_object_height = -1;
+        for (int extruder_nr = 0; extruder_nr < extruder_count; extruder_nr++)
+        {
+            if (extruder_nr == extruder_max_object_height) { continue; }
+            if (max_object_height_per_extruder[extruder_nr] > max_object_height_per_extruder[extruder_second_max_object_height])
+            {
+                extruder_second_max_object_height = extruder_nr;
+            }
+        }
+        if (extruder_second_max_object_height < 0)
+        {
+            storage.max_object_height_second_to_last_extruder = -1;
+        }
+        else 
+        {
+            storage.max_object_height_second_to_last_extruder = max_object_height_per_extruder[extruder_second_max_object_height];
+        }
+    }
+       
+}
+
+void PrimeTower::generateGroundpoly(SliceDataStorage& storage) 
+{
+    PolygonRef p = storage.primeTower.ground_poly.newPoly();
+    int tower_size = storage.getSettingInMicrons("prime_tower_size");
+    int tower_distance = 0; //storage.getSettingInMicrons("prime_tower_distance");
+    int x = storage.getSettingInMicrons("prime_tower_position_x"); // storage.model_max.x
+    int y = storage.getSettingInMicrons("prime_tower_position_y"); // storage.model_max.y
+    p.add(Point(x + tower_distance, y + tower_distance));
+    p.add(Point(x + tower_distance, y + tower_distance + tower_size));
+    p.add(Point(x + tower_distance - tower_size, y + tower_distance + tower_size));
+    p.add(Point(x + tower_distance - tower_size, y + tower_distance));
+
+    storage.wipePoint = Point(x + tower_distance - tower_size / 2, y + tower_distance + tower_size / 2);   
+}
+
+void PrimeTower::generatePaths(SliceDataStorage& storage, unsigned int total_layers)
+{
+    if (storage.max_object_height_second_to_last_extruder >= 0 
+//         && storage.getSettingInMicrons("prime_tower_distance") > 0 
+        && storage.getSettingInMicrons("prime_tower_size") > 0)
+    {
+        generatePaths3(storage);
+    }
+}
+void PrimeTower::generatePaths_OLD(SliceDataStorage& storage, unsigned int total_layers)
+{
+    
+    if (storage.max_object_height_second_to_last_extruder >= 0 && storage.getSettingInMicrons("prime_tower_distance") > 0 && storage.getSettingInMicrons("prime_tower_size") > 0)
+    {
+        PolygonRef p = storage.primeTower.ground_poly.newPoly();
+        int tower_size = storage.getSettingInMicrons("prime_tower_size");
+        int tower_distance = 0; //storage.getSettingInMicrons("prime_tower_distance");
+        int x = storage.getSettingInMicrons("prime_tower_position_x"); // storage.model_max.x
+        int y = storage.getSettingInMicrons("prime_tower_position_y"); // storage.model_max.y
+        p.add(Point(x + tower_distance, y + tower_distance));
+        p.add(Point(x + tower_distance, y + tower_distance + tower_size));
+        p.add(Point(x + tower_distance - tower_size, y + tower_distance + tower_size));
+        p.add(Point(x + tower_distance - tower_size, y + tower_distance));
+
+        storage.wipePoint = Point(x + tower_distance - tower_size / 2, y + tower_distance + tower_size / 2);
+    }
+}
+    
+    
+void PrimeTower::generatePaths2(SliceDataStorage& storage) // half baked attempt at spiral shaped prime tower pattern
+{
+//     extruder_count = storage.getSettingAsCount("machine_extruder_count");
+//     
+//     int64_t line_dists[extruder_count + 1]; // distance between the lines of different extruders, and half the line dist for beginning and ending
+//     int64_t total_width = 0;
+//     {
+//         int64_t last_line_width = 0;
+//         for (int extr = 0; extr < extruder_count; extr++)
+//         {
+//             int64_t line_width = config_per_extruder[extr].getLineWidth();
+//             line_dists[extr] = (line_width + last_line_width) / 2;
+//             total_width += line_width;
+//             last_line_width = line_width;
+//         }
+//         line_dists[extruder_count] = last_line_width / 2;
+//     }
+//     
+    
+    
+}
+
+void PrimeTower::generatePaths3(SliceDataStorage& storage)
+{
+        
+    int n_patterns = 2; // alternating patterns between layers
+    double infill_overlap = 15; // so that it can't be zero
+    
+    generateGroundpoly(storage);
+    
+    for (int extruder = 0; extruder < extruder_count; extruder++)
+    {
+        int line_width = storage.meshgroup->getExtruderTrain(extruder)->getSettingInMicrons("prime_tower_line_width");
+        patterns_per_extruder.emplace_back(n_patterns);
+        std::vector<Polygons>& patterns = patterns_per_extruder.back();
+        for (int pattern_idx = 0; pattern_idx < n_patterns; pattern_idx++)
+        {
+            generateLineInfill(ground_poly, -line_width/2, patterns[pattern_idx], line_width, line_width, infill_overlap, 45 + pattern_idx*90);
+        }
+    }
+}
+
+    
+
+void PrimeTower::addToGcode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed)
+{
+    if (!( storage.max_object_height_second_to_last_extruder >= 0 
+//         && storage.getSettingInMicrons("prime_tower_distance") > 0 
+        && storage.getSettingInMicrons("prime_tower_size") > 0) )
+    {
+        return;
+    }
+    bool prime_tower_added = false;
+    for (int extruder = 0; extruder <  storage.meshgroup->getExtruderCount() && !prime_tower_added; extruder++)
+    {
+        prime_tower_added = last_prime_tower_poly_printed[extruder] == int(layer_nr);
+    }
+    if (prime_tower_added)
+    { // don't print the prime tower if it has been printed already
+        return;
+    }
+    
+    if (prev_extruder == gcodeLayer.getExtruder())
+    {
+        wipe = false;
+    }
+    addToGcode3(storage, gcodeLayer, gcode, layer_nr, prev_extruder, prime_tower_dir_outward, wipe, last_prime_tower_poly_printed);
+}
+
+void PrimeTower::addToGcode3(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed)
+{
+    if (layer_nr > storage.max_object_height_second_to_last_extruder + 1)
+    {
+        return;
+    }
+    
+    int new_extruder = gcodeLayer.getExtruder();
+
+    
+    Polygons& pattern = patterns_per_extruder[new_extruder][layer_nr % 2];
+
+    
+    GCodePathConfig& config = config_per_extruder[new_extruder];
+    int start_idx = 0; // TODO: figure out which idx is closest to the far right corner
+    gcodeLayer.addPolygon(ground_poly.back(), start_idx, &config);
+    gcodeLayer.addLinesByOptimizer(pattern, &config);
+    
+    last_prime_tower_poly_printed[new_extruder] = layer_nr;
+    
+    if (wipe)
+    { //Make sure we wipe the old extruder on the prime tower.
+        gcodeLayer.addTravel(storage.wipePoint - gcode.getExtruderOffset(prev_extruder) + gcode.getExtruderOffset(new_extruder));
+    }
+}
+
+void PrimeTower::addToGcode_OLD(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed)
+{
+    if (layer_nr > storage.max_object_height_second_to_last_extruder + 1)
+    {
+        return;
+    }
+    
+    int new_extruder = gcodeLayer.getExtruder();
+
+    int64_t offset = -config_per_extruder[new_extruder].getLineWidth(); 
+    if (layer_nr > 0)
+        offset *= 2;
+    
+    //If we changed extruder, print the wipe/prime tower for this nozzle;
+    std::vector<Polygons> insets;
+    { // generate polygons
+        if ((layer_nr % 2) == 1)
+            insets.push_back(storage.primeTower.ground_poly.offset(offset / 2));
+        else
+            insets.push_back(storage.primeTower.ground_poly);
+        while(true)
+        {
+            Polygons new_inset = insets[insets.size() - 1].offset(offset);
+            if (new_inset.size() < 1)
+                break;
+            insets.push_back(new_inset);
+        }
+    }
+    
+    
+    for(unsigned int n=0; n<insets.size(); n++)
+    {
+        GCodePathConfig& config = config_per_extruder[new_extruder];
+        gcodeLayer.addPolygonsByOptimizer(insets[(prime_tower_dir_outward)? insets.size() - 1 - n : n], &config);
+    }
+    last_prime_tower_poly_printed[new_extruder] = layer_nr;
+    
+    if (wipe)
+    { //Make sure we wipe the old extruder on the prime tower.
+        gcodeLayer.addTravel(storage.wipePoint - gcode.getExtruderOffset(prev_extruder) + gcode.getExtruderOffset(new_extruder));
+    }
+};
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+}//namespace cura

src/PrimeTower.h

@@ -0,0 +1,67 @@
+#ifndef PRIME_TOWER_H
+#define PRIME_TOWER_H
+
+#include "gcodeExport.h" // GCodePathConfig
+#include "MeshGroup.h"
+#include "utils/polygon.h" // Polygons
+
+namespace cura 
+{
+
+    
+class SliceDataStorage;
+class GCodePlanner;
+class GCodeExport;
+
+typedef std::vector<IntPoint> PolyLine;
+
+class PrimeTower
+{
+private:
+    int extruder_count;
+    std::vector<GCodePathConfig> config_per_extruder;
+
+    class WallInfill
+    {
+        
+    };
+public:
+    void setConfigs(MeshGroup* configs, std::vector<RetractionConfig>& retraction_config_per_extruder, int layer_thickness);
+    
+    Polygons ground_poly;
+    
+    std::vector<PolyLine> extruder_paths;
+    
+    
+    void generateGroundpoly(SliceDataStorage& storage);
+
+    std::vector<std::vector<Polygons>> patterns_per_extruder; //!< for each extruder a vector of patterns to alternate between, over the layers
+    
+    void generatePaths3(SliceDataStorage& storage);
+    
+    void generatePaths2(SliceDataStorage& storage);
+    /*!
+     * Generate the area where the prime tower should be.
+     * 
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param total_layers The total number of layers 
+     */
+    void generatePaths(SliceDataStorage& storage, unsigned int total_layers);
+    void generatePaths_OLD(SliceDataStorage& storage, unsigned int total_layers);
+
+    void computePrimeTowerMax(SliceDataStorage& storage);
+    
+    PrimeTower();
+
+    void addToGcode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed);
+    void addToGcode_OLD(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed);
+    void addToGcode3(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed);
+
+};
+
+
+
+
+}//namespace cura
+
+#endif // PRIME_TOWER_H

src/PrintFeature.h

@@ -0,0 +1,27 @@
+#ifndef PRINT_FEATURE
+#define PRINT_FEATURE
+
+namespace cura
+{
+
+enum class EPrintFeature : unsigned int // unused!!
+{ // TODO: use in gcodePathConfigs ?
+    OUTER_WALL,
+    INNER_WALLS,
+    INFILL,
+    SKIN,
+    HELPERS,
+    UNCLASSIFIED,
+    ENUM_COUNT
+};
+
+
+
+
+
+
+
+
+} // namespace cura
+
+#endif // PRINT_FEATURE

src/Progress.cpp

@@ -0,0 +1,101 @@
+/** Copyright (C) 2015 Ultimaker - Released under terms of the AGPLv3 License */
+#include "Progress.h"
+
+#include "commandSocket.h"
+#include "utils/gettime.h"
+
+namespace cura {
+    
+double Progress::times [] = 
+{ 
+    0.0, 
+    5.269, 
+    1.533, 
+    22.953,
+    51.009, 
+    48.858, 
+    154.62, 
+    0.1 
+};
+std::string Progress::names [] = 
+{
+    "start",
+    "slice",
+    "layerparts",
+    "inset",
+    "support",
+    "skin",
+    "export",
+    "process"
+};
+
+    
+double Progress::accumulated_times [N_PROGRESS_STAGES] = {-1};
+double Progress::total_timing = -1;
+
+/*
+const Progress::Stage Progress::stages[] = 
+{ 
+    Progress::Stage::START, 
+    Progress::Stage::SLICING, 
+    Progress::Stage::PARTS, 
+    Progress::Stage::INSET, 
+    Progress::Stage::SUPPORT, 
+    Progress::Stage::SKIN, 
+    Progress::Stage::EXPORT, 
+    Progress::Stage::FINISH 
+};
+*/
+
+float Progress::calcOverallProgress(Stage stage, float stage_progress)
+{
+    return ( accumulated_times[(int)stage] + stage_progress * times[(int)stage] ) / total_timing;
+}
+
+
+void Progress::init()
+{
+    double accumulated_time = 0;
+    for (int stage = 0; stage < N_PROGRESS_STAGES; stage++)
+    {
+        accumulated_times[(int)stage] = accumulated_time;
+        accumulated_time += times[(int)stage];
+    }
+    total_timing = accumulated_time;
+}
+
+void Progress::messageProgress(Progress::Stage stage, int progress_in_stage, int progress_in_stage_max, CommandSocket* command_socket)
+{
+    float percentage = calcOverallProgress(stage, float(progress_in_stage) / float(progress_in_stage_max));
+    if (command_socket)
+    {
+        command_socket->sendProgress(percentage);
+    }
+    
+    logProgress(names[(int)stage].c_str(), progress_in_stage, progress_in_stage_max, percentage);
+}
+
+void Progress::messageProgressStage(Progress::Stage stage, TimeKeeper* time_keeper, CommandSocket* command_socket)
+{
+    if (command_socket)
+    {
+        command_socket->sendProgressStage(stage);
+    }
+    
+    if (time_keeper)
+    {
+        if ((int)stage > 0)
+        {
+            log("Progress: %s accomplished in %5.3fs\n", names[(int)stage-1].c_str(), time_keeper->restart());
+        }
+        else
+        {
+            time_keeper->restart();
+        }
+        
+        if ((int)stage < (int)Stage::FINISH)
+            log("Starting %s...\n", names[(int)stage].c_str());
+    }
+}
+
+}// namespace cura

src/Progress.h

@@ -0,0 +1,75 @@
+/** Copyright (C) 2015 Ultimaker - Released under terms of the AGPLv3 License */
+#ifndef PROGRESS_H
+#define PROGRESS_H
+
+#include <string>
+
+#include "utils/logoutput.h"
+#include "utils/gettime.h"
+
+namespace cura {
+
+class CommandSocket;
+
+#define N_PROGRESS_STAGES 8
+
+/*!
+ * Class for handling the progress bar and the progress logging.
+ * 
+ * The progress bar is based on a single slicing of a rather large model which needs some complex support;
+ * the relative timing of each stage is currently based on that of the slicing of dragon_65_tilted_large.stl
+ */
+class Progress 
+{
+public:
+    /*!
+     * The stage in the whole slicing process 
+     */
+    enum class Stage : unsigned int
+    {
+        START   = 0, 
+        SLICING = 1, 
+        PARTS   = 2, 
+        INSET   = 3, 
+        SUPPORT = 4, 
+        SKIN    = 5, 
+        EXPORT  = 6, 
+        FINISH  = 7
+    };
+private:
+    static double times [N_PROGRESS_STAGES]; //!< Time estimates per stage
+    static std::string names[N_PROGRESS_STAGES]; //!< name of each stage
+    static double accumulated_times [N_PROGRESS_STAGES]; //!< Time past before each stage
+    static double total_timing; //!< An estimate of the total time
+    /*!
+     * Give an estimate between 0 and 1 of how far the process is.
+     * 
+     * \param stage The current stage of processing
+     * \param stage_process How far we currently are in the \p stage
+     * \return An estimate of the overall progress.
+     */
+    static float calcOverallProgress(Stage stage, float stage_progress);
+public:
+    static void init(); //!< Initialize some values needed in a fast computation of the progress
+    /*!
+     * Message progress over the \p commandSocket and to the terminal (if the command line arg '-p' is provided).
+     * 
+     * \param stage The current stage of processing
+     * \param progress_in_stage Any number giving the progress within the stage
+     * \param progress_in_stage_max The maximal value of \p progress_in_stage
+     * \param commandSocket The command socket over which to communicate the progress.
+     */
+    static void messageProgress(Stage stage, int progress_in_stage, int progress_in_stage_max, CommandSocket* commandSocket);
+    /*!
+     * Message the progress stage over the command socket.
+     * 
+     * \param stage The current stage
+     * \param timeKeeper The stapwatch keeping track of the timings for each stage (optional)
+     * \param commandSocket The command socket over which to communicate (optional)
+     */
+    static void messageProgressStage(Stage stage, TimeKeeper* timeKeeper, CommandSocket* commandSocket);
+};
+
+
+} // name space cura
+#endif//PROGRESS_H

src/Weaver.cpp

@@ -0,0 +1,478 @@
+#include "Weaver.h"
+
+#include <cmath> // sqrt
+#include <fstream> // debug IO
+#include <unistd.h>
+
+#include "Progress.h"
+#include "weaveDataStorage.h"
+
+namespace cura 
+{
+
+void Weaver::weave(MeshGroup* meshgroup, CommandSocket* commandSocket)
+{   
+    wireFrame.meshgroup = meshgroup;
+    
+    int maxz = meshgroup->max().z;
+
+    int layer_count = (maxz - initial_layer_thickness) / connectionHeight + 1;
+
+    DEBUG_SHOW(layer_count);
+
+    std::vector<cura::Slicer*> slicerList;
+
+    for(Mesh& mesh : meshgroup->meshes)
+    {
+        cura::Slicer* slicer = new cura::Slicer(&mesh, initial_layer_thickness, connectionHeight, layer_count, mesh.getSettingBoolean("meshfix_keep_open_polygons"), mesh.getSettingBoolean("meshfix_extensive_stitching"));
+        slicerList.push_back(slicer);
+    }
+
+    
+    int starting_layer_idx;
+    { // find first non-empty layer
+        for (starting_layer_idx = 0; starting_layer_idx < layer_count; starting_layer_idx++)
+        {
+            Polygons parts;
+            for (cura::Slicer* slicer : slicerList)
+                parts.add(slicer->layers[starting_layer_idx].polygonList);  
+            
+            if (parts.size() > 0)
+                break;
+        }
+        if (starting_layer_idx > 0)
+        {
+            logError("First %i layers are empty!\n", starting_layer_idx);
+        }
+    }
+    
+    
+    std::cerr<< "chainifying layers..." << std::endl;
+    {
+        int starting_z = -1;
+        for (cura::Slicer* slicer : slicerList)
+            wireFrame.bottom_outline.add(slicer->layers[starting_layer_idx].polygonList);
+        
+        if (commandSocket)
+            commandSocket->sendPolygons(Inset0Type, 0, wireFrame.bottom_outline, 1);
+        
+        wireFrame.z_bottom = slicerList[0]->layers[starting_layer_idx].z;
+        
+        Point starting_point_in_layer;
+        if (wireFrame.bottom_outline.size() > 0)
+            starting_point_in_layer = (wireFrame.bottom_outline.max() + wireFrame.bottom_outline.min()) / 2;
+        else 
+            starting_point_in_layer = (Point(0,0) + meshgroup->max() + meshgroup->min()) / 2;
+        
+        Progress::messageProgressStage(Progress::Stage::INSET, nullptr, commandSocket);
+        for (int layer_idx = starting_layer_idx + 1; layer_idx < layer_count; layer_idx++)
+        {
+            Progress::messageProgress(Progress::Stage::INSET, layer_idx+1, layer_count, commandSocket); // abuse the progress system of the normal mode of CuraEngine
+            
+            Polygons parts1;
+            for (cura::Slicer* slicer : slicerList)
+                parts1.add(slicer->layers[layer_idx].polygonList);
+
+            
+            Polygons chainified;
+
+            chainify_polygons(parts1, starting_point_in_layer, chainified, false);
+            
+            if (commandSocket)
+                commandSocket->sendPolygons(Inset0Type, layer_idx - starting_layer_idx, chainified, 1);
+            
+            if (chainified.size() > 0)
+            {
+                if (starting_z == -1) starting_z = slicerList[0]->layers[layer_idx-1].z;
+                wireFrame.layers.emplace_back();
+                WeaveLayer& layer = wireFrame.layers.back();
+                
+                layer.z0 = slicerList[0]->layers[layer_idx-1].z - starting_z;
+                layer.z1 = slicerList[0]->layers[layer_idx].z - starting_z;
+                
+                layer.supported = chainified;
+                
+                starting_point_in_layer = layer.supported.back().back();
+            }
+        }
+    }
+    
+    std::cerr<< "finding horizontal parts..." << std::endl;
+    {
+        Polygons* lower_top_parts = &wireFrame.bottom_outline;
+        
+        Progress::messageProgressStage(Progress::Stage::SKIN, nullptr, commandSocket);
+        for (unsigned int layer_idx = 0; layer_idx < wireFrame.layers.size(); layer_idx++)
+        {
+            Progress::messageProgress(Progress::Stage::SKIN, layer_idx+1, wireFrame.layers.size(), commandSocket); // abuse the progress system of the normal mode of CuraEngine
+            
+            WeaveLayer& layer = wireFrame.layers[layer_idx];
+            
+            Polygons empty;
+            Polygons& layer_above = (layer_idx+1 < wireFrame.layers.size())? wireFrame.layers[layer_idx+1].supported : empty;
+            
+            createHorizontalFill(*lower_top_parts, layer, layer_above, layer.z1);
+            lower_top_parts = &layer.supported;
+        }
+    }
+    // at this point layer.supported still only contains the polygons to be connected
+    // when connecting layers, we further add the supporting polygons created by the roofs
+    
+    std::cerr<< "connecting layers..." << std::endl;
+    {
+        Polygons* lower_top_parts = &wireFrame.bottom_outline;
+        int last_z = wireFrame.z_bottom;
+        for (unsigned int layer_idx = 0; layer_idx < wireFrame.layers.size(); layer_idx++) // use top of every layer but the last
+        {
+            WeaveLayer& layer = wireFrame.layers[layer_idx];
+            
+            connect_polygons(*lower_top_parts, last_z, layer.supported, layer.z1, layer);
+            layer.supported.add(layer.roofs.roof_outlines);
+            lower_top_parts = &layer.supported;
+            
+            last_z = layer.z1;
+        }
+    }
+
+
+    { // roofs:
+        
+        WeaveLayer& top_layer = wireFrame.layers.back();
+        Polygons to_be_supported; // empty for the top layer
+        fillRoofs(top_layer.supported, to_be_supported, -1, top_layer.z1, top_layer.roofs);
+    }
+    
+    
+    { // bottom:
+        Polygons to_be_supported; // is empty for the bottom layer, cause the order of insets doesn't really matter (in a sense everything is to be supported)
+        fillRoofs(wireFrame.bottom_outline, to_be_supported, -1, wireFrame.layers.front().z0, wireFrame.bottom_infill);
+    }
+    
+}
+
+
+
+void Weaver::createHorizontalFill(Polygons& lower_top_parts, WeaveLayer& layer, Polygons& layer_above, int z1)
+{
+    int64_t bridgable_dist = connectionHeight;
+    
+//     Polygons& polys_below = lower_top_parts;
+    Polygons& polys_here = layer.supported;
+    Polygons& polys_above = layer_above;
+
+    
+    { // roofs
+        Polygons to_be_supported =  polys_above.offset(bridgable_dist);
+        fillRoofs(polys_here, to_be_supported, -1, layer.z1, layer.roofs);
+
+    }
+   
+    { // floors
+        Polygons to_be_supported =  polys_above.offset(-bridgable_dist);
+        fillFloors(polys_here, to_be_supported, 1, layer.z1, layer.roofs);
+    }
+    
+    {// optimize away doubly printed regions (boundaries of holes in layer etc.)
+        for (WeaveRoofPart& inset : layer.roofs.roof_insets)
+            connections2moves(inset);
+    }
+    
+}
+    
+
+void Weaver::fillRoofs(Polygons& supporting, Polygons& to_be_supported, int direction, int z, WeaveRoof& horizontals)
+{
+    std::vector<WeaveRoofPart>& insets = horizontals.roof_insets;
+    
+    if (supporting.size() == 0) return; // no parts to start the roof from!
+    
+    Polygons roofs = supporting.difference(to_be_supported);
+    
+    roofs = roofs.offset(-roof_inset).offset(roof_inset);
+    
+    if (roofs.size() == 0) return;
+    
+    
+    Polygons roof_outlines; 
+    Polygons roof_holes;
+    { // split roofs into outlines and holes
+        std::vector<PolygonsPart> roof_parts = roofs.splitIntoParts();
+        for (PolygonsPart& roof_part : roof_parts)
+        {
+            roof_outlines.add(roof_part[0]);
+            for (unsigned int hole_idx = 1; hole_idx < roof_part.size(); hole_idx++)
+            {
+                roof_holes.add(roof_part[hole_idx]);
+                roof_holes.back().reverse();
+            }
+        }
+    }
+
+    
+    Polygons supporting_outlines;
+    
+    std::vector<PolygonsPart> supporting_parts = supporting.splitIntoParts();
+    for (PolygonsPart& supporting_part : supporting_parts) 
+        supporting_outlines.add(supporting_part[0]); // only add outlines, not the holes
+    
+    
+    
+    Polygons inset1;
+    Polygons last_inset;
+    Polygons last_supported = supporting;
+    for (Polygons inset0 = supporting_outlines; inset0.size() > 0; inset0 = last_inset)
+    {
+        last_inset = inset0.offset(direction * roof_inset, ClipperLib::jtRound);
+        inset1 = last_inset.intersection(roof_outlines); // stay within roof area
+        inset1 = inset1.unionPolygons(roof_holes);// make insets go around holes
+
+        if (inset1.size() == 0) break;
+        
+        insets.emplace_back();
+        
+        connect(last_supported, z, inset1, z, insets.back(), true);
+        
+        inset1 = inset1.remove(roof_holes); // throw away holes which appear in every intersection
+        inset1 = inset1.remove(roof_outlines);// throw away fully filled regions
+        
+        last_supported = insets.back().supported; // chainified
+        
+    }
+    
+
+    
+    horizontals.roof_outlines.add(roofs); // TODO just add the new lines, not the lines of the roofs which are already supported ==> make outlines into a connection from which we only print the top, not the connection
+} 
+
+void Weaver::fillFloors(Polygons& supporting, Polygons& to_be_supported, int direction, int z, WeaveRoof& horizontals)
+{
+    std::vector<WeaveRoofPart>& outsets = horizontals.roof_insets;
+    
+    if (to_be_supported.size() == 0) return; // no parts to start the floor from!
+    if (supporting.size() == 0) return; // no parts to start the floor from!
+    
+    Polygons floors = to_be_supported.difference(supporting);
+    
+    floors = floors.offset(-roof_inset).offset(roof_inset);
+    
+    if (floors.size() == 0) return;
+    
+    
+    std::vector<PolygonsPart> floor_parts = floors.splitIntoParts();
+    
+    Polygons floor_outlines;
+    Polygons floor_holes;
+    for (PolygonsPart& floor_part : floor_parts)
+    {
+        floor_outlines.add(floor_part[0]);
+        for (unsigned int hole_idx = 1; hole_idx < floor_part.size(); hole_idx++)
+        {
+            floor_holes.add(floor_part[hole_idx]);
+            //floor_holes.back().reverse();
+        }
+    }
+    
+    
+    Polygons outset1;
+    
+    Polygons last_supported = supporting;
+    
+    for (Polygons outset0 = supporting; outset0.size() > 0; outset0 = outset1)
+    {
+        outset1 = outset0.offset(roof_inset * direction, ClipperLib::jtRound).intersection(floors);
+        outset1 = outset1.remove(floor_holes); // throw away holes which appear in every intersection
+        outset1 = outset1.remove(floor_outlines); // throw away holes which appear in every intersection
+        
+        
+        outsets.emplace_back();
+        
+        connect(last_supported, z, outset1, z, outsets.back(), true);
+        
+        outset1 = outset1.remove(floor_outlines);// throw away fully filled regions
+        
+        last_supported = outsets.back().supported; // chainified
+
+    }
+    
+    
+    horizontals.roof_outlines.add(floors);
+}
+
+
+void Weaver::connections2moves(WeaveRoofPart& inset)
+{
+    
+    
+    bool include_half_of_last_down = true;
+    
+    
+    for (WeaveConnectionPart& part : inset.connections)
+    {
+        std::vector<WeaveConnectionSegment>& segments = part.connection.segments;
+        for (unsigned int idx = 0; idx < part.connection.segments.size(); idx += 2)
+        {
+            WeaveConnectionSegment& segment = segments[idx];
+            assert(segment.segmentType == WeaveSegmentType::UP);
+            Point3 from = (idx == 0)? part.connection.from : segments[idx-1].to;
+            bool skipped = (segment.to - from).vSize2() < extrusionWidth * extrusionWidth;
+            if (skipped)
+            {
+                unsigned int begin = idx;
+                for (; idx < segments.size(); idx += 2)
+                {
+                    WeaveConnectionSegment& segment = segments[idx];
+                    assert(segments[idx].segmentType == WeaveSegmentType::UP);
+                    Point3 from = (idx == 0)? part.connection.from : segments[idx-1].to;
+                    bool skipped = (segment.to - from).vSize2() < extrusionWidth * extrusionWidth;
+                    if (!skipped) 
+                        break;
+                }
+                int end = idx - ((include_half_of_last_down)? 2 : 1);
+                if (idx >= segments.size())
+                    segments.erase(segments.begin() + begin, segments.end());
+                else 
+                {
+                    segments.erase(segments.begin() + begin, segments.begin() + end);
+                    if (begin < segments.size()) 
+                    {
+                        segments[begin].segmentType = WeaveSegmentType::MOVE;
+                        if (include_half_of_last_down)
+                            segments[begin+1].segmentType = WeaveSegmentType::DOWN_AND_FLAT;
+                    }
+                    idx = begin + ((include_half_of_last_down)? 2 : 1);
+                }
+            }
+        }
+    }
+}
+
+void Weaver::connect(Polygons& parts0, int z0, Polygons& parts1, int z1, WeaveConnection& result, bool include_last)
+{
+    // TODO: convert polygons (with outset + difference) such that after printing the first polygon, we can't be in the way of the printed stuff
+    // something like:
+    // for (m > n)
+    //     parts[m] = parts[m].difference(parts[n].offset(nozzle_top_diameter))
+    // according to the printing order!
+    //
+    // OR! : 
+    //
+    // unify different parts if gap is too small
+    
+    Polygons& supported = result.supported;
+    
+    if (parts1.size() == 0) return;
+    
+    Point& start_close_to = (parts0.size() > 0)? parts0.back().back() : parts1.back().back();
+    
+    chainify_polygons(parts1, start_close_to, supported, include_last);
+    
+    if (parts0.size() == 0) return;
+    
+    connect_polygons(parts0, z0, supported, z1, result);
+
+}
+
+
+void Weaver::chainify_polygons(Polygons& parts1, Point start_close_to, Polygons& result, bool include_last)
+{
+    
+        
+    for (unsigned int prt = 0 ; prt < parts1.size(); prt++)
+    {
+        const PolygonRef upperPart = parts1[prt];
+        
+        ClosestPolygonPoint closestInPoly = PolygonUtils::findClosest(start_close_to, upperPart);
+
+        
+        PolygonRef part_top = result.newPoly();
+        
+        GivenDistPoint next_upper;
+        bool found = true;
+        int idx = 0;
+        
+        for (Point upper_point = upperPart[closestInPoly.pos]; found; upper_point = next_upper.location)
+        {
+            found = PolygonUtils::getNextPointWithDistance(upper_point, nozzle_top_diameter, upperPart, idx, closestInPoly.pos, next_upper);
+
+            
+            if (!found) 
+            {
+                break;
+            }
+            
+            part_top.add(upper_point);
+            
+            idx = next_upper.pos;
+        }
+        if (part_top.size() > 0)
+            start_close_to = part_top.back();
+        else
+            result.remove(result.size()-1);
+    }
+}
+
+
+void Weaver::connect_polygons(Polygons& supporting, int z0, Polygons& supported, int z1, WeaveConnection& result)
+{
+ 
+    if (supporting.size() < 1)
+    {
+        DEBUG_PRINTLN("lower layer has zero parts!");
+        return;
+    }
+    
+    result.z0 = z0;
+    result.z1 = z1;
+    
+    std::vector<WeaveConnectionPart>& parts = result.connections;
+        
+    for (unsigned int prt = 0 ; prt < supported.size(); prt++)
+    {
+        
+        const PolygonRef upperPart = supported[prt];
+        
+        
+        parts.emplace_back(prt);
+        WeaveConnectionPart& part = parts.back();
+        PolyLine3& connection = part.connection;
+        
+        Point3 last_upper;
+        bool firstIter = true;
+        
+        for (const Point& upper_point : upperPart)
+        {
+            
+            ClosestPolygonPoint lowerPolyPoint = PolygonUtils::findClosest(upper_point, supporting);
+            Point& lower = lowerPolyPoint.location;
+            
+            Point3 lower3 = Point3(lower.X, lower.Y, z0);
+            Point3 upper3 = Point3(upper_point.X, upper_point.Y, z1);
+            
+            
+            if (firstIter)
+                connection.from = lower3;
+            else
+                connection.segments.emplace_back<>(lower3, WeaveSegmentType::DOWN);
+            
+            connection.segments.emplace_back<>(upper3, WeaveSegmentType::UP);
+            last_upper = upper3;
+            
+            firstIter = false;
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+}//namespace cura
+    

src/Weaver.h

@@ -0,0 +1,152 @@
+#ifndef WEAVER_H
+#define WEAVER_H
+
+#include "weaveDataStorage.h"
+#include "commandSocket.h"
+#include "settings.h"
+
+#include "MeshGroup.h"
+#include "slicer.h"
+
+#include "utils/polygon.h"
+#include "utils/polygonUtils.h"
+
+#include "debug.h"
+
+namespace cura
+{
+
+/*!
+ * The main weaver / WirePrint / wireframe printing class, which computes the basic paths to be followed.
+ */
+class Weaver : public SettingsMessenger
+{
+    friend class Wireframe2gcode;
+private:
+    static const int HIGHER_BEND_NO_STRAIGHTEN = 0;
+    static const int MOVE_TO_STRAIGHTEN = 1;
+    static const int RETRACT_TO_STRAIGHTEN = 2;
+    
+    int initial_layer_thickness;
+    int connectionHeight; 
+    int extrusionWidth;
+    
+    int roof_inset; 
+    
+    int nozzle_outer_diameter; 
+    double nozzle_expansion_angle; 
+    int nozzle_clearance; 
+    int nozzle_top_diameter;
+   
+    
+public:
+    Weaver(SettingsBase* settings_base) : SettingsMessenger(settings_base) 
+    {
+        
+        initial_layer_thickness = getSettingInMicrons("layer_height_0");
+        connectionHeight = getSettingInMicrons("wireframe_height"); 
+        
+        extrusionWidth = getSettingInMicrons("wall_line_width_x");
+        
+        roof_inset = getSettingInMicrons("wireframe_roof_inset"); 
+        nozzle_outer_diameter = getSettingInMicrons("machine_nozzle_tip_outer_diameter");      // ___       ___   .
+        nozzle_expansion_angle = getSettingInAngleRadians("machine_nozzle_expansion_angle");  //     \_U_/       .
+        nozzle_clearance = getSettingInMicrons("wireframe_nozzle_clearance");                // at least line width
+        nozzle_top_diameter = tan(nozzle_expansion_angle) * connectionHeight + nozzle_outer_diameter + nozzle_clearance;
+    }
+
+    /*!
+     * This is the main function for Neith / Weaving / WirePrinting / Webbed printing.
+     * Creates a wireframe for the model consisting of horizontal 'flat' parts and connections between consecutive flat parts consisting of UP moves and diagonally DOWN moves.
+     * 
+     * \param objects The objects for which to create a wireframe print
+     * \param commandSocket the commandSocket
+     */
+    void weave(MeshGroup* objects, CommandSocket* commandSocket);
+    
+
+private:
+    WireFrame wireFrame;
+    
+
+/*!
+ * Connect two polygons, chainify the second and generate connections from it, supporting on the first polygon.
+ * 
+ * \param supporting The polygons from which to start the connection
+ * \param z0 The height of the \p supporting
+ * \param supported The polygons to be supported by the connection from \p supporting to \p supported
+ * \param z1 the height of \p supported
+ * \param include_last Whether the last full link should be included in the chainified \p parts1 if the last link would be shorter than the normal link size.
+ */
+    void connect(Polygons& parts0, int z0, Polygons& parts1, int z1, WeaveConnection& result, bool include_last);
+
+/*!
+ * Convert polygons, such that they consist of segments/links of uniform size, namely \p nozzle_top_diameter.
+ * 
+ * \param parts1 The polygons to be chainified
+ * \param start_close_to The point from which to start the first link
+ * \param include_last governs whether the last segment is smaller or grater than the \p nozzle_top_diameter.
+ * If true, the last segment may be smaller.
+ */
+    void chainify_polygons(Polygons& parts1, Point start_close_to, Polygons& result, bool include_last);
+    
+/*!
+ * The main weaving function.
+ * Generate connections between two polygons.
+ * The connections consist of zig zags of which the zig is a line from a point in \p supported to the closest point in \p supporting 
+ * and the zag is a diagonal line from the same point in \p supported to a point in \p supporting 
+ * with a distance equal to Weaver::nozzle_top_diameter from the other point in \p supporting of the zig.
+ * 
+ * \param supporting The polygons from which to start the connection
+ * \param z0 The height of the \p supporting
+ * \param supported The polygons to be supported by the connection from \p supporting to \p supported
+ * \param z1 the height of \p supported
+ * \param result The resulting connection
+ */
+    void connect_polygons(Polygons& supporting, int z0, Polygons& supported, int z1, WeaveConnection& result);
+
+/*!
+ * Creates the roofs and floors which are laid down horizontally.
+ */
+    void createHorizontalFill(Polygons& lower_top_parts, WeaveLayer& layer, Polygons& layer_above, int z1);
+    
+/*!
+ * Fill roofs starting from the outlines of \p supporting.
+ * The area to be filled in is difference( \p to_be_supported , \p supporting ).
+ * 
+ * The basic algorithm performs insets on \p supported until the whole area of \p to_be_supported is filled.
+ * In order to not fill holes in the roof, the hole-areas are unioned with the insets, which results in connections where the UP move has close to zero length;
+ * pieces of the area between two consecutive insets have close to zero distance at these points.
+ * These parts of the horizontal infills are converted into moves by the function \p connections2moves.
+ * 
+ * Note that the new inset is computed from the last inset, while the connections are between the last chainified inset and the new chainified inset.
+ * 
+ */
+    void fillRoofs(Polygons& supporting, Polygons& to_be_supported, int direction, int z, WeaveRoof& roofs);
+    
+/*!
+ * Fill floors starting from the outlines of \p supporting.
+ * The area to be filled in is \p floors = difference( \p to_be_supported , \p supporting ).
+ * 
+ * The basic algorithm performs outsets until the whole area of [to_be_supported] is filled.
+ * In order to not fill too much, the outsets are intersected with the [floors] area, which results in connections where the UP move has close to zero length.
+ * These parts of the horizontal infills are converted into moves by the function [connections2moves].
+ * 
+ * The first supporting polygons are \p supporting while the supporting polygons in consecutive iterations are sub-areas of \p floors.
+ * 
+ * Note that the new outset is computed from the last outset, while the connections are between the last chainified outset and the new (chainified) outset.
+ * 
+ */
+    void fillFloors(Polygons& supporting, Polygons& to_be_supported, int direction, int z, WeaveRoof& roofs);
+    
+/*!
+ * Filter out parts of connections with small distances; replace by moves.
+ * 
+ */
+    void connections2moves(WeaveRoofPart& inset);
+   
+};
+
+}//namespace cura
+
+#endif//WEAVER_H

src/Wireframe2gcode.cpp

@@ -0,0 +1,602 @@
+#include "Wireframe2gcode.h"
+
+#include <cmath> // sqrt
+#include <fstream> // debug IO
+
+#include "weaveDataStorage.h"
+#include "Progress.h"
+
+#include "pathOrderOptimizer.h" // for skirt
+
+namespace cura 
+{
+
+
+void Wireframe2gcode::writeGCode(CommandSocket* commandSocket)
+{
+
+    gcode.preSetup(wireFrame.meshgroup);
+    
+    if (commandSocket)
+        commandSocket->beginGCode();
+    
+    processStartingCode(commandSocket);
+    
+    int maxObjectHeight = wireFrame.layers.back().z1;
+    
+    processSkirt(commandSocket);
+    
+            
+    unsigned int total_layers = wireFrame.layers.size();
+    gcode.writeLayerComment(0);
+    gcode.writeTypeComment("SKIRT");
+
+    gcode.setZ(initial_layer_thickness);
+    
+    for (PolygonRef bottom_part : wireFrame.bottom_infill.roof_outlines)
+    {
+        if (bottom_part.size() == 0) continue;
+        writeMoveWithRetract(bottom_part[bottom_part.size()-1]);
+        for (Point& segment_to : bottom_part)
+        {
+            gcode.writeMove(segment_to, speedBottom, extrusion_per_mm_flat);
+        }
+    }
+    
+    
+    
+    // bottom:
+    Polygons empty_outlines;
+    writeFill(wireFrame.bottom_infill.roof_insets, empty_outlines, 
+              [this](Wireframe2gcode& thiss, WeaveRoofPart& inset, WeaveConnectionPart& part, unsigned int segment_idx) { 
+                    WeaveConnectionSegment& segment = part.connection.segments[segment_idx]; 
+                    if (segment.segmentType == WeaveSegmentType::MOVE || segment.segmentType == WeaveSegmentType::DOWN_AND_FLAT) // this is the case when an inset overlaps with a hole 
+                    {
+                        writeMoveWithRetract(segment.to); 
+                    } else 
+                    {
+                        gcode.writeMove(segment.to, speedBottom, extrusion_per_mm_connection); 
+                    }
+                }   
+            , 
+              [this](Wireframe2gcode& thiss, WeaveConnectionSegment& segment) { 
+                    if (segment.segmentType == WeaveSegmentType::MOVE)
+                        writeMoveWithRetract(segment.to);
+                    else if (segment.segmentType == WeaveSegmentType::DOWN_AND_FLAT)
+                        return; // do nothing
+                    else 
+                        gcode.writeMove(segment.to, speedBottom, extrusion_per_mm_flat); 
+                }
+            );
+    Progress::messageProgressStage(Progress::Stage::EXPORT, nullptr, commandSocket);
+    for (unsigned int layer_nr = 0; layer_nr < wireFrame.layers.size(); layer_nr++)
+    {
+        Progress::messageProgress(Progress::Stage::EXPORT, layer_nr+1, total_layers, commandSocket); // abuse the progress system of the normal mode of CuraEngine
+        
+        WeaveLayer& layer = wireFrame.layers[layer_nr];
+        
+        gcode.writeLayerComment(layer_nr+1);
+        
+        double fanSpeed = getSettingInPercentage("cool_fan_speed_max");
+        if (layer_nr == 0)
+            fanSpeed = getSettingInPercentage("cool_fan_speed_min");
+        gcode.writeFanCommand(fanSpeed);
+        
+        for (unsigned int part_nr = 0; part_nr < layer.connections.size(); part_nr++)
+        {
+            WeaveConnectionPart& part = layer.connections[part_nr];
+       
+            if (part.connection.segments.size() == 0) continue;
+            
+            gcode.writeTypeComment("SUPPORT"); // connection
+            {
+                if (vSize2(gcode.getPositionXY() - part.connection.from) > connectionHeight)
+                {
+                    Point3 point_same_height(part.connection.from.x, part.connection.from.y, layer.z1+100);
+                    writeMoveWithRetract(point_same_height);
+                }
+                writeMoveWithRetract(part.connection.from);
+                for (unsigned int segment_idx = 0; segment_idx < part.connection.segments.size(); segment_idx++)
+                {
+                    handle_segment(layer, part, segment_idx);
+                }
+            }
+            
+            
+            
+            gcode.writeTypeComment("WALL-OUTER"); // top
+            {
+                for (unsigned int segment_idx = 0; segment_idx < part.connection.segments.size(); segment_idx++)
+                {
+                    WeaveConnectionSegment& segment = part.connection.segments[segment_idx];
+                    if (segment.segmentType == WeaveSegmentType::DOWN) continue;
+                    if (segment.segmentType == WeaveSegmentType::MOVE) 
+                    {
+                        writeMoveWithRetract(segment.to);
+                    } else 
+                    {
+                        gcode.writeMove(segment.to, speedFlat, extrusion_per_mm_flat);
+                        gcode.writeDelay(flat_delay);
+                    }
+                }
+            }
+        }
+        
+        // roofs:
+        gcode.setZ(layer.z1);
+        std::function<void (Wireframe2gcode& thiss, WeaveRoofPart& inset, WeaveConnectionPart& part, unsigned int segment_idx)>
+            handle_roof = &Wireframe2gcode::handle_roof_segment;
+        writeFill(layer.roofs.roof_insets, layer.roofs.roof_outlines,
+                  handle_roof,
+                [this](Wireframe2gcode& thiss, WeaveConnectionSegment& segment) { // handle flat segments
+                    if (segment.segmentType == WeaveSegmentType::MOVE)
+                    {
+                        writeMoveWithRetract(segment.to);
+                    } else if (segment.segmentType == WeaveSegmentType::DOWN_AND_FLAT)
+                    {
+                        // do nothing
+                    } else 
+                    {   
+                        gcode.writeMove(segment.to, speedFlat, extrusion_per_mm_flat);
+                        gcode.writeDelay(flat_delay);
+                    }
+                });
+        
+     
+        
+    }
+    
+    gcode.setZ(maxObjectHeight);
+    
+    gcode.writeRetraction(&standard_retraction_config);
+    
+    
+    gcode.updateTotalPrintTime();
+    
+    gcode.writeDelay(0.3);
+    
+    gcode.writeFanCommand(0);
+
+    finalize(maxObjectHeight);
+    
+    if (commandSocket)
+    {
+        commandSocket->sendGCodeLayer();
+        commandSocket->endSendSlicedObject();
+    }
+}
+
+    
+void Wireframe2gcode::go_down(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx) 
+{ 
+    WeaveConnectionSegment& segment = part.connection.segments[segment_idx];
+    Point3 from = (segment_idx == 0)? part.connection.from : part.connection.segments[segment_idx - 1].to;
+    if (go_back_to_last_top)
+        gcode.writeMove(from, speedDown, 0);
+    if (straight_first_when_going_down <= 0)
+    {
+        gcode.writeMove(segment.to, speedDown, extrusion_per_mm_connection);
+    } else 
+    {
+        Point3& to = segment.to;
+        Point3 from = gcode.getPosition();// segment.from;
+        Point3 vec = to - from;
+        Point3 in_between = from + vec * straight_first_when_going_down / 100;
+        
+        Point3 up(in_between.x, in_between.y, from.z);
+        int64_t new_length = (up - from).vSize() + (to - up).vSize() + 5;
+        int64_t orr_length = vec.vSize();
+        double enlargement = new_length / orr_length;
+        gcode.writeMove(up, speedDown*enlargement, extrusion_per_mm_connection / enlargement);
+        gcode.writeMove(to, speedDown*enlargement, extrusion_per_mm_connection / enlargement);
+    }
+    gcode.writeDelay(bottom_delay);
+    if (up_dist_half_speed > 0)
+    {
+        
+        gcode.writeMove(Point3(0,0,up_dist_half_speed) + gcode.getPosition(), speedUp / 2, extrusion_per_mm_connection * 2);
+    }
+}
+
+
+    
+void Wireframe2gcode::strategy_knot(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx)
+{
+    WeaveConnectionSegment& segment = part.connection.segments[segment_idx];
+    gcode.writeMove(segment.to, speedUp, extrusion_per_mm_connection);
+    Point3 next_vector;
+    if (segment_idx + 1 < part.connection.segments.size())
+    {
+        WeaveConnectionSegment& next_segment = part.connection.segments[segment_idx+1];
+        next_vector = next_segment.to - segment.to;
+    } else
+    {
+        next_vector = part.connection.segments[0].to - segment.to;
+    }
+    Point next_dir_2D(next_vector.x, next_vector.y);
+    next_dir_2D = next_dir_2D * top_jump_dist / vSize(next_dir_2D);
+    Point3 next_dir (next_dir_2D.X / 2, next_dir_2D.Y / 2, -top_jump_dist);
+    
+    Point3 current_pos = gcode.getPosition();
+    
+    gcode.writeMove(current_pos - next_dir, speedUp, 0);
+    gcode.writeDelay(top_delay);
+    gcode.writeMove(current_pos + next_dir_2D, speedUp, 0);
+}
+
+void Wireframe2gcode::strategy_retract(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx)
+{
+    WeaveConnectionSegment& segment = part.connection.segments[segment_idx];
+    Point3 from = (segment_idx == 0)? part.connection.from : part.connection.segments[segment_idx - 1].to;
+    
+    RetractionConfig retraction_config;
+    // TODO: get these from the settings!
+    retraction_config.amount = 500; //INT2MM(getSettingInt("retraction_amount"))
+    retraction_config.primeAmount = 0;//INT2MM(getSettingInt("retractionPrime
+    retraction_config.speed = 20; // 40;
+    retraction_config.primeSpeed = 15; // 30;
+    retraction_config.zHop = 0; //getSettingInt("retraction_hop");
+
+    double top_retract_pause = 2.0;
+    int retract_hop_dist = 1000;
+    bool after_retract_hop = false;
+    //bool go_horizontal_first = true;
+    bool lower_retract_start = true;
+    
+    
+    Point3& to = segment.to;
+    if (lower_retract_start)
+    {
+        Point3 vec = to - from;
+        Point3 lowering = vec * retract_hop_dist / 2 / vec.vSize();
+        Point3 lower = to - lowering;
+        gcode.writeMove(lower, speedUp, extrusion_per_mm_connection);
+        gcode.writeRetraction(&retraction_config);
+        gcode.writeMove(to + lowering, speedUp, 0);
+        gcode.writeDelay(top_retract_pause);
+        if (after_retract_hop)
+            gcode.writeMove(to + Point3(0, 0, retract_hop_dist), speedFlat, 0);
+        
+    } else 
+    {
+        gcode.writeMove(to, speedUp, extrusion_per_mm_connection);
+        gcode.writeRetraction(&retraction_config);
+        gcode.writeMove(to + Point3(0, 0, retract_hop_dist), speedFlat, 0);
+        gcode.writeDelay(top_retract_pause);
+        if (after_retract_hop)    
+            gcode.writeMove(to + Point3(0, 0, retract_hop_dist*3), speedFlat, 0);
+        }
+}
+
+void Wireframe2gcode::strategy_compensate(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx)
+{
+    WeaveConnectionSegment& segment = part.connection.segments[segment_idx];
+    Point3 from = (segment_idx == 0)? part.connection.from : part.connection.segments[segment_idx - 1].to;
+    Point3 to = segment.to + Point3(0, 0, fall_down*(segment.to - from).vSize() / connectionHeight);
+    Point3 vector = segment.to - from;
+    Point3 dir = vector * drag_along / vector.vSize();
+    
+    Point3 next_point;
+    if (segment_idx + 1 < part.connection.segments.size())
+    {
+        WeaveConnectionSegment& next_segment = part.connection.segments[segment_idx+1];
+        next_point = next_segment.to;
+    } else
+    {
+        next_point = part.connection.segments[0].to;
+    }
+    Point3 next_vector = next_point - segment.to;
+    Point next_dir_2D(next_vector.x, next_vector.y);
+    int64_t next_dir_2D_size = vSize(next_dir_2D);
+    if (next_dir_2D_size > 0)
+        next_dir_2D = next_dir_2D * drag_along / next_dir_2D_size;
+    Point3 next_dir (next_dir_2D.X, next_dir_2D.Y, 0);
+    
+    Point3 newTop = to - next_dir + dir;
+    
+    int64_t orrLength = (segment.to - from).vSize() + next_vector.vSize() + 1; // + 1 in order to avoid division by zero
+    int64_t newLength = (newTop - from).vSize() + (next_point - newTop).vSize() + 1; // + 1 in order to avoid division by zero
+    
+    gcode.writeMove(newTop, speedUp * newLength / orrLength, extrusion_per_mm_connection * orrLength / newLength);
+}
+void Wireframe2gcode::handle_segment(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx) 
+{
+    WeaveConnectionSegment& segment = part.connection.segments[segment_idx];
+    
+    switch(segment.segmentType)
+    {
+        case WeaveSegmentType::MOVE:
+            writeMoveWithRetract(segment.to);
+            break;
+        case WeaveSegmentType::DOWN:
+            go_down(layer, part, segment_idx);
+            break;
+        case WeaveSegmentType::FLAT:
+            DEBUG_SHOW("flat piece in connection?!!?!");
+            break;
+        case WeaveSegmentType::UP:
+            if (strategy == STRATEGY_KNOT)
+            {
+                strategy_knot(layer, part, segment_idx);
+            } else if (strategy == STRATEGY_RETRACT)
+            { 
+                strategy_retract(layer, part, segment_idx);
+            } else if (strategy == STRATEGY_COMPENSATE)
+            {
+                strategy_compensate(layer, part, segment_idx);
+            }
+            break;
+        case WeaveSegmentType::DOWN_AND_FLAT:
+            logError("Down and flat move in non-horizontal connection!");
+            break;
+    }
+}
+
+
+
+
+void Wireframe2gcode::handle_roof_segment(WeaveRoofPart& inset, WeaveConnectionPart& part, unsigned int segment_idx)
+{
+    WeaveConnectionSegment& segment = part.connection.segments[segment_idx];
+    Point3 from = (segment_idx == 0)? part.connection.from : part.connection.segments[segment_idx - 1].to;
+    WeaveConnectionSegment* next_segment = nullptr;
+    if (segment_idx + 1 < part.connection.segments.size())
+        next_segment = &part.connection.segments[segment_idx+1];
+    switch(segment.segmentType)
+    {
+        case WeaveSegmentType::MOVE:
+        case WeaveSegmentType::DOWN_AND_FLAT:
+            if (next_segment && next_segment->segmentType != WeaveSegmentType::DOWN_AND_FLAT)
+            {
+                writeMoveWithRetract(segment.to);
+            }
+            break;
+        case WeaveSegmentType::UP:
+            {
+                Point3 to = segment.to + Point3(0, 0, roof_fall_down);
+                
+                Point3 vector = segment.to - from;
+                if (vector.vSize2() == 0) return;
+                Point3 dir = vector * roof_drag_along / vector.vSize();
+                
+                Point3 next_vector;
+                if (next_segment)
+                {
+                    next_vector = next_segment->to - segment.to;
+                } else
+                {
+                    next_vector = part.connection.segments[0].to - segment.to;
+                }
+                Point next_dir_2D(next_vector.x, next_vector.y);
+                Point3 detoured = to + dir;
+                if (vSize2(next_dir_2D) > 0) 
+                {
+                    next_dir_2D = next_dir_2D * roof_drag_along / vSize(next_dir_2D);
+                    Point3 next_dir (next_dir_2D.X, next_dir_2D.Y, 0);
+                    detoured -= next_dir;
+                }
+                
+                gcode.writeMove(detoured, speedUp, extrusion_per_mm_connection);
+
+            }
+            break;
+        case WeaveSegmentType::DOWN:
+            gcode.writeMove(segment.to, speedDown, extrusion_per_mm_connection);
+            gcode.writeDelay(roof_outer_delay);
+            break;
+        case WeaveSegmentType::FLAT:
+            logError("Flat move in connection!");
+            break;
+    }
+
+}
+
+
+
+void Wireframe2gcode::writeFill(std::vector<WeaveRoofPart>& infill_insets, Polygons& roof_outlines
+    , std::function<void (Wireframe2gcode& thiss, WeaveRoofPart& inset, WeaveConnectionPart& part, unsigned int segment_idx)> connectionHandler
+    , std::function<void (Wireframe2gcode& thiss, WeaveConnectionSegment& p)> flatHandler)
+{
+        
+    // bottom:
+    gcode.writeTypeComment("FILL");
+    for (unsigned int inset_idx = 0; inset_idx < infill_insets.size(); inset_idx++)
+    {
+        WeaveRoofPart& inset = infill_insets[inset_idx];
+        
+        
+        for (unsigned int inset_part_nr = 0; inset_part_nr < inset.connections.size(); inset_part_nr++)
+        {
+            WeaveConnectionPart& inset_part = inset.connections[inset_part_nr];
+            std::vector<WeaveConnectionSegment>& segments = inset_part.connection.segments;
+            
+            gcode.writeTypeComment("SUPPORT"); // connection
+            if (segments.size() == 0) continue;
+            Point3 first_extrusion_from = inset_part.connection.from;
+            unsigned int first_segment_idx;
+            for (first_segment_idx = 0; first_segment_idx < segments.size() && segments[first_segment_idx].segmentType == WeaveSegmentType::MOVE; first_segment_idx++)
+            { // finds the first segment which is not a move
+                first_extrusion_from = segments[first_segment_idx].to;
+            }
+            if (first_segment_idx == segments.size())
+                continue;
+            writeMoveWithRetract(first_extrusion_from);
+            for (unsigned int segment_idx = first_segment_idx; segment_idx < segments.size(); segment_idx++)
+            {
+                connectionHandler(*this, inset, inset_part, segment_idx);
+            }
+            
+            gcode.writeTypeComment("WALL-INNER"); // top
+            for (unsigned int segment_idx = 0; segment_idx < segments.size(); segment_idx++)
+            {
+                WeaveConnectionSegment& segment = segments[segment_idx];
+
+                if (segment.segmentType == WeaveSegmentType::DOWN) continue;
+
+                flatHandler(*this, segment); 
+            }
+        }
+        
+        
+    }
+    
+    gcode.writeTypeComment("WALL-OUTER"); // outer perimeter of the flat parts
+    for (PolygonRef poly : roof_outlines)
+    {
+        writeMoveWithRetract(poly[poly.size() - 1]);
+        for (Point& p : poly)
+        {
+            Point3 to(p.X, p.Y, gcode.getPositionZ());
+            WeaveConnectionSegment segment(to, WeaveSegmentType::FLAT);
+            flatHandler(*this, segment); 
+        }
+    }
+}
+
+
+
+
+void Wireframe2gcode::writeMoveWithRetract(Point3 to)
+{
+    if ((gcode.getPosition() - to).vSize2() >= nozzle_top_diameter * nozzle_top_diameter * 2 * 2)
+        gcode.writeRetraction(&standard_retraction_config);
+    gcode.writeMove(to, moveSpeed, 0);
+}
+
+void Wireframe2gcode::writeMoveWithRetract(Point to)
+{
+    if (vSize2(gcode.getPositionXY() - to) >= nozzle_top_diameter * nozzle_top_diameter * 2 * 2)
+        gcode.writeRetraction(&standard_retraction_config);
+    gcode.writeMove(to, moveSpeed, 0);
+}
+
+Wireframe2gcode::Wireframe2gcode(Weaver& weaver, GCodeExport& gcode, SettingsBase* settings_base) 
+: SettingsMessenger(settings_base) 
+, gcode(gcode)
+{
+    wireFrame = weaver.wireFrame;
+    initial_layer_thickness = getSettingInMicrons("layer_height_0");
+    connectionHeight = getSettingInMicrons("wireframe_height"); 
+    roof_inset = getSettingInMicrons("wireframe_roof_inset"); 
+    
+    filament_diameter = getSettingInMicrons("material_diameter");
+    extrusionWidth = getSettingInMicrons("wall_line_width_x");
+    
+    flowConnection = getSettingInPercentage("wireframe_flow_connection");
+    flowFlat = getSettingInPercentage("wireframe_flow_flat");
+    
+    double filament_area = /* M_PI * */ (INT2MM(filament_diameter) / 2.0) * (INT2MM(filament_diameter) / 2.0);
+    double lineArea = /* M_PI * */ (INT2MM(extrusionWidth) / 2.0) * (INT2MM(extrusionWidth) / 2.0);
+    extrusion_per_mm_connection = lineArea / filament_area * flowConnection / 100.0;
+    extrusion_per_mm_flat = lineArea / filament_area * flowFlat / 100.0;
+    
+    nozzle_outer_diameter = getSettingInMicrons("machine_nozzle_tip_outer_diameter"); // ___       ___   .
+    nozzle_head_distance = getSettingInMicrons("machine_nozzle_head_distance");      //    |     |      .
+    nozzle_expansion_angle = getSettingInAngleRadians("machine_nozzle_expansion_angle");  //     \_U_/       .
+    nozzle_clearance = getSettingInMicrons("wireframe_nozzle_clearance");    // at least line width
+    nozzle_top_diameter = tan(nozzle_expansion_angle) * connectionHeight + nozzle_outer_diameter + nozzle_clearance;
+    
+    moveSpeed = 40;
+    speedBottom =  getSettingInMillimetersPerSecond("wireframe_printspeed_bottom");
+    speedUp = getSettingInMillimetersPerSecond("wireframe_printspeed_up");
+    speedDown = getSettingInMillimetersPerSecond("wireframe_printspeed_down");
+    speedFlat = getSettingInMillimetersPerSecond("wireframe_printspeed_flat");
+
+    flat_delay = getSettingInSeconds("wireframe_flat_delay");
+    bottom_delay = getSettingInSeconds("wireframe_bottom_delay");
+    top_delay = getSettingInSeconds("wireframe_top_delay");
+    
+    up_dist_half_speed = getSettingInMicrons("wireframe_up_half_speed");
+    
+    top_jump_dist = getSettingInMicrons("wireframe_top_jump");
+    
+    fall_down = getSettingInMicrons("wireframe_fall_down");
+    drag_along = getSettingInMicrons("wireframe_drag_along");
+    
+    strategy = STRATEGY_COMPENSATE;
+    if (getSettingString("wireframe_strategy") == "Compensate")
+        strategy = STRATEGY_COMPENSATE;
+    if (getSettingString("wireframe_strategy") == "Knot")
+        strategy = STRATEGY_KNOT;
+    if (getSettingString("wireframe_strategy") == "Retract")
+        strategy = STRATEGY_RETRACT;
+    
+    go_back_to_last_top = false;
+    straight_first_when_going_down = getSettingInPercentage("wireframe_straight_before_down");
+    
+    roof_fall_down = getSettingInMicrons("wireframe_roof_fall_down");
+    roof_drag_along = getSettingInMicrons("wireframe_roof_drag_along");
+    roof_outer_delay = getSettingInSeconds("wireframe_roof_outer_delay");
+    
+    
+    standard_retraction_config.amount = INT2MM(getSettingInMicrons("retraction_amount"));
+    standard_retraction_config.primeAmount = INT2MM(getSettingInMicrons("retraction_extra_prime_amount"));
+    standard_retraction_config.speed = getSettingInMillimetersPerSecond("retraction_retract_speed");
+    standard_retraction_config.primeSpeed = getSettingInMillimetersPerSecond("retraction_prime_speed");
+    standard_retraction_config.zHop = getSettingInMicrons("retraction_hop");
+
+
+}
+
+void Wireframe2gcode::processStartingCode(CommandSocket* command_socket)
+{
+    if (gcode.getFlavor() == EGCodeFlavor::ULTIGCODE)
+    {
+        if (!command_socket)
+        {
+            gcode.writeCode(";FLAVOR:UltiGCode\n;TIME:666\n;MATERIAL:666\n;MATERIAL2:-1\n");
+        }
+    }
+    else 
+    {
+        if (getSettingBoolean("machine_heated_bed") && getSettingInDegreeCelsius("material_bed_temperature") > 0)
+            gcode.writeBedTemperatureCommand(getSettingInDegreeCelsius("material_bed_temperature"), true);
+        
+        if (getSettingInDegreeCelsius("material_print_temperature") > 0)
+        {
+            gcode.writeTemperatureCommand(getSettingAsIndex("extruder_nr"), getSettingInDegreeCelsius("material_print_temperature"));
+            gcode.writeTemperatureCommand(getSettingAsIndex("extruder_nr"), getSettingInDegreeCelsius("material_print_temperature"), true);
+        }
+        
+    }
+    gcode.writeCode(getSettingString("machine_start_gcode").c_str());
+    
+    gcode.writeComment("Generated with Cura_SteamEngine " VERSION);
+    if (gcode.getFlavor() == EGCodeFlavor::BFB)
+    {
+        gcode.writeComment("enable auto-retraction");
+        std::ostringstream tmp;
+        tmp << "M227 S" << (getSettingInMicrons("retraction_amount") * 2560 / 1000) << " P" << (getSettingInMicrons("retraction_amount") * 2560 / 1000);
+        gcode.writeLine(tmp.str().c_str());
+    }
+}
+
+
+void Wireframe2gcode::processSkirt(CommandSocket* commandSocket)
+{
+    Polygons skirt = wireFrame.bottom_outline.offset(100000+5000).offset(-100000);
+    PathOrderOptimizer order(gcode.getStartPositionXY());
+    order.addPolygons(skirt);
+    order.optimize();
+    
+    for (unsigned int poly_idx = 0; poly_idx < skirt.size(); poly_idx++)
+    {
+        unsigned int actual_poly_idx = order.polyOrder[poly_idx];
+        PolygonRef poly = skirt[actual_poly_idx];
+        gcode.writeMove(poly[order.polyStart[actual_poly_idx]], getSettingInMillimetersPerSecond("speed_travel"), 0);
+        for (unsigned int point_idx = 0; point_idx < poly.size(); point_idx++)
+        {
+            Point& p = poly[(point_idx + order.polyStart[actual_poly_idx] + 1) % poly.size()];
+            gcode.writeMove(p, getSettingInMillimetersPerSecond("skirt_speed"), getSettingInMillimetersPerSecond("skirt_line_width"));
+        }
+    }
+}
+
+
+void Wireframe2gcode::finalize(int maxObjectHeight)
+{
+    gcode.finalize(maxObjectHeight, getSettingInMillimetersPerSecond("speed_travel"), getSettingString("machine_end_gcode").c_str());
+    for(int e=0; e<getSettingAsCount("machine_extruder_count"); e++)
+        gcode.writeTemperatureCommand(e, 0, false);
+}
+}//namespace cura    

src/Wireframe2gcode.h

@@ -0,0 +1,170 @@
+#ifndef WIREFRAME2GCODE_H
+#define WIREFRAME2GCODE_H
+
+
+#include <functional> // passing function pointer or lambda as argument to a function
+
+#include "weaveDataStorage.h"
+#include "commandSocket.h"
+#include "settings.h"
+
+#include "MeshGroup.h"
+#include "slicer.h"
+
+#include "utils/polygon.h"
+#include "Weaver.h"
+
+#include "debug.h"
+
+namespace cura
+{
+
+/*!
+ * Export class for exporting wireframe print gcode / weaver gcode / wireprint gcode.
+ */
+class Wireframe2gcode : public SettingsMessenger
+{
+private:
+    static const int STRATEGY_COMPENSATE = 0;
+    static const int STRATEGY_KNOT = 1;
+    static const int STRATEGY_RETRACT = 2;
+    
+    int initial_layer_thickness;
+    int filament_diameter;
+    int extrusionWidth;
+    double flowConnection;
+    double flowFlat; 
+    double extrusion_per_mm_connection; 
+    double extrusion_per_mm_flat; 
+    int nozzle_outer_diameter;
+    int nozzle_head_distance;
+    double nozzle_expansion_angle;
+    int nozzle_clearance;
+    int nozzle_top_diameter;
+    double moveSpeed;
+    double speedBottom;
+    double speedUp;
+    double speedDown;
+    double speedFlat;
+    int connectionHeight;
+    int roof_inset;
+    double flat_delay;
+    double bottom_delay;
+    double top_delay;
+    int up_dist_half_speed;
+    int top_jump_dist;
+    int fall_down;
+    int drag_along;
+    int strategy;
+    double go_back_to_last_top;
+    int straight_first_when_going_down;
+    int roof_fall_down;
+    int roof_drag_along;
+    double roof_outer_delay;
+    
+    RetractionConfig standard_retraction_config; //!< The standard retraction settings used for moves between parts etc.
+    
+public:
+    GCodeExport& gcode; //!< Where the result is 'stored'
+    
+    Wireframe2gcode(Weaver& weaver, GCodeExport& gcode, SettingsBase* settings_base);
+    
+    void writeGCode(CommandSocket* commandSocket);
+
+
+private:
+    WireFrame wireFrame;
+    
+    /*!
+     * Startup gcode: nozzle temp up, retraction settings, bed temp
+     */
+    void processStartingCode(CommandSocket* command_socket);
+    
+    /*!
+     * Lay down a skirt
+     */
+    void processSkirt(CommandSocket* commandSocket);
+    
+    /*!
+     * End gcode: nozzle temp down
+     */
+    void finalize(int maxObjectHeight);
+    
+    void writeFill(std::vector<WeaveRoofPart>& infill_insets, Polygons& outlines
+        , std::function<void (Wireframe2gcode& thiss, WeaveRoofPart& inset, WeaveConnectionPart& part, unsigned int segment_idx)> connectionHandler
+        , std::function<void (Wireframe2gcode& thiss, WeaveConnectionSegment& p)> flatHandler);
+    
+    /*!
+     * Function for writing the gcode for a diagonally down movement of a connection.
+     * 
+     * \param layer The layer in which the segment is
+     * \param part The part in which the segment is
+     * \param segment_idx The index of the segment in the \p part
+     */
+    void go_down(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx);
+    
+    /*!
+     * Function for writing the gcode of an upward move of a connection, which does a couple of small moves at the top.
+     * 
+     * \param layer The layer in which the segment is
+     * \param part The part in which the segment is
+     * \param segment_idx The index of the segment in the \p part
+     */
+    void strategy_knot(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx);
+    
+    /*!
+     * Function for writing the gcode of an upward move of a connection, which does a retract at the top.
+     * 
+     * \param layer The layer in which the segment is
+     * \param part The part in which the segment is
+     * \param segment_idx The index of the segment in the \p part
+     */
+    void strategy_retract(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx);
+    
+    /*!
+     * Function for writing the gcode of an upward move of a connection, which goes Wireframe2gcode::fall_down further up 
+     * and Wireframe2gcode::drag_along back from the direction it will go to next.
+     * 
+     * \param layer The layer in which the segment is
+     * \param part The part in which the segment is
+     * \param segment_idx The index of the segment in the \p part
+     */
+    void strategy_compensate(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx);
+    
+    /*!
+     * Function writing the gcode of a segment in the connection between two layers.
+     * 
+     * \param layer The layer in which the segment is
+     * \param part The part in which the segment is
+     * \param segment_idx The index of the segment in the \p part
+     */
+    void handle_segment(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx);
+    
+    /*!
+     * Function for writing the gcode of a segment in the connection between two roof insets / floor outsets.
+     * 
+     * \param inset The inset in which the segment is
+     * \param part the part in which the segment is
+     * \param segment_idx The index of the segment in the \p part
+     */
+    void handle_roof_segment(WeaveRoofPart& inset, WeaveConnectionPart& part, unsigned int segment_idx);
+    
+    /*!
+     * Write a move action to gcode, inserting a retraction if neccesary.
+     * 
+     * \param to The 3D destination of the move
+     */
+    void writeMoveWithRetract(Point3 to);
+    
+    /*!
+     * Write a move action to gcode, inserting a retraction if neccesary.
+     * 
+     * \param to The 2D destination of the move
+     */
+    void writeMoveWithRetract(Point to);
+
+};
+
+}//namespace cura
+
+#endif//WIREFRAME2GCODE_H

src/bridge.cpp

@@ -1,6 +1,8 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
 #include "bridge.h"
 
+#include "sliceDataStorage.h"
+
 namespace cura {
 
 int bridgeAngle(Polygons outline, SliceLayer* prevLayer)

src/bridge.h

@@ -2,9 +2,9 @@
 #ifndef BRIDGE_H
 #define BRIDGE_H
 
-#include "sliceDataStorage.h"
-
 namespace cura {
+    class Polygons;
+    class SliceLayer;
 
 int bridgeAngle(Polygons outline, SliceLayer* prevLayer);
 

src/comb.cpp

@@ -1,236 +1,433 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
 #include "comb.h"
 
+#include <algorithm>
+
+#include "utils/polygonUtils.h"
+#include "sliceDataStorage.h"
+#include "utils/SVG.h"
+
 namespace cura {
 
-bool Comb::preTest(Point startPoint, Point endPoint)
+bool Comb::moveInsideBoundary(Point* p, int distance)
 {
-    return collisionTest(startPoint, endPoint);
+    return PolygonUtils::moveInside(boundary_inside, *p, distance) != NO_INDEX;
 }
 
-bool Comb::collisionTest(Point startPoint, Point endPoint)
+Polygons Comb::getLayerSecondWalls()
+{
+    if (layer_nr < 0)
+    { // when a raft is present
+        return storage.raftOutline.offset(MM2INT(0.1));
+    }
+    else 
+    {
+        Polygons layer_walls;
+        for (SliceMeshStorage& mesh : storage.meshes)
+        {
+            for (SliceLayerPart& part : mesh.layers[layer_nr].parts)
+            {
+                // we want the 2nd inner walls
+                if (part.insets.size() >= 2) {
+                    layer_walls.add(part.insets[1]);
+                    continue;
+                }
+                // but we'll also take the inner wall if the 2nd doesn't exist
+                if (part.insets.size() >= 1) {
+                    layer_walls.add(part.insets[0]);
+                    continue;
+                }
+                // and if there is no walls, we'll try to move inside from the outline
+                Polygons newOutline = part.outline.offset(-offset_from_outlines);
+                if(newOutline.polygonLength() > 0) {
+                    layer_walls.add(newOutline);
+                    continue;
+                }
+                // offset_from_outlines was so large that it completely destroyed our isle,
+                // so we'll just use the regular outline
+                layer_walls.add(part.outline);
+                continue;
+            }
+        }
+        return layer_walls;
+    }
+}
+  
+// boundary_outside is only computed when it's needed!
+Polygons* Comb::getBoundaryOutside()
+{
+    if (!boundary_outside)
+    {
+        boundary_outside = new Polygons();
+        *boundary_outside =  storage.getLayerOutlines(layer_nr, false).offset(offset_from_outlines_outside); 
+    }
+    return boundary_outside;
+}
+  
+Comb::Comb(SliceDataStorage& storage, int layer_nr, int64_t comb_boundary_offset, bool travel_avoid_other_parts, int64_t travel_avoid_distance)
+: storage(storage)
+, layer_nr(layer_nr)
+, offset_from_outlines(comb_boundary_offset) // between second wall and infill / other walls
+, max_moveInside_distance2(offset_from_outlines * 2 * offset_from_outlines * 2)
+, offset_from_outlines_outside(travel_avoid_distance)
+, avoid_other_parts(travel_avoid_other_parts)
+// , boundary_inside( boundary.offset(-offset_from_outlines) ) // TODO: make inside boundary configurable?
+, boundary_inside( getLayerSecondWalls() )
+, boundary_outside(nullptr)
+, partsView_inside( boundary_inside.splitIntoPartsView() ) // !! changes the order of boundary_inside !!
+{
+}
+
+Comb::~Comb()
+{
+    if (boundary_outside)
+        delete boundary_outside;
+}
+
+bool Comb::calc(Point startPoint, Point endPoint, CombPaths& combPaths, bool startInside, bool endInside, int64_t max_comb_distance_ignored)
+{
+    if (shorterThen(endPoint - startPoint, max_comb_distance_ignored))
+    {
+        return true;
+    }
+    
+
+    
+    //Move start and end point inside the comb boundary
+    unsigned int start_inside_poly = NO_INDEX;
+    if (startInside) 
+    {
+        start_inside_poly = PolygonUtils::moveInside(boundary_inside, startPoint, offset_extra_start_end, max_moveInside_distance2);
+        if (!inside(start_inside_poly) || start_inside_poly == NO_INDEX)
+        {
+            if (start_inside_poly != NO_INDEX)
+            { // if not yet inside because of overshoot, try again
+                start_inside_poly = PolygonUtils::moveInside(boundary_inside, startPoint, offset_extra_start_end, max_moveInside_distance2);
+            }
+            if (start_inside_poly == NO_INDEX)    //If we fail to move the point inside the comb boundary we need to retract.
+            {
+                startInside = false;
+            }
+        }
+    }
+    unsigned int end_inside_poly = NO_INDEX;
+    if (endInside)
+    {
+        end_inside_poly = PolygonUtils::moveInside(boundary_inside, endPoint, offset_extra_start_end, max_moveInside_distance2);
+        if (!inside(endPoint) || end_inside_poly == NO_INDEX)
+        {
+            if (end_inside_poly != NO_INDEX)
+            { // if not yet inside because of overshoot, try again
+                end_inside_poly = PolygonUtils::moveInside(boundary_inside, endPoint, offset_extra_start_end, max_moveInside_distance2);
+            }
+            if (end_inside_poly == NO_INDEX)    //If we fail to move the point inside the comb boundary we need to retract.
+            {
+                endInside = false;
+            }
+        }
+    }
+
+    
+    unsigned int start_part_boundary_poly_idx;
+    unsigned int end_part_boundary_poly_idx;
+    unsigned int start_part_idx =   (start_inside_poly == NO_INDEX)?    NO_INDEX : partsView_inside.getPartContaining(start_inside_poly, &start_part_boundary_poly_idx);
+    unsigned int end_part_idx =     (end_inside_poly == NO_INDEX)?      NO_INDEX : partsView_inside.getPartContaining(end_inside_poly, &end_part_boundary_poly_idx);
+    
+    if (startInside && endInside && start_part_idx == end_part_idx)
+    { // normal combing within part
+        PolygonsPart part = partsView_inside.assemblePart(start_part_idx);
+        combPaths.emplace_back();
+        LinePolygonsCrossings::comb(part, startPoint, endPoint, combPaths.back(), -offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored);
+        return true;
+    }
+    else 
+    { // comb inside part to edge (if needed) >> move through air avoiding other parts >> comb inside end part upto the endpoint (if needed) 
+        Point middle_from;
+        Point middle_to;
+        Point inside_middle_from;
+        Point inside_middle_to;
+        
+        if (startInside && endInside)
+        {
+            ClosestPolygonPoint middle_from_cp = PolygonUtils::findClosest(endPoint, boundary_inside[start_part_boundary_poly_idx]);
+            ClosestPolygonPoint middle_to_cp = PolygonUtils::findClosest(middle_from_cp.location, boundary_inside[end_part_boundary_poly_idx]);
+//             walkToNearestSmallestConnection(middle_from_cp, middle_to_cp); // TODO: perform this optimization?
+            middle_from = middle_from_cp.location;
+            inside_middle_from = middle_from_cp.location;
+            middle_to = middle_to_cp.location;
+            inside_middle_to = middle_to_cp.location;
+            PolygonUtils::moveInside(boundary_inside,inside_middle_from,offset_dist_to_get_from_on_the_polygon_to_outside,max_comb_distance_ignored); //Also move the intermediary waypoint inside if it isn't yet.
+            PolygonUtils::moveInside(boundary_inside,inside_middle_to,offset_dist_to_get_from_on_the_polygon_to_outside,max_comb_distance_ignored);
+        }
+        else if(!startInside && !endInside)
+        {
+            middle_from = startPoint;
+            inside_middle_from = startPoint;
+            middle_to = endPoint;
+            inside_middle_to = endPoint;
+        }
+        else if(!startInside && endInside)
+        {
+            middle_from = startPoint;
+            inside_middle_from = startPoint;
+            ClosestPolygonPoint middle_to_cp = PolygonUtils::findClosest(middle_from,boundary_inside[end_part_boundary_poly_idx]);
+            middle_to = middle_to_cp.location;
+            inside_middle_to = middle_to_cp.location;
+            PolygonUtils::moveInside(boundary_inside,inside_middle_to,offset_dist_to_get_from_on_the_polygon_to_outside,max_comb_distance_ignored);
+        }
+        else if(startInside && !endInside)
+        {
+            middle_to = endPoint;
+            inside_middle_to = endPoint;
+            ClosestPolygonPoint middle_from_cp = PolygonUtils::findClosest(middle_to,boundary_inside[start_part_boundary_poly_idx]);
+            middle_from = middle_from_cp.location;
+            inside_middle_from = middle_from_cp.location;
+            PolygonUtils::moveInside(boundary_inside,inside_middle_from,offset_dist_to_get_from_on_the_polygon_to_outside,max_comb_distance_ignored);
+        }
+        
+        if (startInside)
+        {
+            // start to boundary
+            PolygonsPart part_begin = partsView_inside.assemblePart(start_part_idx); // comb through the starting part only
+            combPaths.emplace_back();
+            LinePolygonsCrossings::comb(part_begin, startPoint, inside_middle_from, combPaths.back(), -offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored);
+        }
+        
+        // throught air from boundary to boundary
+        if (avoid_other_parts)
+        {
+            Polygons& middle = *getBoundaryOutside(); // comb through all air, since generally the outside consists of a single part
+            Point from_outside = middle_from;
+            if (startInside || middle.inside(from_outside, true))
+            { // move outside
+                PolygonUtils::moveInside(middle, from_outside, -offset_extra_start_end, max_moveInside_distance2);
+            }
+            Point to_outside = middle_to;
+            if (endInside || middle.inside(to_outside, true))
+            { // move outside
+                PolygonUtils::moveInside(middle, to_outside, -offset_extra_start_end, max_moveInside_distance2);
+            }
+            combPaths.emplace_back();
+            combPaths.back().throughAir = true;
+            if ( vSize(inside_middle_from - inside_middle_to) < vSize(inside_middle_from - from_outside) + vSize(inside_middle_to - to_outside) )
+            { // via outside is a detour
+                combPaths.back().push_back(inside_middle_from);
+                combPaths.back().push_back(inside_middle_to);
+            }
+            else
+            {
+                LinePolygonsCrossings::comb(middle, from_outside, to_outside, combPaths.back(), offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored);
+            }
+        }
+        else 
+        { // directly through air (not avoiding other parts)
+            combPaths.emplace_back();
+            combPaths.back().throughAir = true;
+            combPaths.back().cross_boundary = true; // TODO: calculate whether we cross a boundary!
+            combPaths.back().push_back(inside_middle_from);
+            combPaths.back().push_back(inside_middle_to);
+        }
+        
+        if (endInside)
+        {
+            // boundary to end
+            PolygonsPart part_end = partsView_inside.assemblePart(end_part_idx); // comb through end part only
+            combPaths.emplace_back();
+            LinePolygonsCrossings::comb(part_end, inside_middle_to, endPoint, combPaths.back(), -offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored);
+        }
+        
+        return true;
+    }
+}
+
+void LinePolygonsCrossings::calcScanlineCrossings()
+{
+    
+    min_crossing_idx = NO_INDEX;
+    max_crossing_idx = NO_INDEX;
+        
+    for(unsigned int poly_idx = 0; poly_idx < boundary.size(); poly_idx++)
+    {
+        PolyCrossings minMax(poly_idx); 
+        PolygonRef poly = boundary[poly_idx];
+        Point p0 = transformation_matrix.apply(poly[poly.size() - 1]);
+        for(unsigned int point_idx = 0; point_idx < poly.size(); point_idx++)
+        {
+            Point p1 = transformation_matrix.apply(poly[point_idx]);
+            if((p0.Y >= transformed_startPoint.Y && p1.Y <= transformed_startPoint.Y) || (p1.Y >= transformed_startPoint.Y && p0.Y <= transformed_startPoint.Y))
+            {
+                if(p1.Y == p0.Y) //Line segment is parallel with the scanline. That means that both endpoints lie on the scanline, so they will have intersected with the adjacent line.
+                {
+                    p0 = p1;
+                    continue;
+                }
+                int64_t x = p0.X + (p1.X - p0.X) * (transformed_startPoint.Y - p0.Y) / (p1.Y - p0.Y);
+                
+                if (x >= transformed_startPoint.X && x <= transformed_endPoint.X)
+                {
+                    if(x < minMax.min.x) //For the leftmost intersection, move x left to stay outside of the border.
+                                         //Note: The actual distance from the intersection to the border is almost always less than dist_to_move_boundary_point_outside, since it only moves along the direction of the scanline.
+                    {
+                        minMax.min.x = x;
+                        minMax.min.point_idx = point_idx;
+                    }
+                    if(x > minMax.max.x) //For the rightmost intersection, move x right to stay outside of the border.
+                    {
+                        minMax.max.x = x;
+                        minMax.max.point_idx = point_idx;
+                    }
+                }
+            }
+            p0 = p1;
+        }
+        
+        if (minMax.min.point_idx != NO_INDEX)
+        { // then also max.point_idx != -1
+            if (min_crossing_idx == NO_INDEX || minMax.min.x < crossings[min_crossing_idx].min.x) { min_crossing_idx = crossings.size(); }
+            if (max_crossing_idx == NO_INDEX || minMax.max.x > crossings[max_crossing_idx].max.x) { max_crossing_idx = crossings.size(); }
+            crossings.push_back(minMax);
+        }
+        
+    }
+}
+
+
+bool LinePolygonsCrossings::lineSegmentCollidesWithBoundary()
 {
     Point diff = endPoint - startPoint;
 
-    matrix = PointMatrix(diff);
-    sp = matrix.apply(startPoint);
-    ep = matrix.apply(endPoint);
-    
-    for(unsigned int n=0; n<boundery.size(); n++)
+    transformation_matrix = PointMatrix(diff);
+    transformed_startPoint = transformation_matrix.apply(startPoint);
+    transformed_endPoint = transformation_matrix.apply(endPoint);
+
+    for(PolygonRef poly : boundary)
     {
-        if (boundery[n].size() < 1)
-            continue;
-        Point p0 = matrix.apply(boundery[n][boundery[n].size()-1]);
-        for(unsigned int i=0; i<boundery[n].size(); i++)
+        Point p0 = transformation_matrix.apply(poly.back());
+        for(Point p1_ : poly)
         {
-            Point p1 = matrix.apply(boundery[n][i]);
-            if ((p0.Y > sp.Y && p1.Y < sp.Y) || (p1.Y > sp.Y && p0.Y < sp.Y))
+            Point p1 = transformation_matrix.apply(p1_);
+            if ((p0.Y > transformed_startPoint.Y && p1.Y < transformed_startPoint.Y) || (p1.Y > transformed_startPoint.Y && p0.Y < transformed_startPoint.Y))
             {
-                int64_t x = p0.X + (p1.X - p0.X) * (sp.Y - p0.Y) / (p1.Y - p0.Y);
+                int64_t x = p0.X + (p1.X - p0.X) * (transformed_startPoint.Y - p0.Y) / (p1.Y - p0.Y);
                 
-                if (x > sp.X && x < ep.X)
+                if (x > transformed_startPoint.X && x < transformed_endPoint.X)
                     return true;
             }
             p0 = p1;
         }
     }
+    
     return false;
 }
 
-void Comb::calcMinMax()
+
+void LinePolygonsCrossings::getCombingPath(CombPath& combPath, int64_t max_comb_distance_ignored)
 {
-    for(unsigned int n=0; n<boundery.size(); n++)
+    if (shorterThen(endPoint - startPoint, max_comb_distance_ignored) || !lineSegmentCollidesWithBoundary())
     {
-        minX[n] = INT64_MAX;
-        maxX[n] = INT64_MIN;
-        Point p0 = matrix.apply(boundery[n][boundery[n].size()-1]);
-        for(unsigned int i=0; i<boundery[n].size(); i++)
-        {
-            Point p1 = matrix.apply(boundery[n][i]);
-            if ((p0.Y > sp.Y && p1.Y < sp.Y) || (p1.Y > sp.Y && p0.Y < sp.Y))
-            {
-                int64_t x = p0.X + (p1.X - p0.X) * (sp.Y - p0.Y) / (p1.Y - p0.Y);
-                
-                if (x >= sp.X && x <= ep.X)
-                {
-                    if (x < minX[n]) { minX[n] = x; minIdx[n] = i; }
-                    if (x > maxX[n]) { maxX[n] = x; maxIdx[n] = i; }
-                }
-            }
-            p0 = p1;
-        }
+        //We're not crossing any boundaries. So skip the comb generation.
+        combPath.push_back(startPoint); 
+        combPath.push_back(endPoint);
+        return;
     }
+    
+    calcScanlineCrossings();
+    
+    CombPath basicPath;
+    getBasicCombingPath(basicPath);
+    optimizePath(basicPath, combPath);
 }
 
-unsigned int Comb::getPolygonAbove(int64_t x)
+
+void LinePolygonsCrossings::getBasicCombingPath(CombPath& combPath) 
 {
-    int64_t min = POINT_MAX;
-    unsigned int ret = NO_INDEX;
-    for(unsigned int n=0; n<boundery.size(); n++)
+    for (PolyCrossings* crossing = getNextPolygonAlongScanline(transformed_startPoint.X)
+        ; crossing != nullptr
+        ; crossing = getNextPolygonAlongScanline(crossing->max.x))
     {
-        if (minX[n] > x && minX[n] < min)
+        getBasicCombingPath(*crossing, combPath);
+    }
+    combPath.push_back(endPoint);
+}
+
+void LinePolygonsCrossings::getBasicCombingPath(PolyCrossings& polyCrossings, CombPath& combPath) 
+{
+    PolygonRef poly = boundary[polyCrossings.poly_idx];
+    combPath.push_back(transformation_matrix.unapply(Point(polyCrossings.min.x + dist_to_move_boundary_point_outside, transformed_startPoint.Y)));
+    if ( ( polyCrossings.max.point_idx - polyCrossings.min.point_idx + poly.size() ) % poly.size() 
+        < poly.size() / 2 )
+    { // follow the path in the same direction as the winding order of the boundary polygon
+        for(unsigned int point_idx = polyCrossings.min.point_idx
+            ; point_idx != polyCrossings.max.point_idx
+            ; point_idx = (point_idx < poly.size() - 1) ? (point_idx + 1) : (0))
         {
-            min = minX[n];
-            ret = n;
+            combPath.push_back(PolygonUtils::getBoundaryPointWithOffset(poly, point_idx, dist_to_move_boundary_point_outside));
+        }
+    }
+    else
+    { // follow the path in the opposite direction of the winding order of the boundary polygon
+        unsigned int min_idx = (polyCrossings.min.point_idx == 0)? poly.size() - 1: polyCrossings.min.point_idx - 1;
+        unsigned int max_idx = (polyCrossings.max.point_idx == 0)? poly.size() - 1: polyCrossings.max.point_idx - 1;
+
+        for(unsigned int point_idx = min_idx; point_idx != max_idx; point_idx = (point_idx > 0) ? (point_idx - 1) : (poly.size() - 1))
+        {
+            combPath.push_back(PolygonUtils::getBoundaryPointWithOffset(poly, point_idx, dist_to_move_boundary_point_outside));
+        }
+    }
+    combPath.push_back(transformation_matrix.unapply(Point(polyCrossings.max.x - dist_to_move_boundary_point_outside, transformed_startPoint.Y))); 
+}
+
+
+
+LinePolygonsCrossings::PolyCrossings* LinePolygonsCrossings::getNextPolygonAlongScanline(int64_t x)
+{
+    PolyCrossings* ret = nullptr;
+    for(PolyCrossings& crossing : crossings)
+    {
+        if (crossing.min.x > x && (ret == nullptr || crossing.min.x < ret->min.x) )
+        {
+            ret = &crossing;
         }
     }
     return ret;
 }
 
-Point Comb::getBounderyPointWithOffset(unsigned int polygonNr, unsigned int idx)
+bool LinePolygonsCrossings::optimizePath(CombPath& comb_path, CombPath& optimized_comb_path) 
 {
-    Point p0 = boundery[polygonNr][(idx > 0) ? (idx - 1) : (boundery[polygonNr].size() - 1)];
-    Point p1 = boundery[polygonNr][idx];
-    Point p2 = boundery[polygonNr][(idx < (boundery[polygonNr].size() - 1)) ? (idx + 1) : (0)];
-    
-    Point off0 = crossZ(normal(p1 - p0, MM2INT(1.0)));
-    Point off1 = crossZ(normal(p2 - p1, MM2INT(1.0)));
-    Point n = normal(off0 + off1, MM2INT(0.2));
-    
-    return p1 + n;
-}
-
-Comb::Comb(Polygons& _boundery)
-: boundery(_boundery)
-{
-    minX = new int64_t[boundery.size()];
-    maxX = new int64_t[boundery.size()];
-    minIdx = new unsigned int[boundery.size()];
-    maxIdx = new unsigned int[boundery.size()];
-}
-
-Comb::~Comb()
-{
-    delete[] minX;
-    delete[] maxX;
-    delete[] minIdx;
-    delete[] maxIdx;
-}
-
-bool Comb::moveInside(Point* p, int distance)
-{
-    Point ret = *p;
-    int64_t bestDist = MM2INT(2.0) * MM2INT(2.0);
-    for(unsigned int n=0; n<boundery.size(); n++)
+    optimized_comb_path.push_back(startPoint);
+    for(unsigned int point_idx = 1; point_idx<comb_path.size(); point_idx++)
     {
-        if (boundery[n].size() < 1)
+        if(comb_path[point_idx] == comb_path[point_idx - 1]) //Two points are the same. Skip the second.
+        {
             continue;
-        Point p0 = boundery[n][boundery[n].size()-1];
-        for(unsigned int i=0; i<boundery[n].size(); i++)
-        {
-            Point p1 = boundery[n][i];
-            
-            //Q = A + Normal( B - A ) * ((( B - A ) dot ( P - A )) / VSize( A - B ));
-            Point pDiff = p1 - p0;
-            int64_t lineLength = vSize(pDiff);
-            int64_t distOnLine = dot(pDiff, *p - p0) / lineLength;
-            if (distOnLine < 10)
-                distOnLine = 10;
-            if (distOnLine > lineLength - 10)
-                distOnLine = lineLength - 10;
-            Point q = p0 + pDiff * distOnLine / lineLength;
-            
-            int64_t dist = vSize2(q - *p);
-            if (dist < bestDist)
-            {
-                bestDist = dist;
-                ret = q + crossZ(normal(p1 - p0, distance));
-            }
-            
-            p0 = p1;
         }
-    }
-    if (bestDist < MM2INT(2.0) * MM2INT(2.0))
-    {
-        *p = ret;
-        return true;
-    }
-    return false;
-}
-
-bool Comb::calc(Point startPoint, Point endPoint, vector<Point>& combPoints)
-{
-    if (shorterThen(endPoint - startPoint, MM2INT(1.5)))
-        return true;
-    
-    bool addEndpoint = false;
-    //Check if we are inside the comb boundaries
-    if (!boundery.inside(startPoint))
-    {
-        if (!moveInside(&startPoint))    //If we fail to move the point inside the comb boundary we need to retract.
-            return false;
-        combPoints.push_back(startPoint);
-    }
-    if (!boundery.inside(endPoint))
-    {
-        if (!moveInside(&endPoint))    //If we fail to move the point inside the comb boundary we need to retract.
-            return false;
-        addEndpoint = true;
-    }
-    
-    //Check if we are crossing any bounderies, and pre-calculate some values.
-    if (!preTest(startPoint, endPoint))
-    {
-        //We're not crossing any boundaries. So skip the comb generation.
-        if (!addEndpoint && combPoints.size() == 0) //Only skip if we didn't move the start and end point.
-            return true;
-    }
-    
-    //Calculate the minimum and maximum positions where we cross the comb boundary
-    calcMinMax();
-    
-    int64_t x = sp.X;
-    vector<Point> pointList;
-    //Now walk trough the crossings, for every boundary we cross, find the initial cross point and the exit point. Then add all the points in between
-    // to the pointList and continue with the next boundary we will cross, until there are no more boundaries to cross.
-    // This gives a path from the start to finish curved around the holes that it encounters.
-    while(true)
-    {
-        unsigned int n = getPolygonAbove(x);
-        if (n == NO_INDEX) break;
-        
-        pointList.push_back(matrix.unapply(Point(minX[n] - MM2INT(0.2), sp.Y)));
-        if ( (minIdx[n] - maxIdx[n] + boundery[n].size()) % boundery[n].size() > (maxIdx[n] - minIdx[n] + boundery[n].size()) % boundery[n].size())
+        Point& current_point = optimized_comb_path.back();
+        if (PolygonUtils::polygonCollidesWithlineSegment(boundary, current_point, comb_path[point_idx]))
         {
-            for(unsigned int i=minIdx[n]; i != maxIdx[n]; i = (i < boundery[n].size() - 1) ? (i + 1) : (0))
+            if (PolygonUtils::polygonCollidesWithlineSegment(boundary, current_point, comb_path[point_idx - 1]))
             {
-                pointList.push_back(getBounderyPointWithOffset(n, i));
+                comb_path.cross_boundary = true;
             }
-        }else{
-            if (minIdx[n] == 0)
-                minIdx[n] = boundery[n].size() - 1;
-            else
-                minIdx[n]--;
-            if (maxIdx[n] == 0)
-                maxIdx[n] = boundery[n].size() - 1;
-            else
-                maxIdx[n]--;
+            optimized_comb_path.push_back(comb_path[point_idx - 1]);
+        }
+        else 
+        {
+            // : dont add the newest point
             
-            for(unsigned int i=minIdx[n]; i != maxIdx[n]; i = (i > 0) ? (i - 1) : (boundery[n].size() - 1))
+            // TODO: add the below extra optimization? (+/- 7% extra computation time, +/- 2% faster print for Dual_extrusion_support_generation.stl)
+            while (optimized_comb_path.size() > 1)
             {
-                pointList.push_back(getBounderyPointWithOffset(n, i));
+                if (PolygonUtils::polygonCollidesWithlineSegment(boundary, optimized_comb_path[optimized_comb_path.size() - 2], comb_path[point_idx]))
+                {
+                    break;
+                }
+                else 
+                {
+                    optimized_comb_path.pop_back();
+                }
             }
         }
-        pointList.push_back(matrix.unapply(Point(maxX[n] + MM2INT(0.2), sp.Y)));
-        
-        x = maxX[n];
     }
-    pointList.push_back(endPoint);
-    
-    //Optimize the pointList, skip each point we could already reach by not crossing a boundary. This smooths out the path and makes it skip any unneeded corners.
-    Point p0 = startPoint;
-    for(unsigned int n=1; n<pointList.size(); n++)
-    {
-        if (collisionTest(p0, pointList[n]))
-        {
-            if (collisionTest(p0, pointList[n-1]))
-                return false;
-            p0 = pointList[n-1];
-            combPoints.push_back(p0);
-        }
-    }
-    if (addEndpoint)
-        combPoints.push_back(endPoint);
     return true;
 }
 

src/comb.h

@@ -4,39 +4,269 @@
 
 #include "utils/polygon.h"
 
-namespace cura {
+namespace cura 
+{
+    
+struct CombPath : public  std::vector<Point> //!< A single path either inside or outise the parts
+{
+    bool throughAir = false; //!< Whether the path is one which moves through air.
+    bool cross_boundary = false; //!< Whether the path crosses a boundary.
+};
+struct CombPaths : public  std::vector<CombPath> //!< A list of paths alternating between inside a part and outside a part
+{
+}; 
 
-class Comb
+/*!
+ * Class for generating a combing move action from point a to point b and avoiding collision with other parts when moving through air.
+ * See LinePolygonsCrossings::comb.
+ * 
+ * The general implementation is by rotating everything such that the the line segment from a to b is aligned with the x-axis.
+ * We call the line on which a and b lie the 'scanline'.
+ * 
+ * The basic path is generated by following the scanline until it hits a polygon, then follow the polygon until the last point where it hits the scanline, 
+ * follow the scanline again, etc.
+ * The path is offsetted from the polygons, so that it doesn't intersect with them.
+ * 
+ * Next the basic path is optimized by taking shortcuts where possible. Only shortcuts which skip a single point are considered, in order to reduce computational complexity.
+ */
+class LinePolygonsCrossings
 {
 private:
-    Polygons& boundery;
-
-    int64_t* minX;
-    int64_t* maxX;
-    unsigned int* minIdx;
-    unsigned int* maxIdx;
-
-    PointMatrix matrix;
-    Point sp;
-    Point ep;
-
-    bool preTest(Point startPoint, Point endPoint);    
-    bool collisionTest(Point startPoint, Point endPoint);
-
-    void calcMinMax();
     
-    unsigned int getPolygonAbove(int64_t x);
+    /*!
+     * A Crossing holds data on a single point where a polygon crosses the scanline.
+     */
+    struct Crossing
+    {
+        int64_t x; //!< x coordinate of crossings between the polygon and the scanline.
+        unsigned int point_idx; //!< The index of the first point of the line segment which crosses the scanline
+        
+        /*!
+         * Creates a Crossing with minimal initialization
+         * \param x The x-coordinate in transformed space
+         * \param point_idx The index of the first point of the line segment which crosses the scanline
+         */
+        Crossing(int64_t x, unsigned int point_idx)
+        : x(x), point_idx(point_idx)
+        {
+        }
+    };
     
-    Point getBounderyPointWithOffset(unsigned int polygonNr, unsigned int idx);
+    /*!
+     * A PolyCrossings holds data on where a polygon crosses the scanline. Only the Crossing with lowest Crossing::x and highest are recorded.
+     */
+    struct PolyCrossings
+    {
+        unsigned int poly_idx; //!< The index of the polygon which crosses the scanline
+        Crossing min; //!< The point where the polygon first crosses the scanline.
+        Crossing max; //!< The point where the polygon last crosses the scanline.
+        /*!
+         * Create a PolyCrossings with minimal initialization. PolyCrossings::min and PolyCrossings::max are not yet computed.
+         * \param poly_idx The index of the polygon in LinePolygonsCrossings::boundary
+         */
+        PolyCrossings(unsigned int poly_idx) 
+        : poly_idx(poly_idx)
+        , min(INT64_MAX, NO_INDEX), max(INT64_MIN, NO_INDEX) 
+        { 
+        }
+    };
+
+    /*!
+     * A PolyCrossings list: for every polygon a PolyCrossings.
+     */
+    struct PartCrossings : public std::vector<PolyCrossings>
+    {
+        //unsigned int part_idx;
+    };
+    
+    
+    PartCrossings crossings; //!< All crossings of polygons in the LinePolygonsCrossings::boundary with the scanline.
+    unsigned int min_crossing_idx; //!< The index into LinePolygonsCrossings::crossings to the crossing with the minimal PolyCrossings::min crossing of all PolyCrossings's.
+    unsigned int max_crossing_idx; //!< The index into LinePolygonsCrossings::crossings to the crossing with the maximal PolyCrossings::max crossing of all PolyCrossings's.
+    
+    Polygons& boundary; //!< The boundary not to cross during combing.
+    Point startPoint; //!< The start point of the scanline.
+    Point endPoint; //!< The end point of the scanline.
+    
+    int64_t dist_to_move_boundary_point_outside; //!< The distance used to move outside or inside so that a boundary point doesn't intersect with the boundary anymore. Neccesary due to computational rounding problems. Use negative value for insicde combing.
+    
+    PointMatrix transformation_matrix; //!< The transformation which rotates everything such that the scanline is aligned with the x-axis.
+    Point transformed_startPoint; //!< The LinePolygonsCrossings::startPoint as transformed by Comb::transformation_matrix
+    Point transformed_endPoint; //!< The LinePolygonsCrossings::endPoint as transformed by Comb::transformation_matrix
+
+    
+    /*!
+     * Check if we are crossing the boundaries, and pre-calculate some values.
+     * 
+     * Sets Comb::transformation_matrix, Comb::transformed_startPoint and Comb::transformed_endPoint
+     * \return Whether the line segment from LinePolygonsCrossings::startPoint to LinePolygonsCrossings::endPoint collides with the boundary
+     */
+    bool lineSegmentCollidesWithBoundary();
+    
+    /*!
+     * Calculate Comb::crossings, Comb::min_crossing_idx and Comb::max_crossing_idx.
+     */
+    void calcScanlineCrossings();
+    
+    /*! 
+     * Get the basic combing path and optimize it.
+     * 
+     * \param combPath Output parameter: the points along the combing path.
+     */
+    void getCombingPath(CombPath& combPath, int64_t max_comb_distance_ignored = MM2INT(1.5));
+    
+    /*! 
+     * Get the basic combing path, without shortcuts. The path goes straight toward the endPoint and follows the boundary when it hits it, until it passes the scanline again.
+     * 
+     * Walk trough the crossings, for every boundary we cross, find the initial cross point and the exit point. Then add all the points in between
+     * to the \p combPath and continue with the next boundary we will cross, until there are no more boundaries to cross.
+     * This gives a path from the start to finish curved around the holes that it encounters.
+     * 
+     * \param combPath Output parameter: the points along the combing path.
+     */
+    void getBasicCombingPath(CombPath& combPath);
+    
+    /*! 
+     * Get the basic combing path, following a single boundary polygon when it hits it, until it passes the scanline again.
+     * 
+     * Find the initial cross point and the exit point. Then add all the points in between
+     * to the \p combPath and continue with the next boundary we will cross, until there are no more boundaries to cross.
+     * This gives a path from the start to finish curved around the polygon that it encounters.
+     * 
+     * \param combPath Output parameter: where to add the points along the combing path.
+     */
+    void getBasicCombingPath(PolyCrossings& crossings, CombPath& combPath);
+    
+    /*!
+     * Find the first polygon cutting the scanline after \p x.
+     * 
+     * Note that this function only looks at the first segment cutting the scanline (see Comb::minX)!
+     * It doesn't return the next polygon which crosses the scanline, but the first polygon crossing the scanline for the first time.
+     * 
+     * \param x The point on the scanline from where to look.
+     * \return The next PolyCrossings fully beyond \p x or one with PolyCrossings::poly_idx set to NO_INDEX if there's none left.
+     */
+    PolyCrossings* getNextPolygonAlongScanline(int64_t x);
+    
+    /*!
+     * Optimize the \p comb_path: skip each point we could already reach by not crossing a boundary. This smooths out the path and makes it skip some unneeded corners.
+     * 
+     * \param comb_path The unoptimized combing path.
+     * \param optimized_comb_path Output parameter: The points of optimized combing path
+     * \return Whether it turns out that the basic comb path already crossed a boundary
+     */
+    bool optimizePath(CombPath& comb_path, CombPath& optimized_comb_path);
+    
+    /*!
+     * Create a LinePolygonsCrossings with minimal initialization.
+     * \param boundary The boundary which not to cross during combing
+     * \param start the starting point
+     * \param end the end point
+     * \param dist_to_move_boundary_point_outside Distance used to move a point from a boundary so that it doesn't intersect with it anymore. (Precision issue)
+     */
+    LinePolygonsCrossings(Polygons& boundary, Point& start, Point& end, int64_t dist_to_move_boundary_point_outside)
+    : boundary(boundary), startPoint(start), endPoint(end), dist_to_move_boundary_point_outside(dist_to_move_boundary_point_outside)
+    {
+    }
+    
+public: 
+    
+    /*!
+     * The main function of this class: calculate one combing path within the boundary.
+     * \param boundary The polygons to follow when calculating the basic combing path
+     * \param startPoint From where to start the combing move.
+     * \param endPoint Where to end the combing move.
+     * \param combPath Output parameter: the combing path generated.
+     */
+    static void comb(Polygons& boundary, Point startPoint, Point endPoint, CombPath& combPath, int64_t dist_to_move_boundary_point_outside, int64_t max_comb_distance_ignored = MM2INT(1.5))
+    {
+        LinePolygonsCrossings linePolygonsCrossings(boundary, startPoint, endPoint, dist_to_move_boundary_point_outside);
+        linePolygonsCrossings.getCombingPath(combPath, max_comb_distance_ignored);
+    };
+};
+
+class SliceDataStorage;
+
+/*!
+ * Class for generating a full combing actions from a travel move from a start point to an end point.
+ * A single Comb object is used for each layer.
+ * 
+ * Comb::calc is the main function of this class.
+ * 
+ * Typical output: A combing path to the boundary of the polygon + a move through air avoiding other parts in the layer + a combing path from the boundary of the ending polygon to the end point.
+ * Each of these three is a CombPath; the first and last are within Comb::boundary_inside while the middle is outside of Comb::boundary_outside.
+ * Between these there is a little gap where the nozzle crosses the boundary of an object approximately perpendicular to its boundary.
+ * 
+ * As an optimization, the combing paths inside are calculated on specifically those PolygonsParts within which to comb, while the coundary_outside isn't split into outside parts, 
+ * because generally there is only one outside part; encapsulated holes occur less often.
+ */
+class Comb 
+{
+    friend class LinePolygonsCrossings;
+private:
+    SliceDataStorage& storage; //!< The storage from which to compute the outside boundary, when needed.
+    int layer_nr; //!< The layer number for the layer for which to compute the outside boundary, when needed.
+    
+    int64_t offset_from_outlines; //!< Offset from the boundary of a part to the comb path. (nozzle width / 2)
+    int64_t max_moveInside_distance2; //!< Maximal distance of a point to the Comb::boundary_inside which is still to be considered inside. (very sharp corners not allowed :S)
+    int64_t offset_from_outlines_outside; //!< Offset from the boundary of a part to a travel path which avoids it by this distance.
+    static const int64_t max_moveOutside_distance2 = INT64_MAX; //!< Any point which is not inside should be considered outside.
+    static const int64_t offset_dist_to_get_from_on_the_polygon_to_outside = 40; //!< in order to prevent on-boundary vs crossing boundary confusions (precision thing)
+    static const int64_t offset_extra_start_end = 100; //!< Distance to move start point and end point toward eachother to extra avoid collision with the boundaries.
+    
+    bool avoid_other_parts; //!< Whether to perform inverse combing a.k.a. avoid parts.
+    
+    Polygons boundary_inside; //!< The boundary within which to comb.
+    Polygons* boundary_outside; //!< The boundary outside of which to stay to avoid collision with other layer parts. This is a pointer cause we only compute it when we move outside the boundary (so not when there is only a single part in the layer)
+    PartsView partsView_inside; //!< Structured indices onto boundary_inside which shows which polygons belong to which part. 
+        
+    /*!
+     * Collects the inner most walls for every mesh in the layer (not support) or computes them from the outlines using Comb::offset_from_outlines.
+     */
+    Polygons getLayerSecondWalls();
+
+    /*!
+     * Get the boundary_outside, which is an offset from the outlines of all meshes in the layer. Calculate it when it hasn't been calculated yet.
+     */
+    Polygons* getBoundaryOutside();
     
 public:
-    Comb(Polygons& _boundery);
+    /*!
+     * Initializes the combing areas for every mesh in the layer (not support)
+     * \param storage Where the layer polygon data is stored
+     * \param layer_nr The number of the layer for which to generate the combing areas.
+     * \param offset_from_outlines The offset from the outline polygon, to create the combing boundary in case there is no second wall.
+     * \param travel_avoid_other_parts Whether to avoid other layer parts when traveling through air.
+     * \param travel_avoid_distance The distance by which to avoid other layer parts when traveling through air.
+     */
+    Comb(SliceDataStorage& storage, int layer_nr, int64_t offset_from_outlines, bool travel_avoid_other_parts, int64_t travel_avoid_distance);
+    
     ~Comb();
     
-    bool inside(const Point p) { return boundery.inside(p); }
-    bool moveInside(Point* p, int distance = 100);
+    //! Utility function for `boundary_inside.inside(p)`.
+    bool inside(const Point p) { return boundary_inside.inside(p); }
+
+    /*!
+     * Calculate the comb paths (if any) - one for each polygon combed alternated with travel paths
+     * 
+     * \param startPoint Where to start moving from
+     * \param endPoint Where to move to
+     * \param combPoints Output parameter: The points along the combing path, excluding the \p startPoint (?) and \p endPoint
+     * \param startInside Whether we want to start inside the comb boundary
+     * \param endInside Whether we want to end up inside the comb boundary
+     * \return Whether combing has succeeded; otherwise a retraction is needed.
+     */    
+    bool calc(Point startPoint, Point endPoint, CombPaths& combPaths, bool startInside = false, bool endInside = false, int64_t max_comb_distance_ignored = MM2INT(1.5));
+    
+    /*!
+     * Move \p p to inside the inner comb boundary with a \p distance from the boundary.
+     * 
+     * \param p the point to change/move
+     * \param distance the distance from the resulting point to the boundary on the inside
+     * \return whether the point has been moved inside
+     */
+    bool moveInsideBoundary(Point* p, int distance);
     
-    bool calc(Point startPoint, Point endPoint, vector<Point>& combPoints);
 };
 
 }//namespace cura

src/commandSocket.cpp

@@ -0,0 +1,337 @@
+#include "utils/logoutput.h"
+#include "commandSocket.h"
+#include "FffProcessor.h"
+#include "Progress.h"
+
+#include <thread>
+#include <cinttypes>
+
+#include <Arcus/Socket.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+namespace cura {
+
+#define BYTES_PER_FLOAT 4
+#define FLOATS_PER_VECTOR 3
+#define VECTORS_PER_FACE 3
+    
+class CommandSocket::Private
+{
+public:
+    Private()
+        : socket(nullptr)
+        , object_count(0)
+        , current_sliced_object(nullptr)
+        , sliced_objects(0)
+        , current_layer_count(0)
+        , current_layer_offset(0)
+    { }
+
+    cura::proto::Layer* getLayerById(int id);
+
+    Arcus::Socket* socket;
+    
+    // Number of objects that need to be sliced
+    int object_count;
+    
+    // Message that holds a list of sliced objects
+    std::shared_ptr<cura::proto::SlicedObjectList> sliced_object_list;
+    
+    // Message that holds the currently sliced object (to be added to sliced_object_list)
+    cura::proto::SlicedObject* current_sliced_object;
+    
+    // Number of sliced objects for this sliced object list
+    int sliced_objects;
+
+    // Number of layers sent to the front end so far
+    // Used for incrementing the current layer in one at a time mode
+    int current_layer_count;
+    int current_layer_offset;
+    
+    // Ids of the sliced objects
+    std::vector<int64_t> object_ids;
+
+    std::string temp_gcode_file;
+    std::ostringstream gcode_output_stream;
+    
+    // Print object that olds one or more meshes that need to be sliced. 
+    std::vector< std::shared_ptr<MeshGroup> > objects_to_slice;
+};
+
+CommandSocket::CommandSocket()
+    : d(new Private)
+{
+    FffProcessor::getInstance()->setCommandSocket(this);
+}
+
+void CommandSocket::connect(const std::string& ip, int port)
+{
+    d->socket = new Arcus::Socket();
+    //d->socket->registerMessageType(1, &Cura::ObjectList::default_instance());
+    d->socket->registerMessageType(1, &cura::proto::Slice::default_instance());
+    d->socket->registerMessageType(2, &cura::proto::SlicedObjectList::default_instance());
+    d->socket->registerMessageType(3, &cura::proto::Progress::default_instance());
+    d->socket->registerMessageType(4, &cura::proto::GCodeLayer::default_instance());
+    d->socket->registerMessageType(5, &cura::proto::ObjectPrintTime::default_instance());
+    d->socket->registerMessageType(6, &cura::proto::SettingList::default_instance());
+    d->socket->registerMessageType(7, &cura::proto::GCodePrefix::default_instance());
+
+    d->socket->connect(ip, port);
+    
+    // Start & continue listening as long as socket is not closed and there is no error.
+    while(d->socket->state() != Arcus::SocketState::Closed && d->socket->state() != Arcus::SocketState::Error)
+    {
+        //If there is an object to slice, do so.
+        if(d->objects_to_slice.size())
+        {
+            FffProcessor::getInstance()->resetFileNumber();
+            for(auto object : d->objects_to_slice)
+            {
+                if(!FffProcessor::getInstance()->processMeshGroup(object.get()))
+                {
+                    logError("Slicing mesh group failed!");
+                }
+            }
+            d->objects_to_slice.clear();
+            FffProcessor::getInstance()->finalize();
+            sendGCodeLayer();
+            sendPrintTime();
+            //TODO: Support all-at-once/one-at-a-time printing
+            //d->processor->processModel(d->object_to_slice.get());
+            //d->object_to_slice.reset();
+            //d->processor->resetFileNumber();
+
+            //sendPrintTime();
+        }
+        
+        // Actually start handling messages.
+        Arcus::MessagePtr message = d->socket->takeNextMessage();
+        cura::proto::SettingList* setting_list = dynamic_cast<cura::proto::SettingList*>(message.get());
+        if(setting_list)
+        {
+            handleSettingList(setting_list);
+        }
+
+        /*cura::proto::ObjectList* object_list = dynamic_cast<cura::proto::ObjectList*>(message.get());
+        if(object_list)
+        {
+            handleObjectList(object_list);
+        }*/
+        
+        cura::proto::Slice* slice = dynamic_cast<cura::proto::Slice*>(message.get());
+        if(slice)
+        {
+            // Reset object counts
+            d->object_count = 0;
+            d->object_ids.clear();
+            for(auto object : slice->object_lists())
+            {
+                handleObjectList(&object);
+            }
+        }
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(250));
+
+        if(!d->socket->errorString().empty()) 
+        {
+            logError("%s\n", d->socket->errorString().data());
+            d->socket->clearError();
+        }
+    }
+}
+
+void CommandSocket::handleObjectList(cura::proto::ObjectList* list)
+{
+    FMatrix3x3 matrix;
+    //d->object_count = 0;
+    //d->object_ids.clear();
+    d->objects_to_slice.push_back(std::make_shared<MeshGroup>(FffProcessor::getInstance()));
+    MeshGroup* object_to_slice = d->objects_to_slice.back().get();
+    for(auto object : list->objects())
+    {
+        object_to_slice->meshes.push_back(object_to_slice); //Construct a new mesh (with object_to_slice as settings parent object) and put it into MeshGroup's mesh list.
+        Mesh& mesh = object_to_slice->meshes.back();
+
+        int bytes_per_face = BYTES_PER_FLOAT * FLOATS_PER_VECTOR * VECTORS_PER_FACE;
+        int face_count = object.vertices().size() / bytes_per_face;
+        for(int i = 0; i < face_count; ++i)
+        {
+            //TODO: Apply matrix
+            std::string data = object.vertices().substr(i * bytes_per_face, bytes_per_face);
+            const FPoint3* float_vertices = reinterpret_cast<const FPoint3*>(data.data());
+
+            Point3 verts[3];
+            verts[0] = matrix.apply(float_vertices[0]);
+            verts[1] = matrix.apply(float_vertices[1]);
+            verts[2] = matrix.apply(float_vertices[2]);
+            mesh.addFace(verts[0], verts[1], verts[2]);
+        }
+
+        for(auto setting : object.settings())
+        {
+            mesh.setSetting(setting.name(), setting.value());
+        }
+
+        d->object_ids.push_back(object.id());
+        mesh.finish();
+    }
+
+    for(auto setting : list->settings())
+    {
+        object_to_slice->setSetting(setting.name(), setting.value());
+    }
+
+    d->object_count++;
+    object_to_slice->finalize();
+}
+
+void CommandSocket::handleSettingList(cura::proto::SettingList* list)
+{
+    for(auto setting : list->settings())
+    {
+        FffProcessor::getInstance()->setSetting(setting.name(), setting.value());
+    }
+}
+
+void CommandSocket::sendLayerInfo(int layer_nr, int32_t z, int32_t height)
+{
+    if(!d->current_sliced_object)
+    {
+        return;
+    }
+    
+    cura::proto::Layer* layer = d->getLayerById(layer_nr);
+    layer->set_height(z);
+    layer->set_thickness(height);
+}
+
+void CommandSocket::sendPolygons(PolygonType type, int layer_nr, Polygons& polygons, int line_width)
+{
+    if(!d->current_sliced_object)
+        return;
+    
+    if (polygons.size() == 0)
+        return;
+
+    cura::proto::Layer* layer = d->getLayerById(layer_nr);
+
+    for(unsigned int i = 0; i < polygons.size(); ++i)
+    {
+        cura::proto::Polygon* p = layer->add_polygons();
+        p->set_type(static_cast<cura::proto::Polygon_Type>(type));
+        std::string polydata;
+        polydata.append(reinterpret_cast<const char*>(polygons[i].data()), polygons[i].size() * sizeof(Point));
+        p->set_points(polydata);
+        p->set_line_width(line_width);
+    }
+}
+
+void CommandSocket::sendProgress(float amount)
+{
+    auto message = std::make_shared<cura::proto::Progress>();
+    amount /= d->object_count;
+    amount += d->sliced_objects * (1. / d->object_count);
+    message->set_amount(amount);
+    d->socket->sendMessage(message);
+}
+
+void CommandSocket::sendProgressStage(Progress::Stage stage)
+{
+    // TODO
+}
+
+void CommandSocket::sendPrintTime()
+{
+    auto message = std::make_shared<cura::proto::ObjectPrintTime>();
+    message->set_time(FffProcessor::getInstance()->getTotalPrintTime());
+    message->set_material_amount(FffProcessor::getInstance()->getTotalFilamentUsed(0));
+    d->socket->sendMessage(message);
+}
+
+void CommandSocket::sendPrintMaterialForObject(int index, int extruder_nr, float print_time)
+{
+//     socket.sendInt32(CMD_OBJECT_PRINT_MATERIAL);
+//     socket.sendInt32(12);
+//     socket.sendInt32(index);
+//     socket.sendInt32(extruder_nr);
+//     socket.sendFloat32(print_time);
+}
+
+void CommandSocket::beginSendSlicedObject()
+{
+    if(!d->sliced_object_list)
+    {
+        d->sliced_object_list = std::make_shared<cura::proto::SlicedObjectList>();
+    }
+
+    d->current_sliced_object = d->sliced_object_list->add_objects();
+    d->current_sliced_object->set_id(d->object_ids[d->sliced_objects]);
+}
+
+void CommandSocket::endSendSlicedObject()
+{
+    d->sliced_objects++;
+    d->current_layer_offset = d->current_layer_count;
+    std::cout << "End sliced object called. sliced objects " << d->sliced_objects << " object count: " << d->object_count << std::endl;
+
+    std::cout << "current layer count" << d->current_layer_count << std::endl;
+    std::cout << "current layer offset" << d->current_layer_offset << std::endl;
+
+    if(d->sliced_objects >= d->object_count)
+    {
+        d->socket->sendMessage(d->sliced_object_list);
+        d->sliced_objects = 0;
+        d->current_layer_count = 0;
+        d->current_layer_offset = 0;
+        d->sliced_object_list.reset();
+        d->current_sliced_object = nullptr;
+    }
+}
+
+void CommandSocket::beginGCode()
+{
+    FffProcessor::getInstance()->setTargetStream(&d->gcode_output_stream);
+}
+
+void CommandSocket::sendGCodeLayer()
+{
+    auto message = std::make_shared<cura::proto::GCodeLayer>();
+    message->set_id(d->object_ids[0]);
+    message->set_data(d->gcode_output_stream.str());
+    d->socket->sendMessage(message);
+    
+    d->gcode_output_stream.str("");
+}
+
+void CommandSocket::sendGCodePrefix(std::string prefix)
+{
+    auto message = std::make_shared<cura::proto::GCodePrefix>();
+    message->set_data(prefix);
+    d->socket->sendMessage(message);
+}
+
+cura::proto::Layer* CommandSocket::Private::getLayerById(int id)
+{
+    id += current_layer_offset;
+
+    auto itr = std::find_if(current_sliced_object->mutable_layers()->begin(), current_sliced_object->mutable_layers()->end(), [id](cura::proto::Layer& l) { return l.id() == id; });
+
+    cura::proto::Layer* layer = nullptr;
+    if(itr != current_sliced_object->mutable_layers()->end())
+    {
+        layer = &(*itr);
+    }
+    else
+    {
+        layer = current_sliced_object->add_layers();
+        layer->set_id(id);
+        current_layer_count++;
+    }
+
+    return layer;
+}
+
+}//namespace cura

src/commandSocket.h

@@ -0,0 +1,84 @@
+#ifndef COMMAND_SOCKET_H
+#define COMMAND_SOCKET_H
+
+#include "utils/socket.h"
+#include "utils/polygon.h"
+#include "settings.h"
+#include "Progress.h"
+
+#include <memory>
+
+#include "Cura.pb.h"
+
+namespace cura {
+
+
+class CommandSocket
+{
+public:
+    CommandSocket();
+    /*!
+     * Connect with the GUI
+     * This creates and initialises the arcus socket and then continues listening for messages. 
+     * \param ip string containing the ip to connect with
+     * \param port int of the port to connect with.
+     */
+    void connect(const std::string& ip, int port);
+    
+    /*! 
+     * Handler for ObjectList message. 
+     * Loads all objects from the message and starts the slicing process
+     */
+    void handleObjectList(cura::proto::ObjectList* list);
+    
+    /*! 
+     * Handler for SettingList message. 
+     * This simply sets all the settings by using key value pair
+     */
+    void handleSettingList(cura::proto::SettingList* list);
+    
+    /*!
+     * Does nothing at the moment 
+     */
+    void sendLayerInfo(int layer_nr, int32_t z, int32_t height);
+    
+    /*! 
+     * Send a polygon to the engine. This is used for the layerview in the GUI
+     */
+    void sendPolygons(cura::PolygonType type, int layer_nr, cura::Polygons& polygons, int line_width);
+    
+    /*! 
+     * Send progress to GUI
+     */
+    void sendProgress(float amount);
+    
+    /*!
+     * Send the current stage of the process to the GUI (starting, slicing infill, etc) 
+     */
+    void sendProgressStage(Progress::Stage stage);
+    
+    /*!
+     * Send time estimate of how long print would take.
+     */
+    void sendPrintTime();
+    
+    /*!
+     * Does nothing at the moment
+     */
+    void sendPrintMaterialForObject(int index, int extruder_nr, float material_amount);
+
+    void beginSendSlicedObject();
+    void endSendSlicedObject();
+
+    void beginGCode();
+    void sendGCodeLayer();
+    void sendGCodePrefix(std::string prefix);
+
+private:
+    class Private;
+    const std::unique_ptr<Private> d;
+};
+
+}//namespace cura
+
+#endif//COMMAND_SOCKET_H

src/debug.h

@@ -0,0 +1,61 @@
+#ifndef DEBUG_H
+#define DEBUG_H
+
+#include <string.h>
+
+#define __FILE_NAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
+
+
+#define DEBUG_HERE std::cerr << __FILE_NAME__ << " : " << __LINE__ << std::endl
+
+
+
+
+
+#define DEBUG 1
+
+#define DEBUG_SHOW_LINE 1
+
+#if DEBUG_SHOW_LINE == 1
+#define DEBUG_FILE_LINE __FILE_NAME__ << "." << __LINE__ << ": "
+#else
+#define DEBUG_FILE_LINE  ""
+#endif
+
+#if DEBUG == 1
+#   define DEBUG_DO(x) do { x } while (0)
+#   define DEBUG_SHOW(x) do {       std::cerr << DEBUG_FILE_LINE << #x << " = " << x << std::endl; } while (0)
+#   define DEBUG_PRINTLN(x) do {    std::cerr << DEBUG_FILE_LINE << x << std::endl; } while (0)
+#else
+#   define DEBUG_DO(x)
+#   define DEBUG_SHOW(x)
+#   define DEBUG_PRINTLN(x)
+#endif
+
+
+
+#include <sstream>
+
+#if 0==1
+#define ENUM(name, ...) enum class name { __VA_ARGS__, __COUNT};
+#endif
+#define ENUM(name, ...) enum class name { __VA_ARGS__}; \
+inline std::ostream& operator<<(std::ostream& os, name value) { \
+std::string enumName = #name; \
+std::string str = #__VA_ARGS__; \
+int len = str.length(); \
+std::vector<std::string> strings; \
+std::ostringstream temp; \
+for(int i = 0; i < len; i ++) { \
+if(isspace(str[i])) continue; \
+        else if(str[i] == ',') { \
+        strings.push_back(temp.str()); \
+        temp.str(std::string());\
+        } \
+        else temp<< str[i]; \
+} \
+strings.push_back(temp.str()); \
+os << enumName << "::" << strings[static_cast<int>(value)]; \
+return os;}
+
+#endif // DEBUG_H

src/fffProcessor.h

@@ -1,788 +0,0 @@
-#ifndef FFF_PROCESSOR_H
-#define FFF_PROCESSOR_H
-
-#include <algorithm>
-#include <vector>
-#include "utils/socket.h"
-
-#define GUI_CMD_REQUEST_MESH 0x01
-#define GUI_CMD_SEND_POLYGONS 0x02
-#define GUI_CMD_FINISH_OBJECT 0x03
-
-namespace cura {
-
-//FusedFilamentFabrication processor.
-class fffProcessor
-{
-private:
-    int maxObjectHeight;
-    int fileNr;
-    GCodeExport gcode;
-    ConfigSettings& config;
-    TimeKeeper timeKeeper;
-    ClientSocket guiSocket;
-
-    GCodePathConfig skirtConfig;
-    GCodePathConfig inset0Config;
-    GCodePathConfig insetXConfig;
-    GCodePathConfig infillConfig;
-    GCodePathConfig skinConfig;
-    GCodePathConfig supportConfig;
-public:
-    fffProcessor(ConfigSettings& config)
-    : config(config)
-    {
-        fileNr = 1;
-        maxObjectHeight = 0;
-    }
-
-    void guiConnect(int portNr)
-    {
-        guiSocket.connectTo("127.0.0.1", portNr);
-    }
-
-    void sendPolygonsToGui(const char* name, int layerNr, int32_t z, Polygons& polygons)
-    {
-        guiSocket.sendNr(GUI_CMD_SEND_POLYGONS);
-        guiSocket.sendNr(polygons.size());
-        guiSocket.sendNr(layerNr);
-        guiSocket.sendNr(z);
-        guiSocket.sendNr(strlen(name));
-        guiSocket.sendAll(name, strlen(name));
-        for(unsigned int n=0; n<polygons.size(); n++)
-        {
-            PolygonRef polygon = polygons[n];
-            guiSocket.sendNr(polygon.size());
-            guiSocket.sendAll(polygon.data(), polygon.size() * sizeof(Point));
-        }
-    }
-
-    bool setTargetFile(const char* filename)
-    {
-        gcode.setFilename(filename);
-        if (gcode.isOpened())
-            gcode.writeComment("Generated with Cura_SteamEngine %s", VERSION);
-        return gcode.isOpened();
-    }
-
-    bool processFile(const std::vector<std::string> &files)
-    {
-        if (!gcode.isOpened())
-            return false;
-
-        TimeKeeper timeKeeperTotal;
-        SliceDataStorage storage;
-        preSetup();
-        if (!prepareModel(storage, files))
-            return false;
-
-        processSliceData(storage);
-        writeGCode(storage);
-
-        cura::logProgress("process", 1, 1);//Report the GUI that a file has been fully processed.
-        cura::log("Total time elapsed %5.2fs.\n", timeKeeperTotal.restart());
-        guiSocket.sendNr(GUI_CMD_FINISH_OBJECT);
-
-        return true;
-    }
-
-    void finalize()
-    {
-        if (!gcode.isOpened())
-            return;
-        gcode.finalize(maxObjectHeight, config.moveSpeed, config.endCode.c_str());
-    }
-
-private:
-    void preSetup()
-    {
-        skirtConfig.setData(config.printSpeed, config.extrusionWidth, "SKIRT");
-        inset0Config.setData(config.inset0Speed, config.extrusionWidth, "WALL-OUTER");
-        insetXConfig.setData(config.insetXSpeed, config.extrusionWidth, "WALL-INNER");
-        infillConfig.setData(config.infillSpeed, config.extrusionWidth, "FILL");
-        skinConfig.setData(config.skinSpeed, config.extrusionWidth, "FILL");
-        supportConfig.setData(config.printSpeed, config.extrusionWidth, "SUPPORT");
-
-        for(unsigned int n=1; n<MAX_EXTRUDERS;n++)
-            gcode.setExtruderOffset(n, config.extruderOffset[n].p());
-        gcode.setSwitchExtruderCode(config.preSwitchExtruderCode, config.postSwitchExtruderCode);
-        gcode.setFlavor(config.gcodeFlavor);
-        gcode.setRetractionSettings(config.retractionAmount, config.retractionSpeed, config.retractionAmountExtruderSwitch, config.minimalExtrusionBeforeRetraction, config.retractionZHop, config.retractionAmountPrime);
-    }
-
-    bool prepareModel(SliceDataStorage& storage, const std::vector<std::string> &files)
-    {
-        timeKeeper.restart();
-        SimpleModel* model = nullptr;
-        if (files.size() == 1 && files[0][0] == '$')
-        {
-            const char *input_filename = files[0].c_str();
-            model = new SimpleModel();
-            for(unsigned int n=0; input_filename[n]; n++)
-            {
-                model->volumes.push_back(SimpleVolume());
-                SimpleVolume* volume = &model->volumes[model->volumes.size()-1];
-                guiSocket.sendNr(GUI_CMD_REQUEST_MESH);
-
-                int32_t vertexCount = guiSocket.recvNr();
-                int pNr = 0;
-                cura::log("Reading mesh from socket with %i vertexes\n", vertexCount);
-                Point3 v[3];
-                while(vertexCount)
-                {
-                    float f[3];
-                    guiSocket.recvAll(f, 3 * sizeof(float));
-                    FPoint3 fp(f[0], f[1], f[2]);
-                    v[pNr++] = config.matrix.apply(fp);
-                    if (pNr == 3)
-                    {
-                        volume->addFace(v[0], v[1], v[2]);
-                        pNr = 0;
-                    }
-                    vertexCount--;
-                }
-            }
-        }else{
-            model = new SimpleModel();
-            for(unsigned int i=0;i < files.size(); i++) {
-                if(files[i] == "-")
-                    model->volumes.push_back(SimpleVolume());
-                else {
-                    cura::log("Loading %s from disk...\n", files[i].c_str());
-                    SimpleModel *test = loadModelFromFile(model,files[i].c_str(), config.matrix);
-                    if(test == nullptr) { // error while reading occurred
-                        cura::logError("Failed to load model: %s\n", files[i].c_str());
-                        return false;
-                    }
-                }
-            }
-        }
-        cura::log("Loaded from disk in %5.3fs\n", timeKeeper.restart());
-        cura::log("Analyzing and optimizing model...\n");
-        OptimizedModel* optimizedModel = new OptimizedModel(model, Point3(config.objectPosition.X, config.objectPosition.Y, -config.objectSink));
-        for(unsigned int v = 0; v < model->volumes.size(); v++)
-        {
-            cura::log("  Face counts: %i -> %i %0.1f%%\n", (int)model->volumes[v].faces.size(), (int)optimizedModel->volumes[v].faces.size(), float(optimizedModel->volumes[v].faces.size()) / float(model->volumes[v].faces.size()) * 100);
-            cura::log("  Vertex counts: %i -> %i %0.1f%%\n", (int)model->volumes[v].faces.size() * 3, (int)optimizedModel->volumes[v].points.size(), float(optimizedModel->volumes[v].points.size()) / float(model->volumes[v].faces.size() * 3) * 100);
-            cura::log("  Size: %f %f %f\n", INT2MM(optimizedModel->modelSize.x), INT2MM(optimizedModel->modelSize.y), INT2MM(optimizedModel->modelSize.z));
-            cura::log("  vMin: %f %f %f\n", INT2MM(optimizedModel->vMin.x), INT2MM(optimizedModel->vMin.y), INT2MM(optimizedModel->vMin.z));
-            cura::log("  vMax: %f %f %f\n", INT2MM(optimizedModel->vMax.x), INT2MM(optimizedModel->vMax.y), INT2MM(optimizedModel->vMax.z));
-            cura::log("  vMin: %f %f %f\n", INT2MM(model->min().x), INT2MM(model->min().y), INT2MM(model->min().z));
-            cura::log("  vMax: %f %f %f\n", INT2MM(model->max().x), INT2MM(model->max().y), INT2MM(model->max().z));
-            cura::log("  Matrix: %f %f %f\n", config.matrix.m[0][0], config.matrix.m[1][0], config.matrix.m[2][0]);
-            cura::log("  Matrix: %f %f %f\n", config.matrix.m[0][1], config.matrix.m[1][1], config.matrix.m[2][1]);
-            cura::log("  Matrix: %f %f %f\n", config.matrix.m[0][2], config.matrix.m[1][2], config.matrix.m[2][2]);
-            if (INT2MM(optimizedModel->modelSize.x) > 10000.0 || INT2MM(optimizedModel->modelSize.y)  > 10000.0 || INT2MM(optimizedModel->modelSize.z) > 10000.0)
-            {
-                cura::logError("Object is way to big, CuraEngine bug?");
-                exit(1);
-            }
-        }
-        delete model;
-        cura::log("Optimize model %5.3fs \n", timeKeeper.restart());
-        //om->saveDebugSTL("c:\\models\\output.stl");
-
-        cura::log("Slicing model...\n");
-        vector<Slicer*> slicerList;
-        for(unsigned int volumeIdx=0; volumeIdx < optimizedModel->volumes.size(); volumeIdx++)
-        {
-            Slicer* slicer = new Slicer(&optimizedModel->volumes[volumeIdx], config.initialLayerThickness - config.layerThickness / 2, config.layerThickness, config.fixHorrible & FIX_HORRIBLE_KEEP_NONE_CLOSED, config.fixHorrible & FIX_HORRIBLE_EXTENSIVE_STITCHING);
-            slicerList.push_back(slicer);
-            for(unsigned int layerNr=0; layerNr<slicer->layers.size(); layerNr++)
-            {
-                //Reporting the outline here slows down the engine quite a bit, so only do so when debugging.
-                //sendPolygonsToGui("outline", layerNr, slicer->layers[layerNr].z, slicer->layers[layerNr].polygonList);
-                sendPolygonsToGui("openoutline", layerNr, slicer->layers[layerNr].z, slicer->layers[layerNr].openPolygons);
-            }
-        }
-        cura::log("Sliced model in %5.3fs\n", timeKeeper.restart());
-
-        cura::log("Generating support map...\n");
-        generateSupportGrid(storage.support, optimizedModel, config.supportAngle, config.supportEverywhere > 0, config.supportXYDistance, config.supportZDistance);
-
-        storage.modelSize = optimizedModel->modelSize;
-        storage.modelMin = optimizedModel->vMin;
-        storage.modelMax = optimizedModel->vMax;
-        delete optimizedModel;
-
-        cura::log("Generating layer parts...\n");
-        for(unsigned int volumeIdx=0; volumeIdx < slicerList.size(); volumeIdx++)
-        {
-            storage.volumes.push_back(SliceVolumeStorage());
-            createLayerParts(storage.volumes[volumeIdx], slicerList[volumeIdx], config.fixHorrible & (FIX_HORRIBLE_UNION_ALL_TYPE_A | FIX_HORRIBLE_UNION_ALL_TYPE_B | FIX_HORRIBLE_UNION_ALL_TYPE_C));
-            delete slicerList[volumeIdx];
-
-            //Add the raft offset to each layer.
-            for(unsigned int layerNr=0; layerNr<storage.volumes[volumeIdx].layers.size(); layerNr++)
-                storage.volumes[volumeIdx].layers[layerNr].printZ += config.raftBaseThickness + config.raftInterfaceThickness;
-        }
-        cura::log("Generated layer parts in %5.3fs\n", timeKeeper.restart());
-        return true;
-    }
-
-    void processSliceData(SliceDataStorage& storage)
-    {
-        const unsigned int totalLayers = storage.volumes[0].layers.size();
-        
-        //carveMultipleVolumes(storage.volumes);
-        generateMultipleVolumesOverlap(storage.volumes, config.multiVolumeOverlap);
-        //dumpLayerparts(storage, "c:/models/output.html");
-        if (config.simpleMode)
-        {
-            for(unsigned int layerNr=0; layerNr<totalLayers; layerNr++)
-            {
-                for(unsigned int volumeIdx=0; volumeIdx<storage.volumes.size(); volumeIdx++)
-                {
-                    SliceLayer* layer = &storage.volumes[volumeIdx].layers[layerNr];
-                    for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
-                    {
-                        sendPolygonsToGui("inset0", layerNr, layer->printZ, layer->parts[partNr].outline);
-                    }
-                }
-            }
-            return;
-        }
-
-        for(unsigned int layerNr=0; layerNr<totalLayers; layerNr++)
-        {
-            for(unsigned int volumeIdx=0; volumeIdx<storage.volumes.size(); volumeIdx++)
-            {
-                int insetCount = config.insetCount;
-                if (config.spiralizeMode && static_cast<int>(layerNr) < config.downSkinCount && layerNr % 2 == 1)//Add extra insets every 2 layers when spiralizing, this makes bottoms of cups watertight.
-                    insetCount += 5;
-                SliceLayer* layer = &storage.volumes[volumeIdx].layers[layerNr];
-                int extrusionWidth = config.extrusionWidth;
-                if (layerNr == 0)
-                    extrusionWidth = config.layer0extrusionWidth;
-                generateInsets(layer, extrusionWidth, insetCount);
-
-                for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
-                {
-                    if (layer->parts[partNr].insets.size() > 0)
-                    {
-                        sendPolygonsToGui("inset0", layerNr, layer->printZ, layer->parts[partNr].insets[0]);
-                        for(unsigned int inset=1; inset<layer->parts[partNr].insets.size(); inset++)
-                            sendPolygonsToGui("insetx", layerNr, layer->printZ, layer->parts[partNr].insets[inset]);
-                    }
-                }
-            }
-            cura::logProgress("inset",layerNr+1,totalLayers);
-        }
-        if (config.enableOozeShield)
-        {
-            for(unsigned int layerNr=0; layerNr<totalLayers; layerNr++)
-            {
-                Polygons oozeShield;
-                for(unsigned int volumeIdx=0; volumeIdx<storage.volumes.size(); volumeIdx++)
-                {
-                    for(unsigned int partNr=0; partNr<storage.volumes[volumeIdx].layers[layerNr].parts.size(); partNr++)
-                    {
-                        oozeShield = oozeShield.unionPolygons(storage.volumes[volumeIdx].layers[layerNr].parts[partNr].outline.offset(MM2INT(2.0)));
-                    }
-                }
-                storage.oozeShield.push_back(oozeShield);
-            }
-
-            for(unsigned int layerNr=0; layerNr<totalLayers; layerNr++)
-                storage.oozeShield[layerNr] = storage.oozeShield[layerNr].offset(-MM2INT(1.0)).offset(MM2INT(1.0));
-            int offsetAngle = tan(60.0*M_PI/180) * config.layerThickness;//Allow for a 60deg angle in the oozeShield.
-            for(unsigned int layerNr=1; layerNr<totalLayers; layerNr++)
-                storage.oozeShield[layerNr] = storage.oozeShield[layerNr].unionPolygons(storage.oozeShield[layerNr-1].offset(-offsetAngle));
-            for(unsigned int layerNr=totalLayers-1; layerNr>0; layerNr--)
-                storage.oozeShield[layerNr-1] = storage.oozeShield[layerNr-1].unionPolygons(storage.oozeShield[layerNr].offset(-offsetAngle));
-        }
-        cura::log("Generated inset in %5.3fs\n", timeKeeper.restart());
-
-        for(unsigned int layerNr=0; layerNr<totalLayers; layerNr++)
-        {
-            if (!config.spiralizeMode || static_cast<int>(layerNr) < config.downSkinCount)    //Only generate up/downskin and infill for the first X layers when spiralize is choosen.
-            {
-                for(unsigned int volumeIdx=0; volumeIdx<storage.volumes.size(); volumeIdx++)
-                {
-                    int extrusionWidth = config.extrusionWidth;
-                    if (layerNr == 0)
-                        extrusionWidth = config.layer0extrusionWidth;
-                    generateSkins(layerNr, storage.volumes[volumeIdx], extrusionWidth, config.downSkinCount, config.upSkinCount, config.infillOverlap);
-                    generateSparse(layerNr, storage.volumes[volumeIdx], extrusionWidth, config.downSkinCount, config.upSkinCount);
-
-                    SliceLayer* layer = &storage.volumes[volumeIdx].layers[layerNr];
-                    for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
-                        sendPolygonsToGui("skin", layerNr, layer->printZ, layer->parts[partNr].skinOutline);
-                }
-            }
-            cura::logProgress("skin",layerNr+1,totalLayers);
-        }
-        cura::log("Generated up/down skin in %5.3fs\n", timeKeeper.restart());
-
-        if (config.wipeTowerSize > 0)
-        {
-            PolygonRef p = storage.wipeTower.newPoly();
-            p.add(Point(storage.modelMin.x - 3000, storage.modelMax.y + 3000));
-            p.add(Point(storage.modelMin.x - 3000, storage.modelMax.y + 3000 + config.wipeTowerSize));
-            p.add(Point(storage.modelMin.x - 3000 - config.wipeTowerSize, storage.modelMax.y + 3000 + config.wipeTowerSize));
-            p.add(Point(storage.modelMin.x - 3000 - config.wipeTowerSize, storage.modelMax.y + 3000));
-
-            storage.wipePoint = Point(storage.modelMin.x - 3000 - config.wipeTowerSize / 2, storage.modelMax.y + 3000 + config.wipeTowerSize / 2);
-        }
-
-        if (config.raftBaseThickness > 0 && config.raftInterfaceThickness > 0)
-            generateSkirt(storage, config.raftMargin + config.raftBaseLinewidth, config.raftBaseLinewidth, config.skirtLineCount, config.skirtMinLength, config.raftBaseThickness);
-        else
-            generateSkirt(storage, config.skirtDistance, config.layer0extrusionWidth, config.skirtLineCount, config.skirtMinLength, config.initialLayerThickness);
-        generateRaft(storage, config.raftMargin);
-
-        sendPolygonsToGui("skirt", 0, config.initialLayerThickness, storage.skirt);
-    }
-
-    void writeGCode(SliceDataStorage& storage)
-    {
-        if (fileNr == 1)
-        {
-            if (gcode.getFlavor() == GCODE_FLAVOR_ULTIGCODE)
-            {
-                gcode.writeComment("FLAVOR:UltiGCode");
-                gcode.writeComment("TIME:<__TIME__>");
-                gcode.writeComment("MATERIAL:<FILAMENT>");
-                gcode.writeComment("MATERIAL2:<FILAMEN2>");
-            }
-            gcode.writeCode(config.startCode.c_str());
-            if (gcode.getFlavor() == GCODE_FLAVOR_BFB)
-            {
-                gcode.writeComment("enable auto-retraction");
-                gcode.writeLine("M227 S%d P%d", config.retractionAmount * 2560 / 1000, config.retractionAmount * 2560 / 1000);
-            }
-        }else{
-            gcode.writeFanCommand(0);
-            gcode.resetExtrusionValue();
-            gcode.writeRetraction();
-            gcode.setZ(maxObjectHeight + 5000);
-            gcode.writeMove(gcode.getPositionXY(), config.moveSpeed, 0);
-            gcode.writeMove(Point(storage.modelMin.x, storage.modelMin.y), config.moveSpeed, 0);
-        }
-        fileNr++;
-
-        unsigned int totalLayers = storage.volumes[0].layers.size();
-        gcode.writeComment("Layer count: %d", totalLayers);
-
-        if (config.raftBaseThickness > 0 && config.raftInterfaceThickness > 0)
-        {
-            sendPolygonsToGui("support", 0, config.raftBaseThickness, storage.raftOutline);
-            sendPolygonsToGui("support", 0, config.raftBaseThickness + config.raftInterfaceThickness, storage.raftOutline);
-
-            GCodePathConfig raftBaseConfig((config.raftBaseSpeed <= 0) ? config.initialLayerSpeed : config.raftBaseSpeed, config.raftBaseLinewidth, "SUPPORT");
-            GCodePathConfig raftMiddleConfig((config.raftBaseSpeed <= 0) ? config.initialLayerSpeed : config.raftBaseSpeed, config.raftInterfaceLinewidth, "SUPPORT");
-            GCodePathConfig raftInterfaceConfig((config.raftBaseSpeed <= 0) ? config.initialLayerSpeed : config.raftBaseSpeed, config.raftInterfaceLinewidth, "SUPPORT");
-            GCodePathConfig raftSurfaceConfig((config.raftSurfaceSpeed > 0) ? config.raftSurfaceSpeed : config.printSpeed, config.raftSurfaceLinewidth, "SUPPORT");
-
-            {
-                gcode.writeComment("LAYER:-2");
-                gcode.writeComment("RAFT");
-                GCodePlanner gcodeLayer(gcode, config.moveSpeed, config.retractionMinimalDistance);
-                if (config.supportExtruder > 0)
-                    gcodeLayer.setExtruder(config.supportExtruder);
-                gcode.setZ(config.raftBaseThickness);
-                gcode.setExtrusion(config.raftBaseThickness, config.filamentDiameter, config.filamentFlow);
-
-                gcodeLayer.addPolygonsByOptimizer(storage.skirt, &raftBaseConfig);
-                gcodeLayer.addPolygonsByOptimizer(storage.raftOutline, &raftBaseConfig);
-
-                Polygons raftLines;
-                generateLineInfill(storage.raftOutline, raftLines, config.raftBaseLinewidth, config.raftLineSpacing, config.infillOverlap, 0);
-                gcodeLayer.addPolygonsByOptimizer(raftLines, &raftBaseConfig);
-
-                gcodeLayer.writeGCode(false, config.raftBaseThickness);
-            }
-
-            if (config.raftFanSpeed) {
-                gcode.writeFanCommand(config.raftFanSpeed);
-            }
-
-            {
-                gcode.writeComment("LAYER:-1");
-                gcode.writeComment("RAFT");
-                GCodePlanner gcodeLayer(gcode, config.moveSpeed, config.retractionMinimalDistance);
-                gcode.setZ(config.raftBaseThickness + config.raftInterfaceThickness);
-                gcode.setExtrusion(config.raftInterfaceThickness, config.filamentDiameter, config.filamentFlow);
-
-                Polygons raftLines;
-                generateLineInfill(storage.raftOutline, raftLines, config.raftInterfaceLinewidth, config.raftInterfaceLineSpacing, config.infillOverlap, config.raftSurfaceLayers > 0 ? 45 : 90);
-                gcodeLayer.addPolygonsByOptimizer(raftLines, &raftInterfaceConfig);
-
-                gcodeLayer.writeGCode(false, config.raftInterfaceThickness);
-            }
-
-            for (int raftSurfaceLayer=1; raftSurfaceLayer<=config.raftSurfaceLayers; raftSurfaceLayer++)
-            {
-                gcode.writeComment("LAYER:-1");
-                gcode.writeComment("RAFT");
-                GCodePlanner gcodeLayer(gcode, config.moveSpeed, config.retractionMinimalDistance);
-                gcode.setZ(config.raftBaseThickness + config.raftInterfaceThickness + config.raftSurfaceThickness*raftSurfaceLayer);
-                gcode.setExtrusion(config.raftSurfaceThickness, config.filamentDiameter, config.filamentFlow);
-
-                Polygons raftLines;
-                generateLineInfill(storage.raftOutline, raftLines, config.raftSurfaceLinewidth, config.raftSurfaceLineSpacing, config.infillOverlap, 90 * raftSurfaceLayer);
-                gcodeLayer.addPolygonsByOptimizer(raftLines, &raftSurfaceConfig);
-
-                gcodeLayer.writeGCode(false, config.raftInterfaceThickness);
-            }
-        }
-
-        int volumeIdx = 0;
-        for(unsigned int layerNr=0; layerNr<totalLayers; layerNr++)
-        {
-            cura::logProgress("export", layerNr+1, totalLayers);
-
-            int extrusionWidth = config.extrusionWidth;
-            if (layerNr == 0)
-                extrusionWidth = config.layer0extrusionWidth;
-            if (static_cast<int>(layerNr) < config.initialSpeedupLayers)
-            {
-                int n = config.initialSpeedupLayers;
-#define SPEED_SMOOTH(speed) \
-                std::min<int>((speed), (((speed)*layerNr)/n + (config.initialLayerSpeed*(n-layerNr)/n)))
-                skirtConfig.setData(SPEED_SMOOTH(config.printSpeed), extrusionWidth, "SKIRT");
-                inset0Config.setData(SPEED_SMOOTH(config.inset0Speed), extrusionWidth, "WALL-OUTER");
-                insetXConfig.setData(SPEED_SMOOTH(config.insetXSpeed), extrusionWidth, "WALL-INNER");
-                infillConfig.setData(SPEED_SMOOTH(config.infillSpeed), extrusionWidth,  "FILL");
-                skinConfig.setData(SPEED_SMOOTH(config.skinSpeed), extrusionWidth,  "SKIN");
-                supportConfig.setData(SPEED_SMOOTH(config.printSpeed), extrusionWidth, "SUPPORT");
-#undef SPEED_SMOOTH
-            }else{
-                skirtConfig.setData(config.printSpeed, extrusionWidth, "SKIRT");
-                inset0Config.setData(config.inset0Speed, extrusionWidth, "WALL-OUTER");
-                insetXConfig.setData(config.insetXSpeed, extrusionWidth, "WALL-INNER");
-                infillConfig.setData(config.infillSpeed, extrusionWidth, "FILL");
-                skinConfig.setData(config.skinSpeed, extrusionWidth, "SKIN");
-                supportConfig.setData(config.printSpeed, extrusionWidth, "SUPPORT");
-            }
-
-            gcode.writeComment("LAYER:%d", layerNr);
-            if (layerNr == 0)
-                gcode.setExtrusion(config.initialLayerThickness, config.filamentDiameter, config.filamentFlow);
-            else
-                gcode.setExtrusion(config.layerThickness, config.filamentDiameter, config.filamentFlow);
-
-            GCodePlanner gcodeLayer(gcode, config.moveSpeed, config.retractionMinimalDistance);
-            int32_t z = config.initialLayerThickness + layerNr * config.layerThickness;
-            z += config.raftBaseThickness + config.raftInterfaceThickness + config.raftSurfaceLayers*config.raftSurfaceThickness;
-            if (config.raftBaseThickness > 0 && config.raftInterfaceThickness > 0)
-            {
-                if (layerNr == 0)
-                {
-                    z += config.raftAirGapLayer0;
-                } else {
-                    z += config.raftAirGap;
-                }
-            }
-            gcode.setZ(z);
-            gcode.resetStartPosition();
-
-            bool printSupportFirst = (storage.support.generated && config.supportExtruder > 0 && config.supportExtruder == gcodeLayer.getExtruder());
-            if (printSupportFirst)
-                addSupportToGCode(storage, gcodeLayer, layerNr);
-
-            for(unsigned int volumeCnt = 0; volumeCnt < storage.volumes.size(); volumeCnt++)
-            {
-                if (volumeCnt > 0)
-                    volumeIdx = (volumeIdx + 1) % storage.volumes.size();
-                addVolumeLayerToGCode(storage, gcodeLayer, volumeIdx, layerNr);
-            }
-            if (!printSupportFirst)
-                addSupportToGCode(storage, gcodeLayer, layerNr);
-
-            //Finish the layer by applying speed corrections for minimal layer times
-            gcodeLayer.forceMinimalLayerTime(config.minimalLayerTime, config.minimalFeedrate);
-
-            int fanSpeed = config.fanSpeedMin;
-            if (gcodeLayer.getExtrudeSpeedFactor() <= 50)
-            {
-                fanSpeed = config.fanSpeedMax;
-            }else{
-                int n = gcodeLayer.getExtrudeSpeedFactor() - 50;
-                fanSpeed = config.fanSpeedMin * n / 50 + config.fanSpeedMax * (50 - n) / 50;
-            }
-            if (static_cast<int>(layerNr) < config.fanFullOnLayerNr)
-            {
-                //Slow down the fan on the layers below the [fanFullOnLayerNr], where layer 0 is speed 0.
-                fanSpeed = fanSpeed * layerNr / config.fanFullOnLayerNr;
-            }
-            gcode.writeFanCommand(fanSpeed);
-
-            gcodeLayer.writeGCode(config.coolHeadLift > 0, static_cast<int>(layerNr) > 0 ? config.layerThickness : config.initialLayerThickness);
-        }
-
-        cura::log("Wrote layers in %5.2fs.\n", timeKeeper.restart());
-        gcode.tellFileSize();
-        gcode.writeFanCommand(0);
-
-        //Store the object height for when we are printing multiple objects, as we need to clear every one of them when moving to the next position.
-        maxObjectHeight = std::max(maxObjectHeight, storage.modelSize.z - config.objectSink);
-    }
-
-    //Add a single layer from a single mesh-volume to the GCode
-    void addVolumeLayerToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int volumeIdx, int layerNr)
-    {
-        int prevExtruder = gcodeLayer.getExtruder();
-        bool extruderChanged = gcodeLayer.setExtruder(volumeIdx);
-        if (layerNr == 0 && volumeIdx == 0 && !(config.raftBaseThickness > 0 && config.raftInterfaceThickness > 0))
-        {
-            if (storage.skirt.size() > 0)
-                gcodeLayer.addTravel(storage.skirt[storage.skirt.size()-1].closestPointTo(gcode.getPositionXY()));
-            gcodeLayer.addPolygonsByOptimizer(storage.skirt, &skirtConfig);
-        }
-
-        SliceLayer* layer = &storage.volumes[volumeIdx].layers[layerNr];
-        if (extruderChanged)
-            addWipeTower(storage, gcodeLayer, layerNr, prevExtruder);
-
-        if (storage.oozeShield.size() > 0 && storage.volumes.size() > 1)
-        {
-            gcodeLayer.setAlwaysRetract(true);
-            gcodeLayer.addPolygonsByOptimizer(storage.oozeShield[layerNr], &skirtConfig);
-            sendPolygonsToGui("oozeshield", layerNr, layer->printZ, storage.oozeShield[layerNr]);
-            gcodeLayer.setAlwaysRetract(config.enableCombing == COMBING_OFF);
-        }
-
-        if (config.simpleMode)
-        {
-            Polygons polygons;
-            for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
-            {
-                for(unsigned int n=0; n<layer->parts[partNr].outline.size(); n++)
-                {
-                    for(unsigned int m=1; m<layer->parts[partNr].outline[n].size(); m++)
-                    {
-                        Polygon p;
-                        p.add(layer->parts[partNr].outline[n][m-1]);
-                        p.add(layer->parts[partNr].outline[n][m]);
-                        polygons.add(p);
-                    }
-                    if (layer->parts[partNr].outline[n].size() > 0)
-                    {
-                        Polygon p;
-                        p.add(layer->parts[partNr].outline[n][layer->parts[partNr].outline[n].size()-1]);
-                        p.add(layer->parts[partNr].outline[n][0]);
-                        polygons.add(p);
-                    }
-                }
-            }
-            for(unsigned int n=0; n<layer->openLines.size(); n++)
-            {
-                for(unsigned int m=1; m<layer->openLines[n].size(); m++)
-                {
-                    Polygon p;
-                    p.add(layer->openLines[n][m-1]);
-                    p.add(layer->openLines[n][m]);
-                    polygons.add(p);
-                }
-            }
-            if (config.spiralizeMode)
-                inset0Config.spiralize = true;
-            
-            gcodeLayer.addPolygonsByOptimizer(polygons, &inset0Config);
-            return;
-        }
-
-
-        PathOrderOptimizer partOrderOptimizer(gcode.getStartPositionXY());
-        for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
-        {
-            partOrderOptimizer.addPolygon(layer->parts[partNr].insets[0][0]);
-        }
-        partOrderOptimizer.optimize();
-
-        for(unsigned int partCounter=0; partCounter<partOrderOptimizer.polyOrder.size(); partCounter++)
-        {
-            SliceLayerPart* part = &layer->parts[partOrderOptimizer.polyOrder[partCounter]];
-
-            if (config.enableCombing == COMBING_OFF)
-            {
-                gcodeLayer.setAlwaysRetract(true);
-            }else
-            {
-                gcodeLayer.setCombBoundary(&part->combBoundery);
-                gcodeLayer.setAlwaysRetract(false);
-            }
-
-            Polygons infillPolygons;
-            int fillAngle = 45;
-            if (layerNr & 1)
-                fillAngle += 90;
-            int extrusionWidth = config.extrusionWidth;
-            if (layerNr == 0)
-                extrusionWidth = config.layer0extrusionWidth;
-            if (config.sparseInfillLineDistance > 0)
-            {
-                switch (config.infillPattern)
-                {
-                    case INFILL_AUTOMATIC:
-                        generateAutomaticInfill(
-                            part->sparseOutline, infillPolygons, extrusionWidth,
-                            config.sparseInfillLineDistance,
-                            config.infillOverlap, fillAngle);
-                        break;
-
-                    case INFILL_GRID:
-                        generateGridInfill(part->sparseOutline, infillPolygons,
-                                           extrusionWidth,
-                                           config.sparseInfillLineDistance,
-                                           config.infillOverlap, fillAngle);
-                        break;
-
-                    case INFILL_LINES:
-                        generateLineInfill(part->sparseOutline, infillPolygons,
-                                           extrusionWidth,
-                                           config.sparseInfillLineDistance,
-                                           config.infillOverlap, fillAngle);
-                        break;
-
-                    case INFILL_CONCENTRIC:
-                        generateConcentricInfill(
-                            part->sparseOutline, infillPolygons,
-                            config.sparseInfillLineDistance);
-                        break;
-                }
-            }
-
-            gcodeLayer.addPolygonsByOptimizer(infillPolygons, &infillConfig);
-            //sendPolygonsToGui("infill", layerNr, layer->z, fillPolygons);
-
-            if (config.insetCount > 0)
-            {
-                if (config.spiralizeMode)
-                {
-                    if (static_cast<int>(layerNr) >= config.downSkinCount)
-                        inset0Config.spiralize = true;
-                    if (static_cast<int>(layerNr) == config.downSkinCount && part->insets.size() > 0)
-                        gcodeLayer.addPolygonsByOptimizer(part->insets[0], &insetXConfig);
-                }
-                for(int insetNr=part->insets.size()-1; insetNr>-1; insetNr--)
-                {
-                    if (insetNr == 0)
-                        gcodeLayer.addPolygonsByOptimizer(part->insets[insetNr], &inset0Config);
-                    else
-                        gcodeLayer.addPolygonsByOptimizer(part->insets[insetNr], &insetXConfig);
-                }
-            }
-            
-            Polygons skinPolygons;
-            for(Polygons outline : part->skinOutline.splitIntoParts())
-            {
-                int bridge = -1;
-                if (layerNr > 0)
-                    bridge = bridgeAngle(outline, &storage.volumes[volumeIdx].layers[layerNr-1]);
-                generateLineInfill(outline, skinPolygons, extrusionWidth, extrusionWidth, config.infillOverlap, (bridge > -1) ? bridge : fillAngle);
-            }
-            if (config.enableCombing == COMBING_NOSKIN)
-            {
-                gcodeLayer.setCombBoundary(nullptr);
-                gcodeLayer.setAlwaysRetract(true);
-            }
-            gcodeLayer.addPolygonsByOptimizer(skinPolygons, &skinConfig);
-
-
-            //After a layer part, make sure the nozzle is inside the comb boundary, so we do not retract on the perimeter.
-            if (!config.spiralizeMode || static_cast<int>(layerNr) < config.downSkinCount)
-                gcodeLayer.moveInsideCombBoundary(config.extrusionWidth * 2);
-        }
-        gcodeLayer.setCombBoundary(nullptr);
-    }
-
-    void addSupportToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layerNr)
-    {
-        if (!storage.support.generated)
-            return;
-
-        if (config.supportExtruder > -1)
-        {
-            int prevExtruder = gcodeLayer.getExtruder();
-            if (gcodeLayer.setExtruder(config.supportExtruder))
-                addWipeTower(storage, gcodeLayer, layerNr, prevExtruder);
-
-            if (storage.oozeShield.size() > 0 && storage.volumes.size() == 1)
-            {
-                gcodeLayer.setAlwaysRetract(true);
-                gcodeLayer.addPolygonsByOptimizer(storage.oozeShield[layerNr], &skirtConfig);
-                gcodeLayer.setAlwaysRetract(!config.enableCombing);
-            }
-        }
-        int32_t z = config.initialLayerThickness + layerNr * config.layerThickness;
-        SupportPolyGenerator supportGenerator(storage.support, z);
-        for(unsigned int volumeCnt = 0; volumeCnt < storage.volumes.size(); volumeCnt++)
-        {
-            SliceLayer* layer = &storage.volumes[volumeCnt].layers[layerNr];
-            for(unsigned int n=0; n<layer->parts.size(); n++)
-                supportGenerator.polygons = supportGenerator.polygons.difference(layer->parts[n].outline.offset(config.supportXYDistance));
-        }
-        //Contract and expand the suppory polygons so small sections are removed and the final polygon is smoothed a bit.
-        supportGenerator.polygons = supportGenerator.polygons.offset(-config.extrusionWidth * 3);
-        supportGenerator.polygons = supportGenerator.polygons.offset(config.extrusionWidth * 3);
-        sendPolygonsToGui("support", layerNr, z, supportGenerator.polygons);
-
-        vector<Polygons> supportIslands = supportGenerator.polygons.splitIntoParts();
-
-        PathOrderOptimizer islandOrderOptimizer(gcode.getPositionXY());
-        for(unsigned int n=0; n<supportIslands.size(); n++)
-        {
-            islandOrderOptimizer.addPolygon(supportIslands[n][0]);
-        }
-        islandOrderOptimizer.optimize();
-
-        for(unsigned int n=0; n<supportIslands.size(); n++)
-        {
-            Polygons& island = supportIslands[islandOrderOptimizer.polyOrder[n]];
-
-            Polygons supportLines;
-            if (config.supportLineDistance > 0)
-            {
-                switch(config.supportType)
-                {
-                case SUPPORT_TYPE_GRID:
-                    if (config.supportLineDistance > config.extrusionWidth * 4)
-                    {
-                        generateLineInfill(island, supportLines, config.extrusionWidth, config.supportLineDistance*2, config.infillOverlap, 0);
-                        generateLineInfill(island, supportLines, config.extrusionWidth, config.supportLineDistance*2, config.infillOverlap, 90);
-                    }else{
-                        generateLineInfill(island, supportLines, config.extrusionWidth, config.supportLineDistance, config.infillOverlap, (layerNr & 1) ? 0 : 90);
-                    }
-                    break;
-                case SUPPORT_TYPE_LINES:
-                    if (layerNr == 0)
-                    {
-                        generateLineInfill(island, supportLines, config.extrusionWidth, config.supportLineDistance, config.infillOverlap + 150, 0);
-                        generateLineInfill(island, supportLines, config.extrusionWidth, config.supportLineDistance, config.infillOverlap + 150, 90);
-                    }else{
-                        generateLineInfill(island, supportLines, config.extrusionWidth, config.supportLineDistance, config.infillOverlap, 0);
-                    }
-                    break;
-                }
-            }
-
-            gcodeLayer.forceRetract();
-            if (config.enableCombing)
-                gcodeLayer.setCombBoundary(&island);
-            if (config.supportType == SUPPORT_TYPE_GRID)
-                gcodeLayer.addPolygonsByOptimizer(island, &supportConfig);
-            gcodeLayer.addPolygonsByOptimizer(supportLines, &supportConfig);
-            gcodeLayer.setCombBoundary(nullptr);
-        }
-    }
-
-    void addWipeTower(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layerNr, int prevExtruder)
-    {
-        if (config.wipeTowerSize < 1)
-            return;
-        //If we changed extruder, print the wipe/prime tower for this nozzle;
-        gcodeLayer.addPolygonsByOptimizer(storage.wipeTower, &supportConfig);
-        Polygons fillPolygons;
-        generateLineInfill(storage.wipeTower, fillPolygons, config.extrusionWidth, config.extrusionWidth, config.infillOverlap, 45 + 90 * (layerNr % 2));
-        gcodeLayer.addPolygonsByOptimizer(fillPolygons, &supportConfig);
-
-        //Make sure we wipe the old extruder on the wipe tower.
-        gcodeLayer.addTravel(storage.wipePoint - config.extruderOffset[prevExtruder].p() + config.extruderOffset[gcodeLayer.getExtruder()].p());
-    }
-};
-
-}//namespace cura
-
-#endif//FFF_PROCESSOR_H

src/gcodeExport.h

@@ -3,69 +3,197 @@
 #define GCODEEXPORT_H
 
 #include <stdio.h>
+#include <deque> // for extrusionAmountAtPreviousRetractions
+#include <sstream> // for stream.str()
 
 #include "settings.h"
-#include "comb.h"
 #include "utils/intpoint.h"
-#include "utils/polygon.h"
 #include "timeEstimate.h"
+#include "MeshGroup.h"
+#include "commandSocket.h"
 
 namespace cura {
 
+struct CoastingConfig
+{
+    bool coasting_enable; 
+    double coasting_volume_move; 
+    double coasting_speed_move; 
+    double coasting_min_volume_move; 
+
+    double coasting_volume_retract;
+    double coasting_speed_retract;
+    double coasting_min_volume_retract;
+};
+    
+class RetractionConfig
+{
+public:
+    double amount; //!< The amount retracted
+    double speed; //!< The speed with which to retract
+    double primeSpeed; //!< the speed with which to unretract
+    double primeAmount; //!< the amount of material primed after unretracting
+    int zHop; //!< the amount with which to lift the head during a retraction-travel
+    int retraction_min_travel_distance; //!< 
+    double retraction_extrusion_window;
+    int retraction_count_max;
+};
+
+//The GCodePathConfig is the configuration for moves/extrusion actions. This defines at which width the line is printed and at which speed.
+class GCodePathConfig
+{
+private:
+    double speed; //!< movement speed
+    int line_width; //!< width of the line extruded
+    double flow; //!< extrusion flow in %
+    int layer_thickness; //!< layer height
+    double extrusion_mm3_per_mm;//!< mm^3 filament moved per mm line extruded
+public:
+    const char* name;
+    bool spiralize;
+    RetractionConfig *const retraction_config;
+    
+    // GCodePathConfig() : speed(0), line_width(0), extrusion_mm3_per_mm(0.0), name(nullptr), spiralize(false), retraction_config(nullptr) {}
+    GCodePathConfig(RetractionConfig* retraction_config, const char* name) : speed(0), line_width(0), extrusion_mm3_per_mm(0.0), name(name), spiralize(false), retraction_config(retraction_config) {}
+    
+    void setSpeed(double speed)
+    {
+        this->speed = speed;
+    }
+    
+    void setLineWidth(int line_width)
+    {
+        this->line_width = line_width;
+        calculateExtrusion();
+    }
+    
+    void setLayerHeight(int layer_height)
+    {
+        this->layer_thickness = layer_height;
+        calculateExtrusion();
+    }
+
+    void setFlow(double flow)
+    {
+        this->flow = flow;
+        calculateExtrusion();
+    }
+    
+    void smoothSpeed(double min_speed, int layer_nr, double max_speed_layer) 
+    {
+        speed = (speed*layer_nr)/max_speed_layer + (min_speed*(max_speed_layer-layer_nr)/max_speed_layer);
+    }
+    
+    double getExtrusionMM3perMM()
+    {
+        return extrusion_mm3_per_mm;
+    }
+    
+    double getSpeed()
+    {
+        return speed;
+    }
+    
+    int getLineWidth()
+    {
+        return line_width;
+    }
+
+    int getLayerHeight()
+    {
+        return layer_thickness;
+    }
+    
+private:
+    void calculateExtrusion()
+    {
+        extrusion_mm3_per_mm = INT2MM(line_width) * INT2MM(layer_thickness) * double(flow) / 100.0;
+    }
+};
+
 //The GCodeExport class writes the actual GCode. This is the only class that knows how GCode looks and feels.
 //  Any customizations on GCodes flavors are done in this class.
 class GCodeExport
 {
 private:
-    FILE* f;
-    double extrusionAmount;
-    double extrusionPerMM;
-    double retractionAmount;
-    double retractionAmountPrime;
-    int retractionZHop;
-    double extruderSwitchRetraction;
-    double minimalExtrusionBeforeRetraction;
-    double extrusionAmountAtPreviousRetraction;
+    struct ExtruderTrainAttributes
+    {
+        Point nozzle_offset;
+        char extruderCharacter;
+        std::string start_code;
+        std::string end_code;
+        double filament_area; //!< in mm^2 for non-volumetric, cylindrical filament
+
+        double extruderSwitchRetraction;
+        int extruderSwitchRetractionSpeed;
+        int extruderSwitchPrimeSpeed;
+        
+        double totalFilament; //!< total filament used per extruder in mm^3
+        int currentTemperature;
+        
+        ExtruderTrainAttributes()
+        : nozzle_offset(0,0)
+        , extruderCharacter(0)
+        , start_code("")
+        , end_code("")
+        , filament_area(0)
+        , extruderSwitchRetraction(0.0)
+        , extruderSwitchRetractionSpeed(0)
+        , extruderSwitchPrimeSpeed(0)
+        , totalFilament(0)
+        , currentTemperature(0)
+        { }
+    };
+    ExtruderTrainAttributes extruder_attr[MAX_EXTRUDERS];
+    bool use_extruder_offset_to_offset_coords;
+    
+    std::ostream* output_stream;
+    double extrusion_amount; // in mm or mm^3
+    std::deque<double> extrusion_amount_at_previous_n_retractions; // in mm or mm^3
     Point3 currentPosition;
     Point3 startPosition;
-    Point extruderOffset[MAX_EXTRUDERS];
-    char extruderCharacter[MAX_EXTRUDERS];
-    int currentSpeed, retractionSpeed;
+    double currentSpeed;
     int zPos;
     bool isRetracted;
-    int extruderNr;
+    int isZHopped;
+
+    double last_coasted_amount_mm3; //!< The coasted amount of filament to be primed on the first next extrusion. (same type as GCodeExport::extrusion_amount)
+    double retractionPrimeSpeed;
+    int current_extruder;
     int currentFanSpeed;
-    int flavor;
-    std::string preSwitchExtruderCode;
-    std::string postSwitchExtruderCode;
-    
-    double totalFilament[MAX_EXTRUDERS];
+    EGCodeFlavor flavor;
+
     double totalPrintTime;
     TimeEstimateCalculator estimateCalculator;
+    
+    bool is_volumatric;
+
+    // for sending jump data
+    CommandSocket* commandSocket; 
+    unsigned int layer_nr;
+    
 public:
     
     GCodeExport();
-    
     ~GCodeExport();
     
-    void replaceTagInStart(const char* tag, const char* replaceValue);
+    void setCommandSocketAndLayerNr(CommandSocket* commandSocket, unsigned int layer_nr);
     
-    void setExtruderOffset(int id, Point p);
-    void setSwitchExtruderCode(std::string preSwitchExtruderCode, std::string postSwitchExtruderCode);
+    void setOutputStream(std::ostream* stream);
     
-    void setFlavor(int flavor);
-    int getFlavor();
+    Point getExtruderOffset(int id);
     
-    void setFilename(const char* filename);
+    Point getGcodePos(int64_t x, int64_t y, int extruder_train);
     
-    bool isOpened();
-    
-    void setExtrusion(int layerThickness, int filamentDiameter, int flow);
-    
-    void setRetractionSettings(int retractionAmount, int retractionSpeed, int extruderSwitchRetraction, int minimalExtrusionBeforeRetraction, int zHop, int retractionAmountPrime);
+    void setFlavor(EGCodeFlavor flavor);
+    EGCodeFlavor getFlavor();
     
     void setZ(int z);
     
+    void setLastCoastedAmountMM3(double last_coasted_amount) { this->last_coasted_amount_mm3 = last_coasted_amount; }
+    
+    Point3 getPosition();
+    
     Point getPositionXY();
     
     void resetStartPosition();
@@ -76,160 +204,71 @@ public:
 
     int getExtruderNr();
     
+    void setFilamentDiameter(unsigned int n, int diameter);
+    double getFilamentArea(unsigned int extruder);
+    
+    double getExtrusionAmountMM3(unsigned int extruder);
+    
     double getTotalFilamentUsed(int e);
 
     double getTotalPrintTime();
     void updateTotalPrintTime();
+    void resetTotalPrintTimeAndFilament();
     
-    void writeComment(const char* comment, ...);
-
-    void writeLine(const char* line, ...);
+    void writeComment(std::string comment);
+    void writeTypeComment(const char* type);
+    void writeLayerComment(int layer_nr);
+    void writeLayerCountComment(int layer_count);
+    
+    void writeLine(const char* line);
     
     void resetExtrusionValue();
     
     void writeDelay(double timeAmount);
     
-    void writeMove(Point p, int speed, int lineWidth);
+    void writeMove(Point p, double speed, double extrusion_per_mm);
     
-    void writeRetraction(bool force=false);
+    void writeMove(Point3 p, double speed, double extrusion_per_mm);
+private:
+    void writeMove(int x, int y, int z, double speed, double extrusion_per_mm);
+public:
+    void writeRetraction(RetractionConfig* config, bool force=false);
+    
+    void writeRetraction_extruderSwitch();
     
     void switchExtruder(int newExtruder);
     
     void writeCode(const char* str);
     
-    void writeFanCommand(int speed);
+    void writeFanCommand(double speed);
     
-    void finalize(int maxObjectHeight, int moveSpeed, const char* endCode);
+    void writeTemperatureCommand(int extruder, double temperature, bool wait = false);
+    void writeBedTemperatureCommand(double temperature, bool wait = false);
+    
+    void preSetup(MeshGroup* settings)
+    {
+        for(int n=0; n<settings->getSettingAsCount("machine_extruder_count"); n++)
+        {
+            ExtruderTrain* train = settings->getExtruderTrain(n);
+            setFilamentDiameter(n, train->getSettingInMicrons("material_diameter")); 
+            
+            extruder_attr[n].nozzle_offset = Point(train->getSettingInMicrons("machine_nozzle_offset_x"), train->getSettingInMicrons("machine_nozzle_offset_y"));
+            
+            extruder_attr[n].start_code = train->getSettingString("machine_extruder_start_code");
+            extruder_attr[n].end_code = train->getSettingString("machine_extruder_end_code");
+            
+            extruder_attr[n].extruderSwitchRetraction = INT2MM(train->getSettingInMicrons("switch_extruder_retraction_amount")); 
+            extruder_attr[n].extruderSwitchRetractionSpeed = train->getSettingInMillimetersPerSecond("switch_extruder_retraction_speed");
+            extruder_attr[n].extruderSwitchPrimeSpeed = train->getSettingInMillimetersPerSecond("switch_extruder_prime_speed");
+        }
 
-    int getFileSize();
-    void tellFileSize();
+        setFlavor(settings->getSettingAsGCodeFlavor("machine_gcode_flavor"));
+        use_extruder_offset_to_offset_coords = settings->getSettingBoolean("machine_use_extruder_offset_to_offset_coords");
+    }
+    void finalize(int maxObjectHeight, double moveSpeed, const char* endCode);
+    
 };
 
-//The GCodePathConfig is the configuration for moves/extrusion actions. This defines at which width the line is printed and at which speed.
-class GCodePathConfig
-{
-public:
-    int speed;
-    int lineWidth;
-    const char* name;
-    bool spiralize;
-    
-    GCodePathConfig() : speed(0), lineWidth(0), name(nullptr), spiralize(false) {}
-    GCodePathConfig(int speed, int lineWidth, const char* name) : speed(speed), lineWidth(lineWidth), name(name), spiralize(false) {}
-    
-    void setData(int speed, int lineWidth, const char* name)
-    {
-        this->speed = speed;
-        this->lineWidth = lineWidth;
-        this->name = name;
-    }
-};
-
-class GCodePath
-{
-public:
-    GCodePathConfig* config;
-    bool retract;
-    int extruder;
-    vector<Point> points;
-    bool done;//Path is finished, no more moves should be added, and a new path should be started instead of any appending done to this one.
-};
-
-//The GCodePlanner class stores multiple moves that are planned.
-// It facilitates the combing to keep the head inside the print.
-// It also keeps track of the print time estimate for this planning so speed adjustments can be made for the minimal-layer-time.
-class GCodePlanner
-{
-private:
-    GCodeExport& gcode;
-    
-    Point lastPosition;
-    vector<GCodePath> paths;
-    Comb* comb;
-    
-    GCodePathConfig travelConfig;
-    int extrudeSpeedFactor;
-    int travelSpeedFactor;
-    int currentExtruder;
-    int retractionMinimalDistance;
-    bool forceRetraction;
-    bool alwaysRetract;
-    double extraTime;
-    double totalPrintTime;
-private:
-    GCodePath* getLatestPathWithConfig(GCodePathConfig* config);
-    void forceNewPathStart();
-public:
-    GCodePlanner(GCodeExport& gcode, int travelSpeed, int retractionMinimalDistance);
-    ~GCodePlanner();
-    
-    bool setExtruder(int extruder)
-    {
-        if (extruder == currentExtruder)
-            return false;
-        currentExtruder = extruder;
-        return true;
-    }
-    
-    int getExtruder()
-    {
-        return currentExtruder;
-    }
-
-    void setCombBoundary(Polygons* polygons)
-    {
-        if (comb)
-            delete comb;
-        if (polygons)
-            comb = new Comb(*polygons);
-        else
-            comb = nullptr;
-    }
-    
-    void setAlwaysRetract(bool alwaysRetract)
-    {
-        this->alwaysRetract = alwaysRetract;
-    }
-    
-    void forceRetract()
-    {
-        forceRetraction = true;
-    }
-    
-    void setExtrudeSpeedFactor(int speedFactor)
-    {
-        if (speedFactor < 1) speedFactor = 1;
-        this->extrudeSpeedFactor = speedFactor;
-    }
-    int getExtrudeSpeedFactor()
-    {
-        return this->extrudeSpeedFactor;
-    }
-    void setTravelSpeedFactor(int speedFactor)
-    {
-        if (speedFactor < 1) speedFactor = 1;
-        this->travelSpeedFactor = speedFactor;
-    }
-    int getTravelSpeedFactor()
-    {
-        return this->travelSpeedFactor;
-    }
-    
-    void addTravel(Point p);
-    
-    void addExtrusionMove(Point p, GCodePathConfig* config);
-    
-    void moveInsideCombBoundary(int distance);
-
-    void addPolygon(PolygonRef polygon, int startIdx, GCodePathConfig* config);
-
-    void addPolygonsByOptimizer(Polygons& polygons, GCodePathConfig* config);
-    
-    void forceMinimalLayerTime(double minTime, int minimalSpeed);
-    
-    void writeGCode(bool liftHeadIfNeeded, int layerThickness);
-};
-
-}//namespace cura
+}
 
 #endif//GCODEEXPORT_H

src/gcodePlanner.cpp

@@ -0,0 +1,621 @@
+#include "gcodePlanner.h"
+#include "pathOrderOptimizer.h"
+#include "sliceDataStorage.h"
+#include <cstring>
+#include "debug.h" // debugging
+#include "MergeInfillLines.h"
+
+namespace cura {
+
+GCodePath* GCodePlanner::getLatestPathWithConfig(GCodePathConfig* config, float flow)
+{
+    if (paths.size() > 0 && paths[paths.size()-1].config == config && !paths[paths.size()-1].done && paths[paths.size()-1].flow == flow)
+        return &paths[paths.size()-1];
+    paths.push_back(GCodePath());
+    GCodePath* ret = &paths[paths.size()-1];
+    ret->retract = false;
+    ret->config = config;
+    ret->extruder = currentExtruder;
+    ret->done = false;
+    ret->flow = flow;
+    if (config != &travelConfig)
+    {
+        last_retraction_config = config->retraction_config;
+    }
+    return ret;
+}
+
+void GCodePlanner::forceNewPathStart()
+{
+    if (paths.size() > 0)
+        paths[paths.size()-1].done = true;
+}
+
+GCodePlanner::GCodePlanner(CommandSocket* commandSocket, GCodeExport& gcode, SliceDataStorage& storage, int z, RetractionConfig* retraction_config_travel, double travelSpeed, bool retraction_combing, unsigned int layer_nr, int64_t comb_boundary_offset, bool travel_avoid_other_parts, int64_t travel_avoid_distance)
+: gcode(gcode), storage(storage)
+, z(z)
+, travelConfig(retraction_config_travel, "MOVE")
+{
+    gcode.setCommandSocketAndLayerNr(commandSocket, layer_nr);
+    lastPosition = gcode.getPositionXY();
+    travelConfig.setSpeed(travelSpeed);
+    comb = nullptr;
+    last_retraction_config = &storage.retraction_config; // start with general config
+    setExtrudeSpeedFactor(1.0);
+    setTravelSpeedFactor(1.0);
+    extraTime = 0.0;
+    totalPrintTime = 0.0;
+    currentExtruder = gcode.getExtruderNr();
+    if (retraction_combing)
+    {
+        was_combing = true; // means it will try to get inside the comb boundary first
+        is_going_to_comb = true; // means it will try to get inside the comb boundary 
+        comb = new Comb(storage, layer_nr, comb_boundary_offset, travel_avoid_other_parts, travel_avoid_distance);
+    }
+    else
+        comb = nullptr;
+}
+
+GCodePlanner::~GCodePlanner()
+{
+    if (comb)
+        delete comb;
+}
+
+void GCodePlanner::setCombing(bool going_to_comb)
+{
+    is_going_to_comb = going_to_comb;
+}
+
+
+bool GCodePlanner::setExtruder(int extruder)
+{
+    if (extruder == currentExtruder)
+    {
+        return false;
+    }
+    SettingsBase* train = storage.meshgroup->getExtruderTrain(currentExtruder);
+    bool end_pos_absolute = train->getSettingBoolean("machine_extruder_end_pos_abs");
+    Point end_pos(train->getSettingInMicrons("machine_extruder_end_pos_x"), train->getSettingInMicrons("machine_extruder_end_pos_y"));
+    addTravel((end_pos_absolute)? end_pos : lastPosition + end_pos);
+    
+    currentExtruder = extruder; // the extruder switch
+    
+    forceNewPathStart();
+    
+    train = storage.meshgroup->getExtruderTrain(currentExtruder);
+    bool start_pos_absolute = train->getSettingBoolean("machine_extruder_start_pos_abs");
+    Point start_pos(train->getSettingInMicrons("machine_extruder_start_pos_x"), train->getSettingInMicrons("machine_extruder_start_pos_y"));
+    lastPosition = (start_pos_absolute)? start_pos : lastPosition + start_pos;
+    return true;
+}
+
+void GCodePlanner::moveInsideCombBoundary(int distance)
+{
+    if (!comb) return;
+    Point p = lastPosition;
+    if (comb->moveInsideBoundary(&p, distance))
+    {
+        //Move inside again, so we move out of tight 90deg corners
+        comb->moveInsideBoundary(&p, distance);
+        if (comb->inside(p))
+        {
+            addTravel_simple(p);
+            //Make sure the that any retraction happens after this move, not before it by starting a new move path.
+            forceNewPathStart();
+        }
+    }
+}
+
+void GCodePlanner::addTravel(Point p)
+{
+    GCodePath* path = nullptr;
+    
+    bool combed = false;
+    
+    if (comb != nullptr && lastPosition != Point(0,0))
+    {
+        CombPaths combPaths;
+        combed = comb->calc(lastPosition, p, combPaths, was_combing, is_going_to_comb);
+        if (combed)
+        {
+            bool retract = combPaths.size() > 1;
+            { // check whether we want to retract
+                if (!retract && combPaths.size() == 1 && combPaths[0].throughAir && combPaths[0].size() > 2)
+                { // retract when avoiding obstacles through air
+                    retract = true;
+                }
+                
+                for (unsigned int path_idx = 0; path_idx < combPaths.size() && !retract; path_idx++)
+                { // retract when path moves through a boundary
+                    if (combPaths[path_idx].cross_boundary) { retract = true; }
+                }
+            }
+            
+            if (retract && last_retraction_config->zHop > 0)
+            { // TODO: stop comb calculation early! (as soon as we see we don't end in the same part as we began)
+                path = getLatestPathWithConfig(&travelConfig);
+                if (!shorterThen(lastPosition - p, last_retraction_config->retraction_min_travel_distance))
+                {
+                    path->retract = true;
+                }
+            }
+            else 
+            {
+                for (CombPath& combPath : combPaths)
+                { // add all comb paths (don't do anything special for paths which are moving through air)
+                    if (combPath.size() == 0)
+                    {
+                        continue;
+                    }
+                    path = getLatestPathWithConfig(&travelConfig);
+                    path->retract = retract;
+                    for (Point& combPoint : combPath)
+                    {
+                        path->points.push_back(combPoint);
+                    }
+                    lastPosition = combPath.back();
+                }
+            }
+        }
+        was_combing = is_going_to_comb;
+    }
+    
+    if(!combed) {
+        // no combing? always retract!
+        path = getLatestPathWithConfig(&travelConfig);
+        if (!shorterThen(lastPosition - p, last_retraction_config->retraction_min_travel_distance))
+        {
+            path->retract = true;
+        }
+    }
+    
+    addTravel_simple(p, path);
+}
+
+void GCodePlanner::addTravel_simple(Point p, GCodePath* path)
+{
+    if (path == nullptr)
+    {
+        path = getLatestPathWithConfig(&travelConfig);
+    }
+    path->points.push_back(p);
+    lastPosition = p;
+}
+
+
+void GCodePlanner::addExtrusionMove(Point p, GCodePathConfig* config, float flow)
+{
+    getLatestPathWithConfig(config, flow)->points.push_back(p);
+    lastPosition = p;
+}
+
+void GCodePlanner::addPolygon(PolygonRef polygon, int startIdx, GCodePathConfig* config, WallOverlapComputation* wall_overlap_computation)
+{
+    Point p0 = polygon[startIdx];
+    addTravel(p0);
+    for(unsigned int i=1; i<polygon.size(); i++)
+    {
+        Point p1 = polygon[(startIdx + i) % polygon.size()];
+        addExtrusionMove(p1, config, (wall_overlap_computation)? wall_overlap_computation->getFlow(p0, p1) : 1.0);
+        p0 = p1;
+    }
+    if (polygon.size() > 2)
+    {
+        Point& p1 = polygon[startIdx];
+        addExtrusionMove(p1, config, (wall_overlap_computation)? wall_overlap_computation->getFlow(p0, p1) : 1.0);
+    }
+}
+
+void GCodePlanner::addPolygonsByOptimizer(Polygons& polygons, GCodePathConfig* config, WallOverlapComputation* wall_overlap_computation, EZSeamType z_seam_type)
+{
+    PathOrderOptimizer orderOptimizer(lastPosition, z_seam_type);
+    for(unsigned int i=0;i<polygons.size();i++)
+        orderOptimizer.addPolygon(polygons[i]);
+    orderOptimizer.optimize();
+    for(unsigned int i=0;i<orderOptimizer.polyOrder.size();i++)
+    {
+        int nr = orderOptimizer.polyOrder[i];
+        addPolygon(polygons[nr], orderOptimizer.polyStart[nr], config, wall_overlap_computation);
+    }
+}
+void GCodePlanner::addLinesByOptimizer(Polygons& polygons, GCodePathConfig* config, int wipe_dist)
+{
+    LineOrderOptimizer orderOptimizer(lastPosition);
+    for(unsigned int i=0;i<polygons.size();i++)
+        orderOptimizer.addPolygon(polygons[i]);
+    orderOptimizer.optimize();
+    for(unsigned int i=0;i<orderOptimizer.polyOrder.size();i++)
+    {
+        int nr = orderOptimizer.polyOrder[i];
+//         addPolygon(polygons[nr], orderOptimizer.polyStart[nr], config);
+        PolygonRef polygon = polygons[nr];
+        int start = orderOptimizer.polyStart[nr];
+        int end = 1 - start;
+        Point& p0 = polygon[start];
+        addTravel(p0);
+        Point& p1 = polygon[end];
+        addExtrusionMove(p1, config);
+        if (wipe_dist != 0)
+        {
+            int line_width = config->getLineWidth();
+            if (vSize2(p1-p0) > line_width * line_width * 4)
+            { // otherwise line will get optimized by combining multiple into a single extrusion move
+                addExtrusionMove(p1 + normal(p1-p0, wipe_dist), config, 0.0);
+            }
+        }
+    }
+}
+
+void GCodePlanner::forceMinimalLayerTime(double minTime, double minimalSpeed, double travelTime, double extrudeTime)
+{
+    double totalTime = travelTime + extrudeTime; 
+    if (totalTime < minTime && extrudeTime > 0.0)
+    {
+        double minExtrudeTime = minTime - travelTime;
+        if (minExtrudeTime < 1)
+            minExtrudeTime = 1;
+        double factor = extrudeTime / minExtrudeTime;
+        for(unsigned int n=0; n<paths.size(); n++)
+        {
+            GCodePath* path = &paths[n];
+            if (path->getExtrusionMM3perMM() == 0)
+                continue;
+            double speed = path->config->getSpeed() * factor;
+            if (speed < minimalSpeed)
+                factor = minimalSpeed / path->config->getSpeed();
+        }
+
+        //Only slow down with the minimal time if that will be slower then a factor already set. First layer slowdown also sets the speed factor.
+        if (factor < getExtrudeSpeedFactor())
+            setExtrudeSpeedFactor(factor);
+        else
+            factor = getExtrudeSpeedFactor();
+
+        if (minTime - (extrudeTime / factor) - travelTime > 0.1)
+        {
+            this->extraTime = minTime - (extrudeTime / factor) - travelTime;
+        }
+        this->totalPrintTime = (extrudeTime / factor) + travelTime;
+    }else{
+        this->totalPrintTime = totalTime;
+    }
+}
+
+void GCodePlanner::getNaiveTimeEstimates(double& travelTime, double& extrudeTime)
+{
+    travelTime = 0.0;
+    extrudeTime = 0.0;
+    Point p0 = gcode.getPositionXY();
+    for(unsigned int n=0; n<paths.size(); n++)
+    {
+        GCodePath* path = &paths[n];
+        for(unsigned int i=0; i<path->points.size(); i++)
+        {
+            double thisTime = vSizeMM(p0 - path->points[i]) / path->config->getSpeed();
+            if (path->getExtrusionMM3perMM() != 0)
+                extrudeTime += thisTime;
+            else
+                travelTime += thisTime;
+            p0 = path->points[i];
+        }
+    }
+}
+
+void GCodePlanner::writeGCode(bool liftHeadIfNeeded, int layerThickness)
+{
+    GCodePathConfig* last_extrusion_config = nullptr;
+    int extruder = gcode.getExtruderNr();
+
+    
+    for(unsigned int path_idx = 0; path_idx < paths.size(); path_idx++)
+    {
+        GCodePath& path = paths[path_idx];
+        if (extruder != path.extruder)
+        {
+            extruder = path.extruder;
+            gcode.switchExtruder(extruder);
+        }else if (path.retract)
+        {
+            writeRetraction(path_idx);
+        }
+        if (path.config != &travelConfig && last_extrusion_config != path.config)
+        {
+            gcode.writeTypeComment(path.config->name);
+            last_extrusion_config = path.config;
+        }
+        double speed = path.config->getSpeed();
+
+        if (path.getExtrusionMM3perMM() != 0)// Only apply the extrudeSpeed to extrusion moves
+            speed *= getExtrudeSpeedFactor();
+        else
+            speed *= getExtrudeSpeedFactor();
+
+        int64_t nozzle_size = 400; // TODO allow the machine settings to be passed on everywhere :: depends on which nozzle!
+        
+        if (MergeInfillLines(gcode, paths, travelConfig, nozzle_size).mergeInfillLines(speed, path_idx)) // !! has effect on path_idx !!
+        { // !! has effect on path_idx !!
+            // works when path_idx is the index of the travel move BEFORE the infill lines to be merged
+            continue;
+        }
+        
+        if (path.config == &travelConfig)
+        { // early comp for travel paths, which are handled more simply
+            for(unsigned int point_idx = 0; point_idx < path.points.size(); point_idx++)
+            {
+                gcode.writeMove(path.points[point_idx], speed, path.getExtrusionMM3perMM());
+            }
+            continue;
+        }
+        
+        bool spiralize = path.config->spiralize;
+        if (spiralize)
+        {
+            //Check if we are the last spiralize path in the list, if not, do not spiralize.
+            for(unsigned int m=path_idx+1; m<paths.size(); m++)
+            {
+                if (paths[m].config->spiralize)
+                    spiralize = false;
+            }
+        }
+        if (!spiralize) // normal (extrusion) move (with coasting
+        { 
+            CoastingConfig& coasting_config = storage.coasting_config[extruder];
+            bool coasting = coasting_config.coasting_enable; 
+            if (coasting)
+            {
+                coasting = writePathWithCoasting(path_idx, layerThickness
+                            , coasting_config.coasting_volume_move, coasting_config.coasting_speed_move, coasting_config.coasting_min_volume_move
+                            , coasting_config.coasting_volume_retract, coasting_config.coasting_speed_retract, coasting_config.coasting_min_volume_retract);
+            }
+            if (! coasting) // not same as 'else', cause we might have changed coasting in the line above...
+            { // normal path to gcode algorithm
+                if (  // change   ||||||   to  /\/\/\/\/ ...
+                    false &&
+                    path_idx + 2 < paths.size() // has a next move
+                    && paths[path_idx+1].points.size() == 1 // is single extruded line
+                    && paths[path_idx+1].config != &travelConfig // next move is extrusion
+                    && paths[path_idx+2].config == &travelConfig // next next move is travel
+                    && shorterThen(path.points.back() - gcode.getPositionXY(), 2 * nozzle_size) // preceding extrusion is close by
+                    && shorterThen(paths[path_idx+1].points.back() - path.points.back(), 2 * nozzle_size) // extrusion move is small
+                    && shorterThen(paths[path_idx+2].points.back() - paths[path_idx+1].points.back(), 2 * nozzle_size) // consecutive extrusion is close by
+                )
+                {
+                    gcode.writeMove(paths[path_idx+2].points.back(), speed, paths[path_idx+1].getExtrusionMM3perMM());
+                    path_idx += 2;
+                }
+                else 
+                {
+                    for(unsigned int point_idx = 0; point_idx < path.points.size(); point_idx++)
+                    {
+                        gcode.writeMove(path.points[point_idx], speed, path.getExtrusionMM3perMM());
+                    }
+                }
+            }
+        }
+        else
+        { // SPIRALIZE
+            //If we need to spiralize then raise the head slowly by 1 layer as this path progresses.
+            float totalLength = 0.0;
+            int z = gcode.getPositionZ();
+            Point p0 = gcode.getPositionXY();
+            for(unsigned int i=0; i<path.points.size(); i++)
+            {
+                Point p1 = path.points[i];
+                totalLength += vSizeMM(p0 - p1);
+                p0 = p1;
+            }
+
+            float length = 0.0;
+            p0 = gcode.getPositionXY();
+            for(unsigned int point_idx = 0; point_idx < path.points.size(); point_idx++)
+            {
+                Point p1 = path.points[point_idx];
+                length += vSizeMM(p0 - p1);
+                p0 = p1;
+                gcode.setZ(z + layerThickness * length / totalLength);
+                gcode.writeMove(path.points[point_idx], speed, path.getExtrusionMM3perMM());
+            }
+        }
+    }
+
+    gcode.updateTotalPrintTime();
+    if (liftHeadIfNeeded && extraTime > 0.0)
+    {
+        gcode.writeComment("Small layer, adding delay");
+        if (last_extrusion_config)
+        {
+            bool extruder_switch_retract = false;// TODO: check whether we should do a retractoin_extruderSwitch; is the next path with a different extruder?
+            writeRetraction(extruder_switch_retract, last_extrusion_config->retraction_config);
+        }
+        gcode.setZ(gcode.getPositionZ() + MM2INT(3.0));
+        gcode.writeMove(gcode.getPositionXY(), travelConfig.getSpeed(), 0);
+        gcode.writeMove(gcode.getPositionXY() - Point(-MM2INT(20.0), 0), travelConfig.getSpeed(), 0);
+        gcode.writeDelay(extraTime);
+    }
+}
+
+void GCodePlanner::writeRetraction(unsigned int path_idx_travel_after)
+{
+    if (makeRetractSwitchRetract(path_idx_travel_after))
+    {
+        gcode.writeRetraction_extruderSwitch();
+    }
+    else 
+    {
+        RetractionConfig* extrusion_retraction_config = nullptr;
+        for(int extrusion_path_idx = int(path_idx_travel_after) - 1; extrusion_path_idx >= 0; extrusion_path_idx--)
+        { // backtrack to find the last extrusion path
+            if (paths[extrusion_path_idx].config != &travelConfig)
+            {
+                extrusion_retraction_config = paths[extrusion_path_idx].config->retraction_config;
+                break;
+            }
+        }
+        writeRetraction(false, extrusion_retraction_config);
+    }
+}
+void GCodePlanner::writeRetraction(bool extruder_switch_retract, RetractionConfig* retraction_config)
+{    
+    if (extruder_switch_retract)
+    {
+        gcode.writeRetraction_extruderSwitch();
+    }
+    else 
+    {
+        if (retraction_config)
+        {
+            gcode.writeRetraction(retraction_config);
+        }
+        else 
+        {
+            gcode.writeRetraction(travelConfig.retraction_config);
+        }
+    }
+}
+
+
+
+bool GCodePlanner::makeRetractSwitchRetract(unsigned int path_idx)
+{
+    for (unsigned int path_idx2 = path_idx + 1; path_idx2 < paths.size(); path_idx2++)
+    {
+        if (paths[path_idx2].getExtrusionMM3perMM() > 0) 
+        { 
+            if (paths[path_idx2].extruder != gcode.getExtruderNr()) 
+            { 
+                return true; 
+            }
+            return false; 
+        }
+    }
+    return false;
+}
+    
+bool GCodePlanner::writePathWithCoasting(unsigned int path_idx, int64_t layerThickness, double coasting_volume_move, double coasting_speed_move, double coasting_min_volume_move, double coasting_volume_retract, double coasting_speed_retract, double coasting_min_volume_retract)
+{
+    GCodePath& path = paths[path_idx];
+    if (path_idx + 1 >= paths.size()
+        ||
+        ! (path.getExtrusionMM3perMM() > 0.0 &&  paths[path_idx + 1].config->getExtrusionMM3perMM() == 0.0) 
+        ||
+        path.points.size() < 2
+        )
+    {
+        return false;
+    }
+    GCodePath& path_next = paths[path_idx + 1];
+    
+    if (path_next.retract)
+    {
+        if (coasting_volume_retract <= 0) { return false; }
+        return writePathWithCoasting(path, path_next, layerThickness, coasting_volume_retract, coasting_speed_retract, coasting_min_volume_retract, makeRetractSwitchRetract(path_idx));
+    }
+    else
+    {
+        if (coasting_volume_move <= 0) { return false; }
+        return writePathWithCoasting(path, path_next, layerThickness, coasting_volume_move, coasting_speed_move, coasting_min_volume_move);
+    }
+}  
+bool GCodePlanner::writePathWithCoasting(GCodePath& path, GCodePath& path_next, int64_t layerThickness, double coasting_volume, double coasting_speed, double coasting_min_volume, bool extruder_switch_retract)
+{
+
+    int64_t coasting_min_dist_considered = 100; // hardcoded setting for when to not perform coasting
+
+    
+    double extrude_speed = path.config->getSpeed() * getExtrudeSpeedFactor(); // travel speed 
+    
+    int64_t coasting_dist = MM2INT(MM2_2INT(coasting_volume) / layerThickness) / path.config->getLineWidth(); // closing brackets of MM2INT at weird places for precision issues
+    int64_t coasting_min_dist = MM2INT(MM2_2INT(coasting_min_volume) / layerThickness) / path.config->getLineWidth(); // closing brackets of MM2INT at weird places for precision issues
+    
+    
+    std::vector<int64_t> accumulated_dist_per_point; // the first accumulated dist is that of the last point! (that of the last point is always zero...)
+    accumulated_dist_per_point.push_back(0);
+    
+    int64_t accumulated_dist = 0;
+    
+    bool length_is_less_than_min_dist = true;
+    
+    unsigned int acc_dist_idx_gt_coast_dist = NO_INDEX; // the index of the first point with accumulated_dist more than coasting_dist (= index into accumulated_dist_per_point)
+     // == the point printed BEFORE the start point for coasting
+    
+    
+    Point* last = &path.points[path.points.size() - 1];
+    for (unsigned int backward_point_idx = 1; backward_point_idx < path.points.size(); backward_point_idx++)
+    {
+        Point& point = path.points[path.points.size() - 1 - backward_point_idx];
+        int64_t dist = vSize(point - *last);
+        accumulated_dist += dist;
+        accumulated_dist_per_point.push_back(accumulated_dist);
+        
+        if (acc_dist_idx_gt_coast_dist == NO_INDEX && accumulated_dist >= coasting_dist)
+        {
+            acc_dist_idx_gt_coast_dist = backward_point_idx; // the newly added point
+        }
+        
+        if (accumulated_dist >= coasting_min_dist)
+        {
+            length_is_less_than_min_dist = false;
+            break;
+        }
+        
+        last = &point;
+    }
+    
+    if (accumulated_dist < coasting_min_dist_considered)
+    {
+        return false;
+    }
+    int64_t actual_coasting_dist = coasting_dist;
+    if (length_is_less_than_min_dist)
+    {
+        // in this case accumulated_dist is the length of the whole path
+        actual_coasting_dist = accumulated_dist * coasting_dist / coasting_min_dist;
+        for (acc_dist_idx_gt_coast_dist = 0 ; acc_dist_idx_gt_coast_dist < accumulated_dist_per_point.size() ; acc_dist_idx_gt_coast_dist++)
+        { // search for the correct coast_dist_idx
+            if (accumulated_dist_per_point[acc_dist_idx_gt_coast_dist] > actual_coasting_dist)
+            {
+                break;
+            }
+        }
+    }
+    
+    if (acc_dist_idx_gt_coast_dist == NO_INDEX) 
+    { // something has gone wrong; coasting_min_dist < coasting_dist ?
+        return false;
+    }
+    
+    unsigned int point_idx_before_start = path.points.size() - 1 - acc_dist_idx_gt_coast_dist;
+    
+    Point start;
+    { // computation of begin point of coasting
+        int64_t residual_dist = actual_coasting_dist - accumulated_dist_per_point[acc_dist_idx_gt_coast_dist - 1];
+        Point& a = path.points[point_idx_before_start];
+        Point& b = path.points[point_idx_before_start + 1];
+        start = b + normal(a-b, residual_dist);
+    }
+    
+    { // write normal extrude path:
+        for(unsigned int point_idx = 0; point_idx <= point_idx_before_start; point_idx++)
+        {
+            gcode.writeMove(path.points[point_idx], extrude_speed, path.getExtrusionMM3perMM());
+        }
+        gcode.writeMove(start, extrude_speed, path.getExtrusionMM3perMM());
+    }
+    
+    if (path_next.retract)
+    {
+        writeRetraction(extruder_switch_retract, path.config->retraction_config);
+    }
+    
+    for (unsigned int point_idx = point_idx_before_start + 1; point_idx < path.points.size(); point_idx++)
+    {
+        gcode.writeMove(path.points[point_idx], coasting_speed * path.config->getSpeed(), 0);
+    }
+    
+    gcode.setLastCoastedAmountMM3(path.getExtrusionMM3perMM() * INT2MM(actual_coasting_dist));
+    
+    return true;
+}
+
+}//namespace cura

src/gcodePlanner.h

@@ -0,0 +1,223 @@
+#ifndef GCODE_PLANNER_H
+#define GCODE_PLANNER_H
+
+#include <vector>
+
+#include "gcodeExport.h"
+#include "comb.h"
+#include "utils/polygon.h"
+#include "utils/logoutput.h"
+#include "wallOverlap.h"
+#include "commandSocket.h"
+
+
+namespace cura 
+{
+
+class SliceDataStorage;
+
+class GCodePath
+{
+public:
+    GCodePathConfig* config; //!< The configuration settings of the path.
+    float flow; //!< A type-independent flow configuration (used for wall overlap compensation)
+    bool retract; //!< Whether the path is a move path preceded by a retraction move; whether the path is a retracted move path. 
+    int extruder; //!< The extruder used for this path.
+    std::vector<Point> points; //!< The points constituting this path.
+    bool done;//!< Path is finished, no more moves should be added, and a new path should be started instead of any appending done to this one.
+    
+    double getExtrusionMM3perMM()
+    {
+        return flow * config->getExtrusionMM3perMM();
+    }
+};
+
+/*! 
+ * The GCodePlanner class stores multiple moves that are planned.
+ * It facilitates the combing to keep the head inside the print.
+ * It also keeps track of the print time estimate for this planning so speed adjustments can be made for the minimal-layer-time.
+ */
+class GCodePlanner
+{
+private:
+    GCodeExport& gcode;
+    SliceDataStorage& storage;
+
+    int z; 
+    
+    Point lastPosition;
+    std::vector<GCodePath> paths;
+    
+    bool was_combing;
+    bool is_going_to_comb;
+    Comb* comb;
+
+    RetractionConfig* last_retraction_config;
+    
+    GCodePathConfig travelConfig; //!< The config used for travel moves (only the speed and retraction config are set!)
+    double extrudeSpeedFactor;
+    double travelSpeedFactor; // TODO: remove this unused var?
+    int currentExtruder;
+    
+    double extraTime;
+    double totalPrintTime;
+    
+private:
+    /*!
+     * Either create a new path with the given config or return the last path if it already had that config.
+     * If GCodePlanner::forceNewPathStart has been called a new path will always be returned.
+     * 
+     * \param config The config used for the path returned
+     * \param flow (optional) A ratio for the extrusion speed
+     * \return A path with the given config which is now the last path in GCodePlanner::paths
+     */
+    GCodePath* getLatestPathWithConfig(GCodePathConfig* config, float flow = 1.0);
+    
+    /*!
+     * Force GCodePlanner::getLatestPathWithConfig to return a new path.
+     * 
+     * This function is introduced because in some cases 
+     * GCodePlanner::getLatestPathWithConfig is called consecutively with the same config pointer, 
+     * though the content of the config has changed.
+     * 
+     * Example cases: 
+     * - when changing extruder, the same travel config is used, but its extruder field is changed.
+     */
+    void forceNewPathStart();
+public:
+    /*
+     * 
+     * \param travel_avoid_other_parts Whether to avoid other layer parts when travaeling through air.
+     * \param travel_avoid_distance The distance by which to avoid other layer parts when traveling through air.
+     */
+    GCodePlanner(CommandSocket* commandSocket, GCodeExport& gcode, SliceDataStorage& storage, int z, RetractionConfig* retraction_config_travel, double travelSpeed, bool retraction_combing, unsigned int layer_nr, int64_t comb_boundary_offset, bool travel_avoid_other_parts, int64_t travel_avoid_distance);
+    ~GCodePlanner();
+
+    void setCombing(bool going_to_comb);
+    
+    bool setExtruder(int extruder);
+
+    int getExtruder()
+    {
+        return currentExtruder;
+    }
+
+    void setExtrudeSpeedFactor(double speedFactor)
+    {
+        if (speedFactor < 1) speedFactor = 1.0;
+        this->extrudeSpeedFactor = speedFactor;
+    }
+    double getExtrudeSpeedFactor()
+    {
+        return this->extrudeSpeedFactor;
+    }
+    void setTravelSpeedFactor(double speedFactor)
+    {
+        if (speedFactor < 1) speedFactor = 1.0;
+        this->travelSpeedFactor = speedFactor;
+    }
+    double getTravelSpeedFactor()
+    {
+        return this->travelSpeedFactor;
+    }
+
+    /*!
+     * Whether the current retracted path is to be an extruder switch retraction.
+     * This function is used to avoid a G10 S1 after a G10.
+     * 
+     * \param path_idx The index of the current retracted path 
+     * \return Whether the path should be an extgruder switch retracted path
+     */
+    bool makeRetractSwitchRetract(unsigned int path_idx);
+
+    /*!
+     * Add a travel path to a certain point, retract if needed and when avoiding boundary crossings:
+     * avoiding obstacles and comb along the boundary of parts.
+     * 
+     * \param p The point to travel to
+     */
+    void addTravel(Point p);
+    
+    /*!
+     * Add a travel path to a certain point and retract if needed.
+     * 
+     * No combing is performed.
+     * 
+     * \param p The point to travel to
+     * \param path (optional) The travel path to which to add the point \p p
+     */
+    void addTravel_simple(Point p, GCodePath* path = nullptr);
+    
+    void addExtrusionMove(Point p, GCodePathConfig* config, float flow = 1.0);
+
+    void addPolygon(PolygonRef polygon, int startIdx, GCodePathConfig* config, WallOverlapComputation* wall_overlap_computation = nullptr);
+
+    void addPolygonsByOptimizer(Polygons& polygons, GCodePathConfig* config, WallOverlapComputation* wall_overlap_computation = nullptr, EZSeamType z_seam_type = EZSeamType::SHORTEST);
+
+    /*!
+     * Add lines to the gcode with optimized order.
+     * \param polygons The lines
+     * \param config The config of the lines
+     * \param wipe_dist (optional) the distance wiped without extruding after laying down a line.
+     */
+    void addLinesByOptimizer(Polygons& polygons, GCodePathConfig* config, int wipe_dist = 0);
+
+    void forceMinimalLayerTime(double minTime, double minimalSpeed, double travelTime, double extrusionTime);
+    
+    void getNaiveTimeEstimates(double& travelTime, double& extrudeTime);
+
+    /*!
+     * Writes a path to GCode and performs coasting, or returns false if it did nothing.
+     * 
+     * Coasting replaces the last piece of an extruded path by move commands and uses the oozed material to lay down lines.
+     * 
+     * \param path_idx The index into GCodePlanner::paths for the next path to be written to GCode.
+     * \param layerThickness The height of the current layer.
+     * \param coasting_volume_move The volume otherwise leaked during a normal move.
+     * \param coasting_speed_move The speed at which to move during move-coasting.
+     * \param coasting_min_volume_move The minimal volume a path should have which builds up enough pressure to ooze as much as \p coasting_volume_move.
+     * \param coasting_volume_retract The volume otherwise leaked during a retract move.
+     * \param coasting_speed_retract The speed at which to move during retract-coasting.
+     * \param coasting_min_volume_retract The minimal volume a path should have which builds up enough pressure to ooze as much as \p coasting_volume_retract.
+     * \return Whether any GCode has been written for the path.
+     */
+    bool writePathWithCoasting(unsigned int path_idx, int64_t layerThickness, double coasting_volume_move, double coasting_speed_move, double coasting_min_volume_move, double coasting_volume_retract, double coasting_speed_retract, double coasting_min_volume_retract);
+
+    /*!
+     * Writes a path to GCode and performs coasting, or returns false if it did nothing.
+     * 
+     * Coasting replaces the last piece of an extruded path by move commands and uses the oozed material to lay down lines.
+     * 
+     * Paths shorter than \p coasting_min_volume will use less \p coasting_volume linearly.
+     * 
+     * \param path The extrusion path to be written to GCode.
+     * \param path_next The next travel path to be written to GCode.
+     * \param layerThickness The height of the current layer.
+     * \param coasting_volume The volume otherwise leaked.
+     * \param coasting_speed The speed at which to move during coasting.
+     * \param coasting_min_volume The minimal volume a path should have which builds up enough pressure to ooze as much as \p coasting_volume.
+     * \param extruder_switch_retract (optional) For a coasted path followed by a retraction: whether to retract normally, or do an extruder switch retraction.
+     * \return Whether any GCode has been written for the path.
+     */
+    bool writePathWithCoasting(GCodePath& path, GCodePath& path_next, int64_t layerThickness, double coasting_volume, double coasting_speed, double coasting_min_volume, bool extruder_switch_retract = false);
+    
+    /*!
+     * Write a retraction: either an extruder switch retraction or a normal retraction based on the last extrusion paths retraction config.
+     * \param path_idx_travel_after Index in GCodePlanner::paths to the travel move before which to do the retraction
+     */
+    void writeRetraction(unsigned int path_idx_travel_after);
+    
+    /*!
+     * Write a retraction: either an extruder switch retraction or a normal retraction based on the given retraction config.
+     * \param extruder_switch_retract Whether to write an extruder switch retract
+     * \param retraction_config The config used.
+     */
+    void writeRetraction(bool extruder_switch_retract, RetractionConfig* retraction_config);
+    
+    void writeGCode(bool liftHeadIfNeeded, int layerThickness);
+    void moveInsideCombBoundary(int arg1);
+};
+
+}//namespace cura
+
+#endif//GCODE_PLANNER_H

src/infill.cpp

@@ -1,8 +1,76 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
 #include "infill.h"
+#include "functional"
+#include "utils/polygonUtils.h"
+#include "utils/AABB.h"
+#include "utils/logoutput.h"
 
 namespace cura {
 
+void Infill::generate(Polygons& result_polygons, Polygons& result_lines, Polygons* in_between)
+{
+    if (in_outline.size() == 0) return;
+    if (line_distance == 0) return;
+    const Polygons* outline = &in_outline;
+    Polygons outline_offsetted;
+    switch(pattern)
+    {
+    case EFillMethod::GRID:
+        generateGridInfill(in_outline, outlineOffset, result_lines, extrusion_width, line_distance * 2, infill_overlap, fill_angle);
+        break;
+    case EFillMethod::LINES:
+        generateLineInfill(in_outline, outlineOffset, result_lines, extrusion_width, line_distance, infill_overlap, fill_angle);
+        break;
+    case EFillMethod::TRIANGLES:
+        generateTriangleInfill(in_outline, outlineOffset, result_lines, extrusion_width, line_distance * 3, infill_overlap, fill_angle);
+        break;
+    case EFillMethod::CONCENTRIC:
+        if (outlineOffset != 0)
+        {
+            PolygonUtils::offsetSafe(in_outline, outlineOffset, extrusion_width, outline_offsetted, avoidOverlappingPerimeters);
+            outline = &outline_offsetted;
+        }
+        if (abs(extrusion_width - line_distance) < 10)
+        {
+            generateConcentricInfillDense(*outline, result_polygons, in_between, extrusion_width, avoidOverlappingPerimeters);
+        }
+        else 
+        {
+            generateConcentricInfill(*outline, result_polygons, line_distance);
+        }
+        break;
+    case EFillMethod::ZIG_ZAG:
+        if (outlineOffset != 0)
+        {
+            PolygonUtils::offsetSafe(in_outline, outlineOffset, extrusion_width, outline_offsetted, avoidOverlappingPerimeters);
+            outline = &outline_offsetted;
+        }
+        generateZigZagInfill(*outline, result_lines, extrusion_width, line_distance, infill_overlap, fill_angle, connect_zigzags, use_endPieces);
+        break;
+    default:
+        logError("Fill pattern has unknown value.\n");
+        break;
+    }
+}
+
+    
+      
+void generateConcentricInfillDense(Polygons outline, Polygons& result, Polygons* in_between, int extrusionWidth, bool avoidOverlappingPerimeters)
+{
+    while(outline.size() > 0)
+    {
+        for (unsigned int polyNr = 0; polyNr < outline.size(); polyNr++)
+        {
+            PolygonRef r = outline[polyNr];
+            result.add(r);
+        }
+        Polygons next_outline;
+        PolygonUtils::offsetExtrusionWidth(outline, true, extrusionWidth, next_outline, in_between, avoidOverlappingPerimeters);
+        outline = next_outline;
+    } 
+
+}
+
 void generateConcentricInfill(Polygons outline, Polygons& result, int inset_value)
 {
     while(outline.size() > 0)
@@ -13,95 +81,446 @@ void generateConcentricInfill(Polygons outline, Polygons& result, int inset_valu
             result.add(r);
         }
         outline = outline.offset(-inset_value);
-    }
+    } 
 }
 
-void generateAutomaticInfill(const Polygons& in_outline, Polygons& result,
-                             int extrusionWidth, int lineSpacing,
-                             int infillOverlap, double rotation)
-{
-    if (lineSpacing > extrusionWidth * 4)
-    {
-        generateGridInfill(in_outline, result, extrusionWidth, lineSpacing,
-                           infillOverlap, rotation);
-    }
-    else
-    {
-        generateLineInfill(in_outline, result, extrusionWidth, lineSpacing,
-                           infillOverlap, rotation);
-    }
-}
 
-void generateGridInfill(const Polygons& in_outline, Polygons& result,
-                        int extrusionWidth, int lineSpacing, int infillOverlap,
+void generateGridInfill(const Polygons& in_outline, int outlineOffset, Polygons& result,
+                        int extrusionWidth, int lineSpacing, double infillOverlap,
                         double rotation)
 {
-    generateLineInfill(in_outline, result, extrusionWidth, lineSpacing * 2,
+    generateLineInfill(in_outline, outlineOffset, result, extrusionWidth, lineSpacing,
                        infillOverlap, rotation);
-    generateLineInfill(in_outline, result, extrusionWidth, lineSpacing * 2,
+    generateLineInfill(in_outline, outlineOffset, result, extrusionWidth, lineSpacing,
                        infillOverlap, rotation + 90);
 }
 
-int compare_int64_t(const void* a, const void* b)
+void generateTriangleInfill(const Polygons& in_outline, int outlineOffset, Polygons& result,
+                        int extrusionWidth, int lineSpacing, double infillOverlap,
+                        double rotation)
 {
-    int64_t n = (*(int64_t*)a) - (*(int64_t*)b);
-    if (n < 0) return -1;
-    if (n > 0) return 1;
-    return 0;
+    generateLineInfill(in_outline, outlineOffset, result, extrusionWidth, lineSpacing,
+                       infillOverlap, rotation);
+    generateLineInfill(in_outline, outlineOffset, result, extrusionWidth, lineSpacing,
+                       infillOverlap, rotation + 60);
+    generateLineInfill(in_outline, outlineOffset, result, extrusionWidth, lineSpacing,
+                       infillOverlap, rotation + 120);
 }
 
-void generateLineInfill(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, int infillOverlap, double rotation)
+void addLineInfill(Polygons& result, PointMatrix matrix, int scanline_min_idx, int lineSpacing, AABB boundary, std::vector<std::vector<int64_t> > cutList, int extrusionWidth)
 {
-    Polygons outline = in_outline.offset(extrusionWidth * infillOverlap / 100);
+    auto addLine = [&](Point from, Point to)
+    {            
+        PolygonRef p = result.newPoly();
+        p.add(matrix.unapply(from));
+        p.add(matrix.unapply(to));
+    };
+    
+    auto compare_int64_t = [](const void* a, const void* b)
+    {
+        int64_t n = (*(int64_t*)a) - (*(int64_t*)b);
+        if (n < 0) return -1;
+        if (n > 0) return 1;
+        return 0;
+    };
+    
+    int scanline_idx = 0;
+    for(int64_t x = scanline_min_idx * lineSpacing; x < boundary.max.X; x += lineSpacing)
+    {
+        qsort(cutList[scanline_idx].data(), cutList[scanline_idx].size(), sizeof(int64_t), compare_int64_t);
+        for(unsigned int i = 0; i + 1 < cutList[scanline_idx].size(); i+=2)
+        {
+            if (cutList[scanline_idx][i+1] - cutList[scanline_idx][i] < extrusionWidth / 5)
+                continue;
+            addLine(Point(x, cutList[scanline_idx][i]), Point(x, cutList[scanline_idx][i+1]));
+        }
+        scanline_idx += 1;
+    }
+}
+
+/*!
+ * generate lines within the area of \p in_outline, at regular intervals of \p lineSpacing
+ * 
+ * idea:
+ * intersect a regular grid of 'scanlines' with the area inside \p in_outline
+ * 
+ * we call the areas between two consecutive scanlines a 'scansegment'.
+ * Scansegment x is the area between scanline x and scanline x+1
+ * 
+ * algorithm:
+ * 1) for each line segment of each polygon:
+ *      store the intersections of that line segment with all scanlines in a mapping (vector of vectors) from scanline to intersections
+ *      (zigzag): add boundary segments to result
+ * 2) for each scanline:
+ *      sort the associated intersections 
+ *      and connect them using the even-odd rule
+ * 
+ */
+void generateLineInfill(const Polygons& in_outline, int outlineOffset, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation)
+{
+    if (lineSpacing == 0) return;
+    if (in_outline.size() == 0) return;
+    Polygons outline = ((outlineOffset)? in_outline.offset(outlineOffset) : in_outline).offset(extrusionWidth * infillOverlap / 100);
+    if (outline.size() == 0) return;
+    
+    PointMatrix matrix(rotation);
+    
+    outline.applyMatrix(matrix);
+
+    
+    AABB boundary(outline);
+    
+    int scanline_min_idx = boundary.min.X / lineSpacing;
+    int lineCount = (boundary.max.X + (lineSpacing - 1)) / lineSpacing - scanline_min_idx;
+  
+    std::vector<std::vector<int64_t> > cutList; // mapping from scanline to all intersections with polygon segments
+    
+    for(int n=0; n<lineCount; n++)
+        cutList.push_back(std::vector<int64_t>());
+    
+    for(unsigned int poly_idx=0; poly_idx < outline.size(); poly_idx++)
+    {
+        Point p0 = outline[poly_idx][outline[poly_idx].size()-1];
+        for(unsigned int i=0; i < outline[poly_idx].size(); i++)
+        {
+            Point p1 = outline[poly_idx][i];
+            int64_t xMin = p1.X, xMax = p0.X;
+            if (xMin == xMax) {
+                p0 = p1;
+                continue; 
+            }
+            if (xMin > xMax) { xMin = p0.X; xMax = p1.X; }
+            
+            int scanline_idx0 = (p0.X + ((p0.X > 0)? -1 : -lineSpacing)) / lineSpacing; // -1 cause a linesegment on scanline x counts as belonging to scansegment x-1   ...
+            int scanline_idx1 = (p1.X + ((p1.X > 0)? -1 : -lineSpacing)) / lineSpacing; // -linespacing because a line between scanline -n and -n-1 belongs to scansegment -n-1 (for n=positive natural number)
+            int direction = 1;
+            if (p0.X > p1.X) 
+            { 
+                direction = -1; 
+                scanline_idx1 += 1; // only consider the scanlines in between the scansegments
+            } else scanline_idx0 += 1; // only consider the scanlines in between the scansegments
+            
+            for(int scanline_idx = scanline_idx0; scanline_idx != scanline_idx1+direction; scanline_idx+=direction)
+            {
+                int x = scanline_idx * lineSpacing;
+                int y = p1.Y + (p0.Y - p1.Y) * (x - p1.X) / (p0.X - p1.X);
+                cutList[scanline_idx - scanline_min_idx].push_back(y);
+            }
+            p0 = p1;
+        }
+    }
+    
+    addLineInfill(result, matrix, scanline_min_idx, lineSpacing, boundary, cutList, extrusionWidth);
+}
+
+
+void generateZigZagInfill(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation, bool connect_zigzags, bool use_endPieces)
+{
+    if (use_endPieces) return generateZigZagIninfill_endPieces(in_outline, result, extrusionWidth, lineSpacing, infillOverlap, rotation, connect_zigzags);
+    else return generateZigZagIninfill_noEndPieces(in_outline, result, extrusionWidth, lineSpacing, infillOverlap, rotation);
+}
+
+/*!
+ * adapted from generateLineInfill(.)
+ * 
+ * generate lines within the area of [in_outline], at regular intervals of [lineSpacing]
+ * idea:
+ * intersect a regular grid of 'scanlines' with the area inside [in_outline]
+ * sigzag:
+ * include pieces of boundary, connecting the lines, forming an accordion like zigzag instead of separate lines    |_|^|_|
+ * 
+ * we call the areas between two consecutive scanlines a 'scansegment'
+ * 
+ * algorithm:
+ * 1. for each line segment of each polygon:
+ *      store the intersections of that line segment with all scanlines in a mapping (vector of vectors) from scanline to intersections
+ *      (zigzag): add boundary segments to result
+ * 2. for each scanline:
+ *      sort the associated intersections 
+ *      and connect them using the even-odd rule
+ * 
+ * zigzag algorithm:
+ * while walking around (each) polygon (1.)
+ *  if polygon intersects with even scanline
+ *      start boundary segment (add each following segment to the [result])
+ *  when polygon intersects with a scanline again
+ *      stop boundary segment (stop adding segments to the [result])
+ *      if polygon intersects with even scanline again (instead of odd)
+ *          dont add the last line segment to the boundary (unless [connect_zigzags])
+ * 
+ * 
+ *     <--
+ *     ___
+ *    |   |   |
+ *    |   |   |
+ *    |   |___|
+ *         -->
+ * 
+ *        ^ = even scanline
+ * 
+ * start boundary from even scanline! :D
+ * 
+ * 
+ *          _____
+ *   |     |     | ,
+ *   |     |     |  |
+ *   |_____|     |__/
+ * 
+ *   ^     ^     ^    scanlines
+ *                 ^  disconnected end piece
+ */
+void generateZigZagIninfill_endPieces(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation, bool connect_zigzags)
+{
+//     if (in_outline.size() == 0) return;
+//     Polygons outline = in_outline.offset(extrusionWidth * infillOverlap / 100 - extrusionWidth / 2);
+    Polygons empty;
+    Polygons outline = in_outline.difference(empty); // copy
+    if (outline.size() == 0) return;
+    
     PointMatrix matrix(rotation);
     
     outline.applyMatrix(matrix);
     
+    auto addLine = [&](Point from, Point to)
+    {            
+        PolygonRef p = result.newPoly();
+        p.add(matrix.unapply(from));
+        p.add(matrix.unapply(to));
+    };   
+        
     AABB boundary(outline);
     
-    boundary.min.X = ((boundary.min.X / lineSpacing) - 1) * lineSpacing;
-    int lineCount = (boundary.max.X - boundary.min.X + (lineSpacing - 1)) / lineSpacing;
-    vector<vector<int64_t> > cutList;
+    int scanline_min_idx = boundary.min.X / lineSpacing;
+    int lineCount = (boundary.max.X + (lineSpacing - 1)) / lineSpacing - scanline_min_idx;
+    
+    std::vector<std::vector<int64_t> > cutList; // mapping from scanline to all intersections with polygon segments
+    
     for(int n=0; n<lineCount; n++)
-        cutList.push_back(vector<int64_t>());
-
+        cutList.push_back(std::vector<int64_t>());
     for(unsigned int polyNr=0; polyNr < outline.size(); polyNr++)
     {
-        Point p1 = outline[polyNr][outline[polyNr].size()-1];
+        std::vector<Point> firstBoundarySegment;
+        std::vector<Point> unevenBoundarySegment; // stored cause for connected_zigzags a boundary segment which ends in an uneven scanline needs to be included
+        
+        bool isFirstBoundarySegment = true;
+        bool firstBoundarySegmentEndsInEven;
+        
+        bool isEvenScanSegment = false; 
+        
+        
+        Point p0 = outline[polyNr][outline[polyNr].size()-1];
+        Point lastPoint = p0;
         for(unsigned int i=0; i < outline[polyNr].size(); i++)
         {
-            Point p0 = outline[polyNr][i];
-            int idx0 = (p0.X - boundary.min.X) / lineSpacing;
-            int idx1 = (p1.X - boundary.min.X) / lineSpacing;
-            int64_t xMin = p0.X, xMax = p1.X;
-            if (p0.X > p1.X) { xMin = p1.X; xMax = p0.X; }
-            if (idx0 > idx1) { int tmp = idx0; idx0 = idx1; idx1 = tmp; }
-            for(int idx = idx0; idx<=idx1; idx++)
-            {
-                int x = (idx * lineSpacing) + boundary.min.X + lineSpacing / 2;
-                if (x < xMin) continue;
-                if (x >= xMax) continue;
-                int y = p0.Y + (p1.Y - p0.Y) * (x - p0.X) / (p1.X - p0.X);
-                cutList[idx].push_back(y);
+            Point p1 = outline[polyNr][i];
+            int64_t xMin = p1.X, xMax = p0.X;
+            if (xMin == xMax) {
+                lastPoint = p1;
+                p0 = p1;
+                continue; 
             }
-            p1 = p0;
+            if (xMin > xMax) { xMin = p0.X; xMax = p1.X; }
+            
+            int scanline_idx0 = (p0.X + ((p0.X > 0)? -1 : -lineSpacing)) / lineSpacing; // -1 cause a linesegment on scanline x counts as belonging to scansegment x-1   ...
+            int scanline_idx1 = (p1.X + ((p1.X > 0)? -1 : -lineSpacing)) / lineSpacing; // -linespacing because a line between scanline -n and -n-1 belongs to scansegment -n-1 (for n=positive natural number)
+            int direction = 1;
+            if (p0.X > p1.X) 
+            { 
+                direction = -1; 
+                scanline_idx1 += 1; // only consider the scanlines in between the scansegments
+            } else scanline_idx0 += 1; // only consider the scanlines in between the scansegments
+            
+            
+            if (isFirstBoundarySegment) firstBoundarySegment.push_back(p0);
+            for(int scanline_idx = scanline_idx0; scanline_idx != scanline_idx1+direction; scanline_idx+=direction)
+            {
+                int x = scanline_idx * lineSpacing;
+                int y = p1.Y + (p0.Y - p1.Y) * (x - p1.X) / (p0.X - p1.X);
+                cutList[scanline_idx - scanline_min_idx].push_back(y);
+                
+                
+                bool last_isEvenScanSegment = isEvenScanSegment;
+                if (scanline_idx % 2 == 0) isEvenScanSegment = true;
+                else isEvenScanSegment = false;
+                
+                if (!isFirstBoundarySegment)
+                {
+                    if (last_isEvenScanSegment && (connect_zigzags || !isEvenScanSegment))
+                        addLine(lastPoint, Point(x,y));
+                    else if (connect_zigzags && !last_isEvenScanSegment && !isEvenScanSegment) // if we end an uneven boundary in an uneven segment
+                    { // add whole unevenBoundarySegment (including the just obtained point)
+                        for (unsigned int p = 1; p < unevenBoundarySegment.size(); p++)
+                        {
+                            addLine(unevenBoundarySegment[p-1], unevenBoundarySegment[p]);
+                        }
+                        addLine(unevenBoundarySegment[unevenBoundarySegment.size()-1], Point(x,y));
+                        unevenBoundarySegment.clear();
+                    } 
+                    if (connect_zigzags && last_isEvenScanSegment && !isEvenScanSegment)
+                        unevenBoundarySegment.push_back(Point(x,y));
+                    else 
+                        unevenBoundarySegment.clear();
+                        
+                }
+                lastPoint = Point(x,y);
+                
+                if (isFirstBoundarySegment) 
+                {
+                    firstBoundarySegment.emplace_back(x,y);
+                    firstBoundarySegmentEndsInEven = isEvenScanSegment;
+                    isFirstBoundarySegment = false;
+                }
+                
+            }
+            if (!isFirstBoundarySegment)
+            {
+                if (isEvenScanSegment)
+                    addLine(lastPoint, p1);
+                else if (connect_zigzags)
+                    unevenBoundarySegment.push_back(p1);
+            }
+            
+            lastPoint = p1;
+            p0 = p1;
         }
-    }
-    
-    int idx = 0;
-    for(int64_t x = boundary.min.X + lineSpacing / 2; x < boundary.max.X; x += lineSpacing)
-    {
-        qsort(cutList[idx].data(), cutList[idx].size(), sizeof(int64_t), compare_int64_t);
-        for(unsigned int i = 0; i + 1 < cutList[idx].size(); i+=2)
+        
+        if (isEvenScanSegment || isFirstBoundarySegment || connect_zigzags)
         {
-            if (cutList[idx][i+1] - cutList[idx][i] < extrusionWidth / 5)
-                continue;
-            PolygonRef p = result.newPoly();
-            p.add(matrix.unapply(Point(x, cutList[idx][i])));
-            p.add(matrix.unapply(Point(x, cutList[idx][i+1])));
+            for (unsigned int i = 1; i < firstBoundarySegment.size() ; i++)
+            {
+                if (i < firstBoundarySegment.size() - 1 || !firstBoundarySegmentEndsInEven || connect_zigzags) // only add last element if connect_zigzags or boundary segment ends in uneven scanline
+                    addLine(firstBoundarySegment[i-1], firstBoundarySegment[i]);
+            }   
         }
-        idx += 1;
-    }
+        else if (!firstBoundarySegmentEndsInEven)
+            addLine(firstBoundarySegment[firstBoundarySegment.size()-2], firstBoundarySegment[firstBoundarySegment.size()-1]);
+    } 
+    
+    if (cutList.size() == 0) return;
+    if (connect_zigzags && cutList.size() == 1 && cutList[0].size() <= 2) return;  // don't add connection if boundary already contains whole outline!
+    
+    addLineInfill(result, matrix, scanline_min_idx, lineSpacing, boundary, cutList, extrusionWidth);
 }
 
+
+void generateZigZagIninfill_noEndPieces(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation)
+{
+    if (in_outline.size() == 0) return;
+    Polygons outline = in_outline.offset(extrusionWidth * infillOverlap / 100 - extrusionWidth / 2);
+    if (outline.size() == 0) return;
+    
+    PointMatrix matrix(rotation);
+    
+    outline.applyMatrix(matrix);
+    
+    auto addLine = [&](Point from, Point to)
+    {            
+        PolygonRef p = result.newPoly();
+        p.add(matrix.unapply(from));
+        p.add(matrix.unapply(to));
+    };   
+        
+    AABB boundary(outline);
+    
+    int scanline_min_idx = boundary.min.X / lineSpacing;
+    int lineCount = (boundary.max.X + (lineSpacing - 1)) / lineSpacing - scanline_min_idx;
+    
+    std::vector<std::vector<int64_t> > cutList; // mapping from scanline to all intersections with polygon segments
+    
+    for(int n=0; n<lineCount; n++)
+        cutList.push_back(std::vector<int64_t>());
+    for(unsigned int polyNr=0; polyNr < outline.size(); polyNr++)
+    {
+        std::vector<Point> firstBoundarySegment;
+        std::vector<Point> boundarySegment;
+        
+        bool isFirstBoundarySegment = true;
+        bool firstBoundarySegmentEndsInEven;
+        
+        bool isEvenScanSegment = false; 
+        
+        
+        Point p0 = outline[polyNr][outline[polyNr].size()-1];
+        for(unsigned int i=0; i < outline[polyNr].size(); i++)
+        {
+            Point p1 = outline[polyNr][i];
+            int64_t xMin = p1.X, xMax = p0.X;
+            if (xMin == xMax) {
+                p0 = p1;
+                continue; 
+            }
+            if (xMin > xMax) { xMin = p0.X; xMax = p1.X; }
+            
+            int scanline_idx0 = (p0.X + ((p0.X > 0)? -1 : -lineSpacing)) / lineSpacing; // -1 cause a linesegment on scanline x counts as belonging to scansegment x-1   ...
+            int scanline_idx1 = (p1.X + ((p1.X > 0)? -1 : -lineSpacing)) / lineSpacing; // -linespacing because a line between scanline -n and -n-1 belongs to scansegment -n-1 (for n=positive natural number)
+            int direction = 1;
+            if (p0.X > p1.X) 
+            { 
+                direction = -1; 
+                scanline_idx1 += 1; // only consider the scanlines in between the scansegments
+            } else scanline_idx0 += 1; // only consider the scanlines in between the scansegments
+            
+            
+            if (isFirstBoundarySegment) firstBoundarySegment.push_back(p0);
+            else boundarySegment.push_back(p0);
+            for(int scanline_idx = scanline_idx0; scanline_idx != scanline_idx1+direction; scanline_idx+=direction)
+            {
+                int x = scanline_idx * lineSpacing;
+                int y = p1.Y + (p0.Y - p1.Y) * (x - p1.X) / (p0.X - p1.X);
+                cutList[scanline_idx - scanline_min_idx].push_back(y);
+                
+                
+                bool last_isEvenScanSegment = isEvenScanSegment;
+                if (scanline_idx % 2 == 0) isEvenScanSegment = true;
+                else isEvenScanSegment = false;
+                
+                if (!isFirstBoundarySegment)
+                {
+                    if (last_isEvenScanSegment && !isEvenScanSegment)
+                    { // add whole boundarySegment (including the just obtained point)
+                        for (unsigned int p = 1; p < boundarySegment.size(); p++)
+                        {
+                            addLine(boundarySegment[p-1], boundarySegment[p]);
+                        }
+                        addLine(boundarySegment[boundarySegment.size()-1], Point(x,y));
+                        boundarySegment.clear();
+                    } 
+                    else if (isEvenScanSegment) // we are either in an end piece or an uneven boundary segment
+                    {
+                        boundarySegment.clear();
+                        boundarySegment.emplace_back(x,y);
+                    } else
+                        boundarySegment.clear();
+                        
+                }
+                
+                if (isFirstBoundarySegment) 
+                {
+                    firstBoundarySegment.emplace_back(x,y);
+                    firstBoundarySegmentEndsInEven = isEvenScanSegment;
+                    isFirstBoundarySegment = false;
+                    boundarySegment.emplace_back(x,y);
+                }
+                
+            }
+            if (!isFirstBoundarySegment && isEvenScanSegment)
+                boundarySegment.push_back(p1);
+            
+            
+            p0 = p1;
+        }
+        
+        if (!isFirstBoundarySegment && isEvenScanSegment && !firstBoundarySegmentEndsInEven)
+        {
+            for (unsigned int i = 1; i < firstBoundarySegment.size() ; i++)
+                addLine(firstBoundarySegment[i-1], firstBoundarySegment[i]);
+        }
+    } 
+    
+
+    addLineInfill(result, matrix, scanline_min_idx, lineSpacing, boundary, cutList, extrusionWidth);
+
+}
+
+
 }//namespace cura

src/infill.h

@@ -3,14 +3,49 @@
 #define INFILL_H
 
 #include "utils/polygon.h"
+#include "settings.h"
 
 namespace cura {
 
-void generateConcentricInfill(Polygons outline, Polygons& result, int inset_value);
-void generateAutomaticInfill(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, int infillOverlap, double rotation);
-void generateGridInfill(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, int infillOverlap, double rotation);
-void generateLineInfill(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, int infillOverlap, double rotation);
+class Infill 
+{
+    EFillMethod pattern;
+    const Polygons& in_outline;
+    int outlineOffset;
+    bool avoidOverlappingPerimeters;
+    int extrusion_width;
+    int line_distance;
+    double infill_overlap;
+    double fill_angle;
+    bool connect_zigzags;
+    bool use_endPieces;
 
+public:
+    Infill(EFillMethod pattern, const Polygons& in_outline, int outlineOffset, bool avoidOverlappingPerimeters, int extrusion_width, int line_distance, double infill_overlap, double fill_angle, bool connect_zigzags, bool use_endPieces)
+    : pattern(pattern)
+    , in_outline(in_outline)
+    , outlineOffset(outlineOffset)
+    , avoidOverlappingPerimeters(avoidOverlappingPerimeters)
+    , extrusion_width(extrusion_width)
+    , line_distance(line_distance)
+    , infill_overlap(infill_overlap)
+    , fill_angle(fill_angle)
+    , connect_zigzags(connect_zigzags)
+    , use_endPieces(use_endPieces)
+    {
+    }
+    void generate(Polygons& result_polygons, Polygons& result_lines, Polygons* in_between);
+};
+    
+void generateInfill(EFillMethod pattern, const Polygons& in_outline, int outlineOffset, Polygons& result_polygons, Polygons& result_lines, Polygons* in_between, bool avoidOverlappingPerimeters, int extrusion_width, int line_distance, double infill_overlap, double fill_angle, bool connect_zigzags, bool use_endPieces);
+void generateConcentricInfill(Polygons outline, Polygons& result, int inset_value);
+void generateConcentricInfillDense(Polygons outline, Polygons& result, Polygons* in_between, int extrusionWidth, bool avoidOverlappingPerimeters);
+void generateGridInfill(const Polygons& in_outline, int outlineOffset, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation);
+void generateTriangleInfill(const Polygons& in_outline, int outlineOffset, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation);
+void generateLineInfill(const Polygons& in_outline, int outlineOffset, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation);
+void generateZigZagInfill(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation, bool connect_zigzags, bool use_endPieces);
+void generateZigZagIninfill_endPieces(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation, bool connect_zigzags);
+void generateZigZagIninfill_noEndPieces(const Polygons& in_outline, Polygons& result, int extrusionWidth, int lineSpacing, double infillOverlap, double rotation);
 }//namespace cura
 
 #endif//INFILL_H

src/inset.cpp

@@ -1,12 +1,10 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
 #include "inset.h"
-#include "polygonOptimizer.h"
-
+#include "utils/polygonUtils.h"
 namespace cura {
 
-void generateInsets(SliceLayerPart* part, int offset, int insetCount)
+void generateInsets(SliceLayerPart* part, int nozzle_width, int line_width_0, int line_width_x, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters)
 {
-    part->combBoundery = part->outline.offset(-offset);
     if (insetCount == 0)
     {
         part->insets.push_back(part->outline);
@@ -16,8 +14,36 @@ void generateInsets(SliceLayerPart* part, int offset, int insetCount)
     for(int i=0; i<insetCount; i++)
     {
         part->insets.push_back(Polygons());
-        part->insets[i] = part->outline.offset(-offset * i - offset/2);
-        optimizePolygons(part->insets[i]);
+        if (i == 0)
+        {
+            if (line_width_0 < nozzle_width)
+            {
+                PolygonUtils::offsetSafe(part->outline, - nozzle_width/2, line_width_0, part->insets[0], avoidOverlappingPerimeters_0);
+            }
+            else 
+            {
+                PolygonUtils::offsetSafe(part->outline, - line_width_0/2, line_width_0, part->insets[0], avoidOverlappingPerimeters_0);
+            }
+        } else if (i == 1)
+        {
+            if (line_width_0 < nozzle_width)
+            {
+                int offset_from_first_boundary_for_edge_of_outer_wall = -nozzle_width/2; 
+                // ideally this /\ should be: nozzle_width/2 - line_width_0; however, factually, the nozzle will fill up part of the perimeter gaps
+                PolygonUtils::offsetSafe(part->insets[0], nozzle_width/2 - line_width_0 - line_width_x/2, offset_from_first_boundary_for_edge_of_outer_wall, line_width_x, part->insets[1], &part->perimeterGaps, avoidOverlappingPerimeters);
+            }
+            else 
+            {
+                PolygonUtils::offsetSafe(part->insets[0], -line_width_0/2 - line_width_x/2, -line_width_0/2, line_width_x, part->insets[1], &part->perimeterGaps, avoidOverlappingPerimeters);
+            }
+        } else
+        {
+            PolygonUtils::offsetExtrusionWidth(part->insets[i-1], true, line_width_x, part->insets[i], &part->perimeterGaps, avoidOverlappingPerimeters);
+        }
+        
+        
+        //Finally optimize all the polygons. Every point removed saves time in the long run.
+        part->insets[i].simplify();
         if (part->insets[i].size() < 1)
         {
             part->insets.pop_back();
@@ -26,11 +52,11 @@ void generateInsets(SliceLayerPart* part, int offset, int insetCount)
     }
 }
 
-void generateInsets(SliceLayer* layer, int offset, int insetCount)
+void generateInsets(SliceLayer* layer, int nozzle_width, int line_width_0, int line_width_x, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters)
 {
     for(unsigned int partNr = 0; partNr < layer->parts.size(); partNr++)
     {
-        generateInsets(&layer->parts[partNr], offset, insetCount);
+        generateInsets(&layer->parts[partNr], nozzle_width, line_width_0, line_width_x, insetCount, avoidOverlappingPerimeters_0, avoidOverlappingPerimeters);
     }
     
     //Remove the parts which did not generate an inset. As these parts are too small to print,

src/inset.h

@@ -4,11 +4,37 @@
 
 #include "sliceDataStorage.h"
 
-namespace cura {
+namespace cura 
+{
 
-void generateInsets(SliceLayerPart* part, int offset, int insetCount);
+/*!
+ * Generates the insets / perimeters for a single layer part.
+ * 
+ * \param part The part for which to generate the insets.
+ * \param nozzle_width The diameter of the hole in the nozzle
+ * \param line_width_0 line width of the outer wall
+ * \param line_width_x line width of other walls
+ * \param insetCount The number of insets to to generate
+ * \param avoidOverlappingPerimeters_0 Whether to remove the parts of the first perimeters where it have overlap with itself (and store the gaps thus created in the \p storage)
+ * \param avoidOverlappingPerimeters Whether to remove the parts of two consecutive perimeters where they have overlap (and store the gaps thus created in the \p part)
+ */
+void generateInsets(SliceLayerPart* part, int nozzle_width, int line_width_0, int line_width_x, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters);
 
-void generateInsets(SliceLayer* layer, int offset, int insetCount);
+/*!
+ * Generates the insets / perimeters for all parts in a layer.
+ * 
+ * Note that the second inset gets offsetted by \p line_width_0 instead of the first, 
+ * which leads to better results for a smaller \p line_width_0 than \p line_width_x and when printing the outer wall last.
+ * 
+ * \param layer The layer for which to generate the insets.
+ * \param nozzle_width The diameter of the hole in the nozzle
+ * \param line_width_0 line width of the outer wall
+ * \param line_width_x line width of other walls
+ * \param insetCount The number of insets to to generate
+ * \param avoidOverlappingPerimeters_0 Whether to remove the parts of the first perimeters where it have overlap with itself (and store the gaps thus created in the \p storage)
+ * \param avoidOverlappingPerimeters Whether to remove the parts of two consecutive perimeters where they have overlap (and store the gaps thus created in the \p part)
+ */ 
+void generateInsets(SliceLayer* layer, int nozzle_width, int line_width_0, int line_width_x, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters);
 
 }//namespace cura
 

src/layerPart.cpp

@@ -1,8 +1,10 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include <stdio.h>
 
 #include "layerPart.h"
 #include "settings.h"
+#include "Progress.h"
+
+#include "utils/SVG.h" // debug output
 
 /*
 The layer-part creation step is the first step in creating actual useful data for 3D printing.
@@ -11,18 +13,18 @@ each of these groups is called a "part", which sometimes are also known as "isla
 isolated areas in the 2D layer with possible holes.
 
 Creating "parts" is an important step, as all elements in a single part should be printed before going to another part.
-And all every bit inside a single part can be printed without the nozzle leaving the boundery of this part.
+And all every bit inside a single part can be printed without the nozzle leaving the boundary of this part.
 
 It's also the first step that stores the result in the "data storage" so all other steps can access it.
 */
 
 namespace cura {
 
-void createLayerWithParts(SliceLayer& storageLayer, SlicerLayer* layer, int unionAllType)
+void createLayerWithParts(SliceLayer& storageLayer, SlicerLayer* layer, bool union_layers, bool union_all_remove_holes)
 {
-    storageLayer.openLines = layer->openPolygons;
+    storageLayer.openPolyLines = layer->openPolylines;
 
-    if (unionAllType & FIX_HORRIBLE_UNION_ALL_TYPE_B)
+    if (union_all_remove_holes)
     {
         for(unsigned int i=0; i<layer->polygonList.size(); i++)
         {
@@ -31,67 +33,65 @@ void createLayerWithParts(SliceLayer& storageLayer, SlicerLayer* layer, int unio
         }
     }
     
-    vector<Polygons> result;
-    if (unionAllType & FIX_HORRIBLE_UNION_ALL_TYPE_C)
-        result = layer->polygonList.offset(1000).splitIntoParts(unionAllType);
-    else
-        result = layer->polygonList.splitIntoParts(unionAllType);
+    std::vector<PolygonsPart> result;
+    result = layer->polygonList.splitIntoParts(union_layers || union_all_remove_holes);
     for(unsigned int i=0; i<result.size(); i++)
     {
-        storageLayer.parts.push_back(SliceLayerPart());
-        if (unionAllType & FIX_HORRIBLE_UNION_ALL_TYPE_C)
-        {
-            storageLayer.parts[i].outline.add(result[i][0]);
-            storageLayer.parts[i].outline = storageLayer.parts[i].outline.offset(-1000);
-        }else
-            storageLayer.parts[i].outline = result[i];
+        storageLayer.parts.emplace_back();
+        storageLayer.parts[i].outline = result[i];
         storageLayer.parts[i].boundaryBox.calculate(storageLayer.parts[i].outline);
     }
 }
-
-void createLayerParts(SliceVolumeStorage& storage, Slicer* slicer, int unionAllType)
+void createLayerParts(SliceMeshStorage& storage, Slicer* slicer, bool union_layers, bool union_all_remove_holes)
 {
-    for(unsigned int layerNr = 0; layerNr < slicer->layers.size(); layerNr++)
+    for(unsigned int layer_nr = 0; layer_nr < slicer->layers.size(); layer_nr++)
     {
         storage.layers.push_back(SliceLayer());
-        storage.layers[layerNr].sliceZ = slicer->layers[layerNr].z;
-        storage.layers[layerNr].printZ = slicer->layers[layerNr].z;
-        createLayerWithParts(storage.layers[layerNr], &slicer->layers[layerNr], unionAllType);
+        storage.layers[layer_nr].sliceZ = slicer->layers[layer_nr].z;
+        storage.layers[layer_nr].printZ = slicer->layers[layer_nr].z;
+        createLayerWithParts(storage.layers[layer_nr], &slicer->layers[layer_nr], union_layers, union_all_remove_holes);
     }
 }
 
-void dumpLayerparts(SliceDataStorage& storage, const char* filename)
+void layerparts2HTML(SliceDataStorage& storage, const char* filename, bool all_layers, int layer_nr)
 {
+    
     FILE* out = fopen(filename, "w");
     fprintf(out, "<!DOCTYPE html><html><body>");
-    Point3 modelSize = storage.modelSize;
-    Point3 modelMin = storage.modelMin;
+    Point3 modelSize = storage.model_size;
+    Point3 modelMin = storage.model_min;
     
-    for(unsigned int volumeIdx=0; volumeIdx<storage.volumes.size(); volumeIdx++)
+    Point model_min_2d = Point(modelMin.x, modelMin.y);
+    Point model_max_2d = Point(modelSize.x, modelSize.y) + model_min_2d;
+    AABB aabb(model_min_2d, model_max_2d);
+    
+    SVG svg(filename, aabb);
+    
+    for(SliceMeshStorage& mesh : storage.meshes)
     {
-        for(unsigned int layerNr=0;layerNr<storage.volumes[volumeIdx].layers.size(); layerNr++)
+        for(unsigned int layer_idx = 0; layer_idx < mesh.layers.size(); layer_idx++)
         {
-            fprintf(out, "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"width: 500px; height:500px\">\n");
-            SliceLayer* layer = &storage.volumes[volumeIdx].layers[layerNr];
-            for(unsigned int i=0;i<layer->parts.size();i++)
+            if (!(all_layers || int(layer_idx) == layer_nr)) { continue; }
+            SliceLayer& layer = mesh.layers[layer_idx];
+//             fprintf(out, "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"width: 500px; height:500px\">\n");
+            for(SliceLayerPart& part : layer.parts)
             {
-                SliceLayerPart* part = &layer->parts[i];
-                for(unsigned int j=0;j<part->outline.size();j++)
-                {
-                    fprintf(out, "<polygon points=\"");
-                    for(unsigned int k=0;k<part->outline[j].size();k++)
-                        fprintf(out, "%f,%f ", float(part->outline[j][k].X - modelMin.x)/modelSize.x*500, float(part->outline[j][k].Y - modelMin.y)/modelSize.y*500);
-                    if (j == 0)
-                        fprintf(out, "\" style=\"fill:gray; stroke:black;stroke-width:1\" />\n");
-                    else
-                        fprintf(out, "\" style=\"fill:red; stroke:black;stroke-width:1\" />\n");
-                }
+                svg.writeAreas(part.outline);
+                svg.writePoints(part.outline);
+//                 for(unsigned int j=0;j<part.outline.size();j++)
+//                 {
+//                     fprintf(out, "<polygon points=\"");
+//                     for(unsigned int k=0;k<part.outline[j].size();k++)
+//                         fprintf(out, "%f,%f ", float(part.outline[j][k].X - modelMin.x)/modelSize.x*500, float(part.outline[j][k].Y - modelMin.y)/modelSize.y*500);
+//                     if (j == 0)
+//                         fprintf(out, "\" style=\"fill:gray; stroke:black;stroke-width:1\" />\n");
+//                     else
+//                         fprintf(out, "\" style=\"fill:red; stroke:black;stroke-width:1\" />\n");
+//                 }
             }
-            fprintf(out, "</svg>\n");
+//             fprintf(out, "</svg>\n");
         }
     }
-    fprintf(out, "</body></html>");
-    fclose(out);
 }
 
 }//namespace cura

src/layerPart.h

@@ -4,6 +4,7 @@
 
 #include "sliceDataStorage.h"
 #include "slicer.h"
+#include "commandSocket.h"
 
 /*
 The layer-part creation step is the first step in creating actual useful data for 3D printing.
@@ -12,18 +13,18 @@ each of these groups is called a "part", which sometimes are also known as "isla
 isolated areas in the 2D layer with possible holes.
 
 Creating "parts" is an important step, as all elements in a single part should be printed before going to another part.
-And all every bit inside a single part can be printed without the nozzle leaving the boundery of this part.
+And all every bit inside a single part can be printed without the nozzle leaving the boundary of this part.
 
 It's also the first step that stores the result in the "data storage" so all other steps can access it.
 */
 
 namespace cura {
 
-void createLayerWithParts(SliceLayer& storageLayer, SlicerLayer* layer, int unionAllType);
+void createLayerWithParts(SliceLayer& storageLayer, SlicerLayer* layer, bool union_layers, bool union_all_remove_holes);
 
-void createLayerParts(SliceVolumeStorage& storage, Slicer* slicer, int unionAllType);
+void createLayerParts(SliceMeshStorage& storage, Slicer* slicer, bool union_layers, bool union_all_remove_holes);
 
-void dumpLayerparts(SliceDataStorage& storage, const char* filename);
+void layerparts2HTML(SliceDataStorage& storage, const char* filename, bool all_layers = true, int layer_nr = -1);
 
 }//namespace cura
 

src/main.cpp

@@ -13,30 +13,39 @@
 
 #include "utils/gettime.h"
 #include "utils/logoutput.h"
-#include "sliceDataStorage.h"
+#include "utils/string.h"
 
-#include "modelFile/modelFile.h"
-#include "settings.h"
-#include "optimizedModel.h"
-#include "multiVolumes.h"
-#include "polygonOptimizer.h"
-#include "slicer.h"
-#include "layerPart.h"
-#include "inset.h"
-#include "skin.h"
-#include "infill.h"
-#include "bridge.h"
-#include "support.h"
-#include "pathOrderOptimizer.h"
-#include "skirt.h"
-#include "raft.h"
-#include "comb.h"
-#include "gcodeExport.h"
-#include "fffProcessor.h"
+#include "FffProcessor.h"
+#include "settingRegistry.h"
 
+namespace cura
+{
+    
 void print_usage()
 {
-    cura::logError("usage: CuraEngine [-h] [-v] [-m 3x3matrix] [-c <config file>] [-s <settingkey>=<value>] -o <output.gcode> <model.stl>\n");
+    cura::logError("\n");
+    cura::logError("usage:\n");
+    cura::logError("CuraEngine help\n");
+    cura::logError("\tShow this help message\n");
+    cura::logError("\n");
+    cura::logError("CuraEngine connect <host>[:<port>] [-j <settings.json>]\n");
+    cura::logError("  --connect <host>[:<port>]\n\tConnect to <host> via a command socket, \n\tinstead of passing information via the command line\n");
+    cura::logError("  -j\n\tLoad settings.json file to register all settings and their defaults\n");
+    cura::logError("\n");
+    cura::logError("CuraEngine slice [-v] [-p] [-j <settings.json>] [-s <settingkey>=<value>] [-g] [-e] [-o <output.gcode>] [-l <model.stl>] [--next]\n");
+    cura::logError("  -v\n\tIncrease the verbose level (show log messages).\n");
+    cura::logError("  -p\n\tLog progress information.\n");
+    cura::logError("  -j\n\tLoad settings.json file to register all settings and their defaults.\n");
+    cura::logError("  -s <setting>=<value>\n\tSet a setting to a value for the last supplied object, \n\textruder train, or general settings.\n");
+    cura::logError("  -l <model_file>\n\tLoad an STL model. \n");
+    cura::logError("  -g\n\tSwitch setting focus to the current mesh group only.\n\tUsed for one-at-a-time printing.\n");
+    cura::logError("  -e\n\tAdd a new extruder train.\n");
+    cura::logError("  --next\n\tGenerate gcode for the previously supplied mesh group and append that to \n\tthe gcode of further models for one-at-a-time printing.\n");
+    cura::logError("  -o <output_file>\n\tSpecify a file to which to write the generated gcode.\n");
+    cura::logError("\n");
+    cura::logError("The settings are appended to the last supplied object:\n");
+    cura::logError("CuraEngine slice [general settings] \n\t-g [current group settings] \n\t-e [extruder train settings] \n\t-l obj_inheriting_from_last_extruder_train.stl [object settings] \n\t--next [next group settings]\n\t... etc.\n");
+    cura::logError("\n");
 }
 
 //Signal handler for a "floating point exception", which can also be integer division by zero errors.
@@ -47,6 +56,218 @@ void signal_FPE(int n)
     exit(1);
 }
 
+void print_call(int argc, char **argv)
+{
+    cura::logError("Command called:\n");
+    for (int idx= 0; idx < argc; idx++)
+        cura::logError("%s ", argv[idx]);
+    cura::logError("\n");
+}
+
+void connect(int argc, char **argv)
+{
+    CommandSocket* commandSocket = new CommandSocket();
+    std::string ip;
+    int port = 49674;
+    
+    std::string ip_port(argv[2]);
+    if (ip_port.find(':') != std::string::npos)
+    {
+        ip = ip_port.substr(0, ip_port.find(':'));
+        port = std::stoi(ip_port.substr(ip_port.find(':') + 1).data());
+    }
+
+    
+    for(int argn = 3; argn < argc; argn++)
+    {
+        char* str = argv[argn];
+        if (str[0] == '-')
+        {
+            for(str++; *str; str++)
+            {
+                switch(*str)
+                {
+                case 'v':
+                    cura::increaseVerboseLevel();
+                    break;
+                case 'j':
+                    argn++;
+                    if (SettingRegistry::getInstance()->loadJSONsettings(argv[argn]))
+                    {
+                        cura::logError("ERROR: Failed to load json file: %s\n", argv[argn]);
+                    }
+                    break;
+                default:
+                    cura::logError("Unknown option: %c\n", *str);
+                    print_call(argc, argv);
+                    print_usage();
+                    break;
+                }
+            }
+        }
+    }
+    
+    commandSocket->connect(ip, port);
+}
+
+void slice(int argc, char **argv)
+{   
+    FffProcessor::getInstance()->time_keeper.restart();
+    
+    FMatrix3x3 transformation; // the transformation applied to a model when loaded
+                        
+    MeshGroup meshgroup(FffProcessor::getInstance());
+    
+    int extruder_train_nr = 0;
+
+    SettingsBase* last_extruder_train = meshgroup.getExtruderTrain(0);
+    SettingsBase* last_settings_object = FffProcessor::getInstance();
+    for(int argn = 2; argn < argc; argn++)
+    {
+        char* str = argv[argn];
+        if (str[0] == '-')
+        {
+            if (str[1] == '-')
+            {
+                if (stringcasecompare(str, "--next") == 0)
+                {
+                    try {
+                        //Catch all exceptions, this prevents the "something went wrong" dialog on windows to pop up on a thrown exception.
+                        // Only ClipperLib currently throws exceptions. And only in case that it makes an internal error.
+                        meshgroup.finalize();
+                        log("Loaded from disk in %5.3fs\n", FffProcessor::getInstance()->time_keeper.restart());
+                        
+                        for (int extruder_nr = 0; extruder_nr < FffProcessor::getInstance()->getSettingAsCount("machine_extruder_count"); extruder_nr++)
+                        { // initialize remaining extruder trains and load the defaults
+                            meshgroup.getExtruderTrain(extruder_nr)->setExtruderTrainDefaults(extruder_nr); // also initializes yet uninitialized extruder trains
+                        }
+                        //start slicing
+                        FffProcessor::getInstance()->processMeshGroup(&meshgroup);
+                        
+                        // initialize loading of new meshes
+                        FffProcessor::getInstance()->time_keeper.restart();
+                        meshgroup = MeshGroup(FffProcessor::getInstance());
+                        last_settings_object = &meshgroup;
+                    }catch(...){
+                        cura::logError("Unknown exception\n");
+                        exit(1);
+                    }
+                    break;
+                }else{
+                    cura::logError("Unknown option: %s\n", str);
+                }
+            }else{
+                for(str++; *str; str++)
+                {
+                    switch(*str)
+                    {
+                    case 'v':
+                        cura::increaseVerboseLevel();
+                        break;
+                    case 'p':
+                        cura::enableProgressLogging();
+                        break;
+                    case 'j':
+                        argn++;
+                        if (SettingRegistry::getInstance()->loadJSONsettings(argv[argn]))
+                        {
+                            cura::logError("ERROR: Failed to load json file: %s\n", argv[argn]);
+                        }
+                        break;
+                    case 'e':
+                        str++;
+                        extruder_train_nr = int(*str - '0'); // TODO: parse int instead (now "-e10"="-e:" , "-e11"="-e;" , "-e12"="-e<" .. etc) 
+                        last_settings_object = meshgroup.getExtruderTrain(extruder_train_nr);
+                        last_extruder_train = meshgroup.getExtruderTrain(extruder_train_nr);
+                        break;
+                    case 'l':
+                        argn++;
+                        
+                        log("Loading %s from disk...\n", argv[argn]);
+                        // transformation = // TODO: get a transformation from somewhere
+                        
+                        if (!loadMeshIntoMeshGroup(&meshgroup, argv[argn], transformation, last_extruder_train))
+                        {
+                            logError("Failed to load model: %s\n", argv[argn]);
+                        }
+                        else 
+                        {
+                            last_settings_object = &(meshgroup.meshes.back()); // pointer is valid until a new object is added, so this is OK
+                        }
+                        break;
+                    case 'o':
+                        argn++;
+                        if (!FffProcessor::getInstance()->setTargetFile(argv[argn]))
+                        {
+                            cura::logError("Failed to open %s for output.\n", argv[argn]);
+                            exit(1);
+                        }
+                        break;
+                    case 'g':
+                        last_settings_object = &meshgroup;
+                    case 's':
+                        {
+                            //Parse the given setting and store it.
+                            argn++;
+                            char* valuePtr = strchr(argv[argn], '=');
+                            if (valuePtr)
+                            {
+                                *valuePtr++ = '\0';
+
+                                last_settings_object->setSetting(argv[argn], valuePtr);
+                            }
+                        }
+                        break;
+                    default:
+                        cura::logError("Unknown option: %c\n", *str);
+                        print_call(argc, argv);
+                        print_usage();
+                        exit(1);
+                        break;
+                    }
+                }
+            }
+        }
+        else
+        {
+            
+            cura::logError("Unknown option: %s\n", argv[argn]);
+            print_call(argc, argv);
+            print_usage();
+            exit(1);
+        }
+    }
+
+    for (extruder_train_nr = 0; extruder_train_nr < FffProcessor::getInstance()->getSettingAsCount("machine_extruder_count"); extruder_train_nr++)
+    { // initialize remaining extruder trains and load the defaults
+        meshgroup.getExtruderTrain(extruder_train_nr)->setExtruderTrainDefaults(extruder_train_nr); // also initializes yet uninitialized extruder trains
+    }
+    
+    
+#ifndef DEBUG
+    try {
+#endif
+        //Catch all exceptions, this prevents the "something went wrong" dialog on windows to pop up on a thrown exception.
+        // Only ClipperLib currently throws exceptions. And only in case that it makes an internal error.
+        meshgroup.finalize();
+        log("Loaded from disk in %5.3fs\n", FffProcessor::getInstance()->time_keeper.restart());
+        
+        //start slicing
+        FffProcessor::getInstance()->processMeshGroup(&meshgroup);
+        
+#ifndef DEBUG
+    }catch(...){
+        cura::logError("Unknown exception\n");
+        exit(1);
+    }
+#endif
+    //Finalize the processor, this adds the end.gcode. And reports statistics.
+    FffProcessor::getInstance()->finalize();
+    
+}
+
+}//namespace cura
+
 using namespace cura;
 
 int main(int argc, char **argv)
@@ -56,147 +277,58 @@ int main(int argc, char **argv)
     setpriority(PRIO_PROCESS, 0, 10);
 #endif
 
+#ifndef DEBUG
     //Register the exception handling for arithmic exceptions, this prevents the "something went wrong" dialog on windows to pop up on a division by zero.
     signal(SIGFPE, signal_FPE);
+#endif
 
-    ConfigSettings config;
-    fffProcessor processor(config);
-    std::vector<std::string> files;
+    Progress::init();
+    
+    
+    logCopyright("\n");
+    logCopyright("Cura_SteamEngine version %s\n", VERSION);
+    logCopyright("Copyright (C) 2014 David Braam\n");
+    logCopyright("\n");
+    logCopyright("This program is free software: you can redistribute it and/or modify\n");
+    logCopyright("it under the terms of the GNU Affero General Public License as published by\n");
+    logCopyright("the Free Software Foundation, either version 3 of the License, or\n");
+    logCopyright("(at your option) any later version.\n");
+    logCopyright("\n");
+    logCopyright("This program is distributed in the hope that it will be useful,\n");
+    logCopyright("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
+    logCopyright("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");
+    logCopyright("GNU Affero General Public License for more details.\n");
+    logCopyright("\n");
+    logCopyright("You should have received a copy of the GNU Affero General Public License\n");
+    logCopyright("along with this program.  If not, see <http://www.gnu.org/licenses/>.\n");
 
-    cura::logError("Cura_SteamEngine version %s\n", VERSION);
-    cura::logError("Copyright (C) 2014 David Braam\n");
-    cura::logError("\n");
-    cura::logError("This program is free software: you can redistribute it and/or modify\n");
-    cura::logError("it under the terms of the GNU Affero General Public License as published by\n");
-    cura::logError("the Free Software Foundation, either version 3 of the License, or\n");
-    cura::logError("(at your option) any later version.\n");
-    cura::logError("\n");
-    cura::logError("This program is distributed in the hope that it will be useful,\n");
-    cura::logError("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
-    cura::logError("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");
-    cura::logError("GNU Affero General Public License for more details.\n");
-    cura::logError("\n");
-    cura::logError("You should have received a copy of the GNU Affero General Public License\n");
-    cura::logError("along with this program.  If not, see <http://www.gnu.org/licenses/>.\n");
 
-    if(!config.readSettings()) {
-        cura::logError("Default config '%s' not used\n", DEFAULT_CONFIG_PATH);
-    }
-    for(int argn = 1; argn < argc; argn++)
-        cura::log("Arg: %s\n", argv[argn]);
-
-    for(int argn = 1; argn < argc; argn++)
+    if (argc < 2)
     {
-        char* str = argv[argn];
-        if (str[0] == '-')
-        {
-            for(str++; *str; str++)
-            {
-                switch(*str)
-                {
-                case 'h':
-                    print_usage();
-                    exit(1);
-                case 'v':
-                    cura::increaseVerboseLevel();
-                    break;
-                case 'p':
-                    cura::enableProgressLogging();
-                    break;
-                case 'g':
-                    argn++;
-                    //Connect the GUI socket to the given port number.
-                    processor.guiConnect(atoi(argv[argn]));
-                    break;
-                case 'b':
-                    argn++;
-                    //The binaryMeshBlob is depricated and will be removed in the future.
-                    binaryMeshBlob = fopen(argv[argn], "rb");
-                    break;
-                case 'o':
-                    argn++;
-                    if (!processor.setTargetFile(argv[argn]))
-                    {
-                        cura::logError("Failed to open %s for output.\n", argv[argn]);
-                        exit(1);
-                    }
-                    break;
-                case 'c':
-                    {
-                        // Read a config file from the given path
-                        argn++;
-                        if(!config.readSettings(argv[argn])) {
-                            cura::logError("Failed to read config '%s'\n", argv[argn]);
-                        }
-                    }
-                    break;
-                case 's':
-                    {
-                        //Parse the given setting and store it.
-                        argn++;
-                        char* valuePtr = strchr(argv[argn], '=');
-                        if (valuePtr)
-                        {
-                            *valuePtr++ = '\0';
-
-                            if (!config.setSetting(argv[argn], valuePtr))
-                                cura::logError("Setting not found: %s %s\n", argv[argn], valuePtr);
-                        }
-                    }
-                    break;
-                case 'm':
-                    //Read the given rotation/scale matrix
-                    argn++;
-                    sscanf(argv[argn], "%lf,%lf,%lf,%lf,%lf,%lf,%lf,%lf,%lf",
-                        &config.matrix.m[0][0], &config.matrix.m[0][1], &config.matrix.m[0][2],
-                        &config.matrix.m[1][0], &config.matrix.m[1][1], &config.matrix.m[1][2],
-                        &config.matrix.m[2][0], &config.matrix.m[2][1], &config.matrix.m[2][2]);
-                    break;
-                case '-':
-                    try {
-                        //Catch all exceptions, this prevents the "something went wrong" dialog on windows to pop up on a thrown exception.
-                        // Only ClipperLib currently throws exceptions. And only in case that it makes an internal error.
-                        if (files.size() > 0)
-                            processor.processFile(files);
-                        files.clear();
-                    }catch(...){
-                        cura::logError("Unknown exception\n");
-                        exit(1);
-                    }
-                    break;
-                default:
-                    cura::logError("Unknown option: %c\n", *str);
-                    break;
-                }
-            }
-        }else{
-            if (argv[argn][0] == '$')
-            {
-                try {
-                    //Catch all exceptions, this prevents the "something went wrong" dialog on windows to pop up on a thrown exception.
-                    // Only ClipperLib currently throws exceptions. And only in case that it makes an internal error.
-                    std::vector<std::string> tmp;
-                    tmp.push_back(argv[argn]);
-                    processor.processFile(tmp);
-                }catch(...){
-                    cura::logError("Unknown exception\n");
-                    exit(1);
-                }
-            }else{
-                files.push_back(argv[argn]);
-            }
-        }
-    }
-    try {
-        //Catch all exceptions, this prevents the "something went wrong" dialog on windows to pop up on a thrown exception.
-        // Only ClipperLib currently throws exceptions. And only in case that it makes an internal error.
-        if (files.size() > 0)
-            processor.processFile(files);
-    }catch(...){
-        cura::logError("Unknown exception\n");
+        print_usage();
         exit(1);
     }
-    //Finalize the processor, this adds the end.gcode. And reports statistics.
-    processor.finalize();
+    
+    if (stringcasecompare(argv[1], "connect") == 0)
+    {
+        connect(argc, argv);
+    } 
+    else if (stringcasecompare(argv[1], "slice") == 0)
+    {
+        slice(argc, argv);
+    }
+    else if (stringcasecompare(argv[1], "help") == 0)
+    {
+        print_usage();
+        exit(0);
+    }
+    else
+    {
+        cura::logError("Unknown command: %s\n", argv[1]);
+        print_call(argc, argv);
+        print_usage();
+        exit(1);
+    }
+    
     return 0;
-}
+}

src/mesh.cpp

@@ -0,0 +1,182 @@
+#include "mesh.h"
+#include "utils/logoutput.h"
+
+namespace cura
+{
+
+const int vertex_meld_distance = MM2INT(0.03);
+static inline uint32_t pointHash(Point3& p)
+{
+    return ((p.x + vertex_meld_distance/2) / vertex_meld_distance) ^ (((p.y + vertex_meld_distance/2) / vertex_meld_distance) << 10) ^ (((p.z + vertex_meld_distance/2) / vertex_meld_distance) << 20);
+}
+
+Mesh::Mesh(SettingsBaseVirtual* parent)
+: SettingsBase(parent)
+{
+}
+
+void Mesh::addFace(Point3& v0, Point3& v1, Point3& v2)
+{
+    int vi0 = findIndexOfVertex(v0);
+    int vi1 = findIndexOfVertex(v1);
+    int vi2 = findIndexOfVertex(v2);
+    if (vi0 == vi1 || vi1 == vi2 || vi0 == vi2) return; // the face has two vertices which get assigned the same location. Don't add the face.
+
+    int idx = faces.size(); // index of face to be added
+    faces.emplace_back();
+    MeshFace& face = faces[idx];
+    face.vertex_index[0] = vi0;
+    face.vertex_index[1] = vi1;
+    face.vertex_index[2] = vi2;
+    vertices[face.vertex_index[0]].connected_faces.push_back(idx);
+    vertices[face.vertex_index[1]].connected_faces.push_back(idx);
+    vertices[face.vertex_index[2]].connected_faces.push_back(idx);
+}
+
+void Mesh::clear()
+{
+    faces.clear();
+    vertices.clear();
+    vertex_hash_map.clear();
+}
+
+void Mesh::finish()
+{
+    // Finish up the mesh, clear the vertex_hash_map, as it's no longer needed from this point on and uses quite a bit of memory.
+    vertex_hash_map.clear();
+
+    // For each face, store which other face is connected with it.
+    for(unsigned int i=0; i<faces.size(); i++)
+    {
+        MeshFace& face = faces[i];
+        face.connected_face_index[0] = getFaceIdxWithPoints(face.vertex_index[0], face.vertex_index[1], i); // faces are connected via the outside
+        face.connected_face_index[1] = getFaceIdxWithPoints(face.vertex_index[1], face.vertex_index[2], i);
+        face.connected_face_index[2] = getFaceIdxWithPoints(face.vertex_index[2], face.vertex_index[0], i);
+    }
+}
+
+Point3 Mesh::min()
+{
+    return aabb.min;
+}
+Point3 Mesh::max()
+{
+    return aabb.max;
+}
+
+int Mesh::findIndexOfVertex(Point3& v)
+{
+    uint32_t hash = pointHash(v);
+
+    for(unsigned int idx = 0; idx < vertex_hash_map[hash].size(); idx++)
+    {
+        if ((vertices[vertex_hash_map[hash][idx]].p - v).testLength(vertex_meld_distance))
+        {
+            return vertex_hash_map[hash][idx];
+        }
+    }
+    vertex_hash_map[hash].push_back(vertices.size());
+    vertices.emplace_back(v);
+    
+    aabb.include(v);
+    
+    return vertices.size() - 1;
+}
+
+/*!
+Returns the index of the 'other' face connected to the edge between vertices with indices idx0 and idx1.
+In case more than two faces are connected via the same edge, the next face in a counter-clockwise ordering (looking from idx1 to idx0) is returned.
+
+\cond DOXYGEN_EXCLUDE
+    [NON-RENDERED COMENTS]
+    For two faces abc and abd with normals n and m, we have that:
+    \f{eqnarray*}{
+    n &=& \frac{ab \times ac}{\|ab \times ac\|}     \\
+    m &=& \frac{ab \times ad}{\|ab \times ad\|}     \\
+    n \times m &=& \|n\| \cdot \|m\| \mathbf{p} \sin \alpha  \\
+    && (\mathbf{p} \perp n \wedge \mathbf{p} \perp m) \\
+    \sin \alpha &=& \|n \times m \|
+    &=& \left\| \frac{(ab \times ac) \times (ab \times ad)}{\|ab \times ac\| \cdot \|ab \times ad\|}  \right\|    \\
+    &=& \left\| \frac{ (ab \cdot (ac \times ad)) ab  }{\|ab \times ac\| \cdot \|ab \times ad\|}  \right\|    \\
+    &=&  \frac{ (ab \cdot (ac \times ad)) \left\| ab   \right\| }{\|ab\| \|ac\| \sin bac \cdot \|ab\| \|ad\| \sin bad}    \\
+    &=&  \frac{  ab \cdot (ac \times ad)  }{\|ab\| \|ac\| \|ad\|  \sin bac \sin bad}    \\
+    \f}}
+\endcond
+
+See <a href="http://stackoverflow.com/questions/14066933/direct-way-of-computing-clockwise-angle-between-2-vectors">Direct way of computing clockwise angle between 2 vectors</a>
+
+
+*/
+int Mesh::getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx)
+{
+    std::vector<int> candidateFaces; // in case more than two faces meet at an edge, multiple candidates are generated
+    int notFaceVertexIdx = -1; // index of the third vertex of the face corresponding to notFaceIdx
+    for(int f : vertices[idx0].connected_faces) // search through all faces connected to the first vertex and find those that are also connected to the second
+    {
+        if (f == notFaceIdx)
+        {
+            for (int i = 0; i<3; i++) // find the vertex which is not idx0 or idx1
+                if (faces[f].vertex_index[i] != idx0 && faces[f].vertex_index[i] != idx1)
+                    notFaceVertexIdx = faces[f].vertex_index[i];
+            continue;
+        }
+        if ( faces[f].vertex_index[0] == idx1 // && faces[f].vertex_index[1] == idx0 // next face should have the right direction!
+          || faces[f].vertex_index[1] == idx1 // && faces[f].vertex_index[2] == idx0
+          || faces[f].vertex_index[2] == idx1 // && faces[f].vertex_index[0] == idx0
+            )  candidateFaces.push_back(f);
+
+    }
+
+    if (candidateFaces.size() == 0) { cura::logError("Couldn't find face connected to face %i.\n", notFaceIdx); return -1; }
+    if (candidateFaces.size() == 1) { return candidateFaces[0]; }
+
+
+    if (notFaceVertexIdx < 0) { cura::logError("Couldn't find third point on face %i.\n", notFaceIdx); return -1; }
+
+    if (candidateFaces.size() % 2 == 0) cura::log("Warning! Edge with uneven number of faces connecting it!(%i)\n", candidateFaces.size()+1);
+
+    FPoint3 vn = vertices[idx1].p - vertices[idx0].p;
+    FPoint3 n = vn / vn.vSize(); // the normal of the plane in which all normals of faces connected to the edge lie => the normalized normal
+    FPoint3 v0 = vertices[idx1].p - vertices[idx0].p;
+
+// the normals below are abnormally directed! : these normals all point counterclockwise (viewed from idx1 to idx0) from the face, irrespective of the direction of the face.
+    FPoint3 n0 = FPoint3(vertices[notFaceVertexIdx].p - vertices[idx0].p).cross(v0);
+
+    if (n0.vSize() <= 0) cura::log("Warning! Face %i has zero area!", notFaceIdx);
+
+    double smallestAngle = 1000; // more then 2 PI (impossible angle)
+    int bestIdx = -1;
+
+    for (int candidateFace : candidateFaces)
+    {
+        int candidateVertex;
+        {// find third vertex belonging to the face (besides idx0 and idx1)
+            for (candidateVertex = 0; candidateVertex<3; candidateVertex++)
+                if (faces[candidateFace].vertex_index[candidateVertex] != idx0 && faces[candidateFace].vertex_index[candidateVertex] != idx1)
+                    break;
+        }
+
+        FPoint3 v1 = vertices[candidateVertex].p -vertices[idx0].p;
+        FPoint3 n1 = v1.cross(v0);
+
+        double dot = n0 * n1;
+        double det = n * n0.cross(n1);
+        double angle = std::atan2(det, dot);
+        if (angle < 0) angle += 2*M_PI; // 0 <= angle < 2* M_PI
+
+        if (angle == 0)
+        {
+            cura::log("Warning! Overlapping faces: face %i and face %i.\n", notFaceIdx, candidateFace);
+            std::cerr<< n.vSize() <<"; "<<n1.vSize()<<";"<<n0.vSize() <<std::endl;
+        }
+        if (angle < smallestAngle)
+        {
+            smallestAngle = angle;
+            bestIdx = candidateFace;
+        }
+    }
+    if (bestIdx < 0) cura::logError("Couldn't find face connected to face %i.\n", notFaceIdx);
+    return bestIdx;
+}
+
+}//namespace cura

src/mesh.h

@@ -0,0 +1,98 @@
+#ifndef MESH_H
+#define MESH_H
+
+#include "settings.h"
+#include "utils/AABB.h"
+
+namespace cura
+{
+/*!
+Vertex type to be used in a Mesh.
+
+Keeps track of which faces connect to it.
+*/
+class MeshVertex
+{
+public:
+    Point3 p; //!< location of the vertex
+    std::vector<uint32_t> connected_faces; //!< list of the indices of connected faces
+
+    MeshVertex(Point3 p) : p(p) {connected_faces.reserve(8);} //!< doesn't set connected_faces
+};
+
+/*! A MeshFace is a 3 dimensional model triangle with 3 points. These points are already converted to integers
+
+A face has 3 connected faces, corresponding to its 3 edges.
+
+Note that a correct model may have more than 2 faces connected via a single edge!
+In such a case the face_index stored in connected_face_index is the one connected via the outside; see ASCII art below:
+
+: horizontal slice through vertical edge connected to four faces :
+
+\verbatim
+[inside] x|
+         x| <--+--- faces which contain each other in their connected_face_index fiels
+   xxxxxxx|   \|/
+   -------+-------
+      ^   |xxxxxxx
+      +-->|x
+      |   |x [inside]
+      |
+    faces which contain each other in their connected_face_index fiels
+\endverbatim
+*/
+class MeshFace
+{
+public:
+    int vertex_index[3] = {-1}; //!< counter-clockwise ordering
+    int connected_face_index[3]; //!< same ordering as vertex_index (connected_face 0 is connected via vertex 0 and 1, etc.)
+};
+
+
+/*!
+A Mesh is the most basic representation of a 3D model. It contains all the faces as MeshFaces.
+
+See MeshFace for the specifics of how/when faces are connected.
+*/
+class Mesh : public SettingsBase // inherits settings
+{
+    //! The vertex_hash_map stores a index reference of each vertex for the hash of that location. Allows for quick retrieval of points with the same location.
+    std::unordered_map<uint32_t, std::vector<uint32_t> > vertex_hash_map;
+    AABB3D aabb;
+public:
+    std::vector<MeshVertex> vertices;//!< list of all vertices in the mesh
+    std::vector<MeshFace> faces; //!< list of all faces in the mesh
+
+    Mesh(SettingsBaseVirtual* parent); //!< initializes the settings
+
+    void addFace(Point3& v0, Point3& v1, Point3& v2); //!< add a face to the mesh without settings it's connected_faces.
+    void clear(); //!< clears all data
+    void finish(); //!< complete the model : set the connected_face_index fields of the faces.
+
+    Point3 min(); //!< min (in x,y and z) vertex of the bounding box
+    Point3 max(); //!< max (in x,y and z) vertex of the bounding box
+    
+    /*!
+     * Offset the whole mesh (all vertices and the bounding box).
+     * \param offset The offset byu which to offset the whole mesh.
+     */
+    void offset(Point3 offset)
+    {
+        if (offset == Point3(0,0,0)) { return; }
+        for(MeshVertex& v : vertices)
+            v.p += offset;
+        aabb.offset(offset);
+    }
+
+private:
+    int findIndexOfVertex(Point3& v); //!< find index of vertex close to the given point, or create a new vertex and return its index.
+    /*!
+    Get the index of the face connected to the face with index \p notFaceIdx, via vertices \p idx0 and \p idx1.
+    In case multiple faces connect with the same edge, return the next counter-clockwise face when viewing from \p idx1 to \p idx0.
+    */
+    int getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx);
+};
+
+}//namespace cura
+#endif//MESH_H
+

src/modelFile/modelFile.cpp

@@ -1,187 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include <string.h>
-#include <strings.h>
-#include <stdio.h>
-
-#include "modelFile.h"
-#include "../utils/logoutput.h"
-#include "../utils/string.h"
-
-FILE* binaryMeshBlob = nullptr;
-
-/* Custom fgets function to support Mac line-ends in Ascii STL files. OpenSCAD produces this when used on Mac */
-void* fgets_(char* ptr, size_t len, FILE* f)
-{
-    while(len && fread(ptr, 1, 1, f) > 0)
-    {
-        if (*ptr == '\n' || *ptr == '\r')
-        {
-            *ptr = '\0';
-            return ptr;
-        }
-        ptr++;
-        len--;
-    }
-    return nullptr;
-}
-
-SimpleModel* loadModelSTL_ascii(SimpleModel *m,const char* filename, FMatrix3x3& matrix)
-{
-    m->volumes.push_back(SimpleVolume());
-    SimpleVolume* vol = &m->volumes[m->volumes.size()-1];
-    FILE* f = fopen(filename, "rt");
-    char buffer[1024];
-    FPoint3 vertex;
-    int n = 0;
-    Point3 v0(0,0,0), v1(0,0,0), v2(0,0,0);
-    while(fgets_(buffer, sizeof(buffer), f))
-    {
-        if (sscanf(buffer, " vertex %lf %lf %lf", &vertex.x, &vertex.y, &vertex.z) == 3)
-        {
-            n++;
-            switch(n)
-            {
-            case 1:
-                v0 = matrix.apply(vertex);
-                break;
-            case 2:
-                v1 = matrix.apply(vertex);
-                break;
-            case 3:
-                v2 = matrix.apply(vertex);
-                vol->addFace(v0, v1, v2);
-                n = 0;
-                break;
-            }
-        }
-    }
-    fclose(f);
-    return m;
-}
-
-SimpleModel* loadModelSTL_binary(SimpleModel *m,const char* filename, FMatrix3x3& matrix)
-{
-    FILE* f = fopen(filename, "rb");
-    char buffer[80];
-    uint32_t faceCount;
-    //Skip the header
-    if (fread(buffer, 80, 1, f) != 1)
-    {
-        fclose(f);
-        return nullptr;
-    }
-    //Read the face count
-    if (fread(&faceCount, sizeof(uint32_t), 1, f) != 1)
-    {
-        fclose(f);
-        return nullptr;
-    }
-    //For each face read:
-    //float(x,y,z) = normal, float(X,Y,Z)*3 = vertexes, uint16_t = flags
-    m->volumes.push_back(SimpleVolume());
-    SimpleVolume* vol = &m->volumes[m->volumes.size()-1];
-	if(vol == nullptr)
-	{
-		fclose(f);
-		return nullptr;
-	}
-
-    for(unsigned int i=0;i<faceCount;i++)
-    {
-        if (fread(buffer, sizeof(float) * 3, 1, f) != 1)
-        {
-            fclose(f);
-            return nullptr;
-        }
-        float v[9];
-        if (fread(v, sizeof(float) * 9, 1, f) != 1)
-        {
-            fclose(f);
-            return nullptr;
-        }
-        Point3 v0 = matrix.apply(FPoint3(v[0], v[1], v[2]));
-        Point3 v1 = matrix.apply(FPoint3(v[3], v[4], v[5]));
-        Point3 v2 = matrix.apply(FPoint3(v[6], v[7], v[8]));
-        vol->addFace(v0, v1, v2);
-        if (fread(buffer, sizeof(uint16_t), 1, f) != 1)
-        {
-            fclose(f);
-            return nullptr;
-        }
-    }
-    fclose(f);
-    return m;
-}
-
-SimpleModel* loadModelSTL(SimpleModel *m,const char* filename, FMatrix3x3& matrix)
-{
-    FILE* f = fopen(filename, "r");
-    char buffer[6];
-    if (f == nullptr)
-        return nullptr;
-
-    if (fread(buffer, 5, 1, f) != 1)
-    {
-        fclose(f);
-        return nullptr;
-    }
-    fclose(f);
-
-    buffer[5] = '\0';
-    if (stringcasecompare(buffer, "solid") == 0)
-    {
-        SimpleModel* asciiModel = loadModelSTL_ascii(m, filename, matrix);
-        if (!asciiModel)
-            return nullptr;
-
-        // This logic is used to handle the case where the file starts with
-        // "solid" but is a binary file.
-        if (m->volumes[m->volumes.size()-1].faces.size() < 1)
-        {
-            m->volumes.erase(m->volumes.end() - 1);
-            return loadModelSTL_binary(m, filename, matrix);
-        }
-        return asciiModel;
-    }
-    return loadModelSTL_binary(m, filename, matrix);
-}
-
-SimpleModel* loadModelFromFile(SimpleModel *m,const char* filename, FMatrix3x3& matrix)
-{
-    const char* ext = strrchr(filename, '.');
-    if (ext && stringcasecompare(ext, ".stl") == 0)
-    {
-        return loadModelSTL(m,filename, matrix);
-    }
-    if (filename[0] == '#' && binaryMeshBlob != nullptr)
-    {
-        while(*filename == '#')
-        {
-            filename++;
-
-            m->volumes.push_back(SimpleVolume());
-            SimpleVolume* vol = &m->volumes[m->volumes.size()-1];
-            int32_t n, pNr = 0;
-            if (fread(&n, 1, sizeof(int32_t), binaryMeshBlob) < 1)
-                return nullptr;
-            cura::log("Reading mesh from binary blob with %i vertexes\n", n);
-            Point3 v[3];
-            while(n)
-            {
-                float f[3];
-                if (fread(f, 3, sizeof(float), binaryMeshBlob) < 1)
-                    return nullptr;
-                FPoint3 fp(f[0], f[1], f[2]);
-                v[pNr++] = matrix.apply(fp);
-                if (pNr == 3)
-                {
-                    vol->addFace(v[0], v[1], v[2]);
-                    pNr = 0;
-                }
-                n--;
-            }
-        }
-        return m;
-    }
-    return nullptr;
-}

src/modelFile/modelFile.h

@@ -1,118 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#ifndef MODELFILE_H
-#define MODELFILE_H
-/**
-modelFile contains the model loaders for the slicer. The model loader turns any format that it can read into a list of triangles with 3 X/Y/Z points.
-
-The format returned is a Model class with an array of faces, which have integer points with a resolution of 1 micron. Giving a maximum object size of 4 meters.
-**/
-
-#include <vector>
-using std::vector;
-#include "../utils/intpoint.h"
-#include "../utils/floatpoint.h"
-
-extern FILE* binaryMeshBlob;
-
-#define SET_MIN(n, m) do { if ((m) < (n)) n = m; } while(0)
-#define SET_MAX(n, m) do { if ((m) > (n)) n = m; } while(0)
-
-/* A SimpleFace is a 3 dimensional model triangle with 3 points. These points are already converted to integers */
-class SimpleFace
-{
-public:
-    Point3 v[3];
-
-    SimpleFace(Point3& v0, Point3& v1, Point3& v2) { v[0] = v0; v[1] = v1; v[2] = v2; }
-};
-
-/* A SimpleVolume is the most basic reprisentation of a 3D model. It contains all the faces as SimpleTriangles, with nothing fancy. */
-class SimpleVolume
-{
-public:
-    vector<SimpleFace> faces;
-
-    void addFace(Point3& v0, Point3& v1, Point3& v2)
-    {
-        faces.push_back(SimpleFace(v0, v1, v2));
-    }
-
-    Point3 min()
-    {
-        if (faces.size() < 1)
-            return Point3(0, 0, 0);
-        Point3 ret = faces[0].v[0];
-        for(unsigned int i=0; i<faces.size(); i++)
-        {
-            SET_MIN(ret.x, faces[i].v[0].x);
-            SET_MIN(ret.y, faces[i].v[0].y);
-            SET_MIN(ret.z, faces[i].v[0].z);
-            SET_MIN(ret.x, faces[i].v[1].x);
-            SET_MIN(ret.y, faces[i].v[1].y);
-            SET_MIN(ret.z, faces[i].v[1].z);
-            SET_MIN(ret.x, faces[i].v[2].x);
-            SET_MIN(ret.y, faces[i].v[2].y);
-            SET_MIN(ret.z, faces[i].v[2].z);
-        }
-        return ret;
-    }
-    Point3 max()
-    {
-        if (faces.size() < 1)
-            return Point3(0, 0, 0);
-        Point3 ret = faces[0].v[0];
-        for(unsigned int i=0; i<faces.size(); i++)
-        {
-            SET_MAX(ret.x, faces[i].v[0].x);
-            SET_MAX(ret.y, faces[i].v[0].y);
-            SET_MAX(ret.z, faces[i].v[0].z);
-            SET_MAX(ret.x, faces[i].v[1].x);
-            SET_MAX(ret.y, faces[i].v[1].y);
-            SET_MAX(ret.z, faces[i].v[1].z);
-            SET_MAX(ret.x, faces[i].v[2].x);
-            SET_MAX(ret.y, faces[i].v[2].y);
-            SET_MAX(ret.z, faces[i].v[2].z);
-        }
-        return ret;
-    }
-};
-
-//A SimpleModel is a 3D model with 1 or more 3D volumes.
-class SimpleModel
-{
-public:
-    vector<SimpleVolume> volumes;
-
-    Point3 min()
-    {
-        if (volumes.size() < 1)
-            return Point3(0, 0, 0);
-        Point3 ret = volumes[0].min();
-        for(unsigned int i=0; i<volumes.size(); i++)
-        {
-            Point3 v = volumes[i].min();
-            SET_MIN(ret.x, v.x);
-            SET_MIN(ret.y, v.y);
-            SET_MIN(ret.z, v.z);
-        }
-        return ret;
-    }
-    Point3 max()
-    {
-        if (volumes.size() < 1)
-            return Point3(0, 0, 0);
-        Point3 ret = volumes[0].max();
-        for(unsigned int i=0; i<volumes.size(); i++)
-        {
-            Point3 v = volumes[i].max();
-            SET_MAX(ret.x, v.x);
-            SET_MAX(ret.y, v.y);
-            SET_MAX(ret.z, v.z);
-        }
-        return ret;
-    }
-};
-
-SimpleModel* loadModelFromFile(SimpleModel*m,const char* filename, FMatrix3x3& matrix);
-
-#endif//MODELFILE_H

src/multiVolumes.cpp

@@ -0,0 +1,48 @@
+#include "multiVolumes.h"
+
+namespace cura 
+{
+ 
+void carveMultipleVolumes(std::vector<Slicer*> &volumes)
+{
+    //Go trough all the volumes, and remove the previous volume outlines from our own outline, so we never have overlapped areas.
+    for(unsigned int idx=0; idx < volumes.size(); idx++)
+    {
+        for(unsigned int idx2=0; idx2<idx; idx2++)
+        {
+            for(unsigned int layerNr=0; layerNr < volumes[idx]->layers.size(); layerNr++)
+            {
+                SlicerLayer& layer1 = volumes[idx]->layers[layerNr];
+                SlicerLayer& layer2 = volumes[idx2]->layers[layerNr];
+                layer1.polygonList = layer1.polygonList.difference(layer2.polygonList);
+            }
+        }
+    }
+}
+ 
+//Expand each layer a bit and then keep the extra overlapping parts that overlap with other volumes.
+//This generates some overlap in dual extrusion, for better bonding in touching parts.
+void generateMultipleVolumesOverlap(std::vector<Slicer*> &volumes, int overlap)
+{
+    if (volumes.size() < 2 || overlap <= 0) return;
+    
+    for(unsigned int layerNr=0; layerNr < volumes[0]->layers.size(); layerNr++)
+    {
+        Polygons fullLayer;
+        for(unsigned int volIdx = 0; volIdx < volumes.size(); volIdx++)
+        {
+            SlicerLayer& layer1 = volumes[volIdx]->layers[layerNr];
+            fullLayer = fullLayer.unionPolygons(layer1.polygonList.offset(20)); // TODO: put hard coded value in a variable with an explanatory name (and make var a parameter, and perhaps even a setting?)
+        }
+        fullLayer = fullLayer.offset(-20); // TODO: put hard coded value in a variable with an explanatory name (and make var a parameter, and perhaps even a setting?)
+        
+        for(unsigned int volIdx = 0; volIdx < volumes.size(); volIdx++)
+        {
+            SlicerLayer& layer1 = volumes[volIdx]->layers[layerNr];
+            layer1.polygonList = fullLayer.intersection(layer1.polygonList.offset(overlap / 2));
+        }
+    }
+}
+ 
+
+}//namespace cura

src/multiVolumes.h

@@ -1,61 +1,19 @@
 #ifndef MULTIVOLUMES_H
 #define MULTIVOLUMES_H
 
+#include "sliceDataStorage.h"
+#include "slicer.h"
+
 /* This file contains code to help fixing up and changing layers that are build from multiple volumes. */
 namespace cura {
 
-void carveMultipleVolumes(vector<SliceVolumeStorage> &volumes)
-{
-    //Go trough all the volumes, and remove the previous volume outlines from our own outline, so we never have overlapped areas.
-    for(unsigned int idx=0; idx < volumes.size(); idx++)
-    {
-        for(unsigned int idx2=0; idx2<idx; idx2++)
-        {
-            for(unsigned int layerNr=0; layerNr < volumes[idx].layers.size(); layerNr++)
-            {
-                SliceLayer* layer1 = &volumes[idx].layers[layerNr];
-                SliceLayer* layer2 = &volumes[idx2].layers[layerNr];
-                for(unsigned int p1 = 0; p1 < layer1->parts.size(); p1++)
-                {
-                    for(unsigned int p2 = 0; p2 < layer2->parts.size(); p2++)
-                    {
-                        layer1->parts[p1].outline = layer1->parts[p1].outline.difference(layer2->parts[p2].outline);
-                    }
-                }
-            }
-        }
-    }
-}
+void carveMultipleVolumes(std::vector<Slicer*> &meshes);
 
-//Expand each layer a bit and then keep the extra overlapping parts that overlap with other volumes.
-//This generates some overlap in dual extrusion, for better bonding in touching parts.
-void generateMultipleVolumesOverlap(vector<SliceVolumeStorage> &volumes, int overlap)
-{
-    if (volumes.size() < 2 || overlap <= 0) return;
-    
-    for(unsigned int layerNr=0; layerNr < volumes[0].layers.size(); layerNr++)
-    {
-        Polygons fullLayer;
-        for(unsigned int volIdx = 0; volIdx < volumes.size(); volIdx++)
-        {
-            SliceLayer* layer1 = &volumes[volIdx].layers[layerNr];
-            for(unsigned int p1 = 0; p1 < layer1->parts.size(); p1++)
-            {
-                fullLayer = fullLayer.unionPolygons(layer1->parts[p1].outline.offset(20));
-            }
-        }
-        fullLayer = fullLayer.offset(-20);
-        
-        for(unsigned int volIdx = 0; volIdx < volumes.size(); volIdx++)
-        {
-            SliceLayer* layer1 = &volumes[volIdx].layers[layerNr];
-            for(unsigned int p1 = 0; p1 < layer1->parts.size(); p1++)
-            {
-                layer1->parts[p1].outline = fullLayer.intersection(layer1->parts[p1].outline.offset(overlap / 2));
-            }
-        }
-    }
-}
+/*!
+ * Expand each layer a bit and then keep the extra overlapping parts that overlap with other volumes.
+ * This generates some overlap in dual extrusion, for better bonding in touching parts.
+ */
+void generateMultipleVolumesOverlap(std::vector<Slicer*> &meshes, int overlap);
 
 }//namespace cura
 

src/optimizedModel.cpp

@@ -1,123 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include <stdio.h>
-
-#include "utils/gettime.h"
-#include "utils/logoutput.h"
-#include "optimizedModel.h"
-
-#define MELD_DIST MM2INT(0.03)
-OptimizedVolume::OptimizedVolume(SimpleVolume* volume, OptimizedModel* model)
-: model(model)
-{
-    points.reserve(volume->faces.size() * 3);
-    faces.reserve(volume->faces.size());
-
-    std::map<uint32_t, std::vector<uint32_t> > indexMap;
-    
-    double t = getTime();
-    for(uint32_t i=0; i<volume->faces.size(); i++)
-    {
-        OptimizedFace f;
-        if((i%1000==0) && (getTime()-t)>2.0) cura::logProgress("optimized", i + 1, volume->faces.size());
-        for(uint32_t j=0; j<3; j++)
-        {
-            Point3 p = volume->faces[i].v[j];
-            int hash = ((p.x + MELD_DIST/2) / MELD_DIST) ^ (((p.y + MELD_DIST/2) / MELD_DIST) << 10) ^ (((p.z + MELD_DIST/2) / MELD_DIST) << 20);
-            uint32_t idx;
-            bool add = true;
-            for(unsigned int n = 0; n < indexMap[hash].size(); n++)
-            {
-                if ((points[indexMap[hash][n]].p - p).testLength(MELD_DIST))
-                {
-                    idx = indexMap[hash][n];
-                    add = false;
-                    break;
-                }
-            }
-            if (add)
-            {
-                indexMap[hash].push_back(points.size());
-                idx = points.size();
-                points.push_back(p);
-            }
-            f.index[j] = idx;
-        }
-        if (f.index[0] != f.index[1] && f.index[0] != f.index[2] && f.index[1] != f.index[2])
-        {
-            /*
-            //Check if there is a face with the same points
-            bool duplicate = false;
-            for(unsigned int _idx0 = 0; _idx0 < points[f.index[0]].faceIndexList.size(); _idx0++)
-            {
-                for(unsigned int _idx1 = 0; _idx1 < points[f.index[1]].faceIndexList.size(); _idx1++)
-                {
-                    for(unsigned int _idx2 = 0; _idx2 < points[f.index[2]].faceIndexList.size(); _idx2++)
-                    {
-                        if (points[f.index[0]].faceIndexList[_idx0] == points[f.index[1]].faceIndexList[_idx1] && points[f.index[0]].faceIndexList[_idx0] == points[f.index[2]].faceIndexList[_idx2])
-                            duplicate = true;
-                    }
-                }
-            }
-            if (!duplicate)
-            {
-            */
-            points[f.index[0]].faceIndexList.push_back(faces.size());
-            points[f.index[1]].faceIndexList.push_back(faces.size());
-            points[f.index[2]].faceIndexList.push_back(faces.size());
-            faces.push_back(f);
-            //}
-        }
-    }
-    //fprintf(stdout, "\rAll faces are optimized in %5.1fs.\n",timeElapsed(t));
-
-    int openFacesCount = 0;
-    for(unsigned int i=0;i<faces.size();i++)
-    {
-        OptimizedFace* f = &faces[i];
-        f->touching[0] = getFaceIdxWithPoints(f->index[0], f->index[1], i);
-        f->touching[1] = getFaceIdxWithPoints(f->index[1], f->index[2], i);
-        f->touching[2] = getFaceIdxWithPoints(f->index[2], f->index[0], i);
-        if (f->touching[0] == -1)
-            openFacesCount++;
-        if (f->touching[1] == -1)
-            openFacesCount++;
-        if (f->touching[2] == -1)
-            openFacesCount++;
-    }
-    //fprintf(stdout, "  Number of open faces: %i\n", openFacesCount);
-}
-
-
-void OptimizedModel::saveDebugSTL(const char* filename)
-{
-    char buffer[80] = "Cura_Engine_STL_export";
-    uint32_t n;
-    uint16_t s;
-    float flt;
-    OptimizedVolume* vol = &volumes[0];
-    FILE* f = fopen(filename, "wb");
-    fwrite(buffer, 80, 1, f);
-    n = vol->faces.size();
-    fwrite(&n, sizeof(n), 1, f);
-    for(unsigned int i=0;i<vol->faces.size();i++)
-    {
-        flt = 0;
-        s = 0;
-        fwrite(&flt, sizeof(flt), 1, f);
-        fwrite(&flt, sizeof(flt), 1, f);
-        fwrite(&flt, sizeof(flt), 1, f);
-
-        flt = INT2MM(vol->points[vol->faces[i].index[0]].p.x); fwrite(&flt, sizeof(flt), 1, f);
-        flt = INT2MM(vol->points[vol->faces[i].index[0]].p.y); fwrite(&flt, sizeof(flt), 1, f);
-        flt = INT2MM(vol->points[vol->faces[i].index[0]].p.z); fwrite(&flt, sizeof(flt), 1, f);
-        flt = INT2MM(vol->points[vol->faces[i].index[1]].p.x); fwrite(&flt, sizeof(flt), 1, f);
-        flt = INT2MM(vol->points[vol->faces[i].index[1]].p.y); fwrite(&flt, sizeof(flt), 1, f);
-        flt = INT2MM(vol->points[vol->faces[i].index[1]].p.z); fwrite(&flt, sizeof(flt), 1, f);
-        flt = INT2MM(vol->points[vol->faces[i].index[2]].p.x); fwrite(&flt, sizeof(flt), 1, f);
-        flt = INT2MM(vol->points[vol->faces[i].index[2]].p.y); fwrite(&flt, sizeof(flt), 1, f);
-        flt = INT2MM(vol->points[vol->faces[i].index[2]].p.z); fwrite(&flt, sizeof(flt), 1, f);
-
-        fwrite(&s, sizeof(s), 1, f);
-    }
-    fclose(f);
-}

src/optimizedModel.h

@@ -1,85 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#ifndef OPTIMIZED_MODEL_H
-#define OPTIMIZED_MODEL_H
-
-#include <map>
-#include "modelFile/modelFile.h"
-#include "settings.h"
-
-class OptimizedFace
-{
-public:
-    int index[3];
-    int touching[3];
-};
-class OptimizedPoint3
-{
-public:
-    Point3 p;
-    vector<uint32_t> faceIndexList;
-
-    OptimizedPoint3(Point3 p): p(p) {}
-};
-
-class OptimizedModel;
-class OptimizedVolume
-{
-public:
-    OptimizedModel* model;
-    vector<OptimizedPoint3> points;
-    vector<OptimizedFace> faces;
-
-    OptimizedVolume(SimpleVolume* volume, OptimizedModel* model);
-
-    int getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx)
-    {
-        for(unsigned int i=0;i<points[idx0].faceIndexList.size();i++)
-        {
-            int f0 = points[idx0].faceIndexList[i];
-            if (f0 == notFaceIdx) continue;
-            for(unsigned int j=0;j<points[idx1].faceIndexList.size();j++)
-            {
-                int f1 = points[idx1].faceIndexList[j];
-                if (f1 == notFaceIdx) continue;
-                if (f0 == f1) return f0;
-            }
-        }
-        return -1;
-    }
-};
-class OptimizedModel
-{
-public:
-    vector<OptimizedVolume> volumes;
-    Point3 modelSize;
-    Point3 vMin, vMax;
-
-    OptimizedModel(SimpleModel* model, Point3 center)
-    {
-        for(unsigned int i=0; i<model->volumes.size(); i++)
-            volumes.push_back(OptimizedVolume(&model->volumes[i], this));
-        vMin = model->min();
-        vMax = model->max();
-
-        Point3 vOffset((vMin.x + vMax.x) / 2, (vMin.y + vMax.y) / 2, vMin.z);
-        if(ConfigSettings::config->autoCenter != 1)
-        {
-            vOffset.x = 0;
-            vOffset.y = 0;
-            if(ConfigSettings::config->autoCenter == 2)
-                vOffset.z = 0;
-        }
-        vOffset -= center;
-        for(unsigned int i=0; i<volumes.size(); i++)
-            for(unsigned int n=0; n<volumes[i].points.size(); n++)
-                volumes[i].points[n].p -= vOffset;
-
-        modelSize = vMax - vMin;
-        vMin -= vOffset;
-        vMax -= vOffset;
-    }
-
-    void saveDebugSTL(const char* filename);
-};
-
-#endif//OPTIMIZED_MODEL_H

src/pathOrderOptimizer.cpp

@@ -1,158 +1,276 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include <map>
-
 #include "pathOrderOptimizer.h"
+#include "utils/logoutput.h"
+#include "utils/BucketGrid2D.h"
+
+#define INLINE static inline
 
 namespace cura {
 
-static uint32_t hashPoint(const Point& p)
-{
-    return (p.X / 20000) ^ (p.Y / 20000) << 8;
-}
-
+/**
+*
+*/
 void PathOrderOptimizer::optimize()
 {
-    const float incommingPerpundicularNormalScale = 0.0001f;
+    bool picked[polygons.size()];
+    memset(picked, false, sizeof(bool) * polygons.size());/// initialized as falses
     
-    std::map<uint32_t, std::vector<unsigned int>> location_to_polygon_map;
-    std::vector<bool> picked;
-    for(unsigned int i=0;i<polygons.size(); i++)
+    for(unsigned int i_polygon=0 ; i_polygon<polygons.size() ; i_polygon++) /// find closest point to initial starting point within each polygon +initialize picked
     {
         int best = -1;
-        float bestDist = 0xFFFFFFFFFFFFFFFFLL;
-        PolygonRef poly = polygons[i];
-        for(unsigned int j=0; j<poly.size(); j++)
+        float bestDist = std::numeric_limits<float>::infinity();
+        PolygonRef poly = polygons[i_polygon];
+        for(unsigned int i_point=0; i_point<poly.size(); i_point++) /// get closest point in polygon
         {
-            float dist = vSize2f(poly[j] - startPoint);
+            float dist = vSize2f(poly[i_point] - startPoint);
             if (dist < bestDist)
             {
-                best = j;
+                best = i_point;
                 bestDist = dist;
             }
         }
         polyStart.push_back(best);
-        picked.push_back(false);
-        
-        if (poly.size() == 2)
-        {
-            location_to_polygon_map[hashPoint(poly[0])].push_back(i);
-            location_to_polygon_map[hashPoint(poly[1])].push_back(i);
-        }
+        //picked.push_back(false); /// initialize all picked values as false
+
+        assert(poly.size() != 2);
     }
 
-    Point incommingPerpundicularNormal(0, 0);
-    Point p0 = startPoint;
-    for(unsigned int n=0; n<polygons.size(); n++)
+
+    Point prev_point = startPoint;
+    for(unsigned int i_polygon=0 ; i_polygon<polygons.size() ; i_polygon++) /// actual path order optimizer
     {
         int best = -1;
-        float bestDist = 0xFFFFFFFFFFFFFFFFLL;
-        
-        for(unsigned int i : location_to_polygon_map[hashPoint(p0)])
+        float bestDist = std::numeric_limits<float>::infinity();
+
+
+        for(unsigned int i_polygon=0 ; i_polygon<polygons.size() ; i_polygon++)
         {
-            if (picked[i] || polygons[i].size() < 1)
+            if (picked[i_polygon] || polygons[i_polygon].size() < 1) /// skip single-point-polygons
                 continue;
 
-            float dist = vSize2f(polygons[i][0] - p0);
-            dist += abs(dot(incommingPerpundicularNormal, normal(polygons[i][1] - polygons[i][0], 1000))) * incommingPerpundicularNormalScale;
+            assert (polygons[i_polygon].size() != 2);
+
+            float dist = vSize2f(polygons[i_polygon][polyStart[i_polygon]] - prev_point);
             if (dist < bestDist)
             {
-                best = i;
+                best = i_polygon;
                 bestDist = dist;
-                polyStart[i] = 0;
-            }
-            dist = vSize2f(polygons[i][1] - p0);
-            dist += abs(dot(incommingPerpundicularNormal, normal(polygons[i][0] - polygons[i][1], 1000))) * incommingPerpundicularNormalScale;
-            if (dist < bestDist)
-            {
-                best = i;
-                bestDist = dist;
-                polyStart[i] = 1;
             }
+
         }
-        
-        if (best == -1)
+
+
+        if (best > -1) /// should always be true; we should have been able to identify the best next polygon
         {
-            for(unsigned int i=0;i<polygons.size(); i++)
-            {
-                if (picked[i] || polygons[i].size() < 1)
-                    continue;
-                if (polygons[i].size() == 2)
-                {
-                    float dist = vSize2f(polygons[i][0] - p0);
-                    dist += abs(dot(incommingPerpundicularNormal, normal(polygons[i][1] - polygons[i][0], 1000))) * incommingPerpundicularNormalScale;
-                    if (dist < bestDist)
-                    {
-                        best = i;
-                        bestDist = dist;
-                        polyStart[i] = 0;
-                    }
-                    dist = vSize2f(polygons[i][1] - p0);
-                    dist += abs(dot(incommingPerpundicularNormal, normal(polygons[i][0] - polygons[i][1], 1000))) * incommingPerpundicularNormalScale;
-                    if (dist < bestDist)
-                    {
-                        best = i;
-                        bestDist = dist;
-                        polyStart[i] = 1;
-                    }
-                }else{
-                    float dist = vSize2f(polygons[i][polyStart[i]] - p0);
-                    if (dist < bestDist)
-                    {
-                        best = i;
-                        bestDist = dist;
-                    }
-                }
-            }
-        }
-        
-        if (best > -1)
-        {
-            if (polygons[best].size() == 2)
-            {
-                int endIdx = (polyStart[best] + 1) % 2;
-                p0 = polygons[best][endIdx];
-                incommingPerpundicularNormal = crossZ(normal(polygons[best][endIdx] - polygons[best][polyStart[best]], 1000));
-            }else{
-                p0 = polygons[best][polyStart[best]];
-                incommingPerpundicularNormal = Point(0, 0);
-            }
+            assert(polygons[best].size() != 2);
+
+            prev_point = polygons[best][polyStart[best]];
+
             picked[best] = true;
             polyOrder.push_back(best);
         }
+        else
+            logError("Failed to find next closest polygon.\n");
     }
-    
-    p0 = startPoint;
-    for(int nr : polyOrder)
+
+    prev_point = startPoint;
+    for(unsigned int n=0; n<polyOrder.size(); n++) /// decide final starting points in each polygon
     {
-        PolygonRef poly = polygons[nr];
-        if (poly.size() > 2)
+        int poly_idx = polyOrder[n];
+        int point_idx = getPolyStart(prev_point, poly_idx);
+        polyStart[poly_idx] = point_idx;
+        prev_point = polygons[poly_idx][point_idx];
+
+    }
+}
+
+int PathOrderOptimizer::getPolyStart(Point prev_point, int poly_idx)
+{
+    switch (type)
+    {
+        case EZSeamType::BACK:      return getFarthestPointInPolygon(poly_idx); 
+        case EZSeamType::RANDOM:    return getRandomPointInPolygon(poly_idx); 
+        case EZSeamType::SHORTEST:  return getClosestPointInPolygon(prev_point, poly_idx);
+        default:                    return getClosestPointInPolygon(prev_point, poly_idx);
+    }
+}
+
+
+int PathOrderOptimizer::getClosestPointInPolygon(Point prev_point, int poly_idx)
+{
+    PolygonRef poly = polygons[poly_idx];
+    int best_point_idx = -1;
+    float bestDist = std::numeric_limits<float>::infinity();
+    bool orientation = poly.orientation();
+    for(unsigned int i_point=0 ; i_point<poly.size() ; i_point++)
+    {
+        float dist = vSize2f(poly[i_point] - prev_point);
+        Point n0 = normal(poly[(i_point-1+poly.size())%poly.size()] - poly[i_point], 2000);
+        Point n1 = normal(poly[i_point] - poly[(i_point + 1) % poly.size()], 2000);
+        float dot_score = dot(n0, n1) - dot(crossZ(n0), n1); /// prefer binnenbocht
+        if (orientation)
+            dot_score = -dot_score;
+        if (dist + dot_score < bestDist)
         {
-            int best = -1;
-            float bestDist = 0xFFFFFFFFFFFFFFFFLL;
-            bool orientation = poly.orientation();
-            for(unsigned int i=0;i<poly.size(); i++)
-            {
-                const int64_t dot_score_scale = 2000;
-                float dist = vSize2f(polygons[nr][i] - p0);
-                Point n0 = normal(poly[(i+poly.size()-1)%poly.size()] - poly[i], dot_score_scale);
-                Point n1 = normal(poly[i] - poly[(i + 1) % poly.size()], dot_score_scale);
-                float dot_score = dot(n0, n1) - dot(crossZ(n0), n1);
-                if (orientation)
-                    dot_score = -dot_score;
-                dist += dot_score;
-                if (dist < bestDist)
-                {
-                    best = i;
-                    bestDist = dist;
-                }
-            }
-            polyStart[nr] = best;
+            best_point_idx = i_point;
+            bestDist = dist;
         }
-        if (poly.size() <= 2)
+    }
+    return best_point_idx;
+}
+
+int PathOrderOptimizer::getRandomPointInPolygon(int poly_idx)
+{
+    return rand() % polygons[poly_idx].size();
+}
+
+
+int PathOrderOptimizer::getFarthestPointInPolygon(int poly_idx)
+{
+    PolygonRef poly = polygons[poly_idx];
+    int best_point_idx = -1;
+    float best_y = std::numeric_limits<float>::min();
+    for(unsigned int point_idx=0 ; point_idx<poly.size() ; point_idx++)
+    {
+        if (poly[point_idx].Y > best_y)
         {
-            p0 = poly[(polyStart[nr] + 1) % 2];
-        }else{
-            p0 = poly[polyStart[nr]];
+            best_point_idx = point_idx;
+            best_y = poly[point_idx].Y;
+        }
+    }
+    return best_point_idx;
+}
+
+
+/**
+*
+*/
+void LineOrderOptimizer::optimize()
+{
+    int gridSize = 5000; // the size of the cells in the hash grid.
+    BucketGrid2D<unsigned int> line_bucket_grid(gridSize);
+    bool picked[polygons.size()];
+    memset(picked, false, sizeof(bool) * polygons.size());/// initialized as falses
+    
+    for(unsigned int i_polygon=0 ; i_polygon<polygons.size() ; i_polygon++) /// find closest point to initial starting point within each polygon +initialize picked
+    {
+        int best = -1;
+        float bestDist = std::numeric_limits<float>::infinity();
+        PolygonRef poly = polygons[i_polygon];
+        for(unsigned int i_point=0; i_point<poly.size(); i_point++) /// get closest point from polygon
+        {
+            float dist = vSize2f(poly[i_point] - startPoint);
+            if (dist < bestDist)
+            {
+                best = i_point;
+                bestDist = dist;
+            }
+        }
+        polyStart.push_back(best);
+
+        assert(poly.size() == 2);
+
+        line_bucket_grid.insert(poly[0], i_polygon);
+        line_bucket_grid.insert(poly[1], i_polygon);
+
+    }
+
+
+    Point incommingPerpundicularNormal(0, 0);
+    Point prev_point = startPoint;
+    for(unsigned int i_polygon=0 ; i_polygon<polygons.size() ; i_polygon++) /// actual path order optimizer
+    {
+        int best = -1;
+        float bestDist = std::numeric_limits<float>::infinity();
+
+        for(unsigned int i_close_line_polygon :  line_bucket_grid.findNearbyObjects(prev_point)) /// check if single-line-polygon is close to last point
+        {
+            if (picked[i_close_line_polygon] || polygons[i_close_line_polygon].size() < 1)
+                continue;
+
+
+            checkIfLineIsBest(i_close_line_polygon, best, bestDist, prev_point, incommingPerpundicularNormal);
+
+        }
+
+        if (best == -1) /// if single-line-polygon hasn't been found yet
+        {
+           for(unsigned int i_polygon=0 ; i_polygon<polygons.size() ; i_polygon++)
+            {
+                if (picked[i_polygon] || polygons[i_polygon].size() < 1) /// skip single-point-polygons
+                    continue;
+                assert(polygons[i_polygon].size() == 2);
+
+                checkIfLineIsBest(i_polygon, best, bestDist, prev_point, incommingPerpundicularNormal);
+
+            }
+        }
+
+        if (best > -1) /// should always be true; we should have been able to identify the best next polygon
+        {
+            assert(polygons[best].size() == 2);
+
+            int endIdx = polyStart[best] * -1 + 1; /// 1 -> 0 , 0 -> 1
+            prev_point = polygons[best][endIdx];
+            incommingPerpundicularNormal = crossZ(normal(polygons[best][endIdx] - polygons[best][polyStart[best]], 1000));
+
+            picked[best] = true;
+            polyOrder.push_back(best);
+        }
+        else
+            logError("Failed to find next closest line.\n");
+    }
+
+    prev_point = startPoint;
+    for(unsigned int n=0; n<polyOrder.size(); n++) /// decide final starting points in each polygon
+    {
+        int nr = polyOrder[n];
+        PolygonRef poly = polygons[nr];
+        int best = -1;
+        float bestDist = std::numeric_limits<float>::infinity();
+        bool orientation = poly.orientation();
+        for(unsigned int i=0;i<poly.size(); i++)
+        {
+            float dist = vSize2f(polygons[nr][i] - prev_point);
+            Point n0 = normal(poly[(i+poly.size()-1)%poly.size()] - poly[i], 2000);
+            Point n1 = normal(poly[i] - poly[(i + 1) % poly.size()], 2000);
+            float dot_score = dot(n0, n1) - dot(crossZ(n0), n1);
+            if (orientation)
+                dot_score = -dot_score;
+            if (dist + dot_score < bestDist)
+            {
+                best = i;
+                bestDist = dist + dot_score;
+            }
+        }
+
+        polyStart[nr] = best;
+        assert(poly.size() == 2);
+        prev_point = poly[best *-1 + 1]; /// 1 -> 0 , 0 -> 1
+
+    }
+}
+
+inline void LineOrderOptimizer::checkIfLineIsBest(unsigned int i_line_polygon, int& best, float& bestDist, Point& prev_point, Point& incommingPerpundicularNormal)
+{
+    { /// check distance to first point on line (0)
+        float dist = vSize2f(polygons[i_line_polygon][0] - prev_point);
+        dist += abs(dot(incommingPerpundicularNormal, normal(polygons[i_line_polygon][1] - polygons[i_line_polygon][0], 1000))) * 0.0001f; /// penalize sharp corners
+        if (dist < bestDist)
+        {
+            best = i_line_polygon;
+            bestDist = dist;
+            polyStart[i_line_polygon] = 0;
+        }
+    }
+    { /// check distance to second point on line (1)
+        float dist = vSize2f(polygons[i_line_polygon][1] - prev_point);
+        dist += abs(dot(incommingPerpundicularNormal, normal(polygons[i_line_polygon][0] - polygons[i_line_polygon][1], 1000) )) * 0.0001f; /// penalize sharp corners
+        if (dist < bestDist)
+        {
+            best = i_line_polygon;
+            bestDist = dist;
+            polyStart[i_line_polygon] = 1;
         }
     }
 }

src/pathOrderOptimizer.h

@@ -4,18 +4,65 @@
 
 #include <stdint.h>
 #include "utils/polygon.h"
+#include "settings.h"
 
 namespace cura {
-
+ 
+/*!
+ * Parts order optimization class.
+ * 
+ * Utility class for optimizing the path order by minimizing the distance traveled between printing different parts in the layer.
+ * The order of polygons is optimized and the startingpoint within each polygon is chosen.
+ */
 class PathOrderOptimizer
 {
 public:
-    Point startPoint;
-    vector<PolygonRef> polygons;
-    vector<int> polyStart;
-    vector<int> polyOrder;
+    EZSeamType type;
+    Point startPoint; //!< The location of the nozzle before starting to print the current layer
+    std::vector<PolygonRef> polygons; //!< the parts of the layer (in arbitrary order)
+    std::vector<int> polyStart; //!< polygons[i][polyStart[i]] = point of polygon i which is to be the starting point in printing the polygon
+    std::vector<int> polyOrder; //!< the optimized order as indices in #polygons
 
-    PathOrderOptimizer(Point startPoint)
+    PathOrderOptimizer(Point startPoint, EZSeamType type = EZSeamType::SHORTEST)
+    : type(type)
+    , startPoint(startPoint)
+    {
+    }
+
+    void addPolygon(PolygonRef polygon)
+    {
+        this->polygons.push_back(polygon);
+    }
+
+    void addPolygons(Polygons& polygons)
+    {
+        for(unsigned int i=0;i<polygons.size(); i++)
+            this->polygons.push_back(polygons[i]);
+    }
+
+    void optimize(); //!< sets #polyStart and #polyOrder
+
+private:
+    int getPolyStart(Point prev_point, int poly_idx);
+    int getClosestPointInPolygon(Point prev, int i_polygon); //!< returns the index of the closest point
+    int getFarthestPointInPolygon(int poly_idx); //!< return the index to the point farthest from the front (highest y)
+    int getRandomPointInPolygon(int poly_idx);
+
+
+};
+//! Line path order optimization class.
+/*!
+* Utility class for optimizing the path order by minimizing the distance traveled between printing different lines within a part.
+*/
+class LineOrderOptimizer
+{
+public:
+    Point startPoint; //!< The location of the nozzle before starting to print the current layer
+    std::vector<PolygonRef> polygons; //!< the parts of the layer (in arbitrary order)
+    std::vector<int> polyStart; //!< polygons[i][polyStart[i]] = point of polygon i which is to be the starting point in printing the polygon
+    std::vector<int> polyOrder; //!< the optimized order as indices in #polygons
+
+    LineOrderOptimizer(Point startPoint)
     {
         this->startPoint = startPoint;
     }
@@ -24,14 +71,18 @@ public:
     {
         this->polygons.push_back(polygon);
     }
-    
+
     void addPolygons(Polygons& polygons)
     {
         for(unsigned int i=0;i<polygons.size(); i++)
             this->polygons.push_back(polygons[i]);
     }
-    
-    void optimize();
+
+    void optimize(); //!< sets #polyStart and #polyOrder
+
+private:
+    void checkIfLineIsBest(unsigned int i_line_polygon, int& best, float& bestDist, Point& prev_point, Point& incommingPerpundicularNormal);
+
 };
 
 }//namespace cura

src/polygonOptimizer.cpp

@@ -1,54 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include "polygonOptimizer.h"
-
-namespace cura {
-
-void optimizePolygon(PolygonRef poly)
-{
-    Point p0 = poly[poly.size()-1];
-    for(unsigned int i=0;i<poly.size();i++)
-    {
-        Point p1 = poly[i];
-        if (shorterThen(p0 - p1, MICRON2INT(10)))
-        {
-            poly.remove(i);
-            i --;
-        }else if (shorterThen(p0 - p1, MICRON2INT(500)))
-        {
-            Point p2;
-            if (i < poly.size() - 1)
-                p2 = poly[i+1];
-            else
-                p2 = poly[0];
-            
-            Point diff0 = normal(p1 - p0, 10000000);
-            Point diff2 = normal(p1 - p2, 10000000);
-            
-            int64_t d = dot(diff0, diff2);
-            if (d < -99999999999999LL)
-            {
-                poly.remove(i);
-                i --;
-            }else{
-                p0 = p1;
-            }
-        }else{
-            p0 = p1;
-        }
-    }
-}
-
-void optimizePolygons(Polygons& polys)
-{
-    for(unsigned int n=0;n<polys.size();n++)
-    {
-        optimizePolygon(polys[n]);
-        if (polys[n].size() < 3)
-        {
-            polys.remove(n);
-            n--;
-        }
-    }
-}
-
-}//namespace cura

src/polygonOptimizer.h

@@ -1,15 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#ifndef POLYGON_OPTIMIZER_H
-#define POLYGON_OPTIMIZER_H
-
-#include "utils/polygon.h"
-
-namespace cura {
-
-void optimizePolygon(PolygonRef poly);
-
-void optimizePolygons(Polygons& polys);
-
-}//namespace cura
-
-#endif//POLYGON_OPTIMIZER_H

src/raft.cpp

@@ -6,19 +6,18 @@ namespace cura {
 
 void generateRaft(SliceDataStorage& storage, int distance)
 {
-    for(unsigned int volumeIdx = 0; volumeIdx < storage.volumes.size(); volumeIdx++)
+    if (storage.draft_protection_shield.size() > 0)
     {
-        if (storage.volumes[volumeIdx].layers.size() < 1) continue;
-        SliceLayer* layer = &storage.volumes[volumeIdx].layers[0];
-        for(unsigned int i=0; i<layer->parts.size(); i++)
-        {
-            storage.raftOutline = storage.raftOutline.unionPolygons(layer->parts[i].outline.offset(distance));
-        }
+        storage.raftOutline = storage.raftOutline.unionPolygons(storage.draft_protection_shield.offset(distance));
+    }
+    else if (storage.oozeShield.size() > 0 && storage.oozeShield[0].size() > 0)
+    {
+        storage.raftOutline = storage.raftOutline.unionPolygons(storage.oozeShield[0].offset(distance));
+    }
+    else 
+    {
+        storage.raftOutline = storage.getLayerOutlines(0, true).offset(distance);
     }
-
-    SupportPolyGenerator supportGenerator(storage.support, 0);
-    storage.raftOutline = storage.raftOutline.unionPolygons(supportGenerator.polygons.offset(distance));
-    storage.raftOutline = storage.raftOutline.unionPolygons(storage.wipeTower.offset(distance));
 }
 
 }//namespace cura

src/settingRegistry.cpp

@@ -0,0 +1,318 @@
+#include "settingRegistry.h"
+
+#include <sstream>
+#include <iostream> // debug IO
+#include <libgen.h> // dirname
+#include <string>
+
+#include "utils/logoutput.h"
+
+#include "rapidjson/rapidjson.h"
+#include "rapidjson/document.h"
+#include "rapidjson/error/en.h"
+#include "rapidjson/filereadstream.h"
+#include "utils/logoutput.h"
+
+namespace cura
+{
+    
+SettingRegistry SettingRegistry::instance; // define settingRegistry
+
+std::string SettingRegistry::toString(rapidjson::Type type)
+{
+    switch (type)
+    {
+        case rapidjson::Type::kNullType: return "null";
+        case rapidjson::Type::kFalseType: return "false";
+        case rapidjson::Type::kTrueType: return "true";
+        case rapidjson::Type::kObjectType: return "object";
+        case rapidjson::Type::kArrayType: return "array";
+        case rapidjson::Type::kStringType: return "string";
+        case rapidjson::Type::kNumberType: return "number";
+        default: return "Unknown";
+    }
+}
+
+
+SettingContainer::SettingContainer(std::string key, std::string label)
+: key(key)
+, label(label)
+{
+}
+
+SettingConfig* SettingContainer::addChild(std::string key, std::string label)
+{
+    children.emplace_back(key, label, nullptr);
+    return &children.back();
+}
+
+SettingConfig::SettingConfig(std::string key, std::string label, SettingContainer* parent)
+: SettingContainer(key, label)
+, parent(parent)
+{
+//     std::cerr << key << std::endl; // debug output to show all frontend registered settings...
+}
+
+bool SettingRegistry::settingExists(std::string key) const
+{
+    return settings.find(key) != settings.end();
+}
+
+SettingConfig* SettingRegistry::getSettingConfig(std::string key)
+{
+    auto it = settings.find(key);
+    if (it == settings.end())
+        return nullptr;
+    return it->second;
+}
+
+SettingContainer* SettingRegistry::getCategory(std::string key)
+{
+    for (SettingContainer& cat : categories)
+        if (cat.getKey().compare(key) == 0)
+            return &cat;
+    return nullptr;
+}
+
+
+SettingRegistry::SettingRegistry()
+{
+}
+
+bool SettingRegistry::settingsLoaded()
+{
+    return settings.size() > 0;
+}
+
+int SettingRegistry::loadJSON(std::string filename, rapidjson::Document& json_document)
+{
+    FILE* f = fopen(filename.c_str(), "rb");
+    if (!f)
+    {
+        cura::logError("Couldn't open JSON file.\n");
+        return 1;
+    }
+    char read_buffer[4096];
+    rapidjson::FileReadStream reader_stream(f, read_buffer, sizeof(read_buffer));
+    json_document.ParseStream(reader_stream);
+    fclose(f);
+    if (json_document.HasParseError())
+    {
+        cura::logError("Error parsing JSON(offset %u): %s\n", (unsigned)json_document.GetErrorOffset(), GetParseError_En(json_document.GetParseError()));
+        return 2;
+    }
+    
+    return 0;
+}
+
+int SettingRegistry::loadJSONsettings(std::string filename)
+{
+    rapidjson::Document json_document;
+    
+    int err = loadJSON(filename, json_document);
+    if (err) { return err; }
+    
+    if (json_document.HasMember("inherits"))
+    {
+        std::string filename_copy = std::string(filename.c_str()); // copy the string because dirname(.) changes the input string!!!
+        char* filename_cstr = (char*)filename_copy.c_str();
+        int err = loadJSONsettings(std::string(dirname(filename_cstr)) + std::string("/") + json_document["inherits"].GetString());
+        if (err) { return err; }
+        return loadJSONsettingsFromDoc(json_document, false);
+    }
+    else 
+    {
+        return loadJSONsettingsFromDoc(json_document, true);
+    }
+    
+}
+
+int SettingRegistry::loadJSONsettingsFromDoc(rapidjson::Document& json_document, bool warn_duplicates)
+{
+    
+    if (!json_document.IsObject())
+    {
+        cura::logError("JSON file is not an object.\n");
+        return 3;
+    }
+
+    if (json_document.HasMember("machine_extruder_trains"))
+    {
+        categories.emplace_back("machine_extruder_trains", "Extruder Trains Settings Objects");
+        SettingContainer* category_trains = &categories.back();
+        const rapidjson::Value& trains = json_document["machine_extruder_trains"];
+        if (trains.IsArray()) 
+        {
+            if (trains.Size() > 0 && trains[0].IsObject())
+            {
+                unsigned int idx = 0;
+                for (auto it = trains.Begin(); it != trains.End(); ++it)
+                {
+                    SettingConfig* child = category_trains->addChild(std::to_string(idx), std::to_string(idx));
+                    
+                    for (rapidjson::Value::ConstMemberIterator setting_iterator = it->MemberBegin(); setting_iterator != it->MemberEnd(); ++setting_iterator)
+                    {
+                        _addSettingToContainer(child, setting_iterator, warn_duplicates, false);
+                    }
+                    
+                    idx++;
+                }
+            }
+        }
+        else 
+        {
+            logError("Error: JSON machine_extruder_trains is not an array!\n");
+        }
+    }
+    if (json_document.HasMember("machine_settings"))
+    {
+        categories.emplace_back("machine_settings", "Machine Settings");
+        SettingContainer* category_machine_settings = &categories.back();
+        
+        const rapidjson::Value& json_object_container = json_document["machine_settings"];
+        for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
+        {
+            _addSettingToContainer(category_machine_settings, setting_iterator, warn_duplicates);
+        }
+    }
+    
+    if (json_document.HasMember("categories"))
+    {
+        for (rapidjson::Value::ConstMemberIterator category_iterator = json_document["categories"].MemberBegin(); category_iterator != json_document["categories"].MemberEnd(); ++category_iterator)
+        {
+            if (!category_iterator->value.IsObject())
+            {
+                continue;
+            }
+            if (!category_iterator->value.HasMember("label") || !category_iterator->value["label"].IsString())
+            {
+                continue;
+            }
+            if (!category_iterator->value.HasMember("settings") || !category_iterator->value["settings"].IsObject())
+            {
+                continue;
+            }
+            
+            categories.emplace_back(category_iterator->name.GetString(), category_iterator->value["label"].GetString());
+            SettingContainer* category = &categories.back();
+            
+            const rapidjson::Value& json_object_container = category_iterator->value["settings"];
+            for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
+            {
+                _addSettingToContainer(category, setting_iterator, warn_duplicates);
+            }
+        }
+    }
+    
+    if (json_document.HasMember("overrides"))
+    {
+        const rapidjson::Value& json_object_container = json_document["overrides"];
+        for (rapidjson::Value::ConstMemberIterator override_iterator = json_object_container.MemberBegin(); override_iterator != json_object_container.MemberEnd(); ++override_iterator)
+        {
+            std::string setting = override_iterator->name.GetString();
+            SettingConfig* conf = getSettingConfig(setting);
+            _loadSettingValues(conf, override_iterator, false);
+        }
+    }
+    
+    return 0;
+}
+void SettingRegistry::_addSettingToContainer(SettingContainer* parent, rapidjson::Value::ConstMemberIterator& json_object_it, bool warn_duplicates, bool add_to_settings)
+{
+        const rapidjson::Value& data = json_object_it->value;
+        
+        if (data.HasMember("type") && data["type"].IsString() && 
+            (data["type"].GetString() == std::string("polygon") || data["type"].GetString() == std::string("polygons")))
+        {
+            logWarning("Loading polygon setting %s not implemented...\n", json_object_it->name.GetString());
+            /// When this setting has children, add those children to the parent setting.
+            if (data.HasMember("children") && data["children"].IsObject())
+            {
+                const rapidjson::Value& json_object_container = data["children"];
+                for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
+                {
+                    _addSettingToContainer(parent, setting_iterator, warn_duplicates, add_to_settings);
+                }
+            }
+            return;
+        }
+        
+        std::string label;
+        if (!json_object_it->value.HasMember("label") || !data["label"].IsString())
+        {
+            label = "N/A";
+        }
+        else
+        {
+            label = data["label"].GetString();
+        }
+
+        /// Create the new setting config object.
+        SettingConfig* config = parent->addChild(json_object_it->name.GetString(), label);
+        
+    _loadSettingValues(config, json_object_it, warn_duplicates, add_to_settings);
+}
+
+void SettingRegistry::_loadSettingValues(SettingConfig* config, rapidjson::GenericValue< rapidjson::UTF8< char > >::ConstMemberIterator& json_object_it, bool warn_duplicates, bool add_to_settings)
+{
+    const rapidjson::Value& data = json_object_it->value;
+    /// Fill the setting config object with data we have in the json file.
+    if (data.HasMember("type") && data["type"].IsString())
+    {
+        config->setType(data["type"].GetString());
+    }
+    if (data.HasMember("default"))
+    {
+        const rapidjson::Value& dflt = data["default"];
+        if (dflt.IsString())
+        {
+            config->setDefault(dflt.GetString());
+        }
+        else if (dflt.IsTrue())
+        {
+            config->setDefault("true");
+        }
+        else if (dflt.IsFalse())
+        {
+            config->setDefault("false");
+        }
+        else if (dflt.IsNumber())
+        {
+            std::ostringstream ss;
+            ss << dflt.GetDouble();
+            config->setDefault(ss.str());
+        } // arrays are ignored because machine_extruder_trains needs to be handled separately
+        else 
+        {
+            logError("Unrecognized data type in JSON: %s has type %s\n", json_object_it->name.GetString(), toString(dflt.GetType()).c_str());
+        }
+    }
+    if (data.HasMember("unit") && data["unit"].IsString())
+    {
+        config->setUnit(data["unit"].GetString());
+    }
+
+    /// Register the setting in the settings map lookup.
+    if (warn_duplicates && settingExists(config->getKey()))
+    {
+        cura::logError("Duplicate definition of setting: %s a.k.a. \"%s\" was already claimed by \"%s\"\n", config->getKey().c_str(), config->getLabel().c_str(), getSettingConfig(config->getKey())->getLabel().c_str());
+    }
+
+    if (add_to_settings)
+    {
+        settings[config->getKey()] = config;
+    }
+
+    /// When this setting has children, add those children to this setting.
+    if (data.HasMember("children") && data["children"].IsObject())
+    {
+        const rapidjson::Value& json_object_container = data["children"];
+        for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
+        {
+            _addSettingToContainer(config, setting_iterator, warn_duplicates, add_to_settings);
+        }
+    }
+}
+
+
+}//namespace cura

src/settingRegistry.h

@@ -0,0 +1,193 @@
+#ifndef SETTING_REGISTRY_H
+#define SETTING_REGISTRY_H
+
+#include <vector>
+#include <list>
+#include <unordered_map>
+#include <string>
+
+#include "utils/NoCopy.h"
+#include "rapidjson/document.h"
+
+namespace cura
+{
+    
+// Forward declaration
+class SettingConfig;
+
+/*!
+ * Setting category.
+ * Filled from the fdmprinter.json file. Contains one or more children settings.
+ */
+class SettingContainer
+{
+    friend class SettingConfig;
+private:
+    std::string key;
+    std::string label;
+    std::list<SettingConfig> children;
+public:
+    std::string getKey() const { return key; }
+    std::string getLabel() const { return label; }
+    SettingContainer(std::string key, std::string label);
+    
+    SettingConfig* addChild(std::string key, std::string label);
+    
+    /*!
+     * Get the \p idx th child.
+     * 
+     * This is used to get a specific extruder train in Settingsbase::setExtruderTrainDefaults
+     * 
+     * \param idx The index in the list of children
+     * \return The \p idx th child
+     */
+    const SettingConfig* getChild(unsigned int idx) const
+    {
+        if (idx < children.size())
+        {
+            auto it = children.begin();
+            while (idx > 0) { ++it; idx--; }
+            return &*it;
+        }
+        else 
+            return nullptr;
+    }
+};
+
+/*!
+ * Single setting data.
+ * Filled from the fdmprinter.json file. Can contain child settings, and is registered in the
+ * setting registry with it's key.
+ */
+class SettingConfig : public SettingContainer
+{
+private:
+    std::string type;
+    std::string default_value;
+    std::string unit;
+    SettingContainer* parent;
+public:
+    SettingConfig(std::string key, std::string label, SettingContainer* parent);
+    
+    /*!
+     * Get the SettingConfig::children.
+     * 
+     * This is used to get the extruder trains; see Settingsbase::setExtruderTrainDefaults
+     * 
+     * \return SettingConfig::children
+     */
+    const std::list<SettingConfig>& getChildren() const { return children; }
+    
+    std::string getKey() const
+    {
+        return key;
+    }
+    
+    void setType(std::string type)
+    {
+        this->type = type;
+    }
+    
+    std::string getType() const
+    {
+        return type;
+    }
+
+    void setDefault(std::string default_value)
+    {
+        this->default_value = default_value;
+    }
+    
+    std::string getDefaultValue() const
+    {
+        return default_value;
+    }
+
+    void setUnit(std::string unit)
+    {
+        this->unit = unit;
+    }
+    
+    std::string getUnit() const
+    {
+        return unit;
+    }
+};
+
+/*!
+ * Setting registry.
+ * There is a single global setting registry.
+ * This registry contains all known setting keys.
+ * The registry also contains the settings categories to build up the setting hiarcy from the json file.
+ */
+class SettingRegistry : NoCopy
+{
+private:
+    static SettingRegistry instance;
+
+    SettingRegistry();
+    
+    std::unordered_map<std::string, SettingConfig*> settings;
+    std::list<SettingContainer> categories;
+public:
+    /*!
+     * Get the SettingRegistry.
+     * 
+     * This is a singleton class.
+     * 
+     * \return The SettingRegistry
+     */
+    static SettingRegistry* getInstance() { return &instance; }
+    
+    bool settingExists(std::string key) const;
+    SettingConfig* getSettingConfig(std::string key);
+    
+    /*!
+     * Return the first category with the given key as name, or a null pointer.
+     * 
+     * \param key the key as it is in the JSON file
+     * \return The first category in the list having the \p key
+     */
+    SettingContainer* getCategory(std::string key);
+    
+    bool settingsLoaded();
+    /*!
+     * Load settings from a json file and all the parents it inherits from.
+     * 
+     * Uses recursion to load the parent json file.
+     * 
+     * \param filename The filename of the json file to parse
+     * \return an error code or zero of succeeded
+     */
+    int loadJSONsettings(std::string filename);
+    
+private:
+    std::string toString(rapidjson::Type type);
+    /*!
+     * Load a json document.
+     * 
+     * \param filename The filename of the json file to parse
+     * \param json_document (output) the document to be loaded
+     * \return an error code or zero of succeeded
+     */
+    int loadJSON(std::string filename, rapidjson::Document& json_document);
+    
+    /*!
+     * Load settings from a single json file.
+     * 
+     * \param filename The filename of the json file to parse
+     * \param warn_duplicates whether to warn for duplicate definitions
+     * \return an error code or zero of succeeded
+     */
+    int loadJSONsettingsFromDoc(rapidjson::Document& json_document, bool warn_duplicates);
+    
+    /*!
+     * \param warn_duplicates whether to warn for duplicate definitions
+     */
+    void _addSettingToContainer(SettingContainer* parent, rapidjson::Value::ConstMemberIterator& json_object_it, bool warn_duplicates, bool add_to_settings = true);
+    
+    void _loadSettingValues(SettingConfig* config, rapidjson::Value::ConstMemberIterator& json_object_it, bool warn_duplicates, bool add_to_settings = true);
+};
+
+}//namespace cura
+#endif//SETTING_REGISTRY_H

src/settings.cpp

@@ -1,276 +1,299 @@
 #include <cctype>
 #include <fstream>
 #include <stdio.h>
+#include <sstream> // ostringstream
 #include "utils/logoutput.h"
-#include "utils/string.h"
 
 #include "settings.h"
+#include "settingRegistry.h"
 
-#define LTRIM_STRING(s) do { while(((s).length() > 0) && isspace((s)[0])) { (s).erase(0, 1); } } while(0)
-#define RTRIM_STRING(s) do { while(((s).length() > 0) && isspace((s)[(s).length() - 1])) { (s).erase((s).length() - 1); } } while(0)
-#define TRIM_STRING(s) do { LTRIM_STRING(s); RTRIM_STRING(s); } while(0)
-#define STRINGIFY(_s) #_s
-#define SETTING(name, default) do { _index.push_back(_ConfigSettingIndex(STRINGIFY(name), &name)); name = (default); } while(0)
-#define SETTING2(name, altname, default) do { _index.push_back(_ConfigSettingIndex(STRINGIFY(name), &name)); _index.push_back(_ConfigSettingIndex(STRINGIFY(altname), &name)); name = (default); } while(0)
-
-ConfigSettings *ConfigSettings::config = NULL;
-
-ConfigSettings::ConfigSettings()
+namespace cura
 {
-    config = this;
-    SETTING(layerThickness, 100);
-    SETTING(initialLayerThickness, 300);
-    SETTING(filamentDiameter, 2890);
-    SETTING(filamentFlow, 100);
-    SETTING(layer0extrusionWidth, 600);
-    SETTING(extrusionWidth, 400);
-    SETTING(insetCount, 2);
-    SETTING(downSkinCount, 6);
-    SETTING(upSkinCount, 6);
-    SETTING(skirtDistance, 6000);
-    SETTING(skirtLineCount, 1);
-    SETTING(skirtMinLength, 0);
+//c++11 no longer defines M_PI, so add our own constant.
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
 
-    SETTING(initialSpeedupLayers, 4);
-    SETTING(initialLayerSpeed, 20);
-    SETTING(printSpeed, 50);
-    SETTING(inset0Speed, 50);
-    SETTING(insetXSpeed, 50);
-    SETTING(moveSpeed, 150);
-    SETTING(fanFullOnLayerNr, 2);
-
-    SETTING(sparseInfillLineDistance, 100 * extrusionWidth / 20);
-    SETTING(infillOverlap, 15);
-    SETTING(infillSpeed, 50);
-    SETTING(infillPattern, INFILL_AUTOMATIC);
-    SETTING(skinSpeed, 50);
-
-    SETTING(supportType, SUPPORT_TYPE_GRID);
-    SETTING(supportAngle, -1);
-    SETTING(supportEverywhere, 0);
-    SETTING(supportLineDistance, sparseInfillLineDistance);
-    SETTING(supportXYDistance, 700);
-    SETTING(supportZDistance, 150);
-    SETTING(supportExtruder, -1);
-
-    SETTING(retractionAmount, 4500);
-    SETTING(retractionAmountPrime, 0);
-    SETTING(retractionSpeed, 45);
-    SETTING(retractionAmountExtruderSwitch, 14500);
-    SETTING(retractionMinimalDistance, 1500);
-    SETTING(minimalExtrusionBeforeRetraction, 100);
-    SETTING(retractionZHop, 0);
-
-    SETTING(enableCombing, COMBING_ALL);
-    SETTING(enableOozeShield, 0);
-    SETTING(wipeTowerSize, 0);
-    SETTING(multiVolumeOverlap, 0);
-    SETTING2(objectPosition.X, posx, 102500);
-    SETTING2(objectPosition.Y, posy, 102500);
-    SETTING(objectSink, 0);
-    SETTING(autoCenter, 1);
-
-    SETTING(raftMargin, 5000);
-    SETTING(raftLineSpacing, 1000);
-    SETTING(raftBaseThickness, 0);
-    SETTING(raftBaseLinewidth, 0);
-    SETTING(raftInterfaceThickness, 0);
-    SETTING(raftInterfaceLinewidth, 0);
-    SETTING(raftInterfaceLineSpacing, 0);
-    SETTING(raftAirGap, 0);
-    SETTING(raftAirGapLayer0, 0);
-    SETTING(raftBaseSpeed, 0);
-    SETTING(raftFanSpeed, 0);
-    SETTING(raftSurfaceThickness, 0);
-    SETTING(raftSurfaceLinewidth, 0);
-    SETTING(raftSurfaceLineSpacing, 0);
-    SETTING(raftSurfaceLayers, 0);
-    SETTING(raftSurfaceSpeed, 0);
-
-    SETTING(minimalLayerTime, 5);
-    SETTING(minimalFeedrate, 10);
-    SETTING(coolHeadLift, 0);
-    SETTING(fanSpeedMin, 100);
-    SETTING(fanSpeedMax, 100);
-
-    SETTING(fixHorrible, 0);
-    SETTING(spiralizeMode, 0);
-    SETTING(simpleMode, 0);
-    SETTING(gcodeFlavor, GCODE_FLAVOR_REPRAP);
-
-    memset(extruderOffset, 0, sizeof(extruderOffset));
-    SETTING(extruderOffset[0].X, 0); // No one says that extruder 0 can not have an offset!
-    SETTING(extruderOffset[0].Y, 0);
-    SETTING(extruderOffset[1].X, 0);
-    SETTING(extruderOffset[1].Y, 0);
-    SETTING(extruderOffset[2].X, 0);
-    SETTING(extruderOffset[2].Y, 0);
-    SETTING(extruderOffset[3].X, 0);
-    SETTING(extruderOffset[3].Y, 0);
-    SETTING(extruderOffset[4].X, 0);
-    SETTING(extruderOffset[4].Y, 0);
-    SETTING(extruderOffset[5].X, 0);
-    SETTING(extruderOffset[5].Y, 0);
-    SETTING(extruderOffset[6].X, 0);
-    SETTING(extruderOffset[6].Y, 0);
-    SETTING(extruderOffset[7].X, 0);
-    SETTING(extruderOffset[7].Y, 0);
-    SETTING(extruderOffset[8].X, 0);
-    SETTING(extruderOffset[8].Y, 0);
-    SETTING(extruderOffset[9].X, 0);
-    SETTING(extruderOffset[9].Y, 0);
-    SETTING(extruderOffset[10].X, 0);
-    SETTING(extruderOffset[10].Y, 0);
-    SETTING(extruderOffset[11].X, 0);
-    SETTING(extruderOffset[11].Y, 0);
-    SETTING(extruderOffset[12].X, 0);
-    SETTING(extruderOffset[12].Y, 0);
-    SETTING(extruderOffset[13].X, 0);
-    SETTING(extruderOffset[13].Y, 0);
-    SETTING(extruderOffset[14].X, 0);
-    SETTING(extruderOffset[14].Y, 0);
-    SETTING(extruderOffset[15].X, 0);
-    SETTING(extruderOffset[15].Y, 0);
-
-    startCode =
-        "M109 S210     ;Heatup to 210C\n"
-        "G21           ;metric values\n"
-        "G90           ;absolute positioning\n"
-        "G28           ;Home\n"
-        "G1 Z15.0 F300 ;move the platform down 15mm\n"
-        "G92 E0        ;zero the extruded length\n"
-        "G1 F200 E5    ;extrude 5mm of feed stock\n"
-        "G92 E0        ;zero the extruded length again\n";
-    endCode =
-        "M104 S0                     ;extruder heater off\n"
-        "M140 S0                     ;heated bed heater off (if you have it)\n"
-        "G91                            ;relative positioning\n"
-        "G1 E-1 F300                    ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n"
-        "G1 Z+0.5 E-5 X-20 Y-20 F9000   ;move Z up a bit and retract filament even more\n"
-        "G28 X0 Y0                      ;move X/Y to min endstops, so the head is out of the way\n"
-        "M84                         ;steppers off\n"
-        "G90                         ;absolute positioning\n";
+std::string toString(EGCodeFlavor flavor)
+{
+    switch (flavor)
+    {
+        case EGCodeFlavor::BFB:
+            return "BFB";
+        case EGCodeFlavor::MACH3:
+            return "Mach3";
+        case EGCodeFlavor::MAKERBOT:
+            return "Makerbot";
+        case EGCodeFlavor::ULTIGCODE:
+            return "UltiGCode";
+        case EGCodeFlavor::REPRAP_VOLUMATRIC:
+            return "RepRap(Volumetric)";
+        case EGCodeFlavor::REPRAP:
+        default:
+            return "RepRap";
+    }
 }
 
-#undef STRINGIFY
-#undef SETTING
-
-bool ConfigSettings::setSetting(const char* key, const char* value)
+SettingsBaseVirtual::SettingsBaseVirtual()
+: parent(NULL)
 {
-    for(unsigned int n=0; n < _index.size(); n++)
+}
+
+SettingsBaseVirtual::SettingsBaseVirtual(SettingsBaseVirtual* parent)
+: parent(parent)
+{
+}
+
+SettingsBase::SettingsBase()
+: SettingsBaseVirtual(NULL)
+{
+}
+
+SettingsBase::SettingsBase(SettingsBaseVirtual* parent)
+: SettingsBaseVirtual(parent)
+{
+}
+
+SettingsMessenger::SettingsMessenger(SettingsBaseVirtual* parent)
+: SettingsBaseVirtual(parent)
+{
+}
+
+void SettingsBase::setSetting(std::string key, std::string value)
+{
+    if (SettingRegistry::getInstance()->settingExists(key))
     {
-        if (stringcasecompare(key, _index[n].key) == 0)
+        setting_values[key] = value;
+    }
+    else
+    {
+        cura::logError("Warning: setting an unregistered setting %s\n", key.c_str() );
+        setting_values[key] = value; // Handy when programmers are in the process of introducing a new setting
+    }
+}
+
+std::string SettingsBase::getSettingString(std::string key)
+{
+    if (setting_values.find(key) != setting_values.end())
+    {
+        return setting_values[key];
+    }
+    if (parent)
+    {
+        return parent->getSettingString(key);
+    }
+    
+    if (SettingRegistry::getInstance()->settingExists(key))
+    {
+        setting_values[key] = SettingRegistry::getInstance()->getSettingConfig(key)->getDefaultValue();
+    }
+    else
+    {
+        setting_values[key] = "";
+        cura::logError("Unregistered setting %s\n", key.c_str());
+    }
+    return setting_values[key];
+}
+
+void SettingsMessenger::setSetting(std::string key, std::string value)
+{
+    parent->setSetting(key, value);
+}
+
+std::string SettingsMessenger::getSettingString(std::string key)
+{
+    return parent->getSettingString(key);
+}
+
+
+void SettingsBase::setExtruderTrainDefaults(unsigned int extruder_nr)
+{
+    const SettingContainer* machine_extruder_trains = SettingRegistry::getInstance()->getCategory(std::string("machine_extruder_trains"));
+    
+    if (!machine_extruder_trains) 
+    {
+        // no machine_extruder_trains setting present; just use defaults for each train..
+        return;
+    }
+    
+    const SettingConfig* train = machine_extruder_trains->getChild(extruder_nr);
+    
+    if (!train)
+    {
+        // not enough machine_extruder_trains settings present; just use defaults for this train..
+        return;
+    }
+    
+    for (const SettingConfig& setting : train->getChildren())
+    {
+        if (setting_values.find(setting.getKey()) == setting_values.end())
         {
-            *_index[n].ptr = atoi(value);
-            return true;
+            setSetting(setting.getKey(), setting.getDefaultValue());
         }
     }
-    if (stringcasecompare(key, "startCode") == 0)
-    {
-        this->startCode = value;
-        return true;
-    }
-    if (stringcasecompare(key, "endCode") == 0)
-    {
-        this->endCode = value;
-        return true;
-    }
-    if (stringcasecompare(key, "preSwitchExtruderCode") == 0)
-    {
-        this->preSwitchExtruderCode = value;
-        return true;
-    }
-    if (stringcasecompare(key, "postSwitchExtruderCode") == 0)
-    {
-        this->postSwitchExtruderCode = value;
-        return true;
-    }
-    return false;
 }
 
-bool ConfigSettings::readSettings(void) {
-    return readSettings(DEFAULT_CONFIG_PATH);
+int SettingsBaseVirtual::getSettingAsIndex(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atoi(value.c_str());
 }
 
-bool ConfigSettings::readSettings(const char* path) {
-    std::ifstream config(path);
-    std::string line;
-    size_t line_number = 0;
+int SettingsBaseVirtual::getSettingAsCount(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atoi(value.c_str());
+}
 
-    if(!config.good()) return false;
+int SettingsBaseVirtual::getSettingInMicrons(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atof(value.c_str()) * 1000.0;
+}
 
-    while(config.good()) {
-        bool multilineContent = false;
-        size_t pos = std::string::npos;
-        std::getline(config, line);
-        line_number += 1;
+double SettingsBaseVirtual::getSettingInAngleRadians(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atof(value.c_str()) / 180.0 * M_PI;
+}
 
-        // De-comment and trim, skipping anything that shows up empty
-        pos = line.find_first_of('#');
-        if(pos != std::string::npos) line.erase(pos);
-        TRIM_STRING(line);
-        if(line.length() == 0) continue;
+bool SettingsBaseVirtual::getSettingBoolean(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "on")
+        return true;
+    if (value == "yes")
+        return true;
+    if (value == "true" or value == "True") //Python uses "True"
+        return true;
+    int num = atoi(value.c_str());
+    return num != 0;
+}
 
-        // Split into key = val
-        std::string key(""), val("");
-        pos = line.find_first_of('=');
-        if(pos != std::string::npos && line.length() > (pos + 1)) {
-            key = line.substr(0, pos);
-            val = line.substr(pos + 1);
-            TRIM_STRING(key);
-            TRIM_STRING(val);
-        }
+double SettingsBaseVirtual::getSettingInDegreeCelsius(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atof(value.c_str());
+}
 
-        // Are we about to read a multiline string?
-        if(val == CONFIG_MULTILINE_SEPARATOR) {
-            val = "";
-            multilineContent = true;
-            bool done_multiline = false;
+double SettingsBaseVirtual::getSettingInMillimetersPerSecond(std::string key)
+{
+    std::string value = getSettingString(key);
+    return std::max(1.0, atof(value.c_str()));
+}
 
-            while(config.good() && !done_multiline) {
-                std::getline(config, line);
-                line_number += 1;
+double SettingsBaseVirtual::getSettingInCubicMillimeters(std::string key)
+{
+    std::string value = getSettingString(key);
+    return std::max(0.0, atof(value.c_str()));
+}
 
-                // We RTRIM the line for two reasons:
-                //
-                // 1) Make sure that a direct == comparison with '"""' works without
-                //    worrying about trailing space.
-                // 2) Nobody likes trailing whitespace anyway
-                RTRIM_STRING(line);
+double SettingsBaseVirtual::getSettingInPercentage(std::string key)
+{
+    std::string value = getSettingString(key);
+    return std::max(0.0, atof(value.c_str()));
+}
 
-                // Either accumuliate or terminate
-                if(line == CONFIG_MULTILINE_SEPARATOR) {
-                    done_multiline = true;
-                    // Make sure we don't add an extra trailing newline
-                    // to the parsed value
-                    RTRIM_STRING(val);
-                }
-                else {
-                    line += "\n";
-                    val += line;
-                }
-            }
+double SettingsBaseVirtual::getSettingInSeconds(std::string key)
+{
+    std::string value = getSettingString(key);
+    return std::max(0.0, atof(value.c_str()));
+}
 
-            // If we drop out but didn't finish reading, something failed
-            if(!done_multiline) {
-                cura::logError("Config(%s):L%zd: Failed while reading multiline string.\n", path, line_number);
-                return false;
-            }
+EGCodeFlavor SettingsBaseVirtual::getSettingAsGCodeFlavor(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "RepRap")
+        return EGCodeFlavor::REPRAP;
+    else if (value == "UltiGCode")
+        return EGCodeFlavor::ULTIGCODE;
+    else if (value == "Makerbot")
+        return EGCodeFlavor::MAKERBOT;
+    else if (value == "BFB")
+        return EGCodeFlavor::BFB;
+    else if (value == "MACH3")
+        return EGCodeFlavor::MACH3;
+    else if (value == "RepRap (Volumatric)")
+        return EGCodeFlavor::REPRAP_VOLUMATRIC;
+    return EGCodeFlavor::REPRAP;
+}
 
-        }
+EFillMethod SettingsBaseVirtual::getSettingAsFillMethod(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "lines")
+        return EFillMethod::LINES;
+    if (value == "grid")
+        return EFillMethod::GRID;
+    if (value == "triangles")
+        return EFillMethod::TRIANGLES;
+    if (value == "concentric")
+        return EFillMethod::CONCENTRIC;
+    if (value == "zigzag")
+        return EFillMethod::ZIG_ZAG;
+    return EFillMethod::NONE;
+}
 
-        // Fail if we don't get a key and val
-        if(key.length() == 0 || (val.length() == 0 && !multilineContent)) {
-            cura::logError("Config(%s): Line %zd: No key value pair found\n", path, line_number);
-            return false;
-        }
+EPlatformAdhesion SettingsBaseVirtual::getSettingAsPlatformAdhesion(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "brim")
+        return EPlatformAdhesion::BRIM;
+    if (value == "raft")
+        return EPlatformAdhesion::RAFT;
+    return EPlatformAdhesion::SKIRT;
+}
 
-        // Set a config setting for the current K=V
-        if(!setSetting(key.c_str(), val.c_str())) {
-            cura::logError("Config(%s):L%zd: Failed to set '%s' to '%s'\n", path, line_number, key.c_str(), val.c_str());
-            return false;
-        }
+ESupportType SettingsBaseVirtual::getSettingAsSupportType(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "everywhere")
+        return ESupportType::EVERYWHERE;
+    if (value == "buildplate")
+        return ESupportType::PLATFORM_ONLY;
+    return ESupportType::NONE;
+}
+
+EZSeamType SettingsBaseVirtual::getSettingAsZSeamType(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "random")
+        return EZSeamType::RANDOM;
+    if (value == "shortest")
+        return EZSeamType::SHORTEST;
+    if (value == "back")
+        return EZSeamType::BACK;
+    return EZSeamType::SHORTEST;
+}
+
+ESurfaceMode SettingsBaseVirtual::getSettingAsSurfaceMode(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "normal")
+        return ESurfaceMode::NORMAL;
+    if (value == "surface")
+        return ESurfaceMode::SURFACE;
+    if (value == "both")
+        return ESurfaceMode::BOTH;
+    return ESurfaceMode::NORMAL;
+}
+
+FillPerimeterGapMode SettingsBaseVirtual::getSettingAsFillPerimeterGapMode(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "nowhere")
+    {
+        return FillPerimeterGapMode::NOWHERE;
     }
-
-    return true;
+    if (value == "everywhere")
+    {
+        return FillPerimeterGapMode::EVERYWHERE;
+    }
+    if (value == "skin")
+    {
+        return FillPerimeterGapMode::SKIN;
+    }
+    return FillPerimeterGapMode::NOWHERE;
 }
+
+}//namespace cura

src/settings.h

@@ -2,37 +2,24 @@
 #define SETTINGS_H
 
 #include <vector>
+#include <map>
+#include <unordered_map>
+#include <sstream>
 
 #include "utils/floatpoint.h"
 
+namespace cura
+{
+
 #ifndef VERSION
 #define VERSION "DEV"
 #endif
 
-#define FIX_HORRIBLE_UNION_ALL_TYPE_A    0x01
-#define FIX_HORRIBLE_UNION_ALL_TYPE_B    0x02
-#define FIX_HORRIBLE_EXTENSIVE_STITCHING 0x04
-#define FIX_HORRIBLE_UNION_ALL_TYPE_C    0x08
-#define FIX_HORRIBLE_KEEP_NONE_CLOSED    0x10
-
-/**
- * Type of support material.
- * Grid is a X/Y grid with an outline, which is very strong, provides good support. But in some cases is hard to remove.
- * Lines give a row of lines which break off one at a time, making them easier to remove, but they do not support as good as the grid support.
+/*!
+ * Different flavors of GCode. Some machines require different types of GCode.
+ * The GCode flavor definition handles this as a big setting to make major or minor modifications to the GCode.
  */
-enum Support_Pattern
-{
-    SUPPORT_TYPE_GRID = 0,
-    SUPPORT_TYPE_LINES = 1
-};
-
-#ifndef DEFAULT_CONFIG_PATH
-#define DEFAULT_CONFIG_PATH "default.cfg"
-#endif
-
-#define CONFIG_MULTILINE_SEPARATOR "\"\"\""
-
-enum GCode_Flavor
+enum class EGCodeFlavor
 {
 /**
  * RepRap flavored GCode is Marlin/Sprinter/Repetier based GCode.
@@ -42,7 +29,7 @@ enum GCode_Flavor
  *  Retraction is done on E values with G1. Start/end code is added.
  *  M106 Sxxx and M107 are used to turn the fan on/off.
  **/
-    GCODE_FLAVOR_REPRAP = 0,
+    REPRAP = 0,
 /**
  * UltiGCode flavored is Marlin based GCode.
  *  UltiGCode uses less settings on the slicer and puts more settings in the firmware. This makes for more hardware/material independed GCode.
@@ -52,7 +39,7 @@ enum GCode_Flavor
  *  Start/end code is not added.
  *  M106 Sxxx and M107 are used to turn the fan on/off.
  **/
-    GCODE_FLAVOR_ULTIGCODE = 1,
+    ULTIGCODE = 1,
 /**
  * Makerbot flavored GCode.
  *  Looks a lot like RepRap GCode with a few changes. Requires MakerWare to convert to X3G files.
@@ -62,7 +49,7 @@ enum GCode_Flavor
  *   Fan OFF is M127 T0
  *   Homing is done with G162 X Y F2000
  **/
-    GCODE_FLAVOR_MAKERBOT = 2,
+    MAKERBOT = 2,
 
 /**
  * Bits From Bytes GCode.
@@ -70,13 +57,13 @@ enum GCode_Flavor
  *  Need X,Y,Z,F on every line.
  *  Needs extruder ON/OFF (M101, M103), has auto-retrection (M227 S[2560*mm] P[2560*mm])
  **/
-    GCODE_FLAVOR_BFB = 3,
+    BFB = 3,
 
 /**
  * MACH3 GCode
  *  MACH3 is CNC control software, which expects A/B/C/D for extruders, instead of E.
  **/
-    GCODE_FLAVOR_MACH3 = 4,
+    MACH3 = 4,
 /**
  * RepRap volumatric flavored GCode is Marlin based GCode.
  *  Volumatric uses less settings on the slicer and puts more settings in the firmware. This makes for more hardware/material independed GCode.
@@ -85,143 +72,182 @@ enum GCode_Flavor
  *  Retraction is done with G10 and G11. Retraction settings are ignored. G10 S1 is used for multi-extruder switch retraction.
  *  M106 Sxxx and M107 are used to turn the fan on/off.
  **/
-    GCODE_FLAVOR_REPRAP_VOLUMATRIC = 5,
+    REPRAP_VOLUMATRIC = 5,
+};
+
+/*!
+ * Converts a gcode flavor type to string so that it can be included in the gcode.
+ */
+std::string toString(EGCodeFlavor flavor);
+
+/*!
+ * In Cura different infill methods are available.
+ * This enum defines which fill patterns are available to get a uniform naming troughout the engine.
+ * The different methods are used for top/bottom, support and sparse infill.
+ */
+enum class EFillMethod
+{
+    LINES,
+    GRID,
+    TRIANGLES,
+    CONCENTRIC,
+    ZIG_ZAG,
+    NONE
+};
+
+/*!
+ * Type of platform adheasion
+ */
+enum class EPlatformAdhesion
+{
+    SKIRT,
+    BRIM,
+    RAFT
+};
+
+/*!
+ * Type of support material to generate
+ */
+enum class ESupportType
+{
+    NONE,
+    PLATFORM_ONLY,
+    EVERYWHERE
+};
+
+enum class EZSeamType
+{
+    RANDOM,
+    SHORTEST,
+    BACK
+};
+
+enum class ESurfaceMode
+{
+    NORMAL,
+    SURFACE,
+    BOTH
+};
+
+enum class FillPerimeterGapMode
+{
+    NOWHERE,
+    EVERYWHERE,
+    SKIN
 };
 
 #define MAX_EXTRUDERS 16
 
-/**
- * Type of infill pattern.
- */
-enum Infill_Pattern
-{
-    INFILL_AUTOMATIC = 0,
-    INFILL_GRID = 1,
-    INFILL_LINES = 2,
-    INFILL_CONCENTRIC = 3,
-};
+//Maximum number of infill layers that can be combined into a single infill extrusion area.
+#define MAX_INFILL_COMBINE 8
+    
+class SettingsBase;
 
-/**
- * Where to use the combing feature
+/*!
+ * An abstract class for classes that can provide setting values.
+ * These are: SettingsBase, which contains setting information 
+ * and SettingsMessenger, which can pass on setting information from a SettingsBase
  */
-enum Combing_Feature
-{
-    COMBING_OFF = 0,
-    COMBING_ALL = 1,
-    COMBING_NOSKIN = 2,
-};
-
-class _ConfigSettingIndex
+class SettingsBaseVirtual
 {
+protected:
+    SettingsBaseVirtual* parent;
 public:
-    const char* key;
-    int* ptr;
-
-    _ConfigSettingIndex(const char* key, int* ptr) : key(key), ptr(ptr) {}
+    virtual std::string getSettingString(std::string key) = 0;
+    
+    virtual void setSetting(std::string key, std::string value) = 0;
+    
+    virtual ~SettingsBaseVirtual() {}
+    
+    SettingsBaseVirtual(); //!< SettingsBaseVirtual without a parent settings object
+    SettingsBaseVirtual(SettingsBaseVirtual* parent); //!< construct a SettingsBaseVirtual with a parent settings object
+    
+    void setParent(SettingsBaseVirtual* parent) { this->parent = parent; }
+    SettingsBaseVirtual* getParent() { return parent; }
+    
+    int getSettingAsIndex(std::string key);
+    int getSettingAsCount(std::string key);
+    
+    double getSettingInAngleRadians(std::string key);
+    int getSettingInMicrons(std::string key);
+    bool getSettingBoolean(std::string key);
+    double getSettingInDegreeCelsius(std::string key);
+    double getSettingInMillimetersPerSecond(std::string key);
+    double getSettingInCubicMillimeters(std::string key);
+    double getSettingInPercentage(std::string key);
+    double getSettingInSeconds(std::string key);
+    
+    EGCodeFlavor getSettingAsGCodeFlavor(std::string key);
+    EFillMethod getSettingAsFillMethod(std::string key);
+    EPlatformAdhesion getSettingAsPlatformAdhesion(std::string key);
+    ESupportType getSettingAsSupportType(std::string key);
+    EZSeamType getSettingAsZSeamType(std::string key);
+    ESurfaceMode getSettingAsSurfaceMode(std::string key);
+    FillPerimeterGapMode getSettingAsFillPerimeterGapMode(std::string key);
 };
 
-class ConfigSettings
+/*!
+ * Base class for every object that can hold settings.
+ * The SettingBase object can hold multiple key-value pairs that define settings.
+ * The settings that are set on a SettingBase are checked against the SettingRegistry to ensure keys are valid.
+ * Different conversion functions are available for settings to increase code clarity and in the future make
+ * unit conversions possible.
+ */
+class SettingsBase : public SettingsBaseVirtual
 {
 private:
-    std::vector<_ConfigSettingIndex> _index;
+    std::unordered_map<std::string, std::string> setting_values;
 public:
-    static ConfigSettings *config; // allow access to config settings from everywhere
-    int layerThickness;
-    int initialLayerThickness;
-    int filamentDiameter;
-    int filamentFlow;
-    int layer0extrusionWidth;
-    int extrusionWidth;
-    int insetCount;
-    int downSkinCount;
-    int upSkinCount;
-    int skirtDistance;
-    int skirtLineCount;
-    int skirtMinLength;
-
-    //Retraction settings
-    int retractionAmount;
-    int retractionAmountPrime;
-    int retractionAmountExtruderSwitch;
-    int retractionSpeed;
-    int retractionMinimalDistance;
-    int minimalExtrusionBeforeRetraction;
-    int retractionZHop;
-
-    int enableCombing;
-    int enableOozeShield;
-    int wipeTowerSize;
-    int multiVolumeOverlap;
-
-    int initialSpeedupLayers;
-    int initialLayerSpeed;
-    int printSpeed;
-    int inset0Speed;
-    int insetXSpeed;
-    int moveSpeed;
-    int fanFullOnLayerNr;
-
-    //Infill settings
-    int sparseInfillLineDistance;
-    int infillOverlap;
-    int infillSpeed;
-    int infillPattern;
-    int skinSpeed;
-
-    //Support material
-    int supportType;
-    int supportAngle;
-    int supportEverywhere;
-    int supportLineDistance;
-    int supportXYDistance;
-    int supportZDistance;
-    int supportExtruder;
-
-    //Cool settings
-    int minimalLayerTime;
-    int minimalFeedrate;
-    int coolHeadLift;
-    int fanSpeedMin;
-    int fanSpeedMax;
-
-    //Raft settings
-    int raftMargin;
-    int raftLineSpacing;
-    int raftBaseThickness;
-    int raftBaseLinewidth;
-    int raftBaseSpeed;
-    int raftInterfaceThickness;
-    int raftInterfaceLinewidth;
-    int raftInterfaceLineSpacing;
-    int raftFanSpeed;
-    int raftSurfaceThickness;
-    int raftSurfaceLinewidth;
-    int raftSurfaceLineSpacing;
-    int raftSurfaceLayers;
-    int raftSurfaceSpeed;
-    int raftAirGap;
-    int raftAirGapLayer0;
-
-    FMatrix3x3 matrix;
-    IntPoint objectPosition;
-    int objectSink;
-    int autoCenter;
-
-    int fixHorrible;
-    int spiralizeMode;
-    int simpleMode;
-    int gcodeFlavor;
-
-    IntPoint extruderOffset[MAX_EXTRUDERS];
-    std::string startCode;
-    std::string endCode;
-    std::string preSwitchExtruderCode;
-    std::string postSwitchExtruderCode;
-
-    ConfigSettings();
-    bool setSetting(const char* key, const char* value);
-    bool readSettings(void);
-    bool readSettings(const char* path);
+    SettingsBase(); //!< SettingsBase without a parent settings object
+    SettingsBase(SettingsBaseVirtual* parent); //!< construct a SettingsBase with a parent settings object
+    
+    /*!
+     * Retrieve the defaults for each extruder train from the machine_extruder_trains settings 
+     * and set the general settings to those defaults if they haven't been set yet.
+     * 
+     * Only sets those settings which haven't already been set on that level - not looking at its parent (FffProcessor, meshgroup) or children (meshes).
+     * 
+     * \param extruder_nr The index of which extruder train in machine_extruder_trains to get the settings from
+     */
+    void setExtruderTrainDefaults(unsigned int extruder_nr);
+    
+    void setSetting(std::string key, std::string value);
+    std::string getSettingString(std::string key); //!< Get a setting from this SettingsBase (or any ancestral SettingsBase)
+    
+    std::string getAllLocalSettingsString()
+    {
+        std::stringstream sstream;
+        for (auto pair : setting_values)
+        {
+            if (!pair.second.empty())
+            {
+                sstream << " -s " << pair.first << "=\"" << pair.second << "\"";
+            }
+        }
+        return sstream.str();
+    }
+    
+    void debugOutputAllLocalSettings() 
+    {
+        for (auto pair : setting_values)
+            std::cerr << pair.first << " : " << pair.second << std::endl;
+    }
 };
 
+/*!
+ * Base class for an object which passes on settings from another object.
+ * An object which is a subclass of SettingsMessenger can be handled as a SettingsBase;
+ * the difference is that such an object cannot hold any settings, but can only pass on the settings from its parent.
+ */
+class SettingsMessenger : public SettingsBaseVirtual
+{
+public:
+    SettingsMessenger(SettingsBaseVirtual* parent); //!< construct a SettingsMessenger with a parent settings object
+    
+    void setSetting(std::string key, std::string value); //!< Set a setting of the parent SettingsBase to a given value
+    std::string getSettingString(std::string key); //!< Get a setting from the parent SettingsBase (or any further ancestral SettingsBase)
+};
+
+
+}//namespace cura
 #endif//SETTINGS_H

src/skin.cpp

@@ -1,119 +1,237 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
 #include "skin.h"
+#include "utils/polygonUtils.h"
 
-namespace cura {
+#define MIN_AREA_SIZE (0.4 * 0.4) 
 
-void generateSkins(int layerNr, SliceVolumeStorage& storage, int extrusionWidth, int downSkinCount, int upSkinCount, int infillOverlap)
+namespace cura 
 {
-    SliceLayer* layer = &storage.layers[layerNr];
 
+        
+void generateSkins(int layerNr, SliceMeshStorage& storage, int extrusionWidth, int downSkinCount, int upSkinCount, int innermost_wall_extrusion_width, int insetCount, bool no_small_gaps_heuristic, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters)
+{
+    generateSkinAreas(layerNr, storage, innermost_wall_extrusion_width, downSkinCount, upSkinCount, no_small_gaps_heuristic);
+
+    SliceLayer* layer = &storage.layers[layerNr];
     for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
     {
         SliceLayerPart* part = &layer->parts[partNr];
-        
-        Polygons upskin = part->insets[part->insets.size() - 1].offset(-extrusionWidth/2);
-        Polygons downskin = upskin;
-        
-        if (part->insets.size() > 1)
-        {
-            //Add thin wall filling by taking the area between the insets.
-            Polygons thinWalls = part->insets[0].offset(-extrusionWidth / 2 - extrusionWidth * infillOverlap / 100).difference(part->insets[1].offset(extrusionWidth * 6 / 10));
-            upskin.add(thinWalls);
-            downskin.add(thinWalls);
-        }
-        if (static_cast<int>(layerNr - downSkinCount) >= 0)
-        {
-            SliceLayer* layer2 = &storage.layers[layerNr - downSkinCount];
-            for(unsigned int partNr2=0; partNr2<layer2->parts.size(); partNr2++)
-            {
-                if (part->boundaryBox.hit(layer2->parts[partNr2].boundaryBox))
-                    downskin = downskin.difference(layer2->parts[partNr2].insets[layer2->parts[partNr2].insets.size() - 1]);
-            }
-        }
-        if (static_cast<int>(layerNr + upSkinCount) < static_cast<int>(storage.layers.size()))
-        {
-            SliceLayer* layer2 = &storage.layers[layerNr + upSkinCount];
-            for(unsigned int partNr2=0; partNr2<layer2->parts.size(); partNr2++)
-            {
-                if (part->boundaryBox.hit(layer2->parts[partNr2].boundaryBox))
-                    upskin = upskin.difference(layer2->parts[partNr2].insets[layer2->parts[partNr2].insets.size() - 1]);
-            }
-        }
-        
-        part->skinOutline = upskin.unionPolygons(downskin);
+        generateSkinInsets(part, extrusionWidth, insetCount, avoidOverlappingPerimeters_0, avoidOverlappingPerimeters);
+    }
+}
 
-        double minAreaSize = (2 * M_PI * INT2MM(extrusionWidth) * INT2MM(extrusionWidth)) * 0.3;
-        for(unsigned int i=0; i<part->skinOutline.size(); i++)
-        {
-            double area = INT2MM(INT2MM(fabs(part->skinOutline[i].area())));
-            if (area < minAreaSize) // Only create an up/down skin if the area is large enough. So you do not create tiny blobs of "trying to fill"
+void generateSkinAreas(int layer_nr, SliceMeshStorage& storage, int innermost_wall_extrusion_width, int downSkinCount, int upSkinCount, bool no_small_gaps_heuristic)
+{
+    SliceLayer& layer = storage.layers[layer_nr];
+    
+    if (downSkinCount == 0 && upSkinCount == 0)
+    {
+        return;
+    }
+    
+    for(unsigned int partNr = 0; partNr < layer.parts.size(); partNr++)
+    {
+        SliceLayerPart& part = layer.parts[partNr];
+        
+        Polygons upskin = part.insets.back().offset(-innermost_wall_extrusion_width/2);
+        Polygons downskin = (downSkinCount == 0)? Polygons() : upskin;
+        if (upSkinCount == 0) upskin = Polygons();
+
+        auto getInsidePolygons = [&part](SliceLayer& layer2)
             {
-                part->skinOutline.remove(i);
-                i -= 1;
+                Polygons result;
+                for(SliceLayerPart& part2 : layer2.parts)
+                {
+                    if (part.boundaryBox.hit(part2.boundaryBox))
+                        result.add(part2.insets.back());
+                }
+                return result;
+            };
+            
+        if (no_small_gaps_heuristic)
+        {
+            if (static_cast<int>(layer_nr - downSkinCount) >= 0)
+            {
+                downskin = downskin.difference(getInsidePolygons(storage.layers[layer_nr - downSkinCount])); // skin overlaps with the walls
+            }
+            
+            if (static_cast<int>(layer_nr + upSkinCount) < static_cast<int>(storage.layers.size()))
+            {
+                upskin = upskin.difference(getInsidePolygons(storage.layers[layer_nr + upSkinCount])); // skin overlaps with the walls
+            }
+        }
+        else 
+        {
+            if (layer_nr > 0 && downSkinCount > 0)
+            {
+                Polygons not_air = getInsidePolygons(storage.layers[layer_nr - 1]);
+                for (int downskin_layer_nr = std::max(0, layer_nr - downSkinCount); downskin_layer_nr < layer_nr - 1; downskin_layer_nr++)
+                {
+                    not_air = not_air.intersection(getInsidePolygons(storage.layers[downskin_layer_nr]));
+                }
+                downskin = downskin.difference(not_air); // skin overlaps with the walls
+            }
+            
+            if (layer_nr < static_cast<int>(storage.layers.size()) - 1 && upSkinCount > 0)
+            {
+                Polygons not_air = getInsidePolygons(storage.layers[layer_nr + 1]);
+                for (int upskin_layer_nr = layer_nr + 2; upskin_layer_nr < std::min(static_cast<int>(storage.layers.size()) - 1, layer_nr + upSkinCount); upskin_layer_nr++)
+                {
+                    not_air = not_air.intersection(getInsidePolygons(storage.layers[upskin_layer_nr]));
+                }
+                upskin = upskin.difference(not_air); // skin overlaps with the walls
+            }
+        }
+        
+        Polygons skin = upskin.unionPolygons(downskin);
+        
+        skin.removeSmallAreas(MIN_AREA_SIZE);
+        
+        for (PolygonsPart& skin_area_part : skin.splitIntoParts())
+        {
+            part.skin_parts.emplace_back();
+            part.skin_parts.back().outline = skin_area_part;
+        }
+    }
+}
+
+
+void generateSkinInsets(SliceLayerPart* part, int extrusionWidth, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters)
+{
+    if (insetCount == 0)
+    {
+        return;
+    }
+    
+    for (SkinPart& skin_part : part->skin_parts)
+    {
+        for(int i=0; i<insetCount; i++)
+        {
+            skin_part.insets.push_back(Polygons());
+            if (i == 0)
+            {
+                PolygonUtils::offsetSafe(skin_part.outline, - extrusionWidth/2, extrusionWidth, skin_part.insets[0], avoidOverlappingPerimeters_0);
+                Polygons in_between = skin_part.outline.difference(skin_part.insets[0].offset(extrusionWidth/2)); 
+                skin_part.perimeterGaps.add(in_between);
+            } else
+            {
+                PolygonUtils::offsetExtrusionWidth(skin_part.insets[i-1], true, extrusionWidth, skin_part.insets[i], &skin_part.perimeterGaps, avoidOverlappingPerimeters);
+            }
+            
+            // optimize polygons: remove unnnecesary verts
+            skin_part.insets[i].simplify();
+            if (skin_part.insets[i].size() < 1)
+            {
+                skin_part.insets.pop_back();
+                break;
             }
         }
     }
 }
 
-void generateSparse(int layerNr, SliceVolumeStorage& storage, int extrusionWidth, int downSkinCount, int upSkinCount)
+void generateInfill(int layerNr, SliceMeshStorage& storage, int extrusionWidth, int infill_skin_overlap)
 {
-    SliceLayer* layer = &storage.layers[layerNr];
+    SliceLayer& layer = storage.layers[layerNr];
 
-    for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
+    for(SliceLayerPart& part : layer.parts)
     {
-        SliceLayerPart* part = &layer->parts[partNr];
+        Polygons infill = part.insets.back().offset(-extrusionWidth / 2 - infill_skin_overlap);
 
-        Polygons sparse = part->insets[part->insets.size() - 1].offset(-extrusionWidth/2);
-        Polygons downskin = sparse;
-        Polygons upskin = sparse;
-        
-        if (static_cast<int>(layerNr - downSkinCount) >= 0)
+        for(SliceLayerPart& part2 : layer.parts)
         {
-            SliceLayer* layer2 = &storage.layers[layerNr - downSkinCount];
-            for(unsigned int partNr2=0; partNr2<layer2->parts.size(); partNr2++)
+            if (part.boundaryBox.hit(part2.boundaryBox))
             {
-                if (part->boundaryBox.hit(layer2->parts[partNr2].boundaryBox))
+                for(SkinPart& skin_part : part2.skin_parts)
                 {
-                    if (layer2->parts[partNr2].insets.size() > 1)
-                    {
-                        downskin = downskin.difference(layer2->parts[partNr2].insets[layer2->parts[partNr2].insets.size() - 2]);
-                    }else{
-                        downskin = downskin.difference(layer2->parts[partNr2].insets[layer2->parts[partNr2].insets.size() - 1]);
-                    }
+                    infill = infill.difference(skin_part.outline);
                 }
             }
         }
-        if (static_cast<int>(layerNr + upSkinCount) < static_cast<int>(storage.layers.size()))
+        infill.removeSmallAreas(MIN_AREA_SIZE);
+        
+        part.infill_area.push_back(infill.offset(infill_skin_overlap));
+    }
+}
+
+void combineInfillLayers(SliceMeshStorage& storage,unsigned int amount)
+{
+    if(amount <= 1) //If we must combine 1 layer, nothing needs to be combined. Combining 0 layers is invalid.
+    {
+        return;
+    }
+    if(storage.layers.empty() || storage.layers.size() - 1 < static_cast<size_t>(storage.getSettingAsCount("top_layers")) || storage.getSettingAsCount("infill_line_distance") <= 0) //No infill is even generated.
+    {
+        return;
+    }
+    /* We need to round down the layer index we start at to the nearest
+    divisible index. Otherwise we get some parts that have infill at divisible
+    layers and some at non-divisible layers. Those layers would then miss each
+    other. */
+    size_t min_layer = storage.getSettingAsCount("bottom_layers") + amount - 1;
+    min_layer -= min_layer % amount; //Round upwards to the nearest layer divisible by infill_sparse_combine.
+    size_t max_layer = storage.layers.size() - 1 - storage.getSettingAsCount("top_layers");
+    max_layer -= max_layer % amount; //Round downwards to the nearest layer divisible by infill_sparse_combine.
+    for(size_t layer_idx = min_layer;layer_idx <= max_layer;layer_idx += amount) //Skip every few layers, but extrude more.
+    {
+        SliceLayer* layer = &storage.layers[layer_idx];
+
+        for(unsigned int n = 1;n < amount;n++)
         {
-            SliceLayer* layer2 = &storage.layers[layerNr + upSkinCount];
-            for(unsigned int partNr2=0; partNr2<layer2->parts.size(); partNr2++)
+            if(layer_idx < n)
             {
-                if (part->boundaryBox.hit(layer2->parts[partNr2].boundaryBox))
+                break;
+            }
+
+            SliceLayer* layer2 = &storage.layers[layer_idx - n];
+            for(SliceLayerPart& part : layer->parts)
+            {
+                Polygons result;
+                for(SliceLayerPart& part2 : layer2->parts)
                 {
-                    if (layer2->parts[partNr2].insets.size() > 1)
+                    if(part.boundaryBox.hit(part2.boundaryBox))
                     {
-                        upskin = upskin.difference(layer2->parts[partNr2].insets[layer2->parts[partNr2].insets.size() - 2]);
-                    }else{
-                        upskin = upskin.difference(layer2->parts[partNr2].insets[layer2->parts[partNr2].insets.size() - 1]);
+                        Polygons intersection = part.infill_area[n - 1].intersection(part2.infill_area[0]).offset(-200).offset(200);
+                        result.add(intersection);
+                        part.infill_area[n - 1] = part.infill_area[n - 1].difference(intersection);
+                        part2.infill_area[0] = part2.infill_area[0].difference(intersection);
                     }
                 }
-            }
-        }
-        
-        Polygons result = upskin.unionPolygons(downskin);
 
-        double minAreaSize = 3.0;//(2 * M_PI * INT2MM(config.extrusionWidth) * INT2MM(config.extrusionWidth)) * 3;
-        for(unsigned int i=0; i<result.size(); i++)
-        {
-            double area = INT2MM(INT2MM(fabs(result[i].area())));
-            if (area < minAreaSize) /* Only create an up/down skin if the area is large enough. So you do not create tiny blobs of "trying to fill" */
-            {
-                result.remove(i);
-                i -= 1;
+                part.infill_area.push_back(result);
             }
         }
-        
-        part->sparseOutline = sparse.difference(result);
+    }
+}
+
+
+void generatePerimeterGaps(int layer_nr, SliceMeshStorage& storage, int extrusionWidth, int downSkinCount, int upSkinCount)
+{
+    SliceLayer& layer = storage.layers[layer_nr];
+    
+    for (SliceLayerPart& part : layer.parts) 
+    { // handle gaps between perimeters etc.
+        if (downSkinCount > 0 && upSkinCount > 0 && // note: if both are zero or less, then all gaps will be used
+            layer_nr >= downSkinCount && layer_nr < static_cast<int>(storage.layers.size() - upSkinCount)) // remove gaps which appear within print, i.e. not on the bottom most or top most skin
+        {
+            Polygons outlines_above;
+            for (SliceLayerPart& part_above : storage.layers[layer_nr + upSkinCount].parts)
+            {
+                if (part.boundaryBox.hit(part_above.boundaryBox))
+                {
+                    outlines_above.add(part_above.outline);
+                }
+            }
+            Polygons outlines_below;
+            for (SliceLayerPart& part_below : storage.layers[layer_nr - downSkinCount].parts)
+            {
+                if (part.boundaryBox.hit(part_below.boundaryBox))
+                {
+                    outlines_below.add(part_below.outline);
+                }
+            }
+            part.perimeterGaps = part.perimeterGaps.intersection(outlines_above.xorPolygons(outlines_below));
+        }
+        part.perimeterGaps.removeSmallAreas(MIN_AREA_SIZE);
     }
 }