History

Some more memory leaks and codes formatting

atlante45 committed 13 years ago

Commit b03482e1 parent 061199923 files · +145 −91Browse files

Showing the changes to interface/src/Environment.cpp (1 of 23 files). Show all

Unified · Split

interface/src/Environment.cpp+18−0
@@ -38,13 +38,31 @@ static sockaddr getZeroAddress() { · 37 unmodified lines
3838 return addr;
3939 }
4040
41+Environment::Environment()
42+ : _initialized(false) {
43+}
44+
45+Environment::~Environment() {
46+ if (_initialized) {
47+ delete _skyFromAtmosphereProgram;
48+ delete _skyFromSpaceProgram;
49+ }
50+}
51+
4152 void Environment::init() {
53+ if (_initialized) {
54+ qDebug("[ERROR] Environment is already initialized.\n");
55+ return;
56+ }
57+
4258 switchToResourcesParentIfRequired();
4359 _skyFromAtmosphereProgram = createSkyProgram("Atmosphere", _skyFromAtmosphereUniformLocations);
4460 _skyFromSpaceProgram = createSkyProgram("Space", _skyFromSpaceUniformLocations);
4561
4662 // start off with a default-constructed environment data
4763 _data[getZeroAddress()][0];
64+
65+ _initialized = true;
4866 }
4967
5068 void Environment::resetToDefault() {