Skip to content

Support PVS visibility changes for entities #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+80 −50
Draft

Support PVS visibility changes for entities #507

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c68b7a
Name entity cmd magic numbers
makindotcc Feb 10, 2024
cba32f0
flatten entity update handlers
makindotcc Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions pkg/demoinfocs/sendtables2/entity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,17 @@ func (e *Entity) readFields(r *reader, paths *[]*fieldPath) {
}
}

// updateFlag is a bitmask representing the type of operation performed on an Entity
type updateFlag = uint32

const (
updateFlagCreate updateFlag = 0b10
updateFlagLeave updateFlag = 0b01
updateFlagDelete updateFlag = 0b10
updateFlagPreserveEnt updateFlag = 0b01000
updateFlagVisibleInPVS updateFlag = 0b10000
)

// Internal Callback for OnCSVCMsg_PacketEntities.
func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
r := newReader(m.GetEntityData())
Expand Down Expand Up @@ -467,6 +478,7 @@ func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
paths = make([]*fieldPath, 0)
)

isPvsPacket := m.GetHasPvsVisBits() != 0
for ; updates > 0; updates-- {
var (
e *Entity
Expand All @@ -477,14 +489,12 @@ func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
index = next

cmd = r.readBits(2)
if cmd == 0 && m.GetHasPvsVisBits() > 0 {
if cmd == 0 && isPvsPacket {
cmd = r.readBits(2) << 3
if cmd&0x08 == 8 {
continue
}
}
if cmd&0x01 == 0 {
if cmd&0x02 != 0 {

if cmd&updateFlagLeave == 0 {
Copy link
Contributor Author

@makindotcc makindotcc Feb 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to reviewdog: it was already "complex" 😭

I can "flatten" it or extract handlers to other functions, that was on my mind first, but I thought people in go don't like too many functions.

Copy link
Owner

@markus-wa markus-wa Feb 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will take a look when I'm on my PC 🙂

Personally I like having lots of functions in Go (I know this project doesn't look like it as a lot of it is REd and kinda done 1:1) but let's leave it for now until I had a chance to take a proper look 😄

Copy link
Owner

@markus-wa markus-wa Feb 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PS: reviewdog is more of a guideline than hard rules, so we don't always have to listen to it 😄

Copy link
Contributor Author

@makindotcc makindotcc Feb 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I already made this way - inspired by game code.
ezgif com-video-to-gif_2

if cmd&updateFlagCreate != 0 {
classId = int32(r.readBits(p.classIdSize))
serial = int32(r.readBits(17))
r.readVarUint32()
Expand Down Expand Up @@ -519,7 +529,11 @@ func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
}

op = st.EntityOpCreated | st.EntityOpEntered
} else {
} else if cmd&updateFlagPreserveEnt != 0 {
// todo: handle visibility
// visibleInPvs := !isPvsPacket || cmd&updateFlagVisibleInPVS != 0
// fmt.Println("preserve visible in pvs", visibleInPvs)
} else { // delta update
if e = p.entities[index]; e == nil {
_panicf("unable to find existing entity %d", index)
}
Expand All @@ -532,6 +546,8 @@ func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {

e.readFields(r, &paths)
paths = paths[:0]
// todo: handle visibility
// visibleInPVS := !isPvsPacket || cmd&updateFlagVisibleInPVS != 0
}
} else {
e = p.entities[index]
Expand All @@ -545,7 +561,7 @@ func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
}

op = st.EntityOpLeft
if cmd&0x02 != 0 {
if cmd&updateFlagDelete != 0 {
op |= st.EntityOpDeleted

e.Destroy()
Expand Down