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

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

Browse source
This commit is contained in:
Bradley Austin Davis 2015-07-24 17:33:24 -04:00
commit 0efa2c0eee
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -3541,6 +3541,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
sceneInterface->setEngineFeedOverlay3DItems(engineRC->_numFeedOverlay3DItems); sceneInterface->setEngineFeedOverlay3DItems(engineRC->_numFeedOverlay3DItems);
sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems); sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems);
} }
//Render the sixense lasers //Render the sixense lasers
if (Menu::getInstance()->isOptionChecked(MenuOption::HandLasers)) { if (Menu::getInstance()->isOptionChecked(MenuOption::HandLasers)) {
_myAvatar->renderLaserPointers(*renderArgs->_batch); _myAvatar->renderLaserPointers(*renderArgs->_batch);

6
interface/src/ui/ApplicationCompositor.cpp
View file

@ -11,6 +11,10 @@
#include "ApplicationCompositor.h" #include "ApplicationCompositor.h"
#include <memory>
#include <QPropertyAnimation>
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <avatar/AvatarManager.h> #include <avatar/AvatarManager.h>
@ -166,7 +170,7 @@ ApplicationCompositor::ApplicationCompositor() {
} }
}); });
_alphaPropertyAnimation = std::make_unique<QPropertyAnimation>(this, "alpha"); _alphaPropertyAnimation.reset(new QPropertyAnimation(this, "alpha"));
} }
ApplicationCompositor::~ApplicationCompositor() { ApplicationCompositor::~ApplicationCompositor() {

4
libraries/networking/src/PacketReceiver.cpp
View file

@ -280,7 +280,7 @@ void PacketReceiver::processDatagrams() {
auto it = _packetListenerMap.find(packet->getType()); auto it = _packetListenerMap.find(packet->getType());
if (it != _packetListenerMap.end()) { if (it != _packetListenerMap.end() && it->second.isValid()) {
auto listener = it.value(); auto listener = it.value();
@ -367,11 +367,13 @@ void PacketReceiver::processDatagrams() {
} }
} else { } else {
if (it == _packetListenerMap.end()) {
qWarning() << "No listener found for packet type " << nameForPacketType(packet->getType()); qWarning() << "No listener found for packet type " << nameForPacketType(packet->getType());
// insert a dummy listener so we don't print this again // insert a dummy listener so we don't print this again
_packetListenerMap.insert(packet->getType(), { nullptr, QMetaMethod() }); _packetListenerMap.insert(packet->getType(), { nullptr, QMetaMethod() });
} }
}
_packetListenerLock.unlock(); _packetListenerLock.unlock();
} }