From d7dd95cd9eaa223ff8b86e84e6b1b488ff79bcd5 Mon Sep 17 00:00:00 2001
From: Samuel Fadel <samuelfadel@gmail.com>
Date: Sat, 19 Dec 2015 12:29:33 +0100
Subject: New rendering (VoronoiSplat) -- incomplete.

* Added voronoi-like splatting to points: the same technique from
  Messias et al., (2014)
* It is now possible to change the projection technique during
  runtime (possible, but still requires some work)
---
 pm.pro | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'pm.pro')

diff --git a/pm.pro b/pm.pro
index 88a4b61..7cc6bdc 100644
--- a/pm.pro
+++ b/pm.pro
@@ -1,5 +1,7 @@
 QT += qml quick widgets
 
+CONFIG += qt debug
+
 QMAKE_CXXFLAGS += -std=c++11 -fopenmp
 QMAKE_LIBS += -larmadillo -fopenmp
 HEADERS += main.h \
@@ -8,6 +10,7 @@ HEADERS += main.h \
     geometry.h \
     scale.h \
     scatterplot.h \
+    voronoisplat.h \
     historygraph.h \
     interactionhandler.h \
     selectionhandler.h \
@@ -15,18 +18,22 @@ HEADERS += main.h \
     distortionobserver.h \
     distortionmeasure.h \
     npdistortion.h \
+    skelft.h \
+    skelftkernel.h
     mp.h
 SOURCES += main.cpp \
     colorscale.cpp \
     continuouscolorscale.cpp \
     geometry.cpp \
     scatterplot.cpp \
+    voronoisplat.cpp \
     historygraph.cpp \
     interactionhandler.cpp \
     selectionhandler.cpp \
     effectivenessobserver.cpp \
     distortionobserver.cpp \
     npdistortion.cpp \
+    skelft_core.cpp \
     lamp.cpp \
     plmp.cpp \
     knn.cpp \
@@ -34,6 +41,33 @@ SOURCES += main.cpp \
     tsne.cpp \
     measures.cpp \
     dist.cpp
+
+OTHER_FILES += skelft.cu
+
+# Cuda settings
+CUDA_SOURCES += skelft.cu
+CUDA_DIR = "/opt/cuda"
+CUDA_ARCH = sm_30
+NVCC_OPTIONS += --use_fast_math
+SYSTEM_TYPE = 64  # Either 64 or empty
+INCLUDEPATH += $$CUDA_DIR/include
+QMAKE_LIBDIR += $$CUDA_DIR/lib$$SYSTEM_TYPE
+LIBS += -lcuda -lcudart
+
+CONFIG(debug, debug|release) {
+    cuda_dbg.input = CUDA_SOURCES
+    cuda_dbg.output = ${QMAKE_FILE_BASE}_cuda.o
+    cuda_dbg.commands = $$CUDA_DIR/bin/nvcc -D_DEBUG -g $$NVCC_OPTIONS -I$$INCLUDEPATH $$LIBS --machine $$SYSTEM_TYPE -arch=$$CUDA_ARCH -c -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
+    cuda_dbg.dependency_type = TYPE_C
+    QMAKE_EXTRA_COMPILERS += cuda_dbg
+} else {
+    cuda.input = CUDA_SOURCES
+    cuda.output = ${QMAKE_FILE_BASE}_cuda.o
+    cuda.commands = $$CUDA_DIR/bin/nvcc $$NVCC_OPTIONS -I$$INCLUDEPATH $$LIBS --machine $$SYSTEM_TYPE -arch=$$CUDA_ARCH -c -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
+    cuda.dependency_type = TYPE_C
+    QMAKE_EXTRA_COMPILERS += cuda
+}
+
 RESOURCES += pm.qrc
 
 target.path = .
-- 
cgit v1.2.3