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

solved merge conflict

Browse Source
This commit is contained in:
Michael Nilsson
2016-03-11 15:09:07 -05:00
parent c746338553 f01299fe69
commit 7dfdb2083e
7 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rendering/screenspacerenderable.cpp
View File

@@ -25,12 +25,12 @@
#include <openspace/rendering/screenspacerenderable.h>
namespace openspace {
ScreenSpaceRenderable::ScreenSpaceRenderable()
ScreenSpaceRenderable::ScreenSpaceRenderable(std::string texturePath)
: _enabled("enabled", "Is Enabled", true)
, _flatScreen("flatScreen", "Flat Screen", true)
, _position("position", "Position", glm::vec3(0,0,-2),glm::vec3(-2),glm::vec3(2))
, _scale("scale", "Scale" , 0.5, 0, 1)
, _texturePath("texturePath", "Texture path", "${OPENSPACE_DATA}/test2.jpg")
, _texturePath("texturePath", "Texture path", texturePath)
, _quad(0)
, _vertexPositionBuffer(0)
{