Some commit ...

This commit is contained in:
tkarrass 2016-02-08 00:13:49 +01:00
parent 0314ceae4a
commit 4cdad776e1
4 changed files with 14 additions and 5 deletions

View File

@ -79,7 +79,6 @@ func runClient(cmd *cobra.Command, args []string) {
select {
case _ = <-osChan:
// funzt noch nicht:
log.Println("Got a KILL")
con.Close()
close(renderQueue)

View File

@ -74,6 +74,7 @@ func resetServer() {
_, client := k, clients[k]
client.off = off
off += client.w
off += 10
}
}
@ -85,7 +86,7 @@ func serveClients() {
for _, k := range clientKeys {
id, client := k, clients[k]
if id > 0 {
oFrame := level.GetFrame(0+frameCounter, client.w, frameCounter)
oFrame := level.GetFrame(client.off, client.w, frameCounter)
enc := gob.NewEncoder(client.con)
err := enc.Encode(oFrame)
if err != nil {

View File

@ -4,6 +4,7 @@ import (
"encoding/gob"
"log"
"os"
//"sort"
)
type directionType int
@ -60,6 +61,7 @@ func LoadLevel(filename string) *Level {
return ret
}
// that's a func
func (lvl *Level) Height() int {
max := 0
for _, l := range lvl.Layers {
@ -72,6 +74,7 @@ func (lvl *Level) Height() int {
return max
}
// this is a func also ;)
func (lvl *Level) Width() (max int) {
for _, lay := range lvl.Layers {
for _, fra := range lay.Frames {
@ -85,6 +88,7 @@ func (lvl *Level) Width() (max int) {
return
}
//testcomment
func (lvl *Level) GetFrame(off, w, frameNo int) (ret *Frame) {
h := lvl.Height()
@ -92,15 +96,20 @@ func (lvl *Level) GetFrame(off, w, frameNo int) (ret *Frame) {
W: w,
H: h,
}
var mdata = make([]rune, w*h)
for y := 0; y < h; y++ {
ret.Data = append(ret.Data, mdata[y*w:(y+1)*w])
}
for _, layer := range lvl.Layers {
if layer.Z == 0 {
for row := 0; row < h; row++ {
ret.Data = append(ret.Data, []rune{})
//ret.Data = append(ret.Data, []rune{})
f := (frameNo % len(layer.Frames)) + 1
if row <= len(layer.Frames[f]) {
//for col := 0
//log.Println(len(layer.Frames[f][row]))
ret.Data[row] = append(ret.Data[row], (layer.Frames[f][row][off:])...)
//ret.Data[row] = append(ret.Data[row], (layer.Frames[f][row][off%w:])...)
}
}
}

View File

@ -1,6 +1,6 @@
{
"Name": "The locomotive!",
"FPS": 10,
"FPS": 25,
"Layers" : {
"locomotive": {
"Z-Index": 0,