From 4d31bc870cc72d2377385719b49c274078b6b349 Mon Sep 17 00:00:00 2001 From: coaljoe Date: Sun, 23 Aug 2020 00:09:37 +0300 Subject: [PATCH] auts: tile tweaks --- isotest/field.v | 3 ++ isotest/fieldview.v | 3 +- isotest/main.v | 39 +++++++++++++++++-- .../res/images/tiles/test2/tile_0_green.png | 3 ++ .../res/images/tiles/test2/tile_0_green.xcf | 3 ++ isotest/res/images/tiles/test2/tile_1_red.png | 3 ++ isotest/res/images/tiles/test2/tile_1_red.xcf | 3 ++ .../res/images/tiles/test2/tile_2_blue.png | 3 ++ .../res/images/tiles/test2/tile_3_green1.png | 3 ++ .../res/images/tiles/test2/tile_3_green1.xcf | 3 ++ .../res/images/tiles/test2/tile_4_red1.png | 3 ++ .../res/images/tiles/test2/tile_4_red1.xcf | 3 ++ 12 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 isotest/res/images/tiles/test2/tile_0_green.png create mode 100644 isotest/res/images/tiles/test2/tile_0_green.xcf create mode 100644 isotest/res/images/tiles/test2/tile_1_red.png create mode 100644 isotest/res/images/tiles/test2/tile_1_red.xcf create mode 100644 isotest/res/images/tiles/test2/tile_2_blue.png create mode 100644 isotest/res/images/tiles/test2/tile_3_green1.png create mode 100644 isotest/res/images/tiles/test2/tile_3_green1.xcf create mode 100644 isotest/res/images/tiles/test2/tile_4_red1.png create mode 100644 isotest/res/images/tiles/test2/tile_4_red1.xcf diff --git a/isotest/field.v b/isotest/field.v index 8146eae..e064d9a 100644 --- a/isotest/field.v +++ b/isotest/field.v @@ -4,14 +4,17 @@ struct Field { mut: w int h int + tiles_path string cells [][]Cell generated bool + view &FieldView } fn new_field() &Field { println("new_field()") f := &Field{ + tiles_path: "res/images/tiles/test1", view: &FieldView(0), } return f diff --git a/isotest/fieldview.v b/isotest/fieldview.v index bb1e842..c1902ac 100644 --- a/isotest/fieldview.v +++ b/isotest/fieldview.v @@ -24,7 +24,8 @@ fn (mut v FieldView) load() { pp(2) } - path := "res/images/tiles/test1" + //path := "res/images/tiles/test1" + path := v.m.tiles_path for f in os.walk_ext(path, ".png") { println("f: $f") diff --git a/isotest/main.v b/isotest/main.v index 0750518..37f9ca5 100644 --- a/isotest/main.v +++ b/isotest/main.v @@ -1,5 +1,6 @@ module main +import spytheman.vperlin as perlin import time import rand @@ -22,8 +23,12 @@ fn main() { //mut f := new_field() mut f := game.field + f.tiles_path = "res/images/tiles/test2" + //f.generate(4, 4) - f.generate(24, 24) + //f.generate(24, 24) + //f.generate(24, 48) + f.generate(32, 96) f.cells[1][1].z = 100 println("z 0 0: ${f.cells[0][0].z}") @@ -40,8 +45,36 @@ fn main() { // Randomize tiles for y in 0..f.h { for x in 0..f.w { - tile_num := 3 - n := rand.intn(tile_num) + //tile_num := 3 + tile_num := 5 + + mut n := rand.intn(tile_num) + + //scale := 1.0 + //scale := 0.1 + //scale := 0.3 + scale := 0.05 + mag := f32(tile_num) + nv := perlin.noise2d(f32(x) * scale, f32(y) * scale) + nv_norm := (nv + 1.0) / 2.0 + xnv := nv_norm * mag + println(xnv) + if xnv > tile_num { + pp(2) + } + //mut n := int(xnv) + mut noise_n := int(xnv) + + + + // Randomize with random + //if rand.intn(100) > 80 { + if rand.intn(100) > 70 { + //if rand.intn(100) > 30 { + //n = rand.intn(tile_num) + n = noise_n + } + f.cells[x][y].tile_id = n } } diff --git a/isotest/res/images/tiles/test2/tile_0_green.png b/isotest/res/images/tiles/test2/tile_0_green.png new file mode 100644 index 0000000..eb1fe0a --- /dev/null +++ b/isotest/res/images/tiles/test2/tile_0_green.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8fe367316ac4c69305da772cd6305f1752973870a1061699175c65d49951118 +size 3525 diff --git a/isotest/res/images/tiles/test2/tile_0_green.xcf b/isotest/res/images/tiles/test2/tile_0_green.xcf new file mode 100644 index 0000000..d857bad --- /dev/null +++ b/isotest/res/images/tiles/test2/tile_0_green.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0127b3c02a821b2b41bc9779d0eb0c6e056d061a4c77e01d46f41f23b0cb74f1 +size 2845 diff --git a/isotest/res/images/tiles/test2/tile_1_red.png b/isotest/res/images/tiles/test2/tile_1_red.png new file mode 100644 index 0000000..ea77fef --- /dev/null +++ b/isotest/res/images/tiles/test2/tile_1_red.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56cb29204da7ab944925bb968fe3acac15a3d341ea200ee35e4bce04c9189913 +size 2931 diff --git a/isotest/res/images/tiles/test2/tile_1_red.xcf b/isotest/res/images/tiles/test2/tile_1_red.xcf new file mode 100644 index 0000000..cdc3708 --- /dev/null +++ b/isotest/res/images/tiles/test2/tile_1_red.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9e144fc2d41ab2b22d1c53e43dc4d2c63bf80b5d5b63d124646f8774866ac5f +size 3134 diff --git a/isotest/res/images/tiles/test2/tile_2_blue.png b/isotest/res/images/tiles/test2/tile_2_blue.png new file mode 100644 index 0000000..9499534 --- /dev/null +++ b/isotest/res/images/tiles/test2/tile_2_blue.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a395c401d7249940667ada4cd631a171c753ebc0e8cbb6145749aeb6989977c9 +size 1617 diff --git a/isotest/res/images/tiles/test2/tile_3_green1.png b/isotest/res/images/tiles/test2/tile_3_green1.png new file mode 100644 index 0000000..eb5a14b --- /dev/null +++ b/isotest/res/images/tiles/test2/tile_3_green1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:416f6776e48f006560bf11ce8314386552c277ddac23bcf654bb41a2209d68c2 +size 3649 diff --git a/isotest/res/images/tiles/test2/tile_3_green1.xcf b/isotest/res/images/tiles/test2/tile_3_green1.xcf new file mode 100644 index 0000000..5743340 --- /dev/null +++ b/isotest/res/images/tiles/test2/tile_3_green1.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f28ca70f0d2984c26c00e7c00389e3fdd528002173c3a3e496166dab9e59c50 +size 2702 diff --git a/isotest/res/images/tiles/test2/tile_4_red1.png b/isotest/res/images/tiles/test2/tile_4_red1.png new file mode 100644 index 0000000..4ab6e35 --- /dev/null +++ b/isotest/res/images/tiles/test2/tile_4_red1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:004d7c20626f3c4d0c9771f6945d010cfc742e897a38cfa76a6b31a75028993f +size 2679 diff --git a/isotest/res/images/tiles/test2/tile_4_red1.xcf b/isotest/res/images/tiles/test2/tile_4_red1.xcf new file mode 100644 index 0000000..338a218 --- /dev/null +++ b/isotest/res/images/tiles/test2/tile_4_red1.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9d5b12d119932c9b57a75cf9235679a59546f1456080429d681e88c30f6cc0c +size 3937