CPunch/gopenfusion
1
0
Fork 0
mirror of https://github.com/CPunch/gopenfusion.git synced 2025-10-11 03:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor chunk refactoring

Browse Source 
- rename GetChunk -> GetChunkPos
- rename SetChunk -> SetChunkPos
This commit is contained in:
CPunch
2023-11-21 01:36:23 -06:00
parent 3e04103ae4
commit 06f4a4d33f
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
shard/entitymanager.go
View File

@@ -5,15 +5,15 @@ import (
)
func (server *ShardServer) addEntity(e entity.Entity) {
pos := e.GetChunk()
server.addEntityToChunks(server.getViewableChunks(pos), e)
pos := e.GetChunkPos()
server.addEntityToChunks(e, server.getViewableChunks(pos))
server.getChunk(pos).AddEntity(e)
}
func (server *ShardServer) removeEntity(e entity.Entity) {
// TODO: chunk cleanup
pos := e.GetChunk()
server.removeEntityFromChunks(server.getViewableChunks(pos), e)
pos := e.GetChunkPos()
server.removeEntityFromChunks(e, server.getViewableChunks(pos))
server.getChunk(pos).RemoveEntity(e)
}
@@ -56,7 +56,7 @@ func (server *ShardServer) sendAllPacket(plr *entity.Player, typeID uint32, pkt
return nil
}
func (server *ShardServer) removeEntityFromChunks(chunks []*entity.Chunk, this entity.Entity) {
func (server *ShardServer) removeEntityFromChunks(this entity.Entity, chunks []*entity.Chunk) {
for _, chunk := range chunks {
for e := range chunk.Entities {
if e == this {
@@ -78,7 +78,7 @@ func (server *ShardServer) removeEntityFromChunks(chunks []*entity.Chunk, this e
}
}
func (server *ShardServer) addEntityToChunks(chunks []*entity.Chunk, this entity.Entity) {
func (server *ShardServer) addEntityToChunks(this entity.Entity, chunks []*entity.Chunk) {
for _, chunk := range chunks {
for e := range chunk.Entities {
if e == this {
@@ -114,9 +114,9 @@ func (server *ShardServer) updateEntityChunk(e entity.Entity, from entity.ChunkP
toEnter := entity.ChunkSliceDifference(newViewables, oldViewables)
// update chunks
server.removeEntityFromChunks(toExit, e)
server.addEntityToChunks(toEnter, e)
server.removeEntityFromChunks(e, toExit)
server.addEntityToChunks(e, toEnter)
server.getChunk(from).RemoveEntity(e)
server.getChunk(to).AddEntity(e)
e.SetChunk(to)
e.SetChunkPos(to)
}

2
shard/movement.go
View File

@@ -10,7 +10,7 @@ func (server *ShardServer) updatePlayerPosition(plr *entity.Player, X, Y, Z, Ang
plr.Y = Y
plr.Z = Z
plr.Angle = Angle
server.updateEntityChunk(plr, plr.GetChunk(), entity.MakeChunkPosition(X, Y))
server.updateEntityChunk(plr, plr.GetChunkPos(), entity.MakeChunkPosition(X, Y))
}
func (server *ShardServer) playerMove(peer *protocol.CNPeer, pkt protocol.Packet) error {