Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
acgl
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ACGL
acgl
Commits
2a50f6ac
Commit
2a50f6ac
authored
Apr 15, 2014
by
Robert Menzel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reduced cmake dependencies, better error message in RiftController
parent
343315f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
CMakeListsStaticInclude.txt
CMakeListsStaticInclude.txt
+20
-1
src/ACGL/HardwareSupport/SimpleRiftController.cc
src/ACGL/HardwareSupport/SimpleRiftController.cc
+2
-1
No files found.
CMakeListsStaticInclude.txt
View file @
2a50f6ac
...
...
@@ -4,7 +4,26 @@
# e.g.: INCLUDE(${CMAKE_SOURCE_DIR}/extern/acgl/CMakeListsStaticInclude.txt)
#
include(${CMAKE_CURRENT_LIST_DIR}/cmake/CMakeMacros.txt)
################################################################################
# Macro to sort acgl into directories
################################################################################
MACRO (RECURSE_GROUPS dirname)
FILE(GLOB_RECURSE allfiles "${dirname}/*.*")
SET(ALL_FILES ${ALL_FILES} ${allfiles})
STRING(REGEX REPLACE ".*/([^/]*)" "\\1" maindir "${dirname}")
FOREACH(file ${allfiles})
STRING(REGEX REPLACE "${dirname}/(.*)/[^/]*" "\\1" loopdirname "${file}")
STRING(REGEX REPLACE "/" "\\\\" loopdirname "${loopdirname}")
IF(NOT "${file}" MATCHES "${dirname}/(.*)/[^/]*")
source_group("${maindir}" FILES ${file})
ELSE()
source_group("${maindir}\\${loopdirname}" FILES ${file})
ENDIF()
ENDFOREACH()
ENDMACRO (RECURSE_GROUPS)
SET(ACGL_BASE_DIR "${CMAKE_CURRENT_LIST_DIR}")
# Find all used files of certain file-types
...
...
src/ACGL/HardwareSupport/SimpleRiftController.cc
View file @
2a50f6ac
...
...
@@ -131,7 +131,8 @@ SimpleRiftController::SimpleRiftController( uint32_t _riftnumber )
debug
()
<<
"Connected to Rift (SDK: "
<<
OVR_VERSION_STRING
<<
"). Yaw correction inactive. No local user profile found."
<<
endl
;
}
}
else
{
error
()
<<
"could not create a Rift device - using default values (SDK: "
<<
OVR_VERSION_STRING
<<
")."
<<
endl
;
error
()
<<
"Could not create a Rift device - using default values (SDK: "
<<
OVR_VERSION_STRING
<<
")."
<<
endl
;
error
()
<<
"In some cases this happens if the Rift is NOT set to the native resolution (1280*800 in case of the first/old DevKit)."
<<
endl
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment