# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1497492600 -10800
# Node ID d0297d001505350d307b6b6fc1a2ddcd9d7130f1
# Parent  8171de5a000b084e9ba7a40b64f8b3463429deb9
some command line options

diff -r 8171de5a000b -r d0297d001505 Makefile
--- a/Makefile	Wed Jun 14 18:03:57 2017 +0300
+++ b/Makefile	Thu Jun 15 05:10:00 2017 +0300
@@ -2,7 +2,7 @@
 obj = $(src:.c=.o)
 bin = voxfract
 
-CFLAGS = -pedantic -Wall -g
+CFLAGS = -pedantic -Wall -g -O3 -ffast-math
 LDFLAGS = -lGL -lGLU -lglut -lmetasurf -lm
 
 $(bin): $(obj)
diff -r 8171de5a000b -r d0297d001505 src/main.c
--- a/src/main.c	Wed Jun 14 18:03:57 2017 +0300
+++ b/src/main.c	Thu Jun 15 05:10:00 2017 +0300
@@ -22,15 +22,15 @@
 
 int julia(struct quat *qres, struct quat *qprime, struct quat *q, struct quat *seed, int max_iter);
 float julia_dist(struct quat *z, struct quat *seed, int max_iter);
-void julia_grad(float *grad, float dist, struct quat *q, struct quat *seed, int max_iter);
+void julia_grad(float *grad, struct quat *q, struct quat *seed, int max_iter);
 
 void show_waitscr(void);
 
 float cam_theta, cam_phi = 25, cam_dist = 5;
-int grid_size = 350;
+int grid_size = 300;
 float grid_scale = 1.7;
 struct quat seed = {0.4, 0.0, 0.0, -0.8};
-int max_iter = 9;
+int max_iter = 10;
 
 struct metasurface *msurf;
 int dlist;
@@ -38,6 +38,41 @@
 
 int main(int argc, char **argv)
 {
+	int i;
+
+	for(i=1; i<argc; i++) {
+		if(argv[i][0] == '-') {
+			if(argv[i][2] != 0) {
+				fprintf(stderr, "invalid option: %s\n", argv[i]);
+				return 1;
+			}
+			switch(argv[i][1]) {
+			case 'g':
+				if((grid_size = atoi(argv[++i])) <= 0) {
+					fprintf(stderr, "invalid grid size value: %s\n", argv[i]);
+					return 1;
+				}
+				break;
+
+			case 'i':
+				if((max_iter = atoi(argv[++i])) <= 0) {
+					fprintf(stderr, "invalid iterations count: %s\n", argv[i]);
+					return 1;
+				}
+				break;
+
+			default:
+				fprintf(stderr, "invalid option: %s\n", argv[i]);
+				return 1;
+			}
+		} else {
+			fprintf(stderr, "unexpected argument: %s\n", argv[i]);
+			return 1;
+		}
+	}
+	printf("grid size: %d\n", grid_size);
+	printf("max iter: %d\n", max_iter);
+
 	glutInit(&argc, argv);
 	glutInitWindowSize(800, 600);
 	glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
@@ -128,9 +163,20 @@
 
 void keypress(unsigned char key, int x, int y)
 {
+	static int flat;
+
 	switch(key) {
 	case 27:
 		exit(0);
+
+	case 's':
+		flat = !flat;
+		if(flat) {
+			glShadeModel(GL_FLAT);
+		} else {
+			glShadeModel(GL_SMOOTH);
+		}
+		glutPostRedisplay();
 	}
 }
 
@@ -184,7 +230,6 @@
 void vertex(struct metasurface *ms, float x, float y, float z)
 {
 	struct quat q;
-	float dist;
 	float norm[3];
 	float norm_len, nscale = 1.0;
 
@@ -193,13 +238,11 @@
 	q.y = grid_scale * z;
 	q.z = 0.0f;
 
-	dist = julia_dist(&q, &seed, max_iter);
-
-	julia_grad(norm, dist, &q, &seed, max_iter);
+	julia_grad(norm, &q, &seed, max_iter);
 	norm_len = sqrt(norm[0] * norm[0] + norm[1] * norm[1] + norm[2] * norm[2]);
 
-	if(norm_len != 0.0f) {
-		nscale = 1.0f / norm_len;
+	if(norm_len != 0.0) {
+		nscale = 1.0 / norm_len;
 	}
 
 	glNormal3f(norm[0] * nscale, norm[1] * nscale, norm[2] * nscale);
@@ -284,8 +327,8 @@
 	return 0.5 * lenq * log(lenq) / lenqp;
 }
 
-#define OFFS 1e-4
-void julia_grad(float *grad, float dist, struct quat *q, struct quat *seed, int max_iter)
+#define OFFS 1e-5
+void julia_grad(float *grad, struct quat *q, struct quat *seed, int max_iter)
 {
 	struct quat qnext = *q;
 	struct quat qprev = *q;