Further advances in nuklear port.

Rendering now looks similar to Qt version, needs a few tweaks:
* Proper multisampling
* Background

Missing features:
* Barcharts
* Interactivity (e.g. brushing/linking in all objects)
* History view of interactions

1 files changed, 12 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index b409bfa..058675a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-CFLAGS=-O2 -Iinclude `pkg-config --cflags armadillo glfw3`
+CFLAGS=-O0 -g -Iinclude `pkg-config --cflags armadillo glfw3`
 LIBS=-lGL `pkg-config --libs armadillo glfw3`
-OBJS=barchart.o brushinghandler.o colormap.o colorscale.o continuouscolorscale.o divergentcolorscale.o dist.o forcescheme.o geometry.o lamp.o manipulationhandler.o mapscalehandler.o measures.o projectionhistory.o quadtree.o scatterplot.o voronoisplat.o
+OBJS=barchart.o brushinghandler.o colormap.o colorscale.o continuouscolorscale.o divergentcolorscale.o dist.o forcescheme.o geometry.o lamp.o manipulationhandler.o mapscalehandler.o measures.o projectionhistory.o quadtree.o scale.o scatterplot.o shader.o voronoisplat.o
 
 all: pm
 
@@ -68,11 +68,19 @@ quadtree.o: quadtree.cpp quadtree.h geometry.h
 	@echo CC $@
 	@g++ $(CFLAGS) $(LIBS) -c quadtree.cpp
 
-scatterplot.o: scatterplot.cpp scatterplot.h colorscale.h scale.h continuouscolorscale.h geometry.h
+scale.o: scale.cpp scale.h
+	@echo CC $@
+	@g++ $(CFLAGS) $(LIBS) -c scale.cpp
+
+scatterplot.o: scatterplot.cpp scatterplot.h colorscale.h continuouscolorscale.h scale.h geometry.h
 	@echo CC $@
 	@g++ $(CFLAGS) $(LIBS) -c scatterplot.cpp
 
-voronoisplat.o: voronoisplat.cpp voronoisplat.h colormap.h scatterplot.h
+shader.o: shader.cpp shader.h
+	@echo CC $@
+	@g++ $(CFLAGS) $(LIBS) -c shader.cpp
+
+voronoisplat.o: voronoisplat.cpp voronoisplat.h colormap.h scatterplot.h shader.h
 	@echo CC $@
 	@g++ $(CFLAGS) $(LIBS) -c voronoisplat.cpp