Commit 2029a2d0 authored by Ruben Garcia Hernndez's avatar Ruben Garcia Hernndez

CAVE: Add length and angle measurement, fix screensize, synchronize atoms/isos to latest vive code

parent e874de9c
...@@ -61,7 +61,8 @@ set(SOURCES ...@@ -61,7 +61,8 @@ set(SOURCES
src/NOMADVRLib/polyhedron.cpp src/NOMADVRLib/UnitCellShaders.cpp src/NOMADVRLib/polyhedron.cpp src/NOMADVRLib/UnitCellShaders.cpp
src/NOMADVRLib/atomsGL.cpp src/NOMADVRLib/ConfigFile.cpp src/NOMADVRLib/atomsGL.cpp src/NOMADVRLib/ConfigFile.cpp
src/NOMADVRLib/TessShaders.cpp src/NOMADVRLib/IsosurfacesGL.cpp src/NOMADVRLib/TessShaders.cpp src/NOMADVRLib/IsosurfacesGL.cpp
src/NOMADVRLib/IsoShaders.cpp src/NOMADVRLib/IsoShaders.cpp src/NOMADVRLib/Grid.cpp
src/NOMADVRLib/markerShaders.cpp
src/happyhttp/happyhttp.cpp src/happyhttp/happyhttp.cpp
src/rply/rply.c src/rply/rply.c
) )
......
This diff is collapsed.
...@@ -203,7 +203,7 @@ void sceneManager::buttonEval(){ ...@@ -203,7 +203,7 @@ void sceneManager::buttonEval(){
m_swapIsoSurface = 0; m_swapIsoSurface = 0;
} }
} }
if((*it)[0] == 2){ // if button 2 (mode for isosurfaces: both, negative, positive) if((*it)[0] == 2){ // if button 2 (mode for isosurfaces: all, one by one)
if((*it)[1] == 1){ //if pressed if((*it)[1] == 1){ //if pressed
m_oldTimeForSwap = Clock::now(); m_oldTimeForSwap = Clock::now();
m_pressB0 = true; m_pressB0 = true;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <vector> #include <vector>
#include <math.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#include <winsock2.h> #include <winsock2.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment