Fix light color / serialization

This commit is contained in:
Brad Davis 2018-10-19 13:38:58 -07:00
parent 388b31acf7
commit 2687c024eb
3 changed files with 4 additions and 3 deletions

View file

@ -2387,8 +2387,8 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
}
if (properties.getType() == EntityTypes::Light) {
APPEND_ENTITY_PROPERTY(PROP_COLOR, properties.getColor());
APPEND_ENTITY_PROPERTY(PROP_IS_SPOTLIGHT, properties.getIsSpotlight());
APPEND_ENTITY_PROPERTY(PROP_COLOR, properties.getColor());
APPEND_ENTITY_PROPERTY(PROP_INTENSITY, properties.getIntensity());
APPEND_ENTITY_PROPERTY(PROP_FALLOFF_RADIUS, properties.getFalloffRadius());
APPEND_ENTITY_PROPERTY(PROP_EXPONENT, properties.getExponent());

View file

@ -33,7 +33,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
case PacketType::EntityEdit:
case PacketType::EntityData:
case PacketType::EntityPhysics:
return static_cast<PacketVersion>(EntityVersion::ScriptGlmVectors);
return static_cast<PacketVersion>(EntityVersion::FixedLightSerialization);
case PacketType::EntityQuery:
return static_cast<PacketVersion>(EntityQueryPacketVersion::ConicalFrustums);
case PacketType::AvatarIdentity:

View file

@ -244,7 +244,8 @@ enum class EntityVersion : PacketVersion {
ParticleSpin,
BloomEffect,
GrabProperties,
ScriptGlmVectors
ScriptGlmVectors,
FixedLightSerialization
};
enum class EntityScriptCallMethodVersion : PacketVersion {