diff --git a/CMakeLists.txt b/CMakeLists.txt
index d12cf1e45d..2560c6498f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,4 +39,4 @@ add_subdirectory(domain-server)
add_subdirectory(interface)
add_subdirectory(tests)
add_subdirectory(voxel-edit)
-add_subdirectory(SvoViewer)
+add_subdirectory(svo-viewer)
diff --git a/SvoViewer/CMakeLists.txt b/svo-viewer/CMakeLists.txt
similarity index 95%
rename from SvoViewer/CMakeLists.txt
rename to svo-viewer/CMakeLists.txt
index 3cc47678d7..24f07c5a6d 100644
--- a/SvoViewer/CMakeLists.txt
+++ b/svo-viewer/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
set(ROOT_DIR ..)
set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-set(TARGET_NAME SvoViewer)
+set(TARGET_NAME svo-viewer)
project(${TARGET_NAME})
# setup for find modules
@@ -42,9 +42,9 @@ endif (WIN32)
include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME} ${ROOT_DIR})
-# create the ${TARGET_NAME}Config.h file based on GL_HEADERS above
-configure_file(${TARGET_NAME}Config.h.in ${PROJECT_BINARY_DIR}/includes/${TARGET_NAME}Config.h)
-configure_file(${TARGET_NAME}Version.h.in ${PROJECT_BINARY_DIR}/includes/${TARGET_NAME}Version.h)
+# create the ${TARGET_NAME}-config.h file based on GL_HEADERS above
+configure_file(${TARGET_NAME}-config.h.in ${PROJECT_BINARY_DIR}/includes/${TARGET_NAME}-config.h)
+configure_file(${TARGET_NAME}-version.h.in ${PROJECT_BINARY_DIR}/includes/${TARGET_NAME}-version.h)
# grab the implementation and header files from src dirs
file(GLOB APPLICATION_SRCS src/*.c src/*.cpp src/*.h)
@@ -81,7 +81,7 @@ if (APPLE)
# configure CMake to use a custom Info.plist
SET_TARGET_PROPERTIES( ${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in )
- set(MACOSX_BUNDLE_BUNDLE_NAME SvoViewer)
+ set(MACOSX_BUNDLE_BUNDLE_NAME svo-viewer)
set(MACOSX_BUNDLE_GUI_IDENTIFIER io.highfidelity.${TARGET_NAME})
# set how the icon shows up in the Info.plist file
diff --git a/SvoViewer/external/freeglut/Copying.txt b/svo-viewer/external/freeglut/Copying.txt
similarity index 100%
rename from SvoViewer/external/freeglut/Copying.txt
rename to svo-viewer/external/freeglut/Copying.txt
diff --git a/SvoViewer/external/freeglut/bin/freeglut.dll b/svo-viewer/external/freeglut/bin/freeglut.dll
similarity index 100%
rename from SvoViewer/external/freeglut/bin/freeglut.dll
rename to svo-viewer/external/freeglut/bin/freeglut.dll
diff --git a/SvoViewer/external/freeglut/bin/x64/freeglut.dll b/svo-viewer/external/freeglut/bin/x64/freeglut.dll
similarity index 100%
rename from SvoViewer/external/freeglut/bin/x64/freeglut.dll
rename to svo-viewer/external/freeglut/bin/x64/freeglut.dll
diff --git a/SvoViewer/external/freeglut/include/GL/freeglut.h b/svo-viewer/external/freeglut/include/GL/freeglut.h
similarity index 100%
rename from SvoViewer/external/freeglut/include/GL/freeglut.h
rename to svo-viewer/external/freeglut/include/GL/freeglut.h
diff --git a/SvoViewer/external/freeglut/include/GL/freeglut_ext.h b/svo-viewer/external/freeglut/include/GL/freeglut_ext.h
similarity index 100%
rename from SvoViewer/external/freeglut/include/GL/freeglut_ext.h
rename to svo-viewer/external/freeglut/include/GL/freeglut_ext.h
diff --git a/SvoViewer/external/freeglut/include/GL/freeglut_std.h b/svo-viewer/external/freeglut/include/GL/freeglut_std.h
similarity index 100%
rename from SvoViewer/external/freeglut/include/GL/freeglut_std.h
rename to svo-viewer/external/freeglut/include/GL/freeglut_std.h
diff --git a/SvoViewer/external/freeglut/include/GL/glut.h b/svo-viewer/external/freeglut/include/GL/glut.h
similarity index 100%
rename from SvoViewer/external/freeglut/include/GL/glut.h
rename to svo-viewer/external/freeglut/include/GL/glut.h
diff --git a/SvoViewer/external/freeglut/lib/freeglut.lib b/svo-viewer/external/freeglut/lib/freeglut.lib
similarity index 100%
rename from SvoViewer/external/freeglut/lib/freeglut.lib
rename to svo-viewer/external/freeglut/lib/freeglut.lib
diff --git a/SvoViewer/external/freeglut/lib/x64/freeglut.lib b/svo-viewer/external/freeglut/lib/x64/freeglut.lib
similarity index 100%
rename from SvoViewer/external/freeglut/lib/x64/freeglut.lib
rename to svo-viewer/external/freeglut/lib/x64/freeglut.lib
diff --git a/SvoViewer/external/glew/LICENSE.txt b/svo-viewer/external/glew/LICENSE.txt
similarity index 100%
rename from SvoViewer/external/glew/LICENSE.txt
rename to svo-viewer/external/glew/LICENSE.txt
diff --git a/SvoViewer/external/glew/bin/Release MX/Win32/glew32mx.dll b/svo-viewer/external/glew/bin/Release MX/Win32/glew32mx.dll
similarity index 100%
rename from SvoViewer/external/glew/bin/Release MX/Win32/glew32mx.dll
rename to svo-viewer/external/glew/bin/Release MX/Win32/glew32mx.dll
diff --git a/SvoViewer/external/glew/bin/Release MX/x64/glew32mx.dll b/svo-viewer/external/glew/bin/Release MX/x64/glew32mx.dll
similarity index 100%
rename from SvoViewer/external/glew/bin/Release MX/x64/glew32mx.dll
rename to svo-viewer/external/glew/bin/Release MX/x64/glew32mx.dll
diff --git a/SvoViewer/external/glew/bin/Release/Win32/glew32.dll b/svo-viewer/external/glew/bin/Release/Win32/glew32.dll
similarity index 100%
rename from SvoViewer/external/glew/bin/Release/Win32/glew32.dll
rename to svo-viewer/external/glew/bin/Release/Win32/glew32.dll
diff --git a/SvoViewer/external/glew/bin/Release/Win32/glewinfo.exe b/svo-viewer/external/glew/bin/Release/Win32/glewinfo.exe
similarity index 100%
rename from SvoViewer/external/glew/bin/Release/Win32/glewinfo.exe
rename to svo-viewer/external/glew/bin/Release/Win32/glewinfo.exe
diff --git a/SvoViewer/external/glew/bin/Release/Win32/visualinfo.exe b/svo-viewer/external/glew/bin/Release/Win32/visualinfo.exe
similarity index 100%
rename from SvoViewer/external/glew/bin/Release/Win32/visualinfo.exe
rename to svo-viewer/external/glew/bin/Release/Win32/visualinfo.exe
diff --git a/SvoViewer/external/glew/bin/Release/x64/glew32.dll b/svo-viewer/external/glew/bin/Release/x64/glew32.dll
similarity index 100%
rename from SvoViewer/external/glew/bin/Release/x64/glew32.dll
rename to svo-viewer/external/glew/bin/Release/x64/glew32.dll
diff --git a/SvoViewer/external/glew/bin/Release/x64/glewinfo.exe b/svo-viewer/external/glew/bin/Release/x64/glewinfo.exe
similarity index 100%
rename from SvoViewer/external/glew/bin/Release/x64/glewinfo.exe
rename to svo-viewer/external/glew/bin/Release/x64/glewinfo.exe
diff --git a/SvoViewer/external/glew/bin/Release/x64/visualinfo.exe b/svo-viewer/external/glew/bin/Release/x64/visualinfo.exe
similarity index 100%
rename from SvoViewer/external/glew/bin/Release/x64/visualinfo.exe
rename to svo-viewer/external/glew/bin/Release/x64/visualinfo.exe
diff --git a/SvoViewer/external/glew/include/GL/glew.h b/svo-viewer/external/glew/include/GL/glew.h
similarity index 100%
rename from SvoViewer/external/glew/include/GL/glew.h
rename to svo-viewer/external/glew/include/GL/glew.h
diff --git a/SvoViewer/external/glew/include/GL/glxew.h b/svo-viewer/external/glew/include/GL/glxew.h
similarity index 100%
rename from SvoViewer/external/glew/include/GL/glxew.h
rename to svo-viewer/external/glew/include/GL/glxew.h
diff --git a/SvoViewer/external/glew/include/GL/wglew.h b/svo-viewer/external/glew/include/GL/wglew.h
similarity index 100%
rename from SvoViewer/external/glew/include/GL/wglew.h
rename to svo-viewer/external/glew/include/GL/wglew.h
diff --git a/SvoViewer/external/glew/lib/Release MX/Win32/glew32mx.lib b/svo-viewer/external/glew/lib/Release MX/Win32/glew32mx.lib
similarity index 100%
rename from SvoViewer/external/glew/lib/Release MX/Win32/glew32mx.lib
rename to svo-viewer/external/glew/lib/Release MX/Win32/glew32mx.lib
diff --git a/SvoViewer/external/glew/lib/Release MX/Win32/glew32mxs.lib b/svo-viewer/external/glew/lib/Release MX/Win32/glew32mxs.lib
similarity index 100%
rename from SvoViewer/external/glew/lib/Release MX/Win32/glew32mxs.lib
rename to svo-viewer/external/glew/lib/Release MX/Win32/glew32mxs.lib
diff --git a/SvoViewer/external/glew/lib/Release MX/x64/glew32mx.lib b/svo-viewer/external/glew/lib/Release MX/x64/glew32mx.lib
similarity index 100%
rename from SvoViewer/external/glew/lib/Release MX/x64/glew32mx.lib
rename to svo-viewer/external/glew/lib/Release MX/x64/glew32mx.lib
diff --git a/SvoViewer/external/glew/lib/Release MX/x64/glew32mxs.lib b/svo-viewer/external/glew/lib/Release MX/x64/glew32mxs.lib
similarity index 100%
rename from SvoViewer/external/glew/lib/Release MX/x64/glew32mxs.lib
rename to svo-viewer/external/glew/lib/Release MX/x64/glew32mxs.lib
diff --git a/SvoViewer/external/glew/lib/Release/Win32/glew32.lib b/svo-viewer/external/glew/lib/Release/Win32/glew32.lib
similarity index 100%
rename from SvoViewer/external/glew/lib/Release/Win32/glew32.lib
rename to svo-viewer/external/glew/lib/Release/Win32/glew32.lib
diff --git a/SvoViewer/external/glew/lib/Release/Win32/glew32s.lib b/svo-viewer/external/glew/lib/Release/Win32/glew32s.lib
similarity index 100%
rename from SvoViewer/external/glew/lib/Release/Win32/glew32s.lib
rename to svo-viewer/external/glew/lib/Release/Win32/glew32s.lib
diff --git a/SvoViewer/external/glew/lib/Release/x64/glew32.lib b/svo-viewer/external/glew/lib/Release/x64/glew32.lib
similarity index 100%
rename from SvoViewer/external/glew/lib/Release/x64/glew32.lib
rename to svo-viewer/external/glew/lib/Release/x64/glew32.lib
diff --git a/SvoViewer/external/glew/lib/Release/x64/glew32s.lib b/svo-viewer/external/glew/lib/Release/x64/glew32s.lib
similarity index 100%
rename from SvoViewer/external/glew/lib/Release/x64/glew32s.lib
rename to svo-viewer/external/glew/lib/Release/x64/glew32s.lib
diff --git a/SvoViewer/src/AABoundingVolume.h b/svo-viewer/src/AABoundingVolume.h
similarity index 100%
rename from SvoViewer/src/AABoundingVolume.h
rename to svo-viewer/src/AABoundingVolume.h
diff --git a/SvoViewer/src/Camera.cpp b/svo-viewer/src/Camera.cpp
similarity index 99%
rename from SvoViewer/src/Camera.cpp
rename to svo-viewer/src/Camera.cpp
index 7cfbf8fc2c..8582c00b5c 100755
--- a/SvoViewer/src/Camera.cpp
+++ b/svo-viewer/src/Camera.cpp
@@ -4,7 +4,7 @@
//
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
-#include "SvoViewerConfig.h"
+#include "svo-viewer-config.h"
#include <glm/gtx/quaternion.hpp>
#include <glm/gtc/matrix_transform.hpp>
diff --git a/SvoViewer/src/Camera.h b/svo-viewer/src/Camera.h
similarity index 100%
rename from SvoViewer/src/Camera.h
rename to svo-viewer/src/Camera.h
diff --git a/SvoViewer/src/GLCanvas.cpp b/svo-viewer/src/GLCanvas.cpp
similarity index 98%
rename from SvoViewer/src/GLCanvas.cpp
rename to svo-viewer/src/GLCanvas.cpp
index 0bd29e4f00..737d46dbc3 100755
--- a/SvoViewer/src/GLCanvas.cpp
+++ b/svo-viewer/src/GLCanvas.cpp
@@ -5,7 +5,7 @@
// Copyright (c) 2014 HighFidelity, Inc. All rights reserved.
//
-#include "SvoViewerConfig.h"
+#include "svo-viewer-config.h"
#include "svoviewer.h"
diff --git a/SvoViewer/src/GLCanvas.h b/svo-viewer/src/GLCanvas.h
similarity index 100%
rename from SvoViewer/src/GLCanvas.h
rename to svo-viewer/src/GLCanvas.h
diff --git a/SvoViewer/src/Render.cpp b/svo-viewer/src/Render.cpp
similarity index 96%
rename from SvoViewer/src/Render.cpp
rename to svo-viewer/src/Render.cpp
index cb6ddd25c9..69502a9b42 100755
--- a/SvoViewer/src/Render.cpp
+++ b/svo-viewer/src/Render.cpp
@@ -80,7 +80,7 @@ void SvoViewer::InitializePointRenderSystem()
_pointVerticesCount = args.count;
// create the data store.
- int size = _nodeCount * sizeof(glm::vec3);
+ //int size = _nodeCount * sizeof(glm::vec3);
glBindBuffer( GL_ARRAY_BUFFER, _pointVtxBuffer);
glBufferData(GL_ARRAY_BUFFER, _nodeCount * 3, args.buffer, GL_STATIC_DRAW);
//glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, NULL);
@@ -92,7 +92,7 @@ void SvoViewer::InitializePointRenderSystem()
_renderFlags.ptRenderDirty = false;
_ptRenderInitialized = true;
float elapsed = (float)(usecTimestampNow() - fstart) / 1000.f;
- qDebug("Point render intialization took %f time for %d nodes\n", elapsed, _nodeCount);
+ qDebug("Point render intialization took %f time for %ld nodes\n", elapsed, _nodeCount);
}
void SvoViewer::RenderTreeSystemAsPoints()
@@ -324,11 +324,11 @@ void SvoViewer::InitializeVoxelRenderSystem()
glShaderSource(_geometryShader, 1, &simpleGeomShaderSrc, &simpleGeomShaderLen);
glShaderSource(_pixelShader, 1, &simpleFragShaderSrc, &simpleFragShaderLen);
+// TODO: this was Matt's original windows code, it doesn't compile on mac, due to type mismatches
+#ifdef WIN32
GLchar shaderLog[1000];
GLsizei shaderLogLength;
GLint compiled;
-// TODO: this was Matt's original windows code, it doesn't compile on mac, due to type mismatches
-#ifdef WIN32
glCompileShaderARB(_vertexShader);
glGetShaderInfoLog(_vertexShader, 1000, &shaderLogLength, shaderLog);
if (shaderLog[0] != 0) qDebug("Shaderlog v :\n %s\n", shaderLog);
@@ -621,7 +621,7 @@ void SvoViewer::InitializeVoxelOptRenderSystem()
// Set up the segments. Find the number of leaves at each subtree.
OctreeElement * rootNode = _systemTree.getRoot();
OctreeElement* node0fromRoot = rootNode->getChildAtIndex(0); // ALL the interesting data for our test SVO is in this node! HACK!!
- int rootNumChildren = rootNode->getChildCount();
+ //int rootNumChildren = rootNode->getChildCount();
for (int i = 0; i < NUMBER_OF_CHILDREN; i++)
{
OctreeElement* childNode1stOrder = node0fromRoot->getChildAtIndex(i);
@@ -632,7 +632,7 @@ void SvoViewer::InitializeVoxelOptRenderSystem()
OctreeElement* childNode2ndOrder = childNode1stOrder->getChildAtIndex(j);
if (childNode2ndOrder == NULL) continue;
- int num2ndOrderChildren = childNode2ndOrder->getChildCount();
+ //int num2ndOrderChildren = childNode2ndOrder->getChildCount();
// Figure out how populated this child is.
FindNumLeavesData data;
data.numLeaves = 0;
diff --git a/SvoViewer/src/Render.h b/svo-viewer/src/Render.h
similarity index 100%
rename from SvoViewer/src/Render.h
rename to svo-viewer/src/Render.h
diff --git a/SvoViewer/src/Render2.cpp b/svo-viewer/src/Render2.cpp
similarity index 96%
rename from SvoViewer/src/Render2.cpp
rename to svo-viewer/src/Render2.cpp
index 7765aa288b..91e41f3e85 100755
--- a/SvoViewer/src/Render2.cpp
+++ b/svo-viewer/src/Render2.cpp
@@ -190,7 +190,7 @@ void SvoViewer::InitializeVoxelOpt2RenderSystem()
// Set up the segments. Find the number of leaves at each subtree.
OctreeElement * rootNode = _systemTree.getRoot();
OctreeElement* node0fromRoot = rootNode->getChildAtIndex(0); // ALL the interesting data for our test SVO is in this node! HACK!!
- int rootNumChildren = rootNode->getChildCount();
+ //int rootNumChildren = rootNode->getChildCount();
for (int i = 0; i < NUMBER_OF_CHILDREN; i++)
{
OctreeElement* childNode1stOrder = node0fromRoot->getChildAtIndex(i);
@@ -201,7 +201,7 @@ void SvoViewer::InitializeVoxelOpt2RenderSystem()
OctreeElement* childNode2ndOrder = childNode1stOrder->getChildAtIndex(j);
if (childNode2ndOrder == NULL) continue;
- int num2ndOrderChildren = childNode2ndOrder->getChildCount();
+ //int num2ndOrderChildren = childNode2ndOrder->getChildCount();
// Figure out how populated this child is.
FindNumLeavesData data;
data.numLeaves = 0;
@@ -328,7 +328,7 @@ void SvoViewer::UpdateOpt2BVFaceVisibility()
{
if (_currentShaderModel != RENDER_OPT_CULLED_POLYS || _voxelOptRenderInitialized != true ) return;
- float faceParamVals[NUM_CUBE_FACES];
+ //float faceParamVals[NUM_CUBE_FACES];
glm::vec3 pos = _myCamera.getPosition();
for (int i = 0; i < _numSegments; i++)
diff --git a/SvoViewer/src/SvoViewer.ico b/svo-viewer/src/SvoViewer.ico
similarity index 100%
rename from SvoViewer/src/SvoViewer.ico
rename to svo-viewer/src/SvoViewer.ico
diff --git a/SvoViewer/src/SvoViewer.rc b/svo-viewer/src/SvoViewer.rc
similarity index 100%
rename from SvoViewer/src/SvoViewer.rc
rename to svo-viewer/src/SvoViewer.rc
diff --git a/SvoViewer/src/TextRenderer.cpp b/svo-viewer/src/TextRenderer.cpp
similarity index 99%
rename from SvoViewer/src/TextRenderer.cpp
rename to svo-viewer/src/TextRenderer.cpp
index 3b2a308ba8..414f2cdd55 100644
--- a/SvoViewer/src/TextRenderer.cpp
+++ b/svo-viewer/src/TextRenderer.cpp
@@ -5,13 +5,14 @@
// Created by Andrzej Kapolka on 4/24/13.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+#include "svo-viewer-config.h"
+
#include <QFont>
#include <QPaintEngine>
#include <QtDebug>
#include <QString>
#include <QStringList>
-#include "SvoViewerConfig.h"
#include "TextRenderer.h"
// the width/height of the cached glyph textures
diff --git a/SvoViewer/src/TextRenderer.h b/svo-viewer/src/TextRenderer.h
similarity index 98%
rename from SvoViewer/src/TextRenderer.h
rename to svo-viewer/src/TextRenderer.h
index b5348cd665..1a913dac49 100644
--- a/SvoViewer/src/TextRenderer.h
+++ b/svo-viewer/src/TextRenderer.h
@@ -9,13 +9,14 @@
#ifndef __interface__TextRenderer__
#define __interface__TextRenderer__
+#include "svo-viewer-config.h"
+
#include <QFont>
#include <QFontMetrics>
#include <QHash>
#include <QImage>
#include <QVector>
-#include "SvoViewerConfig.h"
// a special "character" that renders as a solid block
const char SOLID_BLOCK_CHAR = 127;
diff --git a/SvoViewer/src/globals.cpp b/svo-viewer/src/globals.cpp
similarity index 100%
rename from SvoViewer/src/globals.cpp
rename to svo-viewer/src/globals.cpp
diff --git a/SvoViewer/src/globals.h b/svo-viewer/src/globals.h
similarity index 91%
rename from SvoViewer/src/globals.h
rename to svo-viewer/src/globals.h
index b20fa3e2a5..2ac08a8973 100755
--- a/SvoViewer/src/globals.h
+++ b/svo-viewer/src/globals.h
@@ -6,7 +6,7 @@
#pragma once
-#include "SvoViewerConfig.h"
+#include "svo-viewer-config.h"
#include <QtWidgets/QMainWindow>
#include <QDesktopWidget>
diff --git a/SvoViewer/src/main.cpp b/svo-viewer/src/main.cpp
similarity index 83%
rename from SvoViewer/src/main.cpp
rename to svo-viewer/src/main.cpp
index e92d98f14b..159171fd53 100755
--- a/SvoViewer/src/main.cpp
+++ b/svo-viewer/src/main.cpp
@@ -4,7 +4,7 @@
// Copyright (c) 2014 HighFidelity, Inc. All rights reserved.
//
-#include "SvoViewerConfig.h"
+#include "svo-viewer-config.h"
#include "svoviewer.h"
#include <QtWidgets/QApplication>
diff --git a/SvoViewer/src/svoviewer.cpp b/svo-viewer/src/svoviewer.cpp
similarity index 93%
rename from SvoViewer/src/svoviewer.cpp
rename to svo-viewer/src/svoviewer.cpp
index 310c1f2f00..50b1cfdfd1 100755
--- a/SvoViewer/src/svoviewer.cpp
+++ b/svo-viewer/src/svoviewer.cpp
@@ -31,13 +31,17 @@ SvoViewer * _globalSvoViewerObj; // Hack :: var to store global pointer since th
SvoViewer::SvoViewer(int& argc, char** argv, QWidget *parent)
: QApplication(argc, argv),
_window(new QMainWindow(desktop())),
- _glWidget(new GLCanvas()),
_width(1280),
_height(720),
_pixelCount(1280*720),
- _frameCount(0),
+ _glWidget(new GLCanvas()),
+ _nodeCount(0),
_leafCount(0),
- _nodeCount(0),
+ _pitch(0),
+ _yaw(0),
+ _roll(0),
+ _displayOnlyPartition(NO_PARTITION),
+ _frameCount(0),
_fps(0.0),
_lastTimeFpsUpdated(0),
_lastTimeFrameUpdated(0),
@@ -48,29 +52,25 @@ SvoViewer::SvoViewer(int& argc, char** argv, QWidget *parent)
_vertexShader(0),
_pixelShader(0),
_geometryShader(0),
- _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM),
- _voxelSizeScale(DEFAULT_OCTREE_SIZE_SCALE),
- _boundaryLevelAdjust(0),
- _viewFrustumOffset(DEFAULT_FRUSTUM_OFFSET),
- _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES),
- _useVoxelTextures(false),
_pointVertices(NULL),
_pointVerticesCount(0),
+ _numSegments(0),
+ _useBoundingVolumes(true),
+ _numElemsDrawn(0),
+ _totalPossibleElems(0),
+ _viewFrustumOffset(DEFAULT_FRUSTUM_OFFSET),
+ _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM),
+ _voxelSizeScale(DEFAULT_OCTREE_SIZE_SCALE),
+ _boundaryLevelAdjust(0),
//_vboShaderData(NULL),
- _mousePressed(false),
- _pitch(0),
- _yaw(0),
- _roll(0),
- _numSegments(0),
- _displayOnlyPartition(NO_PARTITION),
- _totalPossibleElems(0),
- _numElemsDrawn(0),
- _useBoundingVolumes(true)
+ _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES)
{
gettimeofday(&_applicationStartupTime, NULL);
_appStartTickCount = usecTimestampNow();
_globalSvoViewerObj = this;
+ _mousePressed = false;
+ _useVoxelTextures = false;
//ui.setupUi(this);
_window->setWindowTitle("SvoViewer");
@@ -89,7 +89,6 @@ SvoViewer::SvoViewer(int& argc, char** argv, QWidget *parent)
QString shaderMode;
QStringList argumentList = arguments();
- int argumentIndex = 0;
// check if this domain server should use no authentication or a custom hostname for authentication
const QString FILE_NAME = "--file";
@@ -211,8 +210,8 @@ void SvoViewer::init() {
void SvoViewer::initializeGL()
{
- int argc = 0;
#ifdef WIN32
+ int argc = 0;
glutInit(&argc, 0);
#endif
init();
@@ -585,13 +584,9 @@ void SvoViewer::keyReleaseEvent(QKeyEvent* event) {}
void SvoViewer::mouseMoveEvent(QMouseEvent* event)
{
- int deltaX = event->x() - _mouseX;
- int deltaY = event->y() - _mouseY;
_mouseX = event->x();
_mouseY = event->y();
-
-
- loadViewFrustum(_myCamera, _viewFrustum);
+ loadViewFrustum(_myCamera, _viewFrustum);
}
void SvoViewer::mousePressEvent(QMouseEvent* event)
@@ -639,8 +634,8 @@ bool SvoViewer::isVisibleBV(AABoundingVolume * volume, Camera * camera, ViewFrus
//if (pos.z >= volume->getBound(2,AABF_HIGH)) return false;
// Project all the points into screen space.
AA2DBoundingVolume twoDBounds;
- float xvals[2] = {9999.0, -1.0};
- float yvals[2] = {9999.0, -1.0};
+ //float xvals[2] = {9999.0, -1.0};
+ //float yvals[2] = {9999.0, -1.0};
//project all bv points into screen space.
GLdouble scr[3];
for (int i = 0; i < 8; i++)
@@ -660,8 +655,8 @@ bool SvoViewer::isVisibleBV(AABoundingVolume * volume, Camera * camera, ViewFrus
float SvoViewer::visibleAngleSubtended(AABoundingVolume * volume, Camera * camera, ViewFrustum * frustum)
{
AA2DBoundingVolume twoDBounds;
- float xvals[2] = {9999.0, -1.0};
- float yvals[2] = {9999.0, -1.0};
+ //float xvals[2] = {9999.0, -1.0};
+ //float yvals[2] = {9999.0, -1.0};
//project all bv points into screen space.
GLdouble scr[3];
for (int i = 0; i < 8; i++)
diff --git a/SvoViewer/src/svoviewer.h b/svo-viewer/src/svoviewer.h
similarity index 96%
rename from SvoViewer/src/svoviewer.h
rename to svo-viewer/src/svoviewer.h
index c4aca046fe..abd4879424 100755
--- a/SvoViewer/src/svoviewer.h
+++ b/svo-viewer/src/svoviewer.h
@@ -11,7 +11,7 @@
#pragma once
-#include "SvoViewerConfig.h"
+#include "svo-viewer-config.h"
#include <QApplication>
#include <QGLWidget>
diff --git a/SvoViewer/src/svoviewer.qrc b/svo-viewer/src/svoviewer.qrc
similarity index 100%
rename from SvoViewer/src/svoviewer.qrc
rename to svo-viewer/src/svoviewer.qrc
diff --git a/SvoViewer/src/svoviewer.ui b/svo-viewer/src/svoviewer.ui
similarity index 100%
rename from SvoViewer/src/svoviewer.ui
rename to svo-viewer/src/svoviewer.ui
diff --git a/SvoViewer/src/windowshacks.h b/svo-viewer/src/windowshacks.h
similarity index 100%
rename from SvoViewer/src/windowshacks.h
rename to svo-viewer/src/windowshacks.h
diff --git a/SvoViewer/SvoViewerConfig.h.in b/svo-viewer/svo-viewer-config.h.in
similarity index 100%
rename from SvoViewer/SvoViewerConfig.h.in
rename to svo-viewer/svo-viewer-config.h.in
diff --git a/SvoViewer/SvoViewerVersion.h.in b/svo-viewer/svo-viewer-version.h.in
similarity index 100%
rename from SvoViewer/SvoViewerVersion.h.in
rename to svo-viewer/svo-viewer-version.h.in
diff --git a/SvoViewer/SvoViewer.icns b/svo-viewer/svo-viewer.icns
similarity index 100%
rename from SvoViewer/SvoViewer.icns
rename to svo-viewer/svo-viewer.icns