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

Merge branch 'feature/gui-cleanup' of https://github.com/OpenSpace/OpenSpace-Development into feature/gui-cleanup

Browse Source
This commit is contained in:
Alexander Bock
2016-06-29 17:47:13 +02:00
parent 9652e64fd3 a56ce8d3f5
commit 443a0121b1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/openspace/util/camera.h
View File

@@ -29,7 +29,7 @@
// open space includes
#include <openspace/util/powerscaledcoordinate.h>
//#include <openspace/util/syncbuffer.h>
#include <openspace/util/syncbuffer.h>
#include <openspace/rendering/renderengine.h>
// glm includes
@@ -38,6 +38,7 @@
#include <glm/gtc/type_ptr.hpp>
#include <glm/gtc/quaternion.hpp>
namespace openspace {
class SyncBuffer;

1
modules/onscreengui/include/guipropertycomponent.h
View File

@@ -28,6 +28,7 @@
#include <modules/onscreengui/include/guicomponent.h>
#include <functional>
#include <string>
#include <vector>
namespace openspace {

4
src/engine/openspaceengine.cpp
View File

@@ -447,14 +447,14 @@ bool OpenSpaceEngine::initialize() {
OsEng.gui()._screenSpaceProperty.setSource(
[&]() {
auto& ssr = renderEngine().screenSpaceRenderables();
const auto& ssr = renderEngine().screenSpaceRenderables();
return std::vector<properties::PropertyOwner*>(ssr.begin(), ssr.end());
}
);
OsEng.gui()._property.setSource(
[&]() {
auto& nodes = renderEngine().scene()->allSceneGraphNodes();
const auto& nodes = renderEngine().scene()->allSceneGraphNodes();
return std::vector<properties::PropertyOwner*>(nodes.begin(), nodes.end());
}
);