mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-18 09:51:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug that did not set cache directory correctly

Browse Source 
Moved visibility of console into LuaConsole class
This commit is contained in:
Alexander Bock
2014-11-18 17:47:09 +01:00
parent f02234099f
commit e630f6efbb
5 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/engine/openspaceengine.cpp
View File

@@ -85,7 +85,6 @@ OpenSpaceEngine* OpenSpaceEngine::_engine = nullptr;
OpenSpaceEngine::OpenSpaceEngine(std::string programName)
: _commandlineParser(programName, true)
, _syncBuffer(nullptr)
, _inputCommand(false)
, _console(nullptr)
{
// initialize OpenSpace helpers
@@ -294,10 +293,7 @@ bool OpenSpaceEngine::create(int argc, char** argv,
}
// Create the cachemanager
std::string cacheDirectory;
_engine->configurationManager().getValue(
constants::configurationmanager::keyCachePath, cacheDirectory);
FileSys.createCacheManager(cacheDirectory);
FileSys.createCacheManager(absPath("${" + constants::configurationmanager::keyCache + "}"));
_engine->_console = new LuaConsole();
_engine->_syncBuffer = new SyncBuffer(1024);
@@ -426,7 +422,7 @@ void OpenSpaceEngine::render() {
// If currently writing a command, render it to screen
sgct::SGCTWindow* w = sgct::Engine::instance()->getActiveWindowPtr();
if (sgct::Engine::instance()->isMaster() && !w->isUsingFisheyeRendering() && _inputCommand) {
if (sgct::Engine::instance()->isMaster() && !w->isUsingFisheyeRendering() && _console->isVisible()) {
_console->render();
}
}
@@ -441,11 +437,10 @@ void OpenSpaceEngine::postDraw() {
void OpenSpaceEngine::keyboardCallback(int key, int action) {
if (sgct::Engine::instance()->isMaster()) {
if (key == _console->commandInputButton() && (action == SGCT_PRESS || action == SGCT_REPEAT)) {
_inputCommand = !_inputCommand;
}
if (key == _console->commandInputButton() && (action == SGCT_PRESS || action == SGCT_REPEAT))
_console->toggleVisibility();
if (!_inputCommand) {
if (!_console->isVisible()) {
_interactionHandler.keyboardCallback(key, action);
}
else {
@@ -455,7 +450,7 @@ void OpenSpaceEngine::keyboardCallback(int key, int action) {
}
void OpenSpaceEngine::charCallback(unsigned int codepoint) {
if (_inputCommand) {
if (_console->isVisible()) {
_console->charCallback(codepoint);
}
}
@@ -485,10 +480,6 @@ void OpenSpaceEngine::decode()
_renderEngine.deserialize(_syncBuffer);
}
void OpenSpaceEngine::setInputCommand(bool b) {
_inputCommand = b;
}
void OpenSpaceEngine::externalControlCallback(const char* receivedChars,
int size, int clientId)
{