-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
31 additions
and
190 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,169 +1,10 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "log" | ||
| "time" | ||
| "math/rand" | ||
| "code.google.com/p/go.net/websocket" | ||
|
|
||
| ) | ||
| // http://stackoverflow.com/questions/12771930/what-is-the-fastest-way-to-generate-a-long-random-string-in-go | ||
| func randString(n int) string { | ||
| const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" | ||
| bytes := make([]byte, n) | ||
| for i := 0; i < n; i++ { | ||
| bytes[i] = alphanum[rand.Int() % len(alphanum)] | ||
| } | ||
| return string(bytes) | ||
| } | ||
|
|
||
| type Player struct { | ||
| w *World | ||
| c *Conn | ||
|
|
||
| name string | ||
|
|
||
| Broadcast chan *Message | ||
| cm *ChunkManager | ||
| } | ||
|
|
||
| func NewPlayer(world *World, name string) *Player { | ||
| p := new(Player) | ||
| p.w = world | ||
| p.name = name | ||
|
|
||
| p.Broadcast = make(chan *Message, 10) | ||
| p.cm = newChunkManager() | ||
|
|
||
| return p | ||
| } | ||
|
|
||
| func (p *Player) Run(ws *websocket.Conn) { | ||
| p.c = NewConn(ws) | ||
| p.w.Join <- p | ||
|
|
||
| for { | ||
| select { | ||
| case m := <-p.Broadcast: | ||
| // A bit of a gross hack, but we don't want the player | ||
| // to recieve broadcast messages for the position of | ||
| // their own entity. | ||
| if m.Kind == MSG_ENTITY_POSITION && p.name == m.Payload["id"] { | ||
| continue | ||
| } | ||
| p.c.Send(m) | ||
| default: | ||
| m := p.c.Recv() | ||
| if m != nil { | ||
| p.handleMessage(m) | ||
| } else { | ||
| p.w.Leave <- p | ||
| return | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (p *Player) RunChunks(ws *websocket.Conn) { | ||
| c := NewConn(ws) | ||
|
|
||
| for { | ||
| cc, valid := p.cm.top() | ||
| if !valid { | ||
| <-time.After(time.Second / 10) | ||
| continue | ||
| } | ||
|
|
||
| m := NewMessage(MSG_CHUNK) | ||
| m.Payload["ccpos"] = cc.toMap() | ||
| m.Payload["size"] = map[string]interface{}{ | ||
| "w": CHUNK_WIDTH, | ||
| "h": CHUNK_HEIGHT, | ||
| "d": CHUNK_DEPTH, | ||
| } | ||
|
|
||
| chunk := p.w.RequestChunk(cc) | ||
| m.Payload["data"] = chunk.Flatten() | ||
|
|
||
| c.Send(m) | ||
| } | ||
| } | ||
|
|
||
| func (p *Player) handleMessage(m *Message) { | ||
| switch m.Kind { | ||
| case "block": | ||
| p.handleBlock(m) | ||
| case "player-position": | ||
| p.handlePlayerPosition(m) | ||
| default: | ||
| log.Print("Unknown message recieved from client of kind ", m.Kind) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| func (p *Player) sendPlayerPos(wc WorldCoords) { | ||
| m := NewMessage(MSG_PLAYER_POSITION) | ||
| m.Payload["pos"] = wc.toMap() | ||
| p.c.Send(m) | ||
| } | ||
|
|
||
| func (p *Player) handleBlock(m *Message) { | ||
| pl := m.Payload | ||
| wc := readWorldCoords(pl) | ||
| typ := Block(pl["type"].(float64)) | ||
|
|
||
| p.w.ChangeBlock(wc, typ) | ||
| p.w.Broadcast <- m | ||
| } | ||
|
|
||
| func (p *Player) handlePlayerPosition(m *Message) { | ||
| pl := m.Payload | ||
| // TODO: Verify position is valid | ||
| // (they didn't move too much in the last | ||
| // couple frames, and they are not currently | ||
| // in the ground). | ||
| wc := readWorldCoords(pl["pos"].(map[string]interface{})) | ||
|
|
||
| pl["id"] = p.name | ||
| m.Kind = MSG_ENTITY_POSITION | ||
| p.w.Broadcast <- m | ||
|
|
||
| occ := func (cc ChunkCoords, x, y, z int) ChunkCoords { | ||
| return ChunkCoords{ | ||
| x: cc.x + x, | ||
| y: cc.y + y, | ||
| z: cc.z + z, | ||
| } | ||
| } | ||
|
|
||
| eachWithin := func (cc ChunkCoords, xdist, ydist, zdist int, cb func (newCC ChunkCoords, dist int)) { | ||
| abs := func (n int) int { | ||
| if n < 0 { | ||
| return -n | ||
| } | ||
| return n | ||
| } | ||
| dist := func (x, y, z int) int { | ||
| return abs(x) + abs(y) + abs(z) | ||
| } | ||
| cb(cc, 0) | ||
| for x := -xdist; x <= xdist; x++ { | ||
| for y := -ydist; y <= ydist; y++ { | ||
| for z := -zdist; z <= zdist; z++ { | ||
| cb(occ(cc, x, y, z), dist(x, y, z)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| cc := wc.Chunk() | ||
| eachWithin(cc, 2, 0, 2, func (newCC ChunkCoords, dist int) { | ||
| p.cm.display(newCC, -dist) | ||
| }); | ||
|
|
||
| oc := wc.Offset(); | ||
| if oc.y <= 4 { | ||
| p.cm.display(occ(cc, 0, -1, 0), 1); | ||
| } else if oc.y >= 28 { | ||
| p.cm.display(occ(cc, 0, 1, 0), 1); | ||
| } | ||
| Position WorldCoords | ||
| Name string | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters