From c0ef4b628cd87e854c47825c30d9711465f44b72 Mon Sep 17 00:00:00 2001 From: Yutao Yuan Date: Tue, 14 Jun 2016 22:02:32 +0800 Subject: [PATCH] Add some flowers --- alpha/flower.pgm | 19 +++++++++++++++++++ color/dandelion_white.ppm | 4 ++++ color/dandelion_yellow.ppm | 4 ++++ color/geranium.ppm | 4 ++++ color/rose.ppm | 4 ++++ color/tulip.ppm | 4 ++++ color/viola.ppm | 4 ++++ index/flower.pgm | 19 +++++++++++++++++++ rules/flowers.py | 6 ++++++ 9 files changed, 68 insertions(+) create mode 100644 alpha/flower.pgm create mode 100644 color/dandelion_white.ppm create mode 100644 color/dandelion_yellow.ppm create mode 100644 color/geranium.ppm create mode 100644 color/rose.ppm create mode 100644 color/tulip.ppm create mode 100644 color/viola.ppm create mode 100644 index/flower.pgm diff --git a/alpha/flower.pgm b/alpha/flower.pgm new file mode 100644 index 0000000..422cbc1 --- /dev/null +++ b/alpha/flower.pgm @@ -0,0 +1,19 @@ +P2 +16 16 +1 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 +0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 +0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 +0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 +0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 +0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 +0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 +0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 +0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 +0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 diff --git a/color/dandelion_white.ppm b/color/dandelion_white.ppm new file mode 100644 index 0000000..a464edd --- /dev/null +++ b/color/dandelion_white.ppm @@ -0,0 +1,4 @@ +P3 +2 1 +255 +242 242 242 217 217 217 diff --git a/color/dandelion_yellow.ppm b/color/dandelion_yellow.ppm new file mode 100644 index 0000000..f4f74ff --- /dev/null +++ b/color/dandelion_yellow.ppm @@ -0,0 +1,4 @@ +P3 +2 1 +255 +242 204 12 217 182 11 diff --git a/color/geranium.ppm b/color/geranium.ppm new file mode 100644 index 0000000..a64148a --- /dev/null +++ b/color/geranium.ppm @@ -0,0 +1,4 @@ +P3 +2 1 +255 +65 90 217 57 80 191 diff --git a/color/rose.ppm b/color/rose.ppm new file mode 100644 index 0000000..bac1f9b --- /dev/null +++ b/color/rose.ppm @@ -0,0 +1,4 @@ +P3 +2 1 +255 +217 11 11 191 10 10 diff --git a/color/tulip.ppm b/color/tulip.ppm new file mode 100644 index 0000000..a05a9a1 --- /dev/null +++ b/color/tulip.ppm @@ -0,0 +1,4 @@ +P3 +2 1 +255 +255 159 25 230 143 23 diff --git a/color/viola.ppm b/color/viola.ppm new file mode 100644 index 0000000..e473289 --- /dev/null +++ b/color/viola.ppm @@ -0,0 +1,4 @@ +P3 +2 1 +255 +163 82 204 143 71 179 diff --git a/index/flower.pgm b/index/flower.pgm new file mode 100644 index 0000000..5847b53 --- /dev/null +++ b/index/flower.pgm @@ -0,0 +1,19 @@ +P2 +16 16 +3 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 3 3 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 3 3 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 3 3 0 0 0 0 0 0 0 +0 0 0 0 0 3 3 3 3 3 3 0 0 0 0 0 +0 0 0 0 0 3 3 3 3 3 3 0 0 0 0 0 +0 0 0 0 0 0 0 3 3 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 3 3 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 3 3 0 0 0 0 0 0 0 diff --git a/rules/flowers.py b/rules/flowers.py index 4995e83..31b9e9c 100644 --- a/rules/flowers.py +++ b/rules/flowers.py @@ -1,3 +1,9 @@ textures = { + 'flowers_dandelion_white': (('dandelion_white', 'grass'), 'flower', 'flower'), + 'flowers_dandelion_yellow': (('dandelion_yellow', 'grass'), 'flower', 'flower'), + 'flowers_geranium': (('geranium', 'grass'), 'flower', 'flower'), + 'flowers_rose': (('rose', 'grass'), 'flower', 'flower'), + 'flowers_tulip': (('tulip', 'grass'), 'flower', 'flower'), + 'flowers_viola': (('viola', 'grass'), 'flower', 'flower'), 'flowers_waterlily': (('waterlily_1', 'waterlily_2'), 'waterlily', 'waterlily'), }