Showing the changes to interface/src/Environment.cpp (1 of 23 files). Show all
Unified · Split
| @@ -38,13 +38,31 @@ static sockaddr getZeroAddress() { · 37 unmodified lines | |||
| 38 | return addr; | 38 | return addr; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | Environment::Environment() | ||
| 42 | : _initialized(false) { | ||
| 43 | } | ||
| 44 | |||
| 45 | Environment::~Environment() { | ||
| 46 | if (_initialized) { | ||
| 47 | delete _skyFromAtmosphereProgram; | ||
| 48 | delete _skyFromSpaceProgram; | ||
| 49 | } | ||
| 50 | } | ||
| 51 | |||
| 41 | void Environment::init() { | 52 | void Environment::init() { |
| 53 | if (_initialized) { | ||
| 54 | qDebug("[ERROR] Environment is already initialized.\n"); | ||
| 55 | return; | ||
| 56 | } | ||
| 57 | |||
| 42 | switchToResourcesParentIfRequired(); | 58 | switchToResourcesParentIfRequired(); |
| 43 | _skyFromAtmosphereProgram = createSkyProgram("Atmosphere", _skyFromAtmosphereUniformLocations); | 59 | _skyFromAtmosphereProgram = createSkyProgram("Atmosphere", _skyFromAtmosphereUniformLocations); |
| 44 | _skyFromSpaceProgram = createSkyProgram("Space", _skyFromSpaceUniformLocations); | 60 | _skyFromSpaceProgram = createSkyProgram("Space", _skyFromSpaceUniformLocations); |
| 45 | 61 | ||
| 46 | // start off with a default-constructed environment data | 62 | // start off with a default-constructed environment data |
| 47 | _data[getZeroAddress()][0]; | 63 | _data[getZeroAddress()][0]; |
| 64 | |||
| 65 | _initialized = true; | ||
| 48 | } | 66 | } |
| 49 | 67 | ||
| 50 | void Environment::resetToDefault() { | 68 | void Environment::resetToDefault() { |