Utilize BitReader.Skip()

Author: markus-wa

demopacket.go

@@ -5,9 +5,7 @@ import (
 	"sync"
 
 	proto "github.com/gogo/protobuf/proto"
-	r3 "github.com/golang/geo/r3"
 
-	bit "github.com/markus-wa/demoinfocs-golang/bitread"
 	msg "github.com/markus-wa/demoinfocs-golang/msg"
 )
 
@@ -20,9 +18,9 @@ var byteSlicePool sync.Pool = sync.Pool{
 
 func (p *Parser) parsePacket() {
 	// Booooring
-	parseCommandInfo(p.bitReader)
-	p.bitReader.ReadInt(32) // SeqNrIn
-	p.bitReader.ReadInt(32) // SeqNrOut
+	// 152 bytes CommandInfo, 4 bytes SeqNrIn, 4 bytes SeqNrOut
+	// See at the bottom what the CommandInfo would contain if you are interested.
+	p.bitReader.Skip((152 + 4 + 4) << 3)
 
 	// Here we go
 	p.bitReader.BeginChunk(p.bitReader.ReadSignedInt(32) << 3)
@@ -92,69 +90,50 @@ func (p *Parser) parsePacket() {
 	p.bitReader.EndChunk()
 }
 
-// TODO: Find out what all this is good for and why we didn't use the removed functions on seVector, split & commandInfo
-type commandInfo struct {
-	splits [2]split
-}
-
-type split struct {
-	flags int
-
-	viewOrigin      seVector
-	viewAngles      r3.Vector
-	localViewAngles r3.Vector
-
-	viewOrigin2      seVector
-	viewAngles2      r3.Vector
-	localViewAngles2 r3.Vector
-}
-type seVector struct {
-	r3.Vector
-}
-
-type boundingBoxInformation struct {
-	index int
-	min   r3.Vector
-	max   r3.Vector
-}
-
-func (bbi boundingBoxInformation) contains(point r3.Vector) bool {
-	return point.X >= bbi.min.X && point.X <= bbi.max.X &&
-		point.Y >= bbi.min.Y && point.Y <= bbi.max.Y &&
-		point.Z >= bbi.min.Z && point.Z <= bbi.max.Z
-}
-
-type bombsiteInfo struct {
-	index  int
-	center r3.Vector
-}
-
-func parseCommandInfo(r *bit.BitReader) commandInfo {
-	return commandInfo{splits: [2]split{parseSplit(r), parseSplit(r)}}
-}
-
-func parseSplit(r *bit.BitReader) split {
-	return split{
-		flags: r.ReadSignedInt(32),
-
-		viewOrigin:      parseSEVector(r),
-		viewAngles:      parseVector(r),
-		localViewAngles: parseVector(r),
-
-		viewOrigin2:      parseSEVector(r),
-		viewAngles2:      parseVector(r),
-		localViewAngles2: parseVector(r),
-	}
-}
-
-func parseSEVector(r *bit.BitReader) seVector {
-	return seVector{parseVector(r)}
-}
-
-func parseVector(r *bit.BitReader) r3.Vector {
-	return r3.Vector{
-		X: float64(r.ReadFloat()),
-		Y: float64(r.ReadFloat()),
-		Z: float64(r.ReadFloat()),
-	}
-}
+/*
+Format of 'CommandInfos' - I honestly have no clue what they are good for.
+If you find a use for this please let me know!
+
+Here is all i know:
+
+CommandInfo [152 bytes]
+- [2]Split
+
+Split [76 bytes]
+- flags [4 bytes]
+- viewOrigin [12 bytes]
+- viewAngles [12 bytes]
+- localViewAngles [12 bytes]
+- viewOrigin2 [12 bytes]
+- viewAngles2 [12 bytes]
+- localViewAngles2 [12 bytes]
+
+Origin [12 bytes]
+- X [4 bytes]
+- Y [4 bytes]
+- Z [4 bytes]
+
+Angle [12 bytes]
+- X [4 bytes]
+- Y [4 bytes]
+- Z [4 bytes]
+
+They are parsed in the following order:
+split1.flags
+split1.viewOrigin.x
+split1.viewOrigin.y
+split1.viewOrigin.z
+split1.viewAngles.x
+split1.viewAngles.y
+split1.viewAngles.z
+split1.localViewAngles.x
+split1.localViewAngles.y
+split1.localViewAngles.z
+split1.viewOrigin2...
+split1.viewAngles2...
+split1.localViewAngles2...
+split2.flags
+...
+
+Or just check this file's history for an example on how to parse them
+*/

packet_handlers.go

@@ -58,7 +58,7 @@ func (p *Parser) handlePacketEntities(pe *msg.CSVCMsg_PacketEntities) {
 
 func (p *Parser) readEnterPVS(reader *bit.BitReader, entityID int) *st.Entity {
 	scID := int(reader.ReadInt(p.stParser.ClassBits()))
-	reader.ReadInt(10) // Serial Number
+	reader.Skip(10) // Serial Number
 
 	newEntity := st.NewEntity(entityID, p.stParser.ServerClasses()[scID])
 	newEntity.ServerClass.FireEntityCreatedEvent(newEntity)

parser.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"sync"
 
+	r3 "github.com/golang/geo/r3"
 	dp "github.com/markus-wa/godispatch"
 
 	bit "github.com/markus-wa/demoinfocs-golang/bitread"
@@ -53,6 +54,23 @@ type Parser struct {
 	errLock               sync.Mutex
 }
 
+type bombsiteInfo struct {
+	index  int
+	center r3.Vector
+}
+
+type boundingBoxInformation struct {
+	index int
+	min   r3.Vector
+	max   r3.Vector
+}
+
+func (bbi boundingBoxInformation) contains(point r3.Vector) bool {
+	return point.X >= bbi.min.X && point.X <= bbi.max.X &&
+		point.Y >= bbi.min.Y && point.Y <= bbi.max.Y &&
+		point.Z >= bbi.min.Z && point.Z <= bbi.max.Z
+}
+
 // Map returns the map name. E.g. de_dust2 or de_inferno.
 // Deprecated, use Header().MapName instead.
 func (p *Parser) Map() string {

parsing.go

@@ -152,7 +152,7 @@ func (p *Parser) parseFrame() bool {
 	p.msgQueue <- ingameTickNumber(p.bitReader.ReadSignedInt(32))
 
 	// Skip 'player slot'
-	p.bitReader.ReadSingleByte()
+	p.bitReader.Skip(8)
 
 	switch cmd {
 	case dcSynctick:
@@ -163,8 +163,7 @@ func (p *Parser) parseFrame() bool {
 
 	case dcConsoleCommand:
 		// Skip
-		p.bitReader.BeginChunk(p.bitReader.ReadSignedInt(32) << 3)
-		p.bitReader.EndChunk()
+		p.bitReader.Skip(p.bitReader.ReadSignedInt(32) << 3)
 
 	case dcDataTables:
 		p.msgDispatcher.SyncQueues(p.msgQueue)
@@ -183,9 +182,8 @@ func (p *Parser) parseFrame() bool {
 
 	case dcUserCommand:
 		// Skip
-		p.bitReader.ReadInt(32)
-		p.bitReader.BeginChunk(p.bitReader.ReadSignedInt(32) << 3)
-		p.bitReader.EndChunk()
+		p.bitReader.Skip(32)
+		p.bitReader.Skip(p.bitReader.ReadSignedInt(32) << 3)
 
 	case dcSignon:
 		fallthrough

stringtables.go

@@ -51,13 +51,14 @@ func (p *Parser) parseSingleStringTable(name string) {
 			}
 		}
 	}
+
 	// Client side stuff, dgaf
 	if p.bitReader.ReadBit() {
 		strings2 := p.bitReader.ReadSignedInt(16)
 		for i := 0; i < strings2; i++ {
 			p.bitReader.ReadString()
 			if p.bitReader.ReadBit() {
-				p.bitReader.ReadBytes(p.bitReader.ReadSignedInt(16))
+				p.bitReader.Skip(p.bitReader.ReadSignedInt(16))
 			}
 		}
 	}