# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1380255289 -10800
# Node ID 44a20d72f3a6073e3e5d48e79a9738acad3940fb
# Parent  0e31f2c3f29dd03e349186bea4e32c7fc56bacfd# Parent  f5fdefbb7a1dd5ad715c55e02bf0a1fadbce4a41
merged

diff -r 0e31f2c3f29d -r 44a20d72f3a6 .clang_complete
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.clang_complete	Fri Sep 27 07:14:49 2013 +0300
@@ -0,0 +1,3 @@
+-Isrc
+-Ilibs/openctm
+-Ilibs/tinyxml2
diff -r 0e31f2c3f29d -r 44a20d72f3a6 .hgignore
--- a/.hgignore	Fri Sep 27 07:14:27 2013 +0300
+++ b/.hgignore	Fri Sep 27 07:14:49 2013 +0300
@@ -10,3 +10,7 @@
 x64/
 \.tlog$
 ^tags$
+\.xml$
+\.ctm$
+goatprim$
+goatview$
diff -r 0e31f2c3f29d -r 44a20d72f3a6 Makefile
--- a/Makefile	Fri Sep 27 07:14:27 2013 +0300
+++ b/Makefile	Fri Sep 27 07:14:49 2013 +0300
@@ -9,9 +9,10 @@
 dep = $(obj:.o=.d)
 
 openctm = libs/openctm/libopenctm.a
+tinyxml2 = libs/tinyxml2/libtinyxml2.a
 
-extinc = -Ilibs/openctm
-extlibs = $(openctm)
+extinc = -Ilibs/openctm -Ilibs/tinyxml2
+extlibs = $(openctm) $(tinyxml2)
 
 name = goat3d
 so_major = 0
@@ -48,6 +49,9 @@
 $(openctm):
 	$(MAKE) -C libs/openctm
 
+$(tinyxml2):
+	$(MAKE) -C libs/tinyxml2
+
 -include $(dep)
 
 %.d: %.cc
diff -r 0e31f2c3f29d -r 44a20d72f3a6 doc/goatanimfmt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/goatanimfmt	Fri Sep 27 07:14:49 2013 +0300
@@ -0,0 +1,3 @@
+goat3d animation file format
+----------------------------
+TODO
diff -r 0e31f2c3f29d -r 44a20d72f3a6 generators/goatprim/main.c
--- a/generators/goatprim/main.c	Fri Sep 27 07:14:27 2013 +0300
+++ b/generators/goatprim/main.c	Fri Sep 27 07:14:49 2013 +0300
@@ -1,78 +1,346 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
 #include "goat3d.h"
 
-static struct goat3d_mesh *create_box(void);
+#define DEF_USUB		16
+#define DEF_VSUB		8
+#define DEF_SIZE		1.0
+#define DEF_OUTER		0.25
+#define DEF_DIFFUSE_R	0.6
+#define DEF_DIFFUSE_G	0.6
+#define DEF_DIFFUSE_B	0.6
+#define DEF_SPECULAR_R	0.8
+#define DEF_SPECULAR_G	0.8
+#define DEF_SPECULAR_B	0.8
+#define DEF_SHININESS	60.0
 
-int main(void)
+enum { BOX, SPHERE, TORUS };
+
+void gen_box(struct goat3d_mesh *mesh, float size);
+void gen_sphere(struct goat3d_mesh *mesh, float rad, int usub, int vsub);
+void gen_sphere_part(struct goat3d_mesh *mesh, float rad, int usub, int vsub, float umax, float vmax);
+void gen_torus(struct goat3d_mesh *mesh, float inner, float outer, int usub, int vsub);
+void gen_torus_part(struct goat3d_mesh *mesh, float inner, float outer,
+		int usub, int vsub, float umax, float vmin, float vmax);
+
+
+int main(int argc, char **argv)
 {
+	int i, prim = BOX;
+	int usub = DEF_USUB;
+	int vsub = DEF_VSUB;
+	float size = DEF_SIZE;
+	float outer = DEF_OUTER;
+	float diffuse[] = {DEF_DIFFUSE_R, DEF_DIFFUSE_G, DEF_DIFFUSE_B, 1.0};
+	float specular[] = {DEF_SPECULAR_R, DEF_SPECULAR_G, DEF_SPECULAR_B, 1.0};
+	float shininess = DEF_SHININESS;
 	struct goat3d *goat;
 	struct goat3d_material *mtl;
 	struct goat3d_mesh *mesh;
+	const char *fname = 0;
+
+	for(i=1; i<argc; i++) {
+		if(strcmp(argv[i], "-box") == 0) {
+			prim = BOX;
+
+		} else if(strcmp(argv[i], "-sphere") == 0) {
+			prim = SPHERE;
+
+		} else if(strcmp(argv[i], "-torus") == 0) {
+			prim = TORUS;
+
+		} else if(strcmp(argv[i], "-rad") == 0 || strcmp(argv[i], "-size") == 0
+				|| strcmp(argv[i], "-inner") == 0) {
+			if((size = atof(argv[++i])) == 0.0) {
+				fprintf(stderr, "invalid size\n");
+				return 1;
+			}
+
+		} else if(strcmp(argv[i], "-outer") == 0) {
+			if((outer = atof(argv[++i])) == 0.0) {
+				fprintf(stderr, "invalid outer radius\n");
+				return 1;
+			}
+
+		} else if(strcmp(argv[i], "-usub") == 0) {
+			if(!(usub = atoi(argv[++i]))) {
+				fprintf(stderr, "invalid usub\n");
+				return 1;
+			}
+
+		} else if(strcmp(argv[i], "-vsub") == 0) {
+			if(!(vsub = atoi(argv[++i]))) {
+				fprintf(stderr, "invalid vsub\n");
+				return 1;
+			}
+
+		} else if(strcmp(argv[i], "-diffuse") == 0) {
+			if(!argv[i + 1] || !argv[i + 2] || !argv[i + 3]) {
+				fprintf(stderr, "-diffuse must be followed by 3 numbers (r, g, b)\n");
+				return 1;
+			}
+			diffuse[0] = atof(argv[++i]);
+			diffuse[1] = atof(argv[++i]);
+			diffuse[2] = atof(argv[++i]);
+
+		} else if(strcmp(argv[i], "-specular") == 0) {
+			if(!argv[i + 1] || !argv[i + 2] || !argv[i + 3]) {
+				fprintf(stderr, "-specular must be followed by 3 numbers (r, g, b)\n");
+				return 1;
+			}
+			specular[0] = atof(argv[++i]);
+			specular[1] = atof(argv[++i]);
+			specular[2] = atof(argv[++i]);
+
+		} else if(strcmp(argv[i], "-shininess") == 0) {
+			if(!argv[i + 1]) {
+				fprintf(stderr, "-shininess must be followed by a number\n");
+				return 1;
+			}
+			shininess = atof(argv[++i]);
+
+		} else if(strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-help") == 0) {
+			printf("Usage: %s [filename] [options]\n", argv[0]);
+			printf("Options:\n");
+			printf(" -box          create box (default)\n");
+			printf(" -sphere       create sphere\n");
+			printf(" -torus        create torus\n");
+			printf(" -size <n>, -rad <n>, -inner <n> (default: %g)\n", DEF_SIZE);
+			printf(" -outer <n>    torus outer radius (default: %g)\n", DEF_OUTER);
+			printf(" -usub <n>     subdivisions along the horizontal direction (default: %d)\n", DEF_USUB);
+			printf(" -vsub <n>     subdivisions along the vertical direction (default: %d)\n", DEF_VSUB);
+			printf(" -diffuse <r> <g> <b>    material diffuse color (default: %g %g %g)\n", DEF_DIFFUSE_R, DEF_DIFFUSE_G, DEF_DIFFUSE_B);
+			printf(" -specular <r> <g> <b>   material specular color (default: %g %g %g)\n", DEF_SPECULAR_R, DEF_SPECULAR_G, DEF_SPECULAR_B);
+			printf(" -shininess <n>          material shininess (default: %g)\n", DEF_SHININESS);
+			printf(" -h, -help     print usage information and exit\n");
+			return 0;
+
+		} else {
+			if(fname) {
+				fprintf(stderr, "unexpected argument: %s\n", argv[i]);
+				return 1;
+			}
+			fname = argv[i];
+		}
+	}
+
+	if(!fname) {
+		fname = "out.xml";
+	}
 
 	goat = goat3d_create();
+	goat3d_set_name(goat, fname);
 
 	mtl = goat3d_create_mtl();
 	goat3d_set_mtl_name(mtl, "mat");
-	goat3d_set_mtl_attrib4f(mtl, GOAT3D_MAT_ATTR_DIFFUSE, 1, 0, 0, 1);
+	goat3d_set_mtl_attrib(mtl, GOAT3D_MAT_ATTR_DIFFUSE, diffuse);
+	goat3d_set_mtl_attrib(mtl, GOAT3D_MAT_ATTR_SPECULAR, specular);
+	goat3d_set_mtl_attrib1f(mtl, GOAT3D_MAT_ATTR_SHININESS, shininess);
 	goat3d_add_mtl(goat, mtl);
 
-	mesh = create_box();
+	mesh = goat3d_create_mesh();
+
+	switch(prim) {
+	case BOX:
+		gen_box(mesh, size);
+		break;
+
+	case SPHERE:
+		gen_sphere(mesh, size, usub, vsub);
+		break;
+
+	case TORUS:
+		gen_torus(mesh, size, outer, usub, vsub);
+		break;
+
+	default:
+		return 1;
+	}
+	goat3d_set_mesh_mtl(mesh, mtl);
 	goat3d_add_mesh(goat, mesh);
 
 	goat3d_setopt(goat, GOAT3D_OPT_SAVEXML, 1);
-	goat3d_save(goat, "foo.xml");
+	goat3d_save(goat, fname);
 
 	goat3d_free(goat);
 	return 0;
 }
 
-static struct goat3d_mesh *create_box(void)
+void gen_box(struct goat3d_mesh *mesh, float size)
 {
-	struct goat3d_mesh *mesh = goat3d_create_mesh();
+	float hsz = size / 2.0;
 
 	goat3d_begin(mesh, GOAT3D_QUADS);
 	// +X
 	goat3d_normal3f(1, 0, 0);
-	goat3d_vertex3f(-1, -1, 1);
-	goat3d_vertex3f(-1, -1, -1);
-	goat3d_vertex3f(-1, 1, -1);
-	goat3d_vertex3f(-1, 1, 1);
+	goat3d_texcoord2f(0, 0);
+	goat3d_vertex3f(hsz, -hsz, hsz);
+	goat3d_texcoord2f(1, 0);
+	goat3d_vertex3f(hsz, -hsz, -hsz);
+	goat3d_texcoord2f(1, 1);
+	goat3d_vertex3f(hsz, hsz, -hsz);
+	goat3d_texcoord2f(0, 1);
+	goat3d_vertex3f(hsz, hsz, hsz);
 
 	// -X
 	goat3d_normal3f(-1, 0, 0);
-	goat3d_vertex3f(-1, -1, -1);
-	goat3d_vertex3f(-1, -1, 1);
-	goat3d_vertex3f(-1, 1, 1);
-	goat3d_vertex3f(-1, 1, -1);
+	goat3d_texcoord2f(0, 0);
+	goat3d_vertex3f(-hsz, -hsz, -hsz);
+	goat3d_texcoord2f(1, 0);
+	goat3d_vertex3f(-hsz, -hsz, hsz);
+	goat3d_texcoord2f(1, 1);
+	goat3d_vertex3f(-hsz, hsz, hsz);
+	goat3d_texcoord2f(0, 1);
+	goat3d_vertex3f(-hsz, hsz, -hsz);
 
 	// +Y
 	goat3d_normal3f(0, 1, 0);
-	goat3d_vertex3f(-1, 1, 1);
-	goat3d_vertex3f(1, 1, 1);
-	goat3d_vertex3f(1, 1, -1);
-	goat3d_vertex3f(-1, 1, -1);
+	goat3d_texcoord2f(0, 0);
+	goat3d_vertex3f(-hsz, hsz, hsz);
+	goat3d_texcoord2f(1, 0);
+	goat3d_vertex3f(hsz, hsz, hsz);
+	goat3d_texcoord2f(1, 1);
+	goat3d_vertex3f(hsz, hsz, -hsz);
+	goat3d_texcoord2f(0, 1);
+	goat3d_vertex3f(-hsz, hsz, -hsz);
 
 	// -Y
 	goat3d_normal3f(0, -1, 0);
-	goat3d_vertex3f(-1, -1, -1);
-	goat3d_vertex3f(1, -1, -1);
-	goat3d_vertex3f(1, -1, 1);
-	goat3d_vertex3f(-1, -1, 1);
+	goat3d_texcoord2f(0, 0);
+	goat3d_vertex3f(-hsz, -hsz, -hsz);
+	goat3d_texcoord2f(1, 0);
+	goat3d_vertex3f(hsz, -hsz, -hsz);
+	goat3d_texcoord2f(1, 1);
+	goat3d_vertex3f(hsz, -hsz, hsz);
+	goat3d_texcoord2f(0, 1);
+	goat3d_vertex3f(-hsz, -hsz, hsz);
 
 	// +Z
 	goat3d_normal3f(0, 0, 1);
-	goat3d_vertex3f(-1, -1, 1);
-	goat3d_vertex3f(1, -1, 1);
-	goat3d_vertex3f(1, -1, 1);
-	goat3d_vertex3f(-1, -1, 1);
+	goat3d_texcoord2f(0, 0);
+	goat3d_vertex3f(-hsz, -hsz, hsz);
+	goat3d_texcoord2f(1, 0);
+	goat3d_vertex3f(hsz, -hsz, hsz);
+	goat3d_texcoord2f(1, 1);
+	goat3d_vertex3f(hsz, hsz, hsz);
+	goat3d_texcoord2f(0, 1);
+	goat3d_vertex3f(-hsz, hsz, hsz);
 
 	// -Z
 	goat3d_normal3f(0, 0, -1);
-	goat3d_vertex3f(-1, -1, 1);
-	goat3d_vertex3f(1, -1, 1);
-	goat3d_vertex3f(1, -1, -1);
-	goat3d_vertex3f(-1, -1, -1);
+	goat3d_texcoord2f(0, 0);
+	goat3d_vertex3f(hsz, -hsz, -hsz);
+	goat3d_texcoord2f(1, 0);
+	goat3d_vertex3f(-hsz, -hsz, -hsz);
+	goat3d_texcoord2f(1, 1);
+	goat3d_vertex3f(-hsz, hsz, -hsz);
+	goat3d_texcoord2f(0, 1);
+	goat3d_vertex3f(hsz, hsz, -hsz);
 	goat3d_end();
+}
 
-	return mesh;
+void gen_sphere(struct goat3d_mesh *mesh, float rad, int usub, int vsub)
+{
+	gen_sphere_part(mesh, rad, usub, vsub, 1.0, 1.0);
 }
+
+#define sphere_vertex(u, v) \
+	do { \
+		float x, y, z, theta, phi; \
+		float costheta, sinphi; \
+		theta = (u) * 2.0 * M_PI; \
+		phi = (v) * M_PI; \
+		costheta = cos(theta); \
+		sinphi = sin(phi); \
+		x = costheta * sinphi; \
+		y = cos(phi); \
+		z = sin(theta) * sinphi; \
+		goat3d_normal3f(x, y, z); \
+		goat3d_texcoord2f(u, v); \
+		goat3d_vertex3f(rad * x, rad * y, rad * z); \
+	} while(0)
+
+void gen_sphere_part(struct goat3d_mesh *mesh, float rad, int usub, int vsub, float umax, float vmax)
+{
+	int i, j;
+	float u, v, du, dv;
+
+	if(usub < 3) usub = 3;
+	if(vsub < 3) vsub = 3;
+
+	du = umax / (float)usub;
+	dv = vmax / (float)vsub;
+
+	goat3d_begin(mesh, GOAT3D_QUADS);
+
+	u = 0.0;
+	for(i=0; i<usub; i++) {
+		v = 0.0;
+		for(j=0; j<vsub; j++) {
+			sphere_vertex(u, v);
+			sphere_vertex(u + du, v);
+			sphere_vertex(u + du, v + dv);
+			sphere_vertex(u, v + dv);
+			v += dv;
+		}
+		u += du;
+	}
+	goat3d_end();
+}
+
+
+void gen_torus(struct goat3d_mesh *mesh, float inner, float outer, int usub, int vsub)
+{
+	gen_torus_part(mesh, inner, outer, usub, vsub, 1.0, 0.0, 1.0);
+}
+
+#define torus_vertex(u, v) \
+	do { \
+		float rx, ry, rz, cx, cy, cz, theta, phi; \
+		float costheta, sintheta, sinphi; \
+		theta = (u) * 2.0 * M_PI; \
+		phi = (v) * 2.0 * M_PI; \
+		costheta = cos(theta); \
+		sintheta = sin(theta); \
+		sinphi = sin(phi); \
+		cx = costheta * inner; \
+		cy = 0.0f; \
+		cz = sintheta * inner; \
+		rx = costheta * sinphi; \
+		ry = cos(phi); \
+		rz = sintheta * sinphi; \
+		goat3d_normal3f(rx, ry, rz); \
+		goat3d_texcoord2f(u, v); \
+		goat3d_vertex3f(outer * rx + cx, outer * ry + cy, outer * rz + cz); \
+	} while(0)
+
+void gen_torus_part(struct goat3d_mesh *mesh, float inner, float outer,
+		int usub, int vsub, float umax, float vmin, float vmax)
+{
+	int i, j;
+	float u, v, du, dv;
+
+	if(usub < 3) usub = 3;
+	if(vsub < 3) vsub = 3;
+
+	du = umax / (float)usub;
+	dv = (vmax - vmin) / (float)vsub;
+
+	goat3d_begin(mesh, GOAT3D_QUADS);
+
+	u = 0.0;
+	for(i=0; i<usub; i++) {
+		v = vmin;
+		for(j=0; j<vsub; j++) {
+			torus_vertex(u, v);
+			torus_vertex(u + du, v);
+			torus_vertex(u + du, v + dv);
+			torus_vertex(u, v + dv);
+			v += dv;
+		}
+		u += du;
+	}
+	goat3d_end();
+}
diff -r 0e31f2c3f29d -r 44a20d72f3a6 goatview/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/goatview/Makefile	Fri Sep 27 07:14:49 2013 +0300
@@ -0,0 +1,34 @@
+src = $(wildcard src/*.c)
+obj = $(src:.c=.o)
+dep = $(obj:.o=.d)
+bin = goatview
+
+goat_root = ..
+libgoat = $(goat_root)/libgoat3d.so.0.1
+
+CC = clang
+CPP = clang -E
+CFLAGS = -pedantic -Wall -g -I$(goat_root)/src
+LDFLAGS = $(libgoat) -Wl,-rpath=$(goat_root) $(libgl)
+
+ifeq ($(shell uname -s), Darwin)
+	libgl = -framework OpenGL -framework GLUT -lGLEW
+else
+	libgl = -lGL -lGLU -lglut -lGLEW
+endif
+
+$(bin): $(obj) $(libgoat)
+	$(CC) -o $@ $(obj) $(LDFLAGS)
+
+-include $(dep)
+
+%.d: %.c
+	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
+
+.PHONY: clean
+clean:
+	rm -f $(obj) $(bin)
+
+.PHONY: cleandep
+cleandep:
+	rm -f $(dep)
diff -r 0e31f2c3f29d -r 44a20d72f3a6 goatview/src/main.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/goatview/src/main.c	Fri Sep 27 07:14:49 2013 +0300
@@ -0,0 +1,208 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#ifndef __APPLE__
+#include <GL/glut.h>
+#else
+#include <GLUT/glut.h>
+#endif
+#include "goat3d.h"
+
+static void cleanup(void);
+static void disp(void);
+static void draw_scene(struct goat3d *g);
+static void draw_mesh(struct goat3d_mesh *mesh);
+static void reshape(int x, int y);
+static void keyb(unsigned char key, int x, int y);
+static void mouse(int bn, int st, int x, int y);
+static void motion(int x, int y);
+
+static struct goat3d *goat;
+static float cam_theta, cam_phi, cam_dist = 10;
+
+int main(int argc, char **argv)
+{
+	glutInitWindowSize(800, 600);
+	glutInit(&argc, argv);
+
+	if(!argv[1]) {
+		fprintf(stderr, "you must specify a goat3d scene file to open\n");
+		return 1;
+	}
+
+	if(!(goat = goat3d_create())) {
+		fprintf(stderr, "failed to create goat3d\n");
+		return 1;
+	}
+	if(goat3d_load(goat, argv[1]) == -1) {
+		fprintf(stderr, "failed to load goat3d scene: %s\n", argv[1]);
+		goat3d_free(goat);
+		return 1;
+	}
+
+	glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
+	glutCreateWindow(argv[1]);
+
+	glutDisplayFunc(disp);
+	glutReshapeFunc(reshape);
+	glutKeyboardFunc(keyb);
+	glutMouseFunc(mouse);
+	glutMotionFunc(motion);
+
+	glEnable(GL_DEPTH_TEST);
+	glEnable(GL_CULL_FACE);
+	glEnable(GL_LIGHTING);
+	glEnable(GL_LIGHT0);
+
+	glClearColor(0.1, 0.1, 0.1, 1.0);
+
+	atexit(cleanup);
+
+	glutMainLoop();
+	return 0;
+}
+
+static void cleanup(void)
+{
+	goat3d_free(goat);
+}
+
+static void disp(void)
+{
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+	glTranslatef(0, 0, -cam_dist);
+	glRotatef(cam_phi, 1, 0, 0);
+	glRotatef(cam_theta, 0, 1, 0);
+
+	draw_scene(goat);
+
+	glutSwapBuffers();
+	assert(glGetError() == GL_NO_ERROR);
+}
+
+static void draw_scene(struct goat3d *g)
+{
+	int i, num_meshes;
+
+	num_meshes = goat3d_get_mesh_count(g);
+	for(i=0; i<num_meshes; i++) {
+		struct goat3d_mesh *mesh = goat3d_get_mesh(g, i);
+		draw_mesh(mesh);
+	}
+}
+
+static void draw_mesh(struct goat3d_mesh *mesh)
+{
+	int vnum, fnum;
+	struct goat3d_material *mtl;
+	float *verts, *normals, *texcoords;
+	int *vidx;
+
+	if((mtl = goat3d_get_mesh_mtl(mesh))) {
+		float white[] = {1, 1, 1, 1};
+		float black[] = {0, 0, 0, 0};
+		float zero = 0.0;
+		const float *diffuse, *specular, *shininess;
+
+		if(!(diffuse = goat3d_get_mtl_attrib(mtl, GOAT3D_MAT_ATTR_DIFFUSE))) {
+			diffuse = white;
+		}
+		if(!(specular = goat3d_get_mtl_attrib(mtl, GOAT3D_MAT_ATTR_SPECULAR))) {
+			specular = black;
+		}
+		if(!(shininess = goat3d_get_mtl_attrib(mtl, GOAT3D_MAT_ATTR_SHININESS))) {
+			shininess = &zero;
+		}
+
+		glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, diffuse);
+		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular);
+		glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, *shininess);
+	}
+
+	vnum = goat3d_get_mesh_attrib_count(mesh, GOAT3D_MESH_ATTR_VERTEX);
+	fnum = goat3d_get_mesh_face_count(mesh);
+
+	if(!vnum || !fnum) {
+		return;
+	}
+
+	verts = goat3d_get_mesh_attribs(mesh, GOAT3D_MESH_ATTR_VERTEX);
+	normals = goat3d_get_mesh_attribs(mesh, GOAT3D_MESH_ATTR_NORMAL);
+	texcoords = goat3d_get_mesh_attribs(mesh, GOAT3D_MESH_ATTR_TEXCOORD);
+	vidx = goat3d_get_mesh_faces(mesh);
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glVertexPointer(3, GL_FLOAT, 0, verts);
+
+	if(normals) {
+		glEnableClientState(GL_NORMAL_ARRAY);
+		glNormalPointer(GL_FLOAT, 0, normals);
+	}
+	if(texcoords) {
+		glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+		glTexCoordPointer(2, GL_FLOAT, 0, texcoords);
+	}
+
+	glDrawElements(GL_TRIANGLES, fnum * 3, GL_UNSIGNED_INT, vidx);
+
+	glDisableClientState(GL_VERTEX_ARRAY);
+	if(normals) {
+		glDisableClientState(GL_NORMAL_ARRAY);
+	}
+	if(texcoords) {
+		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+	}
+}
+
+static void reshape(int x, int y)
+{
+	glViewport(0, 0, x, y);
+
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	gluPerspective(50.0, (float)x / (float)y, 0.5, 1000.0);
+}
+
+static void keyb(unsigned char key, int x, int y)
+{
+	switch(key) {
+	case 27:
+		exit(0);
+	}
+}
+
+static int bnstate[32];
+static int prev_x, prev_y;
+
+static void mouse(int bn, int st, int x, int y)
+{
+	bnstate[bn - GLUT_LEFT_BUTTON] = (st == GLUT_DOWN);
+	prev_x = x;
+	prev_y = y;
+}
+
+static void motion(int x, int y)
+{
+	int dx = x - prev_x;
+	int dy = y - prev_y;
+	prev_x = x;
+	prev_y = y;
+
+	if(bnstate[0]) {
+		cam_theta += dx * 0.5;
+		cam_phi += dy * 0.5;
+
+		if(cam_phi < -90) cam_phi = -90;
+		if(cam_phi > 90) cam_phi = 90;
+		glutPostRedisplay();
+	}
+	if(bnstate[2]) {
+		cam_dist += dy * 0.1;
+
+		if(cam_dist < 0) cam_dist = 0;
+		glutPostRedisplay();
+	}
+}
diff -r 0e31f2c3f29d -r 44a20d72f3a6 libs/tinyxml2/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libs/tinyxml2/Makefile	Fri Sep 27 07:14:49 2013 +0300
@@ -0,0 +1,15 @@
+obj = tinyxml2.o
+lib = libtinyxml2.a
+
+ifneq ($(shell uname -s), Darwin)
+	pic = -fPIC
+endif
+
+CXXFLAGS = -pedantic -Wall -g $(pic)
+
+$(lib): $(obj)
+	$(AR) rcs $@ $(obj)
+
+.PHONY: clean
+clean:
+	rm -f $(obj) $(lib)
diff -r 0e31f2c3f29d -r 44a20d72f3a6 libs/tinyxml2/tinyxml2.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libs/tinyxml2/tinyxml2.cpp	Fri Sep 27 07:14:49 2013 +0300
@@ -0,0 +1,2101 @@
+/*
+Original code by Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+#include "tinyxml2.h"
+
+#include <new>		// yes, this one new style header, is in the Android SDK.
+#   ifdef ANDROID_NDK
+#   include <stddef.h>
+#else
+#   include <cstddef>
+#endif
+
+static const char LINE_FEED				= (char)0x0a;			// all line endings are normalized to LF
+static const char LF = LINE_FEED;
+static const char CARRIAGE_RETURN		= (char)0x0d;			// CR gets filtered out
+static const char CR = CARRIAGE_RETURN;
+static const char SINGLE_QUOTE			= '\'';
+static const char DOUBLE_QUOTE			= '\"';
+
+// Bunch of unicode info at:
+//		http://www.unicode.org/faq/utf_bom.html
+//	ef bb bf (Microsoft "lead bytes") - designates UTF-8
+
+static const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
+static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
+static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
+
+
+#define DELETE_NODE( node )	{			\
+        if ( node ) {						\
+            MemPool* pool = node->_memPool;	\
+            node->~XMLNode();				\
+            pool->Free( node );				\
+        }									\
+    }
+#define DELETE_ATTRIBUTE( attrib ) {		\
+        if ( attrib ) {							\
+            MemPool* pool = attrib->_memPool;	\
+            attrib->~XMLAttribute();			\
+            pool->Free( attrib );				\
+        }										\
+    }
+
+namespace tinyxml2
+{
+
+struct Entity {
+    const char* pattern;
+    int length;
+    char value;
+};
+
+static const int NUM_ENTITIES = 5;
+static const Entity entities[NUM_ENTITIES] = {
+    { "quot", 4,	DOUBLE_QUOTE },
+    { "amp", 3,		'&'  },
+    { "apos", 4,	SINGLE_QUOTE },
+    { "lt",	2, 		'<'	 },
+    { "gt",	2,		'>'	 }
+};
+
+
+StrPair::~StrPair()
+{
+    Reset();
+}
+
+
+void StrPair::Reset()
+{
+    if ( _flags & NEEDS_DELETE ) {
+        delete [] _start;
+    }
+    _flags = 0;
+    _start = 0;
+    _end = 0;
+}
+
+
+void StrPair::SetStr( const char* str, int flags )
+{
+    Reset();
+    size_t len = strlen( str );
+    _start = new char[ len+1 ];
+    memcpy( _start, str, len+1 );
+    _end = _start + len;
+    _flags = flags | NEEDS_DELETE;
+}
+
+
+char* StrPair::ParseText( char* p, const char* endTag, int strFlags )
+{
+    TIXMLASSERT( endTag && *endTag );
+
+    char* start = p;	// fixme: hides a member
+    char  endChar = *endTag;
+    size_t length = strlen( endTag );
+
+    // Inner loop of text parsing.
+    while ( *p ) {
+        if ( *p == endChar && strncmp( p, endTag, length ) == 0 ) {
+            Set( start, p, strFlags );
+            return p + length;
+        }
+        ++p;
+    }
+    return 0;
+}
+
+
+char* StrPair::ParseName( char* p )
+{
+    char* start = p;
+
+    if ( !start || !(*start) ) {
+        return 0;
+    }
+
+    while( *p && ( p == start ? XMLUtil::IsNameStartChar( *p ) : XMLUtil::IsNameChar( *p ) )) {
+        ++p;
+    }
+
+    if ( p > start ) {
+        Set( start, p, 0 );
+        return p;
+    }
+    return 0;
+}
+
+
+void StrPair::CollapseWhitespace()
+{
+    // Trim leading space.
+    _start = XMLUtil::SkipWhiteSpace( _start );
+
+    if ( _start && *_start ) {
+        char* p = _start;	// the read pointer
+        char* q = _start;	// the write pointer
+
+        while( *p ) {
+            if ( XMLUtil::IsWhiteSpace( *p )) {
+                p = XMLUtil::SkipWhiteSpace( p );
+                if ( *p == 0 ) {
+                    break;    // don't write to q; this trims the trailing space.
+                }
+                *q = ' ';
+                ++q;
+            }
+            *q = *p;
+            ++q;
+            ++p;
+        }
+        *q = 0;
+    }
+}
+
+
+const char* StrPair::GetStr()
+{
+    if ( _flags & NEEDS_FLUSH ) {
+        *_end = 0;
+        _flags ^= NEEDS_FLUSH;
+
+        if ( _flags ) {
+            char* p = _start;	// the read pointer
+            char* q = _start;	// the write pointer
+
+            while( p < _end ) {
+                if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == CR ) {
+                    // CR-LF pair becomes LF
+                    // CR alone becomes LF
+                    // LF-CR becomes LF
+                    if ( *(p+1) == LF ) {
+                        p += 2;
+                    }
+                    else {
+                        ++p;
+                    }
+                    *q++ = LF;
+                }
+                else if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == LF ) {
+                    if ( *(p+1) == CR ) {
+                        p += 2;
+                    }
+                    else {
+                        ++p;
+                    }
+                    *q++ = LF;
+                }
+                else if ( (_flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) {
+                    // Entities handled by tinyXML2:
+                    // - special entities in the entity table [in/out]
+                    // - numeric character reference [in]
+                    //   &#20013; or &#x4e2d;
+
+                    if ( *(p+1) == '#' ) {
+                        char buf[10] = { 0 };
+                        int len;
+                        p = const_cast<char*>( XMLUtil::GetCharacterRef( p, buf, &len ) );
+                        for( int i=0; i<len; ++i ) {
+                            *q++ = buf[i];
+                        }
+                        TIXMLASSERT( q <= p );
+                    }
+                    else {
+                        int i=0;
+                        for(; i<NUM_ENTITIES; ++i ) {
+                            if (    strncmp( p+1, entities[i].pattern, entities[i].length ) == 0
+                                    && *(p+entities[i].length+1) == ';' ) {
+                                // Found an entity convert;
+                                *q = entities[i].value;
+                                ++q;
+                                p += entities[i].length + 2;
+                                break;
+                            }
+                        }
+                        if ( i == NUM_ENTITIES ) {
+                            // fixme: treat as error?
+                            ++p;
+                            ++q;
+                        }
+                    }
+                }
+                else {
+                    *q = *p;
+                    ++p;
+                    ++q;
+                }
+            }
+            *q = 0;
+        }
+        // The loop below has plenty going on, and this
+        // is a less useful mode. Break it out.
+        if ( _flags & COLLAPSE_WHITESPACE ) {
+            CollapseWhitespace();
+        }
+        _flags = (_flags & NEEDS_DELETE);
+    }
+    return _start;
+}
+
+
+
+
+// --------- XMLUtil ----------- //
+
+const char* XMLUtil::ReadBOM( const char* p, bool* bom )
+{
+    *bom = false;
+    const unsigned char* pu = reinterpret_cast<const unsigned char*>(p);
+    // Check for BOM:
+    if (    *(pu+0) == TIXML_UTF_LEAD_0
+            && *(pu+1) == TIXML_UTF_LEAD_1
+            && *(pu+2) == TIXML_UTF_LEAD_2 ) {
+        *bom = true;
+        p += 3;
+    }
+    return p;
+}
+
+
+void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length )
+{
+    const unsigned long BYTE_MASK = 0xBF;
+    const unsigned long BYTE_MARK = 0x80;
+    const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+    if (input < 0x80) {
+        *length = 1;
+    }
+    else if ( input < 0x800 ) {
+        *length = 2;
+    }
+    else if ( input < 0x10000 ) {
+        *length = 3;
+    }
+    else if ( input < 0x200000 ) {
+        *length = 4;
+    }
+    else {
+        *length = 0;    // This code won't covert this correctly anyway.
+        return;
+    }
+
+    output += *length;
+
+    // Scary scary fall throughs.
+    switch (*length) {
+        case 4:
+            --output;
+            *output = (char)((input | BYTE_MARK) & BYTE_MASK);
+            input >>= 6;
+        case 3:
+            --output;
+            *output = (char)((input | BYTE_MARK) & BYTE_MASK);
+            input >>= 6;
+        case 2:
+            --output;
+            *output = (char)((input | BYTE_MARK) & BYTE_MASK);
+            input >>= 6;
+        case 1:
+            --output;
+            *output = (char)(input | FIRST_BYTE_MARK[*length]);
+        default:
+            break;
+    }
+}
+
+
+const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
+{
+    // Presume an entity, and pull it out.
+    *length = 0;
+
+    if ( *(p+1) == '#' && *(p+2) ) {
+        unsigned long ucs = 0;
+        ptrdiff_t delta = 0;
+        unsigned mult = 1;
+
+        if ( *(p+2) == 'x' ) {
+            // Hexadecimal.
+            if ( !*(p+3) ) {
+                return 0;
+            }
+
+            const char* q = p+3;
+            q = strchr( q, ';' );
+
+            if ( !q || !*q ) {
+                return 0;
+            }
+
+            delta = q-p;
+            --q;
+
+            while ( *q != 'x' ) {
+                if ( *q >= '0' && *q <= '9' ) {
+                    ucs += mult * (*q - '0');
+                }
+                else if ( *q >= 'a' && *q <= 'f' ) {
+                    ucs += mult * (*q - 'a' + 10);
+                }
+                else if ( *q >= 'A' && *q <= 'F' ) {
+                    ucs += mult * (*q - 'A' + 10 );
+                }
+                else {
+                    return 0;
+                }
+                mult *= 16;
+                --q;
+            }
+        }
+        else {
+            // Decimal.
+            if ( !*(p+2) ) {
+                return 0;
+            }
+
+            const char* q = p+2;
+            q = strchr( q, ';' );
+
+            if ( !q || !*q ) {
+                return 0;
+            }
+
+            delta = q-p;
+            --q;
+
+            while ( *q != '#' ) {
+                if ( *q >= '0' && *q <= '9' ) {
+                    ucs += mult * (*q - '0');
+                }
+                else {
+                    return 0;
+                }
+                mult *= 10;
+                --q;
+            }
+        }
+        // convert the UCS to UTF-8
+        ConvertUTF32ToUTF8( ucs, value, length );
+        return p + delta + 1;
+    }
+    return p+1;
+}
+
+
+void XMLUtil::ToStr( int v, char* buffer, int bufferSize )
+{
+    TIXML_SNPRINTF( buffer, bufferSize, "%d", v );
+}
+
+
+void XMLUtil::ToStr( unsigned v, char* buffer, int bufferSize )
+{
+    TIXML_SNPRINTF( buffer, bufferSize, "%u", v );
+}
+
+
+void XMLUtil::ToStr( bool v, char* buffer, int bufferSize )
+{
+    TIXML_SNPRINTF( buffer, bufferSize, "%d", v ? 1 : 0 );
+}
+
+
+void XMLUtil::ToStr( float v, char* buffer, int bufferSize )
+{
+    TIXML_SNPRINTF( buffer, bufferSize, "%f", v );
+}
+
+
+void XMLUtil::ToStr( double v, char* buffer, int bufferSize )
+{
+    TIXML_SNPRINTF( buffer, bufferSize, "%f", v );
+}
+
+
+bool XMLUtil::ToInt( const char* str, int* value )
+{
+    if ( TIXML_SSCANF( str, "%d", value ) == 1 ) {
+        return true;
+    }
+    return false;
+}
+
+bool XMLUtil::ToUnsigned( const char* str, unsigned *value )
+{
+    if ( TIXML_SSCANF( str, "%u", value ) == 1 ) {
+        return true;
+    }
+    return false;
+}
+
+bool XMLUtil::ToBool( const char* str, bool* value )
+{
+    int ival = 0;
+    if ( ToInt( str, &ival )) {
+        *value = (ival==0) ? false : true;
+        return true;
+    }
+    if ( StringEqual( str, "true" ) ) {
+        *value = true;
+        return true;
+    }
+    else if ( StringEqual( str, "false" ) ) {
+        *value = false;
+        return true;
+    }
+    return false;
+}
+
+
+bool XMLUtil::ToFloat( const char* str, float* value )
+{
+    if ( TIXML_SSCANF( str, "%f", value ) == 1 ) {
+        return true;
+    }
+    return false;
+}
+
+bool XMLUtil::ToDouble( const char* str, double* value )
+{
+    if ( TIXML_SSCANF( str, "%lf", value ) == 1 ) {
+        return true;
+    }
+    return false;
+}
+
+
+char* XMLDocument::Identify( char* p, XMLNode** node )
+{
+    XMLNode* returnNode = 0;
+    char* start = p;
+    p = XMLUtil::SkipWhiteSpace( p );
+    if( !p || !*p ) {
+        return p;
+    }
+
+    // What is this thing?
+    // - Elements start with a letter or underscore, but xml is reserved.
+    // - Comments: <!--
+    // - Declaration: <?
+    // - Everything else is unknown to tinyxml.
+    //
+
+    static const char* xmlHeader		= { "<?" };
+    static const char* commentHeader	= { "<!--" };
+    static const char* dtdHeader		= { "<!" };
+    static const char* cdataHeader		= { "<![CDATA[" };
+    static const char* elementHeader	= { "<" };	// and a header for everything else; check last.
+
+    static const int xmlHeaderLen		= 2;
+    static const int commentHeaderLen	= 4;
+    static const int dtdHeaderLen		= 2;
+    static const int cdataHeaderLen		= 9;
+    static const int elementHeaderLen	= 1;
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable : 4127 )
+#endif
+    TIXMLASSERT( sizeof( XMLComment ) == sizeof( XMLUnknown ) );		// use same memory pool
+    TIXMLASSERT( sizeof( XMLComment ) == sizeof( XMLDeclaration ) );	// use same memory pool
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+    if ( XMLUtil::StringEqual( p, xmlHeader, xmlHeaderLen ) ) {
+        returnNode = new (_commentPool.Alloc()) XMLDeclaration( this );
+        returnNode->_memPool = &_commentPool;
+        p += xmlHeaderLen;
+    }
+    else if ( XMLUtil::StringEqual( p, commentHeader, commentHeaderLen ) ) {
+        returnNode = new (_commentPool.Alloc()) XMLComment( this );
+        returnNode->_memPool = &_commentPool;
+        p += commentHeaderLen;
+    }
+    else if ( XMLUtil::StringEqual( p, cdataHeader, cdataHeaderLen ) ) {
+        XMLText* text = new (_textPool.Alloc()) XMLText( this );
+        returnNode = text;
+        returnNode->_memPool = &_textPool;
+        p += cdataHeaderLen;
+        text->SetCData( true );
+    }
+    else if ( XMLUtil::StringEqual( p, dtdHeader, dtdHeaderLen ) ) {
+        returnNode = new (_commentPool.Alloc()) XMLUnknown( this );
+        returnNode->_memPool = &_commentPool;
+        p += dtdHeaderLen;
+    }
+    else if ( XMLUtil::StringEqual( p, elementHeader, elementHeaderLen ) ) {
+        returnNode = new (_elementPool.Alloc()) XMLElement( this );
+        returnNode->_memPool = &_elementPool;
+        p += elementHeaderLen;
+    }
+    else {
+        returnNode = new (_textPool.Alloc()) XMLText( this );
+        returnNode->_memPool = &_textPool;
+        p = start;	// Back it up, all the text counts.
+    }
+
+    *node = returnNode;
+    return p;
+}
+
+
+bool XMLDocument::Accept( XMLVisitor* visitor ) const
+{
+    if ( visitor->VisitEnter( *this ) ) {
+        for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) {
+            if ( !node->Accept( visitor ) ) {
+                break;
+            }
+        }
+    }
+    return visitor->VisitExit( *this );
+}
+
+
+// --------- XMLNode ----------- //
+
+XMLNode::XMLNode( XMLDocument* doc ) :
+    _document( doc ),
+    _parent( 0 ),
+    _firstChild( 0 ), _lastChild( 0 ),
+    _prev( 0 ), _next( 0 ),
+    _memPool( 0 )
+{
+}
+
+
+XMLNode::~XMLNode()
+{
+    DeleteChildren();
+    if ( _parent ) {
+        _parent->Unlink( this );
+    }
+}
+
+
+void XMLNode::SetValue( const char* str, bool staticMem )
+{
+    if ( staticMem ) {
+        _value.SetInternedStr( str );
+    }
+    else {
+        _value.SetStr( str );
+    }
+}
+
+
+void XMLNode::DeleteChildren()
+{
+    while( _firstChild ) {
+        XMLNode* node = _firstChild;
+        Unlink( node );
+
+        DELETE_NODE( node );
+    }
+    _firstChild = _lastChild = 0;
+}
+
+
+void XMLNode::Unlink( XMLNode* child )
+{
+    TIXMLASSERT( child->_parent == this );
+    if ( child == _firstChild ) {
+        _firstChild = _firstChild->_next;
+    }
+    if ( child == _lastChild ) {
+        _lastChild = _lastChild->_prev;
+    }
+
+    if ( child->_prev ) {
+        child->_prev->_next = child->_next;
+    }
+    if ( child->_next ) {
+        child->_next->_prev = child->_prev;
+    }
+    child->_parent = 0;
+}
+
+
+void XMLNode::DeleteChild( XMLNode* node )
+{
+    TIXMLASSERT( node->_parent == this );
+    DELETE_NODE( node );
+}
+
+
+XMLNode* XMLNode::InsertEndChild( XMLNode* addThis )
+{
+    if ( _lastChild ) {
+        TIXMLASSERT( _firstChild );
+        TIXMLASSERT( _lastChild->_next == 0 );
+        _lastChild->_next = addThis;
+        addThis->_prev = _lastChild;
+        _lastChild = addThis;
+
+        addThis->_next = 0;
+    }
+    else {
+        TIXMLASSERT( _firstChild == 0 );
+        _firstChild = _lastChild = addThis;
+
+        addThis->_prev = 0;
+        addThis->_next = 0;
+    }
+    addThis->_parent = this;
+    addThis->_memPool->SetTracked();
+    return addThis;
+}
+
+
+XMLNode* XMLNode::InsertFirstChild( XMLNode* addThis )
+{
+    if ( _firstChild ) {
+        TIXMLASSERT( _lastChild );
+        TIXMLASSERT( _firstChild->_prev == 0 );
+
+        _firstChild->_prev = addThis;
+        addThis->_next = _firstChild;
+        _firstChild = addThis;
+
+        addThis->_prev = 0;
+    }
+    else {
+        TIXMLASSERT( _lastChild == 0 );
+        _firstChild = _lastChild = addThis;
+
+        addThis->_prev = 0;
+        addThis->_next = 0;
+    }
+    addThis->_parent = this;
+    addThis->_memPool->SetTracked();
+    return addThis;
+}
+
+
+XMLNode* XMLNode::InsertAfterChild( XMLNode* afterThis, XMLNode* addThis )
+{
+    TIXMLASSERT( afterThis->_parent == this );
+    if ( afterThis->_parent != this ) {
+        return 0;
+    }
+
+    if ( afterThis->_next == 0 ) {
+        // The last node or the only node.
+        return InsertEndChild( addThis );
+    }
+    addThis->_prev = afterThis;
+    addThis->_next = afterThis->_next;
+    afterThis->_next->_prev = addThis;
+    afterThis->_next = addThis;
+    addThis->_parent = this;
+    addThis->_memPool->SetTracked();
+    return addThis;
+}
+
+
+
+
+const XMLElement* XMLNode::FirstChildElement( const char* value ) const
+{
+    for( XMLNode* node=_firstChild; node; node=node->_next ) {
+        XMLElement* element = node->ToElement();
+        if ( element ) {
+            if ( !value || XMLUtil::StringEqual( element->Name(), value ) ) {
+                return element;
+            }
+        }
+    }
+    return 0;
+}
+
+
+const XMLElement* XMLNode::LastChildElement( const char* value ) const
+{
+    for( XMLNode* node=_lastChild; node; node=node->_prev ) {
+        XMLElement* element = node->ToElement();
+        if ( element ) {
+            if ( !value || XMLUtil::StringEqual( element->Name(), value ) ) {
+                return element;
+            }
+        }
+    }
+    return 0;
+}
+
+
+const XMLElement* XMLNode::NextSiblingElement( const char* value ) const
+{
+    for( XMLNode* element=this->_next; element; element = element->_next ) {
+        if (    element->ToElement()
+                && (!value || XMLUtil::StringEqual( value, element->Value() ))) {
+            return element->ToElement();
+        }
+    }
+    return 0;
+}
+
+
+const XMLElement* XMLNode::PreviousSiblingElement( const char* value ) const
+{
+    for( XMLNode* element=_prev; element; element = element->_prev ) {
+        if (    element->ToElement()
+                && (!value || XMLUtil::StringEqual( value, element->Value() ))) {
+            return element->ToElement();
+        }
+    }
+    return 0;
+}
+
+
+char* XMLNode::ParseDeep( char* p, StrPair* parentEnd )
+{
+    // This is a recursive method, but thinking about it "at the current level"
+    // it is a pretty simple flat list:
+    //		<foo/>
+    //		<!-- comment -->
+    //
+    // With a special case:
+    //		<foo>
+    //		</foo>
+    //		<!-- comment -->
+    //
+    // Where the closing element (/foo) *must* be the next thing after the opening
+    // element, and the names must match. BUT the tricky bit is that the closing
+    // element will be read by the child.
+    //
+    // 'endTag' is the end tag for this node, it is returned by a call to a child.
+    // 'parentEnd' is the end tag for the parent, which is filled in and returned.
+
+    while( p && *p ) {
+        XMLNode* node = 0;
+
+        p = _document->Identify( p, &node );
+        if ( p == 0 || node == 0 ) {
+            break;
+        }
+
+        StrPair endTag;
+        p = node->ParseDeep( p, &endTag );
+        if ( !p ) {
+            DELETE_NODE( node );
+            node = 0;
+            if ( !_document->Error() ) {
+                _document->SetError( XML_ERROR_PARSING, 0, 0 );
+            }
+            break;
+        }
+
+        // We read the end tag. Return it to the parent.
+        if ( node->ToElement() && node->ToElement()->ClosingType() == XMLElement::CLOSING ) {
+            if ( parentEnd ) {
+                *parentEnd = static_cast<XMLElement*>(node)->_value;
+            }
+			node->_memPool->SetTracked();	// created and then immediately deleted.
+            DELETE_NODE( node );
+            return p;
+        }
+
+        // Handle an end tag returned to this level.
+        // And handle a bunch of annoying errors.
+        XMLElement* ele = node->ToElement();
+        if ( ele ) {
+            if ( endTag.Empty() && ele->ClosingType() == XMLElement::OPEN ) {
+                _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
+                p = 0;
+            }
+            else if ( !endTag.Empty() && ele->ClosingType() != XMLElement::OPEN ) {
+                _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
+                p = 0;
+            }
+            else if ( !endTag.Empty() ) {
+                if ( !XMLUtil::StringEqual( endTag.GetStr(), node->Value() )) {
+                    _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
+                    p = 0;
+                }
+            }
+        }
+        if ( p == 0 ) {
+            DELETE_NODE( node );
+            node = 0;
+        }
+        if ( node ) {
+            this->InsertEndChild( node );
+        }
+    }
+    return 0;
+}
+
+// --------- XMLText ---------- //
+char* XMLText::ParseDeep( char* p, StrPair* )
+{
+    const char* start = p;
+    if ( this->CData() ) {
+        p = _value.ParseText( p, "]]>", StrPair::NEEDS_NEWLINE_NORMALIZATION );
+        if ( !p ) {
+            _document->SetError( XML_ERROR_PARSING_CDATA, start, 0 );
+        }
+        return p;
+    }
+    else {
+        int flags = _document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES;
+        if ( _document->WhitespaceMode() == COLLAPSE_WHITESPACE ) {
+            flags |= StrPair::COLLAPSE_WHITESPACE;
+        }
+
+        p = _value.ParseText( p, "<", flags );
+        if ( !p ) {
+            _document->SetError( XML_ERROR_PARSING_TEXT, start, 0 );
+        }
+        if ( p && *p ) {
+            return p-1;
+        }
+    }
+    return 0;
+}
+
+
+XMLNode* XMLText::ShallowClone( XMLDocument* doc ) const
+{
+    if ( !doc ) {
+        doc = _document;
+    }
+    XMLText* text = doc->NewText( Value() );	// fixme: this will always allocate memory. Intern?
+    text->SetCData( this->CData() );
+    return text;
+}
+
+
+bool XMLText::ShallowEqual( const XMLNode* compare ) const
+{
+    return ( compare->ToText() && XMLUtil::StringEqual( compare->ToText()->Value(), Value() ));
+}
+
+
+bool XMLText::Accept( XMLVisitor* visitor ) const
+{
+    return visitor->Visit( *this );
+}
+
+
+// --------- XMLComment ---------- //
+
+XMLComment::XMLComment( XMLDocument* doc ) : XMLNode( doc )
+{
+}
+
+
+XMLComment::~XMLComment()
+{
+}
+
+
+char* XMLComment::ParseDeep( char* p, StrPair* )
+{
+    // Comment parses as text.
+    const char* start = p;
+    p = _value.ParseText( p, "-->", StrPair::COMMENT );
+    if ( p == 0 ) {
+        _document->SetError( XML_ERROR_PARSING_COMMENT, start, 0 );
+    }
+    return p;
+}
+
+
+XMLNode* XMLComment::ShallowClone( XMLDocument* doc ) const
+{
+    if ( !doc ) {
+        doc = _document;
+    }
+    XMLComment* comment = doc->NewComment( Value() );	// fixme: this will always allocate memory. Intern?
+    return comment;
+}
+
+
+bool XMLComment::ShallowEqual( const XMLNode* compare ) const
+{
+    return ( compare->ToComment() && XMLUtil::StringEqual( compare->ToComment()->Value(), Value() ));
+}
+
+
+bool XMLComment::Accept( XMLVisitor* visitor ) const
+{
+    return visitor->Visit( *this );
+}
+
+
+// --------- XMLDeclaration ---------- //
+
+XMLDeclaration::XMLDeclaration( XMLDocument* doc ) : XMLNode( doc )
+{
+}
+
+
+XMLDeclaration::~XMLDeclaration()
+{
+    //printf( "~XMLDeclaration\n" );
+}
+
+
+char* XMLDeclaration::ParseDeep( char* p, StrPair* )
+{
+    // Declaration parses as text.
+    const char* start = p;
+    p = _value.ParseText( p, "?>", StrPair::NEEDS_NEWLINE_NORMALIZATION );
+    if ( p == 0 ) {
+        _document->SetError( XML_ERROR_PARSING_DECLARATION, start, 0 );
+    }
+    return p;
+}
+
+
+XMLNode* XMLDeclaration::ShallowClone( XMLDocument* doc ) const
+{
+    if ( !doc ) {
+        doc = _document;
+    }
+    XMLDeclaration* dec = doc->NewDeclaration( Value() );	// fixme: this will always allocate memory. Intern?
+    return dec;
+}
+
+
+bool XMLDeclaration::ShallowEqual( const XMLNode* compare ) const
+{
+    return ( compare->ToDeclaration() && XMLUtil::StringEqual( compare->ToDeclaration()->Value(), Value() ));
+}
+
+
+
+bool XMLDeclaration::Accept( XMLVisitor* visitor ) const
+{
+    return visitor->Visit( *this );
+}
+
+// --------- XMLUnknown ---------- //
+
+XMLUnknown::XMLUnknown( XMLDocument* doc ) : XMLNode( doc )
+{
+}
+
+
+XMLUnknown::~XMLUnknown()
+{
+}
+
+
+char* XMLUnknown::ParseDeep( char* p, StrPair* )
+{
+    // Unknown parses as text.
+    const char* start = p;
+
+    p = _value.ParseText( p, ">", StrPair::NEEDS_NEWLINE_NORMALIZATION );
+    if ( !p ) {
+        _document->SetError( XML_ERROR_PARSING_UNKNOWN, start, 0 );
+    }
+    return p;
+}
+
+
+XMLNode* XMLUnknown::ShallowClone( XMLDocument* doc ) const
+{
+    if ( !doc ) {
+        doc = _document;
+    }
+    XMLUnknown* text = doc->NewUnknown( Value() );	// fixme: this will always allocate memory. Intern?
+    return text;
+}
+
+
+bool XMLUnknown::ShallowEqual( const XMLNode* compare ) const
+{
+    return ( compare->ToUnknown() && XMLUtil::StringEqual( compare->ToUnknown()->Value(), Value() ));
+}
+
+
+bool XMLUnknown::Accept( XMLVisitor* visitor ) const
+{
+    return visitor->Visit( *this );
+}
+
+// --------- XMLAttribute ---------- //
+char* XMLAttribute::ParseDeep( char* p, bool processEntities )
+{
+    // Parse using the name rules: bug fix, was using ParseText before
+    p = _name.ParseName( p );
+    if ( !p || !*p ) {
+        return 0;
+    }
+
+    // Skip white space before =
+    p = XMLUtil::SkipWhiteSpace( p );
+    if ( !p || *p != '=' ) {
+        return 0;
+    }
+
+    ++p;	// move up to opening quote
+    p = XMLUtil::SkipWhiteSpace( p );
+    if ( *p != '\"' && *p != '\'' ) {
+        return 0;
+    }
+
+    char endTag[2] = { *p, 0 };
+    ++p;	// move past opening quote
+
+    p = _value.ParseText( p, endTag, processEntities ? StrPair::ATTRIBUTE_VALUE : StrPair::ATTRIBUTE_VALUE_LEAVE_ENTITIES );
+    return p;
+}
+
+
+void XMLAttribute::SetName( const char* n )
+{
+    _name.SetStr( n );
+}
+
+
+XMLError XMLAttribute::QueryIntValue( int* value ) const
+{
+    if ( XMLUtil::ToInt( Value(), value )) {
+        return XML_NO_ERROR;
+    }
+    return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+XMLError XMLAttribute::QueryUnsignedValue( unsigned int* value ) const
+{
+    if ( XMLUtil::ToUnsigned( Value(), value )) {
+        return XML_NO_ERROR;
+    }
+    return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+XMLError XMLAttribute::QueryBoolValue( bool* value ) const
+{
+    if ( XMLUtil::ToBool( Value(), value )) {
+        return XML_NO_ERROR;
+    }
+    return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+XMLError XMLAttribute::QueryFloatValue( float* value ) const
+{
+    if ( XMLUtil::ToFloat( Value(), value )) {
+        return XML_NO_ERROR;
+    }
+    return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+XMLError XMLAttribute::QueryDoubleValue( double* value ) const
+{
+    if ( XMLUtil::ToDouble( Value(), value )) {
+        return XML_NO_ERROR;
+    }
+    return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+void XMLAttribute::SetAttribute( const char* v )
+{
+    _value.SetStr( v );
+}
+
+
+void XMLAttribute::SetAttribute( int v )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( v, buf, BUF_SIZE );
+    _value.SetStr( buf );
+}
+
+
+void XMLAttribute::SetAttribute( unsigned v )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( v, buf, BUF_SIZE );
+    _value.SetStr( buf );
+}
+
+
+void XMLAttribute::SetAttribute( bool v )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( v, buf, BUF_SIZE );
+    _value.SetStr( buf );
+}
+
+void XMLAttribute::SetAttribute( double v )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( v, buf, BUF_SIZE );
+    _value.SetStr( buf );
+}
+
+void XMLAttribute::SetAttribute( float v )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( v, buf, BUF_SIZE );
+    _value.SetStr( buf );
+}
+
+
+// --------- XMLElement ---------- //
+XMLElement::XMLElement( XMLDocument* doc ) : XMLNode( doc ),
+    _closingType( 0 ),
+    _rootAttribute( 0 )
+{
+}
+
+
+XMLElement::~XMLElement()
+{
+    while( _rootAttribute ) {
+        XMLAttribute* next = _rootAttribute->_next;
+        DELETE_ATTRIBUTE( _rootAttribute );
+        _rootAttribute = next;
+    }
+}
+
+
+XMLAttribute* XMLElement::FindAttribute( const char* name )
+{
+    XMLAttribute* a = 0;
+    for( a=_rootAttribute; a; a = a->_next ) {
+        if ( XMLUtil::StringEqual( a->Name(), name ) ) {
+            return a;
+        }
+    }
+    return 0;
+}
+
+
+const XMLAttribute* XMLElement::FindAttribute( const char* name ) const
+{
+    XMLAttribute* a = 0;
+    for( a=_rootAttribute; a; a = a->_next ) {
+        if ( XMLUtil::StringEqual( a->Name(), name ) ) {
+            return a;
+        }
+    }
+    return 0;
+}
+
+
+const char* XMLElement::Attribute( const char* name, const char* value ) const
+{
+    const XMLAttribute* a = FindAttribute( name );
+    if ( !a ) {
+        return 0;
+    }
+    if ( !value || XMLUtil::StringEqual( a->Value(), value )) {
+        return a->Value();
+    }
+    return 0;
+}
+
+
+const char* XMLElement::GetText() const
+{
+    if ( FirstChild() && FirstChild()->ToText() ) {
+        return FirstChild()->ToText()->Value();
+    }
+    return 0;
+}
+
+
+XMLError XMLElement::QueryIntText( int* ival ) const
+{
+    if ( FirstChild() && FirstChild()->ToText() ) {
+        const char* t = FirstChild()->ToText()->Value();
+        if ( XMLUtil::ToInt( t, ival ) ) {
+            return XML_SUCCESS;
+        }
+        return XML_CAN_NOT_CONVERT_TEXT;
+    }
+    return XML_NO_TEXT_NODE;
+}
+
+
+XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const
+{
+    if ( FirstChild() && FirstChild()->ToText() ) {
+        const char* t = FirstChild()->ToText()->Value();
+        if ( XMLUtil::ToUnsigned( t, uval ) ) {
+            return XML_SUCCESS;
+        }
+        return XML_CAN_NOT_CONVERT_TEXT;
+    }
+    return XML_NO_TEXT_NODE;
+}
+
+
+XMLError XMLElement::QueryBoolText( bool* bval ) const
+{
+    if ( FirstChild() && FirstChild()->ToText() ) {
+        const char* t = FirstChild()->ToText()->Value();
+        if ( XMLUtil::ToBool( t, bval ) ) {
+            return XML_SUCCESS;
+        }
+        return XML_CAN_NOT_CONVERT_TEXT;
+    }
+    return XML_NO_TEXT_NODE;
+}
+
+
+XMLError XMLElement::QueryDoubleText( double* dval ) const
+{
+    if ( FirstChild() && FirstChild()->ToText() ) {
+        const char* t = FirstChild()->ToText()->Value();
+        if ( XMLUtil::ToDouble( t, dval ) ) {
+            return XML_SUCCESS;
+        }
+        return XML_CAN_NOT_CONVERT_TEXT;
+    }
+    return XML_NO_TEXT_NODE;
+}
+
+
+XMLError XMLElement::QueryFloatText( float* fval ) const
+{
+    if ( FirstChild() && FirstChild()->ToText() ) {
+        const char* t = FirstChild()->ToText()->Value();
+        if ( XMLUtil::ToFloat( t, fval ) ) {
+            return XML_SUCCESS;
+        }
+        return XML_CAN_NOT_CONVERT_TEXT;
+    }
+    return XML_NO_TEXT_NODE;
+}
+
+
+
+XMLAttribute* XMLElement::FindOrCreateAttribute( const char* name )
+{
+    XMLAttribute* last = 0;
+    XMLAttribute* attrib = 0;
+    for( attrib = _rootAttribute;
+            attrib;
+            last = attrib, attrib = attrib->_next ) {
+        if ( XMLUtil::StringEqual( attrib->Name(), name ) ) {
+            break;
+        }
+    }
+    if ( !attrib ) {
+        attrib = new (_document->_attributePool.Alloc() ) XMLAttribute();
+        attrib->_memPool = &_document->_attributePool;
+        if ( last ) {
+            last->_next = attrib;
+        }
+        else {
+            _rootAttribute = attrib;
+        }
+        attrib->SetName( name );
+        attrib->_memPool->SetTracked(); // always created and linked.
+    }
+    return attrib;
+}
+
+
+void XMLElement::DeleteAttribute( const char* name )
+{
+    XMLAttribute* prev = 0;
+    for( XMLAttribute* a=_rootAttribute; a; a=a->_next ) {
+        if ( XMLUtil::StringEqual( name, a->Name() ) ) {
+            if ( prev ) {
+                prev->_next = a->_next;
+            }
+            else {
+                _rootAttribute = a->_next;
+            }
+            DELETE_ATTRIBUTE( a );
+            break;
+        }
+        prev = a;
+    }
+}
+
+
+char* XMLElement::ParseAttributes( char* p )
+{
+    const char* start = p;
+    XMLAttribute* prevAttribute = 0;
+
+    // Read the attributes.
+    while( p ) {
+        p = XMLUtil::SkipWhiteSpace( p );
+        if ( !p || !(*p) ) {
+            _document->SetError( XML_ERROR_PARSING_ELEMENT, start, Name() );
+            return 0;
+        }
+
+        // attribute.
+        if (XMLUtil::IsNameStartChar( *p ) ) {
+            XMLAttribute* attrib = new (_document->_attributePool.Alloc() ) XMLAttribute();
+            attrib->_memPool = &_document->_attributePool;
+			attrib->_memPool->SetTracked();
+
+            p = attrib->ParseDeep( p, _document->ProcessEntities() );
+            if ( !p || Attribute( attrib->Name() ) ) {
+                DELETE_ATTRIBUTE( attrib );
+                _document->SetError( XML_ERROR_PARSING_ATTRIBUTE, start, p );
+                return 0;
+            }
+            // There is a minor bug here: if the attribute in the source xml
+            // document is duplicated, it will not be detected and the
+            // attribute will be doubly added. However, tracking the 'prevAttribute'
+            // avoids re-scanning the attribute list. Preferring performance for
+            // now, may reconsider in the future.
+            if ( prevAttribute ) {
+                prevAttribute->_next = attrib;
+            }
+            else {
+                _rootAttribute = attrib;
+            }
+            prevAttribute = attrib;
+        }
+        // end of the tag
+        else if ( *p == '/' && *(p+1) == '>' ) {
+            _closingType = CLOSED;
+            return p+2;	// done; sealed element.
+        }
+        // end of the tag
+        else if ( *p == '>' ) {
+            ++p;
+            break;
+        }
+        else {
+            _document->SetError( XML_ERROR_PARSING_ELEMENT, start, p );
+            return 0;
+        }
+    }
+    return p;
+}
+
+
+//
+//	<ele></ele>
+//	<ele>foo<b>bar</b></ele>
+//
+char* XMLElement::ParseDeep( char* p, StrPair* strPair )
+{
+    // Read the element name.
+    p = XMLUtil::SkipWhiteSpace( p );
+    if ( !p ) {
+        return 0;
+    }
+
+    // The closing element is the </element> form. It is
+    // parsed just like a regular element then deleted from
+    // the DOM.
+    if ( *p == '/' ) {
+        _closingType = CLOSING;
+        ++p;
+    }
+
+    p = _value.ParseName( p );
+    if ( _value.Empty() ) {
+        return 0;
+    }
+
+    p = ParseAttributes( p );
+    if ( !p || !*p || _closingType ) {
+        return p;
+    }
+
+    p = XMLNode::ParseDeep( p, strPair );
+    return p;
+}
+
+
+
+XMLNode* XMLElement::ShallowClone( XMLDocument* doc ) const
+{
+    if ( !doc ) {
+        doc = _document;
+    }
+    XMLElement* element = doc->NewElement( Value() );					// fixme: this will always allocate memory. Intern?
+    for( const XMLAttribute* a=FirstAttribute(); a; a=a->Next() ) {
+        element->SetAttribute( a->Name(), a->Value() );					// fixme: this will always allocate memory. Intern?
+    }
+    return element;
+}
+
+
+bool XMLElement::ShallowEqual( const XMLNode* compare ) const
+{
+    const XMLElement* other = compare->ToElement();
+    if ( other && XMLUtil::StringEqual( other->Value(), Value() )) {
+
+        const XMLAttribute* a=FirstAttribute();
+        const XMLAttribute* b=other->FirstAttribute();
+
+        while ( a && b ) {
+            if ( !XMLUtil::StringEqual( a->Value(), b->Value() ) ) {
+                return false;
+            }
+            a = a->Next();
+            b = b->Next();
+        }
+        if ( a || b ) {
+            // different count
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
+
+
+bool XMLElement::Accept( XMLVisitor* visitor ) const
+{
+    if ( visitor->VisitEnter( *this, _rootAttribute ) ) {
+        for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) {
+            if ( !node->Accept( visitor ) ) {
+                break;
+            }
+        }
+    }
+    return visitor->VisitExit( *this );
+}
+
+
+// --------- XMLDocument ----------- //
+XMLDocument::XMLDocument( bool processEntities, Whitespace whitespace ) :
+    XMLNode( 0 ),
+    _writeBOM( false ),
+    _processEntities( processEntities ),
+    _errorID( XML_NO_ERROR ),
+    _whitespace( whitespace ),
+    _errorStr1( 0 ),
+    _errorStr2( 0 ),
+    _charBuffer( 0 )
+{
+    _document = this;	// avoid warning about 'this' in initializer list
+}
+
+
+XMLDocument::~XMLDocument()
+{
+    DeleteChildren();
+    delete [] _charBuffer;
+
+#if 0
+    _textPool.Trace( "text" );
+    _elementPool.Trace( "element" );
+    _commentPool.Trace( "comment" );
+    _attributePool.Trace( "attribute" );
+#endif
+
+#ifdef DEBUG
+	if ( Error() == false ) {
+		TIXMLASSERT( _elementPool.CurrentAllocs()   == _elementPool.Untracked() );
+		TIXMLASSERT( _attributePool.CurrentAllocs() == _attributePool.Untracked() );
+		TIXMLASSERT( _textPool.CurrentAllocs()      == _textPool.Untracked() );
+		TIXMLASSERT( _commentPool.CurrentAllocs()   == _commentPool.Untracked() );
+	}
+#endif
+}
+
+
+void XMLDocument::Clear()
+{
+    DeleteChildren();
+
+    _errorID = XML_NO_ERROR;
+    _errorStr1 = 0;
+    _errorStr2 = 0;
+
+    delete [] _charBuffer;
+    _charBuffer = 0;
+}
+
+
+XMLElement* XMLDocument::NewElement( const char* name )
+{
+    XMLElement* ele = new (_elementPool.Alloc()) XMLElement( this );
+    ele->_memPool = &_elementPool;
+    ele->SetName( name );
+    return ele;
+}
+
+
+XMLComment* XMLDocument::NewComment( const char* str )
+{
+    XMLComment* comment = new (_commentPool.Alloc()) XMLComment( this );
+    comment->_memPool = &_commentPool;
+    comment->SetValue( str );
+    return comment;
+}
+
+
+XMLText* XMLDocument::NewText( const char* str )
+{
+    XMLText* text = new (_textPool.Alloc()) XMLText( this );
+    text->_memPool = &_textPool;
+    text->SetValue( str );
+    return text;
+}
+
+
+XMLDeclaration* XMLDocument::NewDeclaration( const char* str )
+{
+    XMLDeclaration* dec = new (_commentPool.Alloc()) XMLDeclaration( this );
+    dec->_memPool = &_commentPool;
+    dec->SetValue( str ? str : "xml version=\"1.0\" encoding=\"UTF-8\"" );
+    return dec;
+}
+
+
+XMLUnknown* XMLDocument::NewUnknown( const char* str )
+{
+    XMLUnknown* unk = new (_commentPool.Alloc()) XMLUnknown( this );
+    unk->_memPool = &_commentPool;
+    unk->SetValue( str );
+    return unk;
+}
+
+
+XMLError XMLDocument::LoadFile( const char* filename )
+{
+    Clear();
+    FILE* fp = 0;
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+    errno_t err = fopen_s(&fp, filename, "rb" );
+    if ( !fp || err) {
+#else
+    fp = fopen( filename, "rb" );
+    if ( !fp) {
+#endif
+        SetError( XML_ERROR_FILE_NOT_FOUND, filename, 0 );
+        return _errorID;
+    }
+    LoadFile( fp );
+    fclose( fp );
+    return _errorID;
+}
+
+
+XMLError XMLDocument::LoadFile( FILE* fp )
+{
+    Clear();
+
+    fseek( fp, 0, SEEK_END );
+    size_t size = ftell( fp );
+    fseek( fp, 0, SEEK_SET );
+
+    if ( size == 0 ) {
+        SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
+        return _errorID;
+    }
+
+    _charBuffer = new char[size+1];
+    size_t read = fread( _charBuffer, 1, size, fp );
+    if ( read != size ) {
+        SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
+        return _errorID;
+    }
+
+    _charBuffer[size] = 0;
+
+    const char* p = _charBuffer;
+    p = XMLUtil::SkipWhiteSpace( p );
+    p = XMLUtil::ReadBOM( p, &_writeBOM );
+    if ( !p || !*p ) {
+        SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
+        return _errorID;
+    }
+
+    ParseDeep( _charBuffer + (p-_charBuffer), 0 );
+    return _errorID;
+}
+
+
+XMLError XMLDocument::SaveFile( const char* filename, bool compact )
+{
+    FILE* fp = 0;
+#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+    errno_t err = fopen_s(&fp, filename, "w" );
+    if ( !fp || err) {
+#else
+    fp = fopen( filename, "w" );
+    if ( !fp) {
+#endif
+        SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, filename, 0 );
+        return _errorID;
+    }
+    SaveFile(fp, compact);
+    fclose( fp );
+    return _errorID;
+}
+
+
+XMLError XMLDocument::SaveFile( FILE* fp, bool compact )
+{
+    XMLPrinter stream( fp, compact );
+    Print( &stream );
+    return _errorID;
+}
+
+
+XMLError XMLDocument::Parse( const char* p, size_t len )
+{
+	const char* start = p;
+    Clear();
+
+    if ( !p || !*p ) {
+        SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
+        return _errorID;
+    }
+    if ( len == (size_t)(-1) ) {
+        len = strlen( p );
+    }
+    _charBuffer = new char[ len+1 ];
+    memcpy( _charBuffer, p, len );
+    _charBuffer[len] = 0;
+
+    p = XMLUtil::SkipWhiteSpace( p );
+    p = XMLUtil::ReadBOM( p, &_writeBOM );
+    if ( !p || !*p ) {
+        SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
+        return _errorID;
+    }
+
+    ptrdiff_t delta = p - start;	// skip initial whitespace, BOM, etc.
+    ParseDeep( _charBuffer+delta, 0 );
+    return _errorID;
+}
+
+
+void XMLDocument::Print( XMLPrinter* streamer ) const
+{
+    XMLPrinter stdStreamer( stdout );
+    if ( !streamer ) {
+        streamer = &stdStreamer;
+    }
+    Accept( streamer );
+}
+
+
+void XMLDocument::SetError( XMLError error, const char* str1, const char* str2 )
+{
+    _errorID = error;
+    _errorStr1 = str1;
+    _errorStr2 = str2;
+}
+
+
+void XMLDocument::PrintError() const
+{
+    if ( _errorID ) {
+        static const int LEN = 20;
+        char buf1[LEN] = { 0 };
+        char buf2[LEN] = { 0 };
+
+        if ( _errorStr1 ) {
+            TIXML_SNPRINTF( buf1, LEN, "%s", _errorStr1 );
+        }
+        if ( _errorStr2 ) {
+            TIXML_SNPRINTF( buf2, LEN, "%s", _errorStr2 );
+        }
+
+        printf( "XMLDocument error id=%d str1=%s str2=%s\n",
+                _errorID, buf1, buf2 );
+    }
+}
+
+
+XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
+    _elementJustOpened( false ),
+    _firstElement( true ),
+    _fp( file ),
+    _depth( depth ),
+    _textDepth( -1 ),
+    _processEntities( true ),
+    _compactMode( compact )
+{
+    for( int i=0; i<ENTITY_RANGE; ++i ) {
+        _entityFlag[i] = false;
+        _restrictedEntityFlag[i] = false;
+    }
+    for( int i=0; i<NUM_ENTITIES; ++i ) {
+        TIXMLASSERT( entities[i].value < ENTITY_RANGE );
+        if ( entities[i].value < ENTITY_RANGE ) {
+            _entityFlag[ (int)entities[i].value ] = true;
+        }
+    }
+    _restrictedEntityFlag[(int)'&'] = true;
+    _restrictedEntityFlag[(int)'<'] = true;
+    _restrictedEntityFlag[(int)'>'] = true;	// not required, but consistency is nice
+    _buffer.Push( 0 );
+}
+
+
+void XMLPrinter::Print( const char* format, ... )
+{
+    va_list     va;
+    va_start( va, format );
+
+    if ( _fp ) {
+        vfprintf( _fp, format, va );
+    }
+    else {
+        // This seems brutally complex. Haven't figured out a better
+        // way on windows.
+#ifdef _MSC_VER
+        int len = -1;
+        int expand = 1000;
+        while ( len < 0 ) {
+            len = vsnprintf_s( _accumulator.Mem(), _accumulator.Capacity(), _TRUNCATE, format, va );
+            if ( len < 0 ) {
+                expand *= 3/2;
+                _accumulator.PushArr( expand );
+            }
+        }
+        char* p = _buffer.PushArr( len ) - 1;
+        memcpy( p, _accumulator.Mem(), len+1 );
+#else
+        int len = vsnprintf( 0, 0, format, va );
+        // Close out and re-start the va-args
+        va_end( va );
+        va_start( va, format );
+        char* p = _buffer.PushArr( len ) - 1;
+        vsnprintf( p, len+1, format, va );
+#endif
+    }
+    va_end( va );
+}
+
+
+void XMLPrinter::PrintSpace( int depth )
+{
+    for( int i=0; i<depth; ++i ) {
+        Print( "    " );
+    }
+}
+
+
+void XMLPrinter::PrintString( const char* p, bool restricted )
+{
+    // Look for runs of bytes between entities to print.
+    const char* q = p;
+    const bool* flag = restricted ? _restrictedEntityFlag : _entityFlag;
+
+    if ( _processEntities ) {
+        while ( *q ) {
+            // Remember, char is sometimes signed. (How many times has that bitten me?)
+            if ( *q > 0 && *q < ENTITY_RANGE ) {
+                // Check for entities. If one is found, flush
+                // the stream up until the entity, write the
+                // entity, and keep looking.
+                if ( flag[(unsigned)(*q)] ) {
+                    while ( p < q ) {
+                        Print( "%c", *p );
+                        ++p;
+                    }
+                    for( int i=0; i<NUM_ENTITIES; ++i ) {
+                        if ( entities[i].value == *q ) {
+                            Print( "&%s;", entities[i].pattern );
+                            break;
+                        }
+                    }
+                    ++p;
+                }
+            }
+            ++q;
+        }
+    }
+    // Flush the remaining string. This will be the entire
+    // string if an entity wasn't found.
+    if ( !_processEntities || (q-p > 0) ) {
+        Print( "%s", p );
+    }
+}
+
+
+void XMLPrinter::PushHeader( bool writeBOM, bool writeDec )
+{
+    if ( writeBOM ) {
+        static const unsigned char bom[] = { TIXML_UTF_LEAD_0, TIXML_UTF_LEAD_1, TIXML_UTF_LEAD_2, 0 };
+        Print( "%s", bom );
+    }
+    if ( writeDec ) {
+        PushDeclaration( "xml version=\"1.0\"" );
+    }
+}
+
+
+void XMLPrinter::OpenElement( const char* name )
+{
+    if ( _elementJustOpened ) {
+        SealElement();
+    }
+    _stack.Push( name );
+
+    if ( _textDepth < 0 && !_firstElement && !_compactMode ) {
+        Print( "\n" );
+    }
+    if ( !_compactMode ) {
+        PrintSpace( _depth );
+    }
+
+    Print( "<%s", name );
+    _elementJustOpened = true;
+    _firstElement = false;
+    ++_depth;
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, const char* value )
+{
+    TIXMLASSERT( _elementJustOpened );
+    Print( " %s=\"", name );
+    PrintString( value, false );
+    Print( "\"" );
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, int v )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( v, buf, BUF_SIZE );
+    PushAttribute( name, buf );
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, unsigned v )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( v, buf, BUF_SIZE );
+    PushAttribute( name, buf );
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, bool v )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( v, buf, BUF_SIZE );
+    PushAttribute( name, buf );
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, double v )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( v, buf, BUF_SIZE );
+    PushAttribute( name, buf );
+}
+
+
+void XMLPrinter::CloseElement()
+{
+    --_depth;
+    const char* name = _stack.Pop();
+
+    if ( _elementJustOpened ) {
+        Print( "/>" );
+    }
+    else {
+        if ( _textDepth < 0 && !_compactMode) {
+            Print( "\n" );
+            PrintSpace( _depth );
+        }
+        Print( "</%s>", name );
+    }
+
+    if ( _textDepth == _depth ) {
+        _textDepth = -1;
+    }
+    if ( _depth == 0 && !_compactMode) {
+        Print( "\n" );
+    }
+    _elementJustOpened = false;
+}
+
+
+void XMLPrinter::SealElement()
+{
+    _elementJustOpened = false;
+    Print( ">" );
+}
+
+
+void XMLPrinter::PushText( const char* text, bool cdata )
+{
+    _textDepth = _depth-1;
+
+    if ( _elementJustOpened ) {
+        SealElement();
+    }
+    if ( cdata ) {
+        Print( "<![CDATA[" );
+        Print( "%s", text );
+        Print( "]]>" );
+    }
+    else {
+        PrintString( text, true );
+    }
+}
+
+void XMLPrinter::PushText( int value )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( value, buf, BUF_SIZE );
+    PushText( buf, false );
+}
+
+
+void XMLPrinter::PushText( unsigned value )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( value, buf, BUF_SIZE );
+    PushText( buf, false );
+}
+
+
+void XMLPrinter::PushText( bool value )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( value, buf, BUF_SIZE );
+    PushText( buf, false );
+}
+
+
+void XMLPrinter::PushText( float value )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( value, buf, BUF_SIZE );
+    PushText( buf, false );
+}
+
+
+void XMLPrinter::PushText( double value )
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr( value, buf, BUF_SIZE );
+    PushText( buf, false );
+}
+
+
+void XMLPrinter::PushComment( const char* comment )
+{
+    if ( _elementJustOpened ) {
+        SealElement();
+    }
+    if ( _textDepth < 0 && !_firstElement && !_compactMode) {
+        Print( "\n" );
+        PrintSpace( _depth );
+    }
+    _firstElement = false;
+    Print( "<!--%s-->", comment );
+}
+
+
+void XMLPrinter::PushDeclaration( const char* value )
+{
+    if ( _elementJustOpened ) {
+        SealElement();
+    }
+    if ( _textDepth < 0 && !_firstElement && !_compactMode) {
+        Print( "\n" );
+        PrintSpace( _depth );
+    }
+    _firstElement = false;
+    Print( "<?%s?>", value );
+}
+
+
+void XMLPrinter::PushUnknown( const char* value )
+{
+    if ( _elementJustOpened ) {
+        SealElement();
+    }
+    if ( _textDepth < 0 && !_firstElement && !_compactMode) {
+        Print( "\n" );
+        PrintSpace( _depth );
+    }
+    _firstElement = false;
+    Print( "<!%s>", value );
+}
+
+
+bool XMLPrinter::VisitEnter( const XMLDocument& doc )
+{
+    _processEntities = doc.ProcessEntities();
+    if ( doc.HasBOM() ) {
+        PushHeader( true, false );
+    }
+    return true;
+}
+
+
+bool XMLPrinter::VisitEnter( const XMLElement& element, const XMLAttribute* attribute )
+{
+    OpenElement( element.Name() );
+    while ( attribute ) {
+        PushAttribute( attribute->Name(), attribute->Value() );
+        attribute = attribute->Next();
+    }
+    return true;
+}
+
+
+bool XMLPrinter::VisitExit( const XMLElement& )
+{
+    CloseElement();
+    return true;
+}
+
+
+bool XMLPrinter::Visit( const XMLText& text )
+{
+    PushText( text.Value(), text.CData() );
+    return true;
+}
+
+
+bool XMLPrinter::Visit( const XMLComment& comment )
+{
+    PushComment( comment.Value() );
+    return true;
+}
+
+bool XMLPrinter::Visit( const XMLDeclaration& declaration )
+{
+    PushDeclaration( declaration.Value() );
+    return true;
+}
+
+
+bool XMLPrinter::Visit( const XMLUnknown& unknown )
+{
+    PushUnknown( unknown.Value() );
+    return true;
+}
+
+}   // namespace tinyxml2
+
diff -r 0e31f2c3f29d -r 44a20d72f3a6 libs/tinyxml2/tinyxml2.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libs/tinyxml2/tinyxml2.h	Fri Sep 27 07:14:49 2013 +0300
@@ -0,0 +1,1987 @@
+/*
+Original code by Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+#ifndef TINYXML2_INCLUDED
+#define TINYXML2_INCLUDED
+
+#if defined(ANDROID_NDK) || defined(__BORLANDC__)
+#   include <ctype.h>
+#   include <limits.h>
+#   include <stdio.h>
+#   include <stdlib.h>
+#   include <string.h>
+#   include <stdarg.h>
+#else
+#   include <cctype>
+#   include <climits>
+#   include <cstdio>
+#   include <cstdlib>
+#   include <cstring>
+#   include <cstdarg>
+#endif
+
+/*
+   TODO: intern strings instead of allocation.
+*/
+/*
+	gcc:
+        g++ -Wall -DDEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe
+
+    Formatting, Artistic Style:
+        AStyle.exe --style=1tbs --indent-switches --break-closing-brackets --indent-preprocessor tinyxml2.cpp tinyxml2.h
+*/
+
+#if defined( _DEBUG ) || defined( DEBUG ) || defined (__DEBUG__)
+#   ifndef DEBUG
+#       define DEBUG
+#   endif
+#endif
+
+#ifdef _MSC_VER
+#   pragma warning(push)
+#   pragma warning(disable: 4251)
+#endif
+
+#ifdef _WIN32
+#   ifdef TINYXML2_EXPORT
+#       define TINYXML2_LIB __declspec(dllexport)
+#   elif defined(TINYXML2_IMPORT)
+#       define TINYXML2_LIB __declspec(dllimport)
+#   else
+#       define TINYXML2_LIB
+#   endif
+#else
+#   define TINYXML2_LIB
+#endif
+
+
+#if defined(DEBUG)
+#   if defined(_MSC_VER)
+#       define TIXMLASSERT( x )           if ( !(x)) { __debugbreak(); } //if ( !(x)) WinDebugBreak()
+#   elif defined (ANDROID_NDK)
+#       include <android/log.h>
+#       define TIXMLASSERT( x )           if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); }
+#   else
+#       include <assert.h>
+#       define TIXMLASSERT                assert
+#   endif
+#   else
+#       define TIXMLASSERT( x )           {}
+#endif
+
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+// Microsoft visual studio, version 2005 and higher.
+/*int _snprintf_s(
+   char *buffer,
+   size_t sizeOfBuffer,
+   size_t count,
+   const char *format [,
+	  argument] ...
+);*/
+inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... )
+{
+    va_list va;
+    va_start( va, format );
+    int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va );
+    va_end( va );
+    return result;
+}
+#define TIXML_SSCANF   sscanf_s
+#else
+// GCC version 3 and higher
+//#warning( "Using sn* functions." )
+#define TIXML_SNPRINTF snprintf
+#define TIXML_SSCANF   sscanf
+#endif
+
+static const int TIXML2_MAJOR_VERSION = 1;
+static const int TIXML2_MINOR_VERSION = 0;
+static const int TIXML2_PATCH_VERSION = 11;
+
+namespace tinyxml2
+{
+class XMLDocument;
+class XMLElement;
+class XMLAttribute;
+class XMLComment;
+class XMLText;
+class XMLDeclaration;
+class XMLUnknown;
+class XMLPrinter;
+
+/*
+	A class that wraps strings. Normally stores the start and end
+	pointers into the XML file itself, and will apply normalization
+	and entity translation if actually read. Can also store (and memory
+	manage) a traditional char[]
+*/
+class StrPair
+{
+public:
+    enum {
+        NEEDS_ENTITY_PROCESSING			= 0x01,
+        NEEDS_NEWLINE_NORMALIZATION		= 0x02,
+        COLLAPSE_WHITESPACE	                = 0x04,
+
+        TEXT_ELEMENT		            	= NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
+        TEXT_ELEMENT_LEAVE_ENTITIES		= NEEDS_NEWLINE_NORMALIZATION,
+        ATTRIBUTE_NAME		            	= 0,
+        ATTRIBUTE_VALUE		            	= NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
+        ATTRIBUTE_VALUE_LEAVE_ENTITIES  	= NEEDS_NEWLINE_NORMALIZATION,
+        COMMENT				        = NEEDS_NEWLINE_NORMALIZATION
+    };
+
+    StrPair() : _flags( 0 ), _start( 0 ), _end( 0 ) {}
+    ~StrPair();
+
+    void Set( char* start, char* end, int flags ) {
+        Reset();
+        _start  = start;
+        _end    = end;
+        _flags  = flags | NEEDS_FLUSH;
+    }
+
+    const char* GetStr();
+
+    bool Empty() const {
+        return _start == _end;
+    }
+
+    void SetInternedStr( const char* str ) {
+        Reset();
+        _start = const_cast<char*>(str);
+    }
+
+    void SetStr( const char* str, int flags=0 );
+
+    char* ParseText( char* in, const char* endTag, int strFlags );
+    char* ParseName( char* in );
+
+private:
+    void Reset();
+    void CollapseWhitespace();
+
+    enum {
+        NEEDS_FLUSH = 0x100,
+        NEEDS_DELETE = 0x200
+    };
+
+    // After parsing, if *_end != 0, it can be set to zero.
+    int     _flags;
+    char*   _start;
+    char*   _end;
+};
+
+
+/*
+	A dynamic array of Plain Old Data. Doesn't support constructors, etc.
+	Has a small initial memory pool, so that low or no usage will not
+	cause a call to new/delete
+*/
+template <class T, int INIT>
+class DynArray
+{
+public:
+    DynArray< T, INIT >() {
+        _mem = _pool;
+        _allocated = INIT;
+        _size = 0;
+    }
+
+    ~DynArray() {
+        if ( _mem != _pool ) {
+            delete [] _mem;
+        }
+    }
+
+    void Push( T t ) {
+        EnsureCapacity( _size+1 );
+        _mem[_size++] = t;
+    }
+
+    T* PushArr( int count ) {
+        EnsureCapacity( _size+count );
+        T* ret = &_mem[_size];
+        _size += count;
+        return ret;
+    }
+
+    T Pop() {
+        return _mem[--_size];
+    }
+
+    void PopArr( int count ) {
+        TIXMLASSERT( _size >= count );
+        _size -= count;
+    }
+
+    bool Empty() const					{
+        return _size == 0;
+    }
+
+    T& operator[](int i)				{
+        TIXMLASSERT( i>= 0 && i < _size );
+        return _mem[i];
+    }
+
+    const T& operator[](int i) const	{
+        TIXMLASSERT( i>= 0 && i < _size );
+        return _mem[i];
+    }
+
+    int Size() const					{
+        return _size;
+    }
+
+    int Capacity() const				{
+        return _allocated;
+    }
+
+    const T* Mem() const				{
+        return _mem;
+    }
+
+    T* Mem()							{
+        return _mem;
+    }
+
+private:
+    void EnsureCapacity( int cap ) {
+        if ( cap > _allocated ) {
+            int newAllocated = cap * 2;
+            T* newMem = new T[newAllocated];
+            memcpy( newMem, _mem, sizeof(T)*_size );	// warning: not using constructors, only works for PODs
+            if ( _mem != _pool ) {
+                delete [] _mem;
+            }
+            _mem = newMem;
+            _allocated = newAllocated;
+        }
+    }
+
+    T*  _mem;
+    T   _pool[INIT];
+    int _allocated;		// objects allocated
+    int _size;			// number objects in use
+};
+
+
+/*
+	Parent virtual class of a pool for fast allocation
+	and deallocation of objects.
+*/
+class MemPool
+{
+public:
+    MemPool() {}
+    virtual ~MemPool() {}
+
+    virtual int ItemSize() const = 0;
+    virtual void* Alloc() = 0;
+    virtual void Free( void* ) = 0;
+    virtual void SetTracked() = 0;
+};
+
+
+/*
+	Template child class to create pools of the correct type.
+*/
+template< int SIZE >
+class MemPoolT : public MemPool
+{
+public:
+    MemPoolT() : _root(0), _currentAllocs(0), _nAllocs(0), _maxAllocs(0), _nUntracked(0)	{}
+    ~MemPoolT() {
+        // Delete the blocks.
+        for( int i=0; i<_blockPtrs.Size(); ++i ) {
+            delete _blockPtrs[i];
+        }
+    }
+
+    virtual int ItemSize() const	{
+        return SIZE;
+    }
+    int CurrentAllocs() const		{
+        return _currentAllocs;
+    }
+
+    virtual void* Alloc() {
+        if ( !_root ) {
+            // Need a new block.
+            Block* block = new Block();
+            _blockPtrs.Push( block );
+
+            for( int i=0; i<COUNT-1; ++i ) {
+                block->chunk[i].next = &block->chunk[i+1];
+            }
+            block->chunk[COUNT-1].next = 0;
+            _root = block->chunk;
+        }
+        void* result = _root;
+        _root = _root->next;
+
+        ++_currentAllocs;
+        if ( _currentAllocs > _maxAllocs ) {
+            _maxAllocs = _currentAllocs;
+        }
+        _nAllocs++;
+        _nUntracked++;
+        return result;
+    }
+    virtual void Free( void* mem ) {
+        if ( !mem ) {
+            return;
+        }
+        --_currentAllocs;
+        Chunk* chunk = (Chunk*)mem;
+#ifdef DEBUG
+        memset( chunk, 0xfe, sizeof(Chunk) );
+#endif
+        chunk->next = _root;
+        _root = chunk;
+    }
+    void Trace( const char* name ) {
+        printf( "Mempool %s watermark=%d [%dk] current=%d size=%d nAlloc=%d blocks=%d\n",
+                name, _maxAllocs, _maxAllocs*SIZE/1024, _currentAllocs, SIZE, _nAllocs, _blockPtrs.Size() );
+    }
+
+    void SetTracked() {
+        _nUntracked--;
+    }
+
+    int Untracked() const {
+        return _nUntracked;
+    }
+
+	// This number is perf sensitive. 4k seems like a good tradeoff on my machine.
+	// The test file is large, 170k.
+	// Release:		VS2010 gcc(no opt)
+	//		1k:		4000
+	//		2k:		4000
+	//		4k:		3900	21000
+	//		16k:	5200
+	//		32k:	4300
+	//		64k:	4000	21000
+    enum { COUNT = (4*1024)/SIZE }; // Some compilers do not accept to use COUNT in private part if COUNT is private
+
+private:
+    union Chunk {
+        Chunk*  next;
+        char    mem[SIZE];
+    };
+    struct Block {
+        Chunk chunk[COUNT];
+    };
+    DynArray< Block*, 10 > _blockPtrs;
+    Chunk* _root;
+
+    int _currentAllocs;
+    int _nAllocs;
+    int _maxAllocs;
+    int _nUntracked;
+};
+
+
+
+/**
+	Implements the interface to the "Visitor pattern" (see the Accept() method.)
+	If you call the Accept() method, it requires being passed a XMLVisitor
+	class to handle callbacks. For nodes that contain other nodes (Document, Element)
+	you will get called with a VisitEnter/VisitExit pair. Nodes that are always leafs
+	are simply called with Visit().
+
+	If you return 'true' from a Visit method, recursive parsing will continue. If you return
+	false, <b>no children of this node or its siblings</b> will be visited.
+
+	All flavors of Visit methods have a default implementation that returns 'true' (continue
+	visiting). You need to only override methods that are interesting to you.
+
+	Generally Accept() is called on the XMLDocument, although all nodes support visiting.
+
+	You should never change the document from a callback.
+
+	@sa XMLNode::Accept()
+*/
+class TINYXML2_LIB XMLVisitor
+{
+public:
+    virtual ~XMLVisitor() {}
+
+    /// Visit a document.
+    virtual bool VisitEnter( const XMLDocument& /*doc*/ )			{
+        return true;
+    }
+    /// Visit a document.
+    virtual bool VisitExit( const XMLDocument& /*doc*/ )			{
+        return true;
+    }
+
+    /// Visit an element.
+    virtual bool VisitEnter( const XMLElement& /*element*/, const XMLAttribute* /*firstAttribute*/ )	{
+        return true;
+    }
+    /// Visit an element.
+    virtual bool VisitExit( const XMLElement& /*element*/ )			{
+        return true;
+    }
+
+    /// Visit a declaration.
+    virtual bool Visit( const XMLDeclaration& /*declaration*/ )		{
+        return true;
+    }
+    /// Visit a text node.
+    virtual bool Visit( const XMLText& /*text*/ )					{
+        return true;
+    }
+    /// Visit a comment node.
+    virtual bool Visit( const XMLComment& /*comment*/ )				{
+        return true;
+    }
+    /// Visit an unknown node.
+    virtual bool Visit( const XMLUnknown& /*unknown*/ )				{
+        return true;
+    }
+};
+
+
+/*
+	Utility functionality.
+*/
+class XMLUtil
+{
+public:
+    // Anything in the high order range of UTF-8 is assumed to not be whitespace. This isn't
+    // correct, but simple, and usually works.
+    static const char* SkipWhiteSpace( const char* p )	{
+        while( !IsUTF8Continuation(*p) && isspace( *reinterpret_cast<const unsigned char*>(p) ) ) {
+            ++p;
+        }
+        return p;
+    }
+    static char* SkipWhiteSpace( char* p )				{
+        while( !IsUTF8Continuation(*p) && isspace( *reinterpret_cast<unsigned char*>(p) ) )		{
+            ++p;
+        }
+        return p;
+    }
+    static bool IsWhiteSpace( char p )					{
+        return !IsUTF8Continuation(p) && isspace( static_cast<unsigned char>(p) );
+    }
+    
+    inline static bool IsNameStartChar( unsigned char ch ) {
+        return ( ( ch < 128 ) ? isalpha( ch ) : 1 )
+               || ch == ':'
+               || ch == '_';
+    }
+    
+    inline static bool IsNameChar( unsigned char ch ) {
+        return IsNameStartChar( ch )
+               || isdigit( ch )
+               || ch == '.'
+               || ch == '-';
+    }
+
+    inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX )  {
+        int n = 0;
+        if ( p == q ) {
+            return true;
+        }
+        while( *p && *q && *p == *q && n<nChar ) {
+            ++p;
+            ++q;
+            ++n;
+        }
+        if ( (n == nChar) || ( *p == 0 && *q == 0 ) ) {
+            return true;
+        }
+        return false;
+    }
+    
+    inline static int IsUTF8Continuation( const char p ) {
+        return p & 0x80;
+    }
+
+    static const char* ReadBOM( const char* p, bool* hasBOM );
+    // p is the starting location,
+    // the UTF-8 value of the entity will be placed in value, and length filled in.
+    static const char* GetCharacterRef( const char* p, char* value, int* length );
+    static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length );
+
+    // converts primitive types to strings
+    static void ToStr( int v, char* buffer, int bufferSize );
+    static void ToStr( unsigned v, char* buffer, int bufferSize );
+    static void ToStr( bool v, char* buffer, int bufferSize );
+    static void ToStr( float v, char* buffer, int bufferSize );
+    static void ToStr( double v, char* buffer, int bufferSize );
+
+    // converts strings to primitive types
+    static bool	ToInt( const char* str, int* value );
+    static bool ToUnsigned( const char* str, unsigned* value );
+    static bool	ToBool( const char* str, bool* value );
+    static bool	ToFloat( const char* str, float* value );
+    static bool ToDouble( const char* str, double* value );
+};
+
+
+/** XMLNode is a base class for every object that is in the
+	XML Document Object Model (DOM), except XMLAttributes.
+	Nodes have siblings, a parent, and children which can
+	be navigated. A node is always in a XMLDocument.
+	The type of a XMLNode can be queried, and it can
+	be cast to its more defined type.
+
+	A XMLDocument allocates memory for all its Nodes.
+	When the XMLDocument gets deleted, all its Nodes
+	will also be deleted.
+
+	@verbatim
+	A Document can contain:	Element	(container or leaf)
+							Comment (leaf)
+							Unknown (leaf)
+							Declaration( leaf )
+
+	An Element can contain:	Element (container or leaf)
+							Text	(leaf)
+							Attributes (not on tree)
+							Comment (leaf)
+							Unknown (leaf)
+
+	@endverbatim
+*/
+class TINYXML2_LIB XMLNode
+{
+    friend class XMLDocument;
+    friend class XMLElement;
+public:
+
+    /// Get the XMLDocument that owns this XMLNode.
+    const XMLDocument* GetDocument() const	{
+        return _document;
+    }
+    /// Get the XMLDocument that owns this XMLNode.
+    XMLDocument* GetDocument()				{
+        return _document;
+    }
+
+    /// Safely cast to an Element, or null.
+    virtual XMLElement*		ToElement()		{
+        return 0;
+    }
+    /// Safely cast to Text, or null.
+    virtual XMLText*		ToText()		{
+        return 0;
+    }
+    /// Safely cast to a Comment, or null.
+    virtual XMLComment*		ToComment()		{
+        return 0;
+    }
+    /// Safely cast to a Document, or null.
+    virtual XMLDocument*	ToDocument()	{
+        return 0;
+    }
+    /// Safely cast to a Declaration, or null.
+    virtual XMLDeclaration*	ToDeclaration()	{
+        return 0;
+    }
+    /// Safely cast to an Unknown, or null.
+    virtual XMLUnknown*		ToUnknown()		{
+        return 0;
+    }
+
+    virtual const XMLElement*		ToElement() const		{
+        return 0;
+    }
+    virtual const XMLText*			ToText() const			{
+        return 0;
+    }
+    virtual const XMLComment*		ToComment() const		{
+        return 0;
+    }
+    virtual const XMLDocument*		ToDocument() const		{
+        return 0;
+    }
+    virtual const XMLDeclaration*	ToDeclaration() const	{
+        return 0;
+    }
+    virtual const XMLUnknown*		ToUnknown() const		{
+        return 0;
+    }
+
+    /** The meaning of 'value' changes for the specific type.
+    	@verbatim
+    	Document:	empty
+    	Element:	name of the element
+    	Comment:	the comment text
+    	Unknown:	the tag contents
+    	Text:		the text string
+    	@endverbatim
+    */
+    const char* Value() const			{
+        return _value.GetStr();
+    }
+
+    /** Set the Value of an XML node.
+    	@sa Value()
+    */
+    void SetValue( const char* val, bool staticMem=false );
+
+    /// Get the parent of this node on the DOM.
+    const XMLNode*	Parent() const			{
+        return _parent;
+    }
+
+    XMLNode* Parent()						{
+        return _parent;
+    }
+
+    /// Returns true if this node has no children.
+    bool NoChildren() const					{
+        return !_firstChild;
+    }
+
+    /// Get the first child node, or null if none exists.
+    const XMLNode*  FirstChild() const		{
+        return _firstChild;
+    }
+
+    XMLNode*		FirstChild()			{
+        return _firstChild;
+    }
+
+    /** Get the first child element, or optionally the first child
+        element with the specified name.
+    */
+    const XMLElement* FirstChildElement( const char* value=0 ) const;
+
+    XMLElement* FirstChildElement( const char* value=0 )	{
+        return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->FirstChildElement( value ));
+    }
+
+    /// Get the last child node, or null if none exists.
+    const XMLNode*	LastChild() const						{
+        return _lastChild;
+    }
+
+    XMLNode*		LastChild()								{
+        return const_cast<XMLNode*>(const_cast<const XMLNode*>(this)->LastChild() );
+    }
+
+    /** Get the last child element or optionally the last child
+        element with the specified name.
+    */
+    const XMLElement* LastChildElement( const char* value=0 ) const;
+
+    XMLElement* LastChildElement( const char* value=0 )	{
+        return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->LastChildElement(value) );
+    }
+
+    /// Get the previous (left) sibling node of this node.
+    const XMLNode*	PreviousSibling() const					{
+        return _prev;
+    }
+
+    XMLNode*	PreviousSibling()							{
+        return _prev;
+    }
+
+    /// Get the previous (left) sibling element of this node, with an optionally supplied name.
+    const XMLElement*	PreviousSiblingElement( const char* value=0 ) const ;
+
+    XMLElement*	PreviousSiblingElement( const char* value=0 ) {
+        return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->PreviousSiblingElement( value ) );
+    }
+
+    /// Get the next (right) sibling node of this node.
+    const XMLNode*	NextSibling() const						{
+        return _next;
+    }
+
+    XMLNode*	NextSibling()								{
+        return _next;
+    }
+
+    /// Get the next (right) sibling element of this node, with an optionally supplied name.
+    const XMLElement*	NextSiblingElement( const char* value=0 ) const;
+
+    XMLElement*	NextSiblingElement( const char* value=0 )	{
+        return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->NextSiblingElement( value ) );
+    }
+
+    /**
+    	Add a child node as the last (right) child.
+    */
+    XMLNode* InsertEndChild( XMLNode* addThis );
+
+    XMLNode* LinkEndChild( XMLNode* addThis )	{
+        return InsertEndChild( addThis );
+    }
+    /**
+    	Add a child node as the first (left) child.
+    */
+    XMLNode* InsertFirstChild( XMLNode* addThis );
+    /**
+    	Add a node after the specified child node.
+    */
+    XMLNode* InsertAfterChild( XMLNode* afterThis, XMLNode* addThis );
+
+    /**
+    	Delete all the children of this node.
+    */
+    void DeleteChildren();
+
+    /**
+    	Delete a child of this node.
+    */
+    void DeleteChild( XMLNode* node );
+
+    /**
+    	Make a copy of this node, but not its children.
+    	You may pass in a Document pointer that will be
+    	the owner of the new Node. If the 'document' is
+    	null, then the node returned will be allocated
+    	from the current Document. (this->GetDocument())
+
+    	Note: if called on a XMLDocument, this will return null.
+    */
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const = 0;
+
+    /**
+    	Test if 2 nodes are the same, but don't test children.
+    	The 2 nodes do not need to be in the same Document.
+
+    	Note: if called on a XMLDocument, this will return false.
+    */
+    virtual bool ShallowEqual( const XMLNode* compare ) const = 0;
+
+    /** Accept a hierarchical visit of the nodes in the TinyXML-2 DOM. Every node in the
+    	XML tree will be conditionally visited and the host will be called back
+    	via the XMLVisitor interface.
+
+    	This is essentially a SAX interface for TinyXML-2. (Note however it doesn't re-parse
+    	the XML for the callbacks, so the performance of TinyXML-2 is unchanged by using this
+    	interface versus any other.)
+
+    	The interface has been based on ideas from:
+
+    	- http://www.saxproject.org/
+    	- http://c2.com/cgi/wiki?HierarchicalVisitorPattern
+
+    	Which are both good references for "visiting".
+
+    	An example of using Accept():
+    	@verbatim
+    	XMLPrinter printer;
+    	tinyxmlDoc.Accept( &printer );
+    	const char* xmlcstr = printer.CStr();
+    	@endverbatim
+    */
+    virtual bool Accept( XMLVisitor* visitor ) const = 0;
+
+    // internal
+    virtual char* ParseDeep( char*, StrPair* );
+
+protected:
+    XMLNode( XMLDocument* );
+    virtual ~XMLNode();
+    XMLNode( const XMLNode& );	// not supported
+    XMLNode& operator=( const XMLNode& );	// not supported
+
+    XMLDocument*	_document;
+    XMLNode*		_parent;
+    mutable StrPair	_value;
+
+    XMLNode*		_firstChild;
+    XMLNode*		_lastChild;
+
+    XMLNode*		_prev;
+    XMLNode*		_next;
+
+private:
+    MemPool*		_memPool;
+    void Unlink( XMLNode* child );
+};
+
+
+/** XML text.
+
+	Note that a text node can have child element nodes, for example:
+	@verbatim
+	<root>This is <b>bold</b></root>
+	@endverbatim
+
+	A text node can have 2 ways to output the next. "normal" output
+	and CDATA. It will default to the mode it was parsed from the XML file and
+	you generally want to leave it alone, but you can change the output mode with
+	SetCData() and query it with CData().
+*/
+class TINYXML2_LIB XMLText : public XMLNode
+{
+    friend class XMLBase;
+    friend class XMLDocument;
+public:
+    virtual bool Accept( XMLVisitor* visitor ) const;
+
+    virtual XMLText* ToText()			{
+        return this;
+    }
+    virtual const XMLText* ToText() const	{
+        return this;
+    }
+
+    /// Declare whether this should be CDATA or standard text.
+    void SetCData( bool isCData )			{
+        _isCData = isCData;
+    }
+    /// Returns true if this is a CDATA text element.
+    bool CData() const						{
+        return _isCData;
+    }
+
+    char* ParseDeep( char*, StrPair* endTag );
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+    virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+protected:
+    XMLText( XMLDocument* doc )	: XMLNode( doc ), _isCData( false )	{}
+    virtual ~XMLText()												{}
+    XMLText( const XMLText& );	// not supported
+    XMLText& operator=( const XMLText& );	// not supported
+
+private:
+    bool _isCData;
+};
+
+
+/** An XML Comment. */
+class TINYXML2_LIB XMLComment : public XMLNode
+{
+    friend class XMLDocument;
+public:
+    virtual XMLComment*	ToComment()					{
+        return this;
+    }
+    virtual const XMLComment* ToComment() const		{
+        return this;
+    }
+
+    virtual bool Accept( XMLVisitor* visitor ) const;
+
+    char* ParseDeep( char*, StrPair* endTag );
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+    virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+protected:
+    XMLComment( XMLDocument* doc );
+    virtual ~XMLComment();
+    XMLComment( const XMLComment& );	// not supported
+    XMLComment& operator=( const XMLComment& );	// not supported
+
+private:
+};
+
+
+/** In correct XML the declaration is the first entry in the file.
+	@verbatim
+		<?xml version="1.0" standalone="yes"?>
+	@endverbatim
+
+	TinyXML-2 will happily read or write files without a declaration,
+	however.
+
+	The text of the declaration isn't interpreted. It is parsed
+	and written as a string.
+*/
+class TINYXML2_LIB XMLDeclaration : public XMLNode
+{
+    friend class XMLDocument;
+public:
+    virtual XMLDeclaration*	ToDeclaration()					{
+        return this;
+    }
+    virtual const XMLDeclaration* ToDeclaration() const		{
+        return this;
+    }
+
+    virtual bool Accept( XMLVisitor* visitor ) const;
+
+    char* ParseDeep( char*, StrPair* endTag );
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+    virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+protected:
+    XMLDeclaration( XMLDocument* doc );
+    virtual ~XMLDeclaration();
+    XMLDeclaration( const XMLDeclaration& );	// not supported
+    XMLDeclaration& operator=( const XMLDeclaration& );	// not supported
+};
+
+
+/** Any tag that TinyXML-2 doesn't recognize is saved as an
+	unknown. It is a tag of text, but should not be modified.
+	It will be written back to the XML, unchanged, when the file
+	is saved.
+
+	DTD tags get thrown into XMLUnknowns.
+*/
+class TINYXML2_LIB XMLUnknown : public XMLNode
+{
+    friend class XMLDocument;
+public:
+    virtual XMLUnknown*	ToUnknown()					{
+        return this;
+    }
+    virtual const XMLUnknown* ToUnknown() const		{
+        return this;
+    }
+
+    virtual bool Accept( XMLVisitor* visitor ) const;
+
+    char* ParseDeep( char*, StrPair* endTag );
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+    virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+protected:
+    XMLUnknown( XMLDocument* doc );
+    virtual ~XMLUnknown();
+    XMLUnknown( const XMLUnknown& );	// not supported
+    XMLUnknown& operator=( const XMLUnknown& );	// not supported
+};
+
+
+enum XMLError {
+    XML_NO_ERROR = 0,
+    XML_SUCCESS = 0,
+
+    XML_NO_ATTRIBUTE,
+    XML_WRONG_ATTRIBUTE_TYPE,
+
+    XML_ERROR_FILE_NOT_FOUND,
+    XML_ERROR_FILE_COULD_NOT_BE_OPENED,
+    XML_ERROR_FILE_READ_ERROR,
+    XML_ERROR_ELEMENT_MISMATCH,
+    XML_ERROR_PARSING_ELEMENT,
+    XML_ERROR_PARSING_ATTRIBUTE,
+    XML_ERROR_IDENTIFYING_TAG,
+    XML_ERROR_PARSING_TEXT,
+    XML_ERROR_PARSING_CDATA,
+    XML_ERROR_PARSING_COMMENT,
+    XML_ERROR_PARSING_DECLARATION,
+    XML_ERROR_PARSING_UNKNOWN,
+    XML_ERROR_EMPTY_DOCUMENT,
+    XML_ERROR_MISMATCHED_ELEMENT,
+    XML_ERROR_PARSING,
+
+    XML_CAN_NOT_CONVERT_TEXT,
+    XML_NO_TEXT_NODE
+};
+
+
+/** An attribute is a name-value pair. Elements have an arbitrary
+	number of attributes, each with a unique name.
+
+	@note The attributes are not XMLNodes. You may only query the
+	Next() attribute in a list.
+*/
+class TINYXML2_LIB XMLAttribute
+{
+    friend class XMLElement;
+public:
+    /// The name of the attribute.
+    const char* Name() const {
+        return _name.GetStr();
+    }
+    /// The value of the attribute.
+    const char* Value() const {
+        return _value.GetStr();
+    }
+    /// The next attribute in the list.
+    const XMLAttribute* Next() const {
+        return _next;
+    }
+
+    /** IntValue interprets the attribute as an integer, and returns the value.
+        If the value isn't an integer, 0 will be returned. There is no error checking;
+    	use QueryIntValue() if you need error checking.
+    */
+    int		 IntValue() const				{
+        int i=0;
+        QueryIntValue( &i );
+        return i;
+    }
+    /// Query as an unsigned integer. See IntValue()
+    unsigned UnsignedValue() const			{
+        unsigned i=0;
+        QueryUnsignedValue( &i );
+        return i;
+    }
+    /// Query as a boolean. See IntValue()
+    bool	 BoolValue() const				{
+        bool b=false;
+        QueryBoolValue( &b );
+        return b;
+    }
+    /// Query as a double. See IntValue()
+    double 	 DoubleValue() const			{
+        double d=0;
+        QueryDoubleValue( &d );
+        return d;
+    }
+    /// Query as a float. See IntValue()
+    float	 FloatValue() const				{
+        float f=0;
+        QueryFloatValue( &f );
+        return f;
+    }
+
+    /** QueryIntValue interprets the attribute as an integer, and returns the value
+    	in the provided parameter. The function will return XML_NO_ERROR on success,
+    	and XML_WRONG_ATTRIBUTE_TYPE if the conversion is not successful.
+    */
+    XMLError QueryIntValue( int* value ) const;
+    /// See QueryIntValue
+    XMLError QueryUnsignedValue( unsigned int* value ) const;
+    /// See QueryIntValue
+    XMLError QueryBoolValue( bool* value ) const;
+    /// See QueryIntValue
+    XMLError QueryDoubleValue( double* value ) const;
+    /// See QueryIntValue
+    XMLError QueryFloatValue( float* value ) const;
+
+    /// Set the attribute to a string value.
+    void SetAttribute( const char* value );
+    /// Set the attribute to value.
+    void SetAttribute( int value );
+    /// Set the attribute to value.
+    void SetAttribute( unsigned value );
+    /// Set the attribute to value.
+    void SetAttribute( bool value );
+    /// Set the attribute to value.
+    void SetAttribute( double value );
+    /// Set the attribute to value.
+    void SetAttribute( float value );
+
+private:
+    enum { BUF_SIZE = 200 };
+
+    XMLAttribute() : _next( 0 ), _memPool( 0 ) {}
+    virtual ~XMLAttribute()	{}
+
+    XMLAttribute( const XMLAttribute& );	// not supported
+    void operator=( const XMLAttribute& );	// not supported
+    void SetName( const char* name );
+
+    char* ParseDeep( char* p, bool processEntities );
+
+    mutable StrPair _name;
+    mutable StrPair _value;
+    XMLAttribute*   _next;
+    MemPool*        _memPool;
+};
+
+
+/** The element is a container class. It has a value, the element name,
+	and can contain other elements, text, comments, and unknowns.
+	Elements also contain an arbitrary number of attributes.
+*/
+class TINYXML2_LIB XMLElement : public XMLNode
+{
+    friend class XMLBase;
+    friend class XMLDocument;
+public:
+    /// Get the name of an element (which is the Value() of the node.)
+    const char* Name() const		{
+        return Value();
+    }
+    /// Set the name of the element.
+    void SetName( const char* str, bool staticMem=false )	{
+        SetValue( str, staticMem );
+    }
+
+    virtual XMLElement* ToElement()				{
+        return this;
+    }
+    virtual const XMLElement* ToElement() const {
+        return this;
+    }
+    virtual bool Accept( XMLVisitor* visitor ) const;
+
+    /** Given an attribute name, Attribute() returns the value
+    	for the attribute of that name, or null if none
+    	exists. For example:
+
+    	@verbatim
+    	const char* value = ele->Attribute( "foo" );
+    	@endverbatim
+
+    	The 'value' parameter is normally null. However, if specified,
+    	the attribute will only be returned if the 'name' and 'value'
+    	match. This allow you to write code:
+
+    	@verbatim
+    	if ( ele->Attribute( "foo", "bar" ) ) callFooIsBar();
+    	@endverbatim
+
+    	rather than:
+    	@verbatim
+    	if ( ele->Attribute( "foo" ) ) {
+    		if ( strcmp( ele->Attribute( "foo" ), "bar" ) == 0 ) callFooIsBar();
+    	}
+    	@endverbatim
+    */
+    const char* Attribute( const char* name, const char* value=0 ) const;
+
+    /** Given an attribute name, IntAttribute() returns the value
+    	of the attribute interpreted as an integer. 0 will be
+    	returned if there is an error. For a method with error
+    	checking, see QueryIntAttribute()
+    */
+    int		 IntAttribute( const char* name ) const		{
+        int i=0;
+        QueryIntAttribute( name, &i );
+        return i;
+    }
+    /// See IntAttribute()
+    unsigned UnsignedAttribute( const char* name ) const {
+        unsigned i=0;
+        QueryUnsignedAttribute( name, &i );
+        return i;
+    }
+    /// See IntAttribute()
+    bool	 BoolAttribute( const char* name ) const	{
+        bool b=false;
+        QueryBoolAttribute( name, &b );
+        return b;
+    }
+    /// See IntAttribute()
+    double 	 DoubleAttribute( const char* name ) const	{
+        double d=0;
+        QueryDoubleAttribute( name, &d );
+        return d;
+    }
+    /// See IntAttribute()
+    float	 FloatAttribute( const char* name ) const	{
+        float f=0;
+        QueryFloatAttribute( name, &f );
+        return f;
+    }
+
+    /** Given an attribute name, QueryIntAttribute() returns
+    	XML_NO_ERROR, XML_WRONG_ATTRIBUTE_TYPE if the conversion
+    	can't be performed, or XML_NO_ATTRIBUTE if the attribute
+    	doesn't exist. If successful, the result of the conversion
+    	will be written to 'value'. If not successful, nothing will
+    	be written to 'value'. This allows you to provide default
+    	value:
+
+    	@verbatim
+    	int value = 10;
+    	QueryIntAttribute( "foo", &value );		// if "foo" isn't found, value will still be 10
+    	@endverbatim
+    */
+    XMLError QueryIntAttribute( const char* name, int* value ) const				{
+        const XMLAttribute* a = FindAttribute( name );
+        if ( !a ) {
+            return XML_NO_ATTRIBUTE;
+        }
+        return a->QueryIntValue( value );
+    }
+    /// See QueryIntAttribute()
+    XMLError QueryUnsignedAttribute( const char* name, unsigned int* value ) const	{
+        const XMLAttribute* a = FindAttribute( name );
+        if ( !a ) {
+            return XML_NO_ATTRIBUTE;
+        }
+        return a->QueryUnsignedValue( value );
+    }
+    /// See QueryIntAttribute()
+    XMLError QueryBoolAttribute( const char* name, bool* value ) const				{
+        const XMLAttribute* a = FindAttribute( name );
+        if ( !a ) {
+            return XML_NO_ATTRIBUTE;
+        }
+        return a->QueryBoolValue( value );
+    }
+    /// See QueryIntAttribute()
+    XMLError QueryDoubleAttribute( const char* name, double* value ) const			{
+        const XMLAttribute* a = FindAttribute( name );
+        if ( !a ) {
+            return XML_NO_ATTRIBUTE;
+        }
+        return a->QueryDoubleValue( value );
+    }
+    /// See QueryIntAttribute()
+    XMLError QueryFloatAttribute( const char* name, float* value ) const			{
+        const XMLAttribute* a = FindAttribute( name );
+        if ( !a ) {
+            return XML_NO_ATTRIBUTE;
+        }
+        return a->QueryFloatValue( value );
+    }
+
+	
+    /** Given an attribute name, QueryAttribute() returns
+    	XML_NO_ERROR, XML_WRONG_ATTRIBUTE_TYPE if the conversion
+    	can't be performed, or XML_NO_ATTRIBUTE if the attribute
+    	doesn't exist. It is overloaded for the primitive types,
+		and is a generally more convenient replacement of
+		QueryIntAttribute() and related functions.
+		
+		If successful, the result of the conversion
+    	will be written to 'value'. If not successful, nothing will
+    	be written to 'value'. This allows you to provide default
+    	value:
+
+    	@verbatim
+    	int value = 10;
+    	QueryAttribute( "foo", &value );		// if "foo" isn't found, value will still be 10
+    	@endverbatim
+    */
+	int QueryAttribute( const char* name, int* value ) const {
+		return QueryIntAttribute( name, value );
+	}
+
+	int QueryAttribute( const char* name, unsigned int* value ) const {
+		return QueryUnsignedAttribute( name, value );
+	}
+
+	int QueryAttribute( const char* name, bool* value ) const {
+		return QueryBoolAttribute( name, value );
+	}
+
+	int QueryAttribute( const char* name, double* value ) const {
+		return QueryDoubleAttribute( name, value );
+	}
+
+	int QueryAttribute( const char* name, float* value ) const {
+		return QueryFloatAttribute( name, value );
+	}
+
+	/// Sets the named attribute to value.
+    void SetAttribute( const char* name, const char* value )	{
+        XMLAttribute* a = FindOrCreateAttribute( name );
+        a->SetAttribute( value );
+    }
+    /// Sets the named attribute to value.
+    void SetAttribute( const char* name, int value )			{
+        XMLAttribute* a = FindOrCreateAttribute( name );
+        a->SetAttribute( value );
+    }
+    /// Sets the named attribute to value.
+    void SetAttribute( const char* name, unsigned value )		{
+        XMLAttribute* a = FindOrCreateAttribute( name );
+        a->SetAttribute( value );
+    }
+    /// Sets the named attribute to value.
+    void SetAttribute( const char* name, bool value )			{
+        XMLAttribute* a = FindOrCreateAttribute( name );
+        a->SetAttribute( value );
+    }
+    /// Sets the named attribute to value.
+    void SetAttribute( const char* name, double value )		{
+        XMLAttribute* a = FindOrCreateAttribute( name );
+        a->SetAttribute( value );
+    }
+
+    /**
+    	Delete an attribute.
+    */
+    void DeleteAttribute( const char* name );
+
+    /// Return the first attribute in the list.
+    const XMLAttribute* FirstAttribute() const {
+        return _rootAttribute;
+    }
+    /// Query a specific attribute in the list.
+    const XMLAttribute* FindAttribute( const char* name ) const;
+
+    /** Convenience function for easy access to the text inside an element. Although easy
+    	and concise, GetText() is limited compared to getting the XMLText child
+    	and accessing it directly.
+
+    	If the first child of 'this' is a XMLText, the GetText()
+    	returns the character string of the Text node, else null is returned.
+
+    	This is a convenient method for getting the text of simple contained text:
+    	@verbatim
+    	<foo>This is text</foo>
+    		const char* str = fooElement->GetText();
+    	@endverbatim
+
+    	'str' will be a pointer to "This is text".
+
+    	Note that this function can be misleading. If the element foo was created from
+    	this XML:
+    	@verbatim
+    		<foo><b>This is text</b></foo>
+    	@endverbatim
+
+    	then the value of str would be null. The first child node isn't a text node, it is
+    	another element. From this XML:
+    	@verbatim
+    		<foo>This is <b>text</b></foo>
+    	@endverbatim
+    	GetText() will return "This is ".
+    */
+    const char* GetText() const;
+
+    /**
+    	Convenience method to query the value of a child text node. This is probably best
+    	shown by example. Given you have a document is this form:
+    	@verbatim
+    		<point>
+    			<x>1</x>
+    			<y>1.4</y>
+    		</point>
+    	@endverbatim
+
+    	The QueryIntText() and similar functions provide a safe and easier way to get to the
+    	"value" of x and y.
+
+    	@verbatim
+    		int x = 0;
+    		float y = 0;	// types of x and y are contrived for example
+    		const XMLElement* xElement = pointElement->FirstChildElement( "x" );
+    		const XMLElement* yElement = pointElement->FirstChildElement( "y" );
+    		xElement->QueryIntText( &x );
+    		yElement->QueryFloatText( &y );
+    	@endverbatim
+
+    	@returns XML_SUCCESS (0) on success, XML_CAN_NOT_CONVERT_TEXT if the text cannot be converted
+    			 to the requested type, and XML_NO_TEXT_NODE if there is no child text to query.
+
+    */
+    XMLError QueryIntText( int* ival ) const;
+    /// See QueryIntText()
+    XMLError QueryUnsignedText( unsigned* uval ) const;
+    /// See QueryIntText()
+    XMLError QueryBoolText( bool* bval ) const;
+    /// See QueryIntText()
+    XMLError QueryDoubleText( double* dval ) const;
+    /// See QueryIntText()
+    XMLError QueryFloatText( float* fval ) const;
+
+    // internal:
+    enum {
+        OPEN,		// <foo>
+        CLOSED,		// <foo/>
+        CLOSING		// </foo>
+    };
+    int ClosingType() const {
+        return _closingType;
+    }
+    char* ParseDeep( char* p, StrPair* endTag );
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+    virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+private:
+    XMLElement( XMLDocument* doc );
+    virtual ~XMLElement();
+    XMLElement( const XMLElement& );	// not supported
+    void operator=( const XMLElement& );	// not supported
+
+    XMLAttribute* FindAttribute( const char* name );
+    XMLAttribute* FindOrCreateAttribute( const char* name );
+    //void LinkAttribute( XMLAttribute* attrib );
+    char* ParseAttributes( char* p );
+
+    int _closingType;
+    // The attribute list is ordered; there is no 'lastAttribute'
+    // because the list needs to be scanned for dupes before adding
+    // a new attribute.
+    XMLAttribute* _rootAttribute;
+};
+
+
+enum Whitespace {
+    PRESERVE_WHITESPACE,
+    COLLAPSE_WHITESPACE
+};
+
+
+/** A Document binds together all the functionality.
+	It can be saved, loaded, and printed to the screen.
+	All Nodes are connected and allocated to a Document.
+	If the Document is deleted, all its Nodes are also deleted.
+*/
+class TINYXML2_LIB XMLDocument : public XMLNode
+{
+    friend class XMLElement;
+public:
+    /// constructor
+    XMLDocument( bool processEntities = true, Whitespace = PRESERVE_WHITESPACE );
+    ~XMLDocument();
+
+    virtual XMLDocument* ToDocument()				{
+        return this;
+    }
+    virtual const XMLDocument* ToDocument() const	{
+        return this;
+    }
+
+    /**
+    	Parse an XML file from a character string.
+    	Returns XML_NO_ERROR (0) on success, or
+    	an errorID.
+
+    	You may optionally pass in the 'nBytes', which is
+    	the number of bytes which will be parsed. If not
+    	specified, TinyXML-2 will assume 'xml' points to a
+    	null terminated string.
+    */
+    XMLError Parse( const char* xml, size_t nBytes=(size_t)(-1) );
+
+    /**
+    	Load an XML file from disk.
+    	Returns XML_NO_ERROR (0) on success, or
+    	an errorID.
+    */
+    XMLError LoadFile( const char* filename );
+
+    /**
+    	Load an XML file from disk. You are responsible
+    	for providing and closing the FILE*.
+
+    	Returns XML_NO_ERROR (0) on success, or
+    	an errorID.
+    */
+    XMLError LoadFile( FILE* );
+
+    /**
+    	Save the XML file to disk.
+    	Returns XML_NO_ERROR (0) on success, or
+    	an errorID.
+    */
+    XMLError SaveFile( const char* filename, bool compact = false );
+
+    /**
+    	Save the XML file to disk. You are responsible
+    	for providing and closing the FILE*.
+
+    	Returns XML_NO_ERROR (0) on success, or
+    	an errorID.
+    */
+    XMLError SaveFile( FILE* fp, bool compact = false );
+
+    bool ProcessEntities() const		{
+        return _processEntities;
+    }
+    Whitespace WhitespaceMode() const	{
+        return _whitespace;
+    }
+
+    /**
+    	Returns true if this document has a leading Byte Order Mark of UTF8.
+    */
+    bool HasBOM() const {
+        return _writeBOM;
+    }
+    /** Sets whether to write the BOM when writing the file.
+    */
+    void SetBOM( bool useBOM ) {
+        _writeBOM = useBOM;
+    }
+
+    /** Return the root element of DOM. Equivalent to FirstChildElement().
+        To get the first node, use FirstChild().
+    */
+    XMLElement* RootElement()				{
+        return FirstChildElement();
+    }
+    const XMLElement* RootElement() const	{
+        return FirstChildElement();
+    }
+
+    /** Print the Document. If the Printer is not provided, it will
+        print to stdout. If you provide Printer, this can print to a file:
+    	@verbatim
+    	XMLPrinter printer( fp );
+    	doc.Print( &printer );
+    	@endverbatim
+
+    	Or you can use a printer to print to memory:
+    	@verbatim
+    	XMLPrinter printer;
+    	doc.Print( &printer );
+    	// printer.CStr() has a const char* to the XML
+    	@endverbatim
+    */
+    void Print( XMLPrinter* streamer=0 ) const;
+    virtual bool Accept( XMLVisitor* visitor ) const;
+
+    /**
+    	Create a new Element associated with
+    	this Document. The memory for the Element
+    	is managed by the Document.
+    */
+    XMLElement* NewElement( const char* name );
+    /**
+    	Create a new Comment associated with
+    	this Document. The memory for the Comment
+    	is managed by the Document.
+    */
+    XMLComment* NewComment( const char* comment );
+    /**
+    	Create a new Text associated with
+    	this Document. The memory for the Text
+    	is managed by the Document.
+    */
+    XMLText* NewText( const char* text );
+    /**
+    	Create a new Declaration associated with
+    	this Document. The memory for the object
+    	is managed by the Document.
+
+    	If the 'text' param is null, the standard
+    	declaration is used.:
+    	@verbatim
+    		<?xml version="1.0" encoding="UTF-8"?>
+    	@endverbatim
+    */
+    XMLDeclaration* NewDeclaration( const char* text=0 );
+    /**
+    	Create a new Unknown associated with
+    	this Document. The memory for the object
+    	is managed by the Document.
+    */
+    XMLUnknown* NewUnknown( const char* text );
+
+    /**
+    	Delete a node associated with this document.
+    	It will be unlinked from the DOM.
+    */
+    void DeleteNode( XMLNode* node )	{
+        node->_parent->DeleteChild( node );
+    }
+
+    void SetError( XMLError error, const char* str1, const char* str2 );
+
+    /// Return true if there was an error parsing the document.
+    bool Error() const {
+        return _errorID != XML_NO_ERROR;
+    }
+    /// Return the errorID.
+    XMLError  ErrorID() const {
+        return _errorID;
+    }
+    /// Return a possibly helpful diagnostic location or string.
+    const char* GetErrorStr1() const {
+        return _errorStr1;
+    }
+    /// Return a possibly helpful secondary diagnostic location or string.
+    const char* GetErrorStr2() const {
+        return _errorStr2;
+    }
+    /// If there is an error, print it to stdout.
+    void PrintError() const;
+    
+    /// Clear the document, resetting it to the initial state.
+    void Clear();
+
+    // internal
+    char* Identify( char* p, XMLNode** node );
+
+    virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const	{
+        return 0;
+    }
+    virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const	{
+        return false;
+    }
+
+private:
+    XMLDocument( const XMLDocument& );	// not supported
+    void operator=( const XMLDocument& );	// not supported
+
+    bool        _writeBOM;
+    bool        _processEntities;
+    XMLError    _errorID;
+    Whitespace  _whitespace;
+    const char* _errorStr1;
+    const char* _errorStr2;
+    char*       _charBuffer;
+
+    MemPoolT< sizeof(XMLElement) >	 _elementPool;
+    MemPoolT< sizeof(XMLAttribute) > _attributePool;
+    MemPoolT< sizeof(XMLText) >		 _textPool;
+    MemPoolT< sizeof(XMLComment) >	 _commentPool;
+};
+
+
+/**
+	A XMLHandle is a class that wraps a node pointer with null checks; this is
+	an incredibly useful thing. Note that XMLHandle is not part of the TinyXML-2
+	DOM structure. It is a separate utility class.
+
+	Take an example:
+	@verbatim
+	<Document>
+		<Element attributeA = "valueA">
+			<Child attributeB = "value1" />
+			<Child attributeB = "value2" />
+		</Element>
+	</Document>
+	@endverbatim
+
+	Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very
+	easy to write a *lot* of code that looks like:
+
+	@verbatim
+	XMLElement* root = document.FirstChildElement( "Document" );
+	if ( root )
+	{
+		XMLElement* element = root->FirstChildElement( "Element" );
+		if ( element )
+		{
+			XMLElement* child = element->FirstChildElement( "Child" );
+			if ( child )
+			{
+				XMLElement* child2 = child->NextSiblingElement( "Child" );
+				if ( child2 )
+				{
+					// Finally do something useful.
+	@endverbatim
+
+	And that doesn't even cover "else" cases. XMLHandle addresses the verbosity
+	of such code. A XMLHandle checks for null pointers so it is perfectly safe
+	and correct to use:
+
+	@verbatim
+	XMLHandle docHandle( &document );
+	XMLElement* child2 = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).FirstChild().NextSibling().ToElement();
+	if ( child2 )
+	{
+		// do something useful
+	@endverbatim
+
+	Which is MUCH more concise and useful.
+
+	It is also safe to copy handles - internally they are nothing more than node pointers.
+	@verbatim
+	XMLHandle handleCopy = handle;
+	@endverbatim
+
+	See also XMLConstHandle, which is the same as XMLHandle, but operates on const objects.
+*/
+class TINYXML2_LIB XMLHandle
+{
+public:
+    /// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
+    XMLHandle( XMLNode* node )												{
+        _node = node;
+    }
+    /// Create a handle from a node.
+    XMLHandle( XMLNode& node )												{
+        _node = &node;
+    }
+    /// Copy constructor
+    XMLHandle( const XMLHandle& ref )										{
+        _node = ref._node;
+    }
+    /// Assignment
+    XMLHandle& operator=( const XMLHandle& ref )							{
+        _node = ref._node;
+        return *this;
+    }
+
+    /// Get the first child of this handle.
+    XMLHandle FirstChild() 													{
+        return XMLHandle( _node ? _node->FirstChild() : 0 );
+    }
+    /// Get the first child element of this handle.
+    XMLHandle FirstChildElement( const char* value=0 )						{
+        return XMLHandle( _node ? _node->FirstChildElement( value ) : 0 );
+    }
+    /// Get the last child of this handle.
+    XMLHandle LastChild()													{
+        return XMLHandle( _node ? _node->LastChild() : 0 );
+    }
+    /// Get the last child element of this handle.
+    XMLHandle LastChildElement( const char* _value=0 )						{
+        return XMLHandle( _node ? _node->LastChildElement( _value ) : 0 );
+    }
+    /// Get the previous sibling of this handle.
+    XMLHandle PreviousSibling()												{
+        return XMLHandle( _node ? _node->PreviousSibling() : 0 );
+    }
+    /// Get the previous sibling element of this handle.
+    XMLHandle PreviousSiblingElement( const char* _value=0 )				{
+        return XMLHandle( _node ? _node->PreviousSiblingElement( _value ) : 0 );
+    }
+    /// Get the next sibling of this handle.
+    XMLHandle NextSibling()													{
+        return XMLHandle( _node ? _node->NextSibling() : 0 );
+    }
+    /// Get the next sibling element of this handle.
+    XMLHandle NextSiblingElement( const char* _value=0 )					{
+        return XMLHandle( _node ? _node->NextSiblingElement( _value ) : 0 );
+    }
+
+    /// Safe cast to XMLNode. This can return null.
+    XMLNode* ToNode()							{
+        return _node;
+    }
+    /// Safe cast to XMLElement. This can return null.
+    XMLElement* ToElement() 					{
+        return ( ( _node && _node->ToElement() ) ? _node->ToElement() : 0 );
+    }
+    /// Safe cast to XMLText. This can return null.
+    XMLText* ToText() 							{
+        return ( ( _node && _node->ToText() ) ? _node->ToText() : 0 );
+    }
+    /// Safe cast to XMLUnknown. This can return null.
+    XMLUnknown* ToUnknown() 					{
+        return ( ( _node && _node->ToUnknown() ) ? _node->ToUnknown() : 0 );
+    }
+    /// Safe cast to XMLDeclaration. This can return null.
+    XMLDeclaration* ToDeclaration() 			{
+        return ( ( _node && _node->ToDeclaration() ) ? _node->ToDeclaration() : 0 );
+    }
+
+private:
+    XMLNode* _node;
+};
+
+
+/**
+	A variant of the XMLHandle class for working with const XMLNodes and Documents. It is the
+	same in all regards, except for the 'const' qualifiers. See XMLHandle for API.
+*/
+class TINYXML2_LIB XMLConstHandle
+{
+public:
+    XMLConstHandle( const XMLNode* node )											{
+        _node = node;
+    }
+    XMLConstHandle( const XMLNode& node )											{
+        _node = &node;
+    }
+    XMLConstHandle( const XMLConstHandle& ref )										{
+        _node = ref._node;
+    }
+
+    XMLConstHandle& operator=( const XMLConstHandle& ref )							{
+        _node = ref._node;
+        return *this;
+    }
+
+    const XMLConstHandle FirstChild() const											{
+        return XMLConstHandle( _node ? _node->FirstChild() : 0 );
+    }
+    const XMLConstHandle FirstChildElement( const char* value=0 ) const				{
+        return XMLConstHandle( _node ? _node->FirstChildElement( value ) : 0 );
+    }
+    const XMLConstHandle LastChild()	const										{
+        return XMLConstHandle( _node ? _node->LastChild() : 0 );
+    }
+    const XMLConstHandle LastChildElement( const char* _value=0 ) const				{
+        return XMLConstHandle( _node ? _node->LastChildElement( _value ) : 0 );
+    }
+    const XMLConstHandle PreviousSibling() const									{
+        return XMLConstHandle( _node ? _node->PreviousSibling() : 0 );
+    }
+    const XMLConstHandle PreviousSiblingElement( const char* _value=0 ) const		{
+        return XMLConstHandle( _node ? _node->PreviousSiblingElement( _value ) : 0 );
+    }
+    const XMLConstHandle NextSibling() const										{
+        return XMLConstHandle( _node ? _node->NextSibling() : 0 );
+    }
+    const XMLConstHandle NextSiblingElement( const char* _value=0 ) const			{
+        return XMLConstHandle( _node ? _node->NextSiblingElement( _value ) : 0 );
+    }
+
+
+    const XMLNode* ToNode() const				{
+        return _node;
+    }
+    const XMLElement* ToElement() const			{
+        return ( ( _node && _node->ToElement() ) ? _node->ToElement() : 0 );
+    }
+    const XMLText* ToText() const				{
+        return ( ( _node && _node->ToText() ) ? _node->ToText() : 0 );
+    }
+    const XMLUnknown* ToUnknown() const			{
+        return ( ( _node && _node->ToUnknown() ) ? _node->ToUnknown() : 0 );
+    }
+    const XMLDeclaration* ToDeclaration() const	{
+        return ( ( _node && _node->ToDeclaration() ) ? _node->ToDeclaration() : 0 );
+    }
+
+private:
+    const XMLNode* _node;
+};
+
+
+/**
+	Printing functionality. The XMLPrinter gives you more
+	options than the XMLDocument::Print() method.
+
+	It can:
+	-# Print to memory.
+	-# Print to a file you provide.
+	-# Print XML without a XMLDocument.
+
+	Print to Memory
+
+	@verbatim
+	XMLPrinter printer;
+	doc.Print( &printer );
+	SomeFunction( printer.CStr() );
+	@endverbatim
+
+	Print to a File
+
+	You provide the file pointer.
+	@verbatim
+	XMLPrinter printer( fp );
+	doc.Print( &printer );
+	@endverbatim
+
+	Print without a XMLDocument
+
+	When loading, an XML parser is very useful. However, sometimes
+	when saving, it just gets in the way. The code is often set up
+	for streaming, and constructing the DOM is just overhead.
+
+	The Printer supports the streaming case. The following code
+	prints out a trivially simple XML file without ever creating
+	an XML document.
+
+	@verbatim
+	XMLPrinter printer( fp );
+	printer.OpenElement( "foo" );
+	printer.PushAttribute( "foo", "bar" );
+	printer.CloseElement();
+	@endverbatim
+*/
+class TINYXML2_LIB XMLPrinter : public XMLVisitor
+{
+public:
+    /** Construct the printer. If the FILE* is specified,
+    	this will print to the FILE. Else it will print
+    	to memory, and the result is available in CStr().
+    	If 'compact' is set to true, then output is created
+    	with only required whitespace and newlines.
+    */
+    XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 );
+    ~XMLPrinter()	{}
+
+    /** If streaming, write the BOM and declaration. */
+    void PushHeader( bool writeBOM, bool writeDeclaration );
+    /** If streaming, start writing an element.
+        The element must be closed with CloseElement()
+    */
+    void OpenElement( const char* name );
+    /// If streaming, add an attribute to an open element.
+    void PushAttribute( const char* name, const char* value );
+    void PushAttribute( const char* name, int value );
+    void PushAttribute( const char* name, unsigned value );
+    void PushAttribute( const char* name, bool value );
+    void PushAttribute( const char* name, double value );
+    /// If streaming, close the Element.
+    void CloseElement();
+
+    /// Add a text node.
+    void PushText( const char* text, bool cdata=false );
+    /// Add a text node from an integer.
+    void PushText( int value );
+    /// Add a text node from an unsigned.
+    void PushText( unsigned value );
+    /// Add a text node from a bool.
+    void PushText( bool value );
+    /// Add a text node from a float.
+    void PushText( float value );
+    /// Add a text node from a double.
+    void PushText( double value );
+
+    /// Add a comment
+    void PushComment( const char* comment );
+
+    void PushDeclaration( const char* value );
+    void PushUnknown( const char* value );
+
+    virtual bool VisitEnter( const XMLDocument& /*doc*/ );
+    virtual bool VisitExit( const XMLDocument& /*doc*/ )			{
+        return true;
+    }
+
+    virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute );
+    virtual bool VisitExit( const XMLElement& element );
+
+    virtual bool Visit( const XMLText& text );
+    virtual bool Visit( const XMLComment& comment );
+    virtual bool Visit( const XMLDeclaration& declaration );
+    virtual bool Visit( const XMLUnknown& unknown );
+
+    /**
+    	If in print to memory mode, return a pointer to
+    	the XML file in memory.
+    */
+    const char* CStr() const {
+        return _buffer.Mem();
+    }
+    /**
+    	If in print to memory mode, return the size
+    	of the XML file in memory. (Note the size returned
+    	includes the terminating null.)
+    */
+    int CStrSize() const {
+        return _buffer.Size();
+    }
+
+private:
+    void SealElement();
+    void PrintSpace( int depth );
+    void PrintString( const char*, bool restrictedEntitySet );	// prints out, after detecting entities.
+    void Print( const char* format, ... );
+
+    bool _elementJustOpened;
+    bool _firstElement;
+    FILE* _fp;
+    int _depth;
+    int _textDepth;
+    bool _processEntities;
+    bool _compactMode;
+
+    enum {
+        ENTITY_RANGE = 64,
+        BUF_SIZE = 200
+    };
+    bool _entityFlag[ENTITY_RANGE];
+    bool _restrictedEntityFlag[ENTITY_RANGE];
+
+    DynArray< const char*, 10 > _stack;
+    DynArray< char, 20 > _buffer;
+#ifdef _MSC_VER
+    DynArray< char, 20 > _accumulator;
+#endif
+};
+
+
+}	// tinyxml2
+
+#if defined(_MSC_VER)
+#   pragma warning(pop)
+#endif
+
+#endif // TINYXML2_INCLUDED
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/goat3d.cc
--- a/src/goat3d.cc	Fri Sep 27 07:14:27 2013 +0300
+++ b/src/goat3d.cc	Fri Sep 27 07:14:49 2013 +0300
@@ -243,15 +243,7 @@
 	return (int)mesh->faces.size();
 }
 
-#if __cplusplus >= 201103L
-#define MOVE(x)	std::move(x)
-#else
-#define MOVE(x) x
-#endif
-
-#define VECDATA(type, data, num) \
-	MOVE(std::vector<type>((type*)(data), (type*)(data) + (num)))
-
+// VECDATA is in goat3d_impl.h
 void goat3d_set_mesh_attribs(struct goat3d_mesh *mesh, enum goat3d_mesh_attrib attrib, const void *data, int vnum)
 {
 	if(attrib == GOAT3D_MESH_ATTR_VERTEX) {
@@ -360,42 +352,44 @@
 
 void goat3d_end(void)
 {
-	static int tri_offs[] = {0, 1, 2};
-	static int quad_offs[] = {0, 1, 2, 0, 2, 3};
-	int *index_offs;
-
-	int num_faces, in_face_verts, out_face_verts;
 	switch(im_prim) {
 	case GOAT3D_TRIANGLES:
-		in_face_verts = 3;
-		out_face_verts = 3;
-		index_offs = tri_offs;
+		{
+			int num_faces = (int)im_mesh->vertices.size() / 3;
+			im_mesh->faces.resize(num_faces);
+
+			int vidx = 0;
+			for(int i=0; i<num_faces; i++) {
+				im_mesh->faces[i].v[0] = vidx++;
+				im_mesh->faces[i].v[1] = vidx++;
+				im_mesh->faces[i].v[2] = vidx++;
+			}
+		}
 		break;
 
 	case GOAT3D_QUADS:
-		in_face_verts = 4;
-		out_face_verts = 6;
-		index_offs = quad_offs;
+		{
+			int num_quads = (int)im_mesh->vertices.size() / 4;
+			im_mesh->faces.resize(num_quads * 2);
+
+			int vidx = 0;
+			for(int i=0; i<num_quads; i++) {
+				im_mesh->faces[i * 2].v[0] = vidx;
+				im_mesh->faces[i * 2].v[1] = vidx + 1;
+				im_mesh->faces[i * 2].v[2] = vidx + 2;
+
+				im_mesh->faces[i * 2 + 1].v[0] = vidx;
+				im_mesh->faces[i * 2 + 1].v[1] = vidx + 2;
+				im_mesh->faces[i * 2 + 1].v[2] = vidx + 3;
+
+				vidx += 4;
+			}
+		}
 		break;
 
 	default:
 		return;
 	};
-
-	num_faces = (int)im_mesh->vertices.size() / in_face_verts;
-	if(!num_faces) {
-		return;
-	}
-
-	im_mesh->faces.resize(num_faces);
-
-	int vidx = 0;
-	for(int i=0; i<num_faces; i++) {
-		for(int j=0; j<out_face_verts; j++) {
-			im_mesh->faces[i].v[j] = vidx + index_offs[j];
-		}
-		vidx += 4;
-	}
 }
 
 void goat3d_vertex3f(float x, float y, float z)
@@ -424,21 +418,25 @@
 void goat3d_normal3f(float x, float y, float z)
 {
 	im_norm = Vector3(x, y, z);
+	im_use[GOAT3D_MESH_ATTR_NORMAL] = true;
 }
 
 void goat3d_tangent3f(float x, float y, float z)
 {
 	im_tang = Vector3(x, y, z);
+	im_use[GOAT3D_MESH_ATTR_TANGENT] = true;
 }
 
 void goat3d_texcoord2f(float x, float y)
 {
 	im_texcoord = Vector2(x, y);
+	im_use[GOAT3D_MESH_ATTR_TEXCOORD] = true;
 }
 
 void goat3d_skin_weight4f(float x, float y, float z, float w)
 {
 	im_skinw = Vector4(x, y, z, w);
+	im_use[GOAT3D_MESH_ATTR_SKIN_WEIGHT] = true;
 }
 
 void goat3d_skin_matrix4i(int x, int y, int z, int w)
@@ -447,16 +445,18 @@
 	im_skinmat.y = y;
 	im_skinmat.z = z;
 	im_skinmat.w = w;
+	im_use[GOAT3D_MESH_ATTR_SKIN_MATRIX] = true;
 }
 
 void goat3d_color3f(float x, float y, float z)
 {
-	im_color = Vector4(x, y, z, 1.0f);
+	goat3d_color4f(x, y, z, 1.0f);
 }
 
 void goat3d_color4f(float x, float y, float z, float w)
 {
 	im_color = Vector4(x, y, z, w);
+	im_use[GOAT3D_MESH_ATTR_COLOR] = true;
 }
 
 void goat3d_add_mesh(struct goat3d *g, struct goat3d_mesh *mesh)
@@ -464,6 +464,16 @@
 	g->scn->add_mesh(mesh);
 }
 
+int goat3d_get_mesh_count(struct goat3d *g)
+{
+	return g->scn->get_mesh_count();
+}
+
+struct goat3d_mesh *goat3d_get_mesh(struct goat3d *g, int idx)
+{
+	return (goat3d_mesh*)g->scn->get_mesh(idx);
+}
+
 
 }	// extern "C"
 
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/goat3d.h
--- a/src/goat3d.h	Fri Sep 27 07:14:27 2013 +0300
+++ b/src/goat3d.h	Fri Sep 27 07:14:49 2013 +0300
@@ -155,6 +155,9 @@
 
 void goat3d_add_mesh(struct goat3d *g, struct goat3d_mesh *mesh);
 
+int goat3d_get_mesh_count(struct goat3d *g);
+struct goat3d_mesh *goat3d_get_mesh(struct goat3d *g, int idx);
+
 #ifdef __cplusplus
 }
 #endif
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/goat3d_impl.h
--- a/src/goat3d_impl.h	Fri Sep 27 07:14:27 2013 +0300
+++ b/src/goat3d_impl.h	Fri Sep 27 07:14:49 2013 +0300
@@ -12,6 +12,16 @@
 
 extern int goat_log_level;
 
+#if __cplusplus >= 201103L
+#define MOVE(x)	std::move(x)
+#else
+#define MOVE(x) x
+#endif
+
+#define VECDATA(type, data, num) \
+	MOVE(std::vector<type>((type*)(data), (type*)(data) + (num)))
+
+
 class Scene {
 private:
 	std::string name;
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/goat3d_readxml.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/goat3d_readxml.cc	Fri Sep 27 07:14:49 2013 +0300
@@ -0,0 +1,175 @@
+#include <stdio.h>
+#include "goat3d.h"
+#include "goat3d_impl.h"
+#include "tinyxml2.h"
+#include "log.h"
+
+using namespace tinyxml2;
+
+static Material *read_material(Scene *scn, XMLElement *xml_mtl);
+static const char *read_material_attrib(MaterialAttrib *attr, XMLElement *xml_attr);
+static Mesh *read_mesh(Scene *scn, XMLElement *xml_mesh);
+static std::string get_name(XMLElement *node, int idx);
+
+bool Scene::loadxml(goat3d_io *io)
+{
+	long bytes = io->seek(0, SEEK_END, io->cls);
+	io->seek(0, SEEK_SET, io->cls);
+
+	char *buf = new char[bytes];
+	if(io->read(buf, bytes, io->cls) < bytes) {
+		logmsg(LOG_ERROR, "failed to read XML scene file\n");
+		return false;
+	}
+
+	XMLDocument xml;
+	XMLError err = xml.Parse(buf, bytes);
+	if(err) {
+		logmsg(LOG_ERROR, "failed to parse XML scene file: %s\n%s\n", xml.GetErrorStr1(),
+				xml.GetErrorStr2());
+		return false;
+	}
+
+	XMLElement *root = xml.RootElement();
+	if(strcmp(root->Name(), "scene") != 0) {
+		logmsg(LOG_ERROR, "invalid XML file, root node is not <scene>\n");
+		return false;
+	}
+
+	XMLElement *elem;
+
+	// get all materials
+	elem = root->FirstChildElement("mtl");
+	while(elem) {
+		Material *mtl = read_material(this, elem);
+		if(mtl) {
+			add_material(mtl);
+		}
+		elem = elem->NextSiblingElement("mtl");
+	}
+
+	// get all meshes
+	elem = root->FirstChildElement("mesh");
+	while(elem) {
+		Mesh *mesh = read_mesh(this, elem);
+		if(mesh) {
+			add_mesh(mesh);
+		}
+		elem = elem->NextSiblingElement("mesh");
+	}
+
+	return false;
+}
+
+
+static Material *read_material(Scene *scn, XMLElement *xml_mtl)
+{
+	Material *mtl = new Material;
+	mtl->name = get_name(xml_mtl, scn->get_material_count());
+
+	// get all the material attributes in turn
+	XMLElement *elem = xml_mtl->FirstChildElement("attr");
+	while(elem) {
+		MaterialAttrib attr;
+		const char *name = read_material_attrib(&attr, elem);
+		if(name) {
+			(*mtl)[name] = attr;
+		}
+
+		elem = elem->NextSiblingElement("attr");
+	}
+
+	return mtl;
+}
+
+static const char *read_material_attrib(MaterialAttrib *attr, XMLElement *xml_attr)
+{
+	const char *name;
+
+	XMLElement *elem;
+	if((elem = xml_attr->FirstChildElement("name"))) {
+		if(!(name = elem->Attribute("string"))) {
+			return 0;
+		}
+	}
+
+	if((elem = xml_attr->FirstChildElement("val"))) {
+		if(elem->QueryFloatAttribute("float", &attr->value.x) != XML_NO_ERROR) {
+			// try a float3
+			const char *valstr = elem->Attribute("float3");
+			if(!valstr || sscanf(valstr, "%f %f %f", &attr->value.x, &attr->value.y,
+						&attr->value.z) != 3) {
+				// try a float4
+				valstr = elem->Attribute("float4");
+				if(!valstr || sscanf(valstr, "%f %f %f %f", &attr->value.x, &attr->value.y,
+							&attr->value.z, &attr->value.w) != 4) {
+					// no valid val attribute found
+					return 0;
+				}
+			}
+		}
+	}
+
+	if((elem = xml_attr->FirstChildElement("map"))) {
+		const char *tex = elem->Attribute("string");
+		if(tex) {
+			attr->map = std::string(tex);
+		}
+	}
+
+	return name;
+}
+
+static Mesh *read_mesh(Scene *scn, XMLElement *xml_mesh)
+{
+	Mesh *mesh = new Mesh;
+	mesh->name = get_name(xml_mesh, scn->get_mesh_count());
+
+	XMLElement *elem;
+	if((elem = xml_mesh->FirstChildElement("material"))) {
+		int idx;
+		if(elem->QueryIntAttribute("int", &idx) == XML_NO_ERROR) {
+			mesh->material = scn->get_material(idx);
+		} else {
+			// try string
+			const char *mtlstr = elem->Attribute("string");
+			if(mtlstr) {
+				mesh->material = scn->get_material(mtlstr);
+			}
+		}
+	}
+
+	/* reading mesh data from XML is not supported, only MESH_FILE can be used to
+	 * specify an external mesh file to be loaded
+	 */
+
+	if((elem = xml_mesh->FirstChildElement("file"))) {
+		const char *fname = elem->Attribute("string");
+		if(fname) {
+			if(!mesh->load(fname)) {
+				delete mesh;
+				return 0;
+			}
+		}
+	}
+
+	return mesh;
+}
+
+static std::string get_name(XMLElement *node, int idx)
+{
+	char buf[64];
+	const char *name = 0;
+
+	XMLElement *elem;
+	if((elem = node->FirstChildElement("name"))) {
+		name = elem->Attribute("string");
+	}
+
+	if(!name) {
+		sprintf(buf, "mesh%04d", idx);
+		name = buf;
+	}
+
+	return std::string(name);
+}
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/goat3d_scene.cc
--- a/src/goat3d_scene.cc	Fri Sep 27 07:14:27 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-#include <stdarg.h>
-#include "goat3d.h"
-#include "goat3d_impl.h"
-#include "chunk.h"
-
-Scene::Scene()
-	: name("unnamed"), ambient(0.05, 0.05, 0.05)
-{
-}
-
-Scene::~Scene()
-{
-	clear();
-}
-
-void Scene::clear()
-{
-	for(size_t i=0; i<materials.size(); i++) {
-		delete materials[i];
-	}
-	materials.clear();
-
-	for(size_t i=0; i<meshes.size(); i++) {
-		delete meshes[i];
-	}
-	meshes.clear();
-
-	for(size_t i=0; i<lights.size(); i++) {
-		delete lights[i];
-	}
-	lights.clear();
-
-	for(size_t i=0; i<cameras.size(); i++) {
-		delete cameras[i];
-	}
-	cameras.clear();
-
-	for(size_t i=0; i<nodes.size(); i++) {
-		delete_node_tree(nodes[i]);
-	}
-	nodes.clear();
-
-	name = "unnamed";
-}
-
-void Scene::set_name(const char *name)
-{
-	this->name = name;
-}
-
-const char *Scene::get_name() const
-{
-	return name.c_str();
-}
-
-void Scene::set_ambient(const Vector3 &amb)
-{
-	ambient = amb;
-}
-
-const Vector3 &Scene::get_ambient() const
-{
-	return ambient;
-}
-
-void Scene::add_material(Material *mat)
-{
-	materials.push_back(mat);
-}
-
-Material *Scene::get_material(int idx) const
-{
-	return idx >=0 && idx < (int)materials.size() ? materials[idx] : 0;
-}
-
-Material *Scene::get_material(const char *name) const
-{
-	for(size_t i=0; i<materials.size(); i++) {
-		if(materials[i]->name == std::string(name)) {
-			return materials[i];
-		}
-	}
-	return 0;
-}
-
-int Scene::get_material_count() const
-{
-	return (int)materials.size();
-}
-
-
-void Scene::add_mesh(Mesh *mesh)
-{
-	meshes.push_back(mesh);
-}
-
-Mesh *Scene::get_mesh(int idx) const
-{
-	return idx >= 0 && idx < (int)meshes.size() ? meshes[idx] : 0;
-}
-
-Mesh *Scene::get_mesh(const char *name) const
-{
-	for(size_t i=0; i<meshes.size(); i++) {
-		if(meshes[i]->name == std::string(name)) {
-			return meshes[i];
-		}
-	}
-	return 0;
-}
-
-int Scene::get_mesh_count() const
-{
-	return (int)meshes.size();
-}
-
-
-void Scene::add_light(Light *light)
-{
-	lights.push_back(light);
-}
-
-Light *Scene::get_light(int idx) const
-{
-	return idx >= 0 && idx < (int)lights.size() ? lights[idx] : 0;
-}
-
-Light *Scene::get_light(const char *name) const
-{
-	for(size_t i=0; i<lights.size(); i++) {
-		if(lights[i]->name == std::string(name)) {
-			return lights[i];
-		}
-	}
-	return 0;
-}
-
-int Scene::get_light_count() const
-{
-	return (int)lights.size();
-}
-
-
-void Scene::add_camera(Camera *cam)
-{
-	cameras.push_back(cam);
-}
-
-Camera *Scene::get_camera(int idx) const
-{
-	return idx >= 0 && idx < (int)cameras.size() ? cameras[idx] : 0;
-}
-
-Camera *Scene::get_camera(const char *name) const
-{
-	for(size_t i=0; i<cameras.size(); i++) {
-		if(cameras[i]->name == std::string(name)) {
-			return cameras[i];
-		}
-	}
-	return 0;
-}
-
-int Scene::get_camera_count() const
-{
-	return (int)cameras.size();
-}
-
-
-void Scene::add_node(Node *node)
-{
-	nodes.push_back(node);
-}
-
-Node *Scene::get_node(int idx) const
-{
-	return idx >= 0 && idx < (int)nodes.size() ? nodes[idx] : 0;
-}
-
-Node *Scene::get_node(const char *name) const
-{
-	for(size_t i=0; i<nodes.size(); i++) {
-		if(strcmp(nodes[i]->get_name(), name) == 0) {
-			return nodes[i];
-		}
-	}
-	return 0;
-}
-
-int Scene::get_node_count() const
-{
-	return (int)nodes.size();
-}
-
-
-bool Scene::load(goat3d_io *io)
-{
-	return false;
-}
-
-bool Scene::loadxml(goat3d_io *io)
-{
-	return false;
-}
-
-// Scene::save is defined in goat3d_write.cc
-
-
-void io_fprintf(goat3d_io *io, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	io_vfprintf(io, fmt, ap);
-	va_end(ap);
-}
-
-
-void io_vfprintf(goat3d_io *io, const char *fmt, va_list ap)
-{
-	char smallbuf[256];
-	char *buf = smallbuf;
-	int sz = sizeof smallbuf;
-
-	int retsz = vsnprintf(buf, sz - 1, fmt, ap);
-
-	if(retsz >= sz) {
-		/* C99 mandates that snprintf with a short count should return the
-		 * number of characters that *would* be printed.
-		 */
-		buf = new char[retsz + 1];
-
-		vsnprintf(buf, retsz, fmt, ap);
-
-	} else if(retsz <= 0) {
-		/* SUSv2 and microsoft specify that snprintf with a short count
-		 * returns an arbitrary value <= 0. So let's try allocating
-		 * bigger and bigger arrays until we find the correct size.
-		 */
-		sz = sizeof smallbuf;
-		do {
-			sz *= 2;
-			if(buf != smallbuf) {
-				delete [] buf;
-			}
-			buf = new char[sz + 1];
-
-			retsz = vsnprintf(buf, sz, fmt, ap);
-		} while(retsz <= 0);
-	}
-
-	io->write(buf, retsz, io->cls);
-
-	if(buf != smallbuf) {
-		delete [] buf;
-	}
-
-}
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/goat3d_writexml.cc
--- a/src/goat3d_writexml.cc	Fri Sep 27 07:14:27 2013 +0300
+++ b/src/goat3d_writexml.cc	Fri Sep 27 07:14:49 2013 +0300
@@ -1,11 +1,9 @@
 #include <stdarg.h>
 #include "goat3d_impl.h"
-#include "chunk.h"
-#include "openctm.h"
+#include "log.h"
 
 static bool write_material(const Scene *scn, goat3d_io *io, const Material *mat, int level);
 static bool write_mesh(const Scene *scn, goat3d_io *io, const Mesh *mesh, int idx, int level);
-static void write_ctm_mesh(const Mesh *mesh, const char *fname);
 static bool write_light(const Scene *scn, goat3d_io *io, const Light *light, int level);
 static bool write_camera(const Scene *scn, goat3d_io *io, const Camera *cam, int level);
 static bool write_node(const Scene *scn, goat3d_io *io, const Node *node, int level);
@@ -17,7 +15,8 @@
 
 	// write environment stuff
 	xmlout(io, 1, "<env>\n");
-	xmlout(io, 1, "</env>\n");
+	xmlout(io, 2, "<ambient float3=\"%g %g %g\"/>\n", ambient.x, ambient.y, ambient.z);
+	xmlout(io, 1, "</env>\n\n");
 
 	for(size_t i=0; i<materials.size(); i++) {
 		write_material(this, io, materials[i], 1);
@@ -49,14 +48,14 @@
 		xmlout(io, level + 2, "<name string=\"%s\"/>\n", mat->get_attrib_name(i));
 
 		const MaterialAttrib &attr = (*mat)[i];
-		xmlout(io, level + 2, "<val float4=\"%.3f %.3f %.3f %.3f\"/>\n", attr.value.x,
+		xmlout(io, level + 2, "<val float4=\"%g %g %g %g\"/>\n", attr.value.x,
 				attr.value.y, attr.value.z, attr.value.w);
 		if(!attr.map.empty()) {
 			xmlout(io, level + 2, "<map string=\"%s\"/>\n", attr.map.c_str());
 		}
 		xmlout(io, level + 1, "</attr>\n");
 	}
-	xmlout(io, level, "</mtl>\n");
+	xmlout(io, level, "</mtl>\n\n");
 	return true;
 }
 
@@ -71,85 +70,21 @@
 	char *mesh_filename = (char*)alloca(strlen(prefix) + 32);
 	sprintf(mesh_filename, "%s-mesh%04d.ctm", prefix, idx);
 
-	write_ctm_mesh(mesh, mesh_filename);
+	if(!mesh->save(mesh_filename)) {
+		return false;
+	}
 
 	// then refer to that filename in the XML tags
 	xmlout(io, level, "<mesh>\n");
 	xmlout(io, level + 1, "<name string=\"%s\"/>\n", mesh->name.c_str());
-	xmlout(io, level + 1, "<material string=\"%s\"/>\n", mesh->material->name.c_str());
+	if(mesh->material) {
+		xmlout(io, level + 1, "<material string=\"%s\"/>\n", mesh->material->name.c_str());
+	}
 	xmlout(io, level + 1, "<file string=\"%s\"/>\n", mesh_filename);
-	xmlout(io, level, "</mesh>\n");
+	xmlout(io, level, "</mesh>\n\n");
 	return true;
 }
 
-static void write_ctm_mesh(const Mesh *mesh, const char *fname)
-{
-	int vnum = (int)mesh->vertices.size();
-
-	CTMcontext ctm = ctmNewContext(CTM_EXPORT);
-
-	// vertices, normals, and face-vertex indices
-	ctmDefineMesh(ctm, &mesh->vertices[0].x, vnum, (CTMuint*)mesh->faces[0].v,
-			mesh->faces.size(), mesh->normals.empty() ? 0 : &mesh->normals[0].x);
-
-	// texture coordinates
-	if(!mesh->texcoords.empty()) {
-		ctmAddUVMap(ctm, &mesh->texcoords[0].x, "texcoord", 0);
-	}
-
-	// vertex colors
-	if(!mesh->colors.empty()) {
-		ctmAddAttribMap(ctm, &mesh->colors[0].x, "color");
-	}
-
-	// skin weights
-	if(!mesh->skin_weights.empty()) {
-		ctmAddAttribMap(ctm, &mesh->skin_weights[0].x, "skin_weight");
-	}
-
-	// if either of the non-float4 attributes are present we need to make a tmp array
-	CTMfloat *attr_array = 0;
-	if(!mesh->tangents.empty() || !mesh->skin_matrices.empty()) {
-		attr_array = new CTMfloat[vnum * 4 * sizeof *attr_array];
-	}
-
-	// tangents
-	if(!mesh->tangents.empty()) {
-		CTMfloat *ptr = attr_array;
-
-		for(int i=0; i<vnum; i++) {
-			*ptr++ = mesh->tangents[i].x;
-			*ptr++ = mesh->tangents[i].y;
-			*ptr++ = mesh->tangents[i].z;
-			*ptr++ = 1.0;
-		}
-		ctmAddAttribMap(ctm, attr_array, "tangent");
-	}
-
-	// skin matrix indices (4 per vertex)
-	if(!mesh->skin_matrices.empty()) {
-		CTMfloat *ptr = attr_array;
-
-		for(int i=0; i<vnum; i++) {
-			*ptr++ = (float)mesh->skin_matrices[i].x;
-			*ptr++ = (float)mesh->skin_matrices[i].y;
-			*ptr++ = (float)mesh->skin_matrices[i].z;
-			*ptr++ = (float)mesh->skin_matrices[i].w;
-		}
-		ctmAddAttribMap(ctm, attr_array, "skin_matrix");
-	}
-
-	delete [] attr_array;
-
-	/* TODO find a way to specify the nodes participating in the skinning of this mesh
-	 * probably in the comment field?
-	 */
-
-	ctmSave(ctm, fname);
-
-	ctmFreeContext(ctm);
-}
-
 static bool write_light(const Scene *scn, goat3d_io *io, const Light *light, int level)
 {
 	return true;
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/log.cc
--- a/src/log.cc	Fri Sep 27 07:14:27 2013 +0300
+++ b/src/log.cc	Fri Sep 27 07:14:49 2013 +0300
@@ -6,14 +6,13 @@
 
 void logmsg(int prio, const char *fmt, ...)
 {
-	fprintf(stderr, "goat3d error: ");
-
 	va_list ap;
 
-	if(prio < goat_log_level) {
+	if(goat_log_level < prio) {
 		return;
 	}
 
+	fprintf(stderr, "goat3d: ");
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/mesh.cc
--- a/src/mesh.cc	Fri Sep 27 07:14:27 2013 +0300
+++ b/src/mesh.cc	Fri Sep 27 07:14:49 2013 +0300
@@ -1,10 +1,182 @@
+#include "goat3d_impl.h"
 #include "mesh.h"
+#include "openctm.h"
+#include "log.h"
 
 Mesh::Mesh()
 {
 	material = 0;
 }
 
+bool Mesh::load(const char *fname)
+{
+	CTMcontext ctm = ctmNewContext(CTM_IMPORT);
+
+	ctmLoad(ctm, fname);
+	if(ctmGetError(ctm) != CTM_NONE) {
+		logmsg(LOG_ERROR, "failed to load ctm mesh: %s\n", fname);
+		ctmFreeContext(ctm);
+		return false;
+	}
+
+	int vnum = ctmGetInteger(ctm, CTM_VERTEX_COUNT);
+	int fnum = ctmGetInteger(ctm, CTM_TRIANGLE_COUNT);
+
+	const CTMfloat *vertices = ctmGetFloatArray(ctm, CTM_VERTICES);
+	if(!vertices) {
+		logmsg(LOG_ERROR, "failed to load ctm mesh: %s: no vertices found!\n", fname);
+		ctmFreeContext(ctm);
+		return false;
+	}
+
+	const CTMuint *indices = ctmGetIntegerArray(ctm, CTM_INDICES);
+	if(!indices) {
+		logmsg(LOG_ERROR, "failed to load ctm mesh: %s: no faces found!\n", fname);
+		ctmFreeContext(ctm);
+		return false;
+	}
+
+	const CTMfloat *normals = ctmGetFloatArray(ctm, CTM_NORMALS);
+	const CTMfloat *texcoords = ctmGetFloatArray(ctm, CTM_UV_MAP_1);
+
+	CTMenum tangent_id = ctmGetNamedAttribMap(ctm, "tangent");
+	const CTMfloat *tangents = tangent_id ? ctmGetFloatArray(ctm, tangent_id) : 0;
+
+	CTMenum skinweight_id = ctmGetNamedAttribMap(ctm, "skin_weight");
+	const CTMfloat *skinweights = skinweight_id ? ctmGetFloatArray(ctm, skinweight_id) : 0;
+
+	CTMenum skinmat_id = ctmGetNamedAttribMap(ctm, "skin_matrix");
+	const CTMuint *skinmats = skinmat_id ? ctmGetIntegerArray(ctm, skinmat_id) : 0;
+
+	CTMenum color_id = ctmGetNamedAttribMap(ctm, "color");
+	const CTMfloat *colors = color_id ? ctmGetFloatArray(ctm, color_id) : 0;
+
+	// now put everything we found into our vectors
+	this->vertices = VECDATA(Vector3, vertices, vnum);
+
+	if(texcoords) {
+		this->texcoords = VECDATA(Vector2, texcoords, vnum);
+	}
+	if(normals) {
+		this->normals = VECDATA(Vector3, normals, vnum);
+	}
+	if(skinweights) {
+		this->skin_weights = VECDATA(Vector4, skinweights, vnum);
+	}
+	if(colors) {
+		this->colors = VECDATA(Vector4, colors, vnum);
+	}
+
+	// the rest need converting
+	if(tangents) {
+		this->tangents.clear();
+		this->tangents.resize(vnum);
+
+		for(int i=0; i<vnum; i++) {
+			for(int j=0; j<3; j++) {
+				this->tangents[i][j] = tangents[j];
+			}
+			tangents += 4;
+		}
+	}
+	if(skinmats) {
+		this->skin_matrices.clear();
+		this->skin_matrices.resize(vnum);
+
+		for(int i=0; i<vnum; i++) {
+			this->skin_matrices[i].x = skinmats[0];
+			this->skin_matrices[i].y = skinmats[1];
+			this->skin_matrices[i].z = skinmats[2];
+			this->skin_matrices[i].w = skinmats[3];
+		}
+	}
+
+	// grab the face data
+	this->faces.clear();
+	this->faces.resize(fnum);
+
+	for(int i=0; i<fnum; i++) {
+		for(int j=0; j<3; j++) {
+			this->faces[i].v[j] = indices[j];
+		}
+		indices += 3;
+	}
+
+
+	ctmFreeContext(ctm);
+	return true;
+}
+
+bool Mesh::save(const char *fname) const
+{
+	int vnum = (int)vertices.size();
+
+	CTMcontext ctm = ctmNewContext(CTM_EXPORT);
+
+	// vertices, normals, and face-vertex indices
+	ctmDefineMesh(ctm, &vertices[0].x, vnum, (CTMuint*)faces[0].v, faces.size(),
+			normals.empty() ? 0 : &normals[0].x);
+
+	// texture coordinates
+	if(!texcoords.empty()) {
+		ctmAddUVMap(ctm, &texcoords[0].x, "texcoord", 0);
+	}
+
+	// vertex colors
+	if(!colors.empty()) {
+		ctmAddAttribMap(ctm, &colors[0].x, "color");
+	}
+
+	// skin weights
+	if(!skin_weights.empty()) {
+		ctmAddAttribMap(ctm, &skin_weights[0].x, "skin_weight");
+	}
+
+	// if either of the non-float4 attributes are present we need to make a tmp array
+	CTMfloat *attr_array = 0;
+	if(!tangents.empty() || !skin_matrices.empty()) {
+		attr_array = new CTMfloat[vnum * 4 * sizeof *attr_array];
+	}
+
+	// tangents
+	if(!tangents.empty()) {
+		CTMfloat *ptr = attr_array;
+
+		for(int i=0; i<vnum; i++) {
+			*ptr++ = tangents[i].x;
+			*ptr++ = tangents[i].y;
+			*ptr++ = tangents[i].z;
+			*ptr++ = 1.0;
+		}
+		ctmAddAttribMap(ctm, attr_array, "tangent");
+	}
+
+	// skin matrix indices (4 per vertex)
+	if(!skin_matrices.empty()) {
+		CTMfloat *ptr = attr_array;
+
+		for(int i=0; i<vnum; i++) {
+			*ptr++ = (float)skin_matrices[i].x;
+			*ptr++ = (float)skin_matrices[i].y;
+			*ptr++ = (float)skin_matrices[i].z;
+			*ptr++ = (float)skin_matrices[i].w;
+		}
+		ctmAddAttribMap(ctm, attr_array, "skin_matrix");
+	}
+
+	delete [] attr_array;
+
+	/* TODO find a way to specify the nodes participating in the skinning of this mesh
+	 * probably in the comment field?
+	 */
+
+	logmsg(LOG_INFO, "saving CTM mesh file: %s\n", fname);
+	ctmSave(ctm, fname);
+
+	ctmFreeContext(ctm);
+	return true;
+}
+
 void Mesh::set_material(Material *mat)
 {
 	material = mat;
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/mesh.h
--- a/src/mesh.h	Fri Sep 27 07:14:27 2013 +0300
+++ b/src/mesh.h	Fri Sep 27 07:14:49 2013 +0300
@@ -32,6 +32,9 @@
 
 	Mesh();
 
+	bool load(const char *fname);
+	bool save(const char *fname) const;
+
 	void set_material(Material *mat);
 	Material *get_material();
 	const Material *get_material() const;
diff -r 0e31f2c3f29d -r 44a20d72f3a6 src/scene.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/scene.cc	Fri Sep 27 07:14:49 2013 +0300
@@ -0,0 +1,265 @@
+#include <stdarg.h>
+#include "goat3d.h"
+#include "goat3d_impl.h"
+#include "chunk.h"
+
+Scene::Scene()
+	: name("unnamed"), ambient(0.05, 0.05, 0.05)
+{
+}
+
+Scene::~Scene()
+{
+	clear();
+}
+
+void Scene::clear()
+{
+	for(size_t i=0; i<materials.size(); i++) {
+		delete materials[i];
+	}
+	materials.clear();
+
+	for(size_t i=0; i<meshes.size(); i++) {
+		delete meshes[i];
+	}
+	meshes.clear();
+
+	for(size_t i=0; i<lights.size(); i++) {
+		delete lights[i];
+	}
+	lights.clear();
+
+	for(size_t i=0; i<cameras.size(); i++) {
+		delete cameras[i];
+	}
+	cameras.clear();
+
+	for(size_t i=0; i<nodes.size(); i++) {
+		delete_node_tree(nodes[i]);
+	}
+	nodes.clear();
+
+	name = "unnamed";
+}
+
+void Scene::set_name(const char *name)
+{
+	this->name = name;
+}
+
+const char *Scene::get_name() const
+{
+	return name.c_str();
+}
+
+void Scene::set_ambient(const Vector3 &amb)
+{
+	ambient = amb;
+}
+
+const Vector3 &Scene::get_ambient() const
+{
+	return ambient;
+}
+
+void Scene::add_material(Material *mat)
+{
+	if(mat->name.empty()) {
+		char buf[64];
+		sprintf(buf, "material%04d", (int)materials.size());
+		mat->name = std::string(buf);
+	}
+	materials.push_back(mat);
+}
+
+Material *Scene::get_material(int idx) const
+{
+	return idx >=0 && idx < (int)materials.size() ? materials[idx] : 0;
+}
+
+Material *Scene::get_material(const char *name) const
+{
+	for(size_t i=0; i<materials.size(); i++) {
+		if(materials[i]->name == std::string(name)) {
+			return materials[i];
+		}
+	}
+	return 0;
+}
+
+int Scene::get_material_count() const
+{
+	return (int)materials.size();
+}
+
+
+void Scene::add_mesh(Mesh *mesh)
+{
+	if(mesh->name.empty()) {
+		char buf[64];
+		sprintf(buf, "mesh%04d", (int)meshes.size());
+		mesh->name = std::string(buf);
+	}
+	meshes.push_back(mesh);
+}
+
+Mesh *Scene::get_mesh(int idx) const
+{
+	return idx >= 0 && idx < (int)meshes.size() ? meshes[idx] : 0;
+}
+
+Mesh *Scene::get_mesh(const char *name) const
+{
+	for(size_t i=0; i<meshes.size(); i++) {
+		if(meshes[i]->name == std::string(name)) {
+			return meshes[i];
+		}
+	}
+	return 0;
+}
+
+int Scene::get_mesh_count() const
+{
+	return (int)meshes.size();
+}
+
+
+void Scene::add_light(Light *light)
+{
+	lights.push_back(light);
+}
+
+Light *Scene::get_light(int idx) const
+{
+	return idx >= 0 && idx < (int)lights.size() ? lights[idx] : 0;
+}
+
+Light *Scene::get_light(const char *name) const
+{
+	for(size_t i=0; i<lights.size(); i++) {
+		if(lights[i]->name == std::string(name)) {
+			return lights[i];
+		}
+	}
+	return 0;
+}
+
+int Scene::get_light_count() const
+{
+	return (int)lights.size();
+}
+
+
+void Scene::add_camera(Camera *cam)
+{
+	cameras.push_back(cam);
+}
+
+Camera *Scene::get_camera(int idx) const
+{
+	return idx >= 0 && idx < (int)cameras.size() ? cameras[idx] : 0;
+}
+
+Camera *Scene::get_camera(const char *name) const
+{
+	for(size_t i=0; i<cameras.size(); i++) {
+		if(cameras[i]->name == std::string(name)) {
+			return cameras[i];
+		}
+	}
+	return 0;
+}
+
+int Scene::get_camera_count() const
+{
+	return (int)cameras.size();
+}
+
+
+void Scene::add_node(Node *node)
+{
+	nodes.push_back(node);
+}
+
+Node *Scene::get_node(int idx) const
+{
+	return idx >= 0 && idx < (int)nodes.size() ? nodes[idx] : 0;
+}
+
+Node *Scene::get_node(const char *name) const
+{
+	for(size_t i=0; i<nodes.size(); i++) {
+		if(strcmp(nodes[i]->get_name(), name) == 0) {
+			return nodes[i];
+		}
+	}
+	return 0;
+}
+
+int Scene::get_node_count() const
+{
+	return (int)nodes.size();
+}
+
+
+bool Scene::load(goat3d_io *io)
+{
+	return false;
+}
+
+// Scene::loadxml is defined in goat3d_readxml.cc
+// Scene::save is defined in goat3d_write.cc
+// Scene::savexml is defined in goat3d_writexml.cc
+
+
+void io_fprintf(goat3d_io *io, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	io_vfprintf(io, fmt, ap);
+	va_end(ap);
+}
+
+
+void io_vfprintf(goat3d_io *io, const char *fmt, va_list ap)
+{
+	char smallbuf[256];
+	char *buf = smallbuf;
+	int sz = sizeof smallbuf;
+
+	int retsz = vsnprintf(buf, sz - 1, fmt, ap);
+
+	if(retsz >= sz) {
+		/* C99 mandates that snprintf with a short count should return the
+		 * number of characters that *would* be printed.
+		 */
+		buf = new char[retsz + 1];
+
+		vsnprintf(buf, retsz, fmt, ap);
+
+	} else if(retsz <= 0) {
+		/* SUSv2 and microsoft specify that snprintf with a short count
+		 * returns an arbitrary value <= 0. So let's try allocating
+		 * bigger and bigger arrays until we find the correct size.
+		 */
+		sz = sizeof smallbuf;
+		do {
+			sz *= 2;
+			if(buf != smallbuf) {
+				delete [] buf;
+			}
+			buf = new char[sz + 1];
+
+			retsz = vsnprintf(buf, sz, fmt, ap);
+		} while(retsz <= 0);
+	}
+
+	io->write(buf, retsz, io->cls);
+
+	if(buf != smallbuf) {
+		delete [] buf;
+	}
+
+}