mirror of
https://github.com/minetest/minetest.git
synced 2024-12-23 06:32:23 +01:00
Use "Aux1" key name consistently everywhere
This commit is contained in:
Wuzzy
GitHub
parent
02d64a51ee
commit
827224635b
@ -68,7 +68,7 @@ Some can be changed in the key config dialog in the settings tab.
|
|||||||
| P | Enable/disable pitch move mode |
|
| P | Enable/disable pitch move mode |
|
||||||
| J | Enable/disable fast mode (needs fast privilege) |
|
| J | Enable/disable fast mode (needs fast privilege) |
|
||||||
| H | Enable/disable noclip mode (needs noclip privilege) |
|
| H | Enable/disable noclip mode (needs noclip privilege) |
|
||||||
| E | Move fast in fast mode |
|
| E | Aux1 (Move fast in fast mode. Games may add special features) |
|
||||||
| C | Cycle through camera modes |
|
| C | Cycle through camera modes |
|
||||||
| V | Cycle through minimap modes |
|
| V | Cycle through minimap modes |
|
||||||
| Shift + V | Change minimap orientation |
|
| Shift + V | Change minimap orientation |
|
||||||
|
|||||||
143
build/android/icons/aux1_btn.svg
Normal file
143
build/android/icons/aux1_btn.svg
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
inkscape:export-ydpi="24.000002"
|
||||||
|
inkscape:export-xdpi="24.000002"
|
||||||
|
inkscape:export-filename="/home/stu/Desktop/icons/png/aux_btn.png"
|
||||||
|
sodipodi:docname="aux_btn.svg"
|
||||||
|
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
|
||||||
|
id="svg8"
|
||||||
|
version="1.1"
|
||||||
|
viewBox="0 0 135.46666 135.46667"
|
||||||
|
height="512"
|
||||||
|
width="512">
|
||||||
|
<defs
|
||||||
|
id="defs2" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
inkscape:document-rotation="0"
|
||||||
|
inkscape:snap-bbox-midpoints="true"
|
||||||
|
inkscape:snap-others="true"
|
||||||
|
inkscape:snap-object-midpoints="false"
|
||||||
|
inkscape:snap-to-guides="true"
|
||||||
|
inkscape:snap-bbox="true"
|
||||||
|
showguides="true"
|
||||||
|
inkscape:snap-page="true"
|
||||||
|
inkscape:snap-grids="false"
|
||||||
|
inkscape:pagecheckerboard="false"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:window-y="31"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-height="1024"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
units="px"
|
||||||
|
showgrid="true"
|
||||||
|
inkscape:current-layer="layer2"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:cy="212.91276"
|
||||||
|
inkscape:cx="201.43176"
|
||||||
|
inkscape:zoom="1.4633894"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
borderopacity="1.0"
|
||||||
|
bordercolor="#666666"
|
||||||
|
pagecolor="#404040"
|
||||||
|
id="base">
|
||||||
|
<inkscape:grid
|
||||||
|
empopacity="0.25098039"
|
||||||
|
empcolor="#40ff40"
|
||||||
|
opacity="0.1254902"
|
||||||
|
color="#40ff40"
|
||||||
|
empspacing="4"
|
||||||
|
spacingy="0.26458333"
|
||||||
|
spacingx="0.26458333"
|
||||||
|
id="grid16"
|
||||||
|
type="xygrid" />
|
||||||
|
</sodipodi:namedview>
|
||||||
|
<metadata
|
||||||
|
id="metadata5">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title />
|
||||||
|
<cc:license
|
||||||
|
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
|
||||||
|
</cc:Work>
|
||||||
|
<cc:License
|
||||||
|
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
|
||||||
|
<cc:permits
|
||||||
|
rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
||||||
|
<cc:permits
|
||||||
|
rdf:resource="http://creativecommons.org/ns#Distribution" />
|
||||||
|
<cc:requires
|
||||||
|
rdf:resource="http://creativecommons.org/ns#Notice" />
|
||||||
|
<cc:requires
|
||||||
|
rdf:resource="http://creativecommons.org/ns#Attribution" />
|
||||||
|
<cc:permits
|
||||||
|
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
||||||
|
<cc:requires
|
||||||
|
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
|
||||||
|
</cc:License>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
style="display:inline"
|
||||||
|
inkscape:label="Layer 2"
|
||||||
|
id="layer2"
|
||||||
|
inkscape:groupmode="layer">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path7055"
|
||||||
|
d=""
|
||||||
|
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path7035"
|
||||||
|
d=""
|
||||||
|
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path7005"
|
||||||
|
d=""
|
||||||
|
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path5127"
|
||||||
|
d=""
|
||||||
|
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<text
|
||||||
|
transform="scale(1.0078883,0.99217343)"
|
||||||
|
id="text4716"
|
||||||
|
y="85.59491"
|
||||||
|
x="67.78315"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.4785px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#d9d9d9;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
xml:space="preserve"><tspan
|
||||||
|
style="fill:#d9d9d9;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
y="85.59491"
|
||||||
|
x="67.78315"
|
||||||
|
id="tspan4714"
|
||||||
|
sodipodi:role="line">Aux1</tspan></text>
|
||||||
|
<flowRoot
|
||||||
|
transform="scale(0.26458333)"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="flowRoot4718"
|
||||||
|
xml:space="preserve"><flowRegion
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="flowRegion4720"><rect
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
y="124.10143"
|
||||||
|
x="264.65997"
|
||||||
|
height="136.37059"
|
||||||
|
width="157.5838"
|
||||||
|
id="rect4722" /></flowRegion><flowPara
|
||||||
|
id="flowPara4724" /></flowRoot>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 5.5 KiB |
@ -1,411 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|
||||||
|
|
||||||
<svg
|
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
width="512"
|
|
||||||
height="512"
|
|
||||||
viewBox="0 0 135.46666 135.46667"
|
|
||||||
version="1.1"
|
|
||||||
id="svg8"
|
|
||||||
inkscape:version="0.92.1 r15371"
|
|
||||||
sodipodi:docname="aux_btn.svg"
|
|
||||||
inkscape:export-filename="/home/stu/Desktop/icons/png/aux_btn.png"
|
|
||||||
inkscape:export-xdpi="24.000002"
|
|
||||||
inkscape:export-ydpi="24.000002">
|
|
||||||
<defs
|
|
||||||
id="defs2">
|
|
||||||
<filter
|
|
||||||
style="color-interpolation-filters:sRGB;"
|
|
||||||
inkscape:label="Colorize"
|
|
||||||
id="filter4628">
|
|
||||||
<feComposite
|
|
||||||
in2="SourceGraphic"
|
|
||||||
operator="arithmetic"
|
|
||||||
k1="0"
|
|
||||||
k2="1"
|
|
||||||
result="composite1"
|
|
||||||
id="feComposite4614" />
|
|
||||||
<feColorMatrix
|
|
||||||
in="composite1"
|
|
||||||
values="1"
|
|
||||||
type="saturate"
|
|
||||||
result="colormatrix1"
|
|
||||||
id="feColorMatrix4616" />
|
|
||||||
<feFlood
|
|
||||||
flood-opacity="1"
|
|
||||||
flood-color="rgb(158,0,0)"
|
|
||||||
result="flood1"
|
|
||||||
id="feFlood4618" />
|
|
||||||
<feBlend
|
|
||||||
in="flood1"
|
|
||||||
in2="colormatrix1"
|
|
||||||
mode="multiply"
|
|
||||||
result="blend1"
|
|
||||||
id="feBlend4620" />
|
|
||||||
<feBlend
|
|
||||||
in2="blend1"
|
|
||||||
mode="screen"
|
|
||||||
result="blend2"
|
|
||||||
id="feBlend4622" />
|
|
||||||
<feColorMatrix
|
|
||||||
in="blend2"
|
|
||||||
values="1"
|
|
||||||
type="saturate"
|
|
||||||
result="colormatrix2"
|
|
||||||
id="feColorMatrix4624" />
|
|
||||||
<feComposite
|
|
||||||
in="colormatrix2"
|
|
||||||
in2="SourceGraphic"
|
|
||||||
operator="in"
|
|
||||||
k2="1"
|
|
||||||
result="composite2"
|
|
||||||
id="feComposite4626" />
|
|
||||||
</filter>
|
|
||||||
<filter
|
|
||||||
style="color-interpolation-filters:sRGB;"
|
|
||||||
inkscape:label="Sharpen More"
|
|
||||||
id="filter5109"
|
|
||||||
inkscape:menu="Image Effects"
|
|
||||||
inkscape:menu-tooltip="Sharpen edges and boundaries within the object, force=0.3">
|
|
||||||
<feComposite
|
|
||||||
in2="SourceGraphic"
|
|
||||||
operator="arithmetic"
|
|
||||||
k1="0"
|
|
||||||
k2="1"
|
|
||||||
result="composite1"
|
|
||||||
id="feComposite5095" />
|
|
||||||
<feColorMatrix
|
|
||||||
in="composite1"
|
|
||||||
values="1"
|
|
||||||
type="saturate"
|
|
||||||
result="colormatrix1"
|
|
||||||
id="feColorMatrix5097" />
|
|
||||||
<feFlood
|
|
||||||
flood-opacity="1"
|
|
||||||
flood-color="rgb(158,67,0)"
|
|
||||||
result="flood1"
|
|
||||||
id="feFlood5099" />
|
|
||||||
<feBlend
|
|
||||||
in="flood1"
|
|
||||||
in2="colormatrix1"
|
|
||||||
mode="multiply"
|
|
||||||
result="blend1"
|
|
||||||
id="feBlend5101" />
|
|
||||||
<feBlend
|
|
||||||
in2="blend1"
|
|
||||||
mode="screen"
|
|
||||||
result="blend2"
|
|
||||||
id="feBlend5103" />
|
|
||||||
<feColorMatrix
|
|
||||||
in="blend2"
|
|
||||||
values="1"
|
|
||||||
type="saturate"
|
|
||||||
result="colormatrix2"
|
|
||||||
id="feColorMatrix5105" />
|
|
||||||
<feComposite
|
|
||||||
in="colormatrix2"
|
|
||||||
in2="SourceGraphic"
|
|
||||||
operator="in"
|
|
||||||
k2="1"
|
|
||||||
result="fbSourceGraphic"
|
|
||||||
id="feComposite5107" />
|
|
||||||
<feColorMatrix
|
|
||||||
result="fbSourceGraphicAlpha"
|
|
||||||
in="fbSourceGraphic"
|
|
||||||
values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
|
|
||||||
id="feColorMatrix5111" />
|
|
||||||
<feComposite
|
|
||||||
in2="fbSourceGraphic"
|
|
||||||
id="feComposite5113"
|
|
||||||
operator="arithmetic"
|
|
||||||
k1="0"
|
|
||||||
k2="1"
|
|
||||||
result="composite1"
|
|
||||||
in="fbSourceGraphic" />
|
|
||||||
<feColorMatrix
|
|
||||||
id="feColorMatrix5115"
|
|
||||||
in="composite1"
|
|
||||||
values="1"
|
|
||||||
type="saturate"
|
|
||||||
result="colormatrix1" />
|
|
||||||
<feFlood
|
|
||||||
id="feFlood5117"
|
|
||||||
flood-opacity="1"
|
|
||||||
flood-color="rgb(158,0,0)"
|
|
||||||
result="flood1" />
|
|
||||||
<feBlend
|
|
||||||
in2="colormatrix1"
|
|
||||||
id="feBlend5119"
|
|
||||||
in="flood1"
|
|
||||||
mode="multiply"
|
|
||||||
result="blend1" />
|
|
||||||
<feBlend
|
|
||||||
in2="blend1"
|
|
||||||
id="feBlend5121"
|
|
||||||
mode="screen"
|
|
||||||
result="blend2" />
|
|
||||||
<feColorMatrix
|
|
||||||
id="feColorMatrix5123"
|
|
||||||
in="blend2"
|
|
||||||
values="1"
|
|
||||||
type="saturate"
|
|
||||||
result="colormatrix2" />
|
|
||||||
<feComposite
|
|
||||||
in2="fbSourceGraphic"
|
|
||||||
id="feComposite5125"
|
|
||||||
in="colormatrix2"
|
|
||||||
operator="in"
|
|
||||||
k2="1"
|
|
||||||
result="fbSourceGraphic" />
|
|
||||||
<feColorMatrix
|
|
||||||
result="fbSourceGraphicAlpha"
|
|
||||||
in="fbSourceGraphic"
|
|
||||||
values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
|
|
||||||
id="feColorMatrix7007" />
|
|
||||||
<feConvolveMatrix
|
|
||||||
id="feConvolveMatrix7009"
|
|
||||||
order="3 3"
|
|
||||||
kernelMatrix="0 -0.15 0 -0.15 1.6 -0.15 0 -0.15 0"
|
|
||||||
divisor="1"
|
|
||||||
in="fbSourceGraphic"
|
|
||||||
targetX="1"
|
|
||||||
targetY="1"
|
|
||||||
result="fbSourceGraphic" />
|
|
||||||
<feColorMatrix
|
|
||||||
result="fbSourceGraphicAlpha"
|
|
||||||
in="fbSourceGraphic"
|
|
||||||
values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
|
|
||||||
id="feColorMatrix7011" />
|
|
||||||
<feConvolveMatrix
|
|
||||||
id="feConvolveMatrix7013"
|
|
||||||
targetY="1"
|
|
||||||
targetX="1"
|
|
||||||
in="fbSourceGraphic"
|
|
||||||
divisor="1"
|
|
||||||
kernelMatrix="0 -0.3 0 -0.3 2.2 -0.3 0 -0.3 0"
|
|
||||||
order="3 3"
|
|
||||||
result="result1" />
|
|
||||||
<feBlend
|
|
||||||
in2="fbSourceGraphic"
|
|
||||||
id="feBlend7015"
|
|
||||||
mode="normal"
|
|
||||||
result="result2" />
|
|
||||||
</filter>
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
refY="0.0"
|
|
||||||
refX="0.0"
|
|
||||||
orient="auto"
|
|
||||||
id="DistanceX">
|
|
||||||
<path
|
|
||||||
id="path7410"
|
|
||||||
style="stroke:#000000; stroke-width:0.5"
|
|
||||||
d="M 3,-3 L -3,3 M 0,-5 L 0,5" />
|
|
||||||
</marker>
|
|
||||||
<pattern
|
|
||||||
y="0"
|
|
||||||
x="0"
|
|
||||||
width="8"
|
|
||||||
patternUnits="userSpaceOnUse"
|
|
||||||
id="Hatch"
|
|
||||||
height="8">
|
|
||||||
<path
|
|
||||||
id="path7413"
|
|
||||||
stroke-width="0.25"
|
|
||||||
stroke="#000000"
|
|
||||||
linecap="square"
|
|
||||||
d="M8 4 l-4,4" />
|
|
||||||
<path
|
|
||||||
id="path7415"
|
|
||||||
stroke-width="0.25"
|
|
||||||
stroke="#000000"
|
|
||||||
linecap="square"
|
|
||||||
d="M6 2 l-4,4" />
|
|
||||||
<path
|
|
||||||
id="path7417"
|
|
||||||
stroke-width="0.25"
|
|
||||||
stroke="#000000"
|
|
||||||
linecap="square"
|
|
||||||
d="M4 0 l-4,4" />
|
|
||||||
</pattern>
|
|
||||||
<symbol
|
|
||||||
id="*Model_Space" />
|
|
||||||
<symbol
|
|
||||||
id="*Paper_Space" />
|
|
||||||
<symbol
|
|
||||||
id="*Paper_Space0" />
|
|
||||||
<filter
|
|
||||||
style="color-interpolation-filters:sRGB;"
|
|
||||||
inkscape:label="Colorize"
|
|
||||||
id="filter4883">
|
|
||||||
<feComposite
|
|
||||||
in2="SourceGraphic"
|
|
||||||
operator="arithmetic"
|
|
||||||
k1="0"
|
|
||||||
k2="1"
|
|
||||||
result="composite1"
|
|
||||||
id="feComposite4869" />
|
|
||||||
<feColorMatrix
|
|
||||||
in="composite1"
|
|
||||||
values="1"
|
|
||||||
type="saturate"
|
|
||||||
result="colormatrix1"
|
|
||||||
id="feColorMatrix4871" />
|
|
||||||
<feFlood
|
|
||||||
flood-opacity="1"
|
|
||||||
flood-color="rgb(158,21,0)"
|
|
||||||
result="flood1"
|
|
||||||
id="feFlood4873" />
|
|
||||||
<feBlend
|
|
||||||
in="flood1"
|
|
||||||
in2="colormatrix1"
|
|
||||||
mode="multiply"
|
|
||||||
result="blend1"
|
|
||||||
id="feBlend4875" />
|
|
||||||
<feBlend
|
|
||||||
in2="blend1"
|
|
||||||
mode="screen"
|
|
||||||
result="blend2"
|
|
||||||
id="feBlend4877" />
|
|
||||||
<feColorMatrix
|
|
||||||
in="blend2"
|
|
||||||
values="1"
|
|
||||||
type="saturate"
|
|
||||||
result="colormatrix2"
|
|
||||||
id="feColorMatrix4879" />
|
|
||||||
<feComposite
|
|
||||||
in="colormatrix2"
|
|
||||||
in2="SourceGraphic"
|
|
||||||
operator="in"
|
|
||||||
k2="1"
|
|
||||||
result="composite2"
|
|
||||||
id="feComposite4881" />
|
|
||||||
</filter>
|
|
||||||
</defs>
|
|
||||||
<sodipodi:namedview
|
|
||||||
id="base"
|
|
||||||
pagecolor="#404040"
|
|
||||||
bordercolor="#666666"
|
|
||||||
borderopacity="1.0"
|
|
||||||
inkscape:pageopacity="0"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:zoom="0.98994949"
|
|
||||||
inkscape:cx="-341.34157"
|
|
||||||
inkscape:cy="210.02973"
|
|
||||||
inkscape:document-units="mm"
|
|
||||||
inkscape:current-layer="layer2"
|
|
||||||
showgrid="true"
|
|
||||||
units="px"
|
|
||||||
inkscape:window-width="1920"
|
|
||||||
inkscape:window-height="1023"
|
|
||||||
inkscape:window-x="0"
|
|
||||||
inkscape:window-y="34"
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:pagecheckerboard="false"
|
|
||||||
inkscape:snap-grids="false"
|
|
||||||
inkscape:snap-page="true"
|
|
||||||
showguides="true"
|
|
||||||
inkscape:snap-bbox="true"
|
|
||||||
inkscape:snap-to-guides="true"
|
|
||||||
inkscape:snap-object-midpoints="false"
|
|
||||||
inkscape:snap-others="true"
|
|
||||||
inkscape:snap-bbox-midpoints="true">
|
|
||||||
<inkscape:grid
|
|
||||||
type="xygrid"
|
|
||||||
id="grid16"
|
|
||||||
spacingx="0.26458333"
|
|
||||||
spacingy="0.26458333"
|
|
||||||
empspacing="4"
|
|
||||||
color="#40ff40"
|
|
||||||
opacity="0.1254902"
|
|
||||||
empcolor="#40ff40"
|
|
||||||
empopacity="0.25098039" />
|
|
||||||
</sodipodi:namedview>
|
|
||||||
<metadata
|
|
||||||
id="metadata5">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>image/svg+xml</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
<dc:title></dc:title>
|
|
||||||
<cc:license
|
|
||||||
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
|
|
||||||
</cc:Work>
|
|
||||||
<cc:License
|
|
||||||
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
|
|
||||||
<cc:permits
|
|
||||||
rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
|
||||||
<cc:permits
|
|
||||||
rdf:resource="http://creativecommons.org/ns#Distribution" />
|
|
||||||
<cc:requires
|
|
||||||
rdf:resource="http://creativecommons.org/ns#Notice" />
|
|
||||||
<cc:requires
|
|
||||||
rdf:resource="http://creativecommons.org/ns#Attribution" />
|
|
||||||
<cc:permits
|
|
||||||
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
|
||||||
<cc:requires
|
|
||||||
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
|
|
||||||
</cc:License>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<g
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer2"
|
|
||||||
inkscape:label="Layer 2"
|
|
||||||
style="display:inline">
|
|
||||||
<path
|
|
||||||
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d=""
|
|
||||||
id="path7055"
|
|
||||||
inkscape:connector-curvature="0" />
|
|
||||||
<path
|
|
||||||
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d=""
|
|
||||||
id="path7035"
|
|
||||||
inkscape:connector-curvature="0" />
|
|
||||||
<path
|
|
||||||
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d=""
|
|
||||||
id="path7005"
|
|
||||||
inkscape:connector-curvature="0" />
|
|
||||||
<path
|
|
||||||
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d=""
|
|
||||||
id="path5127"
|
|
||||||
inkscape:connector-curvature="0" />
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.47851181px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#d9d9d9;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
x="67.78315"
|
|
||||||
y="85.59491"
|
|
||||||
id="text4716"
|
|
||||||
transform="scale(1.0078883,0.99217343)"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan4714"
|
|
||||||
x="67.78315"
|
|
||||||
y="85.59491"
|
|
||||||
style="fill:#d9d9d9;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">AUX</tspan></text>
|
|
||||||
<flowRoot
|
|
||||||
xml:space="preserve"
|
|
||||||
id="flowRoot4718"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
|
||||||
transform="scale(0.26458333)"><flowRegion
|
|
||||||
id="flowRegion4720"
|
|
||||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"><rect
|
|
||||||
id="rect4722"
|
|
||||||
width="157.5838"
|
|
||||||
height="136.37059"
|
|
||||||
x="264.65997"
|
|
||||||
y="124.10143"
|
|
||||||
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" /></flowRegion><flowPara
|
|
||||||
id="flowPara4724" /></flowRoot> </g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 12 KiB |
@ -75,7 +75,7 @@ free_move (Flying) bool false
|
|||||||
# If enabled, makes move directions relative to the player's pitch when flying or swimming.
|
# If enabled, makes move directions relative to the player's pitch when flying or swimming.
|
||||||
pitch_move (Pitch move mode) bool false
|
pitch_move (Pitch move mode) bool false
|
||||||
|
|
||||||
# Fast movement (via the "special" key).
|
# Fast movement (via the "Aux1" key).
|
||||||
# This requires the "fast" privilege on the server.
|
# This requires the "fast" privilege on the server.
|
||||||
fast_move (Fast movement) bool false
|
fast_move (Fast movement) bool false
|
||||||
|
|
||||||
@ -99,14 +99,14 @@ invert_mouse (Invert mouse) bool false
|
|||||||
# Mouse sensitivity multiplier.
|
# Mouse sensitivity multiplier.
|
||||||
mouse_sensitivity (Mouse sensitivity) float 0.2
|
mouse_sensitivity (Mouse sensitivity) float 0.2
|
||||||
|
|
||||||
# If enabled, "special" key instead of "sneak" key is used for climbing down and
|
# If enabled, "Aux1" key instead of "Sneak" key is used for climbing down and
|
||||||
# descending.
|
# descending.
|
||||||
aux1_descends (Special key for climbing/descending) bool false
|
aux1_descends (Aux1 key for climbing/descending) bool false
|
||||||
|
|
||||||
# Double-tapping the jump key toggles fly mode.
|
# Double-tapping the jump key toggles fly mode.
|
||||||
doubletap_jump (Double tap jump for fly) bool false
|
doubletap_jump (Double tap jump for fly) bool false
|
||||||
|
|
||||||
# If disabled, "special" key is used to fly fast if both fly and fast mode are
|
# If disabled, "Aux1" key is used to fly fast if both fly and fast mode are
|
||||||
# enabled.
|
# enabled.
|
||||||
always_fly_fast (Always fly and fast) bool true
|
always_fly_fast (Always fly and fast) bool true
|
||||||
|
|
||||||
@ -135,9 +135,9 @@ touchscreen_threshold (Touch screen threshold) int 20 0 100
|
|||||||
# If disabled, virtual joystick will center to first-touch's position.
|
# If disabled, virtual joystick will center to first-touch's position.
|
||||||
fixed_virtual_joystick (Fixed virtual joystick) bool false
|
fixed_virtual_joystick (Fixed virtual joystick) bool false
|
||||||
|
|
||||||
# (Android) Use virtual joystick to trigger "aux" button.
|
# (Android) Use virtual joystick to trigger "Aux1" button.
|
||||||
# If enabled, virtual joystick will also tap "aux" button when out of main circle.
|
# If enabled, virtual joystick will also tap "Aux1" button when out of main circle.
|
||||||
virtual_joystick_triggers_aux (Virtual joystick triggers aux button) bool false
|
virtual_joystick_triggers_aux1 (Virtual joystick triggers Aux1 button) bool false
|
||||||
|
|
||||||
# Enable joysticks
|
# Enable joysticks
|
||||||
enable_joysticks (Enable joysticks) bool false
|
enable_joysticks (Enable joysticks) bool false
|
||||||
@ -199,7 +199,7 @@ keymap_inventory (Inventory key) key KEY_KEY_I
|
|||||||
|
|
||||||
# Key for moving fast in fast mode.
|
# Key for moving fast in fast mode.
|
||||||
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
||||||
keymap_special1 (Special key) key KEY_KEY_E
|
keymap_aux1 (Aux1 key) key KEY_KEY_E
|
||||||
|
|
||||||
# Key for opening the chat window.
|
# Key for opening the chat window.
|
||||||
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
||||||
|
|||||||
@ -2415,7 +2415,7 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
|
|||||||
input->isKeyDown(KeyType::LEFT),
|
input->isKeyDown(KeyType::LEFT),
|
||||||
input->isKeyDown(KeyType::RIGHT),
|
input->isKeyDown(KeyType::RIGHT),
|
||||||
isKeyDown(KeyType::JUMP),
|
isKeyDown(KeyType::JUMP),
|
||||||
isKeyDown(KeyType::SPECIAL1),
|
isKeyDown(KeyType::AUX1),
|
||||||
isKeyDown(KeyType::SNEAK),
|
isKeyDown(KeyType::SNEAK),
|
||||||
isKeyDown(KeyType::ZOOM),
|
isKeyDown(KeyType::ZOOM),
|
||||||
isKeyDown(KeyType::DIG),
|
isKeyDown(KeyType::DIG),
|
||||||
@ -2432,7 +2432,7 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
|
|||||||
( (u32)(isKeyDown(KeyType::LEFT) & 0x1) << 2) |
|
( (u32)(isKeyDown(KeyType::LEFT) & 0x1) << 2) |
|
||||||
( (u32)(isKeyDown(KeyType::RIGHT) & 0x1) << 3) |
|
( (u32)(isKeyDown(KeyType::RIGHT) & 0x1) << 3) |
|
||||||
( (u32)(isKeyDown(KeyType::JUMP) & 0x1) << 4) |
|
( (u32)(isKeyDown(KeyType::JUMP) & 0x1) << 4) |
|
||||||
( (u32)(isKeyDown(KeyType::SPECIAL1) & 0x1) << 5) |
|
( (u32)(isKeyDown(KeyType::AUX1) & 0x1) << 5) |
|
||||||
( (u32)(isKeyDown(KeyType::SNEAK) & 0x1) << 6) |
|
( (u32)(isKeyDown(KeyType::SNEAK) & 0x1) << 6) |
|
||||||
( (u32)(isKeyDown(KeyType::DIG) & 0x1) << 7) |
|
( (u32)(isKeyDown(KeyType::DIG) & 0x1) << 7) |
|
||||||
( (u32)(isKeyDown(KeyType::PLACE) & 0x1) << 8) |
|
( (u32)(isKeyDown(KeyType::PLACE) & 0x1) << 8) |
|
||||||
|
|||||||
@ -35,7 +35,7 @@ void KeyCache::populate()
|
|||||||
key[KeyType::LEFT] = getKeySetting("keymap_left");
|
key[KeyType::LEFT] = getKeySetting("keymap_left");
|
||||||
key[KeyType::RIGHT] = getKeySetting("keymap_right");
|
key[KeyType::RIGHT] = getKeySetting("keymap_right");
|
||||||
key[KeyType::JUMP] = getKeySetting("keymap_jump");
|
key[KeyType::JUMP] = getKeySetting("keymap_jump");
|
||||||
key[KeyType::SPECIAL1] = getKeySetting("keymap_special1");
|
key[KeyType::AUX1] = getKeySetting("keymap_aux1");
|
||||||
key[KeyType::SNEAK] = getKeySetting("keymap_sneak");
|
key[KeyType::SNEAK] = getKeySetting("keymap_sneak");
|
||||||
key[KeyType::DIG] = getKeySetting("keymap_dig");
|
key[KeyType::DIG] = getKeySetting("keymap_dig");
|
||||||
key[KeyType::PLACE] = getKeySetting("keymap_place");
|
key[KeyType::PLACE] = getKeySetting("keymap_place");
|
||||||
@ -219,7 +219,7 @@ void RandomInputHandler::step(float dtime)
|
|||||||
{
|
{
|
||||||
static RandomInputHandlerSimData rnd_data[] = {
|
static RandomInputHandlerSimData rnd_data[] = {
|
||||||
{ "keymap_jump", 0.0f, 40 },
|
{ "keymap_jump", 0.0f, 40 },
|
||||||
{ "keymap_special1", 0.0f, 40 },
|
{ "keymap_aux1", 0.0f, 40 },
|
||||||
{ "keymap_forward", 0.0f, 40 },
|
{ "keymap_forward", 0.0f, 40 },
|
||||||
{ "keymap_left", 0.0f, 40 },
|
{ "keymap_left", 0.0f, 40 },
|
||||||
{ "keymap_dig", 0.0f, 30 },
|
{ "keymap_dig", 0.0f, 30 },
|
||||||
|
|||||||
@ -79,7 +79,7 @@ JoystickLayout create_default_layout()
|
|||||||
|
|
||||||
// Accessible without any modifier pressed
|
// Accessible without any modifier pressed
|
||||||
JLO_B_PB(KeyType::JUMP, bm | 1 << 0, 1 << 0);
|
JLO_B_PB(KeyType::JUMP, bm | 1 << 0, 1 << 0);
|
||||||
JLO_B_PB(KeyType::SPECIAL1, bm | 1 << 1, 1 << 1);
|
JLO_B_PB(KeyType::AUX1, bm | 1 << 1, 1 << 1);
|
||||||
|
|
||||||
// Accessible with start button not pressed, but four pressed
|
// Accessible with start button not pressed, but four pressed
|
||||||
// TODO find usage for button 0
|
// TODO find usage for button 0
|
||||||
@ -126,11 +126,11 @@ JoystickLayout create_xbox_layout()
|
|||||||
// 4 Buttons
|
// 4 Buttons
|
||||||
JLO_B_PB(KeyType::JUMP, 1 << 0, 1 << 0); // A/green
|
JLO_B_PB(KeyType::JUMP, 1 << 0, 1 << 0); // A/green
|
||||||
JLO_B_PB(KeyType::ESC, 1 << 1, 1 << 1); // B/red
|
JLO_B_PB(KeyType::ESC, 1 << 1, 1 << 1); // B/red
|
||||||
JLO_B_PB(KeyType::SPECIAL1, 1 << 2, 1 << 2); // X/blue
|
JLO_B_PB(KeyType::AUX1, 1 << 2, 1 << 2); // X/blue
|
||||||
JLO_B_PB(KeyType::INVENTORY, 1 << 3, 1 << 3); // Y/yellow
|
JLO_B_PB(KeyType::INVENTORY, 1 << 3, 1 << 3); // Y/yellow
|
||||||
|
|
||||||
// Analog Sticks
|
// Analog Sticks
|
||||||
JLO_B_PB(KeyType::SPECIAL1, 1 << 11, 1 << 11); // left
|
JLO_B_PB(KeyType::AUX1, 1 << 11, 1 << 11); // left
|
||||||
JLO_B_PB(KeyType::SNEAK, 1 << 12, 1 << 12); // right
|
JLO_B_PB(KeyType::SNEAK, 1 << 12, 1 << 12); // right
|
||||||
|
|
||||||
// Triggers
|
// Triggers
|
||||||
|
|||||||
@ -32,7 +32,7 @@ public:
|
|||||||
LEFT,
|
LEFT,
|
||||||
RIGHT,
|
RIGHT,
|
||||||
JUMP,
|
JUMP,
|
||||||
SPECIAL1,
|
AUX1,
|
||||||
SNEAK,
|
SNEAK,
|
||||||
AUTOFORWARD,
|
AUTOFORWARD,
|
||||||
DIG,
|
DIG,
|
||||||
|
|||||||
@ -80,7 +80,7 @@ void set_default_settings()
|
|||||||
settings->setDefault("keymap_drop", "KEY_KEY_Q");
|
settings->setDefault("keymap_drop", "KEY_KEY_Q");
|
||||||
settings->setDefault("keymap_zoom", "KEY_KEY_Z");
|
settings->setDefault("keymap_zoom", "KEY_KEY_Z");
|
||||||
settings->setDefault("keymap_inventory", "KEY_KEY_I");
|
settings->setDefault("keymap_inventory", "KEY_KEY_I");
|
||||||
settings->setDefault("keymap_special1", "KEY_KEY_E");
|
settings->setDefault("keymap_aux1", "KEY_KEY_E");
|
||||||
settings->setDefault("keymap_chat", "KEY_KEY_T");
|
settings->setDefault("keymap_chat", "KEY_KEY_T");
|
||||||
settings->setDefault("keymap_cmd", "/");
|
settings->setDefault("keymap_cmd", "/");
|
||||||
settings->setDefault("keymap_cmd_local", ".");
|
settings->setDefault("keymap_cmd_local", ".");
|
||||||
@ -464,7 +464,7 @@ void set_default_settings()
|
|||||||
settings->setDefault("touchtarget", "true");
|
settings->setDefault("touchtarget", "true");
|
||||||
settings->setDefault("touchscreen_threshold","20");
|
settings->setDefault("touchscreen_threshold","20");
|
||||||
settings->setDefault("fixed_virtual_joystick", "false");
|
settings->setDefault("fixed_virtual_joystick", "false");
|
||||||
settings->setDefault("virtual_joystick_triggers_aux", "false");
|
settings->setDefault("virtual_joystick_triggers_aux1", "false");
|
||||||
settings->setDefault("smooth_lighting", "false");
|
settings->setDefault("smooth_lighting", "false");
|
||||||
settings->setDefault("max_simultaneous_block_sends_per_client", "10");
|
settings->setDefault("max_simultaneous_block_sends_per_client", "10");
|
||||||
settings->setDefault("emergequeue_limit_diskonly", "16");
|
settings->setDefault("emergequeue_limit_diskonly", "16");
|
||||||
|
|||||||
@ -46,7 +46,7 @@ enum
|
|||||||
GUI_ID_KEY_BACKWARD_BUTTON,
|
GUI_ID_KEY_BACKWARD_BUTTON,
|
||||||
GUI_ID_KEY_LEFT_BUTTON,
|
GUI_ID_KEY_LEFT_BUTTON,
|
||||||
GUI_ID_KEY_RIGHT_BUTTON,
|
GUI_ID_KEY_RIGHT_BUTTON,
|
||||||
GUI_ID_KEY_USE_BUTTON,
|
GUI_ID_KEY_AUX1_BUTTON,
|
||||||
GUI_ID_KEY_FLY_BUTTON,
|
GUI_ID_KEY_FLY_BUTTON,
|
||||||
GUI_ID_KEY_FAST_BUTTON,
|
GUI_ID_KEY_FAST_BUTTON,
|
||||||
GUI_ID_KEY_JUMP_BUTTON,
|
GUI_ID_KEY_JUMP_BUTTON,
|
||||||
@ -177,7 +177,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
|
|||||||
{
|
{
|
||||||
core::rect<s32> rect(0, 0, option_w, 30 * s);
|
core::rect<s32> rect(0, 0, option_w, 30 * s);
|
||||||
rect += topleft + v2s32(option_x, option_y);
|
rect += topleft + v2s32(option_x, option_y);
|
||||||
const wchar_t *text = wgettext("\"Special\" = climb down");
|
const wchar_t *text = wgettext("\"Aux1\" = climb down");
|
||||||
Environment->addCheckBox(g_settings->getBool("aux1_descends"), rect, this,
|
Environment->addCheckBox(g_settings->getBool("aux1_descends"), rect, this,
|
||||||
GUI_ID_CB_AUX1_DESCENDS, text);
|
GUI_ID_CB_AUX1_DESCENDS, text);
|
||||||
delete[] text;
|
delete[] text;
|
||||||
@ -416,7 +416,7 @@ void GUIKeyChangeMenu::init_keys()
|
|||||||
this->add_key(GUI_ID_KEY_BACKWARD_BUTTON, wgettext("Backward"), "keymap_backward");
|
this->add_key(GUI_ID_KEY_BACKWARD_BUTTON, wgettext("Backward"), "keymap_backward");
|
||||||
this->add_key(GUI_ID_KEY_LEFT_BUTTON, wgettext("Left"), "keymap_left");
|
this->add_key(GUI_ID_KEY_LEFT_BUTTON, wgettext("Left"), "keymap_left");
|
||||||
this->add_key(GUI_ID_KEY_RIGHT_BUTTON, wgettext("Right"), "keymap_right");
|
this->add_key(GUI_ID_KEY_RIGHT_BUTTON, wgettext("Right"), "keymap_right");
|
||||||
this->add_key(GUI_ID_KEY_USE_BUTTON, wgettext("Special"), "keymap_special1");
|
this->add_key(GUI_ID_KEY_AUX1_BUTTON, wgettext("Aux1"), "keymap_aux1");
|
||||||
this->add_key(GUI_ID_KEY_JUMP_BUTTON, wgettext("Jump"), "keymap_jump");
|
this->add_key(GUI_ID_KEY_JUMP_BUTTON, wgettext("Jump"), "keymap_jump");
|
||||||
this->add_key(GUI_ID_KEY_SNEAK_BUTTON, wgettext("Sneak"), "keymap_sneak");
|
this->add_key(GUI_ID_KEY_SNEAK_BUTTON, wgettext("Sneak"), "keymap_sneak");
|
||||||
this->add_key(GUI_ID_KEY_DROP_BUTTON, wgettext("Drop"), "keymap_drop");
|
this->add_key(GUI_ID_KEY_DROP_BUTTON, wgettext("Drop"), "keymap_drop");
|
||||||
|
|||||||
@ -40,7 +40,7 @@ const char **button_imagenames = (const char *[]) {
|
|||||||
"jump_btn.png",
|
"jump_btn.png",
|
||||||
"down.png",
|
"down.png",
|
||||||
"zoom.png",
|
"zoom.png",
|
||||||
"aux_btn.png"
|
"aux1_btn.png"
|
||||||
};
|
};
|
||||||
|
|
||||||
const char **joystick_imagenames = (const char *[]) {
|
const char **joystick_imagenames = (const char *[]) {
|
||||||
@ -80,8 +80,8 @@ static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
|
|||||||
case zoom_id:
|
case zoom_id:
|
||||||
key = "zoom";
|
key = "zoom";
|
||||||
break;
|
break;
|
||||||
case special1_id:
|
case aux1_id:
|
||||||
key = "special1";
|
key = "aux1";
|
||||||
break;
|
break;
|
||||||
case fly_id:
|
case fly_id:
|
||||||
key = "freemove";
|
key = "freemove";
|
||||||
@ -425,7 +425,7 @@ TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver *receiver)
|
|||||||
|
|
||||||
m_touchscreen_threshold = g_settings->getU16("touchscreen_threshold");
|
m_touchscreen_threshold = g_settings->getU16("touchscreen_threshold");
|
||||||
m_fixed_joystick = g_settings->getBool("fixed_virtual_joystick");
|
m_fixed_joystick = g_settings->getBool("fixed_virtual_joystick");
|
||||||
m_joystick_triggers_special1 = g_settings->getBool("virtual_joystick_triggers_aux");
|
m_joystick_triggers_aux1 = g_settings->getBool("virtual_joystick_triggers_aux1");
|
||||||
m_screensize = m_device->getVideoDriver()->getScreenSize();
|
m_screensize = m_device->getVideoDriver()->getScreenSize();
|
||||||
button_size = MYMIN(m_screensize.Y / 4.5f,
|
button_size = MYMIN(m_screensize.Y / 4.5f,
|
||||||
porting::getDisplayDensity() *
|
porting::getDisplayDensity() *
|
||||||
@ -521,9 +521,9 @@ void TouchScreenGUI::init(ISimpleTextureSource *tsrc)
|
|||||||
m_screensize.Y - (3 * button_size)),
|
m_screensize.Y - (3 * button_size)),
|
||||||
L"z", false);
|
L"z", false);
|
||||||
|
|
||||||
// init special1/aux button
|
// init aux1 button
|
||||||
if (!m_joystick_triggers_special1)
|
if (!m_joystick_triggers_aux1)
|
||||||
initButton(special1_id,
|
initButton(aux1_id,
|
||||||
rect<s32>(m_screensize.X - (1.25 * button_size),
|
rect<s32>(m_screensize.X - (1.25 * button_size),
|
||||||
m_screensize.Y - (2.5 * button_size),
|
m_screensize.Y - (2.5 * button_size),
|
||||||
m_screensize.X - (0.25 * button_size),
|
m_screensize.X - (0.25 * button_size),
|
||||||
@ -923,7 +923,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (distance > button_size) {
|
if (distance > button_size) {
|
||||||
m_joystick_status[j_special1] = true;
|
m_joystick_status[j_aux1] = true;
|
||||||
// move joystick "button"
|
// move joystick "button"
|
||||||
s32 ndx = button_size * dx / distance - button_size / 2.0f;
|
s32 ndx = button_size * dx / distance - button_size / 2.0f;
|
||||||
s32 ndy = button_size * dy / distance - button_size / 2.0f;
|
s32 ndy = button_size * dy / distance - button_size / 2.0f;
|
||||||
@ -1039,7 +1039,7 @@ bool TouchScreenGUI::doubleTapDetection()
|
|||||||
void TouchScreenGUI::applyJoystickStatus()
|
void TouchScreenGUI::applyJoystickStatus()
|
||||||
{
|
{
|
||||||
for (unsigned int i = 0; i < 5; i++) {
|
for (unsigned int i = 0; i < 5; i++) {
|
||||||
if (i == 4 && !m_joystick_triggers_special1)
|
if (i == 4 && !m_joystick_triggers_aux1)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
SEvent translated{};
|
SEvent translated{};
|
||||||
|
|||||||
@ -39,7 +39,7 @@ typedef enum
|
|||||||
jump_id = 0,
|
jump_id = 0,
|
||||||
crunch_id,
|
crunch_id,
|
||||||
zoom_id,
|
zoom_id,
|
||||||
special1_id,
|
aux1_id,
|
||||||
after_last_element_id,
|
after_last_element_id,
|
||||||
settings_starter_id,
|
settings_starter_id,
|
||||||
rare_controls_starter_id,
|
rare_controls_starter_id,
|
||||||
@ -69,7 +69,7 @@ typedef enum
|
|||||||
j_backward,
|
j_backward,
|
||||||
j_left,
|
j_left,
|
||||||
j_right,
|
j_right,
|
||||||
j_special1
|
j_aux1
|
||||||
} touch_gui_joystick_move_id;
|
} touch_gui_joystick_move_id;
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
@ -217,7 +217,7 @@ private:
|
|||||||
|
|
||||||
// forward, backward, left, right
|
// forward, backward, left, right
|
||||||
touch_gui_button_id m_joystick_names[5] = {
|
touch_gui_button_id m_joystick_names[5] = {
|
||||||
forward_id, backward_id, left_id, right_id, special1_id};
|
forward_id, backward_id, left_id, right_id, aux1_id};
|
||||||
bool m_joystick_status[5] = {false, false, false, false, false};
|
bool m_joystick_status[5] = {false, false, false, false, false};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -237,7 +237,7 @@ private:
|
|||||||
int m_joystick_id = -1;
|
int m_joystick_id = -1;
|
||||||
bool m_joystick_has_really_moved = false;
|
bool m_joystick_has_really_moved = false;
|
||||||
bool m_fixed_joystick = false;
|
bool m_fixed_joystick = false;
|
||||||
bool m_joystick_triggers_special1 = false;
|
bool m_joystick_triggers_aux1 = false;
|
||||||
button_info *m_joystick_btn_off = nullptr;
|
button_info *m_joystick_btn_off = nullptr;
|
||||||
button_info *m_joystick_btn_bg = nullptr;
|
button_info *m_joystick_btn_bg = nullptr;
|
||||||
button_info *m_joystick_btn_center = nullptr;
|
button_info *m_joystick_btn_center = nullptr;
|
||||||
|
|||||||
BIN
textures/base/pack/aux1_btn.png
Normal file
BIN
textures/base/pack/aux1_btn.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB |
Loading…
Reference in New Issue
Block a user