Mercurial > ldforge / changeset

--- a/bbox.cpp	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "common.h"
-#include "bbox.h"
-#include "ldtypes.h"
-#include "file.h"
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-bbox::bbox () {
-	reset ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void bbox::calculate () {
-	reset ();
-	
-	if (!g_curfile)
-		return;
-	
-	for (LDObject* obj : g_curfile->m_objs)
-		calcObject (obj);
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void bbox::calcObject (LDObject* obj) {
-	switch (obj->getType ()) {
-	case LDObject::Line:
-		{
-			LDLine* line = static_cast<LDLine*> (obj);
-			for (short i = 0; i < 2; ++i)
-				calcVertex (line->vaCoords[i]);
-		}
-		break;
-	
-	case LDObject::Triangle:
-		{
-			LDTriangle* tri = static_cast<LDTriangle*> (obj);
-			for (short i = 0; i < 3; ++i)
-				calcVertex (tri->vaCoords[i]);
-		}
-		break;
-	
-	case LDObject::Quad:
-		{
-			LDQuad* quad = static_cast<LDQuad*> (obj);
-			for (short i = 0; i < 4; ++i)
-				calcVertex (quad->vaCoords[i]);
-		}
-		break;
-	
-	case LDObject::CondLine:
-		{
-			LDCondLine* line = static_cast<LDCondLine*> (obj);
-			for (short i = 0; i < 4; ++i)
-				calcVertex (line->vaCoords[i]);
-		}
-		break;
-	
-	case LDObject::Subfile:
-		{
-			LDSubfile* ref = static_cast<LDSubfile*> (obj);
-			vector<LDObject*> objs = ref->inlineContents (true, true);
-			
-			for (LDObject* obj : objs) {
-				calcObject (obj);
-				delete obj;
-			}
-		}
-		break;
-	
-	case LDObject::Radial:
-		{
-			LDRadial* rad = static_cast<LDRadial*> (obj);
-			vector<LDObject*> objs = rad->decompose (true);
-			
-			for (LDObject* obj : objs) {
-				calcObject (obj);
-				delete obj;
-			}
-		}
-		break;
-	
-	default:
-		break;
-	}
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void bbox::calcVertex (vertex v) {
-	for (const Axis ax : g_Axes) {
-		if (v[ax] < m_v0[ax])
-			m_v0[ax] = v[ax];
-		
-		if (v[ax] > m_v1[ax])
-			m_v1[ax] = v[ax];
-	}
-	
-	m_empty = false;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void bbox::reset () {
-	m_v0[X] = m_v0[Y] = m_v0[Z] = +0x7FFFFFFF;
-	m_v1[X] = m_v1[Y] = m_v1[Z] = -0x7FFFFFFF;
-	
-	m_empty = true;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-double bbox::size () const {
-	double fXScale = (m_v0[X] - m_v1[X]);
-	double fYScale = (m_v0[Y] - m_v1[Y]);
-	double fZScale = (m_v0[Z] - m_v1[Z]);
-	double fSize = fZScale;
-	
-	if (fXScale > fYScale) {
-		if (fXScale > fZScale)
-			fSize = fXScale;
-	} else if (fYScale > fZScale)
-		fSize = fYScale;
-	
-	if (abs (fSize) >= 2.0f)
-		return abs (fSize / 2);
-	
-	return 1.0f;
-}
-
-// =============================================================================
-vertex bbox::center () const {
-	return vertex (
-		(m_v0[X] + m_v1[X]) / 2,
-		(m_v0[Y] + m_v1[Y]) / 2,
-		(m_v0[Z] + m_v1[Z]) / 2);
-}
-
-// =============================================================================
-bool bbox::empty() const {
-	return m_empty;
-}
\ No newline at end of file

--- a/bbox.h	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef BBOX_H
-#define BBOX_H
-
-#include "common.h"
-#include "types.h"
-
-// =============================================================================
-// bbox
-//
-// The bounding box is the box that encompasses a given set of objects. The
-// global instance g_BBox is the bbox for the model we have open.
-// v0 is the minimum vertex, v1 is the maximum vertex.
-// =============================================================================
-class bbox {
-public:
-	bbox ();
-	void reset ();
-	void calculate ();
-	double size () const;
-	void calcObject (LDObject* obj);
-	void calcVertex (vertex v);
-	vertex center () const;
-	bool empty () const;
-	
-	bbox& operator<< (LDObject* obj) {
-		calcObject (obj);
-		return *this;
-	}
-	
-	bbox& operator<< (vertex& v) {
-		calcVertex (v);
-		return *this;
-	}
-	
-	const vertex& v0 () { return m_v0; }
-	const vertex& v1 () { return m_v1; }
-	
-private:
-	vertex m_v0, m_v1;
-	bool m_empty;
-};
-
-#endif // BBOX_H
\ No newline at end of file

--- a/colors.cpp	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "common.h"
-#include "colors.h"
-#include "file.h"
-#include "misc.h"
-#include <qcolor.h>
-
-static color* g_LDColors[MAX_COLORS];
-static bool g_bColorsInit = false;
-
-void initColors () {
-	if (g_bColorsInit)
-		return;
-	
-	logf ("%s: initializing color information.\n", __func__);
-	
-	color* col;
-	
-	// Always make sure there's 16 and 24 available. They're special like that.
-	col = new color;
-	col->zColorString = "#AAAAAA";
-	col->qColor = col->zColorString.chars ();
-	col->qEdge = Qt::black;
-	g_LDColors[maincolor] = col;
-	
-	col = new color;
-	col->zColorString = "#000000";
-	col->qEdge = col->qColor = Qt::black;
-	g_LDColors[edgecolor] = col;
-	
-	parseLDConfig ();
-	
-	g_bColorsInit = true;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-color* getColor (short dColorNum) {
-	// Check bounds
-	if (dColorNum < 0 || dColorNum >= MAX_COLORS)
-		return null;
-	
-	return g_LDColors[dColorNum];
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-static bool parseLDConfigTag (StringParser& pars, char const* sTag, str& zVal) {
-	short dPos;
-	if (!pars.findToken (dPos, sTag, 1))
-		return false;
-	
-	return pars.getToken (zVal, dPos + 1);
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-short color::index () {
-	short idx = 0;
-	for (color* it : g_LDColors) {
-		if (it == this)
-			return idx;
-		idx++;
-	}
-	
-	return -1;
-}
-
-// =============================================================================
-uchar luma (QColor& col) {
-	return (0.2126f * col.red ()) +
-		(0.7152f * col.green ()) +
-		(0.0722f * col.blue ());
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void parseLDConfig () {
-	FILE* fp = openLDrawFile ("LDConfig.ldr", false);
-	
-	if (!fp)
-		return;
-	
-	// Even though LDConfig.ldr is technically an LDraw file, parsing it as one
-	// would be overkill by any standard.
-	char line[1024];
-	while (fgets (line, sizeof line, fp)) {
-		if (strlen (line) == 0 || line[0] != '0')
-			continue; // empty or illogical
-		
-		str zLine = line;
-		zLine.replace ("\n", "");
-		zLine.replace ("\r", "");
-		
-		StringParser pars (zLine, ' ');
-		short dCode = 0, dAlpha = 255;
-		str zName, zColor, zEdge, zValue;
-		
-		// Check 0 !COLOUR, parse the name
-		if (!pars.tokenCompare (0, "0") || !pars.tokenCompare (1, "!COLOUR") || !pars.getToken (zName, 2))
-			continue;
-		
-		// Replace underscores in the name with spaces for readability
-		zName.replace ("_", " ");
-		
-		// get the CODE tag
-		if (!parseLDConfigTag (pars, "CODE", zValue))
-			continue;
-		
-		// Ensure that the code is within range. must be within 0 - 512
-		dCode = atoi (zValue);
-		if (dCode < 0 || dCode >= 512)
-			continue;
-		
-		// Don't let LDConfig.ldr override the special colors 16 and 24. However,
-		// do take the name it gives for the color
-		if (dCode == maincolor || dCode == edgecolor) {
-			g_LDColors[dCode]->zName = zName;
-			continue;
-		}
-		
-		// VALUE tag
-		if (!parseLDConfigTag (pars, "VALUE", zColor))
-			continue;
-		
-		// EDGE tag
-		if (!parseLDConfigTag (pars, "EDGE", zEdge))
-			continue;
-		
-		// Ensure that our colors are correct
-		QColor qColor (zColor.chars()),
-			qEdge (zEdge.chars());
-		
-		if (!qColor.isValid () || !qEdge.isValid ())
-			continue;
-		
-		// Parse alpha if given.
-		if (parseLDConfigTag (pars, "ALPHA", zValue))
-			dAlpha = clamp<short> (atoi (zValue), 0, 255);
-		
-		color* col = new color;
-		col->zName = zName;
-		col->qColor = qColor;
-		col->qEdge = qEdge;
-		col->zColorString = zColor;
-		col->qColor.setAlpha (dAlpha);
-		
-		g_LDColors[dCode] = col;
-	}
-	
-	fclose (fp);
-}
\ No newline at end of file

--- a/colors.h	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef COLORS_H
-#define COLORS_H
-
-#include <qcolor.h>
-#include "common.h"
-
-#define MAX_COLORS 512
-
-class color {
-public:
-	str zName, zColorString;
-	QColor qColor, qEdge;
-	
-	short index ();
-};
-
-typedef struct {
-	const short dIndex;
-	const char* sName, *sColor;
-	const float fAlpha;
-} TemporaryColorMeta;
-
-void initColors ();
-void parseLDConfig ();
-uchar luma (QColor& col);
-
-// Safely gets a color with the given number or null if no such color.
-color* getColor (short dColorNum);
-
-#endif // COLORS_H
\ No newline at end of file

--- a/common.h	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// =============================================================================
-// This file is included one way or another in every source file of LDForge.
-// Stuff defined and included here is universally included.
-
-#ifndef COMMON_H
-#define COMMON_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <vector>
-#include <stdint.h>
-#include <stdarg.h>
-#include "str.h"
-#include "config.h"
-#include "types.h"
-
-#define APPNAME "LDForge"
-
-#define VERSION_MAJOR 0
-#define VERSION_MAJOR_STR "0"
-#define VERSION_MINOR 1
-#define VERSION_MINOR_STR "1"
-
-// ============---
-// #define RELEASE
-
-// Version string identifier
-static const str versionString = fmt ("%d.%d", VERSION_MAJOR, VERSION_MINOR);
-
-#ifdef __GNUC__
-# define FORMAT_PRINTF(M,N) __attribute__ ((format (printf, M, N)))
-# define ATTR(N) __attribute__ ((N))
-#else
-# define FORMAT_PRINTF(M,N)
-# define ATTR(N)
-#endif // __GNUC__
-
-#ifdef WIN32
-#define DIRSLASH "\\"
-#else // WIN32
-#define DIRSLASH "/"
-#endif // WIN32
-
-#ifdef RELEASE
-#define NDEBUG // remove asserts
-#endif // RELEASE
-
-#ifdef null
-#undef null
-#endif // null
-
-// Null pointer
-static const std::nullptr_t null = nullptr;
-
-// Main and edge color identifiers
-static const short maincolor = 16;
-static const short edgecolor = 24;
-
-static const bool yup = true;
-static const bool nope = false;
-
-class ForgeWindow;
-class LDObject;
-class bbox;
-class OpenFile;
-class QApplication;
-
-// =============================================================================
-// Plural expression
-#define PLURAL(n) ((n != 1) ? "s" : "")
-
-// -----------------------------------------------------------------------------
-// Shortcut for formatting
-#define PERFORM_FORMAT(in, out) \
-	va_list v; \
-	va_start (v, in); \
-	char* out = vdynformat (in, v, 256); \
-	va_end (v);
-
-// -----------------------------------------------------------------------------
-// Shortcuts for stuffing vertices into printf-formatting.
-#define FMT_VERTEX "(%.3f, %.3f, %.3f)"
-#define FVERTEX(V) V.x, V.y, V.z
-
-// -----------------------------------------------------------------------------
-// Templated clamp
-template<class T> static inline T clamp (T a, T min, T max) {
-	return (a > max) ? max : (a < min) ? min : a;
-}
-
-// Templated minimum
-template<class T> static inline T min (T a, T b) {
-	return (a < b) ? a : b;
-}
-
-// Templated maximum
-template<class T> static inline T max (T a, T b) {
-	return (a > b) ? a : b;
-}
-
-// Templated absolute value
-template<class T> static inline T abs (T a) {
-	return (a >= 0) ? a : -a;
-}
-
-// Quick QString to const char* conversion
-static inline const char* qchars (QString qstr) {
-	return qstr.toStdString ().c_str ();
-}
-
-static const double pi = 3.14159265358979323846f;
-
-#ifdef IN_IDE_PARSER // KDevelop workaround
-// Current function name
-static const char* __func__ = "";
-#endif // IN_IDE_PARSER
-
-// -----------------------------------------------------------------------------
-enum LogType {
-	LOG_Normal,
-	LOG_Warning,
-	LOG_Error,
-	LOG_Dev,
-};
-
-// logf - universal access to the message log. Defined here so that I don't have
-// to include gui.h here and recompile everything every time that file changes.
-// logf is defined in main.cpp
-void logf (const char* fmtstr, ...) FORMAT_PRINTF (1, 2);
-void logf (LogType type, const char* fmtstr, ...) FORMAT_PRINTF (2, 3);
-void warnf (const char* fmtstr, ...) FORMAT_PRINTF (1, 2);
-void errf (const char* fmtstr, ...) FORMAT_PRINTF (1, 2);
-
-#ifndef RELEASE
-void devf (const char* fmtstr, ...);
-#else
-# define devf(...)
-#endif // RELEASE
-
-// -----------------------------------------------------------------------------
-// Vertex at (0, 0, 0)
-extern const vertex g_origin;
-
-// -----------------------------------------------------------------------------
-// Pointer to the OpenFile which is currently being edited by the user.
-extern OpenFile* g_curfile;
-
-// -----------------------------------------------------------------------------
-// Pointer to the bounding box.
-extern bbox g_BBox;
-
-// -----------------------------------------------------------------------------
-// Vector of all currently opened files.
-extern vector<OpenFile*> g_loadedFiles;
-
-// -----------------------------------------------------------------------------
-// Pointer to the main application.
-extern const QApplication* g_app;
-
-// -----------------------------------------------------------------------------
-// Identity matrix
-extern const matrix<3> g_identity;
-
-#endif // COMMON_H
\ No newline at end of file

--- a/config.cpp	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <time.h>
-#include <QDir>
-#include "common.h"
-#include "str.h"
-#include "config.h"
-
-std::vector<config*> g_pConfigPointers;
-
-// =============================================================================
-const char* g_WeekdayNames[7] = {
-	"Sunday",
-	"Monday",
-	"Tuesday",
-	"Wednesday",
-	"Thursday",
-	"Friday",
-	"Saturday",
-};
-
-// =============================================================================
-static const char* g_MonthNames[12] = {
-	"Januray",
-	"February",
-	"March",
-	"April",
-	"May",
-	"June",
-	"July",
-	"August",
-	"September",
-	"October",
-	"November"
-	"December",
-};
-
-static const char* g_ConfigTypeNames[] = {
-	"None",
-	"Integer",
-	"String",
-	"Float",
-	"Boolean",
-	"Key sequence",
-};
-
-// =============================================================================
-// Load the configuration from file
-bool config::load () {
-	printf ("config::load: loading configuration file.\n");
-	
-	// Locale must be disabled for atof
-	setlocale (LC_NUMERIC, "C");
-	
-	FILE* fp = fopen (filepath().chars(), "r");
-	char linedata[MAX_INI_LINE];
-	char* line;
-	size_t ln = 0;
-	
-	if (!fp)
-		return false; // can't open for reading
-	
-	// Read the values.
-	while (fgets (linedata, MAX_INI_LINE, fp)) {
-		ln++;
-		line = linedata;
-		
-		while (*line != 0 && (*line <= 32 || *line >= 127))
-			line++; // Skip junk
-		
-		if (*line == '\0' || line[0] == '#')
-			continue; // Empty line or comment.
-		
-		// Find the equals sign.
-		char* equals = strchr (line, '=');
-		if (!equals) {
-			fprintf (stderr, "couldn't find `=` sign in entry `%s`\n", line);
-			continue;
-		}
-		
-		str entry = str (line).substr (0, equals - line);
-		
-		// Find the config entry for this.
-		config* cfg = null;
-		for (config* i : g_pConfigPointers)
-			if (entry == i->name)
-				cfg = i;
-		
-		if (!cfg) {
-			fprintf (stderr, "unknown config `%s`\n", entry.chars());
-			continue;
-		}
-		
-		str valstring = str (line).substr (equals - line + 1, -1);
-		
-		// Trim the crap off the end
-		while (~valstring) {
-			char c = valstring[~valstring - 1];
-			if (c <= 32 || c >= 127)
-				valstring -= 1;
-			else
-				break;
-		}
-		
-		switch (cfg->getType()) {
-		case CONFIG_int:
-			static_cast<intconfig*> (cfg)->value = atoi (valstring.chars());
-			break;
-		
-		case CONFIG_str:
-			static_cast<strconfig*> (cfg)->value = valstring;
-			break;
-		
-		case CONFIG_float:
-			static_cast<floatconfig*> (cfg)->value = atof (valstring.chars());
-			break;
-		
-		case CONFIG_bool:
-		{
-			bool& val = static_cast<boolconfig*> (cfg)->value;
-			
-			if (+valstring == "TRUE" || valstring == "1")
-				val = true;
-			else if (+valstring == "FALSE" || valstring == "0")
-				val = false;
-			break;
-		}
-		
-		case CONFIG_keyseq:
-			static_cast<keyseqconfig*> (cfg)->value = keyseq::fromString (valstring.chars ());
-			break;
-		
-		default:
-			break;
-		}
-	}
-	
-	fclose (fp);
-	return true;
-}
-
-// =============================================================================
-// Write a given formatted string to the given file stream
-static size_t writef (FILE* fp, const char* fmt, ...) {
-	va_list va;
-	
-	va_start (va, fmt);
-	char* buf = vdynformat (fmt, va, 256);
-	va_end (va);
-	
-	size_t len = fwrite (buf, 1, strlen (buf), fp);
-	delete[] buf;
-	
-	return len;
-}
-
-// =============================================================================
-// Save the configuration to disk
-bool config::save () {
-	// The function will write floats, disable the locale now so that they
-	// are written properly.
-	setlocale (LC_NUMERIC, "C");
-	
-	// If the directory doesn't exist, create it now.
-	if (QDir (dirpath ()).exists () == nope) {
-		fprintf (stderr, "Creating config path %s...\n", dirpath().chars());
-		if (!QDir ().mkpath (dirpath().chars())) {
-			logf (LOG_Warning, "Failed to create the directory. Configuration cannot be saved!\n");
-			return false; // Couldn't create directory
-		}
-	}
-	
-	FILE* fp = fopen (filepath().chars(), "w");
-	printf ("writing cfg to %s\n", filepath().chars());
-	
-	if (!fp) {
-		printf ("Couldn't open %s for writing\n", filepath().chars());
-		return false;
-	}
-	
-	const time_t curtime = time (NULL);
-	const struct tm* timeinfo = localtime (&curtime);
-	const char* daysuffix =
-		(timeinfo->tm_mday % 10 == 1) ? "st" :
-		(timeinfo->tm_mday % 10 == 2) ? "nd" :
-		(timeinfo->tm_mday % 10 == 3) ? "rd" : "th";
-	
-	writef (fp, "# Configuration file for " APPNAME "\n");
-	writef (fp, "# Written on %s, %s %d%s %d %.2d:%.2d:%.2d\n",
-		g_WeekdayNames[timeinfo->tm_wday], g_MonthNames[timeinfo->tm_mon],
-		timeinfo->tm_mday, daysuffix, timeinfo->tm_year + 1900,
-		timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
-	
-	for (config* cfg : g_pConfigPointers) {
-		str valstring;
-		switch (cfg->getType()) {
-		case CONFIG_int:
-			valstring.format ("%d", static_cast<intconfig*> (cfg)->value);
-			break;
-		case CONFIG_str:
-			valstring = static_cast<strconfig*> (cfg)->value;
-			break;
-		case CONFIG_float:
-			valstring.format ("%f", static_cast<floatconfig*> (cfg)->value);
-			
-			// Trim any trailing zeros
-			if (valstring.first (".") != -1) {
-				while (valstring[~valstring - 1] == '0')
-					valstring -= 1;
-				
-				// But don't trim the only one out...
-				if (valstring[~valstring - 1] == '.')
-					valstring += '0';
-			}
-			
-			break;
-		case CONFIG_bool:
-			valstring = (static_cast<boolconfig*> (cfg)->value) ? "true" : "false";
-			break;
-		case CONFIG_keyseq:
-			valstring = static_cast<keyseqconfig*> (cfg)->value.toString ();
-			break;
-		default:
-			break;
-		}
-		
-		const char* sDefault = (cfg->getType() != CONFIG_keyseq) ? cfg->defaultstring :
-			static_cast<keyseqconfig*> (cfg)->defval.toString ().toUtf8 ().constData ();
-		
-		// Write the entry now.
-		writef (fp, "\n# [%s] default: %s\n", g_ConfigTypeNames[cfg->getType()], sDefault);
-		writef (fp, "%s=%s\n", cfg->name, valstring.chars());
-	}
-	
-	fclose (fp);
-	return true;
-}
-
-// =============================================================================
-void config::reset () {
-	for (size_t i = 0; i < NUM_CONFIG; i++)
-		g_pConfigPointers[i]->resetValue ();
-}
-
-// =============================================================================
-str config::filepath () {
-	str path;
-	path.format ("%s%s.cfg", dirpath ().chars (),
-		str (APPNAME).tolower ().chars ());
-	return path;
-}
-
-// =============================================================================
-str config::dirpath () {
-	return fmt ("%s/.%s/", qchars (QDir::homePath ()),
-		str (APPNAME).tolower ().chars ());
-}
\ No newline at end of file

--- a/config.h	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "common.h"
-#include "str.h"
-
-// =============================================================================
-#include <QString>
-#include <qkeysequence.h>
-
-#define MAX_INI_LINE 512
-#define NUM_CONFIG (g_pConfigPointers.size ())
-
-#define cfg(T, NAME, DEFAULT) \
-	T##config NAME (DEFAULT, #NAME, #T, #DEFAULT)
-
-#define extern_cfg(T, NAME) \
-	extern T##config NAME
-
-// =============================================================================
-enum configtype_e {
-	CONFIG_none,
-	CONFIG_int,
-	CONFIG_str,
-	CONFIG_float,
-	CONFIG_bool,
-	CONFIG_keyseq,
-};
-
-// =========================================================
-class config {
-public:
-	const char* name, *typestring, *defaultstring;
-	
-	virtual configtype_e getType () {
-		return CONFIG_none;
-	}
-	
-	virtual void resetValue () {}
-	
-	// ------------------------------------------
-	static bool load ();
-	static bool save ();
-	static void reset ();
-	static str dirpath ();
-	static str filepath ();
-};
-
-extern std::vector<config*> g_pConfigPointers;
-
-// =============================================================================
-#define DEFINE_UNARY_OPERATOR(T, OP) \
-	T operator OP () { \
-		return (OP value); \
-	} \
-
-#define DEFINE_BINARY_OPERATOR(T, OP) \
-	T operator OP (const T other) { \
-		return (value OP other); \
-	} \
-
-#define DEFINE_ASSIGN_OPERATOR(T, OP) \
-	T& operator OP (const T other) { \
-		return (value OP other); \
-	} \
-
-#define DEFINE_COMPARE_OPERATOR(T, OP) \
-	bool operator OP (const T other) { \
-		return (value OP other); \
-	} \
-
-#define DEFINE_CAST_OPERATOR(T) \
-	operator T () { \
-		return (T) value; \
-	} \
-
-#define DEFINE_ALL_COMPARE_OPERATORS(T) \
-	DEFINE_COMPARE_OPERATOR (T, ==) \
-	DEFINE_COMPARE_OPERATOR (T, !=) \
-	DEFINE_COMPARE_OPERATOR (T, >) \
-	DEFINE_COMPARE_OPERATOR (T, <) \
-	DEFINE_COMPARE_OPERATOR (T, >=) \
-	DEFINE_COMPARE_OPERATOR (T, <=) \
-
-#define DEFINE_INCREMENT_OPERATORS(T) \
-	T operator++ () {return ++value;} \
-	T operator++ (int) {return value++;} \
-	T operator-- () {return --value;} \
-	T operator-- (int) {return value--;}
-
-#define CONFIGTYPE(T) \
-class T##config : public config
-
-#define IMPLEMENT_CONFIG(T) \
-	T value, defval; \
-	\
-	T##config (T _defval, const char* _name, const char* _typestring, \
-		const char* _defaultstring) \
-	{ \
-		value = defval = _defval; \
-		name = _name; \
-		typestring = _typestring; \
-		defaultstring = _defaultstring; \
-		g_pConfigPointers.push_back (this); \
-	} \
-	operator T () { \
-		return value; \
-	} \
-	configtype_e getType () { \
-		return CONFIG_##T; \
-	} \
-	virtual void resetValue () { \
-		value = defval; \
-	}
-
-// =============================================================================
-CONFIGTYPE (int) {
-public:
-	IMPLEMENT_CONFIG (int)
-	
-	// Int-specific operators
-	DEFINE_ALL_COMPARE_OPERATORS (int)
-	DEFINE_INCREMENT_OPERATORS (int)
-	DEFINE_BINARY_OPERATOR (int, +)
-	DEFINE_BINARY_OPERATOR (int, -)
-	DEFINE_BINARY_OPERATOR (int, *)
-	DEFINE_BINARY_OPERATOR (int, /)
-	DEFINE_BINARY_OPERATOR (int, %)
-	DEFINE_BINARY_OPERATOR (int, ^)
-	DEFINE_BINARY_OPERATOR (int, |)
-	DEFINE_BINARY_OPERATOR (int, &)
-	DEFINE_BINARY_OPERATOR (int, >>)
-	DEFINE_BINARY_OPERATOR (int, <<)
-	DEFINE_UNARY_OPERATOR (int, !)
-	DEFINE_UNARY_OPERATOR (int, ~)
-	DEFINE_UNARY_OPERATOR (int, -)
-	DEFINE_UNARY_OPERATOR (int, +)
-	DEFINE_ASSIGN_OPERATOR (int, =)
-	DEFINE_ASSIGN_OPERATOR (int, +=)
-	DEFINE_ASSIGN_OPERATOR (int, -=)
-	DEFINE_ASSIGN_OPERATOR (int, *=)
-	DEFINE_ASSIGN_OPERATOR (int, /=)
-	DEFINE_ASSIGN_OPERATOR (int, %=)
-	DEFINE_ASSIGN_OPERATOR (int, >>=)
-	DEFINE_ASSIGN_OPERATOR (int, <<=)
-};
-
-// =============================================================================
-CONFIGTYPE (str) {
-public:
-	IMPLEMENT_CONFIG (str)
-	
-	DEFINE_ALL_COMPARE_OPERATORS (str)
-	DEFINE_BINARY_OPERATOR (str, -)
-	DEFINE_BINARY_OPERATOR (str, *)
-	DEFINE_UNARY_OPERATOR (str, !)
-	DEFINE_ASSIGN_OPERATOR (str, =)
-	DEFINE_ASSIGN_OPERATOR (str, +=)
-	DEFINE_ASSIGN_OPERATOR (str, -=)
-	DEFINE_ASSIGN_OPERATOR (str, *=)
-	DEFINE_CAST_OPERATOR (char*)
-	
-	char operator[] (size_t n) {
-		return value[n];
-	}
-	
-#ifdef CONFIG_WITH_QT
-	operator QString () {
-		return QString (value.chars());
-	}
-#endif // CONFIG_WITH_QT
-};
-
-// =============================================================================
-CONFIGTYPE (float) {
-public:
-	IMPLEMENT_CONFIG (float)
-	
-	DEFINE_ALL_COMPARE_OPERATORS (float)
-	DEFINE_INCREMENT_OPERATORS (float)
-	DEFINE_BINARY_OPERATOR (float, +)
-	DEFINE_BINARY_OPERATOR (float, -)
-	DEFINE_BINARY_OPERATOR (float, *)
-	DEFINE_UNARY_OPERATOR (float, !)
-	DEFINE_ASSIGN_OPERATOR (float, =)
-	DEFINE_ASSIGN_OPERATOR (float, +=)
-	DEFINE_ASSIGN_OPERATOR (float, -=)
-	DEFINE_ASSIGN_OPERATOR (float, *=)
-};
-
-// =============================================================================
-CONFIGTYPE (bool) {
-public:
-	IMPLEMENT_CONFIG (bool)
-	DEFINE_ALL_COMPARE_OPERATORS (bool)
-	DEFINE_ASSIGN_OPERATOR (bool, =)
-};
-
-// =============================================================================
-typedef QKeySequence keyseq;
-
-CONFIGTYPE (keyseq) {
-public:
-	IMPLEMENT_CONFIG (keyseq)
-	DEFINE_ALL_COMPARE_OPERATORS (keyseq)
-	DEFINE_ASSIGN_OPERATOR (keyseq, =)
-};
-
-#endif // CONFIG_H
\ No newline at end of file

--- a/extprogs.cpp	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,461 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <qprocess.h>
-#include <qtemporaryfile.h>
-#include <qeventloop.h>
-#include <qdialog.h>
-#include <qdialogbuttonbox.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include "common.h"
-#include "config.h"
-#include "misc.h"
-#include "extprogs.h"
-#include "gui.h"
-#include "file.h"
-#include "radiobox.h"
-#include "history.h"
-
-// =============================================================================
-cfg (str, prog_isecalc, "");
-cfg (str, prog_intersector, "");
-cfg (str, prog_coverer, "");
-cfg (str, prog_ytruder, "");
-cfg (str, prog_datheader, "");
-cfg (str, prog_rectifier, "");
-
-const char* g_extProgNames[] = {
-	"Isecalc",
-	"Intersector",
-	"Coverer",
-	"Ytruder",
-	"Rectifier",
-	"DATHeader",
-};
-
-// =============================================================================
-static bool checkProgPath (str path, const extprog prog) {
-	if (~path)
-		return true;
-	
-	const char* name = g_extProgNames[prog];
-	
-	critical (fmt ("Couldn't run %s as no path has "
-		"been defined for it. Use the configuration dialog's External Programs "
-		"tab to define a path for %s.", name, name));
-	return false;
-}
-
-// =============================================================================
-static void processError (const extprog prog, QProcess& proc) {
-	const char* name = g_extProgNames[prog];
-	str errmsg;
-	
-	switch (proc.error ()) {
-	case QProcess::FailedToStart:
-		errmsg = fmt ("Failed to launch %s. Check that you have set the proper path "
-			"to %s and that you have the proper permissions to launch it.", name, name);
-		break;
-	
-	case QProcess::Crashed:
-		errmsg = fmt ("%s crashed.", name);
-		break;
-	
-	case QProcess::WriteError:
-	case QProcess::ReadError:
-		errmsg = fmt ("I/O error while interacting with %s.", name);
-		break;
-	
-	case QProcess::UnknownError:
-		errmsg = fmt ("Unknown error occurred while executing %s.", name);
-		break;
-	
-	case QProcess::Timedout:
-		errmsg = fmt ("%s timed out.", name);
-		break;
-	}
-	
-	critical (errmsg);
-}
-
-// =============================================================================
-static bool mkTempFile (QTemporaryFile& tmp, str& fname) {
-	if (!tmp.open ())
-		return false;
-	
-	fname = tmp.fileName ();
-	tmp.close ();
-	return true;
-}
-
-// =============================================================================
-void writeObjects (std::vector<LDObject*>& objects, str fname) {
-	// Write the input file
-	FILE* fp = fopen (fname, "w");
-	if (!fp) {
-		critical (fmt ("Couldn't open temporary file %s for writing.\n", fname.chars ()));
-		return;
-	}
-	
-	for (LDObject* obj : objects) {
-		str line = fmt ("%s\r\n", obj->getContents ().chars ());
-		fwrite (line.chars(), 1, ~line, fp);
-	}
-	
-#ifndef RELEASE
-	ushort idx = rand ();
-	printf ("%s -> debug_%u\n", fname.chars (), idx);
-	QFile::copy (fname.chars (), fmt ("debug_%u", idx));
-#endif // RELEASE
-	
-	fclose (fp);
-}
-
-// =============================================================================
-void writeSelection (str fname) {
-	writeObjects (g_win->sel (), fname);
-}
-
-// =============================================================================
-void writeColorGroup (const short colnum, str fname) {
-	std::vector<LDObject*> objects;
-	for (LDObject*& obj : g_curfile->m_objs) {
-		if (obj->isColored () == false || obj->dColor != colnum)
-			continue;
-		
-		objects.push_back (obj);
-	}
-	
-	writeObjects (objects, fname);
-}
-
-// =============================================================================
-void runUtilityProcess (extprog prog, str path, QString argvstr) {
-	QTemporaryFile input, output;
-	str inputname, outputname;
-	QStringList argv = argvstr.split (" ", QString::SkipEmptyParts);
-	
-	printf ("cmdline: %s %s\n", path.chars (), qchars (argvstr));
-	
-	if (!mkTempFile (input, inputname) || !mkTempFile (output, outputname))
-		return;
-	
-	QProcess proc;
-	
-	// Init stdin
-	FILE* stdinfp = fopen (inputname, "w");
-	
-	// Begin!
-	proc.setStandardInputFile (inputname);
-	proc.start (path, argv);
-	
-	// Write an enter - one is expected
-	char enter[2] = "\n";
-	enter[1] = '\0';
-	fwrite (enter, 1, sizeof enter, stdinfp);
-	fflush (stdinfp);
-	
-	// Wait while it runs
-	proc.waitForFinished ();
-	
-#ifndef RELASE
-	printf ("%s", qchars (QString (proc.readAllStandardOutput ())));
-#endif // RELEASE
-	
-	if (proc.exitStatus () == QProcess::CrashExit) {
-		processError (prog, proc);
-		return;
-	}
-}
-
-// ========================================================================================================================================
-static void insertOutput (str fname, bool replace, vector<short> colorsToReplace) {
-#ifndef RELEASE
-	QFile::copy (fname, "./debug_lastOutput");
-#endif // RELEASE
-	
-	// Read the output file
-	FILE* fp = fopen (fname, "r");
-	if (!fp) {
-		critical (fmt ("Couldn't open temporary file %s for reading.\n", fname.chars ()));
-		return;
-	}
-	
-	ComboHistory* cmb = new ComboHistory ({});
-	std::vector<LDObject*> objs = loadFileContents (fp, null),
-		copies;
-	std::vector<ulong> indices;
-	
-	// If we replace the objects, delete the selection now.
-	if (replace)
-		*cmb << g_win->deleteSelection ();
-	
-	for (const short colnum : colorsToReplace)
-		*cmb << g_win->deleteByColor (colnum);
-	
-	// Insert the new objects
-	g_win->sel ().clear ();
-	for (LDObject* obj : objs) {
-		if (!obj->isSchemantic ()) {
-			delete obj;
-			continue;
-		}
-		
-		ulong idx = g_curfile->addObject (obj);
-		indices.push_back (idx);
-		copies.push_back (obj->clone ());
-		g_win->sel ().push_back (obj);
-	}
-	
-	if (indices.size() > 0)
-		*cmb << new AddHistory ({indices, copies});
-	
-	if (cmb->paEntries.size () > 0)
-		History::addEntry (cmb);
-	else
-		delete cmb;
-	
-	fclose (fp);
-	g_win->refresh ();
-}
-
-QDialogButtonBox* makeButtonBox (QDialog& dlg) {
-	QDialogButtonBox* bbx_buttons = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-	QWidget::connect (bbx_buttons, SIGNAL (accepted ()), &dlg, SLOT (accept ()));
-	QWidget::connect (bbx_buttons, SIGNAL (rejected ()), &dlg, SLOT (reject ()));
-	return bbx_buttons;
-}
-
-// =============================================================================
-// Interface for Ytruder
-MAKE_ACTION (ytruder, "Ytruder", "ytruder", "Extrude selected lines to a given plane", KEY (F4)) {
-	setlocale (LC_ALL, "C");
-	
-	if (!checkProgPath (prog_ytruder, Ytruder))
-		return;
-	
-	QDialog dlg;
-	
-	RadioBox* rb_mode = new RadioBox ("Extrusion mode", {"Distance", "Symmetry", "Projection", "Radial"}, 0, Qt::Horizontal);
-	RadioBox* rb_axis = new RadioBox ("Axis", {"X", "Y", "Z"}, 0, Qt::Horizontal);
-	LabeledWidget<QDoubleSpinBox>* dsb_depth = new LabeledWidget<QDoubleSpinBox> ("Plane depth"),
-		*dsb_condAngle = new LabeledWidget<QDoubleSpinBox> ("Conditional line threshold");
-	
-	rb_axis->setValue (Y);
-	dsb_depth->w ()->setMinimum (-10000.0);
-	dsb_depth->w ()->setMaximum (10000.0);
-	dsb_depth->w ()->setDecimals (3);
-	dsb_condAngle->w ()->setValue (30.0f);
-	
-	QVBoxLayout* layout = new QVBoxLayout (&dlg);
-	layout->addWidget (rb_mode);
-	layout->addWidget (rb_axis);
-	layout->addWidget (dsb_depth);
-	layout->addWidget (dsb_condAngle);
-	layout->addWidget (makeButtonBox (dlg));
-	
-	dlg.setWindowIcon (getIcon ("extrude"));
-	
-	if (!dlg.exec ())
-		return;
-	
-	// Read the user's choices
-	const enum modetype { Distance, Symmetry, Projection, Radial } mode = (modetype) rb_mode->value ();
-	const Axis axis = (Axis) rb_axis->value ();
-	const double depth = dsb_depth->w ()->value (),
-		condAngle = dsb_condAngle->w ()->value ();
-	
-	QTemporaryFile indat, outdat;
-	str inDATName, outDATName;
-	
-	// Make temp files for the input and output files
-	if (!mkTempFile (indat, inDATName) || !mkTempFile (outdat, outDATName))
-		return;
-	
-	// Compose the command-line arguments
-	str argv = fmt ("%s %s %f -a %f %s %s",
-		(axis == X) ? "-x" : (axis == Y) ? "-y" : "-z",
-		(mode == Distance) ? "-d" : (mode == Symmetry) ? "-s" : (mode == Projection) ? "-p" : "-r",
-		depth, condAngle, inDATName.chars (), outDATName.chars ());
-	
-	writeSelection (inDATName);
-	runUtilityProcess (Ytruder, prog_ytruder, argv);
-	insertOutput (outDATName, false, {});
-}
-
-// ========================================================================================================================================
-// Rectifier interface
-MAKE_ACTION (rectifier, "Rectifier", "rectifier", "Optimizes quads into rect primitives.", KEY (F8)) {
-	setlocale (LC_ALL, "C");
-	
-	if (!checkProgPath (prog_rectifier, Rectifier))
-		return;
-	
-	QDialog dlg;
-	QCheckBox* cb_condense = new QCheckBox ("Condense triangles to quads"),
-		*cb_subst = new QCheckBox ("Substitute rect primitives"),
-		*cb_condlineCheck = new QCheckBox ("Don't replace quads with adj. condlines"),
-		*cb_colorize = new QCheckBox ("Colorize resulting objects");
-	LabeledWidget<QDoubleSpinBox>* dsb_coplthres = new LabeledWidget<QDoubleSpinBox> ("Coplanarity threshold");
-	
-	dsb_coplthres->w ()->setMinimum (0.0f);
-	dsb_coplthres->w ()->setMaximum (360.0f);
-	dsb_coplthres->w ()->setDecimals (3);
-	dsb_coplthres->w ()->setValue (0.95f);
-	cb_condense->setChecked (true);
-	cb_subst->setChecked (true);
-	
-	QVBoxLayout* layout = new QVBoxLayout (&dlg);
-	layout->addWidget (cb_condense);
-	layout->addWidget (cb_subst);
-	layout->addWidget (cb_condlineCheck);
-	layout->addWidget (cb_colorize);
-	layout->addWidget (dsb_coplthres);
-	layout->addWidget (makeButtonBox (dlg));
-	
-	if (!dlg.exec ())
-		return;
-	
-	const bool condense = cb_condense->isChecked (),
-		subst = cb_subst->isChecked (),
-		condlineCheck = cb_condlineCheck->isChecked (),
-		colorize = cb_colorize->isChecked ();
-	const double coplthres = dsb_coplthres->w ()->value ();
-	
-	QTemporaryFile indat, outdat;
-	str inDATName, outDATName;
-	
-	// Make temp files for the input and output files
-	if (!mkTempFile (indat, inDATName) || !mkTempFile (outdat, outDATName))
-		return;
-	
-	// Compose arguments
-	str argv = fmt ("%s %s %s %s -t %f %s %s",
-		(condense == false) ? "-q" : "",
-		(subst == false) ? "-r" : "",
-		(condlineCheck) ? "-a" : "",
-		(colorize) ? "-c" : "",
-		coplthres, inDATName.chars (), outDATName.chars ());
-	
-	writeSelection (inDATName);
-	runUtilityProcess (Rectifier, prog_rectifier, argv);
-	insertOutput (outDATName, true, {});
-}
-
-// =======================================================================================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =======================================================================================================================================
-// Intersector interface
-MAKE_ACTION (intersector, "Intersector", "intersector", "Perform clipping between two input groups.", KEY (F5)) {
-	setlocale (LC_ALL, "C");
-	
-	if (!checkProgPath (prog_intersector, Intersector))
-		return;
-	
-	QDialog dlg;
-	
-	LabeledWidget<QComboBox>* cmb_incol = new LabeledWidget<QComboBox> ("Input", new QComboBox),
-		*cmb_cutcol = new LabeledWidget<QComboBox> ("Cutter", new QComboBox);
-	QCheckBox* cb_colorize = new QCheckBox ("Colorize output"),
-		*cb_nocondense = new QCheckBox ("No condensing"),
-		*cb_repeatInverse = new QCheckBox ("Repeat inverse"),
-		*cb_edges = new QCheckBox ("Add edges");
-	LabeledWidget<QDoubleSpinBox>* dsb_prescale = new LabeledWidget<QDoubleSpinBox> ("Prescaling factor");
-	
-	cb_repeatInverse->setWhatsThis ("If this is set, " APPNAME " runs Intersector a second time with inverse files to cut the "
-		" cutter group with the input group. Both groups are cut by the intersection.");
-	cb_edges->setWhatsThis ("Makes " APPNAME " try run Isecalc to create edgelines for the intersection.");
-	
-	makeColorSelector (cmb_incol->w ());
-	makeColorSelector (cmb_cutcol->w ());
-	dsb_prescale->w ()->setMinimum (0.0f);
-	dsb_prescale->w ()->setMaximum (10000.0f);
-	dsb_prescale->w ()->setSingleStep (0.01f);
-	dsb_prescale->w ()->setValue (1.0f);
-	
-	QVBoxLayout* layout = new QVBoxLayout (&dlg);
-	layout->addWidget (cmb_incol);
-	layout->addWidget (cmb_cutcol);
-	
-	QHBoxLayout* cblayout = new QHBoxLayout;
-	cblayout->addWidget (cb_colorize);
-	cblayout->addWidget (cb_nocondense);
-	
-	QHBoxLayout* cb2layout = new QHBoxLayout;
-	cb2layout->addWidget (cb_repeatInverse);
-	cb2layout->addWidget (cb_edges);
-	
-	layout->addLayout (cblayout);
-	layout->addLayout (cb2layout);
-	layout->addWidget (dsb_prescale);
-	layout->addWidget (makeButtonBox (dlg));
-	
-exec:
-	if (!dlg.exec ())
-		return;
-	
-	const short inCol = cmb_incol->w ()->itemData (cmb_incol->w ()->currentIndex ()).toInt (),
-		cutCol =  cmb_cutcol->w ()->itemData (cmb_cutcol->w ()->currentIndex ()).toInt ();
-	const bool repeatInverse = cb_repeatInverse->isChecked ();
-	
-	if (inCol == cutCol) {
-		critical ("Cannot use the same color group for both input and cutter!");
-		goto exec;
-	}
-	
-	// Five temporary files!
-	// indat = input group file
-	// cutdat = cutter group file
-	// outdat = primary output
-	// outdat2 = inverse output
-	// edgesdat = edges output (isecalc)
-	QTemporaryFile indat, cutdat, outdat, outdat2, edgesdat;
-	str inDATName, cutDATName, outDATName, outDAT2Name, edgesDATName;
-	
-	if (!mkTempFile (indat, inDATName) || !mkTempFile (cutdat, cutDATName) ||
-		!mkTempFile (outdat, outDATName) || !mkTempFile (outdat2, outDAT2Name) ||
-		!mkTempFile (edgesdat, edgesDATName))
-	{
-		return;
-	}
-	
-	str parms = fmt ("%s %s -s %f",
-		(cb_colorize->isChecked ()) ? "-c" : "",
-		(cb_nocondense->isChecked ()) ? "-t" : "",
-		dsb_prescale->w ()->value ());
-	
-	str argv_normal = fmt ("%s %s %s %s", parms.chars (), inDATName.chars (), cutDATName.chars (), outDATName.chars ());
-	str argv_inverse = fmt ("%s %s %s %s", parms.chars (), cutDATName.chars (), inDATName.chars (), outDAT2Name.chars ());
-	
-	writeColorGroup (inCol, inDATName);
-	writeColorGroup (cutCol, cutDATName);
-	runUtilityProcess (Intersector, prog_intersector, argv_normal);
-	insertOutput (outDATName, false, {inCol});
-	
-	if (repeatInverse) {
-		runUtilityProcess (Intersector, prog_intersector, argv_inverse);
-		insertOutput (outDAT2Name, false, {cutCol});
-	}
-	
-	if (cb_edges->isChecked ()) {
-		runUtilityProcess (Isecalc, prog_isecalc, fmt ("%s %s %s", inDATName.chars (), cutDATName.chars (), edgesDATName.chars ()));
-		insertOutput (edgesDATName, false, {});
-	}
-}
\ No newline at end of file

--- a/extprogs.h	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef EXTPROGS_H
-#define EXTPROGS_H
-
-#include <qobject.h>
-
-enum extprog {
-	Isecalc,
-	Intersector,
-	Coverer,
-	Ytruder,
-	Rectifier,
-	DATHeader
-};
-
-#endif // EXTPROGS_H
\ No newline at end of file

--- a/file.cpp	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,757 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <vector>
-#include <stdio.h>
-#include <qmessagebox.h>
-#include <QDir>
-#include "common.h"
-#include "config.h"
-#include "file.h"
-#include "misc.h"
-#include "bbox.h"
-#include "gui.h"
-#include "history.h"
-#include "zz_ldrawPathDialog.h"
-
-cfg (str, io_ldpath, "");
-cfg (str, io_recentfiles, "");
-
-// =============================================================================
-namespace LDPaths {
-	static str pathError;
-	
-	struct {
-		str LDConfigPath;
-		str partsPath, primsPath;
-	} pathInfo;
-	
-	void initPaths () {
-		if (!tryConfigure (io_ldpath)) {
-			LDrawPathDialog dlg (false);
-			
-			if (!dlg.exec ())
-				exit (0);
-			
-			io_ldpath = dlg.path ();
-		}
-	}
-	
-	bool tryConfigure (str path) {
-		QDir dir;
-		
-		if (!dir.cd (path)) {
-			pathError = "Directory does not exist.";
-			return false;
-		}
-		
-		QStringList mustHave = {"LDConfig.ldr", "parts", "p"};
-		QStringList contents = dir.entryList (mustHave);
-		
-		if (contents.size () != mustHave.size ()) {
-			pathError = "Not an LDraw directory! Must<br />have LDConfig.ldr, parts/ and p/.";
-			return false;
-		}
-		
-		pathInfo.partsPath = fmt ("%s" DIRSLASH "parts", path.chars ());
-		pathInfo.LDConfigPath = fmt ("%s" DIRSLASH "LDConfig.ldr", path.chars ());
-		pathInfo.primsPath = fmt ("%s" DIRSLASH "p", path.chars ());
-		
-		return true;
-	}
-	
-	// Accessors
-	str getError () { return pathError; }
-	str ldconfig () { return pathInfo.LDConfigPath; }
-	str prims () { return pathInfo.primsPath; }
-	str parts () { return pathInfo.partsPath; }
-}
-
-// =============================================================================
-OpenFile::OpenFile () {
-	m_implicit = true;
-	savePos = -1;
-}
-
-// =============================================================================
-OpenFile::~OpenFile () {
-	// Clear everything from the model
-	for (LDObject* obj : m_objs)
-		delete obj;
-	
-	// Clear the cache as well
-	for (LDObject* obj : m_objCache)
-		delete obj;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-OpenFile* findLoadedFile (str zName) {
-	for (OpenFile* file : g_loadedFiles)
-		if (file->m_filename == zName)
-			return file;
-	
-	return null;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-FILE* openLDrawFile (str path, bool bSubDirectories) {
-	str zTruePath = path;
-	
-#ifndef WIN32
-	zTruePath.replace ("\\", "/");
-#endif // WIN32
-	
-	FILE* fp = fopen (path.chars (), "r");
-	str zFilePath;
-	
-	if (fp != null)
-		return fp;
-	
-	if (~io_ldpath.value) {
-		// Try with just the LDraw path first
-		zFilePath = fmt ("%s" DIRSLASH "%s",
-			io_ldpath.value.chars(), zTruePath.chars());
-		logf ("Trying %s\n", zFilePath.chars());
-		
-		fp = fopen (zFilePath, "r");
-		if (fp != null)
-			return fp;
-		
-		if (bSubDirectories) {
-			char const* saSubdirectories[] = {
-				"parts",
-				"p",
-			};
-			
-			for (char const* sSubdir : saSubdirectories) {
-				zFilePath = fmt ("%s" DIRSLASH "%s" DIRSLASH "%s",
-					io_ldpath.value.chars(), sSubdir, zTruePath.chars());
-				printf ("try %s\n", zFilePath.chars());
-				
-				fp = fopen (zFilePath.chars (), "r");
-				
-				if (fp)
-					return fp;
-			}
-		}
-	}
-	
-	return null;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-std::vector<LDObject*> loadFileContents (FILE* fp, ulong* numWarnings) {
-	char line[1024];
-	vector<str> lines;
-	vector<LDObject*> objs;
-	ulong lnum = 0;
-	
-	if (numWarnings)
-		*numWarnings = 0;
-	
-	while (fgets (line, sizeof line, fp)) {
-		// Trim the trailing newline
-		str data = line;
-		while (data[~data - 1] == '\n' || data[~data - 1] == '\r')
-			data -= 1;
-		
-		LDObject* obj = parseLine (data);
-		assert (obj != null);
-		
-		// Check for parse errors and warn about tthem
-		if (obj->getType() == LDObject::Gibberish) {
-			logf (LOG_Warning, "Couldn't parse line #%lu: %s\n",
-				lnum, static_cast<LDGibberish*> (obj)->zReason.chars());
-			
-			logf (LOG_Warning, "- Line was: %s\n", data.chars());
-			
-			if (numWarnings)
-				(*numWarnings)++;
-		}
-		
-		objs.push_back (obj);
-		lnum++;
-	}
-	
-	return objs;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-OpenFile* openDATFile (str path, bool search) {
-	logf ("Opening %s...\n", path.chars());
-	
-	// Convert the file name to lowercase since some parts contain uppercase
-	// file names. I'll assume here that the library will always use lowercase
-	// file names for the actual parts..
-	FILE* fp;
-	if (search)
-		fp = openLDrawFile (-path, true);
-	else
-		fp = fopen (path, "r");
-	
-	if (!fp) {
-		logf (LOG_Error, "Couldn't open %s: %s\n", path.chars (), strerror (errno));
-		return null;
-	}
-	
-	OpenFile* load = new OpenFile;
-	load->m_filename = path;
-	ulong numWarnings;
-	std::vector<LDObject*> objs = loadFileContents (fp, &numWarnings);
-	
-	for (LDObject* obj : objs)
-		load->m_objs.push_back (obj);
-	
-	fclose (fp);
-	g_loadedFiles.push_back (load);
-	
-	logf ("File %s parsed successfully (%lu warning%s).\n",
-		path.chars(), numWarnings, PLURAL (numWarnings));
-	
-	return load;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-bool OpenFile::safeToClose () {
-	setlocale (LC_ALL, "C");
-	
-	// If we have unsaved changes, warn and give the option of saving.
-	if (!m_implicit && History::pos () != savePos) {
-		switch (QMessageBox::question (g_win, "Unsaved Changes",
-			fmt ("There are unsaved changes to %s. Should it be saved?", m_filename.chars ()),
-			(QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel), QMessageBox::Cancel))
-		{
-		case QMessageBox::Yes:
-			if (!save ()) {
-				str errormsg = fmt ("Failed to save %s: %s\nDo you still want to close?",
-					m_filename.chars (), strerror (lastError));
-				
-				if (QMessageBox::critical (g_win, "Save Failure", errormsg,
-					(QMessageBox::Yes | QMessageBox::No), QMessageBox::No) == QMessageBox::No)
-				{
-					return false;
-				}
-			}
-			
-			break;
-		
-		case QMessageBox::Cancel:
-			return false;
-		
-		default:
-			break;
-		}
-	}
-	
-	return true;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void closeAll () {
-	if (!g_loadedFiles.size())
-		return;
-	
-	// Remove all loaded files and the objects they contain
-	for (OpenFile* file : g_loadedFiles)
-		delete file;
-	
-	// Clear the array
-	g_loadedFiles.clear();
-	g_curfile = NULL;
-	
-	g_win->refresh ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void newFile () {
-	// Create a new anonymous file and set it to our current
-	closeAll ();
-	
-	OpenFile* f = new OpenFile;
-	f->m_filename = "";
-	g_loadedFiles.push_back (f);
-	g_curfile = f;
-	
-	g_BBox.calculate();
-	g_win->refresh ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void addRecentFile (str zPath) {
-	long lPos = io_recentfiles.value.first (zPath);
-	
-	// If this file already is in the list, pop it out.
-	if (lPos != -1) {
-		if (~io_recentfiles.value == ~zPath)
-			return; // only recent file - do nothing
-		
-		// Pop it out.
-		str zFront = io_recentfiles.value.substr (0, lPos);
-		str zBack = io_recentfiles.value.substr (lPos + ~zPath + 1, -1);
-		io_recentfiles.value = zFront + zBack;
-	}
-	
-	// If there's too many recent files, drop one out.
-	while (io_recentfiles.value.count ('@') > 3)
-		io_recentfiles.value = io_recentfiles.value.substr (io_recentfiles.value.first ("@") + 1, -1);
-	
-	// Add the file
-	if (~io_recentfiles.value > 0)
-		io_recentfiles.value += "@";
-	
-	io_recentfiles += zPath;
-	
-	config::save ();
-	g_win->updateRecentFilesMenu ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void openMainFile (str path) {
-	closeAll ();
-	
-	OpenFile* file = openDATFile (path, false);
-	
-	if (!file) {
-		// Tell the user loading failed.
-		setlocale (LC_ALL, "C");
-		critical (fmt ("Failed to open %s: %s", path.chars(), strerror (errno)));
-		return;
-	}
-	
-	file->m_implicit = false;
-	g_curfile = file;
-	
-	// Recalculate the bounding box
-	g_BBox.calculate();
-	
-	// Rebuild the object tree view now.
-	g_win->refresh ();
-	g_win->setTitle ();
-	g_win->R ()->resetAngles ();
-	
-	History::clear ();
-	
-	// Add it to the recent files list.
-	addRecentFile (path);
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-bool OpenFile::save (str path) {
-	if (!~path)
-		path = m_filename;
-	
-	FILE* fp = fopen (path, "w");
-	
-	if (!fp) {
-		lastError = errno;
-		return false;
-	}
-	
-	// Write all entries now
-	for (LDObject* obj : m_objs) {
-		// LDraw requires lines to have DOS line endings
-		str zLine = fmt ("%s\r\n", obj->getContents ().chars ());
-		
-		fwrite (zLine.chars(), 1, ~zLine, fp);
-	}
-	
-	fclose (fp);
-	
-	// We have successfully saved, update the save position now.
-	savePos = History::pos ();
-	
-	g_win->setTitle ();
-	
-	return true;
-}
-
-#define CHECK_TOKEN_COUNT(N) \
-	if (tokens.size() != N) \
-		return new LDGibberish (zLine, "Bad amount of tokens");
-
-#define CHECK_TOKEN_NUMBERS(MIN,MAX) \
-	for (ushort i = MIN; i <= MAX; ++i) \
-		if (!isNumber (tokens[i])) \
-			return new LDGibberish (zLine, fmt ("Token #%u was `%s`, expected a number", \
-				(i + 1), tokens[i].chars()));
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-static vertex parseVertex (vector<str>& s, const ushort n) {
-	// Disable the locale while parsing the line or atof's behavior changes
-	// between locales (i.e. fails to read decimals properly). That is
-	// quite undesired...
-	setlocale (LC_NUMERIC, "C");
-	
-	vertex v;
-	for (const Axis ax : g_Axes)
-		v[ax] = atof (s[n + ax]);
-	
-	return v;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-LDObject* parseLine (str zLine) {
-	vector<str> tokens = zLine.split (" ", true);
-	
-	if (!tokens.size ()) {
-		// Line was empty, or only consisted of whitespace
-		return new LDEmpty;
-	}
-	
-	if (~tokens[0] != 1)
-		return new LDGibberish (zLine, "Illogical line code");
-	
-	const char c = tokens[0][0];
-	switch (c - '0') {
-	case 0:
-		{
-			// Comment
-			str comm;
-			for (uint i = 1; i < tokens.size(); ++i) {
-				comm += tokens[i];
-				
-				if (i != tokens.size() - 1)
-					comm += ' ';
-			}
-			
-			// Handle BFC statements
-			if (tokens.size() > 2 && tokens[1] == "BFC") {
-				for (short i = 0; i < LDBFC::NumStatements; ++i)
-					if (comm == fmt ("BFC %s", LDBFC::statements [i]))
-						return new LDBFC ((LDBFC::Type) i);
-				
-				// MLCAD is notorious for stuffing these statements in parts it
-				// creates. The above block only handles valid statements, so we
-				// need to handle MLCAD-style invertnext separately.
-				if (comm == "BFC CERTIFY INVERTNEXT")
-					return new LDBFC (LDBFC::InvertNext);
-			}
-			
-			if (tokens.size() > 2 && tokens[1] == "!LDFORGE") {
-				// Handle LDForge-specific types, they're embedded into comments
-				
-				if (tokens[2] == "VERTEX") {
-					// Vertex (0 !LDFORGE VERTEX)
-					CHECK_TOKEN_COUNT (7)
-					CHECK_TOKEN_NUMBERS (3, 6)
-					
-					LDVertex* obj = new LDVertex;
-					obj->dColor = atol (tokens[3]);
-					
-					for (const Axis ax : g_Axes)
-						obj->vPosition[ax] = atof (tokens[4 + ax]); // 4 - 6
-					
-					return obj;
-				}
-				
-				if (tokens[2] == "RADIAL") {
-					CHECK_TOKEN_COUNT (20)
-					CHECK_TOKEN_NUMBERS (4, 19)
-					
-					LDRadial::Type eType = LDRadial::NumTypes;
-					
-					for (int i = 0; i < LDRadial::NumTypes; ++i) {
-						if (str (LDRadial::radialTypeName ((LDRadial::Type) i)).toupper ().strip (' ') == tokens[3]) {
-							eType = (LDRadial::Type) i;
-							break;
-						}
-					}
-					
-					if (eType == LDRadial::NumTypes)
-						return new LDGibberish (zLine, fmt ("Unknown radial type %s", tokens[3].chars ()));
-					
-					LDRadial* obj = new LDRadial;
-					
-					obj->eRadialType = eType;			// 3
-					obj->dColor = atol (tokens[4]);		// 4
-					obj->dSegments = atol (tokens[5]);	// 5
-					obj->dDivisions = atol (tokens[6]);	// 6
-					obj->dRingNum = atol (tokens[7]);	// 7
-					
-					obj->vPosition = parseVertex (tokens, 8); // 8 - 10
-					
-					for (short i = 0; i < 9; ++i)
-						obj->mMatrix[i] = atof (tokens[i + 11]); // 11 - 19
-					
-					return obj;
-				}
-			}
-			
-			LDComment* obj = new LDComment;
-			obj->text = comm;
-			return obj;
-		}
-	
-	case 1:
-		{
-			// Subfile
-			CHECK_TOKEN_COUNT (15)
-			CHECK_TOKEN_NUMBERS (1, 13)
-			
-			// Try open the file
-			OpenFile* pFile = loadSubfile (tokens[14]);
-			
-			// If we cannot open the file, mark it an error
-			if (!pFile)
-				return new LDGibberish (zLine, "Could not open referred file");
-			
-			LDSubfile* obj = new LDSubfile;
-			obj->dColor = atol (tokens[1]);
-			obj->vPosition = parseVertex (tokens, 2); // 2 - 4
-			
-			for (short i = 0; i < 9; ++i)
-				obj->mMatrix[i] = atof (tokens[i + 5]); // 5 - 13
-			
-			obj->zFileName = tokens[14];
-			obj->pFile = pFile;
-			return obj;
-		}
-	
-	case 2:
-		{
-			CHECK_TOKEN_COUNT (8)
-			CHECK_TOKEN_NUMBERS (1, 7)
-			
-			// Line
-			LDLine* obj = new LDLine;
-			obj->dColor = atol (tokens[1]);
-			for (short i = 0; i < 2; ++i)
-				obj->vaCoords[i] = parseVertex (tokens, 2 + (i * 3)); // 2 - 7
-			return obj;
-		}
-	
-	case 3:
-		{
-			CHECK_TOKEN_COUNT (11)
-			CHECK_TOKEN_NUMBERS (1, 10)
-			
-			// Triangle
-			LDTriangle* obj = new LDTriangle;
-			obj->dColor = atol (tokens[1]);
-			
-			for (short i = 0; i < 3; ++i)
-				obj->vaCoords[i] = parseVertex (tokens, 2 + (i * 3)); // 2 - 10
-			
-			return obj;
-		}
-	
-	case 4:
-		{
-			CHECK_TOKEN_COUNT (14)
-			CHECK_TOKEN_NUMBERS (1, 13)
-			
-			// Quadrilateral
-			LDQuad* obj = new LDQuad;
-			obj->dColor = atol (tokens[1]);
-			
-			for (short i = 0; i < 4; ++i)
-				obj->vaCoords[i] = parseVertex (tokens, 2 + (i * 3)); // 2 - 13
-			
-			return obj;
-		}
-	
-	case 5:
-		{
-			CHECK_TOKEN_COUNT (14)
-			CHECK_TOKEN_NUMBERS (1, 13)
-			
-			// Conditional line
-			LDCondLine* obj = new LDCondLine;
-			obj->dColor = atol (tokens[1]);
-			
-			for (short i = 0; i < 4; ++i)
-				obj->vaCoords[i] = parseVertex (tokens, 2 + (i * 3)); // 2 - 13
-			
-			return obj;
-		}
-	
-	default: // Strange line we couldn't parse
-		return new LDGibberish (zLine, "Unknown line code number");
-	}
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-OpenFile* loadSubfile (str zFile) {
-	// Try open the file
-	OpenFile* pFile = findLoadedFile (zFile);
-	if (!pFile)
-		pFile = openDATFile (zFile, true);
-	
-	return pFile;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void reloadAllSubfiles () {
-	if (!g_curfile)
-		return;
-	
-	// First, close all but the current open file.
-	for (OpenFile* file : g_loadedFiles)
-		if (file != g_curfile)
-			delete file;
-	
-	g_loadedFiles.clear ();
-	g_loadedFiles.push_back (g_curfile);
-	
-	// Go through all objects in the current file and reload the subfiles
-	for (LDObject* obj : g_curfile->m_objs) {
-		if (obj->getType() == LDObject::Subfile) {
-			// Note: ref->pFile is invalid right now since all subfiles were closed.
-			LDSubfile* ref = static_cast<LDSubfile*> (obj);
-			OpenFile* pFile = loadSubfile (ref->zFileName);
-			
-			if (pFile)
-				ref->pFile = pFile;
-			else {
-				// Couldn't load the file, mark it an error
-				ref->replace (new LDGibberish (ref->getContents (), "Could not open referred file"));
-			}
-		}
-		
-		// Reparse gibberish files. It could be that they are invalid because
-		// the file could not be opened. Circumstances may be different now.
-		if (obj->getType() == LDObject::Gibberish)
-			obj->replace (parseLine (static_cast<LDGibberish*> (obj)->zContents));
-	}
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-ulong OpenFile::addObject (LDObject* obj) {
-	m_objs.push_back (obj);
-	
-	if (this == g_curfile)
-		g_BBox.calcObject (obj);
-	
-	return m_objs.size() - 1;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void OpenFile::insertObj (const ulong pos, LDObject* obj) {
-	m_objs.insert (m_objs.begin () + pos, obj);
-	
-	if (this == g_curfile)
-		g_BBox.calcObject (obj);
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void OpenFile::forgetObject (LDObject* obj) {
-	// Find the index for the given object
-	ulong ulIndex;
-	for (ulIndex = 0; ulIndex < (ulong)m_objs.size(); ++ulIndex)
-		if (m_objs[ulIndex] == obj)
-			break; // found it
-	
-	if (ulIndex >= m_objs.size ())
-		return; // was not found
-	
-	// Erase it from memory
-	m_objs.erase (m_objs.begin() + ulIndex);
-	
-	// Update the bounding box
-	if (this == g_curfile)
-		g_BBox.calculate ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-std::vector<partListEntry> g_PartList;
-
-void initPartList () {
-	logf ("%s: initializing parts.lst\n", __func__);
-	
-	FILE* fp = openLDrawFile ("parts.lst", false);
-	
-	if (!fp)
-		return;
-	
-	char sLine[1024];
-	while (fgets (sLine, sizeof sLine, fp)) {
-		// Locate the first whitespace
-		char* cpWhite = strstr (sLine, " ");
-		
-		char sName[65];
-		size_t uLength = (cpWhite - sLine);
-		
-		if (uLength >= 64)
-			continue; // too long
-		
-		strncpy (sName, sLine, uLength);
-		sName[uLength] = '\0';
-		
-		// Surf through the whitespace sea!
-		while (*cpWhite == ' ')
-			cpWhite++;
-		
-		// Get the end point
-		char* cpEnd = strstr (sLine, "\r");
-		
-		if (cpEnd == null) {
-			// must not be DOS-formatted
-			cpEnd = strstr (sLine, "\n");
-		}
-		
-		assert (cpEnd != null);
-		
-		// Make the file title now
-		char sTitle[81];
-		uLength = (cpEnd - cpWhite);
-		strncpy (sTitle, cpWhite, uLength);
-		sTitle[uLength] = '\0';
-		
-		// Add it to the array.
-		partListEntry entry;
-		strcpy (entry.sName, sName);
-		strcpy (entry.sTitle, sTitle);
-		g_PartList.push_back (entry);
-	}
-}
\ No newline at end of file

--- a/file.h	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FILE_H
-#define FILE_H
-
-#include "common.h"
-#include "ldtypes.h"
-#include "str.h"
-
-namespace LDPaths {
-	void initPaths ();
-	bool tryConfigure (str path);
-	
-	str ldconfig ();
-	str prims ();
-	str parts ();
-	str getError ();
-}
-
-// =============================================================================
-// OpenFile
-//
-// The OpenFile class stores a file opened in LDForge either as a editable file
-// for the user or for subfile caching. Its methods handle file input and output.
-// =============================================================================
-class OpenFile {
-public:
-	str m_filename, m_title;
-	vector<LDObject*> m_objs;
-	vector<LDObject*> m_objCache; // Cache of this file's contents, if desired
-	
-	int lastError;
-	
-	// Is this file implicit? Implicit files are opened automatically for
-	// caching purposes and are hidden from the user.
-	bool m_implicit;
-	
-	OpenFile ();
-	~OpenFile ();
-	
-	// Saves this file to disk.
-	bool save (str zPath = "");
-	
-	// Perform safety checks. Do this before closing any files!
-	bool safeToClose ();
-	
-	// Adds an object to this file at the end of the file.
-	ulong addObject (LDObject* obj);
-	
-	// Deletes the given object from the object chain.
-	void forgetObject (LDObject* obj);
-	
-	// At what point was this file last saved?
-	long savePos;
-	
-	LDObject* object (ulong pos) const {
-		return m_objs[pos];
-	}
-	
-	void insertObj (const ulong pos, LDObject* obj);
-};
-
-// Close all current loaded files and start off blank.
-void newFile ();
-
-// Opens the given file as the main file. Everything is closed first.
-void openMainFile (str zPath);
-
-// Finds an OpenFile by name or null if not open
-OpenFile* findLoadedFile (str name);
-
-// Opens the given file and parses the LDraw code within. Returns a pointer
-// to the opened file or null on error.
-OpenFile* openDATFile (str path, bool search);
-
-// Opens the given file and returns a pointer to it, potentially looking in /parts and /p
-FILE* openLDrawFile (str path, bool bSubDirectories);
-
-// Close all open files, whether user-opened or subfile caches.
-void closeAll ();
-
-// Parses a string line containing an LDraw object and returns the object parsed.
-LDObject* parseLine (str zLine);
-
-// Retrieves the pointer to - or loads - the given subfile.
-OpenFile* loadSubfile (str zFile);
-
-// Re-caches all subfiles.
-void reloadAllSubfiles ();
-
-typedef struct {
-	char sName[65], sTitle[81];
-} partListEntry;
-
-// Init and parse parts.lst
-void initPartList ();
-
-std::vector< LDObject* > loadFileContents (FILE* fp, ulong* numWarnings);
-
-extern vector<OpenFile*> g_loadedFiles;
-extern vector<partListEntry> g_PartList;
-
-#endif // FILE_H
\ No newline at end of file

--- a/gldraw.cpp	Wed May 08 14:57:48 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1214 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QtGui>
-#include <QGLWidget>
-#include <GL/glu.h>
-#include "common.h"
-#include "config.h"
-#include "file.h"
-#include "gldraw.h"
-#include "bbox.h"
-#include "colors.h"
-#include "gui.h"
-#include "misc.h"
-#include "history.h"
-
-static double g_objOffset[3];
-
-static short g_pulseTick = 0;
-static const short g_numPulseTicks = 8;
-static const short g_pulseInterval = 65;
-
-static const struct staticCameraMeta {
-	const char glrotate[3];
-	const Axis axisX, axisY;
-	const bool negX, negY;
-} g_staticCameras[6] = {
-	{ { 1, 0, 0 }, X, Z, false, false },
-	{ { 0, 0, 0 }, X, Y, false, true },
-	{ { 0, 1, 0 }, Z, Y, true, true },
-	{ { -1, 0, 0 }, X, Z, false, true },
-	{ { 0, 0, 0 }, X, Y, true, true },
-	{ { 0, -1, 0 }, Z, Y, false, true },
-};
-
-cfg (str, gl_bgcolor, "#CCCCD9");
-cfg (str, gl_maincolor, "#707078");
-cfg (float, gl_maincolor_alpha, 1.0);
-cfg (int, gl_linethickness, 2);
-cfg (bool, gl_colorbfc, true);
-cfg (bool, gl_selflash, false);
-cfg (int, gl_camera, GLRenderer::Free);
-cfg (bool, gl_blackedges, true);
-cfg (bool, gl_axes, false);
-
-// CameraIcon::img is a heap-allocated QPixmap because otherwise it gets
-// initialized before program gets to main() and constructs a QApplication
-// and Qt doesn't like that.
-struct CameraIcon {
-	QPixmap* img;
-	QRect srcRect, destRect, selRect;
-	GLRenderer::Camera cam;
-} g_CameraIcons[7];
-
-const char* g_CameraNames[7] = { "Top", "Front", "Left", "Bottom", "Back", "Right", "Free" };
-
-const GLRenderer::Camera g_Cameras[7] = {
-	GLRenderer::Top,
-	GLRenderer::Front,
-	GLRenderer::Left,
-	GLRenderer::Bottom,
-	GLRenderer::Back,
-	GLRenderer::Right,
-	GLRenderer::Free
-};
-
-const struct GLAxis {
-	const QColor col;
-	const vertex vert;
-} g_GLAxes[3] = {
-	{ QColor (255, 0, 0), vertex (10000, 0, 0) },
-	{ QColor (128, 192, 0), vertex (0, 10000, 0) },
-	{ QColor (0, 160, 192), vertex (0, 0, 10000) },
-};
-	
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-GLRenderer::GLRenderer (QWidget* parent) : QGLWidget (parent) {
-	resetAngles ();
-	m_picking = m_rangepick = false;
-	m_camera = (GLRenderer::Camera) gl_camera.value;
-	m_drawToolTip = false;
-	m_planeDraw = false;
-	
-	m_pulseTimer = new QTimer (this);
-	connect (m_pulseTimer, SIGNAL (timeout ()), this, SLOT (slot_timerUpdate ()));
-	
-	m_toolTipTimer = new QTimer (this);
-	m_toolTipTimer->setSingleShot (true);
-	connect (m_toolTipTimer, SIGNAL (timeout ()), this, SLOT (slot_toolTipTimer ()));
-	
-	m_thickBorderPen = QPen (QColor (0, 0, 0, 208), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
-	m_thinBorderPen = m_thickBorderPen;
-	m_thinBorderPen.setWidth (1);
-	
-	// Init camera icons
-	for (const GLRenderer::Camera cam : g_Cameras) {
-		str iconname;
-		iconname.format ("camera-%s", str (g_CameraNames[cam]).tolower ().chars ());
-		
-		CameraIcon* info = &g_CameraIcons[cam];
-		info->img = new QPixmap (getIcon (iconname));
-		info->cam = cam;
-	}
-	
-	calcCameraIconRects ();
-}
-
-// =============================================================================
-GLRenderer::~GLRenderer() {
-	for (CameraIcon& info : g_CameraIcons)
-		delete info.img;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::calcCameraIconRects () {
-	ushort i = 0;
-	
-	for (CameraIcon& info : g_CameraIcons) {
-		const long x1 = (m_width - (info.cam != Free ? 48 : 16)) + ((i % 3) * 16) - 1,
-			y1 = ((i / 3) * 16) + 1;
-		
-		info.srcRect = QRect (0, 0, 16, 16);
-		info.destRect = QRect (x1, y1, 16, 16);
-		info.selRect = QRect (info.destRect.x (), info.destRect.y (),
-			info.destRect.width () + 1, info.destRect.height () + 1);
-		++i;
-	}
-}
-
-// =============================================================================
-void GLRenderer::resetAngles () {
-	m_rotX = 30.0f;
-	m_rotY = 325.f;
-	m_panX = m_panY = m_rotZ = 0.0f;
-	
-	// Set the default zoom based on the bounding box
-	m_zoom = g_BBox.size () * 6;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::initializeGL () {
-	setBackground ();
-	
-	glEnable (GL_POLYGON_OFFSET_FILL);
-	glPolygonOffset (1.0f, 1.0f);
-	
-	glEnable (GL_DEPTH_TEST);
-	glShadeModel (GL_SMOOTH);
-	glEnable (GL_MULTISAMPLE);
-	
-	glEnable (GL_BLEND);
-	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	
-	glEnable (GL_LINE_SMOOTH);
-	glHint (GL_LINE_SMOOTH_HINT, GL_NICEST);
-	
-	glLineWidth (gl_linethickness);
-	
-	setAutoFillBackground (false);
-	setMouseTracking (true);
-	setFocusPolicy (Qt::WheelFocus);
-	compileObjects ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-QColor GLRenderer::getMainColor () {
-	QColor col (gl_maincolor.value.chars());
-	
-	if (!col.isValid ())
-		return QColor (0, 0, 0);
-	
-	col.setAlpha (gl_maincolor_alpha * 255.f);
-	return col;
-}
-
-// -----------------------------------------------------------------------------
-void GLRenderer::setBackground () {
-	QColor col (gl_bgcolor.value.chars());
-	
-	if (!col.isValid ())
-		return;
-	
-	m_darkbg = luma (col) < 80;
-	
-	col.setAlpha (255);
-	qglClearColor (col);
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-static vector<short> g_daWarnedColors;
-void GLRenderer::setObjectColor (LDObject* obj) {
-	QColor qcol;
-	
-	if (!obj->isColored())
-		return;
-	
-	if (m_picking) {
-		// Make the color by the object's index color if we're picking, so we can
-		// make the index from the color we get from the picking results.
-		long i = obj->getIndex (g_curfile);
-		
-		// If we couldn't find the index, this object must not be from this file,
-		// therefore it must be an object inlined from a subfile reference or
-		// decomposed from a radial. Find the top level parent object and use
-		// its index.
-		if (i == -1)
-			i = obj->topLevelParent ()->getIndex (g_curfile);
-		
-		// We should have the index now.
-		assert (i != -1);
-		
-		// Calculate a color based from this index. This method caters for
-		// 16777216 objects. I don't think that'll be exceeded anytime soon. :)
-		// ATM biggest is 53588.dat with 12600 lines.
-		double r = (i / (256 * 256)) % 256,
-			g = (i / 256) % 256,
-			b = i % 256;
-		
-		qglColor (QColor (r, g, b, 255));
-		return;
-	}
-	
-#if 0
-	if (gl_colorbfc &&
-		obj->getType () != LDObject::Line &&
-		obj->getType () != LDObject::CondLine)
-	{
-		if (bBackSide)
-			glColor4f (0.9f, 0.0f, 0.0f, 1.0f);
-		else
-			glColor4f (0.0f, 0.8f, 0.0f, 1.0f);
-		return;
-	}
-#endif
-	
-	if (obj->dColor == maincolor)
-		qcol = getMainColor ();
-	else {
-		color* col = getColor (obj->dColor);
-		qcol = col->qColor;
-	}
-	
-	if (obj->dColor == edgecolor) {
-		qcol = Qt::black;
-		color* col;
-		
-		if (!gl_blackedges && obj->parent != null && (col = getColor (obj->parent->dColor)) != null)
-			qcol = col->qEdge;
-	}
-	
-	if (qcol.isValid () == false) {
-		// The color was unknown. Use main color to make the object at least
-		// not appear pitch-black.
-		if (obj->dColor != edgecolor)
-			qcol = getMainColor ();
-		
-		// Warn about the unknown colors, but only once.
-		for (short i : g_daWarnedColors)
-			if (obj->dColor == i)
-				return;
-		
-		printf ("%s: Unknown color %d!\n", __func__, obj->dColor);
-		g_daWarnedColors.push_back (obj->dColor);
-		return;
-	}
-	
-	long r = qcol.red (),
-		g = qcol.green (),
-		b = qcol.blue (),
-		a = qcol.alpha ();
-	
-	// If it's selected, brighten it up, also pulse flash it if desired.
-	if (g_win->isSelected (obj)) {
-		short tick, numTicks;
-		
-		if (gl_selflash) {
-			tick = (g_pulseTick < (g_numPulseTicks / 2)) ? g_pulseTick : (g_numPulseTicks - g_pulseTick);
-			numTicks = g_numPulseTicks;
-		} else {
-			tick = 2;
-			numTicks = 5;
-		}
-		
-		const long add = ((tick * 128) / numTicks);
-		r = min (r + add, 255l);
-		g = min (g + add, 255l);
-		b = min (b + add, 255l);
-		
-		// a = 255;
-	}
-	
-	glColor4f (
-		((double) r) / 255.0f,
-		((double) g) / 255.0f,
-		((double) b) / 255.0f,
-		((double) a) / 255.0f);
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::refresh () {
-	update ();
-	swapBuffers ();
-}
-
-// =============================================================================
-void GLRenderer::hardRefresh () {
-	compileObjects ();
-	refresh ();
-	
-	glLineWidth (gl_linethickness);
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::resizeGL (int w, int h) {
-	m_width = w;
-	m_height = h;
-	
-	calcCameraIconRects ();
-	
-	glViewport (0, 0, w, h);
-	glMatrixMode (GL_PROJECTION);
-	glLoadIdentity ();
-	gluPerspective (45.0f, (double)w / (double)h, 1.0f, 10000.0f);
-	glMatrixMode (GL_MODELVIEW);
-}
-
-void GLRenderer::drawGLScene () const {
-	if (g_curfile == null)
-		return;
-	
-	glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-	glEnable (GL_DEPTH_TEST);
-	
-	if (m_camera != GLRenderer::Free) {
-		glMatrixMode (GL_PROJECTION);
-		glPushMatrix ();
-		
-		glLoadIdentity ();
-		glOrtho (-m_virtWidth, m_virtWidth, -m_virtHeight, m_virtHeight, -100.0f, 100.0f);
-		glTranslatef (m_panX, m_panY, 0.0f);
-		glRotatef (90.0f, g_staticCameras[m_camera].glrotate[0],
-			g_staticCameras[m_camera].glrotate[1],
-			g_staticCameras[m_camera].glrotate[2]);
-		
-		// Back camera needs to be handled differently
-		if (m_camera == GLRenderer::Back) {
-			glRotatef (180.0f, 1.0f, 0.0f, 0.0f);
-			glRotatef (180.0f, 0.0f, 0.0f, 1.0f);
-		}
-	} else {
-		glMatrixMode (GL_MODELVIEW);
-		glPushMatrix ();
-		glLoadIdentity ();
-		
-		glTranslatef (0.0f, 0.0f, -2.0f);
-		glTranslatef (m_panX, m_panY, -m_zoom);
-		glRotatef (m_rotX, 1.0f, 0.0f, 0.0f);
-		glRotatef (m_rotY, 0.0f, 1.0f, 0.0f);
-		glRotatef (m_rotZ, 0.0f, 0.0f, 1.0f);
-	}
-	
-	for (LDObject* obj : g_curfile->m_objs) {
-		if (obj->hidden ())
-			continue; // Don't draw hidden objects
-		
-		glCallList (m_picking == false ? obj->uGLList : obj->uGLPickList);
-	}
-	
-	if (gl_axes && !m_picking)
-		glCallList (m_axeslist);
-	
-	glPopMatrix ();
-	glMatrixMode (GL_MODELVIEW);
-}
-
-// =============================================================================
-vertex GLRenderer::coord_2to3 (const QPoint& pos2d, const bool snap) const {
-	vertex pos3d;
-	const staticCameraMeta* cam = &g_staticCameras[m_camera];
-	const Axis axisX = cam->axisX;
-	const Axis axisY = cam->axisY;
-	const short negXFac = cam->negX ? -1 : 1,
-		negYFac = cam->negY ? -1 : 1;
-	
-	// Calculate cx and cy - these are the LDraw unit coords the cursor is at.
-	double cx = (-m_virtWidth + ((2 * pos2d.x () * m_virtWidth) / m_width) - m_panX) - (negXFac * g_objOffset[axisX]);
-	double cy = (m_virtHeight - ((2 * pos2d.y () * m_virtHeight) / m_height) - m_panY) - (negYFac * g_objOffset[axisY]);
-	
-	if (snap) {
-		cx = Grid::snap (cx, (Grid::Config) axisX);
-		cy = Grid::snap (cy, (Grid::Config) axisY);
-	}
-	
-	cx *= negXFac;
-	cy *= negYFac;
-	
-	pos3d = g_origin;
-	pos3d[axisX] = cx;
-	pos3d[axisY] = cy;
-	return pos3d;
-}
-
-// =============================================================================
-QPoint GLRenderer::coord_3to2 (const vertex& pos3d) const {
-	/*
-	cx = (-m_virtWidth + ((2 * pos2d.x () * m_virtWidth) / m_width) - m_panX) - (negXFac * g_objOffset[axisX]);
-	
-	                                                 cx = (-vw + ((2 * x * vw) / w) - panx) - (neg * ofs)
-	                                  cx + (neg * ofs) = (-vw + ((2 * x * vw) / w) - panx)
-	                                  cx + (neg * ofs) = ((2 * x * vw) / w) - vw - panx
-	                    (cx + (neg * ofs)) + vw + panx = (2 * x * vw) / w
-	              ((cx + (neg * ofs)) + vw + panx) * w = 2 * vw * x
-	
-	x = (((cx + (neg * ofs)) + vw + panx) * w) / (2 * vw)
-	*/
-	
-	QPoint pos2d;
-	const staticCameraMeta* cam = &g_staticCameras[m_camera];
-	const Axis axisX = cam->axisX;
-	const Axis axisY = cam->axisY;
-	const short negXFac = cam->negX ? -1 : 1,
-		negYFac = cam->negY ? -1 : 1;
-	
-	short x1 = (((pos3d[axisX] + (negXFac * g_objOffset[axisX])) +
-		m_virtWidth + m_panX) * m_width) / (2 * m_virtWidth);
-	short y1 = -(((pos3d[axisY] + (negYFac * g_objOffset[axisY])) -
-		m_virtHeight + m_panY) * m_height) / (2 * m_virtHeight);
-	
-	x1 *= negXFac;
-	y1 *= negYFac;
-	
-	pos2d = QPoint (x1, y1);
-	return pos2d;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::paintEvent (QPaintEvent* ev) {
-	Q_UNUSED (ev)
-	m_virtWidth = m_zoom;
-	m_virtHeight = (m_height * m_virtWidth) / m_width;
-	drawGLScene ();
-	
-	QPainter paint (this);
-	QFontMetrics metrics = QFontMetrics (QFont ());
-	paint.setRenderHint (QPainter::Antialiasing);
-	
-	m_hoverpos = g_origin;
-	
-	if (m_camera != Free) {
-		// Calculate 3d position of the cursor
-		m_hoverpos = coord_2to3 (m_pos, true);
-		
-		// Paint the coordinates onto the screen.
-		str text;
-		text.format ("X: %s, Y: %s, Z: %s", ftoa (m_hoverpos[X]).chars (),
-			ftoa (m_hoverpos[Y]).chars (), ftoa (m_hoverpos[Z]).chars ());
-		
-		QFontMetrics metrics = QFontMetrics (font ());
-		QRect textSize = metrics.boundingRect (0, 0, m_width, m_height, Qt::AlignCenter, text);
-		
-		paint.drawText (m_width - textSize.width (), m_height - 16, textSize.width (),
-			textSize.height (), Qt::AlignCenter, text);
-		
-		// If we're plane drawing, draw the vertices onto the screen.
-		if (m_planeDraw) {
-			ushort numverts = m_planeDrawVerts.size () + 1;
-			const short blipsize = 8;
-			
-			if (numverts > 0) {
-				QPoint* poly = new QPoint[numverts];
-				
-				uchar i = 0;
-				for (vertex& vert : m_planeDrawVerts) {
-					poly[i] = coord_3to2 (vert);
-					++i;
-				}
-				
-				// Draw the cursor vertex as the last one in the list.
-				if (numverts < 5)
-					poly[i] = coord_3to2 (m_hoverpos);
-				else
-					numverts = 4;
-				
-				paint.setPen (m_thinBorderPen);
-				paint.setBrush (QColor (128, 192, 0));
-				
-				// Draw vertex blips
-				for (ushort i = 0; i < numverts; ++i) {
-					QPoint& blip = poly[i];
-					paint.drawEllipse (blip.x () - blipsize / 2, blip.y () - blipsize / 2,
-						blipsize, blipsize);
-				}
-				
-				paint.setPen (m_thickBorderPen);
-				paint.setBrush (QColor (128, 192, 0, 128));
-				paint.drawPolygon (poly, numverts);
-				
-				delete[] poly;
-			}
-		}
-	}
-	
-	// Camera icons
-	if (!m_picking && m_planeDraw == false) {
-		// Draw a background for the selected camera
-		paint.setPen (m_thinBorderPen);
-		paint.setBrush (QBrush (QColor (0, 128, 160, 128)));
-		paint.drawRect (g_CameraIcons[camera ()].selRect);
-		
-		// Draw the actual icons
-		for (CameraIcon& info : g_CameraIcons)
-			paint.drawPixmap (info.destRect, *info.img, info.srcRect);
-		
-		// Draw a label for the current camera in the top left corner
-		{
-			const ushort margin = 4;
-			
-			str label;
-			label.format ("%s Camera", g_CameraNames[camera ()]);
-			paint.setBrush (Qt::black);
-			paint.drawText (QPoint (margin, margin + metrics.ascent ()), label);
-		}
-		
-		// Tool tips
-		if (m_drawToolTip) {
-			if (g_CameraIcons[m_toolTipCamera].destRect.contains (m_pos) == false)
-				m_drawToolTip = false;
-			else {
-				QPen bord = m_thinBorderPen;
-				bord.setBrush (Qt::black);
-				
-				const ushort margin = 2;
-				ushort x0 = m_pos.x (),
-					y0 = m_pos.y ();
-				
-				str label;
-				label.format ("%s Camera", g_CameraNames[m_toolTipCamera]);
-				
-				const ushort textWidth = metrics.width (label),
-					textHeight = metrics.height (),
-					fullWidth = textWidth + (2 * margin),
-					fullHeight = textHeight + (2 * margin);
-				
-				QRect area (m_pos.x (), m_pos.y (), fullWidth, fullHeight);
-				
-				if (x0 + fullWidth > m_width)
-					x0 -= fullWidth;
-				
-				if (y0 + fullHeight > m_height)
-					y0 -= fullHeight;
-				
-				paint.setBrush (QColor (0, 128, 255, 208));
-				paint.setPen (bord);
-				paint.drawRect (x0, y0, fullWidth, fullHeight);
-				
-				paint.setBrush (Qt::black);
-				paint.drawText (QPoint (x0 + margin, y0 + margin + metrics.ascent ()), label);
-			}
-		}
-	}
-	
-	// If we're range-picking, draw a rectangle encompassing the selection area.
-	if (m_rangepick && !m_picking) {
-		const short x0 = m_rangeStart.x (),
-			y0 = m_rangeStart.y (),
-			x1 = m_pos.x (),
-			y1 = m_pos.y ();
-		
-		QRect rect (x0, y0, x1 - x0, y1 - y0);
-		QColor fillColor = (m_addpick ? "#80FF00" : "#00CCFF");
-		fillColor.setAlphaF (0.2f);
-		
-		paint.setPen (m_thickBorderPen);
-		paint.setBrush (QBrush (fillColor));
-		paint.drawRect (rect);
-	}
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::compileObjects () {
-	if (g_BBox.empty () == false) {
-		g_objOffset[X] = -(g_BBox.v0 ()[X] + g_BBox.v1 ()[X]) / 2;
-		g_objOffset[Y] = -(g_BBox.v0 ()[Y] + g_BBox.v1 ()[Y]) / 2;
-		g_objOffset[Z] = -(g_BBox.v0 ()[Z] + g_BBox.v1 ()[Z]) / 2;
-	} else {
-		// use a default bbox if we need 
-		g_objOffset[X] = g_objOffset[Y] = g_objOffset[Z] = 0;
-	}
-	
-	if (!g_curfile) {
-		printf ("renderer: no files loaded, cannot compile anything\n");
-		return;
-	}
-	
-	for (LDObject* obj : g_curfile->m_objs) {
-		GLuint* upaLists[2] = {
-			&obj->uGLList,
-			&obj->uGLPickList
-		};
-		
-		for (GLuint* upMemberList : upaLists) {
-			GLuint uList = glGenLists (1);
-			glNewList (uList, GL_COMPILE);
-			
-			m_picking = (upMemberList == &obj->uGLPickList);
-			compileOneObject (obj);
-			m_picking = false;
-			
-			glEndList ();
-			*upMemberList = uList;
-		}
-	}
-	
-	// Compile axes
-	m_axeslist = glGenLists (1);
-	glNewList (m_axeslist, GL_COMPILE);
-	glBegin (GL_LINES);
-	for (const GLAxis& ax : g_GLAxes) {
-		qglColor (ax.col);
-		compileVertex (ax.vert);
-		compileVertex (-ax.vert);
-	}
-	glEnd ();
-	glEndList ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::compileSubObject (LDObject* obj, const GLenum gltype) {
-	glBegin (gltype);
-	
-	const short numverts = (obj->getType () != LDObject::CondLine) ? obj->vertices () : 2;
-	
-	for (short i = 0; i < numverts; ++i)
-		compileVertex (obj->vaCoords[i]);
-	
-	glEnd ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::compileOneObject (LDObject* obj) {
-	setObjectColor (obj);
-	
-	switch (obj->getType ()) {
-	case LDObject::Line:
-		compileSubObject (obj, GL_LINES);
-		break;
-	
-	case LDObject::CondLine:
-		glLineStipple (1, 0x6666);
-		glEnable (GL_LINE_STIPPLE);
-		
-		compileSubObject (obj, GL_LINES);
-		
-		glDisable (GL_LINE_STIPPLE);
-		break;
-	
-	case LDObject::Triangle:
-		compileSubObject (obj, GL_TRIANGLES);
-		break;
-	
-	case LDObject::Quad:
-		compileSubObject (obj, GL_QUADS);
-		break;
-	
-	case LDObject::Subfile:
-		{
-			LDSubfile* ref = static_cast<LDSubfile*> (obj);
-			vector<LDObject*> objs = ref->inlineContents (true, true);
-			
-			for (LDObject* obj : objs) {
-				compileOneObject (obj);
-				delete obj;
-			}
-		}
-		break;
-	
-	case LDObject::Radial:
-		{
-			LDRadial* pRadial = static_cast<LDRadial*> (obj);
-			std::vector<LDObject*> objs = pRadial->decompose (true);
-			
-			for (LDObject* obj : objs) {
-				compileOneObject (obj);
-				delete obj;
-			}
-		}
-		break;
-	
-#if 0
-	TODO: find a proper way to draw vertices without having them be affected by zoom.
-	case LDObject::Vertex:
-		{
-			LDVertex* pVert = static_cast<LDVertex*> (obj);
-			LDTriangle* pPoly;
-			vertex* vPos = &(pVert->vPosition);
-			const double fPolyScale = max (fZoom, 1.0);
-			
-#define BIPYRAMID_COORD(N) ((((i + N) % 4) >= 2 ? 1 : -1) * 0.3f * fPolyScale)
-			
-			for (int i = 0; i < 8; ++i) {
-				pPoly = new LDTriangle;
-				pPoly->vaCoords[0] = {vPos->x, vPos->y + ((i >= 4 ? 1 : -1) * 0.4f * fPolyScale), vPos->z};
-				pPoly->vaCoords[1] = {
-					vPos->x + BIPYRAMID_COORD (0),
-					vPos->y,
-					vPos->z + BIPYRAMID_COORD (1)
-				};
-				
-				pPoly->vaCoords[2] = {
-					vPos->x + BIPYRAMID_COORD (1),
-					vPos->y,
-					vPos->z + BIPYRAMID_COORD (2)
-				};
-				
-				pPoly->dColor = pVert->dColor;
-				compileOneObject (pPoly);
-				delete pPoly;
-			}
-		}
-		break;
-#endif // 0
-	
-	default:
-		break;
-	}
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::compileVertex (const vertex& vrt) {
-	glVertex3d (
-		(vrt[X] + g_objOffset[0]),
-		-(vrt[Y] + g_objOffset[1]),
-		-(vrt[Z] + g_objOffset[2]));
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::clampAngle (double& angle) {
-	while (angle < 0)
-		angle += 360.0;
-	while (angle > 360.0)
-		angle -= 360.0;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::mouseReleaseEvent (QMouseEvent* ev) {
-	const bool wasLeft = (m_lastButtons & Qt::LeftButton) && !(ev->buttons() & Qt::LeftButton);
-	const bool wasRight = (m_lastButtons & Qt::RightButton) && !(ev->buttons() & Qt::RightButton);
-	
-	if (wasLeft) {
-		if (m_planeDraw) {
-			// If we picked an already-existing vertex, stop drawing
-			for (vertex& vert : m_planeDrawVerts) {
-				if (vert == m_hoverpos) {
-					endPlaneDraw (true);
-					return;
-				}
-			}
-			
-			// Also, if have 4 verts, also stop drawing.
-			if (m_planeDrawVerts.size () >= 4)
-				endPlaneDraw (true);
-			
-			m_planeDrawVerts.push_back (m_hoverpos);
-			
-			update ();
-			return;
-		} else {
-			if (!m_rangepick)
-				m_addpick = (m_keymods & Qt::ControlModifier);
-			
-			if (m_totalmove < 10 || m_rangepick)
-				pick (ev->x (), ev->y ());
-		}
-		
-		m_rangepick = false;
-		m_totalmove = 0;
-		return;
-	}
-	
-	if (wasRight && m_planeDraw) {
-		if (m_planeDrawVerts.size () > 0) {
-			// Remove the last vertex
-			m_planeDrawVerts.erase (m_planeDrawVerts.end () - 1);
-		} else {
-			endPlaneDraw (false);
-			return;
-		}
-		
-		update ();
-	}
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::mousePressEvent (QMouseEvent* ev) {
-	if (ev->buttons () & Qt::LeftButton)
-		m_totalmove = 0;
-	
-	if (ev->modifiers () & Qt::ShiftModifier) {
-		m_rangepick = true;
-		m_rangeStart.setX (ev->x ());
-		m_rangeStart.setY (ev->y ());
-		
-		m_addpick = (m_keymods & Qt::ControlModifier);
-	}
-	
-	m_lastButtons = ev->buttons ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::mouseMoveEvent (QMouseEvent* ev) {
-	int dx = ev->x () - m_pos.x ();
-	int dy = ev->y () - m_pos.y ();
-	m_totalmove += abs (dx) + abs (dy);
-	
-	if (ev->buttons () & Qt::LeftButton && !m_rangepick) {
-		m_rotX = m_rotX + (dy);
-		m_rotY = m_rotY + (dx);
-		
-		clampAngle (m_rotX);
-		clampAngle (m_rotY);
-	}
-	
-	if (ev->buttons () & Qt::MidButton) {
-		m_panX += 0.03f * dx * (m_zoom / 7.5f);
-		m_panY -= 0.03f * dy * (m_zoom / 7.5f);
-	}
-	
-	// Start the tool tip timer
-	if (!m_drawToolTip)
-		m_toolTipTimer->start (1000);
-	
-	m_pos = ev->pos ();
-	update ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::keyPressEvent (QKeyEvent* ev) {
-	m_keymods = ev->modifiers ();
-}
-
-void GLRenderer::keyReleaseEvent (QKeyEvent* ev) {
-	m_keymods = ev->modifiers ();
-}
-
-// =============================================================================
-void GLRenderer::wheelEvent (QWheelEvent* ev) {
-	m_zoom *= (ev->delta () < 0) ? 1.2f : (1.0f / 1.2f);
-	m_zoom = clamp (m_zoom, 0.01, 10000.0);
-	
-	update ();
-	ev->accept ();
-}
-
-// =============================================================================
-void GLRenderer::leaveEvent (QEvent* ev) {
-	Q_UNUSED (ev);
-	m_drawToolTip = false;
-	m_toolTipTimer->stop ();
-	update ();
-}
-
-// =============================================================================
-void GLRenderer::contextMenuEvent (QContextMenuEvent* ev) {
-	g_win->spawnContextMenu (ev->globalPos ());
-}
-
-// =============================================================================
-void GLRenderer::setCamera (const GLRenderer::Camera cam) {
-	m_camera = cam;
-	gl_camera = (int) cam;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::updateSelFlash () {
-	if (gl_selflash && g_win->sel ().size() > 0) {
-		m_pulseTimer->start (g_pulseInterval);
-		g_pulseTick = 0;
-	} else
-		m_pulseTimer->stop ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::pick (uint mouseX, uint mouseY) {
-	// Check if we selected a camera icon
-	if (!m_rangepick) {
-		QPoint pos (mouseX, mouseY);
-		
-		for (CameraIcon& info : g_CameraIcons) {
-			if (info.destRect.contains (pos)) {
-				setCamera (info.cam);
-				update ();
-				return;
-			}
-		}
-	}
-	
-	GLint viewport[4];
-	LDObject* removedObject = null;
-	
-	// Clear the selection if we do not wish to add to it.
-	if (!m_addpick) {
-		std::vector<LDObject*> oldsel = g_win->sel ();
-		g_win->sel ().clear ();
-		
-		// Recompile the prior selection to remove the highlight color
-		for (LDObject* obj : oldsel)
-			recompileObject (obj);
-	}
-	
-	m_picking = true;
-	
-	// Paint the picking scene
-	glDisable (GL_DITHER);
-	glClearColor (1.0f, 1.0f, 1.0f, 1.0f);
-	drawGLScene ();
-	
-	glGetIntegerv (GL_VIEWPORT, viewport);
-	
-	short x0 = mouseX,
-		y0 = mouseY;
-	short x1, y1;
-	
-	// Determine how big an area to read - with range picking, we pick by
-	// the area given, with single pixel picking, we use an 1 x 1 area.
-	if (m_rangepick) {
-		x1 = m_rangeStart.x ();
-		y1 = m_rangeStart.y ();
-	} else {
-		x1 = x0 + 1;
-		y1 = y0 + 1;
-	}
-	
-	// x0 and y0 must be less than x1 and y1, respectively.
-	if (x0 > x1)
-		dataswap (x0, x1);
-	
-	if (y0 > y1)
-		dataswap (y0, y1);
-	
-	// Clamp the values to ensure they're within bounds
-	x0 = max<short> (0, x0);
-	y0 = max<short> (0, y0);
-	x1 = min<short> (x1, m_width);
-	y1 = min<short> (y1, m_height);
-	
-	const short areawidth = (x1 - x0);
-	const short areaheight = (y1 - y0);
-	const long numpixels = areawidth * areaheight;
-	
-	// Allocate space for the pixel data.
-	uchar* const pixeldata = new uchar[4 * numpixels];
-	uchar* pixelptr = &pixeldata[0];
-	
-	assert (viewport[3] == m_height);
-	
-	// Read pixels from the color buffer.
-	glReadPixels (x0, viewport[3] - y1, areawidth, areaheight, GL_RGBA, GL_UNSIGNED_BYTE, pixeldata);
-	
-	// Go through each pixel read and add them to the selection.
-	for (long i = 0; i < numpixels; ++i) {
-		uint32 idx =
-			(*(pixelptr) * 0x10000) +
-			(*(pixelptr + 1) * 0x00100) +
-			(*(pixelptr + 2) * 0x00001);
-		pixelptr += 4;
-		
-		if (idx == 0xFFFFFF)
-			continue; // White is background; skip
-		
-		LDObject* obj = g_curfile->object (idx);
-		
-		// If this is an additive single pick and the object is currently selected,
-		// we remove it from selection instead.
-		if (!m_rangepick && m_addpick) {
-			bool removed = false;
-			
-			for (ulong i = 0; i < g_win->sel ().size(); ++i) {
-				if (g_win->sel ()[i] == obj) {
-					g_win->sel ().erase (g_win->sel ().begin () + i);
-					removedObject = obj;
-					removed = true;
-				}
-			}
-			
-			if (removed)
-				break;
-		}
-		
-		g_win->sel ().push_back (obj);
-	}
-	
-	delete[] pixeldata;
-	
-	// Remove duplicate entries. For this to be effective, the vector must be
-	// sorted first.
-	std::vector<LDObject*>& sel = g_win->sel ();
-	std::sort (sel.begin(), sel.end ());
-	std::vector<LDObject*>::iterator pos = std::unique (sel.begin (), sel.end ());
-	sel.resize (std::distance (sel.begin (), pos));
-	
-	// Update everything now.
-	g_win->buildObjList ();
-	
-	m_picking = false;
-	m_rangepick = false;
-	glEnable (GL_DITHER);
-	
-	setBackground ();
-	updateSelFlash ();
-	
-	for (LDObject* obj : g_win->sel ())
-		recompileObject (obj);
-	
-	if (removedObject != null)
-		recompileObject (removedObject);
-	
-	drawGLScene ();
-	swapBuffers ();
-	update ();
-}
-
-// =============================================================================
-void GLRenderer::beginPlaneDraw () {
-	if (m_camera == Free)
-		return; // Cannot draw with the free camera
-	
-	m_planeDraw = true;
-	
-	// Disable the context menu - we need the right mouse button
-	// for removing vertices.
-	setContextMenuPolicy (Qt::NoContextMenu);
-	
-	// Use the crosshair cursor when plane drawing.
-	setCursor (Qt::CrossCursor);
-	
-	// Clear the selection when beginning to draw onto a plane.
-	// FIXME: make the selection clearing stuff in ::pick a method and use it
-	// here! This code doesn't update the GL lists.
-	g_win->sel ().clear ();
-	g_win->updateSelection ();
-	update ();
-}
-
-// =============================================================================
-void GLRenderer::endPlaneDraw (bool accept) {
-	// If we accepted, clean the selection and create the object
-	if (accept) {
-		vector<vertex>& verts = m_planeDrawVerts;
-		LDObject* obj = null;
-		
-		switch (verts.size ()) {
-		case 1:
-			{
-				// 1 vertex - add a vertex object
-				obj = new LDVertex;
-				static_cast<LDVertex*> (obj)->vPosition = verts[0];
-				obj->dColor = maincolor;
-			}
-			break;
-		
-		case 2:
-			{
-				// 2 verts - make a line
-				obj = new LDLine;
-				obj->dColor = edgecolor;
-				for (ushort i = 0; i < 2; ++i)
-					obj->vaCoords[i] = verts[i];
-			}
-			break;
-			
-		case 3:
-		case 4:
-			{
-				obj = (verts.size () == 3) ?
-					static_cast<LDObject*> (new LDTriangle) :
-					static_cast<LDObject*> (new LDQuad);
-				
-				obj->dColor = maincolor;
-				for (ushort i = 0; i < obj->vertices (); ++i)
-					obj->vaCoords[i] = verts[i];
-			}
-			break;
-		}
-		
-		if (obj) {
-			g_curfile->addObject (obj);
-			recompileObject (obj);
-			g_win->refresh ();
-			
-			History::addEntry (new AddHistory ({(ulong) obj->getIndex (g_curfile)}, {obj->clone ()}));
-		}
-	}
-	
-	m_planeDraw = false;
-	m_planeDrawVerts.clear ();
-	
-	unsetCursor ();
-	
-	// Restore the context menu
-	setContextMenuPolicy (Qt::DefaultContextMenu);
-	
-	update ();
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
-void GLRenderer::recompileObject (LDObject* obj) {
-	// Replace the old list with the new one.
-	GLuint uList = glGenLists (1);
-	glNewList (uList, GL_COMPILE);
-	
-	compileOneObject (obj);
-	
-	glEndList ();
-	obj->uGLList = uList;
-}
-
-// =============================================================================
-uchar* GLRenderer::screencap (ushort& w, ushort& h) {
-	w = m_width;
-	h = m_height;
-	uchar* cap = new uchar[4 * w * h];
-	
-	m_screencap = true;
-	update ();
-	m_screencap = false;
-	
-	// Capture the pixels
-	glReadPixels (0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, cap);
-	
-	// Restore the background
-	setBackground ();
-	
-	return cap;
-}
-
-// =============================================================================
-void GLRenderer::slot_timerUpdate () {
-	++g_pulseTick %= g_numPulseTicks;
-	
-	for (LDObject* obj : g_win->sel ())
-		recompileObject (obj);
-	
-	update ();
-}
-
-// =============================================================================
-void GLRenderer::slot_toolTipTimer () {
-	// We come here if the cursor has stayed in one place for longer than a
-	// a second. Check if we're holding it over a camera icon - if so, draw
-	// a tooltip.
-	for (CameraIcon& icon : g_CameraIcons) {
-		if (icon.destRect.contains (m_pos)) {
-			m_toolTipCamera = icon.cam;
-			m_drawToolTip = true;
-			update ();
-			break;
-		}
-	}
-}
\ No newline at end of file