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

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/planetradius

Browse Source 
Conflicts:
	modules/space/rendering/simplespheregeometry.h
This commit is contained in:
Emil Axelsson
2017-04-13 21:31:40 +02:00
parent a614f1ffda 76aed0578c
commit a71f4974fe
17 changed files with 499 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/space/rendering/renderableplanet.cpp
+5 -12
View File
@@ -308,16 +308,7 @@ bool RenderablePlanet::initialize() {
LERROR(ss.str());
}
loadTexture();
while ((err = glGetError()) != GL_NO_ERROR) {
const GLubyte * errString = gluErrorString(err);
std::stringstream ss;
ss << "Error loading textures. OpenGL error: " << errString << std::endl;
LERROR(ss.str());
}
_geometry->initialize(this);
_geometry->initialize(this);
_programObject->deactivate();
@@ -325,6 +316,8 @@ bool RenderablePlanet::initialize() {
const GLubyte * errString = gluErrorString(err);
LERROR("Shader Programs Creation. OpenGL error: " << errString);
}
loadTexture();
return isReady();
}
@@ -410,13 +403,13 @@ void RenderablePlanet::render(const RenderData& data) {
_programObject->setUniform("texture1", dayUnit);
// Bind possible night texture
if (_hasNightTexture) {
if (_hasNightTexture && _nightTexture) {
nightUnit.activate();
_nightTexture->bind();
_programObject->setUniform("nightTex", nightUnit);
}
if (_hasHeightTexture) {
if (_hasHeightTexture && _heightMapTexture) {
heightUnit.activate();
_heightMapTexture->bind();
_programObject->setUniform("heightTex", heightUnit);