# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1423250123 -7200
# Node ID df4a277adb82b6bc4ee878b15a01295304495b00
# Parent  eb87d4a12bd39f029392866a1bdadaa18d8285da
port to macosx

diff -r eb87d4a12bd3 -r df4a277adb82 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Fri Feb 06 21:15:23 2015 +0200
@@ -0,0 +1,5 @@
+\.o$
+\.d$
+\.swp$
+^data/
+^test1$
diff -r eb87d4a12bd3 -r df4a277adb82 Makefile
--- a/Makefile	Mon Aug 18 10:44:11 2014 +0300
+++ b/Makefile	Fri Feb 06 21:15:23 2015 +0200
@@ -3,13 +3,21 @@
 dep = $(obj:.o=.d)
 bin = test1
 
+warn = -pedantic -Wall
 dbg = -g
 opt = -O0
 inc = -Isrc -I/usr/local/include -I/usr/local/lib
 
 CXX = g++
-CXXFLAGS = -std=c++11 -pedantic -Wall $(dbg) $(opt) $(inc)
-LDFLAGS = -lGL -lGLU -lGLEW -lglut -limago -lm -lmetasurf -lglui
+CXXFLAGS = -std=c++11 $(warn) $(dbg) $(opt) $(inc)
+LDFLAGS = $(libgl) -limago -lm
+
+ifeq ($(shell uname -s), Darwin)
+	libgl = -framework OpenGL -framework GLUT -lGLEW -lglui
+	warn += -Wno-deprecated-declarations
+else
+	libgl = -lGL -lGLU -lglut -lGLEW -lglui
+endif
 
 $(bin): $(obj)
 	$(CXX) -o $@ $(obj) $(LDFLAGS)
diff -r eb87d4a12bd3 -r df4a277adb82 src/main.cc
--- a/src/main.cc	Mon Aug 18 10:44:11 2014 +0300
+++ b/src/main.cc	Fri Feb 06 21:15:23 2015 +0200
@@ -1,6 +1,4 @@
-#include <GL/glew.h>
-#include <GL/glut.h>
-#include <GL/glui.h>
+#include "opengl.h"
 
 #include <math.h>
 #include <stdio.h>
diff -r eb87d4a12bd3 -r df4a277adb82 src/mesh.cc
--- a/src/mesh.cc	Mon Aug 18 10:44:11 2014 +0300
+++ b/src/mesh.cc	Fri Feb 06 21:15:23 2015 +0200
@@ -1,4 +1,4 @@
-#include <GL/gl.h>
+#include "opengl.h"
 #include "mesh.h"
 
 Mesh::Mesh()
diff -r eb87d4a12bd3 -r df4a277adb82 src/opengl.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/opengl.h	Fri Feb 06 21:15:23 2015 +0200
@@ -0,0 +1,15 @@
+#ifndef OPENGL_H_
+#define OPENGL_H_
+
+#include <GL/glew.h>
+
+#ifndef __APPLE__
+#include <GL/glut.h>
+#else
+#include <GLUT/glut.h>
+#endif
+
+#include <GL/glui.h>
+
+
+#endif	// OPENGL_H_
diff -r eb87d4a12bd3 -r df4a277adb82 src/sdr.cc
--- a/src/sdr.cc	Mon Aug 18 10:44:11 2014 +0300
+++ b/src/sdr.cc	Fri Feb 06 21:15:23 2015 +0200
@@ -1,5 +1,4 @@
-#include <GL/glew.h>
-#include <GL/gl.h>
+#include "opengl.h"
 
 #include <errno.h>
 #include <stdio.h>
diff -r eb87d4a12bd3 -r df4a277adb82 src/volume.cc
--- a/src/volume.cc	Mon Aug 18 10:44:11 2014 +0300
+++ b/src/volume.cc	Fri Feb 06 21:15:23 2015 +0200
@@ -1,4 +1,4 @@
-#include <GL/glew.h>
+#include "opengl.h"
 
 #include <assert.h>
 
@@ -11,8 +11,6 @@
 #include <string>
 #include <vector>
 
-#include <metasurf.h>
-
 #include "mesh.h"
 #include "volume.h"
 
@@ -228,31 +226,6 @@
 		(1 - smoothstep(x, high_thres - dt, high_thres + dt));
 }
 
-static float cb_eval(float x, float y, float z)
-{
-	const Image *img = cur_vol->get_slice_by_z((z + 1) / 2.0);
-	const float *pixels = img->get_pixels();
-
-	int px = (x + 1) / 2.0 * img->get_width();
-	int py = (y + 1) / 2.0 * img->get_height();
-
-	float val = pixels[px + img->get_width() * py];
-	return transfer_function(val, low_thres, high_thres);
-}
-
-static void cb_vertex(float x, float y, float z)
-{
-	float dx = 1.0 / cur_vol->get_slice(0)->get_width();
-	float dy = 1.0 / cur_vol->get_slice(0)->get_height();
-	float dz = 1.0 / cur_vol->get_slice_count();
-	float dfdx = cb_eval(x - dx, y, z) - cb_eval(x + dx, y, z);
-	float dfdy = cb_eval(x, y - dy, z) - cb_eval(x, y + dy, z);
-	float dfdz = cb_eval(x, y, z - dz) - cb_eval(x, y, z + dz);
-
-	cur_mesh->add_normal(Vector3(dfdx, dfdy, dfdz));
-	cur_mesh->add_vertex(Vector3(x, y, z));
-}
-
 void Volume::create_mesh(Mesh *mesh, float tmin, float tmax, int xres, int yres, int zres)
 {
 	if (tmin > tmax) {
@@ -271,14 +244,6 @@
 
 	cur_mesh = mesh;
 	cur_vol = this;
-
-	metasurface *ms = msurf_create();
-	msurf_threshold(ms, 0.5);
-	msurf_resolution(ms, xres, yres, zres);
-	msurf_vertex_func(ms, cb_vertex);
-	msurf_eval_func(ms, cb_eval);
-	msurf_polygonize(ms);
-	msurf_free(ms);
 }
 
 void Volume::draw() const