mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated Ghoul version

Browse Source 
Started cleaning up OpenSpace
This commit is contained in:
Alexander Bock
2015-12-13 22:01:42 -08:00
parent 8260f5701d
commit e26f1d41a4
34 changed files with 304 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/renderableplane.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ void RenderablePlane::render(const RenderData& data) {
_shader->activate();
if (_projectionListener){
//get parent node-texture and set with correct dimensions
SceneGraphNode* textureNode = OsEng.renderEngine()->scene()->sceneGraphNode(_nodeName)->parent();
SceneGraphNode* textureNode = OsEng.renderEngine().scene()->sceneGraphNode(_nodeName)->parent();
if (textureNode != nullptr){
RenderablePlanetProjection* t = static_cast<RenderablePlanetProjection*>(textureNode->renderable());
_texture = std::unique_ptr<ghoul::opengl::Texture>(t->baseTexture());
modules/base/rendering/renderableplanet.cpp
+2 -2
View File
@@ -123,9 +123,9 @@ RenderablePlanet::~RenderablePlanet() {
bool RenderablePlanet::initialize() {
if (_programObject == nullptr && _hasNightTexture)
OsEng.ref().configurationManager()->getValue("nightTextureProgram", _programObject);
OsEng.ref().configurationManager().getValue("nightTextureProgram", _programObject);
else if (_programObject == nullptr)
OsEng.ref().configurationManager()->getValue("pscShader", _programObject);
OsEng.ref().configurationManager().getValue("pscShader", _programObject);
loadTexture();
_geometry->initialize(this);
modules/base/rendering/renderablesphericalgrid.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ bool RenderableSphericalGrid::deinitialize(){
bool RenderableSphericalGrid::initialize(){
bool completeSuccess = true;
if (_gridProgram == nullptr)
completeSuccess &= OsEng.ref().configurationManager()->getValue("GridProgram", _gridProgram);
completeSuccess &= OsEng.ref().configurationManager().getValue("GridProgram", _gridProgram);
// Initialize and upload to graphics card
glGenVertexArrays(1, &_vaoID);