started chunking

shard/chunks.go

@@ -1,6 +1,8 @@
 package shard
 
-import "github.com/CPunch/gopenfusion/core/entity"
+import (
+	"github.com/CPunch/gopenfusion/core/entity"
+)
 
 func (server *ShardServer) getChunk(pos entity.ChunkPosition) *entity.Chunk {
 	chunk, ok := server.chunks[pos]
@@ -12,12 +14,67 @@ func (server *ShardServer) getChunk(pos entity.ChunkPosition) *entity.Chunk {
 	return chunk
 }
 
-func (server *ShardServer) getViewableChunks(plr *entity.Player) []*entity.Chunk {
+func (server *ShardServer) getViewableChunks(pos entity.ChunkPosition) []*entity.Chunk {
 	chunks := make([]*entity.Chunk, 0, 9)
-
-	for _, pos := range plr.GetChunk().GetAdjacentPositions() {
+	for _, pos := range server.getChunk(pos).GetAdjacentPositions() {
 		chunks = append(chunks, server.getChunk(pos))
 	}
 
 	return chunks
 }
+
+func (server *ShardServer) sendPacketToViewableChunks(plr *entity.Player, typeID uint32, pkt ...interface{}) error {
+	for _, chunk := range server.getViewableChunks(plr.Chunk) {
+		chunk.SendPacket(typeID, pkt...)
+	}
+
+	return nil
+}
+
+func (server *ShardServer) removeEntityFromChunks(chunks []*entity.Chunk, this entity.Entity) {
+	for _, chunk := range chunks {
+		for e, _ := range chunk.Entities {
+			if e.GetKind() == entity.ENTITY_KIND_PLAYER {
+				otherPlr := e.(*entity.Player)
+				this.DisappearFromViewOf(otherPlr.Peer)
+			}
+
+			if this.GetKind() == entity.ENTITY_KIND_PLAYER {
+				thisPlr := this.(*entity.Player)
+				e.DisappearFromViewOf(thisPlr.Peer)
+			}
+		}
+	}
+}
+
+func (server *ShardServer) addEntityToChunks(chunks []*entity.Chunk, this entity.Entity) {
+	for _, chunk := range chunks {
+		for e, _ := range chunk.Entities {
+			if e.GetKind() == entity.ENTITY_KIND_PLAYER {
+				otherPlr := e.(*entity.Player)
+				this.EnterIntoViewOf(otherPlr.Peer)
+			}
+
+			if this.GetKind() == entity.ENTITY_KIND_PLAYER {
+				thisPlr := this.(*entity.Player)
+				e.EnterIntoViewOf(thisPlr.Peer)
+			}
+		}
+	}
+}
+
+func (server *ShardServer) updateEntityChunk(e entity.Entity, from entity.ChunkPosition, to entity.ChunkPosition) {
+	oldViewables := server.getViewableChunks(from)
+	newViewables := server.getViewableChunks(to)
+
+	// compute differences
+	toExit := entity.ChunkSliceDifference(oldViewables, newViewables)
+	toEnter := entity.ChunkSliceDifference(newViewables, oldViewables)
+
+	// update chunks
+	server.removeEntityFromChunks(toExit, e)
+	server.addEntityToChunks(toEnter, e)
+	server.getChunk(from).RemoveEntity(e)
+	server.getChunk(to).AddEntity(e)
+	e.SetChunk(to)
+}

shard/join.go

@@ -22,9 +22,10 @@ func (server *ShardServer) attachPlayer(peer *protocol.CNPeer, meta redis.LoginM
 	if err != nil {
 		return nil, err
 	}
+	plr.Peer = peer
 
 	server.setPlayer(peer, plr)
-	return plr, err
+	return plr, nil
 }
 
 func (server *ShardServer) RequestEnter(peer *protocol.CNPeer, pkt protocol.Packet) error {
@@ -57,6 +58,8 @@ func (server *ShardServer) RequestEnter(peer *protocol.CNPeer, pkt protocol.Pack
 	peer.SetActiveKey(protocol.USE_FE)
 
 	log.Printf("Player %d (AccountID %d) entered\n", resp.IID, loginData.AccountID)
+
+	server.updatePlayerPosition(peer, int(plr.X), int(plr.Y), int(plr.Z), int(plr.Angle))
 	return peer.Send(protocol.P_FE2CL_REP_PC_ENTER_SUCC, resp)
 }
 

shard/movement.go

@@ -1,6 +1,7 @@
 package shard
 
 import (
+	"github.com/CPunch/gopenfusion/core/entity"
 	"github.com/CPunch/gopenfusion/core/protocol"
 )
 
@@ -9,12 +10,16 @@ func (server *ShardServer) updatePlayerPosition(peer *protocol.CNPeer, X, Y, Z,
 	if err != nil {
 		return err
 	}
+	newPos := entity.MakeChunkPosition(X, Y)
+	oldPos := plr.Chunk
 
 	plr.X = X
 	plr.Y = Y
 	plr.Z = Z
 	plr.Angle = Angle
-
+	if newPos != oldPos {
+		server.updateEntityChunk(plr, oldPos, newPos)
+	}
 	return nil
 }
 

shard/shardServer.go

@@ -115,6 +115,14 @@ func (server *ShardServer) disconnect(peer *protocol.CNPeer) {
 	server.peerLock.Lock()
 	defer server.peerLock.Unlock()
 
+	// remove from chunk(s)
+	plr, ok := server.peers[peer]
+	if ok {
+		log.Printf("Player %d (AccountID %d) disconnected\n", plr.PlayerID, plr.AccountID)
+		server.removeEntityFromChunks(server.getViewableChunks(plr.Chunk), plr)
+		server.getChunk(plr.Chunk).RemoveEntity(plr)
+	}
+
 	log.Printf("Peer %p disconnected from SHARD\n", peer)
 	delete(server.peers, peer)
 }