| |
commit adfb9d83f651f829dfef5bc6d261220f5e5a4c28
Author: Matthias Melcher <github@matthiasm.com>
AuthorDate: Fri Jan 28 14:22:45 2022 +0100
Commit: Matthias Melcher <github@matthiasm.com>
CommitDate: Fri Jan 28 14:22:53 2022 +0100
Checkers pieces scaling.
test/checkers_pieces.fl | 6 +-
test/pixmaps/black_checker.png | Bin 6815 -> 6645 bytes
test/pixmaps/black_checker_king.png | Bin 7927 -> 7744 bytes
test/pixmaps/checker.svg | 475 ++++++++++++++++++------------------
test/pixmaps/white_checker.png | Bin 6629 -> 6490 bytes
test/pixmaps/white_checker_king.png | Bin 7778 -> 7593 bytes
6 files changed, 242 insertions(+), 239 deletions(-)
diff --git test/checkers_pieces.fl test/checkers_pieces.fl
index 8c4894f..d91bdf1 100644
--- test/checkers_pieces.fl
+++ test/checkers_pieces.fl
@@ -5,7 +5,7 @@ code_name {.cxx}
comment {//
// Checkers images for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2020 by Bill Spitzak and others.
+// Copyright 1998-2022 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@@ -17,13 +17,13 @@ comment {//
//
// https://www.fltk.org/bugs.php
//
-} {in_source in_header
+} {selected in_source in_header
}
data pixmaps_black_checker_png {public local filename {pixmaps/black_checker.png}
}
-data pixmaps_white_checker_png {selected public local filename {pixmaps/white_checker.png}
+data pixmaps_white_checker_png {public local filename {pixmaps/white_checker.png}
}
data pixmaps_black_checker_king_png {public local filename {pixmaps/black_checker_king.png}
diff --git test/pixmaps/black_checker.png test/pixmaps/black_checker.png
index a7e2cd7..363e557 100644
Binary files test/pixmaps/black_checker.png and test/pixmaps/black_checker.png differ
diff --git test/pixmaps/black_checker_king.png test/pixmaps/black_checker_king.png
index e54e870..523283a 100644
Binary files test/pixmaps/black_checker_king.png and test/pixmaps/black_checker_king.png differ
diff --git test/pixmaps/checker.svg test/pixmaps/checker.svg
index ad196a0..730385e 100644
--- test/pixmaps/checker.svg
+++ test/pixmaps/checker.svg
@@ -8,255 +8,255 @@
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="400"
- height="400"
- viewBox="0 0 400 400"
- version="1.1"
- id="svg2339"
+ sodipodi:docname="checker.svg"
inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
- sodipodi:docname="Checker_Matt.svg">
+ id="svg2339"
+ version="1.1"
+ viewBox="0 0 400 400"
+ height="400"
+ width="400">
<title
id="title2902">Checkers</title>
<defs
id="defs2333">
<linearGradient
- id="linearGradient3913"
- inkscape:collect="always">
+ inkscape:collect="always"
+ id="linearGradient3913">
<stop
- id="stop3907"
+ style="stop-color:#f2f2f2;stop-opacity:1"
offset="0"
- style="stop-color:#f2f2f2;stop-opacity:1" />
+ id="stop3907" />
<stop
- style="stop-color:#f2f2f2;stop-opacity:1"
+ id="stop3909"
offset="0.42485708"
- id="stop3909" />
+ style="stop-color:#f2f2f2;stop-opacity:1" />
<stop
- id="stop3911"
+ style="stop-color:#686868;stop-opacity:1"
offset="1"
- style="stop-color:#686868;stop-opacity:1" />
+ id="stop3911" />
</linearGradient>
<linearGradient
- inkscape:collect="always"
- id="White">
+ id="White"
+ inkscape:collect="always">
<stop
- style="stop-color:#f2f2f2;stop-opacity:1"
+ id="stop3889"
offset="0"
- id="stop3889" />
+ style="stop-color:#f2f2f2;stop-opacity:1" />
<stop
- id="stop3897"
+ style="stop-color:#f2f2f2;stop-opacity:1"
offset="0.5724141"
- style="stop-color:#f2f2f2;stop-opacity:1" />
+ id="stop3897" />
<stop
- style="stop-color:#686868;stop-opacity:1"
+ id="stop3891"
offset="1"
- id="stop3891" />
+ style="stop-color:#686868;stop-opacity:1" />
</linearGradient>
<linearGradient
- inkscape:collect="always"
- id="Black">
+ id="Black"
+ inkscape:collect="always">
<stop
- style="stop-color:#909090;stop-opacity:1"
+ id="stop3115"
offset="0"
- id="stop3115" />
+ style="stop-color:#909090;stop-opacity:1" />
<stop
- id="stop3862"
+ style="stop-color:#101010;stop-opacity:1"
offset="0.66777831"
- style="stop-color:#101010;stop-opacity:1" />
+ id="stop3862" />
<stop
- style="stop-color:#000000;stop-opacity:1"
+ id="stop3117"
offset="1"
- id="stop3117" />
+ style="stop-color:#000000;stop-opacity:1" />
</linearGradient>
<inkscape:path-effect
- effect="mirror_symmetry"
- start_point="0,0"
- end_point="0,0"
- center_point="0,0"
- id="path-effect3051"
- is_visible="true"
- lpeversion="1"
- mode="free"
- discard_orig_path="false"
- fuse_paths="false"
+ split_items="false"
oposite_fuse="false"
- split_items="false" />
- <inkscape:path-effect
- effect="mirror_symmetry"
- start_point="0,0"
- end_point="0,0"
- center_point="0,0"
- id="path-effect3049"
- is_visible="true"
- lpeversion="1"
- mode="free"
- discard_orig_path="false"
fuse_paths="false"
- oposite_fuse="false"
- split_items="false" />
- <inkscape:path-effect
- effect="bspline"
- id="path-effect2980"
- is_visible="true"
+ discard_orig_path="false"
+ mode="free"
lpeversion="1"
- weight="33.333333"
- steps="2"
- helper_size="0"
- apply_no_weight="true"
- apply_with_weight="true"
- only_selected="false" />
- <inkscape:path-effect
- effect="mirror_symmetry"
- start_point="0,0"
- end_point="0,0"
+ is_visible="true"
+ id="path-effect3051"
center_point="0,0"
- id="path-effect2970"
+ end_point="0,0"
+ start_point="0,0"
+ effect="mirror_symmetry" />
+ <inkscape:path-effect
+ split_items="false"
+ oposite_fuse="false"
+ fuse_paths="false"
+ discard_orig_path="false"
+ mode="free"
+ lpeversion="1"
is_visible="true"
+ id="path-effect3049"
+ center_point="0,0"
+ end_point="0,0"
+ start_point="0,0"
+ effect="mirror_symmetry" />
+ <inkscape:path-effect
+ only_selected="false"
+ apply_with_weight="true"
+ apply_no_weight="true"
+ helper_size="0"
+ steps="2"
+ weight="33.333333"
lpeversion="1"
- mode="free"
- discard_orig_path="false"
- fuse_paths="false"
+ is_visible="true"
+ id="path-effect2980"
+ effect="bspline" />
+ <inkscape:path-effect
+ split_items="false"
oposite_fuse="false"
- split_items="false" />
+ fuse_paths="false"
+ discard_orig_path="false"
+ mode="free"
+ lpeversion="1"
+ is_visible="true"
+ id="path-effect2970"
+ center_point="0,0"
+ end_point="0,0"
+ start_point="0,0"
+ effect="mirror_symmetry" />
<linearGradient
- id="Gold"
- spreadMethod="pad"
- gradientTransform="matrix(46.428806,43.129295,43.129295,-46.428806,110.23385,107.76259)"
- gradientUnits="userSpaceOnUse"
- y2="0"
- x2="1"
+ x1="0"
y1="0"
- x1="0">
+ x2="1"
+ y2="0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(46.428806,43.129295,43.129295,-46.428806,110.23385,107.76259)"
+ spreadMethod="pad"
+ id="Gold">
<stop
- id="stop1187"
+ style="stop-opacity:1;stop-color:#857435"
offset="0"
- style="stop-opacity:1;stop-color:#857435" />
+ id="stop1187" />
<stop
- id="stop1189"
+ style="stop-opacity:1;stop-color:#a19132"
offset="0.50122982"
- style="stop-opacity:1;stop-color:#a19132" />
+ id="stop1189" />
<stop
- id="stop1191"
+ style="stop-opacity:1;stop-color:#a19132"
offset="1"
- style="stop-opacity:1;stop-color:#a19132" />
+ id="stop1191" />
</linearGradient>
<linearGradient
- inkscape:collect="always"
- xlink:href="#Gold"
- id="linearGradient3096"
- x1="141.98361"
- y1="260.68472"
- x2="253.47739"
+ gradientUnits="userSpaceOnUse"
y2="138.69893"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#Gold"
- id="linearGradient3098"
- x1="146.52261"
- y1="256.14572"
x2="253.47739"
+ y1="260.68472"
+ x1="141.98361"
+ id="linearGradient3096"
+ xlink:href="#Gold"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
y2="138.69893"
- gradientUnits="userSpaceOnUse" />
+ x2="253.47739"
+ y1="256.14572"
+ x1="146.52261"
+ id="linearGradient3098"
+ xlink:href="#Gold"
+ inkscape:collect="always" />
<linearGradient
- inkscape:collect="always"
- xlink:href="#Black"
- id="linearGradient3866"
- x1="126.97269"
- y1="264.68085"
- x2="247.49542"
+ gradientUnits="userSpaceOnUse"
y2="156.31206"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
+ x2="247.49542"
+ y1="264.68085"
+ x1="126.97269"
+ id="linearGradient3866"
xlink:href="#Black"
- id="linearGradient3874"
- x1="87.068634"
- y1="85.957443"
- x2="295.91006"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
y2="324.82269"
- gradientUnits="userSpaceOnUse" />
+ x2="295.91006"
+ y1="85.957443"
+ x1="87.068634"
+ id="linearGradient3874"
+ xlink:href="#Black"
+ inkscape:collect="always" />
<filter
- inkscape:collect="always"
- style="color-interpolation-filters:sRGB"
- id="filter3883"
- x="-0.0012"
- width="1.0024"
+ height="1.0024"
y="-0.0012"
- height="1.0024">
+ width="1.0024"
+ x="-0.0012"
+ id="filter3883"
+ style="color-interpolation-filters:sRGB"
+ inkscape:collect="always">
<feGaussianBlur
- inkscape:collect="always"
+ id="feGaussianBlur3885"
stdDeviation="0.13449165"
- id="feGaussianBlur3885" />
+ inkscape:collect="always" />
</filter>
<linearGradient
- inkscape:collect="always"
- xlink:href="#White"
- id="linearGradient3895"
- x1="105.22466"
- y1="76.312057"
- x2="302.71857"
+ gradientUnits="userSpaceOnUse"
y2="347.51773"
- gradientUnits="userSpaceOnUse" />
+ x2="302.71857"
+ y1="76.312057"
+ x1="105.22466"
+ id="linearGradient3895"
+ xlink:href="#White"
+ inkscape:collect="always" />
<linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3913"
- id="linearGradient3905"
- x1="167.82375"
- y1="297.58865"
- x2="238.41739"
+ gradientUnits="userSpaceOnUse"
y2="104.68085"
- gradientUnits="userSpaceOnUse" />
+ x2="238.41739"
+ y1="297.58865"
+ x1="167.82375"
+ id="linearGradient3905"
+ xlink:href="#linearGradient3913"
+ inkscape:collect="always" />
<filter
- inkscape:collect="always"
- style="color-interpolation-filters:sRGB"
- id="filter3915"
- x="-0.093385214"
- width="1.1867704"
+ height="1.1867704"
y="-0.093385214"
- height="1.1867704">
+ width="1.1867704"
+ x="-0.093385214"
+ id="filter3915"
+ style="color-interpolation-filters:sRGB"
+ inkscape:collect="always">
<feGaussianBlur
- inkscape:collect="always"
+ id="feGaussianBlur3917"
stdDeviation="10.466277"
- id="feGaussianBlur3917" />
+ inkscape:collect="always" />
</filter>
</defs>
<sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.7625"
- inkscape:cx="200"
- inkscape:cy="200"
- inkscape:document-units="px"
- inkscape:current-layer="layer2"
- inkscape:document-rotation="0"
- showgrid="true"
- units="px"
- inkscape:window-width="1448"
- inkscape:window-height="1037"
- inkscape:window-x="199"
- inkscape:window-y="38"
- inkscape:window-maximized="0"
- inkscape:snap-grids="false"
- inkscape:snap-smooth-nodes="false"
- inkscape:object-paths="false"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:snap-to-guides="false"
- inkscape:snap-others="false"
+ inkscape:snap-nodes="false"
inkscape:object-nodes="false"
- inkscape:snap-nodes="false">
+ inkscape:snap-others="false"
+ inkscape:snap-to-guides="false"
+ inkscape:guide-bbox="true"
+ showguides="true"
+ inkscape:object-paths="false"
+ inkscape:snap-smooth-nodes="false"
+ inkscape:snap-grids="false"
+ inkscape:window-maximized="0"
+ inkscape:window-y="38"
+ inkscape:window-x="199"
+ inkscape:window-height="1037"
+ inkscape:window-width="1448"
+ units="px"
+ showgrid="true"
+ inkscape:document-rotation="0"
+ inkscape:current-layer="layer2"
+ inkscape:document-units="px"
+ inkscape:cy="200"
+ inkscape:cx="200"
+ inkscape:zoom="1.7625"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base">
<sodipodi:guide
- position="200,201"
+ id="guide3037"
orientation="1,0"
- id="guide3037" />
+ position="200,201" />
<sodipodi:guide
- position="190,200"
+ id="guide3039"
orientation="0,-1"
- id="guide3039" />
+ position="190,200" />
</sodipodi:namedview>
<metadata
id="metadata2336">
@@ -284,95 +284,98 @@
</rdf:RDF>
</metadata>
<g
- inkscape:groupmode="layer"
- id="layer6"
+ style="display:inline"
inkscape:label="Shadow"
- style="display:inline">
- <circle
- r="134.49165"
- cy="219.99971"
- cx="219.99971"
- id="circle3053-7-3"
- style="display:inline;opacity:0.846304;mix-blend-mode:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.01669;filter:url(#filter3915)"
- inkscape:label="Outer"
- transform="matrix(0.9999985,0,0,1.0000001,-4.9998826,-4.9999995)" />
- </g>
- <g
- inkscape:label="WhitePiece"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:none">
+ id="layer6"
+ inkscape:groupmode="layer">
<circle
+ transform="matrix(0.9999985,0,0,1.0000001,-4.9998826,-4.9999995)"
inkscape:label="Outer"
- style="display:inline;fill:url(#linearGradient3895);fill-opacity:1;stroke:none;stroke-width:1.01669"
- id="circle3053-7"
- cx="200"
- cy="200"
+ style="display:inline;opacity:0.846304;mix-blend-mode:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.01669;filter:url(#filter3915)"
+ id="circle3053-7-3"
+ cx="219.99971"
+ cy="219.99971"
r="134.49165" />
- <circle
- inkscape:label="Inner"
- style="display:inline;fill:url(#linearGradient3905);fill-opacity:1;stroke:none;stroke-width:1.03757"
- id="circle3055-9"
- cx="200"
- cy="200"
- r="89.481216" />
</g>
<g
+ style="display:inline"
+ id="layer1"
inkscape:groupmode="layer"
- id="layer4"
- inkscape:label="BlackPiece"
- style="display:inline">
+ inkscape:label="WhitePiece">
<circle
r="134.49165"
cy="200"
cx="200"
- id="circle3053"
- style="fill:url(#linearGradient3874);fill-opacity:1;stroke:none;stroke-width:1.01669;filter:url(#filter3883)"
+ id="circle3053-7"
+ style="display:inline;fill:url(#linearGradient3895);fill-opacity:1;stroke:none;stroke-width:1.01669"
inkscape:label="Outer" />
<circle
r="89.481216"
cy="200"
cx="200"
- id="circle3055"
- style="fill:url(#linearGradient3866);fill-opacity:1;stroke:none;stroke-width:1.03757"
+ id="circle3055-9"
+ style="display:inline;fill:url(#linearGradient3905);fill-opacity:1;stroke:none;stroke-width:1.03757"
inkscape:label="Inner" />
</g>
<g
- inkscape:groupmode="layer"
- id="layer5"
+ style="display:none"
+ inkscape:label="BlackPiece"
+ id="layer4"
+ inkscape:groupmode="layer">
+ <circle
+ inkscape:label="Outer"
+ style="fill:url(#linearGradient3874);fill-opacity:1;stroke:none;stroke-width:1.01669;filter:url(#filter3883)"
+ id="circle3053"
+ cx="200"
+ cy="200"
+ r="134.49165" />
+ <circle
+ inkscape:label="Inner"
+ style="fill:url(#linearGradient3866);fill-opacity:1;stroke:none;stroke-width:1.03757"
+ id="circle3055"
+ cx="200"
+ cy="200"
+ r="89.481216" />
+ </g>
+ <g
+ style="display:none;opacity:1;mix-blend-mode:normal"
inkscape:label="Crown"
- style="display:none;opacity:1;mix-blend-mode:normal">
+ id="layer5"
+ inkscape:groupmode="layer">
<path
- style="fill:url(#linearGradient3098);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 200,260 v -10 h -30 c -5,0 -5,0 -5,5 0,5 0,5 5,5 z m 0,0 v -10 h 30 c 5,0 5,0 5,5 0,5 0,5 -5,5 z"
- id="path3045"
- inkscape:connector-curvature="0"
- inkscape:label="Bottom"
+ inkscape:path-effect="#path-effect3051"
inkscape:original-d="m 200,260 v -10 c 0,0 -25,0 -30,0 -5,0 -5,0 -5,5 0,5 0,5 5,5 5,0 30,0 30,0 z"
- inkscape:path-effect="#path-effect3051" />
- <path
- style="fill:url(#linearGradient3096);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 200,135 v 105 h -35 c 0,0 -13.01247,-48.28017 -17.35303,-63.67651 -2.3708,-8.40943 2.32158,-14.22993 10.44116,-6.54407 9.6322,9.11768 17.85987,16.60643 17.85987,16.60643 0,0 2.38733,-6.0854 18.02246,-45.72411 C 196.43692,134.40867 200,135 200,135 Z m 0,0 v 105 h 35 c 0,0 13.01247,-48.28017 17.35303,-63.67651 2.3708,-8.40943 -2.32158,-14.22993 -10.44116,-6.54407 -9.6322,9.11768 -17.85987,16.60643 -17.85987,16.60643 0,0 -2.38733,-6.0854 -18.02246,-45.72411 C 203.56308,134.40867 200,135 200,135 Z"
- id="path3047"
+ inkscape:label="Bottom"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccsscsc"
- inkscape:label="Top"
+ id="path3045"
+ d="m 200,260 v -10 h -30 c -5,0 -5,0 -5,5 0,5 0,5 5,5 z m 0,0 v -10 h 30 c 5,0 5,0 5,5 0,5 0,5 -5,5 z"
+ style="fill:url(#linearGradient3098);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:path-effect="#path-effect3049"
inkscape:original-d="m 200,135 v 105 h -35 c 0,0 -13.01247,-48.28017 -17.35303,-63.67651 -2.3708,-8.40943 2.32158,-14.22993 10.44116,-6.54407 9.6322,9.11768 17.85987,16.60643 17.85987,16.60643 0,0 2.38733,-6.0854 18.02246,-45.72411 C 196.43692,134.40867 200,135 200,135 Z"
- inkscape:path-effect="#path-effect3049" />
+ inkscape:label="Top"
+ sodipodi:nodetypes="cccsscsc"
+ inkscape:connector-curvature="0"
+ id="path3047"
+ d="m 200,135 v 105 h -35 c 0,0 -13.01247,-48.28017 -17.35303,-63.67651 -2.3708,-8.40943 2.32158,-14.22993 10.44116,-6.54407 9.6322,9.11768 17.85987,16.60643 17.85987,16.60643 0,0 2.38733,-6.0854 18.02246,-45.72411 C 196.43692,134.40867 200,135 200,135 Z m 0,0 v 105 h 35 c 0,0 13.01247,-48.28017 17.35303,-63.67651 2.3708,-8.40943 -2.32158,-14.22993 -10.44116,-6.54407 -9.6322,9.11768 -17.85987,16.60643 -17.85987,16.60643 0,0 -2.38733,-6.0854 -18.02246,-45.72411 C 203.56308,134.40867 200,135 200,135 Z"
+ style="fill:url(#linearGradient3096);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<g
- style="display:none"
- inkscape:label="Crop"
+ inkscape:groupmode="layer"
id="layer2"
- inkscape:groupmode="layer">
+ inkscape:label="Crop"
+ style="display:none">
<rect
- inkscape:export-ydpi="34.683872"
- inkscape:export-xdpi="34.683872"
- y="55.602837"
- x="57.872341"
- height="305.81561"
- width="309.78723"
- id="rect882"
- style="fill:none" />
+ style="fill:none;stroke-width:1.04614"
+ id="ExportPng112x112"
+ width="322"
+ height="322"
+ x="57"
+ y="57"
+ inkscape:export-xdpi="33.391304"
+ inkscape:export-ydpi="33.391304">
+ <desc
+ id="desc60">Select this rectangle and export it as a PNG with 112x112 pixels in size, creating the correct image for the checkers game.</desc>
+ </rect>
</g>
</svg>
diff --git test/pixmaps/white_checker.png test/pixmaps/white_checker.png
index 9aaf778..2f654d3 100644
Binary files test/pixmaps/white_checker.png and test/pixmaps/white_checker.png differ
diff --git test/pixmaps/white_checker_king.png test/pixmaps/white_checker_king.png
index 08eadc7..4446786 100644
Binary files test/pixmaps/white_checker_king.png and test/pixmaps/white_checker_king.png differ
[ Direct Link to Message ] | |
