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

tweaks

Browse source
This commit is contained in:
David Back 2018-05-15 17:36:39 -07:00
parent f8fc7bedd7
commit 1e2d2819d5
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/EntityItemProperties.cpp
View file

@ -2823,7 +2823,6 @@ bool EntityItemProperties::encodeEraseEntityMessage(const EntityItemID& entityIt
} }
bool EntityItemProperties::encodeCloneEntityMessage(const EntityItemID& entityIDToClone, const EntityItemID& newEntityID, QByteArray& buffer) { bool EntityItemProperties::encodeCloneEntityMessage(const EntityItemID& entityIDToClone, const EntityItemID& newEntityID, QByteArray& buffer) {
char* copyAt = buffer.data(); char* copyAt = buffer.data();
int outputLength = 0; int outputLength = 0;
@ -2846,7 +2845,6 @@ bool EntityItemProperties::encodeCloneEntityMessage(const EntityItemID& entityID
} }
bool EntityItemProperties::decodeCloneEntityMessage(const QByteArray& buffer, int& processedBytes, EntityItemID& entityIDToClone, EntityItemID& newEntityID) { bool EntityItemProperties::decodeCloneEntityMessage(const QByteArray& buffer, int& processedBytes, EntityItemID& entityIDToClone, EntityItemID& newEntityID) {
const unsigned char* packetData = (const unsigned char*)buffer.constData(); const unsigned char* packetData = (const unsigned char*)buffer.constData();
const unsigned char* dataAt = packetData; const unsigned char* dataAt = packetData;
size_t packetLength = buffer.size(); size_t packetLength = buffer.size();
@ -3489,7 +3487,6 @@ QList<QString> EntityItemProperties::listChangedProperties() {
out += "cloneOriginID"; out += "cloneOriginID";
} }
getAnimation().listChangedProperties(out); getAnimation().listChangedProperties(out);
getKeyLight().listChangedProperties(out); getKeyLight().listChangedProperties(out);
getAmbientLight().listChangedProperties(out); getAmbientLight().listChangedProperties(out);

2
libraries/entities/src/EntityTree.cpp
View file

@ -1429,7 +1429,7 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
case PacketType::EntityClone: case PacketType::EntityClone:
isClone = true; // fall through to next case isClone = true; // fall through to next case
case PacketType::EntityAdd: case PacketType::EntityAdd:
isAdd = true; // fall through to next case isAdd = true; // fall through to next case
// FALLTHRU // FALLTHRU
case PacketType::EntityPhysics: case PacketType::EntityPhysics:
case PacketType::EntityEdit: { case PacketType::EntityEdit: {

4
scripts/system/html/js/entityProperties.js
View file

@ -1042,7 +1042,7 @@ function loaded() {
elCloneable.checked = properties.cloneable; elCloneable.checked = properties.cloneable;
elCloneableDynamic.checked = properties.cloneDynamic; elCloneableDynamic.checked = properties.cloneDynamic;
elCloneableAvatarEntity.checked = properties.cloneAvatarEntity; elCloneableAvatarEntity.checked = properties.cloneAvatarEntity;
elCloneableGroup.style.display = elCloneable.checked ? "block": "none"; elCloneableGroup.style.display = elCloneable.checked ? "block": "none";
elCloneableLimit.value = properties.cloneLimit; elCloneableLimit.value = properties.cloneLimit;
elCloneableLifetime.value = properties.cloneLifetime; elCloneableLifetime.value = properties.cloneLifetime;
@ -1443,7 +1443,7 @@ function loaded() {
elCloneable.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneable')); elCloneable.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneable'));
elCloneableDynamic.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneDynamic')); elCloneableDynamic.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneDynamic'));
elCloneableAvatarEntity.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneAvatarEntity')); elCloneableAvatarEntity.addEventListener('change', createEmitCheckedPropertyUpdateFunction('cloneAvatarEntity'));
elCloneableLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('cloneLifetime')); elCloneableLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('cloneLifetime'));
elCloneableLimit.addEventListener('change', createEmitNumberPropertyUpdateFunction('cloneLimit')); elCloneableLimit.addEventListener('change', createEmitNumberPropertyUpdateFunction('cloneLimit'));