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

Merge pull request #390 from ey6es/master

Browse source 
Fix for OS X structure initialization.
This commit is contained in:
Andrzej Kapolka 2013-05-22 16:13:55 -07:00
commit e48aebdd9e
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/Environment.cpp
View file

@ -30,14 +30,20 @@ bool operator== (const sockaddr& addr1, const sockaddr& addr2) {
return socketMatch(&addr1, &addr2); return socketMatch(&addr1, &addr2);
} }
static sockaddr getZeroAddress() {
sockaddr addr;
memset(&addr, 0, sizeof(sockaddr));
addr.sa_family = AF_INET;
return addr;
}
void Environment::init() { void Environment::init() {
switchToResourcesParentIfRequired(); switchToResourcesParentIfRequired();
_skyFromAtmosphereProgram = createSkyProgram("Atmosphere", _skyFromAtmosphereUniformLocations); _skyFromAtmosphereProgram = createSkyProgram("Atmosphere", _skyFromAtmosphereUniformLocations);
_skyFromSpaceProgram = createSkyProgram("Space", _skyFromSpaceUniformLocations); _skyFromSpaceProgram = createSkyProgram("Space", _skyFromSpaceUniformLocations);
// start off with a default-constructed environment data // start off with a default-constructed environment data
sockaddr addr = { AF_INET }; _data[getZeroAddress()][0];
_data[addr][0];
} }
void Environment::renderAtmospheres(Camera& camera) { void Environment::renderAtmospheres(Camera& camera) {
@ -118,8 +124,7 @@ int Environment::parseData(sockaddr *senderAddress, unsigned char* sourceBuffer,
_data[*senderAddress][newData.getID()] = newData; _data[*senderAddress][newData.getID()] = newData;
// remove the default mapping, if any // remove the default mapping, if any
sockaddr addr = { AF_INET }; _data.remove(getZeroAddress());
_data.remove(addr);
return bytesRead; return bytesRead;
} }