mirror of
https://git.sr.ht/~thestr4ng3r/chiaki
synced 2025-03-12 05:25:23 -07:00
Add Face Buttons to Android
This commit is contained in:
Florian Märkl
parent
884333ed65
commit
5d0ec59ea3
android/app/src/main
java/com/metallic/chiaki
res
assets/controls
@ -25,6 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.lifecycle.*
|
||||
import com.metallic.chiaki.R
|
||||
import com.metallic.chiaki.StreamStateIdle
|
||||
import com.metallic.chiaki.lib.ConnectInfo
|
||||
import com.metallic.chiaki.touchcontrols.TouchControlsFragment
|
||||
import kotlinx.android.synthetic.main.activity_stream.*
|
||||
@ -60,7 +61,7 @@ class StreamActivity : AppCompatActivity()
|
||||
viewModel.session.attachToTextureView(textureView)
|
||||
|
||||
viewModel.session.state.observe(this, Observer {
|
||||
stateTextView.text = "$it"
|
||||
stateTextView.text = if(it != StreamStateIdle) "$it" else ""
|
||||
})
|
||||
|
||||
textureView.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
|
||||
|
||||
@ -0,0 +1,77 @@
|
||||
/*
|
||||
* This file is part of Chiaki.
|
||||
*
|
||||
* Chiaki is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Chiaki is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Chiaki. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.metallic.chiaki.touchcontrols
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Canvas
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.util.AttributeSet
|
||||
import android.view.MotionEvent
|
||||
import android.view.View
|
||||
import com.metallic.chiaki.R
|
||||
|
||||
class ButtonView @JvmOverloads constructor(
|
||||
context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
|
||||
) : View(context, attrs, defStyleAttr)
|
||||
{
|
||||
var buttonPressed = false
|
||||
private set(value)
|
||||
{
|
||||
val diff = field != value
|
||||
field = value
|
||||
if(diff)
|
||||
{
|
||||
invalidate()
|
||||
buttonPressedCallback?.let { it(field) }
|
||||
}
|
||||
}
|
||||
|
||||
var buttonPressedCallback: ((Boolean) -> Unit)? = null
|
||||
|
||||
private val drawableIdle: Drawable?
|
||||
private val drawablePressed: Drawable?
|
||||
|
||||
init
|
||||
{
|
||||
context.theme.obtainStyledAttributes(attrs, R.styleable.ButtonView, 0, 0).apply {
|
||||
drawableIdle = getDrawable(R.styleable.ButtonView_drawableIdle)
|
||||
drawablePressed = getDrawable(R.styleable.ButtonView_drawablePressed)
|
||||
recycle()
|
||||
}
|
||||
|
||||
isClickable = true
|
||||
}
|
||||
|
||||
override fun onDraw(canvas: Canvas)
|
||||
{
|
||||
super.onDraw(canvas)
|
||||
val drawable = if(buttonPressed) drawablePressed else drawableIdle
|
||||
drawable?.setBounds(0, 0, width, height)
|
||||
drawable?.draw(canvas)
|
||||
}
|
||||
|
||||
override fun onTouchEvent(event: MotionEvent): Boolean
|
||||
{
|
||||
when(event.action)
|
||||
{
|
||||
MotionEvent.ACTION_DOWN -> buttonPressed = true
|
||||
MotionEvent.ACTION_UP -> buttonPressed = false
|
||||
}
|
||||
return true
|
||||
}
|
||||
}
|
||||
@ -47,6 +47,11 @@ class TouchControlsFragment : Fragment()
|
||||
{
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
dpadView.stateChangeCallback = this::dpadStateChanged
|
||||
crossButtonView.buttonPressedCallback = buttonStateChanged(ControllerState.BUTTON_CROSS)
|
||||
moonButtonView.buttonPressedCallback = buttonStateChanged(ControllerState.BUTTON_MOON)
|
||||
pyramidButtonView.buttonPressedCallback = buttonStateChanged(ControllerState.BUTTON_PYRAMID)
|
||||
boxButtonView.buttonPressedCallback = buttonStateChanged(ControllerState.BUTTON_BOX)
|
||||
psButtonView.buttonPressedCallback = buttonStateChanged(ControllerState.BUTTON_PS)
|
||||
}
|
||||
|
||||
private fun dpadStateChanged(direction: DPadView.Direction?)
|
||||
@ -67,4 +72,15 @@ class TouchControlsFragment : Fragment()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
private fun buttonStateChanged(buttonMask: UInt) = { pressed: Boolean ->
|
||||
controllerState = controllerState.copy().apply {
|
||||
buttons =
|
||||
if(pressed)
|
||||
buttons or buttonMask
|
||||
else
|
||||
buttons and buttonMask.inv()
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
13
android/app/src/main/res/drawable/control_button_box.xml
Normal file
13
android/app/src/main/res/drawable/control_button_box.xml
Normal file
@ -0,0 +1,13 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="512dp"
|
||||
android:height="512dp"
|
||||
android:viewportWidth="135.46666"
|
||||
android:viewportHeight="135.46667">
|
||||
<path
|
||||
android:pathData="m67.733,0c-43.925,-1.668 -79.229,46.32 -64.708,87.75 11.396,42.428 67.652,62.049 102.953,35.886 37.18,-23.426 39.288,-82.963 3.859,-108.96 -11.851,-9.454 -26.946,-14.714 -42.104,-14.676zM25.401,25.401c28.222,0 56.444,0 84.666,0 0,28.222 0,56.444 0,84.666 -28.222,0 -56.444,0 -84.666,0 0,-28.222 0,-56.444 0,-84.666zM37.277,37.277c0,20.304 0,40.608 0,60.912 20.304,0 40.608,0 60.912,0 0,-20.304 0,-40.608 0,-60.912 -20.304,0 -40.608,0 -60.912,0z"
|
||||
android:strokeAlpha="1"
|
||||
android:strokeWidth="9.17431831"
|
||||
android:fillColor="@color/control_primary"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillAlpha="1"/>
|
||||
</vector>
|
||||
@ -0,0 +1,13 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="512dp"
|
||||
android:height="512dp"
|
||||
android:viewportWidth="135.46666"
|
||||
android:viewportHeight="135.46667">
|
||||
<path
|
||||
android:pathData="m67.733,0c-43.925,-1.668 -79.229,46.32 -64.708,87.75 11.396,42.428 67.652,62.049 102.953,35.886 37.18,-23.426 39.288,-82.963 3.859,-108.96 -11.851,-9.454 -26.946,-14.714 -42.104,-14.676zM25.401,25.401c28.222,0 56.444,0 84.666,0 0,28.222 0,56.444 0,84.666 -28.222,0 -56.444,0 -84.666,0 0,-28.222 0,-56.444 0,-84.666zM37.277,37.277c0,20.304 0,40.608 0,60.912 20.304,0 40.608,0 60.912,0 0,-20.304 0,-40.608 0,-60.912 -20.304,0 -40.608,0 -60.912,0z"
|
||||
android:strokeAlpha="1"
|
||||
android:strokeWidth="9.17431831"
|
||||
android:fillColor="@color/control_pressed"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillAlpha="1"/>
|
||||
</vector>
|
||||
13
android/app/src/main/res/drawable/control_button_cross.xml
Normal file
13
android/app/src/main/res/drawable/control_button_cross.xml
Normal file
@ -0,0 +1,13 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="512dp"
|
||||
android:height="512dp"
|
||||
android:viewportWidth="135.46666"
|
||||
android:viewportHeight="135.46667">
|
||||
<path
|
||||
android:pathData="M67.733,0A67.733,67.733 0,0 0,0 67.733,67.733 67.733,46.804 0,0 67.733,135.467 67.733,67.733 0,0 0,135.467 67.733,67.733 67.733,133.241 0,0 67.733,0ZM33.309,24.328 L67.733,58.753 102.158,24.328 111.138,33.309 76.714,67.733 111.138,102.158 102.158,111.138 67.733,76.714 33.309,111.138 24.328,102.158 58.753,67.733 24.328,33.309Z"
|
||||
android:strokeAlpha="1"
|
||||
android:strokeWidth="34.67459106"
|
||||
android:fillColor="@color/control_primary"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillAlpha="1"/>
|
||||
</vector>
|
||||
@ -0,0 +1,13 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="512dp"
|
||||
android:height="512dp"
|
||||
android:viewportWidth="135.46666"
|
||||
android:viewportHeight="135.46667">
|
||||
<path
|
||||
android:pathData="M67.733,0A67.733,67.733 0,0 0,0 67.733,67.733 67.733,46.804 0,0 67.733,135.467 67.733,67.733 0,0 0,135.467 67.733,67.733 67.733,133.241 0,0 67.733,0ZM33.309,24.328 L67.733,58.753 102.158,24.328 111.138,33.309 76.714,67.733 111.138,102.158 102.158,111.138 67.733,76.714 33.309,111.138 24.328,102.158 58.753,67.733 24.328,33.309Z"
|
||||
android:strokeAlpha="1"
|
||||
android:strokeWidth="34.67459106"
|
||||
android:fillColor="@color/control_pressed"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillAlpha="1"/>
|
||||
</vector>
|
||||
13
android/app/src/main/res/drawable/control_button_moon.xml
Normal file
13
android/app/src/main/res/drawable/control_button_moon.xml
Normal file
@ -0,0 +1,13 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="512dp"
|
||||
android:height="512dp"
|
||||
android:viewportWidth="135.46666"
|
||||
android:viewportHeight="135.46667">
|
||||
<path
|
||||
android:pathData="M67.733,0A67.733,67.733 0,0 0,0 67.733,67.733 67.733,46.804 0,0 67.733,135.467 67.733,67.733 0,0 0,135.467 67.733,67.733 67.733,133.241 0,0 67.733,0ZM67.732,14.801c29.158,0 52.934,23.775 52.934,52.934 0,29.158 -23.775,52.932 -52.934,52.932 -29.158,0 -52.932,-23.773 -52.932,-52.932 0,-29.158 23.773,-52.934 52.932,-52.934zM67.732,27.502c-22.295,0 -40.23,17.938 -40.23,40.233 0,22.295 17.935,40.231 40.23,40.231 22.295,0 40.233,-17.936 40.233,-40.231 0,-22.295 -17.938,-40.233 -40.233,-40.233z"
|
||||
android:strokeAlpha="1"
|
||||
android:strokeWidth="34.67459106"
|
||||
android:fillColor="@color/control_primary"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillAlpha="1"/>
|
||||
</vector>
|
||||
@ -0,0 +1,13 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="512dp"
|
||||
android:height="512dp"
|
||||
android:viewportWidth="135.46666"
|
||||
android:viewportHeight="135.46667">
|
||||
<path
|
||||
android:pathData="M67.733,0A67.733,67.733 0,0 0,0 67.733,67.733 67.733,46.804 0,0 67.733,135.467 67.733,67.733 0,0 0,135.467 67.733,67.733 67.733,133.241 0,0 67.733,0ZM67.732,14.801c29.158,0 52.934,23.775 52.934,52.934 0,29.158 -23.775,52.932 -52.934,52.932 -29.158,0 -52.932,-23.773 -52.932,-52.932 0,-29.158 23.773,-52.934 52.932,-52.934zM67.732,27.502c-22.295,0 -40.23,17.938 -40.23,40.233 0,22.295 17.935,40.231 40.23,40.231 22.295,0 40.233,-17.936 40.233,-40.231 0,-22.295 -17.938,-40.233 -40.233,-40.233z"
|
||||
android:strokeAlpha="1"
|
||||
android:strokeWidth="34.67459106"
|
||||
android:fillColor="@color/control_pressed"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillAlpha="1"/>
|
||||
</vector>
|
||||
13
android/app/src/main/res/drawable/control_button_pyramid.xml
Normal file
13
android/app/src/main/res/drawable/control_button_pyramid.xml
Normal file
@ -0,0 +1,13 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="512dp"
|
||||
android:height="512dp"
|
||||
android:viewportWidth="135.46666"
|
||||
android:viewportHeight="135.46667">
|
||||
<path
|
||||
android:pathData="M67.733,0A67.733,67.733 0,0 0,0 67.733,67.733 67.733,46.804 0,0 67.733,135.467 67.733,67.733 0,0 0,135.467 67.733,67.733 67.733,133.241 0,0 67.733,0ZM67.732,9.576 L112.6,87.287 118.1,96.812L17.367,96.812ZM67.734,34.977 L39.365,84.111l56.737,0z"
|
||||
android:strokeAlpha="1"
|
||||
android:strokeWidth="34.67459106"
|
||||
android:fillColor="@color/control_primary"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillAlpha="1"/>
|
||||
</vector>
|
||||
@ -0,0 +1,13 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="512dp"
|
||||
android:height="512dp"
|
||||
android:viewportWidth="135.46666"
|
||||
android:viewportHeight="135.46667">
|
||||
<path
|
||||
android:pathData="M67.733,0A67.733,67.733 0,0 0,0 67.733,67.733 67.733,46.804 0,0 67.733,135.467 67.733,67.733 0,0 0,135.467 67.733,67.733 67.733,133.241 0,0 67.733,0ZM67.732,9.576 L112.6,87.287 118.1,96.812L17.367,96.812ZM67.734,34.977 L39.365,84.111l56.737,0z"
|
||||
android:strokeAlpha="1"
|
||||
android:strokeWidth="34.67459106"
|
||||
android:fillColor="@color/control_pressed"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillAlpha="1"/>
|
||||
</vector>
|
||||
@ -10,11 +10,77 @@
|
||||
|
||||
<com.metallic.chiaki.touchcontrols.DPadView
|
||||
android:id="@+id/dpadView"
|
||||
android:layout_width="130dp"
|
||||
android:layout_height="130dp"
|
||||
android:layout_width="128dp"
|
||||
android:layout_height="128dp"
|
||||
android:layout_marginLeft="32dp"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="144dp"
|
||||
android:layout_height="144dp"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent">
|
||||
|
||||
<com.metallic.chiaki.touchcontrols.ButtonView
|
||||
android:id="@+id/crossButtonView"
|
||||
android:layout_width="@dimen/control_face_button_size"
|
||||
android:layout_height="@dimen/control_face_button_size"
|
||||
android:padding="8dp"
|
||||
app:drawableIdle="@drawable/control_button_cross"
|
||||
app:drawablePressed="@drawable/control_button_cross_pressed"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
|
||||
<com.metallic.chiaki.touchcontrols.ButtonView
|
||||
android:id="@+id/moonButtonView"
|
||||
android:layout_width="@dimen/control_face_button_size"
|
||||
android:layout_height="@dimen/control_face_button_size"
|
||||
android:padding="8dp"
|
||||
app:drawableIdle="@drawable/control_button_moon"
|
||||
app:drawablePressed="@drawable/control_button_moon_pressed"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
|
||||
<com.metallic.chiaki.touchcontrols.ButtonView
|
||||
android:id="@+id/pyramidButtonView"
|
||||
android:layout_width="@dimen/control_face_button_size"
|
||||
android:layout_height="@dimen/control_face_button_size"
|
||||
android:padding="8dp"
|
||||
app:drawableIdle="@drawable/control_button_pyramid"
|
||||
app:drawablePressed="@drawable/control_button_pyramid_pressed"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
|
||||
<com.metallic.chiaki.touchcontrols.ButtonView
|
||||
android:id="@+id/boxButtonView"
|
||||
android:layout_width="@dimen/control_face_button_size"
|
||||
android:layout_height="@dimen/control_face_button_size"
|
||||
android:padding="8dp"
|
||||
app:drawableIdle="@drawable/control_button_box"
|
||||
app:drawablePressed="@drawable/control_button_box_pressed"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
<com.metallic.chiaki.touchcontrols.ButtonView
|
||||
android:id="@+id/psButtonView"
|
||||
android:layout_width="@dimen/control_face_button_size"
|
||||
android:layout_height="@dimen/control_face_button_size"
|
||||
android:padding="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
app:drawableIdle="@drawable/control_button_pyramid"
|
||||
app:drawablePressed="@drawable/control_button_pyramid_pressed"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
7
android/app/src/main/res/values/attrs.xml
Normal file
7
android/app/src/main/res/values/attrs.xml
Normal file
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<declare-styleable name="ButtonView">
|
||||
<attr name="drawableIdle" format="reference" />
|
||||
<attr name="drawablePressed" format="integer" />
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
4
android/app/src/main/res/values/dimens.xml
Normal file
4
android/app/src/main/res/values/dimens.xml
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="control_face_button_size">48dp</dimen>
|
||||
</resources>
|
||||
163
assets/controls/buttons.svg
Normal file
163
assets/controls/buttons.svg
Normal file
@ -0,0 +1,163 @@
|
||||
<?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.4 5da689c313, 2019-01-14"
|
||||
sodipodi:docname="buttons.svg">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#000000"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.76346102"
|
||||
inkscape:cx="130.79961"
|
||||
inkscape:cy="208.94165"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="g1412"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
showguides="true"
|
||||
inkscape:guide-bbox="true"
|
||||
inkscape:snap-object-midpoints="true"
|
||||
inkscape:window-width="1918"
|
||||
inkscape:window-height="1048"
|
||||
inkscape:window-x="1920"
|
||||
inkscape:window-y="15"
|
||||
inkscape:window-maximized="1">
|
||||
<sodipodi:guide
|
||||
position="67.733332,67.733332"
|
||||
orientation="1,0"
|
||||
id="guide1368"
|
||||
inkscape:locked="false"
|
||||
inkscape:label=""
|
||||
inkscape:color="rgb(0,0,255)" />
|
||||
<sodipodi:guide
|
||||
position="67.73333,67.733335"
|
||||
orientation="0,1"
|
||||
id="guide1370"
|
||||
inkscape:locked="false" />
|
||||
</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:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="raw"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-161.53332)"
|
||||
style="display:none">
|
||||
<circle
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:9.17431927;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path1366"
|
||||
cx="67.73333"
|
||||
cy="229.26665"
|
||||
r="67.73333"
|
||||
inkscape:label="background" />
|
||||
<g
|
||||
id="g1386"
|
||||
inkscape:label="cross"
|
||||
style="display:none;stroke-width:12.69999981;stroke-miterlimit:4;stroke-dasharray:none">
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
id="path1374"
|
||||
d="m 28.818889,268.18111 77.828891,-77.8289"
|
||||
style="fill:none;stroke:#000000;stroke-width:12.69999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
<path
|
||||
style="fill:none;stroke:#000000;stroke-width:12.69999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 106.64778,268.18111 28.818886,190.35221"
|
||||
id="path1382"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<rect
|
||||
style="display:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:11.87760735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="rect1388"
|
||||
width="72.789055"
|
||||
height="72.789062"
|
||||
x="31.338804"
|
||||
y="192.87212"
|
||||
inkscape:label="box" />
|
||||
<path
|
||||
sodipodi:type="star"
|
||||
style="display:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:12.69999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path1394"
|
||||
sodipodi:sides="3"
|
||||
sodipodi:cx="67.733333"
|
||||
sodipodi:cy="229.26665"
|
||||
sodipodi:r1="45.457153"
|
||||
sodipodi:r2="22.728577"
|
||||
sodipodi:arg1="0.52359878"
|
||||
sodipodi:arg2="1.5707963"
|
||||
inkscape:flatsided="true"
|
||||
inkscape:rounded="0"
|
||||
inkscape:randomized="0"
|
||||
d="m 107.10038,251.99522 -78.734097,0 39.36705,-68.18573 z"
|
||||
inkscape:transform-center-y="-9.063038"
|
||||
inkscape:transform-center-x="1.7040565e-06"
|
||||
inkscape:label="pyramid" />
|
||||
<circle
|
||||
inkscape:label="moon"
|
||||
r="46.582188"
|
||||
cx="67.73333"
|
||||
cy="229.26665"
|
||||
id="circle1610"
|
||||
style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:12.69999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
</g>
|
||||
<g
|
||||
transform="translate(0,-161.53332)"
|
||||
id="g1412"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="cut"
|
||||
style="display:inline">
|
||||
<path
|
||||
style="display:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:9.17431831;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 67.733332,161.53332 c -43.92462,-1.6678 -79.228707,46.32026 -64.7081243,87.7499 11.3956053,42.4276 67.6519453,62.04888 102.9532423,35.88616 37.17969,-23.4255 39.2881,-82.96325 3.8586,-108.96007 -11.850603,-9.45376 -26.946374,-14.7137 -42.103718,-14.67599 z m -42.332816,25.40052 c 28.22205,0 56.444099,0 84.666154,0 0,28.22187 0,56.44375 0,84.66563 -28.222055,0 -56.444104,0 -84.666154,0 0,-28.22188 0,-56.44376 0,-84.66563 z m 11.876793,11.87679 c 0,20.30402 0,40.60803 0,60.91205 20.304017,0 40.60803,0 60.912047,0 0,-20.30402 0,-40.60803 0,-60.91205 -20.304017,0 -40.60803,0 -60.912047,0 z"
|
||||
id="circle1423"
|
||||
inkscape:connector-curvature="0"
|
||||
inkscape:label="box" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:34.67459106;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 256,0 A 255.99999,255.99999 0 0 0 0,256 255.99999,255.99999 0 0 0 256,512 255.99999,255.99999 0 0 0 512,256 255.99999,255.99999 0 0 0 256,0 Z m -0.004,55.939453 c 110.20508,0 200.06446,89.859367 200.06446,200.064457 0,110.20505 -89.85938,200.05664 -200.06446,200.05664 -110.20507,0 -200.056637,-89.85159 -200.056637,-200.05664 0,-110.20509 89.851567,-200.064457 200.056637,-200.064457 z m 0,48.003907 c -84.26395,0 -152.05078,67.79658 -152.05078,152.06055 0,84.26396 67.78683,152.05273 152.05078,152.05273 84.26395,0 152.06055,-67.78877 152.06055,-152.05273 0,-84.26397 -67.7966,-152.06055 -152.06055,-152.06055 z"
|
||||
transform="matrix(0.26458333,0,0,0.26458333,0,161.53332)"
|
||||
id="circle1613"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="display:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:34.67459106;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 256,0 A 255.99999,255.99999 0 0 0 0,256 255.99999,255.99999 0 0 0 256,512 255.99999,255.99999 0 0 0 512,256 255.99999,255.99999 0 0 0 256,0 Z M 125.89062,91.949219 256,222.05859 386.10938,91.949219 420.05078,125.89062 289.94141,256 420.05078,386.10938 386.10938,420.05078 256,289.94141 125.89062,420.05078 91.949219,386.10938 222.05859,256 91.949219,125.89062 Z"
|
||||
transform="matrix(0.26458333,0,0,0.26458333,0,161.53332)"
|
||||
id="circle1414"
|
||||
inkscape:connector-curvature="0"
|
||||
inkscape:label="cross" />
|
||||
<path
|
||||
style="display:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:34.67459106;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 256,0 A 255.99999,255.99999 0 0 0 0,256 255.99999,255.99999 0 0 0 256,512 255.99999,255.99999 0 0 0 512,256 255.99999,255.99999 0 0 0 256,0 Z m -0.004,36.193359 169.57813,293.710941 20.78711,36 H 65.640625 Z m 0.008,96.001951 -107.22266,185.70508 h 214.4375 z"
|
||||
transform="matrix(0.26458333,0,0,0.26458333,0,161.53332)"
|
||||
id="circle1428"
|
||||
inkscape:connector-curvature="0"
|
||||
inkscape:label="pyramid" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After 
(image error) Size: 7.6 KiB |
Loading…
x
Reference in New Issue
Block a user