Skip to content

D3d capi doublebuffer #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 45 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
cd4c5c7
change int to std::uint8_t. Add some logging to check value of eye i…
DuFF14 Dec 8, 2016
b9ad253
enable logging.
DuFF14 Dec 8, 2016
0fe7801
updated logging
DuFF14 Dec 8, 2016
ee11567
added logging
DuFF14 Dec 8, 2016
3b2ef30
updated logging
DuFF14 Dec 8, 2016
bd0edc0
more logging
DuFF14 Dec 8, 2016
af7daac
return default HDK2 viewport when renderInfo size=0 bug occurs
DuFF14 Dec 8, 2016
dad1c16
cache non-zero viewport values for width and height, and return them …
DuFF14 Dec 12, 2016
6294035
Disable logging and added comments.
DuFF14 Dec 12, 2016
fc16712
Change from C++ to CAPI. Works, but not complete yet.
DuFF14 Jan 9, 2017
6c73177
Corrects the upside-down image.
DuFF14 Feb 9, 2017
c17ed66
Removes flickering issue when combined with Unity changes
DuFF14 Feb 13, 2017
0079f1f
Update RenderInfoCollection. Shuts down properly.
DuFF14 Feb 16, 2017
5edd011
cmake updates
DuFF14 Jun 20, 2017
01a1cb9
added android support
DuFF14 Jun 20, 2017
4214e2f
Cmakelists update
DuFF14 Jun 21, 2017
e1ed6b8
fixed typo
DuFF14 Jun 21, 2017
260a9d4
moved struct definition
DuFF14 Jun 21, 2017
345b832
disabled DebugLog on android
DuFF14 Jun 21, 2017
b8e0b11
fixed typo
DuFF14 Jun 21, 2017
1f8087d
Moved ShutdownRenderManager
DuFF14 Jun 21, 2017
6bea8e3
Added JNI variable declarations
DuFF14 Jun 21, 2017
6029ab9
a bunch of fixes on android path
DuFF14 Jun 21, 2017
622fa66
more android fixes
DuFF14 Jun 21, 2017
12112fc
Android type fixes
DuFF14 Jun 21, 2017
9589168
removed extra bracket
DuFF14 Jun 21, 2017
62398a3
more platform dependent compilation
DuFF14 Jun 21, 2017
72314cd
more platform dependent compilation changes
DuFF14 Jun 21, 2017
c86ea98
platform dependent function call
DuFF14 Jun 21, 2017
9f3a572
cleanup, comments
DuFF14 Jun 22, 2017
1acd482
clang format
DuFF14 Jun 22, 2017
8721dd3
merging master
JeroMiya Jul 31, 2017
0681c81
Added experimental android vsync timings to Unity's OpenGL custom too…
JeroMiya Jul 31, 2017
5bfd6a5
Fixed build errors on Android.
JeroMiya Aug 1, 2017
70925c9
Attempt to cleanup a bad copy/paste
JeroMiya Aug 8, 2017
7443176
Removed commented out code, plus more cleanup. Refactored render info…
JeroMiya Aug 9, 2017
92d62f3
Choreographer implementation, some build fixes
JeroMiya Sep 1, 2017
7b0013a
Creates an extra set of render buffers and swaps buffers every frame.
DuFF14 Dec 5, 2017
25563a5
Comments out DebugLog from Shutdown Event to avoid crash
DuFF14 Dec 7, 2017
376a6ee
Cleaned up shutdown process
DuFF14 Dec 7, 2017
27a0d44
Fixes crash when switching scenes.
DuFF14 Dec 12, 2017
18d8e6e
Cmakelists update to add extra linker flags on android, attempting to…
DuFF14 Dec 21, 2017
10dfe9e
Updates to double buffering on Android path
DuFF14 Dec 22, 2017
15e27b8
fixed cmake build error on Windows without breaking OSVR-Android-Build
DuFF14 Dec 27, 2017
d998a22
Creating const strings for JNI class paths and log method name. Refac…
DuFF14 Dec 30, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.1.0)
project(osvrUnityRenderingPlugin)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

#-----------------------------------------------------------------------------
# Local CMake Modules
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
Expand All @@ -17,11 +20,13 @@ find_package(osvr REQUIRED)
# Add one of these libraries for each vendor that we've got a driver
# for and add a No driver that tells that it is unavailable when we
# don't find the driver library.
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
find_package(Boost REQUIRED)
find_package(OpenGL)
find_package(OpenGLES2 REQUIRED)
find_package(GLEW)
find_package(Boost)
find_package(osvrRenderManager REQUIRED)
find_package(JsonCpp REQUIRED)
find_package(JsonCpp)
find_package(SDL2)

set (osvrUnityRenderingPlugin_SOURCES
OsvrRenderingPlugin.h
Expand All @@ -34,21 +39,37 @@ if(WIN32)
# list(APPEND osvrUnityRenderingPlugin_SOURCES OsvrRenderingPlugin.def)
endif()

add_library(osvrUnityRenderingPlugin MODULE ${osvrUnityRenderingPlugin_SOURCES})
set(EXTRA_ANDROID_LINKER_FLAGS "")

if(ANDROID)
add_library(osvrUnityRenderingPlugin SHARED ${osvrUnityRenderingPlugin_SOURCES})
set(EXTRA_ANDROID_LINKER_FLAGS "log -z global")
else()
add_library(osvrUnityRenderingPlugin MODULE ${osvrUnityRenderingPlugin_SOURCES})
endif()

#set_target_properties(osvrUnityRenderingPlugin PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/OsvrRenderingPlugin.def")
target_link_libraries(osvrUnityRenderingPlugin osvr::osvrClientKit)
target_link_libraries(osvrUnityRenderingPlugin osvrRenderManager::osvrRenderManager)
#target_link_libraries(osvrUnityRenderingPlugin osvr::osvrClientKit)
#target_link_libraries(osvrUnityRenderingPlugin osvrRenderManager::osvrRenderManager)
target_include_directories(osvrUnityRenderingPlugin PRIVATE ${Boost_INCLUDE_DIRS})
# target_link_libraries(osvrUnityRenderingPlugin ${Boost_LIBRARIES})

if (OPENGL_FOUND AND GLEW_FOUND)
target_include_directories(osvrUnityRenderingPlugin PRIVATE ${OPENGL_INCLUDE_DIRS})
target_link_libraries(osvrUnityRenderingPlugin ${OPENGL_LIBRARY} GLEW::GLEW JsonCpp::JsonCpp)
target_link_libraries(osvrUnityRenderingPlugin ${OPENGL_LIBRARY} GLEW::GLEW JsonCpp::JsonCpp SDL2::SDL2 osvr::osvrClientKit osvrRenderManager::osvrRenderManager)
# Handle static glew.
if(GLEW_LIBRARY MATCHES ".*s.lib")
target_compile_definitions(osvrUnityRenderingPlugin PRIVATE GLEW_STATIC)
endif()
endif()
if (OPENGL_FOUND)
target_include_directories(osvrUnityRenderingPlugin PRIVATE ${OPENGL_INCLUDE_DIRS})
target_link_libraries(osvrUnityRenderingPlugin ${OPENGL_LIBRARY} JsonCpp::JsonCpp osvr::osvrClientKit osvrRenderManager::osvrRenderManager)
endif()
if(OPENGLES2_FOUND)
target_include_directories(osvrUnityRenderingPlugin PRIVATE ${OPENGLES2_INCLUDE_DIR})
target_link_libraries(osvrUnityRenderingPlugin PRIVATE ${OPENGLES2_LIBRARIES} JsonCpp::JsonCpp osvr::osvrClientKit osvrRenderManager::osvrRenderManager android ${EXTRA_ANDROID_LINKER_FLAGS})
endif()

# Install docs, license, sample config
install(TARGETS
Expand Down
Loading