examples/moles: update to inkscape_tools instead of the old bash script

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/examples/mnit_moles/.gitignore b/examples/mnit_moles/.gitignore
index 18c4e15..f4dac05 100644 (file)
--- a/examples/mnit_moles/.gitignore
+++ b/examples/mnit_moles/.gitignore
@@ -1 +1,3 @@
 icon.png
+src/drawing.nit
+assets/images/

diff --git a/examples/mnit_moles/Makefile b/examples/mnit_moles/Makefile
index ebd6d09..8615b29 100644 (file)
--- a/examples/mnit_moles/Makefile
+++ b/examples/mnit_moles/Makefile
@@ -20,7 +20,7 @@ android-install: android
 
 pngs:
        mkdir -p assets/images
-       ../mnit_dino/tools/svg-to-pngs art/drawing.svg assets/images
+       ../../contrib/inkscape_tools/bin/svg_to_png_and_nit --src src/ --scale 2.0 art/drawing.svg
 
 check-android:
        ./check-android.sh

diff --git a/examples/mnit_moles/art/drawing.svg b/examples/mnit_moles/art/drawing.svg
index f63fd06..4be9cbf 100644 (file)
--- a/examples/mnit_moles/art/drawing.svg
+++ b/examples/mnit_moles/art/drawing.svg
@@ -1367,11 +1367,11 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="0sign-warning"
-       transform="matrix(1.525334,-0.20537456,0.20537456,1.525334,99.174751,443.48013)"
+       id="0sign_warning"
+       transform="matrix(1.525334,-0.20537456,0.20537456,1.525334,99.174751,416.54677)"
        inkscape:label="#g3997">
       <path
-         style="fill:#ac7905;fill-opacity:1;stroke:#000000;stroke-width:1.25000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:#ac7905;fill-opacity:1;stroke:#000000;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m 17.598259,-420.73934 0,72.79425 -2.205794,1.22556 -3.256697,0.65967 -2.124193,-1.53194 -2.5837759,1.22555 -3.2525318,-0.90933 -2.7535111,-0.66951 0,-72.79425 2.7164414,1.0213 5.0654206,-2.34898 5.2696818,2.85962 z"
          id="path3974"
          inkscape:connector-curvature="0"
@@ -1381,7 +1381,7 @@
          inkscape:connector-curvature="0"
          id="rect3202"
          d="m -89.373545,-452.72425 199.969995,0 3.38745,8.63727 -1.40278,10.32417 -4.20834,5.83528 3.36667,7.09778 -6.17223,7.09778 5.05001,8.02333 -199.969998,0 2.805558,-7.46222 -6.452784,-13.915 7.855564,-14.47612 z"
-         style="fill:#ac7905;fill-opacity:1;stroke:#000000;stroke-width:1.25000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:#ac7905;fill-opacity:1;stroke:#000000;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <g
          id="g4067">
         <path
@@ -1477,7 +1477,7 @@
          sodipodi:nodetypes="ssscs" />
     </g>
     <g
-       id="0sign-cute"
+       id="0sign_cute"
        transform="matrix(1.5327722,0.13939765,-0.13939765,1.5327722,-47.019003,386.37643)"
        inkscape:label="#g4005">
       <path
@@ -1693,7 +1693,7 @@
          style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.87091571;stroke-opacity:1" />
     </g>
     <g
-       id="0sign-hits"
+       id="0sign_hits"
        transform="matrix(1.5390979,0,0,1.5390979,-6.5847589,444.36219)"
        inkscape:label="#g4014">
       <path
@@ -1789,7 +1789,7 @@
          sodipodi:nodetypes="ssscs" />
     </g>
     <g
-       id="00"
+       id="0n0"
        transform="translate(288.4488,400.73354)"
        inkscape:label="#g3374">
       <path
@@ -1804,7 +1804,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="01"
+       id="0n1"
        transform="translate(288.4488,400.73354)"
        inkscape:label="#g3378">
       <path
@@ -1819,7 +1819,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="02"
+       id="0n2"
        transform="matrix(0.8473467,0,0,1,337.59724,400.73354)"
        inkscape:label="#g3382">
       <path
@@ -1834,7 +1834,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="03"
+       id="0n3"
        transform="translate(288.4488,400.73354)"
        inkscape:label="#g3386">
       <path
@@ -1849,7 +1849,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="04"
+       id="0n4"
        transform="translate(288.4488,400.73354)"
        inkscape:label="#g3390">
       <path
@@ -1864,7 +1864,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="05"
+       id="0n5"
        transform="translate(288.4488,400.73354)"
        inkscape:label="#g3394">
       <path
@@ -1879,7 +1879,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="06"
+       id="0n6"
        transform="translate(288.4488,400.73354)"
        inkscape:label="#g3398">
       <path
@@ -1894,7 +1894,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="07"
+       id="0n7"
        transform="translate(288.4488,400.73354)"
        inkscape:label="#g3402">
       <path
@@ -1909,7 +1909,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="08"
+       id="0n8"
        transform="translate(288.4488,400.73354)"
        inkscape:label="#g3406">
       <path
@@ -1924,7 +1924,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="09"
+       id="0n9"
        transform="translate(288.4488,400.73354)"
        inkscape:label="#g3410">
       <path

diff --git a/examples/mnit_moles/assets/images/0.png b/examples/mnit_moles/assets/images/0.png
deleted file mode 100644 (file)
index b471835..0000000
Binary files a/examples/mnit_moles/assets/images/0.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/1.png b/examples/mnit_moles/assets/images/1.png
deleted file mode 100644 (file)
index 2a5ae86..0000000
Binary files a/examples/mnit_moles/assets/images/1.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/2.png b/examples/mnit_moles/assets/images/2.png
deleted file mode 100644 (file)
index 113e0eb..0000000
Binary files a/examples/mnit_moles/assets/images/2.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/3.png b/examples/mnit_moles/assets/images/3.png
deleted file mode 100644 (file)
index f94c43d..0000000
Binary files a/examples/mnit_moles/assets/images/3.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/4.png b/examples/mnit_moles/assets/images/4.png
deleted file mode 100644 (file)
index 2e05015..0000000
Binary files a/examples/mnit_moles/assets/images/4.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/5.png b/examples/mnit_moles/assets/images/5.png
deleted file mode 100644 (file)
index ac17174..0000000
Binary files a/examples/mnit_moles/assets/images/5.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/6.png b/examples/mnit_moles/assets/images/6.png
deleted file mode 100644 (file)
index 122f412..0000000
Binary files a/examples/mnit_moles/assets/images/6.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/7.png b/examples/mnit_moles/assets/images/7.png
deleted file mode 100644 (file)
index a341702..0000000
Binary files a/examples/mnit_moles/assets/images/7.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/8.png b/examples/mnit_moles/assets/images/8.png
deleted file mode 100644 (file)
index 40c1c17..0000000
Binary files a/examples/mnit_moles/assets/images/8.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/9.png b/examples/mnit_moles/assets/images/9.png
deleted file mode 100644 (file)
index 8263229..0000000
Binary files a/examples/mnit_moles/assets/images/9.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/empty.png b/examples/mnit_moles/assets/images/empty.png
deleted file mode 100644 (file)
index 032d075..0000000
Binary files a/examples/mnit_moles/assets/images/empty.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/hit.png b/examples/mnit_moles/assets/images/hit.png
deleted file mode 100644 (file)
index 1488e6a..0000000
Binary files a/examples/mnit_moles/assets/images/hit.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/sign-cute.png b/examples/mnit_moles/assets/images/sign-cute.png
deleted file mode 100644 (file)
index bf1ab24..0000000
Binary files a/examples/mnit_moles/assets/images/sign-cute.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/sign-hits.png b/examples/mnit_moles/assets/images/sign-hits.png
deleted file mode 100644 (file)
index a8a9992..0000000
Binary files a/examples/mnit_moles/assets/images/sign-hits.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/sign-warning.png b/examples/mnit_moles/assets/images/sign-warning.png
deleted file mode 100644 (file)
index 62b7688..0000000
Binary files a/examples/mnit_moles/assets/images/sign-warning.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/trap.png b/examples/mnit_moles/assets/images/trap.png
deleted file mode 100644 (file)
index c795661..0000000
Binary files a/examples/mnit_moles/assets/images/trap.png and /dev/null differ

diff --git a/examples/mnit_moles/assets/images/up.png b/examples/mnit_moles/assets/images/up.png
deleted file mode 100644 (file)
index 84cb8d0..0000000
Binary files a/examples/mnit_moles/assets/images/up.png and /dev/null differ

diff --git a/examples/mnit_moles/src/moles.nit b/examples/mnit_moles/src/moles.nit
index c3824a4..bfa03e7 100644 (file)
--- a/examples/mnit_moles/src/moles.nit
+++ b/examples/mnit_moles/src/moles.nit
@@ -24,6 +24,8 @@ end
 
 import mnit
 
+import drawing
+
 class Hole
        var game: Game
 
@@ -142,68 +144,45 @@ end
 
 # Where all the UI stuff is done
 class Screen
-       var empty_img: Image
-       var up_img: Image
-       var hit_img: Image
-       var trap_img: Image
-       var numbers: NumberImages
-
-       var sign_warning: Image
-       var sign_cute: Image
-       var sign_hits: Image
-
        var game = new Game
 
-       init (app: App)
-       do
-               empty_img = app.load_image("images/empty.png")
-               up_img = app.load_image("images/up.png")
-               hit_img = app.load_image("images/hit.png")
-               trap_img = app.load_image("images/trap.png")
-               numbers = app.load_numbers("images/#.png")
-
-               sign_warning = app.load_image("images/sign-warning.png")
-               sign_cute = app.load_image("images/sign-cute.png")
-               sign_hits = app.load_image("images/sign-hits.png")
-       end
-
        fun do_frame(display: Display)
        do
                display.clear(0.1, 0.65, 0.2)
 
-               sign_warning.scale = display_scale
-               sign_cute.scale = display_scale
-               sign_hits.scale = display_scale
-               for img in numbers.imgs do img.scale = display_scale
+               app.assets.sign_warning.scale = display_scale
+               app.assets.sign_cute.scale = display_scale
+               app.assets.sign_hits.scale = display_scale
+               for img in app.numbers.imgs do img.scale = display_scale
 
-               display.blit(sign_warning, (-120.0*display_scale).to_i, (-235.0*display_scale).to_i)
-               display.blit(sign_cute, (540.0*display_scale).to_i, (-180.0*display_scale).to_i)
-               display.blit(sign_hits, (1340.0*display_scale).to_i, (55.0*display_scale).to_i)
-               display.blit_number(numbers, game.points, (1460.0*display_scale).to_i, (270.0*display_scale).to_i)
+               display.blit(app.assets.sign_warning, (0.0*display_scale).to_i, (0.0*display_scale).to_i)
+               display.blit(app.assets.sign_cute, (740.0*display_scale).to_i, (0.0*display_scale).to_i)
+               display.blit(app.assets.sign_hits, (1640.0*display_scale).to_i, (55.0*display_scale).to_i)
+               display.blit_number(app.numbers, game.points, (1720.0*display_scale).to_i, (170.0*display_scale).to_i)
 
                for hole in game.holes do
                        # Hole
-                       var img = empty_img
-                       var dx = 512.0*display_scale
-                       var dy = 512.0*display_scale
+                       var img = app.assets.empty
+                       var dx = 300.0*display_scale
+                       var dy = 256.0*display_scale
                        img.scale = display_scale
                        display.blit(img, hole.x-dx.to_i+display_offset_x, hole.y-dy.to_i+display_offset_y)
 
                        # Mole
                        var empty = false
                        if hole.hitted then
-                               img = hit_img
-                               dx = 256.0*display_scale
-                               dy = 417.0*display_scale
+                               img = app.assets.hit
+                               dx = 250.0*display_scale
+                               dy = 512.0*display_scale
                        else if hole.up then
                                if hole.trap then
-                                       img = trap_img
-                                       dx = 512.0*display_scale
+                                       img = app.assets.trap
+                                       dx = 212.0*display_scale
                                        dy = 830.0*display_scale
                                else
-                                       img = up_img
-                                       dx = 512.0*display_scale
-                                       dy = 830.0*display_scale
+                                       img = app.assets.up
+                                       dx = 212.0*display_scale
+                                       dy = 820.0*display_scale
                                end
                        else empty = true
 
@@ -233,6 +212,18 @@ redef class App
 
        var screen: nullable Screen = null
 
+       # Image set generate by inkscape_tools
+       var assets = new DrawingImages
+
+       # Numbers to display the score
+       var numbers = new NumberImages(assets.n)
+
+       redef fun on_start
+       do
+               super
+               assets.load_all self
+       end
+
        redef fun on_create
        do
                super
@@ -241,7 +232,7 @@ redef class App
                init_screen_and_game
        end
 
-       fun init_screen_and_game do screen = new Screen(self)
+       fun init_screen_and_game do screen = new Screen
 
        redef fun frame_core(display)
        do