Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 06:29:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a couple of compile errors for avatar changes

Browse source
This commit is contained in:
Stephen Birarda 2015-07-13 13:34:36 -07:00
parent 859122db5d
commit ca1ff9b0f5
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/AvatarManager.cpp
View file

@ -56,10 +56,6 @@ static void localLightFromScriptValue(const QScriptValue& value, AvatarManager::
vec3FromScriptValue(value.property("color"), light.color); vec3FromScriptValue(value.property("color"), light.color);
} }
AvatarManager::AvatarManager() {
}
void AvatarManager::registerMetaTypes(QScriptEngine* engine) { void AvatarManager::registerMetaTypes(QScriptEngine* engine) {
qScriptRegisterMetaType(engine, localLightToScriptValue, localLightFromScriptValue); qScriptRegisterMetaType(engine, localLightToScriptValue, localLightFromScriptValue);
qScriptRegisterSequenceMetaType<QVector<AvatarManager::LocalLight> >(engine); qScriptRegisterSequenceMetaType<QVector<AvatarManager::LocalLight> >(engine);

2
interface/src/avatar/AvatarManager.h
View file

@ -29,8 +29,6 @@ class AvatarManager : public AvatarHashMap {
SINGLETON_DEPENDENCY SINGLETON_DEPENDENCY
public: public:
AvatarManager();
/// Registers the script types associated with the avatar manager. /// Registers the script types associated with the avatar manager.
static void registerMetaTypes(QScriptEngine* engine); static void registerMetaTypes(QScriptEngine* engine);

2
interface/src/avatar/MyAvatar.cpp
View file

@ -872,7 +872,7 @@ AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString&
int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) { int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) {
qCDebug(interfaceapp) << "Error: ignoring update packet for MyAvatar" qCDebug(interfaceapp) << "Error: ignoring update packet for MyAvatar"
<< " packetLength = " << buffer.size() << " packetLength = " << buffer.size();
// this packet is just bad, so we pretend that we unpacked it ALL // this packet is just bad, so we pretend that we unpacked it ALL
return buffer.size(); return buffer.size();
} }