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

Intermediate step when porting Flare

Browse Source
This commit is contained in:
Jonas Strandstedt
2014-03-25 13:21:03 -04:00
parent 956a44ffcd
commit 88b0246506
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: 53d27bd972...58385daea3

10
src/CMakeLists.txt
View File

@@ -83,11 +83,11 @@ file(GLOB UTIL_HEADER ${HEADER_ROOT_DIR}/util/*.h)
set(OPENSPACE_HEADER ${OPENSPACE_HEADER} ${UTIL_HEADER})
source_group(Util FILES ${UTIL_SOURCE} ${UTIL_HEADER})
#file(GLOB FLARE_SOURCE ${SOURCE_ROOT_DIR}/flare/*.cpp)
#set(OPENSPACE_SOURCE ${OPENSPACE_SOURCE} ${FLARE_SOURCE})
#file(GLOB FLARE_HEADER ${HEADER_ROOT_DIR}/flare/*.h)
#set(OPENSPACE_HEADER ${OPENSPACE_HEADER} ${FLARE_HEADER})
#source_group(Flare FILES ${FLARE_SOURCE} ${FLARE_HEADER})
file(GLOB FLARE_SOURCE ${SOURCE_ROOT_DIR}/flare/*.cpp)
set(OPENSPACE_SOURCE ${OPENSPACE_SOURCE} ${FLARE_SOURCE})
file(GLOB FLARE_HEADER ${HEADER_ROOT_DIR}/flare/*.h)
set(OPENSPACE_HEADER ${OPENSPACE_HEADER} ${FLARE_HEADER})
source_group(Flare FILES ${FLARE_SOURCE} ${FLARE_HEADER})
include_directories(${HEADER_ROOT_DIR})

22
src/openspaceengine.cpp
View File

@@ -166,13 +166,13 @@ bool OpenSpaceEngine::initialize() {
_engine->_interactionHandler->connectDevices();
//_volumeRaycaster = new VolumeRaycaster();
//_flare = new Flare();
_flare = new Flare();
ghoul::opencl::CLContext context;
if(context.createContextGLContext()) {
if(context.createContextFromGLContext()) {
LDEBUG("Successfull CL/GL context creation");
ghoul::opencl::CLProgram prog(&context, "${KERNELS}/test.cl");
ghoul::opencl::CLProgram prog = context.createProgram("${KERNELS}/test.cl");
prog.addDefinition("OFFSET", 3);
prog.build();
ghoul::opencl::CLKernel kernel = prog.createKernel("hello");
@@ -201,6 +201,8 @@ bool OpenSpaceEngine::initialize() {
delete out;
//ghoul::opengl::Texture t(glm::size3_t(256,256,256));
}
return true;
@@ -235,7 +237,7 @@ void OpenSpaceEngine::preSynchronization() {
_interactionHandler->update(dt);
_interactionHandler->lockControls();
//_flare->preSync();
_flare->preSync();
}
}
@@ -245,28 +247,28 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
void OpenSpaceEngine::render() {
// _volumeRaycaster->render();
//_flare->render();
_flare->render();
//_renderEngine->render();
}
void OpenSpaceEngine::postDraw() {
if (sgct::Engine::instance()->isMaster()) {
_interactionHandler->unlockControls();
//_flare->postDraw();
_flare->postDraw();
}
}
void OpenSpaceEngine::keyboardCallback(int key, int action) {
if (sgct::Engine::instance()->isMaster()) {
_interactionHandler->keyboardCallback(key, action);
//_flare->keyboard(key, action);
_flare->keyboard(key, action);
}
}
void OpenSpaceEngine::mouseButtonCallback(int key, int action) {
if (sgct::Engine::instance()->isMaster()) {
_interactionHandler->mouseButtonCallback(key, action);
//_flare->mouse(key, action);
_flare->mouse(key, action);
}
}
@@ -279,11 +281,11 @@ void OpenSpaceEngine::mouseScrollWheelCallback(int pos) {
}
void OpenSpaceEngine::encode() {
//_flare->encode();
_flare->encode();
}
void OpenSpaceEngine::decode() {
//_flare->decode();
_flare->decode();
}
} // namespace openspace

4
src/openspaceengine.h
View File

@@ -30,7 +30,7 @@
#include <ghoul/misc/configurationmanager.h>
#include <rendering/volumeraycaster.h>
//#include <flare/flare.h>
#include <flare/flare.h>
namespace openspace {
@@ -69,7 +69,7 @@ private:
static OpenSpaceEngine* _engine;
VolumeRaycaster* _volumeRaycaster;
//Flare* _flare;
Flare* _flare;
ghoul::ConfigurationManager* _configurationManager;
InteractionHandler* _interactionHandler;
RenderEngine* _renderEngine;