diff --git a/.gitignore b/.gitignore index dcf864f..ae6fbf1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ build/ # Logs *.log +*.log.lck diff --git a/src/main/resources/content/textures/products/stone/granite_heavy.png b/src/main/resources/content/textures/products/stone/granite_heavy.png index a8ada42..ec36880 100644 Binary files a/src/main/resources/content/textures/products/stone/granite_heavy.png and b/src/main/resources/content/textures/products/stone/granite_heavy.png differ diff --git a/src/main/resources/content/textures/products/stone/granite_light.png b/src/main/resources/content/textures/products/stone/granite_light.png index 5807c9e..c62eb1c 100644 Binary files a/src/main/resources/content/textures/products/stone/granite_light.png and b/src/main/resources/content/textures/products/stone/granite_light.png differ diff --git a/src/main/resources/content/textures/products/stone/granite_medium.png b/src/main/resources/content/textures/products/stone/granite_medium.png index 0fd9aee..77784da 100644 Binary files a/src/main/resources/content/textures/products/stone/granite_medium.png and b/src/main/resources/content/textures/products/stone/granite_medium.png differ diff --git a/src/main/resources/content/textures/products/stone/marble_heavy.png b/src/main/resources/content/textures/products/stone/marble_heavy.png index f2603e8..39bf0a7 100644 Binary files a/src/main/resources/content/textures/products/stone/marble_heavy.png and b/src/main/resources/content/textures/products/stone/marble_heavy.png differ diff --git a/src/main/resources/content/textures/products/stone/marble_light.png b/src/main/resources/content/textures/products/stone/marble_light.png index 5284eab..69e9a6e 100644 Binary files a/src/main/resources/content/textures/products/stone/marble_light.png and b/src/main/resources/content/textures/products/stone/marble_light.png differ diff --git a/src/main/resources/content/textures/products/stone/marble_medium.png b/src/main/resources/content/textures/products/stone/marble_medium.png index 9ccf6cf..51735e8 100644 Binary files a/src/main/resources/content/textures/products/stone/marble_medium.png and b/src/main/resources/content/textures/products/stone/marble_medium.png differ diff --git a/src/main/resources/content/textures/products/stone/sandstone_heavy.png b/src/main/resources/content/textures/products/stone/sandstone_heavy.png index f0f644b..e60eee1 100644 Binary files a/src/main/resources/content/textures/products/stone/sandstone_heavy.png and b/src/main/resources/content/textures/products/stone/sandstone_heavy.png differ diff --git a/src/main/resources/content/textures/products/stone/sandstone_light.png b/src/main/resources/content/textures/products/stone/sandstone_light.png index dc5fabf..e1fb96c 100644 Binary files a/src/main/resources/content/textures/products/stone/sandstone_light.png and b/src/main/resources/content/textures/products/stone/sandstone_light.png differ diff --git a/src/main/resources/content/textures/products/stone/sandstone_medium.png b/src/main/resources/content/textures/products/stone/sandstone_medium.png index b4709b1..309451a 100644 Binary files a/src/main/resources/content/textures/products/stone/sandstone_medium.png and b/src/main/resources/content/textures/products/stone/sandstone_medium.png differ diff --git a/src/main/resources/content/textures/products/stone/stone-base.svg b/src/main/resources/content/textures/products/stone/stone-base.svg index a374d8b..5786bd9 100644 --- a/src/main/resources/content/textures/products/stone/stone-base.svg +++ b/src/main/resources/content/textures/products/stone/stone-base.svg @@ -8,252 +8,254 @@ 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="500" - height="500" - viewBox="0 0 132.29166 132.29167" - version="1.1" - id="svg8" - sodipodi:docname="stone-base.svg" - inkscape:version="1.0 (4035a4fb49, 2020-05-01)" - inkscape:export-filename="D:\coding\java\what-a-storage\src\main\resources\content\textures\products\stone\marble_light.png" + inkscape:export-ydpi="95.999992" inkscape:export-xdpi="95.999992" - inkscape:export-ydpi="95.999992"> + inkscape:export-filename="D:\coding\java\what-a-storage\src\main\resources\content\textures\products\stone\granite_light.png" + inkscape:version="1.0 (4035a4fb49, 2020-05-01)" + sodipodi:docname="stone-base.svg" + id="svg8" + version="1.1" + viewBox="0 0 132.29166 132.29167" + height="500" + width="500"> - + + patternTransform="translate(0,0) scale(10,10)" + height="1" + width="2" + patternUnits="userSpaceOnUse" + inkscape:collect="always"> + width="1" + y="-0.5" + x="0" + style="fill:black;stroke:none" /> - + - + + apply_with_radius="true" + apply_no_radius="true" + use_knot_distance="true" + flexible="false" + chamfer_steps="1" + radius="20" + mode="F" + method="auto" + unit="px" + satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1" + lpeversion="1" + is_visible="true" + id="path-effect4225" + effect="fillet_chamfer" /> - - - - - - - - - - + + + + + + + + + + id="rect2973" /> + + width="1.00006" + x="-3e-05" + id="filter3419" + style="color-interpolation-filters:sRGB" + inkscape:collect="always"> + inkscape:collect="always" /> + clipPathUnits="userSpaceOnUse" + id="clipPath879-8"> + d="M 26.458333,0 0,26.458333 V 132.29166 h 105.83333 l 26.45833,-26.45833 V 0 Z" /> + clipPathUnits="userSpaceOnUse" + id="clipPath887-0"> + d="M 26.458333,0 0,26.458333 V 132.29166 h 105.83333 l 26.45833,-26.45833 V 0 Z" /> + clipPathUnits="userSpaceOnUse" + id="clipPath883-6"> + d="M 26.458333,0 0,26.458333 V 132.29166 h 105.83333 l 26.45833,-26.45833 V 0 Z" /> + width="1.0000096" + x="-4.8067882e-06" + id="filter4349" + style="color-interpolation-filters:sRGB" + inkscape:collect="always"> + inkscape:collect="always" /> + inkscape:lockguides="false" + showguides="true" + inkscape:window-maximized="1" + inkscape:window-y="-7" + inkscape:window-x="-7" + inkscape:window-height="1010" + inkscape:window-width="1920" + units="px" + showgrid="false" + inkscape:document-rotation="0" + inkscape:current-layer="layer14" + inkscape:document-units="mm" + inkscape:cy="55.655445" + inkscape:cx="-178.44521" + inkscape:zoom="0.70710678" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:snap-bbox="false" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-smooth-nodes="true" + inkscape:bbox-paths="false" + inkscape:snap-global="true"> - - - + + inkscape:label="" + id="guide1412" + orientation="-1,0" + position="105.83333,105.83333" /> + + + position="0,132.29166" /> + position="132.29166,132.29166" /> + position="132.29166,0" /> + position="0,0" /> @@ -268,290 +270,290 @@ - - - - - - - - - - - - - - - + style="fill:#916f6f;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path4256-0" /> + style="fill:#916f6f;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#916f6f;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#ac9393;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#ac9393;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#825050;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#825050;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#825050;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#825050;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="display:none" + inkscape:label="sandstone" + id="g4343" + inkscape:groupmode="layer"> + + + + + + + + + + + + + + + + id="layer12" + inkscape:groupmode="layer"> + x="65.004082" + height="48.380955" + width="36.096725" + id="rect4118" + style="display:inline;fill:#fff6d5;fill-opacity:1;stroke:#000000;stroke-width:1.05833" /> - + height="6.0135641" + x="3.8650548" + y="87.890541" + ry="1.9382317e-06" /> + + id="rect4152" + width="17.70332" + height="5.8098249" + x="-12.340456" + y="143.31749" + ry="1.8725646e-06" /> - - - + diff --git a/src/main/resources/content/textures/products/wood/beech_boards.png b/src/main/resources/content/textures/products/wood/beech_boards.png index ac9a5d5..d979f41 100644 Binary files a/src/main/resources/content/textures/products/wood/beech_boards.png and b/src/main/resources/content/textures/products/wood/beech_boards.png differ diff --git a/src/main/resources/content/textures/products/wood/beech_pieces.png b/src/main/resources/content/textures/products/wood/beech_pieces.png index 4737b6d..bf2c9ba 100644 Binary files a/src/main/resources/content/textures/products/wood/beech_pieces.png and b/src/main/resources/content/textures/products/wood/beech_pieces.png differ diff --git a/src/main/resources/content/textures/products/wood/oak_boards.png b/src/main/resources/content/textures/products/wood/oak_boards.png index cfe1771..65a7ecf 100644 Binary files a/src/main/resources/content/textures/products/wood/oak_boards.png and b/src/main/resources/content/textures/products/wood/oak_boards.png differ diff --git a/src/main/resources/content/textures/products/wood/oak_pieces.png b/src/main/resources/content/textures/products/wood/oak_pieces.png index 6f091cc..a5bb3e5 100644 Binary files a/src/main/resources/content/textures/products/wood/oak_pieces.png and b/src/main/resources/content/textures/products/wood/oak_pieces.png differ diff --git a/src/main/resources/content/textures/products/wood/pine_boards.png b/src/main/resources/content/textures/products/wood/pine_boards.png index d982e91..c208fa9 100644 Binary files a/src/main/resources/content/textures/products/wood/pine_boards.png and b/src/main/resources/content/textures/products/wood/pine_boards.png differ diff --git a/src/main/resources/content/textures/products/wood/pine_pieces.png b/src/main/resources/content/textures/products/wood/pine_pieces.png index ab30503..65cf879 100644 Binary files a/src/main/resources/content/textures/products/wood/pine_pieces.png and b/src/main/resources/content/textures/products/wood/pine_pieces.png differ diff --git a/src/main/resources/content/textures/products/wood/wood-pieces.svg b/src/main/resources/content/textures/products/wood/wood-pieces.svg index 3125ede..9dcd979 100644 --- a/src/main/resources/content/textures/products/wood/wood-pieces.svg +++ b/src/main/resources/content/textures/products/wood/wood-pieces.svg @@ -8,258 +8,273 @@ 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" - inkscape:export-ydpi="95.999992" - inkscape:export-xdpi="95.999992" - inkscape:export-filename="D:\coding\java\what-a-storage\src\main\resources\content\textures\products\wood\beech_pieces.png" - inkscape:version="1.0 (4035a4fb49, 2020-05-01)" - sodipodi:docname="wood-pieces.svg" - id="svg8" - version="1.1" - viewBox="0 0 132.29166 132.29167" + width="500" height="500" - width="500"> + viewBox="0 0 132.29166 132.29167" + version="1.1" + id="svg8" + sodipodi:docname="wood-pieces.svg" + inkscape:version="1.0 (4035a4fb49, 2020-05-01)" + inkscape:export-filename="D:\coding\java\what-a-storage\src\main\resources\content\textures\products\wood\pine_pieces.png" + inkscape:export-xdpi="95.999992" + inkscape:export-ydpi="95.999992"> + xlink:href="#Strips1_1" + inkscape:collect="always" /> + width="2" + height="1" + patternTransform="translate(0,0) scale(10,10)" + id="Strips1_1" + inkscape:stockid="Stripes 1:1"> + y="-0.5" + width="1" + height="2" + id="rect1882" /> - + - + - - - - - - - - - - + is_visible="true" + lpeversion="1" + satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1" + unit="px" + method="auto" + mode="F" + radius="20" + chamfer_steps="1" + flexible="false" + use_knot_distance="true" + apply_no_radius="true" + apply_with_radius="true" + only_selected="false" + hide_knots="false" /> + id="rect2965" /> + + + + + + + + + + + x="-3e-05" + width="1.00006" + y="-3e-05" + height="1.00006"> + id="feGaussianBlur3421" /> + id="clipPath879-8" + clipPathUnits="userSpaceOnUse"> + id="path881-0" /> + id="clipPath887-0" + clipPathUnits="userSpaceOnUse"> + id="path889-2" /> + id="clipPath883-6" + clipPathUnits="userSpaceOnUse"> + id="path885-2" /> + id="filter4349" + x="-4.8067882e-06" + width="1.0000096" + y="-4.7932309e-06" + height="1.0000096"> + id="feGaussianBlur4351" /> + + inkscape:snap-bbox-midpoints="false" + inkscape:snap-nodes="true" + inkscape:snap-others="false" + inkscape:snap-global="false" + inkscape:bbox-paths="true" + inkscape:snap-smooth-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-bbox="true" + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.70710678" + inkscape:cx="-108.94692" + inkscape:cy="205.26113" + inkscape:document-units="mm" + inkscape:current-layer="g1814" + inkscape:document-rotation="0" + showgrid="false" + units="px" + inkscape:window-width="1920" + inkscape:window-height="1010" + inkscape:window-x="-7" + inkscape:window-y="-7" + inkscape:window-maximized="1" + showguides="true" + inkscape:lockguides="false" + inkscape:guide-bbox="true" + inkscape:snap-object-midpoints="true" + inkscape:snap-to-guides="true"> - + - + - + + id="guide1416" + inkscape:label="" + inkscape:locked="false" + inkscape:color="rgb(0,0,255)" /> + id="guide1418" /> + id="guide1420" /> + id="guide1422" /> + id="guide1424" /> @@ -269,594 +284,652 @@ image/svg+xml - + + inkscape:groupmode="layer" + sodipodi:insensitive="true"> - + + width="5.2916665" + height="104.51041" + x="26.722916" + y="1.3229215" + ry="1.9217798e-06" /> + + - - + + + + + + + + + + + + + + + + + + + + + + + + id="g4315" + inkscape:groupmode="layer"> - + height="106.62351" + width="5.2880826" + id="rect2842" + style="fill:#8c5d33;fill-opacity:1;stroke:#000000;stroke-width:1.06192;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" /> + - + width="105.99102" + height="18.520834" + x="0" + y="87.3125" + ry="1.3567623e-06" /> + + x="0" + height="18.520834" + width="105.99102" + id="rect879" + style="fill:#8c5d33;fill-opacity:1;stroke:#000000;stroke-width:1.05833;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" /> + - - - + + + cy="25.135418" + cx="103.1875" + id="ellipse78" + style="fill:#8c5d33;fill-opacity:1;stroke:#000000;stroke-width:1.05833;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" /> +