Some commit ...
This commit is contained in:
parent
0314ceae4a
commit
4cdad776e1
|
@ -79,7 +79,6 @@ func runClient(cmd *cobra.Command, args []string) {
|
||||||
|
|
||||||
select {
|
select {
|
||||||
case _ = <-osChan:
|
case _ = <-osChan:
|
||||||
// funzt noch nicht:
|
|
||||||
log.Println("Got a KILL")
|
log.Println("Got a KILL")
|
||||||
con.Close()
|
con.Close()
|
||||||
close(renderQueue)
|
close(renderQueue)
|
||||||
|
|
|
@ -74,6 +74,7 @@ func resetServer() {
|
||||||
_, client := k, clients[k]
|
_, client := k, clients[k]
|
||||||
client.off = off
|
client.off = off
|
||||||
off += client.w
|
off += client.w
|
||||||
|
off += 10
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -85,7 +86,7 @@ func serveClients() {
|
||||||
for _, k := range clientKeys {
|
for _, k := range clientKeys {
|
||||||
id, client := k, clients[k]
|
id, client := k, clients[k]
|
||||||
if id > 0 {
|
if id > 0 {
|
||||||
oFrame := level.GetFrame(0+frameCounter, client.w, frameCounter)
|
oFrame := level.GetFrame(client.off, client.w, frameCounter)
|
||||||
enc := gob.NewEncoder(client.con)
|
enc := gob.NewEncoder(client.con)
|
||||||
err := enc.Encode(oFrame)
|
err := enc.Encode(oFrame)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"encoding/gob"
|
"encoding/gob"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
|
//"sort"
|
||||||
)
|
)
|
||||||
|
|
||||||
type directionType int
|
type directionType int
|
||||||
|
@ -60,6 +61,7 @@ func LoadLevel(filename string) *Level {
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// that's a func
|
||||||
func (lvl *Level) Height() int {
|
func (lvl *Level) Height() int {
|
||||||
max := 0
|
max := 0
|
||||||
for _, l := range lvl.Layers {
|
for _, l := range lvl.Layers {
|
||||||
|
@ -72,6 +74,7 @@ func (lvl *Level) Height() int {
|
||||||
return max
|
return max
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// this is a func also ;)
|
||||||
func (lvl *Level) Width() (max int) {
|
func (lvl *Level) Width() (max int) {
|
||||||
for _, lay := range lvl.Layers {
|
for _, lay := range lvl.Layers {
|
||||||
for _, fra := range lay.Frames {
|
for _, fra := range lay.Frames {
|
||||||
|
@ -85,6 +88,7 @@ func (lvl *Level) Width() (max int) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//testcomment
|
||||||
func (lvl *Level) GetFrame(off, w, frameNo int) (ret *Frame) {
|
func (lvl *Level) GetFrame(off, w, frameNo int) (ret *Frame) {
|
||||||
h := lvl.Height()
|
h := lvl.Height()
|
||||||
|
|
||||||
|
@ -92,15 +96,20 @@ func (lvl *Level) GetFrame(off, w, frameNo int) (ret *Frame) {
|
||||||
W: w,
|
W: w,
|
||||||
H: h,
|
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 {
|
for _, layer := range lvl.Layers {
|
||||||
if layer.Z == 0 {
|
if layer.Z == 0 {
|
||||||
for row := 0; row < h; row++ {
|
for row := 0; row < h; row++ {
|
||||||
ret.Data = append(ret.Data, []rune{})
|
//ret.Data = append(ret.Data, []rune{})
|
||||||
f := (frameNo % len(layer.Frames)) + 1
|
f := (frameNo % len(layer.Frames)) + 1
|
||||||
if row <= len(layer.Frames[f]) {
|
if row <= len(layer.Frames[f]) {
|
||||||
|
//for col := 0
|
||||||
//log.Println(len(layer.Frames[f][row]))
|
//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:])...)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"Name": "The locomotive!",
|
"Name": "The locomotive!",
|
||||||
"FPS": 10,
|
"FPS": 25,
|
||||||
"Layers" : {
|
"Layers" : {
|
||||||
"locomotive": {
|
"locomotive": {
|
||||||
"Z-Index": 0,
|
"Z-Index": 0,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user