mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-28 16:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/OpenSpace/OpenSpace

Browse Source
This commit is contained in:
Jonathas Costa
2020-01-27 12:08:08 -05:00
parent b19147fba7 b545ab5c5b
commit 47e89d2d74
18 changed files with 85 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/OpenSpace/main.cpp
View File

@@ -890,6 +890,11 @@ void setSgctDelegateFunctions() {
};
sgctDelegate.currentSubwindowSize = []() {
auto window = sgct::Engine::instance()->getCurrentWindowPtr();
if (sgct::Engine::instance()->getCurrentWindowPtr()->getNumberOfViewports() > 1) {
sgct_core::Viewport* viewport =
sgct::Engine::instance()->getCurrentWindowPtr()->getViewport(0);
return glm::ivec2(window->getXResolution()*viewport->getXSize(), window->getYResolution()*viewport->getYSize());
}
switch (window->getStereoMode()) {
case sgct::SGCTWindow::Side_By_Side_Stereo:
case sgct::SGCTWindow::Side_By_Side_Inverted_Stereo:
@@ -915,6 +920,12 @@ void setSgctDelegateFunctions() {
int res = viewport->getNonLinearProjectionPtr()->getCubemapResolution();
return glm::ivec2(res, res);
}
else if (sgct::Engine::instance()->getCurrentWindowPtr()->getNumberOfViewports() > 1) {
int x, y;
auto window = sgct::Engine::instance()->getCurrentWindowPtr();
window->getFinalFBODimensions(x, y);
return glm::ivec2(x*viewport->getXSize(), y*viewport->getYSize());
}
else {
int x, y;
auto window = sgct::Engine::instance()->getCurrentWindowPtr();
@@ -944,16 +955,6 @@ void setSgctDelegateFunctions() {
sgctDelegate.currentNumberOfAaSamples = []() {
return sgct::Engine::instance()->getCurrentWindowPtr()->getNumberOfAASamples();
};
sgctDelegate.isRegularRendering = []() {
sgct::SGCTWindow* w = sgct::Engine::instance()->getCurrentWindowPtr();
ghoul_assert(
w->getNumberOfViewports() > 0,
"At least one viewport must exist at this time"
);
sgct_core::Viewport* vp = w->getViewport(0);
sgct_core::NonLinearProjection* nlp = vp->getNonLinearProjectionPtr();
return nlp == nullptr;
};
sgctDelegate.hasGuiWindow = []() {
auto engine = sgct::Engine::instance();
for (size_t i = 0; i < engine->getNumberOfWindows(); ++i) {

30
config/single_sbs_stereo.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" ?>
<Cluster masterAddress="localhost">
<Node address="localhost" port="20401">
<Window fullScreen="false">
<Stereo type="none" />
<Pos x="200" y="300" />
<!-- 16:9 aspect ratio -->
<Size x="1280" y="360" />
<Viewport eye="left">
<Pos x="0.0" y="0.0" />
<Size x="0.5" y="1.0" />
<PlanarProjection>
<FOV down="25.267007923362" left="40.0" right="40.0" up="25.267007923362" />
<Orientation heading="0.0" pitch="0.0" roll="0.0" />
</PlanarProjection>
</Viewport>
<Viewport eye="right">
<Pos x="0.5" y="0.0" />
<Size x="0.5" y="1.0" />
<PlanarProjection>
<FOV down="25.267007923362" left="40.0" right="40.0" up="25.267007923362" />
<Orientation heading="0.0" pitch="0.0" roll="0.0" />
</PlanarProjection>
</Viewport>
</Window>
</Node>
<User eyeSeparation="0.06">
<Pos x="0.0" y="0.0" z="0.0" />
</User>
</Cluster>

2
include/openspace/engine/windowdelegate.h
View File

@@ -74,8 +74,6 @@ struct WindowDelegate {
int (*currentNumberOfAaSamples)() = []() { return 1; };
bool (*isRegularRendering)() = []() { return true; };
bool (*hasGuiWindow)() = []() { return false; };
bool (*isGuiWindow)() = []() { return false; };

2
modules/base/rendering/screenspacedashboard.cpp
View File

@@ -201,7 +201,7 @@ bool ScreenSpaceDashboard::isReady() const {
void ScreenSpaceDashboard::update() {
if (global::windowDelegate.windowHasResized()) {
const glm::ivec2 size = global::windowDelegate.currentWindowResolution();
const glm::ivec2 size = global::windowDelegate.currentDrawBufferResolution();
_size = { 0.f, 0.f, size.x, size.y };
createFramebuffer();
}

15
modules/base/rendering/screenspaceframebuffer.cpp
View File

@@ -77,7 +77,7 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona
setGuiName("ScreenSpaceFramebuffer " + std::to_string(iIdentifier));
}
glm::vec2 resolution = global::windowDelegate.currentWindowResolution();
glm::vec2 resolution = global::windowDelegate.currentDrawBufferResolution();
addProperty(_size);
_size.set(glm::vec4(0, 0, resolution.x,resolution.y));
}
@@ -103,13 +103,15 @@ bool ScreenSpaceFramebuffer::deinitializeGL() {
}
void ScreenSpaceFramebuffer::render() {
const glm::vec2& resolution = global::windowDelegate.currentWindowResolution();
const glm::vec2& resolution = global::windowDelegate.currentDrawBufferResolution();
const glm::vec4& size = _size.value();
const float xratio = resolution.x / (size.z - size.x);
const float yratio = resolution.y / (size.w - size.y);;
if (!_renderFunctions.empty()) {
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
glViewport(
static_cast<GLint>(-size.x * xratio),
static_cast<GLint>(-size.y * yratio),
@@ -127,12 +129,7 @@ void ScreenSpaceFramebuffer::render() {
_framebuffer->deactivate();
glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
glViewport(
0,
0,
static_cast<GLsizei>(resolution.x),
static_cast<GLsizei>(resolution.y)
);
glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
const glm::mat4 globalRotation = globalRotationMatrix();
const glm::mat4 translation = translationMatrix();
@@ -170,7 +167,7 @@ void ScreenSpaceFramebuffer::removeAllRenderFunctions() {
}
void ScreenSpaceFramebuffer::createFramebuffer() {
glm::vec2 resolution = global::windowDelegate.currentWindowResolution();
glm::vec2 resolution = global::windowDelegate.currentDrawBufferResolution();
_framebuffer = std::make_unique<ghoul::opengl::FramebufferObject>();
_framebuffer->activate();

9
modules/cefwebgui/cefwebguimodule.cpp
View File

@@ -103,6 +103,10 @@ void CefWebGuiModule::startOrStopGui() {
new GUIKeyboardHandler
);
_instance->initialize();
_instance->reshape(static_cast<glm::ivec2>(
static_cast<glm::vec2>(global::windowDelegate.currentSubwindowSize()) *
global::windowDelegate.dpiScaling()
));
if (!_url.value().empty()) {
_instance->loadUrl(_url);
}
@@ -200,11 +204,12 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
const bool isMaster = global::windowDelegate.isMaster();
if (isGuiWindow && isMaster && _instance) {
if (global::windowDelegate.windowHasResized()) {
if (global::windowDelegate.windowHasResized() || _instance->_shouldReshape) {
_instance->reshape(static_cast<glm::ivec2>(
static_cast<glm::vec2>(global::windowDelegate.currentWindowSize()) *
static_cast<glm::vec2>(global::windowDelegate.currentSubwindowSize()) *
global::windowDelegate.dpiScaling()
));
_instance->_shouldReshape = false;
}
if (_visible) {
_instance->draw();

2
modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
View File

@@ -1731,7 +1731,7 @@ void RenderableBillboardsCloud::renderToTexture(GLuint textureToRenderTo,
glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, textureToRenderTo, 0);
glViewport(0, 0, textureWidth, textureHeight);
glViewport(viewport[0], viewport[1], textureWidth, textureHeight);
loadPolygonGeometryForRendering();
renderPolygonGeometry(_polygonVao);

4
modules/imgui/imguimodule.cpp
View File

@@ -151,8 +151,8 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
WindowDelegate& delegate = global::windowDelegate;
const bool showGui = delegate.hasGuiWindow() ? delegate.isGuiWindow() : true;
if (delegate.isMaster() && showGui) {
const glm::ivec2 windowSize = delegate.currentWindowSize();
const glm::ivec2 resolution = delegate.currentWindowResolution();
const glm::ivec2 windowSize = delegate.currentSubwindowSize();
const glm::ivec2 resolution = delegate.currentDrawBufferResolution();
if (windowSize.x <= 0 || windowSize.y <= 0) {
return;

2
modules/webbrowser/include/browserinstance.h
View File

@@ -119,6 +119,8 @@ public:
bool hasContent(int x, int y);
bool _shouldReshape = false;
private:
CefRefPtr<WebRenderHandler> _renderHandler;
CefRefPtr<WebKeyboardHandler> _keyboardHandler;

3
modules/webbrowser/src/browserinstance.cpp
View File

@@ -74,10 +74,11 @@ BrowserInstance::~BrowserInstance() {
void BrowserInstance::initialize() {
reshape(static_cast<glm::ivec2>(
static_cast<glm::vec2>(global::windowDelegate.currentWindowSize()) *
static_cast<glm::vec2>(global::windowDelegate.currentSubwindowSize()) *
global::windowDelegate.dpiScaling()
));
_isInitialized = true;
_shouldReshape = true;
}
void BrowserInstance::loadUrl(std::string url) {

4
openspace.cfg
View File

@@ -32,6 +32,9 @@ SGCTConfig = sgct.config.single{}
-- Streaming OpenSpace via Spout to OBS
-- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"}
-- A side-by-side test of mutiple viewport (also with different eyes)
-- SGCTConfig = "${CONFIG}/single_sbs_stereo.xml"
-- Spout exit
-- SGCTConfig = "${CONFIG}/spout_output.xml"
@@ -97,6 +100,7 @@ ModuleConfigurations = {
SynchronizationRoot = "${SYNC}",
HttpSynchronizationRepositories = {
"http://data.openspaceproject.com/request"
-- "http://openspace.sci.utah.edu/request"
}
},
Server = {

8
src/rendering/framebufferrenderer.cpp
View File

@@ -1137,8 +1137,6 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
glBindFramebuffer(GL_FRAMEBUFFER, _defaultFBO);
}
glViewport(0, 0, _resolution.x, _resolution.y);
// Apply the selected TMO on the results and resolve the result for the default FBO
applyTMO(blackoutFactor);
@@ -1155,6 +1153,8 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
glBindFramebuffer(GL_FRAMEBUFFER, _exitFramebuffer);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
ghoul::opengl::ProgramObject* exitProgram = _exitPrograms[raycaster].get();
if (exitProgram) {
@@ -1166,7 +1166,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
if (raycaster->downscaleRender() < 1.f) {
float scaleDown = raycaster->downscaleRender();
glBindFramebuffer(GL_FRAMEBUFFER, _downscaleVolumeRendering.framebuffer);
glViewport(0, 0, _resolution.x * scaleDown, _resolution.y * scaleDown);
glViewport(viewport[0], viewport[1], viewport[2] * scaleDown, viewport[3] * scaleDown);
if (_downscaleVolumeRendering.currentDownscaleFactor != scaleDown) {
_downscaleVolumeRendering.currentDownscaleFactor = scaleDown;
updateDownscaleTextures();
@@ -1259,7 +1259,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
}
if (raycaster->downscaleRender() < 1.f) {
glViewport(0, 0, _resolution.x, _resolution.y);
glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _gBuffers.framebuffer);
writeDownscaledVolume();
}

4
src/rendering/loadingscreen.cpp
View File

@@ -159,7 +159,7 @@ void LoadingScreen::render() {
const glm::vec2 dpiScaling = global::windowDelegate.dpiScaling();
const glm::ivec2 res =
glm::vec2(global::windowDelegate.currentDrawBufferResolution()) / dpiScaling;
glm::vec2(global::windowDelegate.currentSubwindowSize()) / dpiScaling;
float screenAspectRatio = static_cast<float>(res.x) / static_cast<float>(res.y);
@@ -178,7 +178,7 @@ void LoadingScreen::render() {
//
glClearColor(0.f, 0.f, 0.f, 1.f);
glClear(ClearBufferMask::GL_COLOR_BUFFER_BIT);
glViewport(0, 0, res.x, res.y);
glDisable(GL_CULL_FACE);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

4
src/rendering/luaconsole.cpp
View File

@@ -615,7 +615,7 @@ void LuaConsole::update() {
// Update the current height.
// The current height is the offset that is used to slide
// the console in from the top.
const glm::ivec2 res = global::windowDelegate.currentWindowResolution();
const glm::ivec2 res = global::windowDelegate.currentSubwindowSize();
const glm::vec2 dpiScaling = global::windowDelegate.dpiScaling();
const double dHeight = (_targetHeight - _currentHeight) *
std::pow(0.98, 1.0 / (ConsoleOpenSpeed / dpiScaling.y * frametime));
@@ -636,7 +636,7 @@ void LuaConsole::render() {
const glm::vec2 dpiScaling = global::windowDelegate.dpiScaling();
const glm::ivec2 res =
glm::vec2(global::windowDelegate.currentWindowResolution()) / dpiScaling;
glm::vec2(global::windowDelegate.currentSubwindowSize()) / dpiScaling;
// Render background

14
src/rendering/renderengine.cpp
View File

@@ -555,12 +555,7 @@ void RenderEngine::updateScreenSpaceRenderables() {
}
glm::ivec2 RenderEngine::renderingResolution() const {
if (global::windowDelegate.isRegularRendering()) {
return global::windowDelegate.currentWindowResolution();
}
else {
return global::windowDelegate.currentDrawBufferResolution();
}
return global::windowDelegate.currentDrawBufferResolution();
}
glm::ivec2 RenderEngine::fontResolution() const {
@@ -569,7 +564,7 @@ glm::ivec2 RenderEngine::fontResolution() const {
return global::windowDelegate.currentViewportSize();
}
else {
return global::windowDelegate.currentWindowSize();
return global::windowDelegate.currentSubwindowSize();
}
}
@@ -771,6 +766,11 @@ void RenderEngine::renderEndscreen() {
glm::vec4(0.f, 0.f, 0.f, 0.5f)
);
const glm::vec2 dpiScaling = global::windowDelegate.dpiScaling();
const glm::ivec2 res =
glm::vec2(global::windowDelegate.currentSubwindowSize()) / dpiScaling;
glViewport(0, 0, res.x, res.y);
using FR = ghoul::fontrendering::FontRenderer;
using BBox = FR::BoundingBoxInformation;
BBox size = FR::defaultRenderer().boundingBox(

4
src/rendering/screenspacerenderable.cpp
View File

@@ -515,7 +515,7 @@ float ScreenSpaceRenderable::depth() {
void ScreenSpaceRenderable::createShaders() {
ghoul::Dictionary dict = ghoul::Dictionary();
auto res = global::windowDelegate.currentWindowResolution();
auto res = global::windowDelegate.currentDrawBufferResolution();
ghoul::Dictionary rendererData = {
{ "fragmentRendererPath", "${SHADERS}/framebuffer/renderframebuffer.frag" },
{ "windowWidth" , res.x },
@@ -537,7 +537,7 @@ void ScreenSpaceRenderable::createShaders() {
}
glm::mat4 ScreenSpaceRenderable::scaleMatrix() {
glm::vec2 resolution = global::windowDelegate.currentWindowResolution();
glm::vec2 resolution = global::windowDelegate.currentDrawBufferResolution();
//to scale the plane
float textureRatio =

2
src/scene/scenegraphnode.cpp
View File

@@ -684,7 +684,7 @@ void SceneGraphNode::computeScreenSpaceData(RenderData& newData) {
return;
}
glm::ivec2 res = global::windowDelegate.currentWindowSize();
glm::ivec2 res = global::windowDelegate.currentSubwindowSize();
// Get the radius of node
double nodeRadius = static_cast<double>(this->boundingSphere());

2
src/util/touch.cpp
View File

@@ -44,7 +44,7 @@ glm::vec2 TouchInput::screenCoordinates(glm::vec2 resolution) const {
}
glm::vec2 TouchInput::currentWindowCoordinates() const {
glm::vec2 res = global::windowDelegate.currentWindowSize();
glm::vec2 res = global::windowDelegate.currentSubwindowSize();
return { std::floor(x * res.x + 0.5f), std::floor(y * res.y + 0.5f) };
}