History

have scripted avatars send billboard, if they have one

Stephen Birarda committed 12 years ago

Commit ee70c931 parent f2a70bf3 files · +22 −7Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+12−2
@@ -45,6 +45,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, co · 44 unmodified lines
4545 AbstractControllerScriptingInterface* controllerScriptingInterface) :
4646 _isAvatar(false),
4747 _avatarIdentityTimer(NULL),
48+ _avatarBillboardTimer(NULL),
4849 _avatarData(NULL)
4950 {
5051 _scriptContents = scriptContents;
@@ -79,14 +80,17 @@ void ScriptEngine::setIsAvatar(bool isAvatar) { · 28 unmodified lines
7980 _isAvatar = isAvatar;
8081
8182 if (_isAvatar && !_avatarIdentityTimer) {
82− // set up the avatar identity timer
83+ // set up the avatar timers
8384 _avatarIdentityTimer = new QTimer(this);
85+ _avatarBillboardTimer = new QTimer(this);
8486
8587 // connect our slot
8688 connect(_avatarIdentityTimer, &QTimer::timeout, this, &ScriptEngine::sendAvatarIdentityPacket);
89+ connect(_avatarBillboardTimer, &QTimer::timeout, this, &ScriptEngine::sendAvatarBillboardPacket);
8790
88− // start the timer
91+ // start the timers
8992 _avatarIdentityTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS);
93+ _avatarBillboardTimer->start(AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS);
9094 }
9195 }
9296
@@ -196,6 +200,12 @@ void ScriptEngine::sendAvatarIdentityPacket() { · 103 unmodified lines
196200 }
197201 }
198202
203+void ScriptEngine::sendAvatarBillboardPacket() {
204+ if (_isAvatar && _avatarData) {
205+ _avatarData->sendBillboardPacket();
206+ }
207+}
208+
199209 void ScriptEngine::run() {
200210 if (!_isInitialized) {
201211 init();