From 16aa368ca1f62be7080bc07c83d4446bf58ee2c1 Mon Sep 17 00:00:00 2001 From: Jordan Orelli Date: Tue, 20 Sep 2016 12:30:15 -0400 Subject: [PATCH] god where was i --- ent/decoders.go | 6 ------ ent/primitive.go | 14 ++++++++++++++ ent/vector.go | 7 +++++++ 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 ent/vector.go diff --git a/ent/decoders.go b/ent/decoders.go index 216df0a..c47c503 100644 --- a/ent/decoders.go +++ b/ent/decoders.go @@ -113,12 +113,6 @@ func vectorDecoder(f *Field) decoder { } } -type vector struct { - x float32 - y float32 - z float32 -} - func decodeNormalVector(br bit.Reader) interface{} { var v vector x, y := bit.ReadBool(br), bit.ReadBool(br) diff --git a/ent/primitive.go b/ent/primitive.go index b6298f7..ac87d02 100644 --- a/ent/primitive.go +++ b/ent/primitive.go @@ -38,6 +38,7 @@ func init() { {name: "int32", read: readInt32}, {name: "int64", read: readInt64}, {name: "Color", read: readColor}, + {name: "HSequence", read: readIntMinusOne}, } primitives = make(map[string]Primitive, len(types)) for _, t := range types { @@ -49,6 +50,10 @@ func readBool(br bit.Reader, d *Dict) (interface{}, error) { return bit.ReadBool(br), br.Err() } +// ------------------------------------------------------------------------------ +// uints +// ------------------------------------------------------------------------------ + func readUint8(br bit.Reader, d *Dict) (interface{}, error) { return uint8(br.ReadBits(8)), br.Err() } @@ -65,6 +70,10 @@ func readUint64(br bit.Reader, d *Dict) (interface{}, error) { return bit.ReadVarInt(br), br.Err() } +// ------------------------------------------------------------------------------ +// ints +// ------------------------------------------------------------------------------ + func readInt8(br bit.Reader, d *Dict) (interface{}, error) { return int8(bit.ReadZigZag(br)), br.Err() } @@ -90,3 +99,8 @@ func readColor(br bit.Reader, d *Dict) (interface{}, error) { a: uint8(u & 0x000000ff), }, br.Err() } + +// what in the good fuck is this +func readIntMinusOne(br bit.Reader, d *Dict) (interface{}, error) { + return bit.ReadVarInt(br) - 1, br.Err() +} diff --git a/ent/vector.go b/ent/vector.go new file mode 100644 index 0000000..1f11c96 --- /dev/null +++ b/ent/vector.go @@ -0,0 +1,7 @@ +package ent + +type vector struct { + x float32 + y float32 + z float32 +}