Browse Source

created new buttons for section C. redesigned button size

wes 4 years ago
parent
commit
5b4d2054f9

+ 12 - 12
Qwixx/frontend/inkScape/base.svg

@@ -25,10 +25,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.4"
-     inkscape:cx="225.7994"
-     inkscape:cy="119.41467"
+     inkscape:cx="225.79825"
+     inkscape:cy="105.92801"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer17"
+     inkscape:current-layer="layer16"
      inkscape:document-rotation="0"
      showgrid="false"
      borderlayer="false"
@@ -101,7 +101,7 @@
        inkscape:groupmode="layer"
        id="layer13"
        inkscape:label="createGame"
-       style="display:none"
+       style="display:inline"
        sodipodi:insensitive="true">
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\createGame.svg"
@@ -154,7 +154,7 @@
        id="layer16"
        inkscape:label="endGame"
        sodipodi:insensitive="true"
-       style="display:inline">
+       style="display:none">
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\endScreen.svg"
          xlink:href="endScreen.svg"
@@ -201,11 +201,12 @@
      inkscape:groupmode="layer"
      id="layer4"
      inkscape:label="c"
-     sodipodi:insensitive="true">
+     style="display:inline">
     <g
        inkscape:groupmode="layer"
        id="layer9"
-       inkscape:label="highlight 2">
+       inkscape:label="highlight 2"
+       style="display:inline">
       <rect
          style="fill:#ff6600;stroke-width:0.40715"
          id="rect17"
@@ -228,17 +229,16 @@
     <g
        inkscape:groupmode="layer"
        id="layer17"
-       inkscape:label="ctest"
-       sodipodi:insensitive="true">
+       inkscape:label="ctest">
       <image
          sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\sectionC\cButton.svg"
          xlink:href="sectionC/cButton.svg"
-         y="-1.335144e-05"
+         y="0"
          x="50"
-         id="image1214"
+         id="image1712"
          height="20.000013"
          width="100.00007"
-         inkscape:svg-dpi="96"
+         inkscape:svg-dpi="200"
          preserveAspectRatio="none" />
     </g>
   </g>

+ 102 - 43
Qwixx/frontend/inkScape/buttons/button.svg

@@ -14,11 +14,17 @@
    id="svg8"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    sodipodi:docname="button.svg"
-   inkscape:export-filename="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\yellowOptions.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
+   inkscape:export-filename="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\greenNewGame.png"
+   inkscape:export-xdpi="200"
+   inkscape:export-ydpi="200">
   <defs
      id="defs2">
+    <rect
+       x="4.3556932"
+       y="-2.2585076"
+       width="29.844564"
+       height="22.746398"
+       id="rect970" />
     <inkscape:path-effect
        effect="powerclip"
        id="path-effect957"
@@ -232,11 +238,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.4601423"
-     inkscape:cx="59.729456"
-     inkscape:cy="92.946412"
+     inkscape:zoom="4.9202846"
+     inkscape:cx="58.458432"
+     inkscape:cy="19.167374"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer9"
+     inkscape:current-layer="layer1"
      inkscape:document-rotation="0"
      showgrid="false"
      inkscape:pagecheckerboard="true"
@@ -262,22 +268,23 @@
      inkscape:groupmode="layer"
      id="layer10"
      inkscape:label="MAIN"
-     sodipodi:insensitive="true"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="display:inline;opacity:1;fill:#ff00ff;fill-opacity:1;stroke-width:1.11767;stroke-miterlimit:4;stroke-dasharray:none"
        id="rect8612-9"
        width="31.702999"
        height="14.647"
-       x="42.010525"
-       y="-16.164892"
+       x="6.5734653"
+       y="-18.853592"
        ry="1.1462885" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer8"
      inkscape:label="colors"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <g
        inkscape:groupmode="layer"
        id="layer9"
@@ -285,42 +292,43 @@
        style="display:none"
        sodipodi:insensitive="true">
       <rect
-         style="opacity:1;fill:#70c1b3;fill-opacity:1;stroke-width:1.11767;stroke-miterlimit:4;stroke-dasharray:none"
+         style="opacity:1;fill:#70c1b3;fill-opacity:1;stroke-width:1.1884;stroke-miterlimit:4;stroke-dasharray:none"
          id="rect8612"
-         width="31.702999"
-         height="14.647"
-         x="7.3828988"
+         width="34.999725"
+         height="14.999566"
+         x="7.3829246"
          y="5.6141505"
-         ry="1.1462885" />
+         ry="1.1738807" />
     </g>
     <g
        inkscape:groupmode="layer"
        id="layer12"
        inkscape:label="yellow"
+       style="display:inline"
        sodipodi:insensitive="true">
       <rect
-         style="display:inline;opacity:1;fill:#ffe066;fill-opacity:1;stroke-width:1.11767;stroke-miterlimit:4;stroke-dasharray:none"
+         style="display:inline;opacity:1;fill:#ffe066;fill-opacity:1;stroke-width:1.1884;stroke-miterlimit:4;stroke-dasharray:none"
          id="rect8612-2"
-         width="31.702999"
-         height="14.647"
-         x="7.3828988"
-         y="5.6145725"
-         ry="1.1462885" />
+         width="34.999725"
+         height="14.999566"
+         x="7.3829246"
+         y="5.6145825"
+         ry="1.1738807" />
     </g>
     <g
        inkscape:groupmode="layer"
        id="layer11"
        inkscape:label="red"
-       sodipodi:insensitive="true"
-       style="display:none">
+       style="display:none"
+       sodipodi:insensitive="true">
       <rect
-         style="display:inline;opacity:1;fill:#f25f5c;fill-opacity:1;stroke-width:1.11767;stroke-miterlimit:4;stroke-dasharray:none"
+         style="display:inline;opacity:1;fill:#f25f5c;fill-opacity:1;stroke-width:1.1884;stroke-miterlimit:4;stroke-dasharray:none"
          id="rect8612-9-8"
-         width="31.702999"
-         height="14.647"
+         width="34.999725"
+         height="14.999566"
          x="7.3826494"
-         y="5.6141496"
-         ry="1.1462885" />
+         y="5.6141491"
+         ry="1.1738807" />
     </g>
   </g>
   <g
@@ -331,15 +339,16 @@
        inkscape:groupmode="layer"
        id="layer5"
        inkscape:label="join"
-       style="display:none">
+       style="display:none"
+       sodipodi:insensitive="true">
       <text
          xml:space="preserve"
          style="font-size:7.581px;line-height:1.25;font-family:'Javanese Text';-inkscape-font-specification:'Javanese Text';text-align:center;text-anchor:middle;display:inline;stroke-width:0.189525"
-         x="22.425478"
+         x="24.253794"
          y="15.640176"
          id="text8604-4-4"><tspan
            sodipodi:role="line"
-           x="22.425478"
+           x="24.253794"
            y="15.640176"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.189525"
            id="tspan948">Join</tspan></text>
@@ -353,15 +362,66 @@
       <text
          xml:space="preserve"
          style="font-size:7.581px;line-height:1.25;font-family:'Javanese Text';-inkscape-font-specification:'Javanese Text';text-align:center;text-anchor:middle;display:inline;stroke-width:0.189525"
-         x="22.905857"
+         x="24.41153"
          y="15.443126"
          id="text8604-4-8"><tspan
            sodipodi:role="line"
            id="tspan8602-9-5"
-           x="22.905857"
+           x="24.41153"
            y="15.443126"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.189525">Options</tspan></text>
     </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer13"
+       inkscape:label="new game"
+       style="display:none"
+       sodipodi:insensitive="true">
+      <text
+         xml:space="preserve"
+         style="font-size:7.581px;line-height:1.25;font-family:'Javanese Text';-inkscape-font-specification:'Javanese Text';text-align:center;text-anchor:middle;display:inline;stroke-width:0.189525"
+         x="24.680996"
+         y="12.256872"
+         id="text8604-4-8-6"><tspan
+           sodipodi:role="line"
+           id="tspan8602-9-5-0"
+           x="24.680996"
+           y="12.256872"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.189525">New</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:7.581px;line-height:1.25;font-family:'Javanese Text';-inkscape-font-specification:'Javanese Text';text-align:center;text-anchor:middle;display:inline;stroke-width:0.189525"
+         x="24.182913"
+         y="18.248447"
+         id="text8604-4-8-6-9"><tspan
+           sodipodi:role="line"
+           id="tspan8602-9-5-0-0"
+           x="24.182913"
+           y="18.248447"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.189525">Game</tspan></text>
+    </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer14"
+       inkscape:label="rematch"
+       style="display:none"
+       sodipodi:insensitive="true">
+      <text
+         xml:space="preserve"
+         style="font-size:7.581px;line-height:1.25;font-family:'Javanese Text';-inkscape-font-specification:'Javanese Text';text-align:center;text-anchor:middle;display:inline;stroke-width:0.189525"
+         x="24.869595"
+         y="15.855246"
+         id="text8604-4-8-6-9-3"><tspan
+           sodipodi:role="line"
+           id="tspan8602-9-5-0-0-9"
+           x="24.869595"
+           y="15.855246"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.189525">Rematch</tspan></text>
+      <text
+         xml:space="preserve"
+         id="text968"
+         style="font-size:10.5833px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;white-space:pre;shape-inside:url(#rect970);" />
+    </g>
     <g
        inkscape:groupmode="layer"
        id="layer4"
@@ -371,12 +431,12 @@
       <text
          xml:space="preserve"
          style="font-size:7.58099px;line-height:1.25;font-family:'Javanese Text';-inkscape-font-specification:'Javanese Text';text-align:center;text-anchor:middle;stroke-width:0.189525"
-         x="23.276016"
+         x="25.104332"
          y="14.975505"
          id="text8604"><tspan
            sodipodi:role="line"
            id="tspan8602"
-           x="23.276016"
+           x="25.104332"
            y="14.975505"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.189525">Create</tspan></text>
     </g>
@@ -411,12 +471,12 @@
       <text
          xml:space="preserve"
          style="font-size:7.581px;line-height:1.25;font-family:'Javanese Text';-inkscape-font-specification:'Javanese Text';text-align:center;text-anchor:middle;display:inline;stroke-width:0.189525"
-         x="22.82378"
+         x="23.469069"
          y="15.443786"
          id="text8604-4"><tspan
            sodipodi:role="line"
            id="tspan8602-9"
-           x="22.82378"
+           x="23.469069"
            y="15.443786"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-align:center;text-anchor:middle;fill:#000000;stroke-width:0.189525">Exit</tspan></text>
     </g>
@@ -425,8 +485,7 @@
      inkscape:label="glassLayer"
      inkscape:groupmode="layer"
      id="layer1"
-     style="display:inline"
-     sodipodi:insensitive="true">
+     style="display:inline">
     <path
        style="display:inline;opacity:0.45;fill:#ffffff;fill-opacity:1;stroke-width:1"
        id="rect833-6"
@@ -437,7 +496,7 @@
        clip-path="url(#clipPath8423-4)"
        sodipodi:type="rect"
        d="M 7.4650294,6.0476193 H 37.466888 c 0.471147,0 0.850446,0.3792991 0.850446,0.8504464 V 19.84375 c 0,0.471147 -0.379299,0.850446 -0.850446,0.850446 H 7.4650294 c -0.4711473,0 -0.8504464,-0.379299 -0.8504464,-0.850446 V 6.8980657 c 0,-0.4711473 0.3792991,-0.8504464 0.8504464,-0.8504464 z"
-       transform="translate(0.76831726,-0.43304692)"
+       transform="matrix(1.1040051,0,0,1.0241301,0.08039117,-0.57896646)"
        mask="url(#mask8544)"
        ry="0.8504464" />
   </g>
@@ -456,7 +515,7 @@
        y="-9.4406357"
        clip-path="url(#clipPath953)"
        mask="url(#mask8271)"
-       transform="matrix(1.0277616,0,0,1.0277832,-9.3241953,15.317074)"
+       transform="matrix(1.1346452,0,0,1.0525532,-11.061674,15.550919)"
        sodipodi:type="rect"
        ry="0.87342685"
        inkscape:path-effect="#path-effect957"

BIN
Qwixx/frontend/inkScape/buttons/greenNewGame.png


BIN
Qwixx/frontend/inkScape/buttons/yellowPlayAgain.png


BIN
Qwixx/frontend/inkScape/sectionC/cButton.png


+ 62 - 36
Qwixx/frontend/inkScape/sectionC/cButton.svg

@@ -14,7 +14,10 @@
    version="1.1"
    id="svg8"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
-   sodipodi:docname="cButton.svg">
+   sodipodi:docname="cButton.svg"
+   inkscape:export-filename="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\sectionC\cButton.png"
+   inkscape:export-xdpi="200"
+   inkscape:export-ydpi="200">
   <defs
      id="defs2">
     <linearGradient
@@ -48,10 +51,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.979899"
-     inkscape:cx="121.90512"
-     inkscape:cy="10.058372"
+     inkscape:cx="59.246451"
+     inkscape:cy="14.501323"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g864"
      inkscape:document-rotation="0"
      showgrid="false"
      inkscape:pagecheckerboard="true"
@@ -73,7 +76,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -114,60 +117,83 @@
     </g>
   </g>
   <g
-     inkscape:label="buttonLayout1"
+     inkscape:label="mainScreen"
      inkscape:groupmode="layer"
      id="layer1"
-     style="display:inline"
+     style="display:none"
      sodipodi:insensitive="true">
     <image
        sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\greenCreate.png"
        xlink:href="../buttons/greenCreate.png"
-       transform="matrix(0.96592583,-0.25881905,0,1,0,0)"
-       y="6.5474601"
-       x="8.2822094"
-       id="image909"
-       preserveAspectRatio="none"
+       width="14.117456"
        height="6.2500238"
-       width="14.117456" />
+       preserveAspectRatio="none"
+       id="image909"
+       x="8.2822094"
+       y="6.5474601"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)" />
     <image
        sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\greenJoin.png"
        xlink:href="../buttons/greenJoin.png"
-       transform="matrix(0.96592583,-0.25881905,0,1,0,0)"
-       y="14.914148"
-       x="8.2822094"
-       id="image923"
-       preserveAspectRatio="none"
+       width="14.117456"
        height="6.2500238"
-       width="14.117456" />
+       preserveAspectRatio="none"
+       id="image923"
+       x="8.2822094"
+       y="14.914148"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)" />
     <image
        sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\redExit.png"
        xlink:href="../buttons/redExit.png"
-       transform="matrix(0.96592583,-0.25881905,0,1,0,0)"
-       y="34.303997"
-       x="82.822098"
-       id="image937"
-       preserveAspectRatio="none"
+       width="13.979107"
        height="6.1887741"
-       width="13.979107" />
+       preserveAspectRatio="none"
+       id="image937"
+       x="82.822098"
+       y="34.303997"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)" />
     <image
        sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\yellowOptions.png"
        xlink:href="../buttons/yellowOptions.png"
-       transform="matrix(0.96592583,-0.25881905,0,1,0,0)"
-       y="23.505341"
-       x="79.085068"
-       id="image931"
-       preserveAspectRatio="none"
+       width="22.998825"
        height="11.107579"
-       width="22.998825" />
+       preserveAspectRatio="none"
+       id="image931"
+       x="79.085068"
+       y="23.505341"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)" />
   </g>
   <g
+     inkscape:label="endScreen"
      inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="buttonLayout2"
+     id="g864"
+     style="display:inline"
      sodipodi:insensitive="true" />
   <g
+     inkscape:label="createScreen"
      inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="buttonLayout3"
-     sodipodi:insensitive="true" />
+     id="g854"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <image
+       sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\greenCreate.png"
+       xlink:href="../buttons/greenCreate.png"
+       width="14.117456"
+       height="6.2500238"
+       preserveAspectRatio="none"
+       id="image846"
+       x="8.2822094"
+       y="6.5474601"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)" />
+    <image
+       sodipodi:absref="C:\Users\bad-p\Desktop\Work Folder\VS CODE\Qwixx\frontend\inkScape\buttons\redExit.png"
+       xlink:href="../buttons/redExit.png"
+       width="13.979107"
+       height="6.1887741"
+       preserveAspectRatio="none"
+       id="image850"
+       x="82.822098"
+       y="34.303997"
+       transform="matrix(0.96592583,-0.25881905,0,1,0,0)" />
+  </g>
 </svg>

+ 0 - 10
Qwixx/frontend/inkScape/sectionDecoration/toDo.txt

@@ -1,10 +0,0 @@
-## Colors
-1. fix it
-2. fix it
-3. mesh gradient
-4. mask it
-5. how to?
-
-change the color of the outter perimeter of the dice's gradient (gradient is set, mask it with desired color)
-
-create some colored die pngs - use them in decoration. 15oct20

+ 15 - 0
Qwixx/frontend/inkScape/toDo.txt

@@ -0,0 +1,15 @@
+## Colors
+1. fix it
+2. fix it
+3. mesh gradient
+4. mask it
+5. how to?
+
+change the color of the outter perimeter of the dice's gradient (gradient is set, mask it with desired color)
+
+create some colored die pngs - use them in decoration. 15oct20
+
+## Buttons
+1. 20OCT20 fix scaling on buttons and positioning of text
+2. create skewed version of button (layers: border, glasslayer and colors)
+3. use new buttons for the different button layouts in section C for each screen of the game