Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Missed these guys.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-06-17 13:29:24 -07:00
parent 4421b21124
commit ec495e14d3
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/CMakeLists.txt
View file

@ -8,9 +8,9 @@ project(${TARGET_NAME})
# setup for find modules # setup for find modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/")
set(LODEPNG_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/LodePNG)
set(LIBOVR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/LibOVR) set(LIBOVR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/LibOVR)
set(PORTAUDIO_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/PortAudio) set(PORTAUDIO_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/PortAudio)
set(OPENCV_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/OpenCV)
if (APPLE) if (APPLE)
set(GL_HEADERS "#include <GLUT/glut.h>\n#include <OpenGL/glext.h>") set(GL_HEADERS "#include <GLUT/glut.h>\n#include <OpenGL/glext.h>")
@ -84,8 +84,8 @@ link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
# find required libraries # find required libraries
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
find_package(LodePNG REQUIRED)
find_package(LibOVR) find_package(LibOVR)
find_package(OpenCV)
# include headers for interface and InterfaceConfig. # include headers for interface and InterfaceConfig.
include_directories( include_directories(
@ -98,11 +98,11 @@ include_directories(
include_directories( include_directories(
SYSTEM SYSTEM
${GLM_INCLUDE_DIRS} ${GLM_INCLUDE_DIRS}
${LODEPNG_INCLUDE_DIRS}
${LIBOVR_INCLUDE_DIRS} ${LIBOVR_INCLUDE_DIRS}
${OPENCV_INCLUDE_DIRS}
) )
target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES} ${OPENCV_LIBRARIES})
if (APPLE) if (APPLE)
# link in required OS X frameworks and include the right GL headers # link in required OS X frameworks and include the right GL headers
@ -141,12 +141,9 @@ if (WIN32)
${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/glew32.lib ${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/glew32.lib
${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/freeglut.lib ${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/freeglut.lib
${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/pthread_lib.lib ${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/pthread_lib.lib
${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/lodepng.lib
wsock32.lib wsock32.lib
) )
else (WIN32) else (WIN32)
target_link_libraries(${TARGET_NAME} ${LODEPNG_LIBRARIES})
# link the PortAudio library # link the PortAudio library
find_package(PortAudio REQUIRED) find_package(PortAudio REQUIRED)
include_directories(${PORTAUDIO_INCLUDE_DIRS}) include_directories(${PORTAUDIO_INCLUDE_DIRS})

3
interface/src/Application.h
View file

@ -31,6 +31,7 @@
#include "Stars.h" #include "Stars.h"
#include "ViewFrustum.h" #include "ViewFrustum.h"
#include "VoxelSystem.h" #include "VoxelSystem.h"
#include "Webcam.h"
#include "ui/ChatEntry.h" #include "ui/ChatEntry.h"
class QAction; class QAction;
@ -249,6 +250,8 @@ private:
Transmitter _myTransmitter; // Gets UDP data from transmitter app used to animate the avatar Transmitter _myTransmitter; // Gets UDP data from transmitter app used to animate the avatar
Webcam _webcam; // The webcam interface
Camera _myCamera; // My view onto the world Camera _myCamera; // My view onto the world
Camera _viewFrustumOffsetCamera; // The camera we use to sometimes show the view frustum from an offset mode Camera _viewFrustumOffsetCamera; // The camera we use to sometimes show the view frustum from an offset mode

1
interface/src/Avatar.cpp
View file

@ -9,7 +9,6 @@
#include <glm/gtx/quaternion.hpp> #include <glm/gtx/quaternion.hpp>
#include <glm/gtx/vector_angle.hpp> #include <glm/gtx/vector_angle.hpp>
#include <vector> #include <vector>
#include <lodepng.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include "world.h" #include "world.h"
#include "Application.h" #include "Application.h"