Merge branch 'master' of https://github.com/highfidelity/hifi

Stephen Birarda committed 12 years ago

Commit 6038c332 parents f1e2ba1 973444612 files · +832 −38Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 12 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+4−1

@@ -471,7 +471,10 @@ void ScriptEngine::run() { · 470 unmodified lines
471		471
472	// pack a placeholder value for sequence number for now, will be packed when destination node is known	472	// pack a placeholder value for sequence number for now, will be packed when destination node is known
473	int numPreSequenceNumberBytes = audioPacket.size();	473	int numPreSequenceNumberBytes = audioPacket.size();
474	packetStream << (quint16)0;	474	packetStream << (quint16) 0;
		475
		476	// assume scripted avatar audio is mono and set channel flag to zero
		477	packetStream << (quint8) 0;
475		478
476	// use the orientation and position of this avatar for the source of this audio	479	// use the orientation and position of this avatar for the source of this audio
477	packetStream.writeRawData(reinterpret_cast<const char*>(&_avatarData->getPosition()), sizeof(glm::vec3));	480	packetStream.writeRawData(reinterpret_cast<const char*>(&_avatarData->getPosition()), sizeof(glm::vec3));