Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 16:50:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization

Browse source
This commit is contained in:
ZappoMan 2013-05-08 15:35:09 -07:00
commit 9bde92fe78
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Environment.cpp
View file

@ -7,6 +7,8 @@
#include <QByteArray> #include <QByteArray>
#include <SharedUtil.h>
#include "Camera.h" #include "Camera.h"
#include "Environment.h" #include "Environment.h"
#include "renderer/ProgramObject.h" #include "renderer/ProgramObject.h"
@ -14,6 +16,7 @@
#include "world.h" #include "world.h"
void Environment::init() { void Environment::init() {
switchToResourcesParentIfRequired();
_skyFromAtmosphereProgram = createSkyProgram("Atmosphere", _skyFromAtmosphereUniformLocations); _skyFromAtmosphereProgram = createSkyProgram("Atmosphere", _skyFromAtmosphereUniformLocations);
_skyFromSpaceProgram = createSkyProgram("Space", _skyFromSpaceUniformLocations); _skyFromSpaceProgram = createSkyProgram("Space", _skyFromSpaceUniformLocations);
} }