mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-17 02:50:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/statlogs

Browse Source 
# Conflicts:
#	Jenkinsfile
#	openspace.cfg
This commit is contained in:
Matthew Territo
2017-07-13 11:05:02 -06:00
parent 9f8036fa0e b09f89f918
commit d65a83dfbc
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@@ -34,7 +34,7 @@ stage('Build') {
cd build
cmake .. ''' +
flags + ''' ..
make
make -j2
'''
}
}
@@ -70,7 +70,7 @@ stage('Build') {
mkdir ${srcDir}/build
fi
cd ${srcDir}/build
/Applications/CMake.app/Contents/bin/cmake -G Xcode -D NASM=/usr/local/bin/nasm ${srcDir} .. ''' +
/Applications/CMake.app/Contents/bin/cmake -G Xcode ${srcDir} .. ''' +
flags + '''
xcodebuild -quiet
'''

2
ext/ghoul

Submodule ext/ghoul updated: d1b4177c44...67827b142e

12
openspace.cfg
View File

@@ -10,7 +10,7 @@ return {
SGCTConfig = sgct.config.single{},
-- A regular 1920x1080 window
-- SGCTConfig = sgct.config.single{1920, 1080},
-- SGCTConfig = sgct.config.single{1920, 1080},
-- A 1k fisheye rendering
-- SGCTConfig = sgct.config.fisheye{1024, 1024},
@@ -19,7 +19,7 @@ return {
-- SGCTConfig = sgct.config.fisheye{1024, 1024, res={4096, 4096}, quality="2k", tilt=27},
-- Streaming OpenSpace via Spout to OBS
-- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"},
-- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"},
--SGCTConfig = "${CONFIG}/openvr_oculusRiftCv1.xml",
@@ -48,8 +48,7 @@ return {
CONFIG = "${BASE_PATH}/config",
CACHE = "${BASE_PATH}/cache",
FONTS = "${OPENSPACE_DATA}/fonts",
DOCUMENTATION = "${BASE_PATH}/documentation",
LOGS = "${BASE_PATH}/logs"
DOCUMENTATION = "${BASE_PATH}/documentation"
},
Fonts = {
Mono = "${FONTS}/Droid_Sans_Mono/DroidSansMono.ttf",
@@ -57,12 +56,11 @@ return {
Console = "${FONTS}/Inconsolata/Inconsolata-Regular.ttf"
},
Logging = {
LogDir = "${LOGS}",
-- LogLevel = "Trace",
LogLevel = "Debug",
ImmediateFlush = true,
Logs = {
{ Type = "html", File = "${LOGS}/log.html", Append = false }
{ Type = "html", File = "${BASE_PATH}/log.html", Append = false }
},
CapabilitiesVerbosity = "Full"
},
@@ -71,7 +69,7 @@ return {
},
LuaDocumentation = "${DOCUMENTATION}/LuaScripting.html",
PropertyDocumentation = "${DOCUMENTATION}/Properties.html",
ScriptLog = "${LOGS}/ScriptLog.txt",
ScriptLog = "${BASE_PATH}/ScriptLog.txt",
KeyboardShortcuts = "${DOCUMENTATION}/KeyboardMapping.html",
Documentation = "${DOCUMENTATION}/Documentation.html",
FactoryDocumentation = "${DOCUMENTATION}/FactoryDocumentation.html",