From 470588b296aea880c84071ee53a23f055f9c5bf0 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Fri, 10 May 2013 01:13:11 +0200
Subject: Quick feasibility test for #304


diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc
index eb66687..add90d3 100644
--- a/src/OpenCSGRenderer.cc
+++ b/src/OpenCSGRenderer.cc
@@ -95,7 +95,7 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo,
 					csgmode = PolySet::csgmode_e(csgmode + 20);
 				}
 				else if (background) {
-					setColor(COLORMODE_BACKGROUND, shaderinfo);
+					setColor(COLORMODE_BACKGROUND, c.data(), shaderinfo);
 					csgmode = PolySet::csgmode_e(csgmode + 10);
 				} else if (c[0] >= 0 || c[1] >= 0 || c[2] >= 0 || c[3] >= 0) {
 					// User-defined color or alpha from source
diff --git a/src/renderer.cc b/src/renderer.cc
index 985b460..77dcde9 100644
--- a/src/renderer.cc
+++ b/src/renderer.cc
@@ -17,6 +17,27 @@ void Renderer::setColor(const float color[4], GLint *shaderinfo) const
 	}
 }
 
+void Renderer::setColor(ColorMode colormode, const float color[4], GLint *shaderinfo) const
+{
+	if (colormode == COLORMODE_BACKGROUND && 
+			color[0] >= 0 || color[1] >= 0 || color[2] >= 0 || color[3] >= 0) {
+
+		Color4f col;
+    col.setRgb(180, 180, 180, 255);
+		float c[4] = {color[0], color[1], color[2], color[3]};
+		if (c[0] < 0) c[0] = col[0];
+		if (c[1] < 0) c[1] = col[1];
+		if (c[2] < 0) c[2] = col[2];
+		if (c[3] < 0) c[3] = col[3];
+
+		c[3] /= 2; // Background objects are half-transparent
+		setColor(c, shaderinfo);
+	}
+	else {
+		setColor(colormode, shaderinfo);
+	}
+}
+
 void Renderer::setColor(ColorMode colormode, GLint *shaderinfo) const
 {
 	Color4f col;
diff --git a/src/renderer.h b/src/renderer.h
index 2bc482d..24c1d94 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -27,6 +27,7 @@ public:
 
 	virtual void setColor(const float color[4], GLint *shaderinfo = NULL) const;
 	virtual void setColor(ColorMode colormode, GLint *shaderinfo = NULL) const;
+	virtual void setColor(ColorMode colormode, const float color[4], GLint *shaderinfo = NULL) const;
 };
 
 #endif // RENDERER_H
-- 
cgit v0.10.1


From 293f3cc7c9c6dfec76120714b33a458f54792545 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Thu, 16 May 2013 06:54:34 -0500
Subject: enable mingw64 cross build (alpha stage)


diff --git a/eigen.pri b/eigen.pri
index 5935a47..1c9a5ef 100644
--- a/eigen.pri
+++ b/eigen.pri
@@ -70,7 +70,12 @@ isEmpty(EIGEN_INCLUDEPATH) {
 }
 
 mingw-cross-env {
-  EIGEN_CFLAGS = $$system("i686-pc-mingw32-pkg-config --cflags eigen3")
+  exists(mingw-cross-env/../i686-pc-mingw32-pkg-config) {
+    EIGEN_CFLAGS = $$system("i686-pc-mingw32-pkg-config --cflags eigen3")
+  }
+  exists(mingw-cross-env/../x86_64-w64-mingw32-pkg-config) {
+    EIGEN_CFLAGS = $$system("x86_64-w64-mingw32-pkg-config --cflags eigen3")
+  }
   EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
 }
 
diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri
index 9b808c0..a447fd8 100644
--- a/mingw-cross-env.pri
+++ b/mingw-cross-env.pri
@@ -4,7 +4,9 @@ CONFIG(mingw-cross-env) {
   LIBS += mingw-cross-env/lib/libglut.a 
   LIBS += mingw-cross-env/lib/libopengl32.a 
   LIBS += mingw-cross-env/lib/libGLEW.a 
-  LIBS += mingw-cross-env/lib/libglaux.a 
+  exists( mingw-cross-env/lib/libglaux.a ) {
+    LIBS += mingw-cross-env/lib/libglaux.a
+  }
   LIBS += mingw-cross-env/lib/libglu32.a 
   LIBS += mingw-cross-env/lib/libopencsg.a 
   LIBS += mingw-cross-env/lib/libmpfr.a 
diff --git a/scripts/LogicLib.nsh b/scripts/LogicLib.nsh
new file mode 100644
index 0000000..2f8968c
--- /dev/null
+++ b/scripts/LogicLib.nsh
@@ -0,0 +1,792 @@
+; NSIS LOGIC LIBRARY - LogicLib.nsh
+; Version 2.6 - 08/12/2007
+; By dselkirk@hotmail.com
+; and eccles@users.sf.net
+; with IfNot support added by Message
+;
+; Questions/Comments -
+; See http://forums.winamp.com/showthread.php?s=&postid=1116241
+;
+; Description:
+;   Provides the use of various logic statements within NSIS.
+;
+; Usage:
+;   The following "statements" are available:
+;       If|IfNot|Unless..{ElseIf|ElseIfNot|ElseUnless}..[Else]..EndIf|EndUnless
+;         - Conditionally executes a block of statements, depending on the value
+;           of an expression. IfNot and Unless are equivalent and
+;           interchangeable, as are ElseIfNot and ElseUnless.
+;       AndIf|AndIfNot|AndUnless|OrIf|OrIfNot|OrUnless
+;         - Adds any number of extra conditions to If, IfNot, Unless, ElseIf,
+;           ElseIfNot and ElseUnless statements.
+;       IfThen|IfNotThen..|..|
+;         - Conditionally executes an inline statement, depending on the value
+;           of an expression.
+;       IfCmd..||..|
+;         - Conditionally executes an inline statement, depending on a true
+;           value of the provided NSIS function.
+;       Select..{Case[2|3|4|5]}..[CaseElse|Default]..EndSelect
+;         - Executes one of several blocks of statements, depending on the value
+;           of an expression.
+;       Switch..{Case|CaseElse|Default}..EndSwitch
+;         - Jumps to one of several labels, depending on the value of an
+;           expression.
+;       Do[While|Until]..{ExitDo|Continue|Break}..Loop[While|Until]
+;         - Repeats a block of statements until stopped, or depending on the
+;           value of an expression.
+;       While..{ExitWhile|Continue|Break}..EndWhile
+;         - An alias for DoWhile..Loop (for backwards-compatibility)
+;       For[Each]..{ExitFor|Continue|Break}..Next
+;         - Repeats a block of statements varying the value of a variable.
+;
+;   The following "expressions" are available:
+;       Standard (built-in) string tests (which are case-insensitive):
+;         a == b; a != b
+;       Additional case-insensitive string tests (using System.dll):
+;         a S< b; a S>= b; a S> b; a S<= b
+;       Case-sensitive string tests:
+;         a S== b; a S!= b
+;       Standard (built-in) signed integer tests:
+;         a = b; a <> b; a < b; a >= b; a > b; a <= b
+;       Standard (built-in) unsigned integer tests:
+;         a U< b; a U>= b; a U> b; a U<= b
+;       64-bit integer tests (using System.dll):
+;         a L= b; a L<> b; a L< b; a L>= b; a L> b; a L<= b
+;       Built-in NSIS flag tests:
+;         ${Abort}; ${Errors}; ${RebootFlag}; ${Silent}
+;       Built-in NSIS other tests:
+;         ${FileExists} a
+;       Any conditional NSIS instruction test:
+;         ${Cmd} a
+;       Section flag tests:
+;         ${SectionIsSelected} a; ${SectionIsSectionGroup} a;
+;         ${SectionIsSectionGroupEnd} a; ${SectionIsBold} a;
+;         ${SectionIsReadOnly} a; ${SectionIsExpanded} a;
+;         ${SectionIsPartiallySelected} a
+;
+; Examples:
+;   See LogicLib.nsi in the Examples folder for lots of example usage.
+
+!verbose push
+!verbose 3
+!ifndef LOGICLIB_VERBOSITY
+  !define LOGICLIB_VERBOSITY 3
+!endif
+!define _LOGICLIB_VERBOSITY ${LOGICLIB_VERBOSITY}
+!undef LOGICLIB_VERBOSITY
+!verbose ${_LOGICLIB_VERBOSITY}
+
+!ifndef LOGICLIB
+  !define LOGICLIB
+  !define | "'"
+  !define || "' '"
+  !define LOGICLIB_COUNTER 0
+
+  !include Sections.nsh
+
+  !macro _LOGICLIB_TEMP
+    !ifndef _LOGICLIB_TEMP
+      !define _LOGICLIB_TEMP
+      Var /GLOBAL _LOGICLIB_TEMP  ; Temporary variable to aid the more elaborate logic tests
+    !endif
+  !macroend
+
+  !macro _IncreaseCounter
+    !define _LOGICLIB_COUNTER ${LOGICLIB_COUNTER}
+    !undef LOGICLIB_COUNTER
+    !define /math LOGICLIB_COUNTER ${_LOGICLIB_COUNTER} + 1
+    !undef _LOGICLIB_COUNTER
+  !macroend
+
+  !macro _PushLogic
+    !insertmacro _PushScope Logic _LogicLib_Label_${LOGICLIB_COUNTER}
+    !insertmacro _IncreaseCounter
+  !macroend
+
+  !macro _PopLogic
+    !insertmacro _PopScope Logic
+  !macroend
+
+  !macro _PushScope Type label
+    !ifdef _${Type}                                       ; If we already have a statement
+      !define _Cur${Type} ${_${Type}}
+      !undef _${Type}
+      !define _${Type} ${label}
+      !define ${_${Type}}Prev${Type} ${_Cur${Type}}       ; Save the current logic
+      !undef _Cur${Type}
+    !else
+      !define _${Type} ${label}                           ; Initialise for first statement
+    !endif
+  !macroend
+
+  !macro _PopScope Type
+    !ifndef _${Type}
+      !error "Cannot use _Pop${Type} without a preceding _Push${Type}"
+    !endif
+    !ifdef ${_${Type}}Prev${Type}                         ; If a previous statment was active then restore it
+      !define _Cur${Type} ${_${Type}}
+      !undef _${Type}
+      !define _${Type} ${${_Cur${Type}}Prev${Type}}
+      !undef ${_Cur${Type}}Prev${Type}
+      !undef _Cur${Type}
+    !else
+      !undef _${Type}
+    !endif
+  !macroend
+
+  ; String tests
+  !macro _== _a _b _t _f
+    StrCmp `${_a}` `${_b}` `${_t}` `${_f}`
+  !macroend
+
+  !macro _!= _a _b _t _f
+    !insertmacro _== `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  ; Case-sensitive string tests
+  !macro _S== _a _b _t _f
+    StrCmpS `${_a}` `${_b}` `${_t}` `${_f}`
+  !macroend
+
+  !macro _S!= _a _b _t _f
+    !insertmacro _S== `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  ; Extra string tests (cannot do these case-sensitively - I tried and lstrcmp still ignored the case)
+  !macro _StrCmpI _a _b _e _l _m
+    !insertmacro _LOGICLIB_TEMP
+    System::Call `kernel32::lstrcmpiA(ts, ts) i.s` `${_a}` `${_b}`
+    Pop $_LOGICLIB_TEMP
+    IntCmp $_LOGICLIB_TEMP 0 `${_e}` `${_l}` `${_m}`
+  !macroend
+
+  !macro _S< _a _b _t _f
+    !insertmacro _StrCmpI `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`
+  !macroend
+
+  !macro _S>= _a _b _t _f
+    !insertmacro _S< `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  !macro _S> _a _b _t _f
+    !insertmacro _StrCmpI `${_a}` `${_b}` `${_f}` `${_f}` `${_t}`
+  !macroend
+
+  !macro _S<= _a _b _t _f
+    !insertmacro _S> `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  ; Integer tests
+  !macro _= _a _b _t _f
+    IntCmp `${_a}` `${_b}` `${_t}` `${_f}` `${_f}`
+  !macroend
+
+  !macro _<> _a _b _t _f
+    !insertmacro _= `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  !macro _< _a _b _t _f
+    IntCmp `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`
+  !macroend
+
+  !macro _>= _a _b _t _f
+    !insertmacro _< `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  !macro _> _a _b _t _f
+    IntCmp `${_a}` `${_b}` `${_f}` `${_f}` `${_t}`
+  !macroend
+
+  !macro _<= _a _b _t _f
+    !insertmacro _> `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  ; Unsigned integer tests (NB: no need for extra equality tests)
+  !macro _U< _a _b _t _f
+    IntCmpU `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`
+  !macroend
+
+  !macro _U>= _a _b _t _f
+    !insertmacro _U< `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  !macro _U> _a _b _t _f
+    IntCmpU `${_a}` `${_b}` `${_f}` `${_f}` `${_t}`
+  !macroend
+
+  !macro _U<= _a _b _t _f
+    !insertmacro _U> `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  ; Int64 tests
+  !macro _Int64Cmp _a _o _b _t _f
+    !insertmacro _LOGICLIB_TEMP
+    System::Int64Op `${_a}` `${_o}` `${_b}`
+    Pop $_LOGICLIB_TEMP
+    !insertmacro _= $_LOGICLIB_TEMP 0 `${_f}` `${_t}`
+  !macroend
+
+  !macro _L= _a _b _t _f
+    !insertmacro _Int64Cmp `${_a}` = `${_b}` `${_t}` `${_f}`
+  !macroend
+
+  !macro _L<> _a _b _t _f
+    !insertmacro _L= `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  !macro _L< _a _b _t _f
+    !insertmacro _Int64Cmp `${_a}` < `${_b}` `${_t}` `${_f}`
+  !macroend
+
+  !macro _L>= _a _b _t _f
+    !insertmacro _L< `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  !macro _L> _a _b _t _f
+    !insertmacro _Int64Cmp `${_a}` > `${_b}` `${_t}` `${_f}`
+  !macroend
+
+  !macro _L<= _a _b _t _f
+    !insertmacro _L> `${_a}` `${_b}` `${_f}` `${_t}`
+  !macroend
+
+  ; Flag tests
+  !macro _Abort _a _b _t _f
+    IfAbort `${_t}` `${_f}`
+  !macroend
+  !define Abort `"" Abort ""`
+
+  !macro _Errors _a _b _t _f
+    IfErrors `${_t}` `${_f}`
+  !macroend
+  !define Errors `"" Errors ""`
+
+  !macro _FileExists _a _b _t _f
+    IfFileExists `${_b}` `${_t}` `${_f}`
+  !macroend
+  !define FileExists `"" FileExists`
+
+  !macro _RebootFlag _a _b _t _f
+    IfRebootFlag `${_t}` `${_f}`
+  !macroend
+  !define RebootFlag `"" RebootFlag ""`
+
+  !macro _Silent _a _b _t _f
+    IfSilent `${_t}` `${_f}`
+  !macroend
+  !define Silent `"" Silent ""`
+
+  ; "Any instruction" test
+  !macro _Cmd _a _b _t _f
+    !define _t=${_t}
+    !ifdef _t=                                            ; If no true label then make one
+      !define __t _LogicLib_Label_${LOGICLIB_COUNTER}
+      !insertmacro _IncreaseCounter
+    !else
+      !define __t ${_t}
+    !endif
+    ${_b} ${__t}
+    !define _f=${_f}
+    !ifndef _f=                                           ; If a false label then go there
+      Goto ${_f}
+    !endif
+    !undef _f=${_f}
+    !ifdef _t=                                            ; If we made our own true label then place it
+      ${__t}:
+    !endif
+    !undef __t
+    !undef _t=${_t}
+  !macroend
+  !define Cmd `"" Cmd`
+
+  ; Section flag test
+  !macro _SectionFlagIsSet _a _b _t _f
+    !insertmacro _LOGICLIB_TEMP
+    SectionGetFlags `${_b}` $_LOGICLIB_TEMP
+    IntOp $_LOGICLIB_TEMP $_LOGICLIB_TEMP & `${_a}`
+    !insertmacro _= $_LOGICLIB_TEMP `${_a}` `${_t}` `${_f}`
+  !macroend
+  !define SectionIsSelected `${SF_SELECTED} SectionFlagIsSet`
+  !define SectionIsSubSection `${SF_SUBSEC} SectionFlagIsSet`
+  !define SectionIsSubSectionEnd `${SF_SUBSECEND} SectionFlagIsSet`
+  !define SectionIsSectionGroup `${SF_SECGRP} SectionFlagIsSet`
+  !define SectionIsSectionGroupEnd `${SF_SECGRPEND} SectionFlagIsSet`
+  !define SectionIsBold `${SF_BOLD} SectionFlagIsSet`
+  !define SectionIsReadOnly `${SF_RO} SectionFlagIsSet`
+  !define SectionIsExpanded `${SF_EXPAND} SectionFlagIsSet`
+  !define SectionIsPartiallySelected `${SF_PSELECTED} SectionFlagIsSet`
+
+  !define IfCmd `!insertmacro _IfThen "" Cmd ${|}`
+
+  !macro _If _c _a _o _b
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !insertmacro _PushLogic
+    !define ${_Logic}If
+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the Else
+    !insertmacro _IncreaseCounter
+    !define _c=${_c}
+    !ifdef _c=true                                        ; If is true
+      !insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}
+    !else                                                 ; If condition is false
+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""
+    !endif
+    !undef _c=${_c}
+    !verbose pop
+  !macroend
+  !define If     `!insertmacro _If true`
+  !define Unless `!insertmacro _If false`
+  !define IfNot  `!insertmacro _If false`
+
+  !macro _And _c _a _o _b
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifndef _Logic | ${_Logic}If
+      !error "Cannot use And without a preceding If or IfNot/Unless"
+    !endif
+    !ifndef ${_Logic}Else
+      !error "Cannot use And following an Else"
+    !endif
+    !define _c=${_c}
+    !ifdef _c=true                                        ; If is true
+      !insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}
+    !else                                                 ; If condition is false
+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""
+    !endif
+    !undef _c=${_c}
+    !verbose pop
+  !macroend
+  !define AndIf     `!insertmacro _And true`
+  !define AndUnless `!insertmacro _And false`
+  !define AndIfNot  `!insertmacro _And false`
+
+  !macro _Or _c _a _o _b
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifndef _Logic | ${_Logic}If
+      !error "Cannot use Or without a preceding If or IfNot/Unless"
+    !endif
+    !ifndef ${_Logic}Else
+      !error "Cannot use Or following an Else"
+    !endif
+    !define _label _LogicLib_Label_${LOGICLIB_COUNTER}                           ; Skip this test as we already
+    !insertmacro _IncreaseCounter
+    Goto ${_label}                                        ; have a successful result
+    ${${_Logic}Else}:                                     ; Place the Else label
+    !undef ${_Logic}Else                                  ; and remove it
+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new If
+    !insertmacro _IncreaseCounter
+    !define _c=${_c}
+    !ifdef _c=true                                        ; If is true
+      !insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}
+    !else                                                 ; If condition is false
+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""
+    !endif
+    !undef _c=${_c}
+    ${_label}:
+    !undef _label
+    !verbose pop
+  !macroend
+  !define OrIf     `!insertmacro _Or true`
+  !define OrUnless `!insertmacro _Or false`
+  !define OrIfNot  `!insertmacro _Or false`
+
+  !macro _Else
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifndef _Logic | ${_Logic}If
+      !error "Cannot use Else without a preceding If or IfNot/Unless"
+    !endif
+    !ifndef ${_Logic}Else
+      !error "Cannot use Else following an Else"
+    !endif
+    !ifndef ${_Logic}EndIf                                ; First Else for this If?
+      !define ${_Logic}EndIf _LogicLib_Label_${LOGICLIB_COUNTER}                 ; Get a label for the EndIf
+      !insertmacro _IncreaseCounter
+    !endif
+    Goto ${${_Logic}EndIf}                                ; Go to the EndIf
+    ${${_Logic}Else}:                                     ; Place the Else label
+    !undef ${_Logic}Else                                  ; and remove it
+    !verbose pop
+  !macroend
+  !define Else `!insertmacro _Else`
+
+  !macro _ElseIf _c _a _o _b
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    ${Else}                                               ; Perform the Else
+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new If
+    !insertmacro _IncreaseCounter
+    !define _c=${_c}
+    !ifdef _c=true                                        ; If is true
+      !insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}
+    !else                                                 ; If condition is false
+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""
+    !endif
+    !undef _c=${_c}
+    !verbose pop
+  !macroend
+  !define ElseIf     `!insertmacro _ElseIf true`
+  !define ElseUnless `!insertmacro _ElseIf false`
+  !define ElseIfNot  `!insertmacro _ElseIf false`
+
+  !macro _EndIf _n
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifndef _Logic | ${_Logic}If
+      !error "Cannot use End${_n} without a preceding If or IfNot/Unless"
+    !endif
+    !ifdef ${_Logic}Else
+      ${${_Logic}Else}:                                   ; Place the Else label
+      !undef ${_Logic}Else                                ; and remove it
+    !endif
+    !ifdef ${_Logic}EndIf
+      ${${_Logic}EndIf}:                                  ; Place the EndIf
+      !undef ${_Logic}EndIf                               ; and remove it
+    !endif
+    !undef ${_Logic}If
+    !insertmacro _PopLogic
+    !verbose pop
+  !macroend
+  !define EndIf     `!insertmacro _EndIf If`
+  !define EndUnless `!insertmacro _EndIf Unless`
+
+  !macro _IfThen _a _o _b _t
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    ${If} `${_a}` `${_o}` `${_b}`
+      ${_t}
+    ${EndIf}
+    !verbose pop
+  !macroend
+  !define IfThen `!insertmacro _IfThen`
+
+  !macro _IfNotThen _a _o _b _t
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    ${IfNot} `${_a}` `${_o}` `${_b}`
+      ${_t}
+    ${EndIf}
+    !verbose pop
+  !macroend
+  !define IfNotThen `!insertmacro _IfNotThen`
+
+  !macro _ForEach _v _f _t _o _s
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    StrCpy "${_v}" "${_f}"                                ; Assign the initial value
+    Goto +2                                               ; Skip the loop expression for the first iteration
+    !define _DoLoopExpression `IntOp "${_v}" "${_v}" "${_o}" "${_s}"` ; Define the loop expression
+    !define _o=${_o}
+    !ifdef _o=+                                           ; Check the loop expression operator
+      !define __o >                                       ; to determine the correct loop condition
+    !else ifdef _o=-
+      !define __o <
+    !else
+      !error "Unsupported ForEach step operator (must be + or -)"
+    !endif
+    !undef _o=${_o}
+    !insertmacro _Do For false `${_v}` `${__o}` `${_t}`   ; Let Do do the rest
+    !undef __o
+    !verbose pop
+  !macroend
+  !define ForEach `!insertmacro _ForEach`
+
+  !macro _For _v _f _t
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    ${ForEach} `${_v}` `${_f}` `${_t}` + 1                ; Pass on to ForEach
+    !verbose pop
+  !macroend
+  !define For `!insertmacro _For`
+
+  !define ExitFor `!insertmacro _Goto ExitFor For`
+
+  !define Next      `!insertmacro _Loop For Next "" "" "" ""`
+
+  !define While     `!insertmacro _Do While true`
+
+  !define ExitWhile `!insertmacro _Goto ExitWhile While`
+
+  !define EndWhile  `!insertmacro _Loop While EndWhile "" "" "" ""`
+
+  !macro _Do _n _c _a _o _b
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !insertmacro _PushLogic
+    !define ${_Logic}${_n} _LogicLib_Label_${LOGICLIB_COUNTER}                   ; Get a label for the start of the loop
+    !insertmacro _IncreaseCounter
+    ${${_Logic}${_n}}:
+    !insertmacro _PushScope Exit${_n} _LogicLib_Label_${LOGICLIB_COUNTER}        ; Get a label for the end of the loop
+    !insertmacro _IncreaseCounter
+    !insertmacro _PushScope Break ${_Exit${_n}}           ; Break goes to the end of the loop
+    !ifdef _DoLoopExpression
+      ${_DoLoopExpression}                                ; Special extra parameter for inserting code
+      !undef _DoLoopExpression                            ; between the Continue label and the loop condition
+    !endif
+    !define _c=${_c}
+    !ifdef _c=                                            ; No starting condition
+      !insertmacro _PushScope Continue _LogicLib_Label_${LOGICLIB_COUNTER}       ; Get a label for Continue at the end of the loop
+      !insertmacro _IncreaseCounter
+    !else
+      !insertmacro _PushScope Continue ${${_Logic}${_n}}  ; Continue goes to the start of the loop
+      !ifdef _c=true                                      ; If is true
+        !insertmacro _${_o} `${_a}` `${_b}` "" ${_Exit${_n}}
+      !else                                               ; If condition is false
+        !insertmacro _${_o} `${_a}` `${_b}` ${_Exit${_n}} ""
+      !endif
+    !endif
+    !undef _c=${_c}
+    !define ${_Logic}Condition ${_c}                      ; Remember the condition used
+    !verbose pop
+  !macroend
+  !define Do      `!insertmacro _Do Do "" "" "" ""`
+  !define DoWhile `!insertmacro _Do Do true`
+  !define DoUntil `!insertmacro _Do Do false`
+
+  !macro _Goto _n _s
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifndef _${_n}
+      !error "Cannot use ${_n} without a preceding ${_s}"
+    !endif
+    Goto ${_${_n}}
+    !verbose pop
+  !macroend
+  !define ExitDo   `!insertmacro _Goto ExitDo Do`
+
+  !macro _Loop _n _e _c _a _o _b
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifndef _Logic | ${_Logic}${_n}
+      !error "Cannot use ${_e} without a preceding ${_n}"
+    !endif
+    !define _c=${${_Logic}Condition}
+    !ifdef _c=                                            ; If Do had no condition place the Continue label
+      ${_Continue}:
+    !endif
+    !undef _c=${${_Logic}Condition}
+    !define _c=${_c}
+    !ifdef _c=                                            ; No ending condition
+      Goto ${${_Logic}${_n}}
+    !else ifdef _c=true                                   ; If condition is true
+      !insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}${_n}} ${_Exit${_n}}
+    !else                                                 ; If condition is false
+      !insertmacro _${_o} `${_a}` `${_b}` ${_Exit${_n}} ${${_Logic}${_n}}
+    !endif
+    !undef _c=${_c}
+    Goto ${_Continue}                                     ; Just to ensure it is referenced at least once
+	Goto ${_Exit${_n}}                                    ; Just to ensure it is referenced at least once
+    ${_Exit${_n}}:                                        ; Place the loop exit point
+    !undef ${_Logic}Condition
+    !insertmacro _PopScope Continue
+    !insertmacro _PopScope Break
+    !insertmacro _PopScope Exit${_n}
+    !undef ${_Logic}${_n}
+    !insertmacro _PopLogic
+    !verbose pop
+  !macroend
+  !define Loop      `!insertmacro _Loop Do Loop "" "" "" ""`
+  !define LoopWhile `!insertmacro _Loop Do LoopWhile true`
+  !define LoopUntil `!insertmacro _Loop Do LoopUntil false`
+
+  !define Continue `!insertmacro _Goto Continue "For or Do or While"`
+  !define Break    `!insertmacro _Goto Break "For or Do or While"`
+
+  !macro _Select _a
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !insertmacro _PushLogic
+    !define ${_Logic}Select `${_a}`                       ; Remember the left hand side of the comparison
+    !verbose pop
+  !macroend
+  !define Select `!insertmacro _Select`
+
+  !macro _Select_CaseElse
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifndef _Logic | ${_Logic}Select
+      !error "Cannot use Case without a preceding Select"
+    !endif
+    !ifdef ${_Logic}EndSelect                             ; This is set only after the first case
+      !ifndef ${_Logic}Else
+        !error "Cannot use Case following a CaseElse"
+      !endif
+      Goto ${${_Logic}EndSelect}                          ; Go to the EndSelect
+      ${${_Logic}Else}:                                   ; Place the Else label
+      !undef ${_Logic}Else                                ; and remove it
+    !else
+      !define ${_Logic}EndSelect _LogicLib_Label_${LOGICLIB_COUNTER}             ; Get a label for the EndSelect
+      !insertmacro _IncreaseCounter
+    !endif
+    !verbose pop
+  !macroend
+  !define CaseElse `!insertmacro _CaseElse`
+  !define Case_Else `!insertmacro _CaseElse`              ; Compatibility with 2.2 and earlier
+  !define Default `!insertmacro _CaseElse`                ; For the C-minded
+
+  !macro _Select_Case _a
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    ${CaseElse}                                           ; Perform the CaseElse
+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !insertmacro _IncreaseCounter
+    !insertmacro _== `${${_Logic}Select}` `${_a}` "" ${${_Logic}Else}
+    !verbose pop
+  !macroend
+  !define Case `!insertmacro _Case`
+
+  !macro _Case2 _a _b
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    ${CaseElse}                                           ; Perform the CaseElse
+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !insertmacro _IncreaseCounter
+    !insertmacro _== `${${_Logic}Select}` `${_a}` +2 ""
+    !insertmacro _== `${${_Logic}Select}` `${_b}` "" ${${_Logic}Else}
+    !verbose pop
+  !macroend
+  !define Case2 `!insertmacro _Case2`
+
+  !macro _Case3 _a _b _c
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    ${CaseElse}                                           ; Perform the CaseElse
+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !insertmacro _IncreaseCounter
+    !insertmacro _== `${${_Logic}Select}` `${_a}` +3 ""
+    !insertmacro _== `${${_Logic}Select}` `${_b}` +2 ""
+    !insertmacro _== `${${_Logic}Select}` `${_c}` "" ${${_Logic}Else}
+    !verbose pop
+  !macroend
+  !define Case3 `!insertmacro _Case3`
+
+  !macro _Case4 _a _b _c _d
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    ${CaseElse}                                           ; Perform the CaseElse
+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !insertmacro _IncreaseCounter
+    !insertmacro _== `${${_Logic}Select}` `${_a}` +4 ""
+    !insertmacro _== `${${_Logic}Select}` `${_b}` +3 ""
+    !insertmacro _== `${${_Logic}Select}` `${_c}` +2 ""
+    !insertmacro _== `${${_Logic}Select}` `${_d}` "" ${${_Logic}Else}
+    !verbose pop
+  !macroend
+  !define Case4 `!insertmacro _Case4`
+
+  !macro _Case5 _a _b _c _d _e
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    ${CaseElse}                                           ; Perform the CaseElse
+    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !insertmacro _IncreaseCounter
+    !insertmacro _== `${${_Logic}Select}` `${_a}` +5 ""
+    !insertmacro _== `${${_Logic}Select}` `${_b}` +4 ""
+    !insertmacro _== `${${_Logic}Select}` `${_c}` +3 ""
+    !insertmacro _== `${${_Logic}Select}` `${_d}` +2 ""
+    !insertmacro _== `${${_Logic}Select}` `${_e}` "" ${${_Logic}Else}
+    !verbose pop
+  !macroend
+  !define Case5 `!insertmacro _Case5`
+
+  !macro _EndSelect
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifndef _Logic | ${_Logic}Select
+      !error "Cannot use EndSelect without a preceding Select"
+    !endif
+    !ifdef ${_Logic}Else
+      ${${_Logic}Else}:                                   ; Place the Else label
+      !undef ${_Logic}Else                                ; and remove it
+    !endif
+    !ifdef ${_Logic}EndSelect                             ; This won't be set if there weren't any cases
+      ${${_Logic}EndSelect}:                              ; Place the EndSelect
+      !undef ${_Logic}EndSelect                           ; and remove it
+    !endif
+    !undef ${_Logic}Select
+    !insertmacro _PopLogic
+    !verbose pop
+  !macroend
+  !define EndSelect `!insertmacro _EndSelect`
+
+  !macro _Switch _a
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !insertmacro _PushLogic
+    !insertmacro _PushScope Switch ${_Logic}              ; Keep a separate stack for switch data
+    !insertmacro _PushScope Break _LogicLib_Label_${LOGICLIB_COUNTER}            ; Get a lable for beyond the end of the switch
+    !insertmacro _IncreaseCounter
+    !define ${_Switch}Var `${_a}`                         ; Remember the left hand side of the comparison
+    !tempfile ${_Switch}Tmp                               ; Create a temporary file
+    !define ${_Logic}Switch _LogicLib_Label_${LOGICLIB_COUNTER}                  ; Get a label for the end of the switch
+    !insertmacro _IncreaseCounter
+    Goto ${${_Logic}Switch}                               ; and go there
+    !verbose pop
+  !macroend
+  !define Switch `!insertmacro _Switch`
+
+  !macro _Case _a
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifdef _Logic & ${_Logic}Select                       ; Check for an active Select
+      !insertmacro _Select_Case `${_a}`
+    !else ifndef _Switch                                  ; If not then check for an active Switch
+      !error "Cannot use Case without a preceding Select or Switch"
+    !else
+      !define _label _LogicLib_Label_${LOGICLIB_COUNTER}                         ; Get a label for this case,
+      !insertmacro _IncreaseCounter
+      ${_label}:                                          ; place it and add it's check to the temp file
+      !appendfile "${${_Switch}Tmp}" `!insertmacro _== $\`${${_Switch}Var}$\` $\`${_a}$\` ${_label} ""$\n`
+      !undef _label
+    !endif
+    !verbose pop
+  !macroend
+
+  !macro _CaseElse
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifdef _Logic & ${_Logic}Select                       ; Check for an active Select
+      !insertmacro _Select_CaseElse
+    !else ifndef _Switch                                  ; If not then check for an active Switch
+      !error "Cannot use Case without a preceding Select or Switch"
+    !else ifdef ${_Switch}Else                            ; Already had a default case?
+      !error "Cannot use CaseElse following a CaseElse"
+    !else
+      !define ${_Switch}Else _LogicLib_Label_${LOGICLIB_COUNTER}                 ; Get a label for the default case,
+      !insertmacro _IncreaseCounter
+      ${${_Switch}Else}:                                  ; and place it
+    !endif
+    !verbose pop
+  !macroend
+
+  !macro _EndSwitch
+    !verbose push
+    !verbose ${LOGICLIB_VERBOSITY}
+    !ifndef _Logic | ${_Logic}Switch
+      !error "Cannot use EndSwitch without a preceding Switch"
+    !endif
+    Goto ${_Break}                                        ; Skip the jump table
+    ${${_Logic}Switch}:                                   ; Place the end of the switch
+    !undef ${_Logic}Switch
+    !include "${${_Switch}Tmp}"                           ; Include the jump table
+    !delfile "${${_Switch}Tmp}"                           ; and clear it up
+    !ifdef ${_Switch}Else                                 ; Was there a default case?
+      Goto ${${_Switch}Else}                              ; then go there if all else fails
+      !undef ${_Switch}Else
+    !endif
+    !undef ${_Switch}Tmp
+    !undef ${_Switch}Var
+    ${_Break}:                                            ; Place the break label
+    !insertmacro _PopScope Break
+    !insertmacro _PopScope Switch
+    !insertmacro _PopLogic
+    !verbose pop
+  !macroend
+  !define EndSwitch `!insertmacro _EndSwitch`
+
+!endif ; LOGICLIB
+!verbose 3
+!define LOGICLIB_VERBOSITY ${_LOGICLIB_VERBOSITY}
+!undef _LOGICLIB_VERBOSITY
+!verbose pop
diff --git a/scripts/installer.nsi b/scripts/installer.nsi
index 1841431..2cbd6d3 100644
--- a/scripts/installer.nsi
+++ b/scripts/installer.nsi
@@ -1,7 +1,10 @@
+InstallDir ""
+!include "LogicLib.nsh"
 !include "mingw-file-association.nsh"
+!include "x64.nsh"
 Name "OpenSCAD"
 OutFile "openscad_setup.exe"
-InstallDir $PROGRAMFILES\OpenSCAD
+!include "installer_arch.nsi"
 DirText "This will install OpenSCAD on your computer. Choose a directory"
 Section "install"
 SetOutPath $INSTDIR
diff --git a/scripts/installer32.nsi b/scripts/installer32.nsi
new file mode 100644
index 0000000..051cb0e
--- /dev/null
+++ b/scripts/installer32.nsi
@@ -0,0 +1,3 @@
+Function .onInit
+  StrCpy $InstDir $PROGRAMFILES\OpenSCAD
+FunctionEnd
diff --git a/scripts/installer64.nsi b/scripts/installer64.nsi
new file mode 100644
index 0000000..1b24c0c
--- /dev/null
+++ b/scripts/installer64.nsi
@@ -0,0 +1,8 @@
+Function .onInit
+${If} ${RunningX64}
+  StrCpy $InstDir $PROGRAMFILES64\OpenSCAD
+  SetRegView 64
+${Else}
+  Messagebox MB_OK "This is 64 bit OpenSCAD, your machine is 32 bits. Error."
+${EndIf}
+FunctionEnd
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index 7a16530..03adc22 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -1,11 +1,13 @@
 #!/bin/sh -e
 #
 # This script builds all library dependencies of OpenSCAD for cross-compilation
-# from linux to mingw32 for windows, using the MXE cross build system.
+# from linux to mingw32/64 for windows, using the MXE cross build system.
 #
 # This script must be run from the OpenSCAD source root directory
 #
-# Usage: ./scripts/mingw-x-build-dependencies.sh
+# Usage:
+#        ./scripts/mingw-x-build-dependencies.sh       # 32 bit
+#        ./scripts/mingw-x-build-dependencies.sh 64    # 64 bit
 #
 # Prerequisites:
 #
@@ -13,6 +15,8 @@
 #
 # Also see http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Cross-compiling_for_Windows_on_Linux_or_Mac_OS_X
 #
+# Also note the 64 bit is built on the branch of mxe by Tony Theodore
+# which hasnt been merged to official mxe as of writing
 
 OPENSCADDIR=$PWD
 if [ ! -f $OPENSCADDIR/openscad.pro ]; then
@@ -34,7 +38,7 @@ if [ ! $NUMJOBS ]; then
 	fi
 fi
 
-. ./scripts/setenv-mingw-xbuild.sh
+. ./scripts/setenv-mingw-xbuild.sh $*
 
 if [ ! -e $BASEDIR ]; then
 	mkdir -p $BASEDIR
@@ -44,7 +48,11 @@ if [ ! -e $MXEDIR ]; then
 	mkdir -p $MXEDIR
 	cd $MXEDIR/..
 	echo "Downloading MXE into " $PWD
-	git clone git://github.com/mxe/mxe.git
+	if [ `echo $* | grep 64` ]; then
+		git clone -b multi-rebase git://github.com/tonytheodore/mxe.git ./mxe-w64
+	else
+		git clone git://github.com/mxe/mxe.git
+	fi
 fi
 
 echo "entering" $MXEDIR
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 02b276b..035fa3f 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -7,11 +7,12 @@
 # The script will create a file called openscad-<versionstring>.<extension> in
 # the current directory (or under ./mingw32)
 #
-# Usage: release-common.sh [-v <versionstring>] [-c] [-x32]
+# Usage: release-common.sh [-v <versionstring>] [-c] [-mingw[32|64]]
 #  -v       Version string (e.g. -v 2010.01)
 #  -d       Version date (e.g. -d 2010.01.23)
 #  -c       Build with commit info
 #  -mingw32 Cross-compile for win32 using MXE
+#  -mingw64 Cross-compile for win64 using MXE
 #
 # If no version string or version date is given, todays date will be used (YYYY-MM-DD)
 # If only verion date is given, it will be used also as version string.
@@ -20,7 +21,7 @@
 # The commit info will extracted from git and be passed to qmake as OPENSCAD_COMMIT
 # to identify a build in the about box.
 #
-# The mingw32 cross compile depends on the MXE cross-build tools. Please
+# The mingw cross compile depends on the MXE cross-build tools. Please
 # see the README.md file on how to install these dependencies.
 
 printUsage()
@@ -52,6 +53,12 @@ fi
 
 if [ "`echo $* | grep mingw32`" ]; then
   OS=LINXWIN
+  ARCH=32
+fi
+
+if [ "`echo $* | grep mingw64`" ]; then
+  OS=LINXWIN
+  ARCH=64
 fi
 
 if [ $OS ]; then
@@ -83,7 +90,6 @@ echo "Checking pre-requisites..."
 case $OS in
     LINXWIN)
         MAKENSIS=
-
         if [ "`command -v makensis`" ]; then
             MAKENSIS=makensis
         elif [ "`command -v i686-pc-mingw32-makensis`" ]; then
@@ -124,7 +130,7 @@ case $OS in
         TARGET=release
         ;;
     LINXWIN) 
-        . ./scripts/setenv-mingw-xbuild.sh
+        . ./scripts/setenv-mingw-xbuild.sh $ARCH
         TARGET=release
         ZIP="zip"
         ZIPARGS="-r"
@@ -170,13 +176,12 @@ fi
 
 case $OS in
     LINXWIN)
-        # dont use paralell builds, it can error-out on parser_yacc.
-
+        # make || make enables paralell builds, thanks Tony Theodore
         # make main openscad.exe
         cd $DEPLOYDIR
-        make $TARGET ## comment out for test-run
+        make $TARGET -j$NUMCPU || make $TARGET -j $NUMCPU ## comment 4 test
         if [ ! -e $TARGET/openscad.exe ]; then
-            echo 'build failed. stopping.'
+            echo "cant find $TARGET/openscad.exe. build failed. stopping."
             exit
         fi
         # make console pipe-able openscad.com - see winconsole.pri for info
@@ -271,8 +276,11 @@ case $OS in
 
         echo "Creating installer"
         echo "Copying NSIS files to $DEPLOYDIR/openscad-$VERSION"
-        cp ./scripts/installer.nsi $DEPLOYDIR/openscad-$VERSION
-        cp ./scripts/mingw-file-association.nsh $DEPLOYDIR/openscad-$VERSION
+        cp ./scripts/installer$ARCH.nsi $DEPLOYDIR/openscad-$VERSION/installer_arch.nsi
+        cp ./scripts/installer.nsi $DEPLOYDIR/openscad-$VERSION/
+        cp ./scripts/mingw-file-association.nsh $DEPLOYDIR/openscad-$VERSION/
+        cp ./scripts/x64.nsh $DEPLOYDIR/openscad-$VERSION/
+        cp ./scripts/LogicLib.nsh $DEPLOYDIR/openscad-$VERSION/
         cd $DEPLOYDIR/openscad-$VERSION
         NSISDEBUG=-V2
         # NSISDEBUG=      # leave blank for full log
@@ -288,12 +296,11 @@ case $OS in
                 echo "Installer created:" $INSTFILE
                 echo
             else
-              echo "Build failed. Cannot find" $INSTFILE
-              exit 1
+                echo "Build failed. Cannot find" $INSTFILE
             fi
         else
-          echo "Build failed. Cannot find" $BINFILE
-          exit 1
+            echo "Build failed. Cannot find" $BINFILE
+            exit 1
         fi
         ;;
     LINUX)
diff --git a/scripts/setenv-mingw-xbuild.sh b/scripts/setenv-mingw-xbuild.sh
index e31534e..b6fa156 100644
--- a/scripts/setenv-mingw-xbuild.sh
+++ b/scripts/setenv-mingw-xbuild.sh
@@ -2,7 +2,10 @@
 #
 # set environment variables for mingw/mxe cross-build
 #
-# Usage: source ./scripts/setenv-mingw-xbuild.sh
+# Usage:
+#
+#     source ./scripts/setenv-mingw-xbuild.sh         # 32 bit build
+#     source ./scripts/setenv-mingw-xbuild.sh 64      # 64 bit build
 #
 # Prerequisites:
 #
@@ -18,11 +21,20 @@ if [ ! $BASEDIR ]; then
 fi
 
 if [ ! $DEPLOYDIR ]; then
-	export DEPLOYDIR=$OPENSCADDIR/mingw32
+	if [ `echo $* | grep 64 ` ]; then
+		DEPLOYDIR=$OPENSCADDIR/mingw64
+	else
+		DEPLOYDIR=$OPENSCADDIR/mingw32
+	fi
+	export DEPLOYDIR
 fi
 
 if [ ! $MXEDIR ]; then
-	export MXEDIR=$BASEDIR/mxe
+	if [ `echo $* | grep 64 ` ]; then
+		export MXEDIR=$BASEDIR/mxe-w64
+	else
+		export MXEDIR=$BASEDIR/mxe
+	fi
 fi
 
 export PATH=$MXEDIR/usr/bin:$PATH
@@ -31,16 +43,21 @@ if [ ! -e $DEPLOYDIR ]; then
   mkdir -p $DEPLOYDIR
 fi
 
-echo linking $MXEDIR/usr/i686-pc-mingw32/ to $DEPLOYDIR/mingw-cross-env
+if [ `echo $* | grep 64 ` ]; then
+	MXETARGETDIR=$MXEDIR/usr/x86_64-w64-mingw32
+else
+	MXETARGETDIR=$MXEDIR/usr/i686-pc-mingw32
+fi
+echo linking $MXETARGETDIR to $DEPLOYDIR/mingw-cross-env
 rm -f $DEPLOYDIR/mingw-cross-env
-ln -s $MXEDIR/usr/i686-pc-mingw32/ $DEPLOYDIR/mingw-cross-env
-export PATH=$MXEDIR/usr/i686-pc-mingw32/qt/bin:$PATH
+ln -s $MXETARGETDIR $DEPLOYDIR/mingw-cross-env
+export PATH=$MXETARGETDIR/qt/bin:$PATH
 
 echo BASEDIR: $BASEDIR
 echo MXEDIR: $MXEDIR
 echo DEPLOYDIR: $DEPLOYDIR
 echo PATH modified: $MXEDIR/usr/bin
-echo PATH modified: $MXEDIR/usr/i686-pc-mingw32/qt/bin
+echo PATH modified: $MXETARGETDIR/qt/bin
 
 
 
diff --git a/scripts/x64.nsh b/scripts/x64.nsh
new file mode 100644
index 0000000..e694c1e
--- /dev/null
+++ b/scripts/x64.nsh
@@ -0,0 +1,54 @@
+; ---------------------
+;       x64.nsh
+; ---------------------
+;
+; A few simple macros to handle installations on x64 machines.
+;
+; RunningX64 checks if the installer is running on x64.
+;
+;   ${If} ${RunningX64}
+;     MessageBox MB_OK "running on x64"
+;   ${EndIf}
+;
+; DisableX64FSRedirection disables file system redirection.
+; EnableX64FSRedirection enables file system redirection.
+;
+;   SetOutPath $SYSDIR
+;   ${DisableX64FSRedirection}
+;   File some.dll # extracts to C:\Windows\System32
+;   ${EnableX64FSRedirection}
+;   File some.dll # extracts to C:\Windows\SysWOW64
+;
+
+!ifndef ___X64__NSH___
+!define ___X64__NSH___
+
+!include LogicLib.nsh
+
+!macro _RunningX64 _a _b _t _f
+  !insertmacro _LOGICLIB_TEMP
+  System::Call kernel32::GetCurrentProcess()i.s
+  System::Call kernel32::IsWow64Process(is,*i.s)
+  Pop $_LOGICLIB_TEMP
+  !insertmacro _!= $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
+!macroend
+
+!define RunningX64 `"" RunningX64 ""`
+
+!macro DisableX64FSRedirection
+
+  System::Call kernel32::Wow64EnableWow64FsRedirection(i0)
+
+!macroend
+
+!define DisableX64FSRedirection "!insertmacro DisableX64FSRedirection"
+
+!macro EnableX64FSRedirection
+
+  System::Call kernel32::Wow64EnableWow64FsRedirection(i1)
+
+!macroend
+
+!define EnableX64FSRedirection "!insertmacro EnableX64FSRedirection"
+
+!endif # !___X64__NSH___
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 5f9d633..da3501d 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -1765,6 +1765,12 @@ void MainWindow::helpLibrary()
 									OPENCSG_VERSION_STRING,
 									qVersion());
 
+#if defined( __MINGW64__ )
+	libinfo += QString("Compiled for MingW64\n\n");
+#elif defined( __MINGW32__ )
+	libinfo += QString("Compiled for MingW32\n\n");
+#endif
+
 	if (!this->openglbox) {
     this->openglbox = new QMessageBox(QMessageBox::Information, 
                                       "OpenGL Info", "OpenSCAD Detailed Library Info                  ",
-- 
cgit v0.10.1


From be87d30f427a4ffff8a21c3871e0304670443710 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Thu, 16 May 2013 22:59:58 -0500
Subject: enable both win32 and win64 build and upload (beta level) from same
 script


diff --git a/scripts/builder.sh b/scripts/builder.sh
index 75b80f8..e8876e8 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -6,10 +6,6 @@
 # requirements -
 # see http://mxe.cc for required tools (scons, perl, yasm, etc etc etc)
 
-# todo - auto update webpage to link to proper snapshot
-#
-# todo - 64 bit windows (needs mxe 64 bit stable)
-#
 # todo - can we build 32 bit linux from within 64 bit linux?
 #
 # todo - make linux work
@@ -36,14 +32,23 @@ get_source_code()
 
 build_win32()
 {
+	. ./scripts/setenv-mingw-xbuild.sh clean
 	. ./scripts/setenv-mingw-xbuild.sh
 	./scripts/mingw-x-build-dependencies.sh
 	./scripts/release-common.sh mingw32
 }
 
+build_win64()
+{
+	. ./scripts/setenv-mingw-xbuild.sh clean
+	. ./scripts/setenv-mingw-xbuild.sh 64
+	./scripts/mingw-x-build-dependencies.sh 64
+	./scripts/release-common.sh mingw64
+}
+
 build_lin32()
 {
-	. ./scripts/setenv-unibuild.sh clang
+	. ./scripts/setenv-unibuild.sh
 	./scripts/uni-build-dependencies.sh
 	./scripts/release-common.sh
 }
@@ -87,6 +92,26 @@ upload_win32()
 	export WIN32_PACKAGEFILE2_SIZE
 }
 
+upload_win64()
+{
+	SUMMARY1="Windows x86-64 Snapshot Zipfile"
+	SUMMARY2="Windows x86-64 Snapshot Installer"
+	DATECODE=`date +"%Y.%m.%d"`
+	BASEDIR=./mingw64/
+	WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64.zip
+	WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64-Installer.exe
+	upload_win_generic "$SUMMARY1" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE1
+	upload_win_generic "$SUMMARY2" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE2
+	export WIN64_PACKAGEFILE1
+	export WIN64_PACKAGEFILE2
+	WIN64_PACKAGEFILE1_SIZE=`ls -sh $BASEDIR/$WIN64_PACKAGEFILE1 | awk ' {print $1} ';`
+	WIN64_PACKAGEFILE2_SIZE=`ls -sh $BASEDIR/$WIN64_PACKAGEFILE2 | awk ' {print $1} ';`
+	WIN64_PACKAGEFILE1_SIZE=`echo "$WIN64_PACKAGEFILE1_SIZE""B"`
+	WIN64_PACKAGEFILE2_SIZE=`echo "$WIN64_PACKAGEFILE2_SIZE""B"`
+	export WIN64_PACKAGEFILE1_SIZE
+	export WIN64_PACKAGEFILE2_SIZE
+}
+
 read_username_from_user()
 {
 	echo 'Please enter your username for https://code.google.com/hosting/settings'
@@ -112,7 +137,7 @@ read_password_from_user()
 	export OSUPL_PASSWORD
 }
 
-update_www_download_links()
+update_win_www_download_links()
 {
 	cd $STARTPATH
 	git clone git@github.com:openscad/openscad.github.com.git
@@ -123,6 +148,13 @@ update_www_download_links()
 	DATECODE=`date +"%Y.%m.%d"`
 
 	rm win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT2_URL'] = '$BASEURL$WIN64_PACKAGEFILE2'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT1_SIZE'] = '$WIN64_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js
+	echo "snapinfo['WIN64_SNAPSHOT2_SIZE'] = '$WIN64_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js
+
 	echo "snapinfo['WIN32_SNAPSHOT1_URL'] = '$BASEURL$WIN32_PACKAGEFILE1'" >> win_snapshot_links.js
 	echo "snapinfo['WIN32_SNAPSHOT2_URL'] = '$BASEURL$WIN32_PACKAGEFILE2'" >> win_snapshot_links.js
 	echo "snapinfo['WIN32_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js
@@ -130,7 +162,6 @@ update_www_download_links()
 	echo "snapinfo['WIN32_SNAPSHOT1_SIZE'] = '$WIN32_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js
 	echo "snapinfo['WIN32_SNAPSHOT2_SIZE'] = '$WIN32_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js
 	echo 'modified win_snapshot_links.js'
-	cat win_snapshot_links.js
 
 	PAGER=cat git diff
 	if [ ! $DRYRUN ]; then
@@ -157,9 +188,12 @@ check_starting_path
 read_username_from_user
 read_password_from_user
 get_source_code
+
 build_win32
+build_win64
 upload_win32
-update_www_download_links
+upload_win64
+update_win_www_download_links
 
 
 
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index 03adc22..168b847 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -48,7 +48,7 @@ if [ ! -e $MXEDIR ]; then
 	mkdir -p $MXEDIR
 	cd $MXEDIR/..
 	echo "Downloading MXE into " $PWD
-	if [ `echo $* | grep 64` ]; then
+	if [ "`echo $* | grep 64`" ]; then
 		git clone -b multi-rebase git://github.com/tonytheodore/mxe.git ./mxe-w64
 	else
 		git clone git://github.com/mxe/mxe.git
@@ -57,9 +57,15 @@ fi
 
 echo "entering" $MXEDIR
 cd $MXEDIR
-echo "make mpfr eigen opencsg cgal qt nsis -j $NUMCPU JOBS=$NUMJOBS"
-make mpfr eigen opencsg cgal qt nsis -j $NUMCPU JOBS=$NUMJOBS
-#make mpfr -j $NUMCPU JOBS=$NUMJOBS # for testing
+if [ "`echo $* | grep 64`" ]; then
+  MXE_TARGETS='x86_64-w64-mingw32'
+  PACKAGES='mpfr eigen opencsg cgal qt'
+else
+  MXE_TARGETS=
+  PACKAGES='mpfr eigen opencsg cgal qt nsis'
+fi
+echo make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS
+make $PACKAGES MXE_TARGETS=$MXE_TARGETS -j $NUMCPU JOBS=$NUMJOBS
 
 echo "leaving" $MXEDIR
 
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 035fa3f..85b719c 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -116,6 +116,13 @@ fi
 
 echo "Building openscad-$VERSION ($VERSIONDATE) $CONFIGURATION..."
 
+if [ ! $NUMCPU ]; then
+  echo "note: you can 'export NUMCPU=x' for multi-core compiles (x=number)";
+  NUMCPU=2
+else
+  echo "NUMCPU: " $NUMCPU
+fi
+
 CONFIG=deploy
 case $OS in
     LINUX|MACOSX) 
@@ -169,17 +176,12 @@ case $OS in
         ;;
 esac
 
-if [ ! $NUMCPU ]; then
-  echo "note: you can 'export NUMCPU=x' for multi-core compiles (x=number)";
-  NUMCPU=2
-fi
-
 case $OS in
     LINXWIN)
         # make || make enables paralell builds, thanks Tony Theodore
         # make main openscad.exe
         cd $DEPLOYDIR
-        make $TARGET -j$NUMCPU || make $TARGET -j $NUMCPU ## comment 4 test
+        make $TARGET -j$NUMCPU || make $TARGET -j$NUMCPU ## comment 4 test
         if [ ! -e $TARGET/openscad.exe ]; then
             echo "cant find $TARGET/openscad.exe. build failed. stopping."
             exit
diff --git a/scripts/setenv-mingw-xbuild.sh b/scripts/setenv-mingw-xbuild.sh
index b6fa156..15449ce 100644
--- a/scripts/setenv-mingw-xbuild.sh
+++ b/scripts/setenv-mingw-xbuild.sh
@@ -14,50 +14,82 @@
 # Also see http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Cross-compiling_for_Windows_on_Linux_or_Mac_OS_X
 #
 
-export OPENSCADDIR=$PWD
+OPENSCADDIR=$PWD
 
 if [ ! $BASEDIR ]; then
-	export BASEDIR=$HOME/openscad_deps
+	BASEDIR=$HOME/openscad_deps
 fi
 
+DEPLOYDIR64=$OPENSCADDIR/mingw64
+DEPLOYDIR32=$OPENSCADDIR/mingw32
+
 if [ ! $DEPLOYDIR ]; then
-	if [ `echo $* | grep 64 ` ]; then
-		DEPLOYDIR=$OPENSCADDIR/mingw64
+	if [ "`echo $* | grep 64 `" ]; then
+		DEPLOYDIR=$DEPLOYDIR64
 	else
-		DEPLOYDIR=$OPENSCADDIR/mingw32
+		DEPLOYDIR=$DEPLOYDIR32
 	fi
-	export DEPLOYDIR
 fi
 
 if [ ! $MXEDIR ]; then
-	if [ `echo $* | grep 64 ` ]; then
-		export MXEDIR=$BASEDIR/mxe-w64
+	if [ "`echo $* | grep 64 `" ]; then
+		MXEDIR=$BASEDIR/mxe-w64
 	else
-		export MXEDIR=$BASEDIR/mxe
+		MXEDIR=$BASEDIR/mxe
 	fi
 fi
 
-export PATH=$MXEDIR/usr/bin:$PATH
-
 if [ ! -e $DEPLOYDIR ]; then
   mkdir -p $DEPLOYDIR
 fi
 
-if [ `echo $* | grep 64 ` ]; then
+if [ "`echo $* | grep 64 `" ]; then
 	MXETARGETDIR=$MXEDIR/usr/x86_64-w64-mingw32
 else
 	MXETARGETDIR=$MXEDIR/usr/i686-pc-mingw32
 fi
-echo linking $MXETARGETDIR to $DEPLOYDIR/mingw-cross-env
-rm -f $DEPLOYDIR/mingw-cross-env
-ln -s $MXETARGETDIR $DEPLOYDIR/mingw-cross-env
-export PATH=$MXETARGETDIR/qt/bin:$PATH
+
+if [ ! $MINGWX_SAVED_ORIGINAL_PATH ]; then
+  MINGWX_SAVED_ORIGINAL_PATH=$PATH
+  echo current path saved
+fi
+
+PATH=$MXEDIR/usr/bin:$PATH
+PATH=$MXETARGETDIR/qt/bin:$PATH
+
+
+
+
+
+if [ "`echo $* | grep clean`" ]; then
+  BASEDIR=
+  MXEDIR=
+  MXETARGETDIR=
+  DEPLOYDIR=
+  PATH=$MINGWX_SAVED_ORIGINAL_PATH
+  MINGWX_SAVED_ORIGINAL_PATH=
+else
+  echo 'linking' $MXETARGETDIR
+  echo '     to' $DEPLOYDIR/mingw-cross-env
+  rm -f $DEPLOYDIR/mingw-cross-env
+  ln -s $MXETARGETDIR $DEPLOYDIR/mingw-cross-env
+fi
+
+export BASEDIR
+export MXEDIR
+export MXETARGETDIR
+export DEPLOYDIR
+export PATH
+export MINGWX_SAVED_ORIGINAL_PATH
 
 echo BASEDIR: $BASEDIR
 echo MXEDIR: $MXEDIR
+echo MXETARGETDIR: $MXETARGETDIR
 echo DEPLOYDIR: $DEPLOYDIR
-echo PATH modified: $MXEDIR/usr/bin
-echo PATH modified: $MXETARGETDIR/qt/bin
-
-
+if [ "`echo $* | grep clean`" ]; then
+  echo PATH restored to pre-setenv-mingw-x state
+else
+  echo PATH modified: $MXEDIR/usr/bin
+  echo PATH modified: $MXETARGETDIR/qt/bin
+fi
 
-- 
cgit v0.10.1


From b3b83059e7c62339712e71294662cd3fa883f0db Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Fri, 17 May 2013 15:32:23 -0500
Subject: tweaks to improve build. alos update about.html docs


diff --git a/scripts/builder.sh b/scripts/builder.sh
index e8876e8..7cd551e 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -12,11 +12,16 @@
 #
 # todo - detect failure and stop
 
-DRYRUN=
+DRYRUN=1
 
-check_starting_path()
+init_variables()
 {
 	STARTPATH=$PWD
+	export STARTPATH
+}
+
+check_starting_path()
+{
 	if [ -e openscad.pro ]; then
 		echo 'please start from a clean directory outside of openscad'
 		exit
@@ -36,6 +41,8 @@ build_win32()
 	. ./scripts/setenv-mingw-xbuild.sh
 	./scripts/mingw-x-build-dependencies.sh
 	./scripts/release-common.sh mingw32
+	DATECODE=`date +"%Y.%m.%d"`
+	export DATECODE
 }
 
 build_win64()
@@ -44,6 +51,8 @@ build_win64()
 	. ./scripts/setenv-mingw-xbuild.sh 64
 	./scripts/mingw-x-build-dependencies.sh 64
 	./scripts/release-common.sh mingw64
+	DATECODE=`date +"%Y.%m.%d"`
+	export DATECODE
 }
 
 build_lin32()
@@ -51,24 +60,29 @@ build_lin32()
 	. ./scripts/setenv-unibuild.sh
 	./scripts/uni-build-dependencies.sh
 	./scripts/release-common.sh
+	DATECODE=`date +"%Y.%m.%d"`
+	export DATECODE
 }
 
 upload_win_generic()
 {
-	# 1=file summary, 2 = username, 3 = filename
-	if [ -e $3 ]; then
-		echo $3 found
+	summary="$1"
+	username=$2
+	filename=$3
+	if [ -f $filename ]; then
+		echo 'file "'$filename'" found'
 	else
-		echo $3 not found
+		echo 'file "'$filename'" not found'
 	fi
 	opts=
 	opts="$opts -p openscad"
-	opts="$opts -u $2"
-	opts="$opts $3"
-	if [ ! $DRYRUN ]; then
-		python ./scripts/googlecode_upload.py -s "$1" $opts
-	else
+	opts="$opts -u $username"
+	opts="$opts $filename"
+	if [ $DRYRUN ]; then
 		echo dry run, not uploading to googlecode
+		echo cmd - python ./scripts/googlecode_upload.py -s '"'$summary'"' $opts
+	else
+		python ./scripts/googlecode_upload.py -s "$summary" $opts
 	fi
 }
 
@@ -76,7 +90,6 @@ upload_win32()
 {
 	SUMMARY1="Windows x86-32 Snapshot Zipfile"
 	SUMMARY2="Windows x86-32 Snapshot Installer"
-	DATECODE=`date +"%Y.%m.%d"`
 	BASEDIR=./mingw32/
 	WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32.zip
 	WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32-Installer.exe
@@ -96,7 +109,6 @@ upload_win64()
 {
 	SUMMARY1="Windows x86-64 Snapshot Zipfile"
 	SUMMARY2="Windows x86-64 Snapshot Installer"
-	DATECODE=`date +"%Y.%m.%d"`
 	BASEDIR=./mingw64/
 	WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64.zip
 	WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64-Installer.exe
@@ -114,6 +126,7 @@ upload_win64()
 
 read_username_from_user()
 {
+	if [ $DRYRUN ]; then USERNAME=none;export USERNAME; return; fi
 	echo 'Please enter your username for https://code.google.com/hosting/settings'
 	echo -n 'Username:'
 	read USERNAME
@@ -122,6 +135,7 @@ read_username_from_user()
 
 read_password_from_user()
 {
+	if [ $DRYRUN ]; then return; fi
 	echo 'Please enter your password for https://code.google.com/hosting/settings'
 	echo -n 'Password:'
 	read -s PASSWORD1
@@ -145,7 +159,6 @@ update_win_www_download_links()
 	cd inc
 	echo `pwd`
 	BASEURL='https://openscad.google.com/files/'
-	DATECODE=`date +"%Y.%m.%d"`
 
 	rm win_snapshot_links.js
 	echo "snapinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js
@@ -174,6 +187,7 @@ update_win_www_download_links()
 
 check_ssh_agent()
 {
+	if [ $DRYRUN ]; then echo 'skipping ssh, dry run'; return; fi
 	if [ ! $SSH_AUTH_SOCK ]; then
 		echo 'please start an ssh-agent for github.com/openscad/openscad.github.com uploads'
 		echo 'for example:'
@@ -183,6 +197,7 @@ check_ssh_agent()
 	fi
 }
 
+init_variables
 check_ssh_agent
 check_starting_path
 read_username_from_user
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index 168b847..c3d5179 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -46,13 +46,13 @@ fi
 
 if [ ! -e $MXEDIR ]; then
 	mkdir -p $MXEDIR
-	cd $MXEDIR/..
-	echo "Downloading MXE into " $PWD
-	if [ "`echo $* | grep 64`" ]; then
-		git clone -b multi-rebase git://github.com/tonytheodore/mxe.git ./mxe-w64
-	else
-		git clone git://github.com/mxe/mxe.git
-	fi
+fi
+cd $MXEDIR/..
+echo "Downloading MXE into " $PWD
+if [ "`echo $* | grep 64`" ]; then
+	git clone -b multi-rebase git://github.com/tonytheodore/mxe.git ./mxe-w64
+else
+	git clone git://github.com/mxe/mxe.git
 fi
 
 echo "entering" $MXEDIR
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 85b719c..a9fb3b5 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -48,17 +48,19 @@ elif [[ $OSTYPE == "linux-gnu" ]]; then
   else
     ARCH=32
   fi
-  echo "Detected ARCH: $ARCH"
+  echo "Detected build-machine ARCH: $ARCH"
 fi
 
 if [ "`echo $* | grep mingw32`" ]; then
   OS=LINXWIN
   ARCH=32
+  echo Mingw-cross build using ARCH=32
 fi
 
 if [ "`echo $* | grep mingw64`" ]; then
   OS=LINXWIN
   ARCH=64
+  echo Mingw-cross build using ARCH=64
 fi
 
 if [ $OS ]; then
diff --git a/src/AboutDialog.html b/src/AboutDialog.html
index 6203e83..946f5e7 100644
--- a/src/AboutDialog.html
+++ b/src/AboutDialog.html
@@ -67,7 +67,7 @@ Please visit this link for a copy of the license: <a href="http://www.gnu.org/li
 </p>
 
 <p>
-<b>Acknowledgements</b>
+OpenSCAD Maintainer: <a href="https://github.com/kintel">Marius Kintel </a>
 </p>
 
 <p>
@@ -101,6 +101,8 @@ Please visit this link for a copy of the license: <a href="http://www.gnu.org/li
 <li><a href="https://github.com/iamwilhelm">iamwilhelm</a>
 <li><a href="https://github.com/clothbot">clothbot</a>
 <li><a href="https://github.com/colah">colah</a>
+<li><a href="https://github.com/peteruithoven">Peter Uithoven</a>
+
 </lu>
 
 
-- 
cgit v0.10.1


From 48816160cd87fe067156c5b8622e31ab10754e74 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 17:49:26 +0200
Subject: fix eigen bugs mingw32/64


diff --git a/eigen.pri b/eigen.pri
index 1c9a5ef..7b4d46a 100644
--- a/eigen.pri
+++ b/eigen.pri
@@ -15,10 +15,6 @@ OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES)
 EIGEN2_DIR = $$(EIGEN2DIR)
 EIGEN_DIR = $$(EIGENDIR)
 
-CONFIG(mingw-cross-env) {
-  EIGEN_INCLUDEPATH = mingw-cross-env/include/eigen2
-}
-
 # Optionally specify location of Eigen3 using the 
 # OPENSCAD_LIBRARIES env. variable
 !isEmpty(OPENSCAD_LIBRARIES_DIR) {
@@ -69,16 +65,6 @@ isEmpty(EIGEN_INCLUDEPATH) {
   EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
 }
 
-mingw-cross-env {
-  exists(mingw-cross-env/../i686-pc-mingw32-pkg-config) {
-    EIGEN_CFLAGS = $$system("i686-pc-mingw32-pkg-config --cflags eigen3")
-  }
-  exists(mingw-cross-env/../x86_64-w64-mingw32-pkg-config) {
-    EIGEN_CFLAGS = $$system("x86_64-w64-mingw32-pkg-config --cflags eigen3")
-  }
-  EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
-}
-
 # disable Eigen SIMD optimizations for platforms where it breaks compilation
 !macx {
   !freebsd-g++ {
diff --git a/scripts/builder.sh b/scripts/builder.sh
index 7cd551e..11b6e02 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -33,6 +33,7 @@ get_source_code()
 	git clone http://github.com/openscad/openscad.git
 	cd openscad
 	git submodule update --init # MCAD
+	git checkout issue341
 }
 
 build_win32()
diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index c3d5179..e9f124b 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -46,13 +46,13 @@ fi
 
 if [ ! -e $MXEDIR ]; then
 	mkdir -p $MXEDIR
-fi
-cd $MXEDIR/..
-echo "Downloading MXE into " $PWD
-if [ "`echo $* | grep 64`" ]; then
-	git clone -b multi-rebase git://github.com/tonytheodore/mxe.git ./mxe-w64
-else
-	git clone git://github.com/mxe/mxe.git
+	cd $MXEDIR/..
+	echo "Downloading MXE into " $PWD
+	if [ "`echo $* | grep 64`" ]; then
+		git clone -b multi-rebase git://github.com/tonytheodore/mxe.git $MXEDIR
+	else
+		git clone git://github.com/mxe/mxe.git $MXEDIR
+	fi
 fi
 
 echo "entering" $MXEDIR
diff --git a/scripts/setenv-mingw-xbuild.sh b/scripts/setenv-mingw-xbuild.sh
index 15449ce..d3a014c 100644
--- a/scripts/setenv-mingw-xbuild.sh
+++ b/scripts/setenv-mingw-xbuild.sh
@@ -57,11 +57,10 @@ fi
 PATH=$MXEDIR/usr/bin:$PATH
 PATH=$MXETARGETDIR/qt/bin:$PATH
 
-
-
-
+OPENSCAD_LIBRARIES=$MXETARGETDIR
 
 if [ "`echo $* | grep clean`" ]; then
+  OPENSCAD_LIBRARIES=
   BASEDIR=
   MXEDIR=
   MXETARGETDIR=
@@ -75,6 +74,7 @@ else
   ln -s $MXETARGETDIR $DEPLOYDIR/mingw-cross-env
 fi
 
+export OPENSCAD_LIBRARIES
 export BASEDIR
 export MXEDIR
 export MXETARGETDIR
@@ -82,6 +82,7 @@ export DEPLOYDIR
 export PATH
 export MINGWX_SAVED_ORIGINAL_PATH
 
+echo OPENSCAD_LIBRARIES: $OPENSCAD_LIBRARIES
 echo BASEDIR: $BASEDIR
 echo MXEDIR: $MXEDIR
 echo MXETARGETDIR: $MXETARGETDIR
-- 
cgit v0.10.1


From 7d68cb0232d15950275b22836652238625eb9ae2 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 18:39:48 +0200
Subject: improve mingw build, make rm silent


diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri
index a447fd8..1ddce88 100644
--- a/mingw-cross-env.pri
+++ b/mingw-cross-env.pri
@@ -4,15 +4,16 @@ CONFIG(mingw-cross-env) {
   LIBS += mingw-cross-env/lib/libglut.a 
   LIBS += mingw-cross-env/lib/libopengl32.a 
   LIBS += mingw-cross-env/lib/libGLEW.a 
-  exists( mingw-cross-env/lib/libglaux.a ) {
-    LIBS += mingw-cross-env/lib/libglaux.a
-  }
+#  exists( mingw-cross-env/lib/libglaux.a ) {
+#    LIBS += mingw-cross-env/lib/libglaux.a
+#  }
   LIBS += mingw-cross-env/lib/libglu32.a 
   LIBS += mingw-cross-env/lib/libopencsg.a 
   LIBS += mingw-cross-env/lib/libmpfr.a 
   LIBS += mingw-cross-env/lib/libgmp.a 
   LIBS += mingw-cross-env/lib/libCGAL.a
   QMAKE_CXXFLAGS += -fpermissive
+  QMAKE_DEL_FILE = rm -f
 }
 
 
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index a9fb3b5..261905d 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -160,7 +160,7 @@ esac
 case $OS in
     LINXWIN)
         cd $DEPLOYDIR
-        make -s clean ## comment out for test-run
+        make clean ## comment out for test-run
         cd $OPENSCADDIR
     ;;
     *)
-- 
cgit v0.10.1


From 78303a79fae63bc3f7519184fa10f7e1e9cb5653 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 18:45:13 +0200
Subject: reduce flood of eigen warnings on mingw build


diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri
index 1ddce88..f13bfa7 100644
--- a/mingw-cross-env.pri
+++ b/mingw-cross-env.pri
@@ -14,6 +14,5 @@ CONFIG(mingw-cross-env) {
   LIBS += mingw-cross-env/lib/libCGAL.a
   QMAKE_CXXFLAGS += -fpermissive
   QMAKE_DEL_FILE = rm -f
+  QMAKE_CXXFLAGS_WARN_ON += -Wunused-local-typedefs #eigen3
 }
-
-
-- 
cgit v0.10.1


From d8bcf47df699ce7104a7cb0572cbf6c34f6a3cd8 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 18:48:39 +0200
Subject: gcc warning off, eigen3 mingw build


diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri
index f13bfa7..e696b56 100644
--- a/mingw-cross-env.pri
+++ b/mingw-cross-env.pri
@@ -14,5 +14,5 @@ CONFIG(mingw-cross-env) {
   LIBS += mingw-cross-env/lib/libCGAL.a
   QMAKE_CXXFLAGS += -fpermissive
   QMAKE_DEL_FILE = rm -f
-  QMAKE_CXXFLAGS_WARN_ON += -Wunused-local-typedefs #eigen3
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs #eigen3
 }
-- 
cgit v0.10.1


From 127d84a58cf58f394f6786429296bde357803a24 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 18:55:44 +0200
Subject: url bugfix


diff --git a/scripts/builder.sh b/scripts/builder.sh
index 11b6e02..6a9fd54 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -159,7 +159,7 @@ update_win_www_download_links()
 	cd openscad.github.com
 	cd inc
 	echo `pwd`
-	BASEURL='https://openscad.google.com/files/'
+	BASEURL='https://openscad.googlecode.com/files/'
 
 	rm win_snapshot_links.js
 	echo "snapinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js
-- 
cgit v0.10.1


From 874a4840687bc0c3209ffe3bcb7649f549a18e63 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 18:57:08 +0200
Subject: if .com fails, stop build. also stop using make || make


diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 261905d..5c63ccd 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -180,10 +180,9 @@ esac
 
 case $OS in
     LINXWIN)
-        # make || make enables paralell builds, thanks Tony Theodore
         # make main openscad.exe
         cd $DEPLOYDIR
-        make $TARGET -j$NUMCPU || make $TARGET -j$NUMCPU ## comment 4 test
+        make $TARGET -j$NUMCPU ## comment 4 test
         if [ ! -e $TARGET/openscad.exe ]; then
             echo "cant find $TARGET/openscad.exe. build failed. stopping."
             exit
@@ -191,6 +190,10 @@ case $OS in
         # make console pipe-able openscad.com - see winconsole.pri for info
         qmake CONFIG+=winconsole ../openscad.pro
         make
+        if [ ! -e $TARGET/openscad.com ]; then
+            echo "cant find $TARGET/openscad.com. build failed. stopping."
+            exit
+        fi
 
         cd $OPENSCADDIR
     ;;
-- 
cgit v0.10.1


From cc94b647f1af763944d104468affb48625ab7f9a Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 19:01:35 +0200
Subject: credit tony theodore


diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 5c63ccd..9e56263 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -12,7 +12,7 @@
 #  -d       Version date (e.g. -d 2010.01.23)
 #  -c       Build with commit info
 #  -mingw32 Cross-compile for win32 using MXE
-#  -mingw64 Cross-compile for win64 using MXE
+#  -mingw64 Cross-compile for win64 using Tony Theodore's MXE fork
 #
 # If no version string or version date is given, todays date will be used (YYYY-MM-DD)
 # If only verion date is given, it will be used also as version string.
diff --git a/src/AboutDialog.html b/src/AboutDialog.html
index 946f5e7..2ec691d 100644
--- a/src/AboutDialog.html
+++ b/src/AboutDialog.html
@@ -107,7 +107,7 @@ OpenSCAD Maintainer: <a href="https://github.com/kintel">Marius Kintel </a>
 
 
 <p>
-<b>Mailing list, bug reports, testing, contribs, &c</b>
+<b>Mailing list, bug reports, testing, contribs, help, &c</b>
 </p>
 
 nop head, Triffid Hunter, Len Trigg, Kliment Yanev, Christian Siefkes, 
@@ -117,7 +117,7 @@ Brett Sutton, hmnapier, Eero af Heurlin, caliston, 5263, ghost, 42loop,
 uniqx, Michael Thomson, Michael Ivko, Pierre Doucet, myglc2, Alan Cox, 
 Peter Falke, Michael Ambrus, Gordon Wrigley, Ed Nisley, Stony Smith, 
 Pasca Andrei, David Goodenough, William A Adams, mrrobinson, 1i7, 
-benhowes, 5263, Craig Trader, Miro Hrončok, ... and many others
+benhowes, 5263, Craig Trader, Miro Hrončok, Tony Theodore ... and many others
 
 <p>
 <b>Hosting &amp; resources</b>
-- 
cgit v0.10.1


From 2c5b09a0a79609b5cf02f1abc9dca0cb27677f79 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 19:03:08 +0200
Subject: zip silent


diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 9e56263..7d36907 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -142,7 +142,7 @@ case $OS in
         . ./scripts/setenv-mingw-xbuild.sh $ARCH
         TARGET=release
         ZIP="zip"
-        ZIPARGS="-r"
+        ZIPARGS="-r -q"
         ;;
 esac
 
-- 
cgit v0.10.1


From 6509f0838269de67e6b84759ef36f0078f6e65f7 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 14:37:04 -0500
Subject: allow 'upload only' and 'dryrun' debugging options


diff --git a/scripts/builder.sh b/scripts/builder.sh
index 6a9fd54..984a651 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -12,12 +12,24 @@
 #
 # todo - detect failure and stop
 
-DRYRUN=1
-
 init_variables()
 {
 	STARTPATH=$PWD
 	export STARTPATH
+	if [ "`echo $* | grep uploadonly`" ]; then
+		UPLOADONLY=1
+		DATECODE=`date +"%Y.%m.%d"`
+	else
+		UPLOADONLY=
+	fi
+	if [ "`echo $* | grep dry`" ]; then
+		DRYRUN=1
+	else
+		DRYRUN=
+	fi
+	export UPLOADONLY
+	export DRYRUN
+	export DATECODE
 }
 
 check_starting_path()
@@ -198,15 +210,17 @@ check_ssh_agent()
 	fi
 }
 
-init_variables
+init_variables $*
 check_ssh_agent
 check_starting_path
 read_username_from_user
 read_password_from_user
 get_source_code
 
-build_win32
-build_win64
+if [ ! $UPLOADONLY ]; then
+	build_win32
+	build_win64
+fi
 upload_win32
 upload_win64
 update_win_www_download_links
-- 
cgit v0.10.1


From ca4fb9238fa50fc11efdc36070bdd38f77148ff5 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 15:40:01 -0500
Subject: update readme


diff --git a/README.md b/README.md
index 5bbe8b6..73eea87 100644
--- a/README.md
+++ b/README.md
@@ -188,14 +188,14 @@ http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Building_on_Windows
 
 To cross-build, first make sure that you have development tools 
 installed to get GCC. Then after you've cloned this git repository, 
-start a new clean shell and run the script that sets up the environment 
+start a new clean bash shell and run the script that sets up the environment 
 variables.
 
-    source ./scripts/setenv-mingw-xbuild.sh
+    source ./scripts/setenv-mingw-xbuild.sh 32
 
 Then run the script to download & compile all the prerequisite libraries above:
 
-    ./scripts/mingw-x-build-dependencies.sh
+    ./scripts/mingw-x-build-dependencies.sh 32
 
 Note that this process can take several hours, as it uses the 
 http://mxe.cc system to cross-build many libraries. After it is 
@@ -208,7 +208,9 @@ If you wish you can only build the openscad.exe binary:
     cd mingw32
     qmake .. CONFIG+=mingw-cross-env
     make
-    
+
+For a 64-bit Windows cross-build, replace 32 with 64 in the above instructions. 
+
 ### Compilation
 
 First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to
diff --git a/scripts/builder.sh b/scripts/builder.sh
index 984a651..9850bcc 100755
--- a/scripts/builder.sh
+++ b/scripts/builder.sh
@@ -45,7 +45,7 @@ get_source_code()
 	git clone http://github.com/openscad/openscad.git
 	cd openscad
 	git submodule update --init # MCAD
-	git checkout issue341
+	#git checkout branch ##debugging
 }
 
 build_win32()
@@ -104,8 +104,8 @@ upload_win32()
 	SUMMARY1="Windows x86-32 Snapshot Zipfile"
 	SUMMARY2="Windows x86-32 Snapshot Installer"
 	BASEDIR=./mingw32/
-	WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32.zip
-	WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32-Installer.exe
+	WIN32_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-32-Installer.exe
+	WIN32_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-32.zip
 	upload_win_generic "$SUMMARY1" $USERNAME $BASEDIR/$WIN32_PACKAGEFILE1
 	upload_win_generic "$SUMMARY2" $USERNAME $BASEDIR/$WIN32_PACKAGEFILE2
 	export WIN32_PACKAGEFILE1
@@ -123,8 +123,8 @@ upload_win64()
 	SUMMARY1="Windows x86-64 Snapshot Zipfile"
 	SUMMARY2="Windows x86-64 Snapshot Installer"
 	BASEDIR=./mingw64/
-	WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64.zip
-	WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64-Installer.exe
+	WIN64_PACKAGEFILE1=OpenSCAD-$DATECODE-x86-64-Installer.exe
+	WIN64_PACKAGEFILE2=OpenSCAD-$DATECODE-x86-64.zip
 	upload_win_generic "$SUMMARY1" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE1
 	upload_win_generic "$SUMMARY2" $USERNAME $BASEDIR/$WIN64_PACKAGEFILE2
 	export WIN64_PACKAGEFILE1
@@ -192,7 +192,7 @@ update_win_www_download_links()
 	PAGER=cat git diff
 	if [ ! $DRYRUN ]; then
 		git commit -a -m 'builder.sh - updated snapshot links'
-		git push origin
+		git push origin master
 	else
 		echo dry run, not updating www links
 	fi
-- 
cgit v0.10.1


From 5a647f963a2dbe2344fe64d98ea5bd42f8f3e806 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Sat, 18 May 2013 16:04:59 -0500
Subject: bold a single about box line


diff --git a/src/AboutDialog.html b/src/AboutDialog.html
index 2ec691d..005f61f 100644
--- a/src/AboutDialog.html
+++ b/src/AboutDialog.html
@@ -67,7 +67,7 @@ Please visit this link for a copy of the license: <a href="http://www.gnu.org/li
 </p>
 
 <p>
-OpenSCAD Maintainer: <a href="https://github.com/kintel">Marius Kintel </a>
+<b>OpenSCAD Maintainer:</b> <a href="https://github.com/kintel">Marius Kintel </a>
 </p>
 
 <p>
-- 
cgit v0.10.1


From fab07bafdaacf931314673e396111a9670dccc0e Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Tue, 21 May 2013 19:21:00 -0400
Subject: Added recursion example. Fixes #346


diff --git a/examples/example024.scad b/examples/example024.scad
new file mode 100644
index 0000000..1502ec7
--- /dev/null
+++ b/examples/example024.scad
@@ -0,0 +1,32 @@
+// Menger Sponge
+// By Nathan Hellweg, Emmett Lalish and Marius Kintel May 13, 2013
+// CC-BY-SA license
+
+// Size of edge of sponge
+D=100;
+// Fractal depth (number of iterations)
+n=3;
+
+module menger() {
+  difference() {
+    cube(D, center=true);
+    for (v=[[0,0,0], [0,0,90], [0,90,0]])
+      rotate(v) menger_negative(side=D, maxside=D, level=n);
+  }
+}
+
+module menger_negative(side=1, maxside=1, level=1) {
+  l=side/3;
+  cube([maxside*1.1, l, l], center=true);
+  if (level > 1) {
+    for (i=[-1:1], j=[-1:1])
+      if (i || j)
+        translate([0, i*l, j*l])
+          menger_negative(side=l, maxside=maxside, level=level-1);
+  }
+}
+
+difference() {
+  rotate([45, atan(1/sqrt(2)), 0]) menger();
+  translate([0,0,-D]) cube(2*D, center=true);
+}
-- 
cgit v0.10.1


From 71ab237aada8db602045063f0f1c6082ef06972a Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Tue, 21 May 2013 21:26:51 -0400
Subject: Added tests for linear extrude with scale. Should mostly fix #273


diff --git a/testdata/scad/features/linear_extrude-scale-tests.scad b/testdata/scad/features/linear_extrude-scale-tests.scad
deleted file mode 100644
index 9a82c9d..0000000
--- a/testdata/scad/features/linear_extrude-scale-tests.scad
+++ /dev/null
@@ -1,17 +0,0 @@
-difference() {
-    linear_extrude(height=40, scale=[0, 0]) {
-        square(10, center=true);
-        translate([10,0]) circle(10);
-    }
- translate([0,0,35])   sphere(10);
-}
-
-/*
-Test case ideas:
-o off-center starting point
-o Concave polygon
-o Disjoint polygons
-o multi-rotation twist
-o zero scales, zero scales in only one axis (for the above cases)
-o boolean operations on scaled extrusion (including zero scale)
-*/
diff --git a/testdata/scad/features/linear_extrude-scale-zero-tests.scad b/testdata/scad/features/linear_extrude-scale-zero-tests.scad
new file mode 100644
index 0000000..8a85203
--- /dev/null
+++ b/testdata/scad/features/linear_extrude-scale-zero-tests.scad
@@ -0,0 +1,56 @@
+// test cases for linear extrude with scale
+// by TakeItAndRun 2013
+
+// syntax: linear_extrude(height=a, slices=b, twist=c, scale=[x,y])
+
+a=3;
+b=20;
+c=0;
+x=1;
+y=1;
+
+module linear_extrudes_of_different_shapes(a=a,b=b,c=c,x=x,y=y) {
+  translate(00*[4,0,0])
+  // linear_extrude of shape with hole
+  linear_extrude(height=a, slices=b, twist=c, scale=[x,y])
+    difference() {
+      square(2,true); square(1,true);
+    }
+  
+  translate(01*[4,0,0])
+  // linear_extrude of disjoint polygons shapes
+  linear_extrude(height=a, slices=b, twist=c, scale=[x,y]) {
+    translate([1,0,0]) square(1,true);
+    translate([-1,0,0]) square(1,true);
+  }
+  
+  translate(02*[4,0,0])
+  // linear_extrude with a coplanar face
+  linear_extrude(height=a, slices=b, twist=c, scale=[x,y]) {
+    translate([.5,0,0])square();
+    translate([-.5,0,0])square();
+  }
+  
+  translate(03*[4,0,0])
+  // linear_extrude with internal hole and one coplanar edge
+  linear_extrude(height=a, slices=b, twist=c, scale=[x,y])
+  difference() {
+    square(2,true);
+    translate([-0.5,0,0]) square(1,true);
+  }
+}
+
+
+// Test varying parameters
+translate(00*[0,3,0])
+linear_extrudes_of_different_shapes(c=0,x=0,y=y);
+translate(01*[0,3,0])
+linear_extrudes_of_different_shapes(c=0,x=x,y=0);
+translate(02*[0,3,0])
+linear_extrudes_of_different_shapes(c=0,x=0,y=0);
+translate(03*[0,3,0])
+linear_extrudes_of_different_shapes(c=180,x=0,y=y);
+translate(04*[0,3,0])
+linear_extrudes_of_different_shapes(c=180,x=x,y=0);
+translate(05*[0,3,0])
+linear_extrudes_of_different_shapes(c=180,x=0,y=0);
diff --git a/testdata/scad/features/linear_extrude-tests.scad b/testdata/scad/features/linear_extrude-tests.scad
index 67d892f..528eea2 100644
--- a/testdata/scad/features/linear_extrude-tests.scad
+++ b/testdata/scad/features/linear_extrude-tests.scad
@@ -12,4 +12,13 @@ translate([31.5,2.5,0]) linear_extrude(height=10, twist=-45) polygon(points = [[
 translate([0,20,0]) linear_extrude(height=20, twist=45, slices=2) square([10,10]);
 translate([19,20,0]) linear_extrude(height=20, twist=45, slices=10) square([10,10]);
 
-translate([-15,0,0]) linear_extrude(5) square([10,10]);
+translate([0,-15,0]) linear_extrude(5) square([10,10]);
+
+// scale given as a scalar
+translate([-25,-10,0]) linear_extrude(height=10, scale=2) square(5, center=true);
+// scale given as a 3-dim vector
+translate([-15,20,0]) linear_extrude(height=20, scale=[4,5,6]) square(10);
+// scale is negative
+translate([-10,5,0]) linear_extrude(height=15, scale=-2) square(10, center=true);
+// scale given as undefined
+translate([-15,-15,0]) linear_extrude(height=10, scale=var_undef) square(10);
diff --git a/tests/regression/cgalpngtest/linear_extrude-scale-zero-tests-expected.png b/tests/regression/cgalpngtest/linear_extrude-scale-zero-tests-expected.png
new file mode 100644
index 0000000..3b1c934
Binary files /dev/null and b/tests/regression/cgalpngtest/linear_extrude-scale-zero-tests-expected.png differ
diff --git a/tests/regression/cgalpngtest/linear_extrude-tests-expected.png b/tests/regression/cgalpngtest/linear_extrude-tests-expected.png
index 7d3ea2c..c85142e 100644
Binary files a/tests/regression/cgalpngtest/linear_extrude-tests-expected.png and b/tests/regression/cgalpngtest/linear_extrude-tests-expected.png differ
diff --git a/tests/regression/dumptest/linear_extrude-scale-zero-tests-expected.txt b/tests/regression/dumptest/linear_extrude-scale-zero-tests-expected.txt
new file mode 100644
index 0000000..950c724
--- /dev/null
+++ b/tests/regression/dumptest/linear_extrude-scale-zero-tests-expected.txt
@@ -0,0 +1,253 @@
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		group() {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [0, 1], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [0, 1], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+					multmatrix([[1, 0, 0, -1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 8], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [0, 1], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+					multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [0, 1], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							square(size = [1, 1], center = true);
+						}
+					}
+				}
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 3], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		group() {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [1, 0], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [1, 0], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+					multmatrix([[1, 0, 0, -1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 8], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [1, 0], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+					multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [1, 0], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							square(size = [1, 1], center = true);
+						}
+					}
+				}
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 6], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		group() {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [0, 0], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [0, 0], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+					multmatrix([[1, 0, 0, -1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 8], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [0, 0], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+					multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 0, slices = 20, scale = [0, 0], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							square(size = [1, 1], center = true);
+						}
+					}
+				}
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		group() {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [0, 1], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [0, 1], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+					multmatrix([[1, 0, 0, -1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 8], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [0, 1], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+					multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [0, 1], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							square(size = [1, 1], center = true);
+						}
+					}
+				}
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		group() {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [1, 0], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [1, 0], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+					multmatrix([[1, 0, 0, -1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 8], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [1, 0], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+					multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [1, 0], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							square(size = [1, 1], center = true);
+						}
+					}
+				}
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 15], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		group() {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [0, 0], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [0, 0], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+					multmatrix([[1, 0, 0, -1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = true);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 8], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [0, 0], $fn = 0, $fa = 12, $fs = 2) {
+					multmatrix([[1, 0, 0, 0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+					multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						square(size = [1, 1], center = false);
+					}
+				}
+			}
+			multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+				linear_extrude(height = 3, center = false, convexity = 1, twist = 180, slices = 20, scale = [0, 0], $fn = 0, $fa = 12, $fs = 2) {
+					difference() {
+						square(size = [2, 2], center = true);
+						multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							square(size = [1, 1], center = true);
+						}
+					}
+				}
+			}
+		}
+	}
+
diff --git a/tests/regression/dumptest/linear_extrude-tests-expected.txt b/tests/regression/dumptest/linear_extrude-tests-expected.txt
index c031ed8..c867388 100644
--- a/tests/regression/dumptest/linear_extrude-tests-expected.txt
+++ b/tests/regression/dumptest/linear_extrude-tests-expected.txt
@@ -29,9 +29,29 @@
 			square(size = [10, 10], center = false);
 		}
 	}
-	multmatrix([[1, 0, 0, -15], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, -15], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		linear_extrude(height = 5, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
 			square(size = [10, 10], center = false);
 		}
 	}
+	multmatrix([[1, 0, 0, -25], [0, 1, 0, -10], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		linear_extrude(height = 10, center = false, convexity = 1, scale = [2, 2], $fn = 0, $fa = 12, $fs = 2) {
+			square(size = [5, 5], center = true);
+		}
+	}
+	multmatrix([[1, 0, 0, -15], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		linear_extrude(height = 20, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
+			square(size = [10, 10], center = false);
+		}
+	}
+	multmatrix([[1, 0, 0, -10], [0, 1, 0, 5], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		linear_extrude(height = 15, center = false, convexity = 1, scale = [0, 0], $fn = 0, $fa = 12, $fs = 2) {
+			square(size = [10, 10], center = true);
+		}
+	}
+	multmatrix([[1, 0, 0, -15], [0, 1, 0, -15], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		linear_extrude(height = 10, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
+			square(size = [10, 10], center = false);
+		}
+	}
 
diff --git a/tests/regression/opencsgtest/linear_extrude-scale-zero-tests-expected.png b/tests/regression/opencsgtest/linear_extrude-scale-zero-tests-expected.png
new file mode 100644
index 0000000..22e94ad
Binary files /dev/null and b/tests/regression/opencsgtest/linear_extrude-scale-zero-tests-expected.png differ
diff --git a/tests/regression/opencsgtest/linear_extrude-tests-expected.png b/tests/regression/opencsgtest/linear_extrude-tests-expected.png
index b929d09..cbbdc11 100644
Binary files a/tests/regression/opencsgtest/linear_extrude-tests-expected.png and b/tests/regression/opencsgtest/linear_extrude-tests-expected.png differ
diff --git a/tests/regression/throwntogethertest/linear_extrude-scale-zero-tests-expected.png b/tests/regression/throwntogethertest/linear_extrude-scale-zero-tests-expected.png
new file mode 100644
index 0000000..22e94ad
Binary files /dev/null and b/tests/regression/throwntogethertest/linear_extrude-scale-zero-tests-expected.png differ
diff --git a/tests/regression/throwntogethertest/linear_extrude-tests-expected.png b/tests/regression/throwntogethertest/linear_extrude-tests-expected.png
index fddeeb8..cbbdc11 100644
Binary files a/tests/regression/throwntogethertest/linear_extrude-tests-expected.png and b/tests/regression/throwntogethertest/linear_extrude-tests-expected.png differ
-- 
cgit v0.10.1


From 1c480a554ad4094bfb2337d915be33393a679e13 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Thu, 23 May 2013 19:16:04 -0700
Subject: make dependency build work for OpenCSG without qmake


diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index bfc830f..67df0b7 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -408,11 +408,25 @@ build_opencsg()
     OPENCSG_QMAKE=qmake-qt4
   elif [ "`command -v qmake4`" ]; then
     OPENCSG_QMAKE=qmake4
-  else
+  elif [ "`command -v qmake`" ]; then
     OPENCSG_QMAKE=qmake
+  else
+    echo qmake not found... using standard OpenCSG makefiles
+    OPENCSG_QMAKE=make
+    cp Makefile Makefile.bak
+    cp src/Makefile src/Makefile.bak
+
+    cat Makefile.bak | sed s/example// |sed s/glew// > Makefile
+    cat src/Makefile.bak | sed s@^INCPATH.*@INCPATH\ =\ -I$BASEDIR/include\ -I../include\ -I..\ -I.@ > src/Makefile
+    cp src/Makefile src/Makefile.bak2
+    cat src/Makefile.bak2 | sed s@^LIBS.*@LIBS\ =\ -L$BASEDIR/lib\ -L/usr/X11R6/lib\ -lGLU\ -lGL@ > src/Makefile
+    tmp=$version
+    build_glu 9.0.0 # todo - autodetect the need for glu
+    version=$tmp
   fi
 
   cd $BASEDIR/src/OpenCSG-$version/src
+  OPENCSG_QMAKE=make
   $OPENCSG_QMAKE
 
   cd $BASEDIR/src/OpenCSG-$version
@@ -562,7 +576,7 @@ fi
 build_eigen 3.1.1
 build_gmp 5.0.5
 build_mpfr 3.1.1
-build_boost 1.49.0
+build_boost 1.53.0
 # NB! For CGAL, also update the actual download URL in the function
 build_cgal 4.1
 build_glew 1.9.0
-- 
cgit v0.10.1


From f95941bbba15c016e8ceba55accd79f98c171aa9 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Thu, 23 May 2013 19:31:49 -0700
Subject: update cmake to work with custom built GLU in $BASEDIR


diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9821d70..39dc341 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -252,6 +252,18 @@ endif()
 
 # OpenGL
 find_package(OpenGL REQUIRED)
+if (NOT OPENGL_GLU_FOUND)
+  message(STATUS "GLU not found in system paths...searching $ENV{OPENSCAD_LIBRARIES} ")
+  find_library(OPENGL_glu_LIBRARY GLU HINTS $ENV{OPENSCAD_LIBRARIES}/lib)
+  if (NOT OPENGL_glu_LIBRARY)
+    message(FATAL "GLU library not found")
+  endif()
+  set(OPENGL_LIBRARIES ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARIES})
+  message(STATUS "OpenGL LIBRARIES: ")
+  foreach(GLLIB ${OPENGL_LIBRARIES})
+    message(STATUS "  " ${GLLIB})
+  endforeach()
+endif()
 
 # OpenCSG
 if (NOT $ENV{OPENCSGDIR} STREQUAL "")
-- 
cgit v0.10.1


From 85a6cf92feebd75f817e68bbfd53807d3d2fd1fd Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Thu, 23 May 2013 19:35:44 -0700
Subject: remove debugging assignment


diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index 67df0b7..60dbb74 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -426,7 +426,6 @@ build_opencsg()
   fi
 
   cd $BASEDIR/src/OpenCSG-$version/src
-  OPENCSG_QMAKE=make
   $OPENCSG_QMAKE
 
   cd $BASEDIR/src/OpenCSG-$version
-- 
cgit v0.10.1


From 27ce04ef90533ef2f6ad80c3c8b6748a23cdc624 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Fri, 24 May 2013 15:16:58 -0400
Subject: Related to #372. Fixes crash on systems where the stack size for new
 threads is to small


diff --git a/src/cgalworker.cc b/src/cgalworker.cc
index 96fead9..f011262 100644
--- a/src/cgalworker.cc
+++ b/src/cgalworker.cc
@@ -9,6 +9,7 @@
 CGALWorker::CGALWorker()
 {
 	this->thread = new QThread();
+	if (this->thread->stackSize() < 1024*1024) this->thread->setStackSize(1024*1024);
 	connect(this->thread, SIGNAL(started()), this, SLOT(work()));
 	moveToThread(this->thread);
 }
-- 
cgit v0.10.1


From e1766faeeda4218a453121ec81f8007cc1a1734d Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Fri, 24 May 2013 18:40:09 -0400
Subject: Initial implementation of improved operator handling. Provides the
 bulk of work for #304


diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
index 4624d4c..9fc3147 100644
--- a/src/CSGTermEvaluator.cc
+++ b/src/CSGTermEvaluator.cc
@@ -57,6 +57,7 @@ void CSGTermEvaluator::applyToChildren(const AbstractNode &node, CSGTermEvaluato
 		}
 	}
 	if (t1 && node.modinst->isHighlight()) {
+		t1->flag = CSGTerm::FLAG_HIGHLIGHT;
 		this->highlights.push_back(t1);
 	}
 	if (t1 && node.modinst->isBackground()) {
@@ -95,6 +96,7 @@ static shared_ptr<CSGTerm> evaluate_csg_term_from_ps(const State &state,
 	stream << node.name() << node.index();
 	shared_ptr<CSGTerm> t(new CSGTerm(ps, state.matrix(), state.color(), stream.str()));
 	if (modinst->isHighlight()) {
+		t->flag = CSGTerm::FLAG_HIGHLIGHT;
 		highlights.push_back(t);
 	}
 	if (modinst->isBackground()) {
diff --git a/src/CsgInfo.h b/src/CsgInfo.h
index fe953b5..774325b 100644
--- a/src/CsgInfo.h
+++ b/src/CsgInfo.h
@@ -57,7 +57,7 @@ public:
 		if (this->root_norm_term) {
 			this->root_chain = new CSGChain();
 			this->root_chain->import(this->root_norm_term);
-			PRINTB("Normalized CSG tree has %d elements", int(this->root_chain->polysets.size()));
+			PRINTB("Normalized CSG tree has %d elements", int(this->root_chain->objects.size()));
 		}
 		else {
 			this->root_chain = NULL;
diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc
index add90d3..31f27db 100644
--- a/src/OpenCSGRenderer.cc
+++ b/src/OpenCSGRenderer.cc
@@ -77,35 +77,45 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo,
 	std::vector<OpenCSG::Primitive*> primitives;
 	size_t j = 0;
 	for (size_t i = 0;; i++) {
-		bool last = i == chain->polysets.size();
-		if (last || chain->types[i] == CSGTerm::TYPE_UNION) {
+		const CSGChainObject &i_obj = chain->objects[i];
+		bool last = i == chain->objects.size();
+		if (last || i_obj.type == CSGTerm::TYPE_UNION) {
 			if (j+1 != i) {
 				 OpenCSG::render(primitives);
 				glDepthFunc(GL_EQUAL);
 			}
 			if (shaderinfo) glUseProgram(shaderinfo[0]);
 			for (; j < i; j++) {
-				const Transform3d &m = chain->matrices[j];
-				const Color4f &c = chain->colors[j];
+				const CSGChainObject &j_obj = chain->objects[j];
+				const Color4f &c = j_obj.color;
 				glPushMatrix();
-				glMultMatrixd(m.data());
-				PolySet::csgmode_e csgmode = chain->types[j] == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
-				if (highlight) {
-					setColor(COLORMODE_HIGHLIGHT, shaderinfo);
-					csgmode = PolySet::csgmode_e(csgmode + 20);
-				}
-				else if (background) {
-					setColor(COLORMODE_BACKGROUND, c.data(), shaderinfo);
+				glMultMatrixd(j_obj.matrix.data());
+				PolySet::csgmode_e csgmode = j_obj.type == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
+				ColorMode colormode = COLORMODE_NONE;
+				if (background) {
+					colormode = COLORMODE_BACKGROUND;
 					csgmode = PolySet::csgmode_e(csgmode + 10);
-				} else if (c[0] >= 0 || c[1] >= 0 || c[2] >= 0 || c[3] >= 0) {
-					// User-defined color or alpha from source
-					setColor(c.data(), shaderinfo);
-				} else if (chain->types[j] == CSGTerm::TYPE_DIFFERENCE) {
-					setColor(COLORMODE_CUTOUT, shaderinfo);
+				} else if (j_obj.type == CSGTerm::TYPE_DIFFERENCE) {
+					if (j_obj.flag & CSGTerm::FLAG_HIGHLIGHT) {
+						colormode = COLORMODE_HIGHLIGHT;
+						csgmode = PolySet::csgmode_e(csgmode + 20);
+					}
+					else {
+						colormode = COLORMODE_CUTOUT;
+					}
 				} else {
-					setColor(COLORMODE_MATERIAL, shaderinfo);
+					if (j_obj.flag & CSGTerm::FLAG_HIGHLIGHT) {
+						colormode = COLORMODE_HIGHLIGHT;
+						csgmode = PolySet::csgmode_e(csgmode + 20);
+					 }
+					else {
+						colormode = COLORMODE_MATERIAL;
+					}
 				}
-				chain->polysets[j]->render_surface(csgmode, m, shaderinfo);
+
+				setColor(colormode, c.data(), shaderinfo);
+
+				j_obj.polyset->render_surface(csgmode, j_obj.matrix, shaderinfo);
 				glPopMatrix();
 			}
 			if (shaderinfo) glUseProgram(0);
@@ -118,11 +128,11 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo,
 
 		if (last) break;
 
-		OpenCSGPrim *prim = new OpenCSGPrim(chain->types[i] == CSGTerm::TYPE_DIFFERENCE ?
-				OpenCSG::Subtraction : OpenCSG::Intersection, chain->polysets[i]->convexity);
-		prim->ps = chain->polysets[i];
-		prim->m = chain->matrices[i];
-		prim->csgmode = chain->types[i] == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
+		OpenCSGPrim *prim = new OpenCSGPrim(i_obj.type == CSGTerm::TYPE_DIFFERENCE ?
+				OpenCSG::Subtraction : OpenCSG::Intersection, i_obj.polyset->convexity);
+		prim->ps = i_obj.polyset;
+		prim->m = i_obj.matrix;
+		prim->csgmode = i_obj.type == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
 		if (highlight) prim->csgmode = PolySet::csgmode_e(prim->csgmode + 20);
 		else if (background) prim->csgmode = PolySet::csgmode_e(prim->csgmode + 10);
 		primitives.push_back(prim);
diff --git a/src/ThrownTogetherRenderer.cc b/src/ThrownTogetherRenderer.cc
index 146d2e1..6151145 100644
--- a/src/ThrownTogetherRenderer.cc
+++ b/src/ThrownTogetherRenderer.cc
@@ -31,6 +31,7 @@
 #include "system-gl.h"
 
 #include <boost/unordered_map.hpp>
+#include <boost/foreach.hpp>
 
 ThrownTogetherRenderer::ThrownTogetherRenderer(CSGChain *root_chain, 
 																							 CSGChain *highlights_chain,
@@ -62,56 +63,56 @@ void ThrownTogetherRenderer::renderCSGChain(CSGChain *chain, bool highlight,
 																						bool fberror) const
 {
 	glDepthFunc(GL_LEQUAL);
-	boost::unordered_map<std::pair<PolySet*,Transform3d*>,int> polySetVisitMark;
-	for (size_t i = 0; i < chain->polysets.size(); i++) {
-		if (polySetVisitMark[std::make_pair(chain->polysets[i].get(), &chain->matrices[i])]++ > 0)
+	boost::unordered_map<std::pair<PolySet*,const Transform3d*>,int> polySetVisitMark;
+	BOOST_FOREACH(const CSGChainObject &obj, chain->objects) {
+		if (polySetVisitMark[std::make_pair(obj.polyset.get(), &obj.matrix)]++ > 0)
 			continue;
-		const Transform3d &m = chain->matrices[i];
-		const Color4f &c = chain->colors[i];
+		const Transform3d &m = obj.matrix;
+		const Color4f &c = obj.color;
 		glPushMatrix();
 		glMultMatrixd(m.data());
-		PolySet::csgmode_e csgmode  = chain->types[i] == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
+		PolySet::csgmode_e csgmode  = obj.type == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
 		if (highlight) {
 			csgmode = PolySet::csgmode_e(csgmode + 20);
 			setColor(COLORMODE_HIGHLIGHT);
-			chain->polysets[i]->render_surface(csgmode, m);
+			obj.polyset->render_surface(csgmode, m);
 			if (showedges) {
 				setColor(COLORMODE_HIGHLIGHT_EDGES);
-				chain->polysets[i]->render_edges(csgmode);
+				obj.polyset->render_edges(csgmode);
 			}
 		} else if (background) {
 			csgmode = PolySet::csgmode_e(csgmode + 10);
 			setColor(COLORMODE_BACKGROUND);
-			chain->polysets[i]->render_surface(csgmode, m);
+			obj.polyset->render_surface(csgmode, m);
 			if (showedges) {
 				setColor(COLORMODE_BACKGROUND_EDGES);
-				chain->polysets[i]->render_edges(csgmode);
+				obj.polyset->render_edges(csgmode);
 			}
 		} else if (fberror) {
 			if (highlight) csgmode = PolySet::csgmode_e(csgmode + 20);
 			else if (background) csgmode = PolySet::csgmode_e(csgmode + 10);
 			else csgmode = PolySet::csgmode_e(csgmode);
-			chain->polysets[i]->render_surface(csgmode, m);
+			obj.polyset->render_surface(csgmode, m);
 		} else if (c[0] >= 0 || c[1] >= 0 || c[2] >= 0 || c[3] >= 0) {
 			setColor(c.data());
-			chain->polysets[i]->render_surface(csgmode, m);
+			obj.polyset->render_surface(csgmode, m);
 			if (showedges) {
 				glColor4f((c[0]+1)/2, (c[1]+1)/2, (c[2]+1)/2, 1.0);
-				chain->polysets[i]->render_edges(csgmode);
+				obj.polyset->render_edges(csgmode);
 			}
-		} else if (chain->types[i] == CSGTerm::TYPE_DIFFERENCE) {
+		} else if (obj.type == CSGTerm::TYPE_DIFFERENCE) {
 			setColor(COLORMODE_CUTOUT);
-			chain->polysets[i]->render_surface(csgmode, m);
+			obj.polyset->render_surface(csgmode, m);
 			if (showedges) {
 				setColor(COLORMODE_CUTOUT_EDGES);
-				chain->polysets[i]->render_edges(csgmode);
+				obj.polyset->render_edges(csgmode);
 			}
 		} else {
 			setColor(COLORMODE_MATERIAL);
-			chain->polysets[i]->render_surface(csgmode, m);
+			obj.polyset->render_surface(csgmode, m);
 			if (showedges) {
 				setColor(COLORMODE_MATERIAL_EDGES);
-				chain->polysets[i]->render_edges(csgmode);
+				obj.polyset->render_edges(csgmode);
 			}
 		}
 		glPopMatrix();
diff --git a/src/csgterm.cc b/src/csgterm.cc
index aed97b2..7852715 100644
--- a/src/csgterm.cc
+++ b/src/csgterm.cc
@@ -28,6 +28,7 @@
 #include "polyset.h"
 #include "linalg.h"
 #include <sstream>
+#include <boost/foreach.hpp>
 
 /*!
 	\class CSGTerm
@@ -103,19 +104,19 @@ shared_ptr<CSGTerm> CSGTerm::createCSGTerm(type_e type, CSGTerm *left, CSGTerm *
 }
 
 CSGTerm::CSGTerm(const shared_ptr<PolySet> &polyset, const Transform3d &matrix, const Color4f &color, const std::string &label)
-	: type(TYPE_PRIMITIVE), polyset(polyset), label(label), m(matrix), color(color)
+	: type(TYPE_PRIMITIVE), polyset(polyset), label(label), flag(CSGTerm::FLAG_NONE), m(matrix), color(color)
 {
 	initBoundingBox();
 }
 
 CSGTerm::CSGTerm(type_e type, shared_ptr<CSGTerm> left, shared_ptr<CSGTerm> right)
-	: type(type), left(left), right(right), m(Transform3d::Identity())
+	: type(type), left(left), right(right), flag(CSGTerm::FLAG_NONE), m(Transform3d::Identity())
 {
 	initBoundingBox();
 }
 
 CSGTerm::CSGTerm(type_e type, CSGTerm *left, CSGTerm *right)
-	: type(type), left(left), right(right), m(Transform3d::Identity())
+	: type(type), left(left), right(right), flag(CSGTerm::FLAG_NONE), m(Transform3d::Identity())
 {
 	initBoundingBox();
 }
@@ -181,26 +182,14 @@ std::string CSGTerm::dump()
 	return dump.str();
 }
 
-CSGChain::CSGChain()
-{
-}
-
-void CSGChain::add(const shared_ptr<PolySet> &polyset, const Transform3d &m, const Color4f &color, CSGTerm::type_e type, std::string label)
-{
-	polysets.push_back(polyset);
-	matrices.push_back(m);
-	colors.push_back(color);
-	types.push_back(type);
-	labels.push_back(label);
-}
-
-void CSGChain::import(shared_ptr<CSGTerm> term, CSGTerm::type_e type)
+void CSGChain::import(shared_ptr<CSGTerm> term, CSGTerm::type_e type, CSGTerm::Flag flag)
 {
+	CSGTerm::Flag newflag = (CSGTerm::Flag)(term->flag | flag);
 	if (term->type == CSGTerm::TYPE_PRIMITIVE) {
-		add(term->polyset, term->m, term->color, type, term->label);
+		this->objects.push_back(CSGChainObject(term->polyset, term->m, term->color, type, term->label, newflag));
 	} else {
-		import(term->left, type);
-		import(term->right, term->type);
+		import(term->left, type, newflag);
+		import(term->right, term->type, newflag);
 	}
 }
 
@@ -208,21 +197,20 @@ std::string CSGChain::dump(bool full)
 {
 	std::stringstream dump;
 
-	for (size_t i = 0; i < types.size(); i++)
-	{
-		if (types[i] == CSGTerm::TYPE_UNION) {
-			if (i != 0) dump << "\n";
+	BOOST_FOREACH(const CSGChainObject &obj, this->objects) {
+		if (obj.type == CSGTerm::TYPE_UNION) {
+			if (&obj != &this->objects.front()) dump << "\n";
 			dump << "+";
 		}
-		else if (types[i] == CSGTerm::TYPE_DIFFERENCE)
+		else if (obj.type == CSGTerm::TYPE_DIFFERENCE)
 			dump << " -";
-		else if (types[i] == CSGTerm::TYPE_INTERSECTION)
+		else if (obj.type == CSGTerm::TYPE_INTERSECTION)
 			dump << " *";
-		dump << labels[i];
+		dump << obj.label;
 		if (full) {
-			dump << " polyset: \n" << polysets[i]->dump() << "\n";
-			dump << " matrix: \n" << matrices[i].matrix() << "\n";
-			dump << " color: \n" << colors[i] << "\n";
+			dump << " polyset: \n" << obj.polyset->dump() << "\n";
+			dump << " matrix: \n" << obj.matrix.matrix() << "\n";
+			dump << " color: \n" << obj.color << "\n";
 		}
 	}
 	dump << "\n";
@@ -232,11 +220,11 @@ std::string CSGChain::dump(bool full)
 BoundingBox CSGChain::getBoundingBox() const
 {
 	BoundingBox bbox;
-	for (size_t i=0;i<polysets.size();i++) {
-		if (types[i] != CSGTerm::TYPE_DIFFERENCE) {
-			BoundingBox psbox = polysets[i]->getBoundingBox();
+	BOOST_FOREACH(const CSGChainObject &obj, this->objects) {
+		if (obj.type != CSGTerm::TYPE_DIFFERENCE) {
+			BoundingBox psbox = obj.polyset->getBoundingBox();
 			if (!psbox.isNull()) {
-				bbox.extend(matrices[i] * psbox);
+				bbox.extend(obj.matrix * psbox);
 			}
 		}
 	}
diff --git a/src/csgterm.h b/src/csgterm.h
index 566ebc3..94878e5 100644
--- a/src/csgterm.h
+++ b/src/csgterm.h
@@ -18,6 +18,12 @@ public:
 		TYPE_DIFFERENCE
 	};
 
+	enum Flag {
+		FLAG_NONE = 0x00,
+		FLAG_BACKGROUND = 0x01,
+		FLAG_HIGHLIGHT = 0x03
+	};
+
 	static shared_ptr<CSGTerm> createCSGTerm(type_e type, shared_ptr<CSGTerm> left, shared_ptr<CSGTerm> right);
 	static shared_ptr<CSGTerm> createCSGTerm(type_e type, CSGTerm *left, CSGTerm *right);
 
@@ -27,6 +33,7 @@ public:
 	shared_ptr<CSGTerm> left;
 	shared_ptr<CSGTerm> right;
 	BoundingBox bbox;
+	Flag flag;
 
 	CSGTerm(const shared_ptr<PolySet> &polyset, const Transform3d &matrix, const Color4f &color, const std::string &label);
 	~CSGTerm();
@@ -46,19 +53,34 @@ private:
 	friend class CSGChain;
 };
 
+class CSGChainObject
+{
+public:
+	CSGChainObject(shared_ptr<PolySet> polyset,
+								 const Transform3d &matrix,
+								 const Color4f &color,
+								 CSGTerm::type_e type,
+								 const std::string &label,
+								 CSGTerm::Flag flag = CSGTerm::FLAG_NONE)
+		: polyset(polyset), matrix(matrix), color(color), type(type), label(label), flag(flag) {}
+
+	shared_ptr<PolySet> polyset;
+	Transform3d matrix;
+	Color4f color;
+	CSGTerm::type_e type;
+	std::string label;
+	CSGTerm::Flag flag;
+};
+
 class CSGChain
 {
 public:
-	std::vector<shared_ptr<PolySet> > polysets;
-	std::vector<Transform3d> matrices;
-	std::vector<Color4f> colors;
-	std::vector<CSGTerm::type_e> types;
-	std::vector<std::string> labels;
+	std::vector<CSGChainObject> objects;
 
-	CSGChain();
+	CSGChain() {};
 
-	void add(const shared_ptr<PolySet> &polyset, const Transform3d &m, const Color4f &color, CSGTerm::type_e type, std::string label);
-	void import(shared_ptr<CSGTerm> term, CSGTerm::type_e type = CSGTerm::TYPE_UNION);
+	void import(shared_ptr<CSGTerm> term, CSGTerm::type_e type = CSGTerm::TYPE_UNION,
+							CSGTerm::Flag flag = CSGTerm::FLAG_NONE);
 	std::string dump(bool full = false);
 
 	BoundingBox getBoundingBox() const;
diff --git a/src/mainwin.cc b/src/mainwin.cc
index da3501d..1ac96fa 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -771,14 +771,14 @@ void MainWindow::compileCSG(bool procevents)
 		}
 
 		if (this->root_chain && 
-				(this->root_chain->polysets.size() > 
+				(this->root_chain->objects.size() > 
 				 Preferences::inst()->getValue("advanced/openCSGLimit").toUInt())) {
-			PRINTB("WARNING: Normalized tree has %d elements!", this->root_chain->polysets.size());
+			PRINTB("WARNING: Normalized tree has %d elements!", this->root_chain->objects.size());
 			PRINT("WARNING: OpenCSG rendering has been disabled.");
 		}
 		else {
 			PRINTB("Normalized CSG tree has %d elements", 
-						 (this->root_chain ? this->root_chain->polysets.size() : 0));
+						 (this->root_chain ? this->root_chain->objects.size() : 0));
 			this->opencsgRenderer = new OpenCSGRenderer(this->root_chain, 
 																									this->highlights_chain, 
 																									this->background_chain, 
diff --git a/src/renderer.cc b/src/renderer.cc
index 77dcde9..7c4f8d7 100644
--- a/src/renderer.cc
+++ b/src/renderer.cc
@@ -1,49 +1,11 @@
 #include "renderer.h"
 #include "rendersettings.h"
-#include "linalg.h"
 
-void Renderer::setColor(const float color[4], GLint *shaderinfo) const
+bool Renderer::getColor(Renderer::ColorMode colormode, Color4f &col) const
 {
-	Color4f col = RenderSettings::inst()->color(RenderSettings::OPENCSG_FACE_FRONT_COLOR);
-	float c[4] = {color[0], color[1], color[2], color[3]};
-	if (c[0] < 0) c[0] = col[0];
-	if (c[1] < 0) c[1] = col[1];
-	if (c[2] < 0) c[2] = col[2];
-	if (c[3] < 0) c[3] = col[3];
-	glColor4fv(c);
-	if (shaderinfo) {
-		glUniform4f(shaderinfo[1], c[0], c[1], c[2], c[3]);
-		glUniform4f(shaderinfo[2], (c[0]+1)/2, (c[1]+1)/2, (c[2]+1)/2, 1.0);
-	}
-}
-
-void Renderer::setColor(ColorMode colormode, const float color[4], GLint *shaderinfo) const
-{
-	if (colormode == COLORMODE_BACKGROUND && 
-			color[0] >= 0 || color[1] >= 0 || color[2] >= 0 || color[3] >= 0) {
-
-		Color4f col;
-    col.setRgb(180, 180, 180, 255);
-		float c[4] = {color[0], color[1], color[2], color[3]};
-		if (c[0] < 0) c[0] = col[0];
-		if (c[1] < 0) c[1] = col[1];
-		if (c[2] < 0) c[2] = col[2];
-		if (c[3] < 0) c[3] = col[3];
-
-		c[3] /= 2; // Background objects are half-transparent
-		setColor(c, shaderinfo);
-	}
-	else {
-		setColor(colormode, shaderinfo);
-	}
-}
-
-void Renderer::setColor(ColorMode colormode, GLint *shaderinfo) const
-{
-	Color4f col;
 	switch (colormode) {
 	case COLORMODE_NONE:
-		return;
+		return false;
 		break;
 	case COLORMODE_MATERIAL:
 		col = RenderSettings::inst()->color(RenderSettings::OPENCSG_FACE_FRONT_COLOR);
@@ -52,7 +14,7 @@ void Renderer::setColor(ColorMode colormode, GLint *shaderinfo) const
 		col = RenderSettings::inst()->color(RenderSettings::OPENCSG_FACE_BACK_COLOR);
 		break;
 	case COLORMODE_HIGHLIGHT:
-		col.setRgb(255, 157, 81, 128);
+		col.setRgb(255, 81, 81, 128);
 		break;
 	case COLORMODE_BACKGROUND:
     col.setRgb(180, 180, 180, 128);
@@ -70,19 +32,51 @@ void Renderer::setColor(ColorMode colormode, GLint *shaderinfo) const
 		col.setRgb(150, 150, 150, 128);
 		break;
 	default:
-		return;
+		return false;
 		break;
 	}
-	float rgba[4];
-	rgba[0] = col[0];
-	rgba[1] = col[1];
-	rgba[2] = col[2];
-	rgba[3] = col[3];
-	glColor4fv(rgba);
+	return true;
+}
+
+void Renderer::setColor(const float color[4], GLint *shaderinfo) const
+{
+	Color4f col = RenderSettings::inst()->color(RenderSettings::OPENCSG_FACE_FRONT_COLOR);
+	float c[4] = {color[0], color[1], color[2], color[3]};
+	if (c[0] < 0) c[0] = col[0];
+	if (c[1] < 0) c[1] = col[1];
+	if (c[2] < 0) c[2] = col[2];
+	if (c[3] < 0) c[3] = col[3];
+	glColor4fv(c);
 #ifdef ENABLE_OPENCSG
 	if (shaderinfo) {
-		glUniform4f(shaderinfo[1], col[0], col[1], col[2], 1.0f);
-		glUniform4f(shaderinfo[2], (col[0]+1)/2, (col[1]+1)/2, (col[2]+1)/2, 1.0f);
+		glUniform4f(shaderinfo[1], c[0], c[1], c[2], c[3]);
+		glUniform4f(shaderinfo[2], (c[0]+1)/2, (c[1]+1)/2, (c[2]+1)/2, 1.0);
 	}
 #endif
 }
+
+void Renderer::setColor(ColorMode colormode, const float color[4], GLint *shaderinfo) const
+{
+	Color4f basecol;
+	if (getColor(colormode, basecol)) {
+		if (colormode == COLORMODE_BACKGROUND) {
+			basecol = Color4f(color[0] >= 0 ? color[0] : basecol[0],
+												color[1] >= 0 ? color[1] : basecol[1],
+												color[2] >= 0 ? color[2] : basecol[2],
+												color[3] >= 0 ? color[3] : basecol[3]);
+		}
+		else if (colormode != COLORMODE_HIGHLIGHT) {
+			basecol = Color4f(color[0] >= 0 ? color[0] : basecol[0],
+												color[1] >= 0 ? color[1] : basecol[1],
+												color[2] >= 0 ? color[2] : basecol[2],
+												color[3] >= 0 ? color[3] : basecol[3]);
+		}
+		setColor(basecol.data(), shaderinfo);
+	}
+}
+
+void Renderer::setColor(ColorMode colormode, GLint *shaderinfo) const
+{	
+	float c[4] = {-1,-1,-1,-1};
+	setColor(colormode, c, shaderinfo);
+}
diff --git a/src/renderer.h b/src/renderer.h
index 24c1d94..f70b4e1 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -2,6 +2,7 @@
 #define RENDERER_H_
 
 #include "system-gl.h"
+#include "linalg.h"
 
 #ifdef _MSC_VER // NULL
 #include <cstdlib>
@@ -25,6 +26,7 @@ public:
 		COLORMODE_BACKGROUND_EDGES
 	};
 
+	virtual bool getColor(ColorMode colormode, Color4f &col) const;
 	virtual void setColor(const float color[4], GLint *shaderinfo = NULL) const;
 	virtual void setColor(ColorMode colormode, GLint *shaderinfo = NULL) const;
 	virtual void setColor(ColorMode colormode, const float color[4], GLint *shaderinfo = NULL) const;
-- 
cgit v0.10.1


From 3baefed148d27eafd19ccef4b96eaaeb4a5fbb1a Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 25 May 2013 13:09:57 -0400
Subject: Tuning of highlight and background modifiers


diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc
index 31f27db..b4acf82 100644
--- a/src/OpenCSGRenderer.cc
+++ b/src/OpenCSGRenderer.cc
@@ -93,7 +93,12 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo,
 				PolySet::csgmode_e csgmode = j_obj.type == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
 				ColorMode colormode = COLORMODE_NONE;
 				if (background) {
-					colormode = COLORMODE_BACKGROUND;
+					if (j_obj.flag & CSGTerm::FLAG_HIGHLIGHT) {
+						colormode = COLORMODE_HIGHLIGHT;
+					}
+					else {
+						colormode = COLORMODE_BACKGROUND;
+					}
 					csgmode = PolySet::csgmode_e(csgmode + 10);
 				} else if (j_obj.type == CSGTerm::TYPE_DIFFERENCE) {
 					if (j_obj.flag & CSGTerm::FLAG_HIGHLIGHT) {
diff --git a/src/ThrownTogetherRenderer.cc b/src/ThrownTogetherRenderer.cc
index 6151145..6be30dc 100644
--- a/src/ThrownTogetherRenderer.cc
+++ b/src/ThrownTogetherRenderer.cc
@@ -53,9 +53,9 @@ void ThrownTogetherRenderer::draw(bool /*showfaces*/, bool showedges) const
 		glDisable(GL_CULL_FACE);
 	}
 	if (this->background_chain)
-		renderCSGChain(this->background_chain, false, true, showedges, false);
+	 	renderCSGChain(this->background_chain, false, true, showedges, false);
 	if (this->highlights_chain)
-		renderCSGChain(this->highlights_chain, true, false, showedges, false);
+	 	renderCSGChain(this->highlights_chain, true, false, showedges, false);
 }
 
 void ThrownTogetherRenderer::renderCSGChain(CSGChain *chain, bool highlight,
@@ -72,49 +72,54 @@ void ThrownTogetherRenderer::renderCSGChain(CSGChain *chain, bool highlight,
 		glPushMatrix();
 		glMultMatrixd(m.data());
 		PolySet::csgmode_e csgmode  = obj.type == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL;
+		ColorMode colormode = COLORMODE_NONE;
+		ColorMode edge_colormode = COLORMODE_NONE;
+
 		if (highlight) {
 			csgmode = PolySet::csgmode_e(csgmode + 20);
-			setColor(COLORMODE_HIGHLIGHT);
-			obj.polyset->render_surface(csgmode, m);
-			if (showedges) {
-				setColor(COLORMODE_HIGHLIGHT_EDGES);
-				obj.polyset->render_edges(csgmode);
-			}
+			colormode = COLORMODE_HIGHLIGHT;
+			edge_colormode = COLORMODE_HIGHLIGHT_EDGES;
 		} else if (background) {
-			csgmode = PolySet::csgmode_e(csgmode + 10);
-			setColor(COLORMODE_BACKGROUND);
-			obj.polyset->render_surface(csgmode, m);
-			if (showedges) {
-				setColor(COLORMODE_BACKGROUND_EDGES);
-				obj.polyset->render_edges(csgmode);
+			if (obj.flag & CSGTerm::FLAG_HIGHLIGHT) {
+				colormode = COLORMODE_HIGHLIGHT;
 			}
+			else {
+				colormode = COLORMODE_BACKGROUND;
+			}
+			csgmode = PolySet::csgmode_e(csgmode + 10);
+			edge_colormode = COLORMODE_BACKGROUND_EDGES;
 		} else if (fberror) {
 			if (highlight) csgmode = PolySet::csgmode_e(csgmode + 20);
 			else if (background) csgmode = PolySet::csgmode_e(csgmode + 10);
 			else csgmode = PolySet::csgmode_e(csgmode);
-			obj.polyset->render_surface(csgmode, m);
-		} else if (c[0] >= 0 || c[1] >= 0 || c[2] >= 0 || c[3] >= 0) {
-			setColor(c.data());
-			obj.polyset->render_surface(csgmode, m);
-			if (showedges) {
-				glColor4f((c[0]+1)/2, (c[1]+1)/2, (c[2]+1)/2, 1.0);
-				obj.polyset->render_edges(csgmode);
-			}
 		} else if (obj.type == CSGTerm::TYPE_DIFFERENCE) {
-			setColor(COLORMODE_CUTOUT);
-			obj.polyset->render_surface(csgmode, m);
-			if (showedges) {
-				setColor(COLORMODE_CUTOUT_EDGES);
-				obj.polyset->render_edges(csgmode);
+			if (obj.flag & CSGTerm::FLAG_HIGHLIGHT) {
+				colormode = COLORMODE_HIGHLIGHT;
+				csgmode = PolySet::csgmode_e(csgmode + 20);
+			}
+			else {
+				colormode = COLORMODE_CUTOUT;
 			}
+			edge_colormode = COLORMODE_CUTOUT_EDGES;
 		} else {
-			setColor(COLORMODE_MATERIAL);
-			obj.polyset->render_surface(csgmode, m);
-			if (showedges) {
-				setColor(COLORMODE_MATERIAL_EDGES);
-				obj.polyset->render_edges(csgmode);
+			if (obj.flag & CSGTerm::FLAG_HIGHLIGHT) {
+				colormode = COLORMODE_HIGHLIGHT;
+				csgmode = PolySet::csgmode_e(csgmode + 20);
+			}
+			else {
+				colormode = COLORMODE_MATERIAL;
 			}
+			edge_colormode = COLORMODE_MATERIAL_EDGES;
 		}
+		
+		setColor(colormode, c.data());
+		obj.polyset->render_surface(csgmode, m);
+		if (showedges) {
+			// FIXME? glColor4f((c[0]+1)/2, (c[1]+1)/2, (c[2]+1)/2, 1.0);
+			setColor(edge_colormode);
+			obj.polyset->render_edges(csgmode);
+		}
+
 		glPopMatrix();
 	}
 }
-- 
cgit v0.10.1


From 794b80ffcfa356b294e2e0c202ece005f2d0009c Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 25 May 2013 13:11:09 -0400
Subject: Modified tests for #304


diff --git a/testdata/scad/features/background-modifier.scad b/testdata/scad/features/background-modifier.scad
index 5430472..d67270e 100644
--- a/testdata/scad/features/background-modifier.scad
+++ b/testdata/scad/features/background-modifier.scad
@@ -3,3 +3,8 @@ difference() {
   %cylinder(h=30, r=6, center=true);
 }
 %if (true) cube([25,6,3], center=true);
+
+%translate([0,-9,0]) difference() {
+  color("green") cube([10,4,10], center=true);
+  color("red") translate([0,-2,0]) sphere(3);
+}
diff --git a/testdata/scad/features/highlight-and-background-modifier.scad b/testdata/scad/features/highlight-and-background-modifier.scad
index 5dca703..d97408b 100644
--- a/testdata/scad/features/highlight-and-background-modifier.scad
+++ b/testdata/scad/features/highlight-and-background-modifier.scad
@@ -1,10 +1,31 @@
 difference() {
   sphere(r=10);
   %#cylinder(h=30, r=6, center=true);
-  %#if (true) cube([6,25,3], center=true);
+  %#if (true) cube([25,6,3], center=true);
 }
-translate([13,0,0]) difference() {
-  sphere(r=10);
-  #%cylinder(h=30, r=6, center=true);
-  #%if (true) cube([6,25,3], center=true);
+%#translate([0,-9,0]) difference() {
+  color("green") cube([10,4,10], center=true);
+  color("red") translate([0,-2,0]) sphere(3);
+}
+%translate([13,0,0]){
+  difference() {
+    sphere(r=10);
+    cylinder(h=30, r=6, center=true);
+    if (true) cube([25,6,3], center=true);
+  }
+  #translate([0,-9,0]) difference() {
+    color("green") cube([10,4,10], center=true);
+    color("red") translate([0,-2,0]) sphere(3);
+  }
+}
+#translate([26,0,0]){
+  difference() {
+    sphere(r=10);
+    cylinder(h=30, r=6, center=true);
+    if (true) cube([25,6,3], center=true);
+  }
+  %translate([0,-9,0]) difference() {
+    color("green") cube([10,4,10], center=true);
+    color("red") translate([0,-2,0]) sphere(3);
+  }
 }
diff --git a/testdata/scad/features/highlight-modifier.scad b/testdata/scad/features/highlight-modifier.scad
index f228d08..2141f58 100644
--- a/testdata/scad/features/highlight-modifier.scad
+++ b/testdata/scad/features/highlight-modifier.scad
@@ -3,3 +3,8 @@ difference() {
   #cylinder(h=30, r=6, center=true);
 }
 #if (true) cube([25,6,3], center=true);
+
+#translate([0,-9,0]) difference() {
+  color("green") cube([10,4,10], center=true);
+  color("red") translate([0,-2,0]) sphere(3);
+}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 39dc341..b696f2e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -833,10 +833,7 @@ disable_tests(cgalpngtest_child-background
               cgalpngtest_testcolornames
               openscad-cgalpng_child-background
               openscad-cgalpng_highlight-and-background-modifier
-              openscad-cgalpng_testcolornames
-              throwntogethertest_child-background
-              throwntogethertest_highlight-and-background-modifier
-              throwntogethertest_testcolornames)
+              openscad-cgalpng_testcolornames)
 
 # Test config handling
 
diff --git a/tests/regression/cgalpngtest/highlight-modifier-expected.png b/tests/regression/cgalpngtest/highlight-modifier-expected.png
index e220aa1..2fc7678 100644
Binary files a/tests/regression/cgalpngtest/highlight-modifier-expected.png and b/tests/regression/cgalpngtest/highlight-modifier-expected.png differ
diff --git a/tests/regression/dumptest/background-modifier-expected.txt b/tests/regression/dumptest/background-modifier-expected.txt
index ed769b3..5861bef 100644
--- a/tests/regression/dumptest/background-modifier-expected.txt
+++ b/tests/regression/dumptest/background-modifier-expected.txt
@@ -5,4 +5,16 @@
 	%group() {
 		cube(size = [25, 6, 3], center = true);
 	}
+	%multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			color([0, 0.501961, 0, 1]) {
+				cube(size = [10, 4, 10], center = true);
+			}
+			color([1, 0, 0, 1]) {
+				multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+				}
+			}
+		}
+	}
 
diff --git a/tests/regression/dumptest/highlight-and-background-modifier-expected.txt b/tests/regression/dumptest/highlight-and-background-modifier-expected.txt
index 20c82cc..eb8931c 100644
--- a/tests/regression/dumptest/highlight-and-background-modifier-expected.txt
+++ b/tests/regression/dumptest/highlight-and-background-modifier-expected.txt
@@ -2,15 +2,60 @@
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
 		%cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
 		%group() {
-			cube(size = [6, 25, 3], center = true);
+			cube(size = [25, 6, 3], center = true);
 		}
 	}
-	multmatrix([[1, 0, 0, 13], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+	%multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			color([0, 0.501961, 0, 1]) {
+				cube(size = [10, 4, 10], center = true);
+			}
+			color([1, 0, 0, 1]) {
+				multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+				}
+			}
+		}
+	}
+	%multmatrix([[1, 0, 0, 13], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
+			cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
+			group() {
+				cube(size = [25, 6, 3], center = true);
+			}
+		}
+		multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			difference() {
+				color([0, 0.501961, 0, 1]) {
+					cube(size = [10, 4, 10], center = true);
+				}
+				color([1, 0, 0, 1]) {
+					multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+					}
+				}
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 26], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
-			%cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
-			%group() {
-				cube(size = [6, 25, 3], center = true);
+			cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
+			group() {
+				cube(size = [25, 6, 3], center = true);
+			}
+		}
+		%multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			difference() {
+				color([0, 0.501961, 0, 1]) {
+					cube(size = [10, 4, 10], center = true);
+				}
+				color([1, 0, 0, 1]) {
+					multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+						sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+					}
+				}
 			}
 		}
 	}
diff --git a/tests/regression/dumptest/highlight-modifier-expected.txt b/tests/regression/dumptest/highlight-modifier-expected.txt
index c6204bd..c0a29ad 100644
--- a/tests/regression/dumptest/highlight-modifier-expected.txt
+++ b/tests/regression/dumptest/highlight-modifier-expected.txt
@@ -5,4 +5,16 @@
 	group() {
 		cube(size = [25, 6, 3], center = true);
 	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			color([0, 0.501961, 0, 1]) {
+				cube(size = [10, 4, 10], center = true);
+			}
+			color([1, 0, 0, 1]) {
+				multmatrix([[1, 0, 0, 0], [0, 1, 0, -2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
+				}
+			}
+		}
+	}
 
diff --git a/tests/regression/opencsgtest/background-modifier-expected.png b/tests/regression/opencsgtest/background-modifier-expected.png
index 2505331..9cf7db0 100644
Binary files a/tests/regression/opencsgtest/background-modifier-expected.png and b/tests/regression/opencsgtest/background-modifier-expected.png differ
diff --git a/tests/regression/opencsgtest/highlight-and-background-modifier-expected.png b/tests/regression/opencsgtest/highlight-and-background-modifier-expected.png
index 8febe76..c1c7313 100644
Binary files a/tests/regression/opencsgtest/highlight-and-background-modifier-expected.png and b/tests/regression/opencsgtest/highlight-and-background-modifier-expected.png differ
diff --git a/tests/regression/opencsgtest/highlight-modifier-expected.png b/tests/regression/opencsgtest/highlight-modifier-expected.png
index af01e5b..1021c22 100644
Binary files a/tests/regression/opencsgtest/highlight-modifier-expected.png and b/tests/regression/opencsgtest/highlight-modifier-expected.png differ
diff --git a/tests/regression/throwntogethertest/background-modifier-expected.png b/tests/regression/throwntogethertest/background-modifier-expected.png
index 2505331..499b92f 100644
Binary files a/tests/regression/throwntogethertest/background-modifier-expected.png and b/tests/regression/throwntogethertest/background-modifier-expected.png differ
diff --git a/tests/regression/throwntogethertest/highlight-and-background-modifier-expected.png b/tests/regression/throwntogethertest/highlight-and-background-modifier-expected.png
new file mode 100644
index 0000000..e95f763
Binary files /dev/null and b/tests/regression/throwntogethertest/highlight-and-background-modifier-expected.png differ
diff --git a/tests/regression/throwntogethertest/highlight-modifier-expected.png b/tests/regression/throwntogethertest/highlight-modifier-expected.png
index 7973d82..e8d4e62 100644
Binary files a/tests/regression/throwntogethertest/highlight-modifier-expected.png and b/tests/regression/throwntogethertest/highlight-modifier-expected.png differ
-- 
cgit v0.10.1


From 199409c42b569716978ac6705a5894239dc744e3 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 25 May 2013 13:30:38 -0400
Subject: re-disabled some nonsensical test combinations


diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b696f2e..14416ce 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -833,7 +833,8 @@ disable_tests(cgalpngtest_child-background
               cgalpngtest_testcolornames
               openscad-cgalpng_child-background
               openscad-cgalpng_highlight-and-background-modifier
-              openscad-cgalpng_testcolornames)
+              openscad-cgalpng_testcolornames
+              throwntogethertest_highlight-and-background-modifier)
 
 # Test config handling
 
-- 
cgit v0.10.1


From 85d465617a84135a74a780a7ffabb22a6ab921c2 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 25 May 2013 14:01:45 -0400
Subject: Updated tests as part of #304


diff --git a/tests/regression/opencsgtest/difference-tests-expected.png b/tests/regression/opencsgtest/difference-tests-expected.png
index a6d863a..8db2742 100644
Binary files a/tests/regression/opencsgtest/difference-tests-expected.png and b/tests/regression/opencsgtest/difference-tests-expected.png differ
diff --git a/tests/regression/throwntogethertest/difference-tests-expected.png b/tests/regression/throwntogethertest/difference-tests-expected.png
index 0a27c90..7a61f42 100644
Binary files a/tests/regression/throwntogethertest/difference-tests-expected.png and b/tests/regression/throwntogethertest/difference-tests-expected.png differ
-- 
cgit v0.10.1


From e60744776193d5dc3f22e7a4a9f3afa8b8664e30 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 25 May 2013 10:51:21 -0700
Subject: Added expected files for example024


diff --git a/tests/regression/cgalpngtest/example024-expected.png b/tests/regression/cgalpngtest/example024-expected.png
new file mode 100644
index 0000000..8e69808
Binary files /dev/null and b/tests/regression/cgalpngtest/example024-expected.png differ
diff --git a/tests/regression/dumptest/example024-expected.txt b/tests/regression/dumptest/example024-expected.txt
new file mode 100644
index 0000000..e7d6e8b
--- /dev/null
+++ b/tests/regression/dumptest/example024-expected.txt
@@ -0,0 +1,1869 @@
+	difference() {
+		multmatrix([[0.81649658092, 0.40824829046, 0.40824829046, 0], [0, 0.70710678118, -0.70710678118, 0], [-0.57735026919, 0.57735026919, 0.57735026919, 0], [0, 0, 0, 1]]) {
+			group() {
+				difference() {
+					cube(size = [100, 100, 100], center = true);
+					group() {
+						multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							group() {
+								cube(size = [110, 33.3333, 33.3333], center = true);
+								group() {
+									group() {
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, -33.33333333333], [0, 0, 1, -33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, -33.33333333333], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, -33.33333333333], [0, 0, 1, 33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group();
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 33.33333333333], [0, 0, 1, -33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 33.33333333333], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 33.33333333333], [0, 0, 1, 33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+						multmatrix([[0, -1, 0, 0], [1, 0, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+							group() {
+								cube(size = [110, 33.3333, 33.3333], center = true);
+								group() {
+									group() {
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, -33.33333333333], [0, 0, 1, -33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, -33.33333333333], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, -33.33333333333], [0, 0, 1, 33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group();
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 33.33333333333], [0, 0, 1, -33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 33.33333333333], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 33.33333333333], [0, 0, 1, 33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+						multmatrix([[0, 0, 1, 0], [0, 1, 0, 0], [-1, 0, 0, 0], [0, 0, 0, 1]]) {
+							group() {
+								cube(size = [110, 33.3333, 33.3333], center = true);
+								group() {
+									group() {
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, -33.33333333333], [0, 0, 1, -33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, -33.33333333333], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, -33.33333333333], [0, 0, 1, 33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group();
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 33.33333333333], [0, 0, 1, -33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 33.33333333333], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+										group() {
+											multmatrix([[1, 0, 0, 0], [0, 1, 0, 33.33333333333], [0, 0, 1, 33.33333333333], [0, 0, 0, 1]]) {
+												group() {
+													cube(size = [110, 11.1111, 11.1111], center = true);
+													group() {
+														group() {
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, -11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group();
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, -11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+															group() {
+																multmatrix([[1, 0, 0, 0], [0, 1, 0, 11.11111111111], [0, 0, 1, 11.11111111111], [0, 0, 0, 1]]) {
+																	group() {
+																		cube(size = [110, 3.7037, 3.7037], center = true);
+																		group();
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -100], [0, 0, 0, 1]]) {
+			cube(size = [200, 200, 200], center = true);
+		}
+	}
+
diff --git a/tests/regression/opencsgtest/example024-expected.png b/tests/regression/opencsgtest/example024-expected.png
new file mode 100644
index 0000000..dfbe847
Binary files /dev/null and b/tests/regression/opencsgtest/example024-expected.png differ
diff --git a/tests/regression/throwntogethertest/example024-expected.png b/tests/regression/throwntogethertest/example024-expected.png
new file mode 100644
index 0000000..ffa2360
Binary files /dev/null and b/tests/regression/throwntogethertest/example024-expected.png differ
-- 
cgit v0.10.1