First implementation of Shape shop

2017-10-22 18:48:00 +02:00
parent 33275f9046
commit 757c13c31c
52 changed files with 2237 additions and 1788 deletions
--- a/particlelab/src/main/assets/allSettings.pe
+++ b/particlelab/src/main/assets/allSettings.pe
@ -63,7 +63,7 @@ scaling0: 1.0
 timelineCount: 1
 timeline0: 0.0
 - Spawn Shape - 
-shape: square
+playerShape: square
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/colors.pe
+++ b/particlelab/src/main/assets/colors.pe
@ -36,7 +36,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/conti.pe
+++ b/particlelab/src/main/assets/conti.pe
@ -38,7 +38,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/explosion.pe
+++ b/particlelab/src/main/assets/explosion.pe
@ -46,7 +46,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: square
+playerShape: square
 - Spawn Width - 
 lowMin: 200.0
 lowMax: 200.0
--- a/particlelab/src/main/assets/fire.pe
+++ b/particlelab/src/main/assets/fire.pe
@ -38,7 +38,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/firework.pe
+++ b/particlelab/src/main/assets/firework.pe
@ -53,7 +53,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/gravity.pe
+++ b/particlelab/src/main/assets/gravity.pe
@ -38,7 +38,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/magnet.pe
+++ b/particlelab/src/main/assets/magnet.pe
@ -38,7 +38,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/offset.pe
+++ b/particlelab/src/main/assets/offset.pe
@ -56,7 +56,7 @@ scaling0: 1.0
 timelineCount: 1
 timeline0: 0.0
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/oneDirection.pe
+++ b/particlelab/src/main/assets/oneDirection.pe
@ -38,7 +38,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/pe.pe
+++ b/particlelab/src/main/assets/pe.pe
@ -34,7 +34,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: square
+playerShape: square
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/rotation.pe
+++ b/particlelab/src/main/assets/rotation.pe
@ -34,7 +34,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/assets/test.txt
+++ b/particlelab/src/main/assets/test.txt
@ -38,7 +38,7 @@ active: false
 - Y Offset - 
 active: false
 - Spawn Shape - 
-shape: point
+playerShape: point
 - Spawn Width - 
 lowMin: 0.0
 lowMax: 0.0
--- a/particlelab/src/main/res/drawable/custom_button.xml
+++ b/particlelab/src/main/res/drawable/custom_button.xml
@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:context=".main.GameActivity">
    <item android:state_pressed="true" android:state_enabled="true">
-        <shape>
+        <playerShape>
            <corners android:radius="20dp" />
            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
            <stroke android:width="1dp" android:color="#992f2f" />

            <solid android:color="#ef4444" />
-        </shape>
+        </playerShape>
    </item>
    <item android:state_pressed="false" android:state_enabled="true">
-        <shape>
+        <playerShape>
            <corners android:radius="20dp" />
            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
            <stroke android:width="1dp" android:color="#992f2f" />

            <gradient android:angle="270" android:endColor="#992f2f" android:startColor="#ef4444" />
-        </shape>
+        </playerShape>
    </item>
    <item android:state_enabled="false">
-        <shape>
+        <playerShape>
            <corners android:radius="20dp" />
            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
            <stroke android:width="1dp" android:color="#992f2f" />

            <gradient android:angle="270" android:endColor="#a15d5d" android:startColor="#b73d3d" />
-        </shape>
+        </playerShape>
    </item>
 </selector>
--- a/particlelab/src/main/res/drawable/tool_slot_background.xml
+++ b/particlelab/src/main/res/drawable/tool_slot_background.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+<playerShape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:playerShape="rectangle">
    <corners android:radius="3dp" />
    <solid
        android:color="#715f5f"/>
@ -12,4 +12,4 @@
    <stroke
        android:width="2dp"
        android:color="#635e5e" />
-</shape>
+</playerShape>
--- a/particlelab/src/main/res/drawable/toolprogressbarlayers.xml
+++ b/particlelab/src/main/res/drawable/toolprogressbarlayers.xml
@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:id="@android:id/background">
-        <shape android:shape="rectangle">
+        <playerShape android:playerShape="rectangle">
            <solid android:color="#00fff700" />
            <corners android:radius="200dp" />
-        </shape>
+        </playerShape>
    </item>

    <item android:id="@android:id/progress">
        <clip android:gravity="right">
-            <shape android:shape="rectangle">
+            <playerShape android:playerShape="rectangle">
                <gradient
                    android:angle="45"
                    android:endColor="#a06c6c6c"
                    android:startColor="#a0ababab" />
                <corners android:radius="200dp" />
-            </shape>
+            </playerShape>
        </clip>
    </item>
 </layer-list>
--- a/particlelab/src/main/res/drawable/unlock_message_background.xml
+++ b/particlelab/src/main/res/drawable/unlock_message_background.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+<playerShape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:playerShape="rectangle">
    <corners android:radius="30dp" />
    <gradient
        android:centerX="50%"
@ -17,4 +17,4 @@
    <stroke
        android:width="2dp"
        android:color="#7826adbc" />
-</shape>
+</playerShape>
--- a/particlelab/src/main/res/drawable/worldbutton_background.xml
+++ b/particlelab/src/main/res/drawable/worldbutton_background.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+<playerShape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:playerShape="rectangle">
    <corners android:radius="20dp" />
    <gradient
        android:centerX="0%"
@ -17,4 +17,4 @@
    <stroke
        android:width="4dp"
        android:color="#74ff71d0" />
-</shape>
+</playerShape>