Performance improvements for property-decoding

Author: markus-wa

entities.go

@@ -54,9 +54,7 @@ func (p *Parser) readEnterPVS(reader *bit.BitReader, entityID int) *st.Entity {
 	newEntity := st.NewEntity(entityID, p.stParser.ServerClasses()[scID])
 
 	if p.preprocessedBaselines[scID] != nil {
-		for idx, val := range p.preprocessedBaselines[scID] {
-			newEntity.Props()[idx].FirePropertyUpdate(val)
-		}
+		newEntity.ApplyBaseline(p.preprocessedBaselines[scID])
 	} else {
 		if p.instanceBaselines[scID] != nil {
 			r := bit.NewSmallBitReader(bytes.NewReader(p.instanceBaselines[scID]))

sendtables/entity.go

@@ -56,7 +56,8 @@ func (e *Entity) ApplyUpdate(reader *bit.BitReader) {
 	}
 
 	for _, idx := range *updatedPropIndices {
-		e.props[idx].FirePropertyUpdate(propDecoder.decodeProp(e.props[idx].entry, reader))
+		propDecoder.decodeProp(&e.props[idx], reader)
+		e.props[idx].firePropertyUpdate()
 	}
 
 	// Reset length to 0 before pooling
@@ -115,6 +116,13 @@ func (e *Entity) InitializeBaseline(r *bit.BitReader) map[int]PropValue {
 	return baseline
 }
 
+// ApplyBaseline baseline applies a previously collected baseline
+func (e *Entity) ApplyBaseline(baseline map[int]PropValue) {
+	for idx := range baseline {
+		e.props[idx].value = baseline[idx]
+	}
+}
+
 const maxCoordInt = 16384
 
 // Position returns the entity's position in world coordinates.
@@ -164,13 +172,11 @@ func (pe *PropertyEntry) Value() PropValue {
 	return pe.value
 }
 
-// FirePropertyUpdate triggers all registered PropertyUpdateHandler
-// on the PropertyEntry with the given PropValue.
-func (pe *PropertyEntry) FirePropertyUpdate(value PropValue) {
-	pe.value = value
+// Trigger all the registered PropertyUpdateHandlers on this entry.
+func (pe *PropertyEntry) firePropertyUpdate() {
 	for _, h := range pe.updateHandlers {
 		if h != nil {
-			h(value)
+			h(pe.value)
 		}
 	}
 }

sendtables/propdecoder.go

@@ -82,28 +82,28 @@ type PropValue struct {
 
 type propertyDecoder struct{}
 
-func (propertyDecoder) decodeProp(fProp *FlattenedPropEntry, reader *bit.BitReader) PropValue {
-	switch fProp.prop.rawType {
+func (propertyDecoder) decodeProp(prop *PropertyEntry, reader *bit.BitReader) {
+	switch prop.entry.prop.rawType {
 	case propTypeFloat:
-		return PropValue{FloatVal: propDecoder.decodeFloat(fProp.prop, reader)}
+		prop.value.FloatVal = propDecoder.decodeFloat(prop.entry.prop, reader)
 
 	case propTypeInt:
-		return PropValue{IntVal: propDecoder.decodeInt(fProp.prop, reader)}
+		prop.value.IntVal = propDecoder.decodeInt(prop.entry.prop, reader)
 
 	case propTypeVectorXY:
-		return PropValue{VectorVal: propDecoder.decodeVectorXY(fProp.prop, reader)}
+		prop.value.VectorVal = propDecoder.decodeVectorXY(prop.entry.prop, reader)
 
 	case propTypeVector:
-		return PropValue{VectorVal: propDecoder.decodeVector(fProp.prop, reader)}
+		prop.value.VectorVal = propDecoder.decodeVector(prop.entry.prop, reader)
 
 	case propTypeArray:
-		return PropValue{ArrayVal: propDecoder.decodeArray(fProp, reader)}
+		prop.value.ArrayVal = propDecoder.decodeArray(prop.entry, reader)
 
 	case propTypeString:
-		return PropValue{StringVal: propDecoder.decodeString(fProp.prop, reader)}
+		prop.value.StringVal = propDecoder.decodeString(prop.entry.prop, reader)
 
 	default:
-		panic(fmt.Sprintf("Unknown prop type %d", fProp.prop.rawType))
+		panic(fmt.Sprintf("Unknown prop type %d", prop.entry.prop.rawType))
 	}
 }
 
@@ -295,10 +295,13 @@ func (propertyDecoder) decodeArray(fProp *FlattenedPropEntry, reader *bit.BitRea
 
 	res := make([]PropValue, 0, nElements)
 
-	tmp := &FlattenedPropEntry{prop: fProp.arrayElementProp}
+	tmp := &PropertyEntry{
+		entry: &FlattenedPropEntry{prop: fProp.arrayElementProp},
+	}
 
 	for i := 0; i < nElements; i++ {
-		res = append(res, propDecoder.decodeProp(tmp, reader))
+		propDecoder.decodeProp(tmp, reader)
+		res = append(res, tmp.value)
 	}
 
 	return res

sendtables/sendtables.go

@@ -59,7 +59,7 @@ func (sc *ServerClass) FireEntityCreatedEvent(entity *Entity) {
 	}
 
 	for _, v := range entity.props {
-		v.FirePropertyUpdate(v.value)
+		v.firePropertyUpdate()
 	}
 }