Merge remote-tracking branch 'upstream/master' into scriptEngine

HifiExperiments committed 6 years ago

Commit b3e9c1e2 parents 2e4a6ee 66ccfab505 files · +332422 −13060Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 505 files). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+12−7

@@ -83,13 +83,18 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig · 82 unmodified lines
83		83
84	auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();	84	auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
85	packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },	85	packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
86	this, "handleOctreePacket");	86	PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleOctreePacket));
87	packetReceiver.registerListener(PacketType::SelectedAudioFormat, this, "handleSelectedAudioFormat");	87	packetReceiver.registerListener(PacketType::SelectedAudioFormat,
88		88	PacketReceiver::makeUnsourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleSelectedAudioFormat));
89	packetReceiver.registerListener(PacketType::ReloadEntityServerScript, this, "handleReloadEntityServerScriptPacket");	89
90	packetReceiver.registerListener(PacketType::EntityScriptGetStatus, this, "handleEntityScriptGetStatusPacket");	90	packetReceiver.registerListener(PacketType::ReloadEntityServerScript,
91	packetReceiver.registerListener(PacketType::EntityServerScriptLog, this, "handleEntityServerScriptLogPacket");	91	PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleReloadEntityServerScriptPacket));
92	packetReceiver.registerListener(PacketType::EntityScriptCallMethod, this, "handleEntityScriptCallMethodPacket");	92	packetReceiver.registerListener(PacketType::EntityScriptGetStatus,
		93	PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleEntityScriptGetStatusPacket));
		94	packetReceiver.registerListener(PacketType::EntityServerScriptLog,
		95	PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleEntityServerScriptLogPacket));
		96	packetReceiver.registerListener(PacketType::EntityScriptCallMethod,
		97	PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleEntityScriptCallMethodPacket));
93		98
94	static const int LOG_INTERVAL = MSECS_PER_SECOND / 10;	99	static const int LOG_INTERVAL = MSECS_PER_SECOND / 10;
95	auto timer = new QTimer(this);	100	auto timer = new QTimer(this);