Merged master into NewAtmosphere.

This commit is contained in:
Jonathas Costa
2017-12-14 15:55:27 -05:00
110 changed files with 4277 additions and 383 deletions

View File

@@ -289,9 +289,10 @@ bool RenderableStars::isReady() const {
void RenderableStars::initializeGL() {
RenderEngine& renderEngine = OsEng.renderEngine();
_program = renderEngine.buildRenderProgram("Star",
"${MODULE_SPACE}/shaders/star_vs.glsl",
"${MODULE_SPACE}/shaders/star_fs.glsl",
"${MODULE_SPACE}/shaders/star_ge.glsl");
absPath("${MODULE_SPACE}/shaders/star_vs.glsl"),
absPath("${MODULE_SPACE}/shaders/star_fs.glsl"),
absPath("${MODULE_SPACE}/shaders/star_ge.glsl")
);
bool success = loadData();
if (!success) {