Project

General

Profile

« Previous | Next » 

Revision de82c8b7

Added by Leszek Koltunski over 7 years ago

Effects3D: beginnings of support for removing arbitrary effect

View differences:

src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java
536 536
    renderer.mQuat2.set(0,0,0,1);
537 537
    }
538 538

  
539
///////////////////////////////////////////////////////////////////////////////////////////////////
540

  
541
  public void remove(View v)
542
    {
543
    android.util.Log.e("effects3D", "removing!");
544
    }
545

  
539 546
///////////////////////////////////////////////////////////////////////////////////////////////////
540 547
// Overrides
541 548

  
src/main/res/layout/effect1d.xml
5 5
              android:layout_height="wrap_content"
6 6
              android:orientation="vertical">
7 7

  
8
        <TextView
9
            android:id="@+id/effect1dText"
10
            android:layout_width="wrap_content"
11
            android:layout_height="wrap_content"
12
            android:layout_marginEnd="5dp"
13
            android:layout_marginStart="5dp"
14
            android:layout_marginTop="3dp"
15
            />
8
        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
9
              android:id="@+id/button1dLayout"
10
              android:layout_width="match_parent"
11
              android:layout_height="match_parent"
12
              android:orientation="horizontal">
13

  
14
                <TextView
15
                    android:id="@+id/effect1dText"
16
                    android:layout_width="wrap_content"
17
                    android:layout_height="wrap_content"
18
                    android:layout_marginEnd="5dp"
19
                    android:layout_marginStart="5dp"
20
                    android:layout_marginTop="3dp"
21
                    android:layout_weight="1"/>
22

  
23
                <Button
24
                    android:text="@string/removebut"
25
                    android:layout_width="wrap_content"
26
                    android:layout_height="wrap_content"
27
                    android:id="@+id/button"
28
                    android:layout_weight="0.2"
29
                    android:layout_marginTop="3dp"
30
                    android:onClick="remove"/>
31
        </LinearLayout>
16 32

  
17 33
        <SeekBar
18 34
            android:id="@+id/effect1dbar1"
src/main/res/layout/effect2d.xml
5 5
              android:layout_height="wrap_content"
6 6
              android:orientation="vertical">
7 7

  
8
        <TextView
9
            android:id="@+id/effect2dText"
10
            android:layout_width="wrap_content"
11
            android:layout_height="wrap_content"
12
            android:layout_marginEnd="5dp"
13
            android:layout_marginStart="5dp"
14
            android:layout_marginTop="3dp"
15
            />
8
        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
9
              android:id="@+id/button2dLayout"
10
              android:layout_width="match_parent"
11
              android:layout_height="match_parent"
12
              android:orientation="horizontal">
13

  
14
                <TextView
15
                    android:id="@+id/effect2dText"
16
                    android:layout_width="wrap_content"
17
                    android:layout_height="wrap_content"
18
                    android:layout_marginEnd="5dp"
19
                    android:layout_marginStart="5dp"
20
                    android:layout_marginTop="3dp"
21
                    android:layout_weight="1"/>
22

  
23
                <Button
24
                    android:text="@string/removebut"
25
                    android:layout_width="wrap_content"
26
                    android:layout_height="wrap_content"
27
                    android:id="@+id/button"
28
                    android:layout_weight="0.2"
29
                    android:layout_marginTop="3dp"
30
                    android:onClick="remove"/>
31
        </LinearLayout>
16 32

  
17 33
        <SeekBar
18 34
            android:id="@+id/effect2dbar1"
src/main/res/layout/effect3d.xml
5 5
              android:layout_height="wrap_content"
6 6
              android:orientation="vertical">
7 7

  
8
        <TextView
9
            android:id="@+id/effect3dText"
10
            android:layout_width="wrap_content"
11
            android:layout_height="wrap_content"
12
            android:layout_marginEnd="5dp"
13
            android:layout_marginStart="5dp"
14
            android:layout_marginTop="3dp" />
8
        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
9
              android:id="@+id/button3dLayout"
10
              android:layout_width="match_parent"
11
              android:layout_height="match_parent"
12
              android:orientation="horizontal">
13

  
14
                <TextView
15
                    android:id="@+id/effect3dText"
16
                    android:layout_width="wrap_content"
17
                    android:layout_height="wrap_content"
18
                    android:layout_marginEnd="5dp"
19
                    android:layout_marginStart="5dp"
20
                    android:layout_marginTop="3dp"
21
                    android:layout_weight="1"/>
22

  
23
                <Button
24
                    android:text="@string/removebut"
25
                    android:layout_width="wrap_content"
26
                    android:layout_height="wrap_content"
27
                    android:id="@+id/button"
28
                    android:layout_weight="0.2"
29
                    android:layout_marginTop="3dp"
30
                    android:onClick="remove"/>
31
        </LinearLayout>
15 32

  
16 33
        <SeekBar
17 34
            android:id="@+id/effect3dbar1"
src/main/res/layout/effect4d.xml
5 5
              android:layout_height="wrap_content"
6 6
              android:orientation="vertical">
7 7

  
8
        <TextView
9
            android:id="@+id/effect4dText"
10
            android:layout_width="wrap_content"
11
            android:layout_height="wrap_content"
12
            android:layout_marginEnd="5dp"
13
            android:layout_marginStart="5dp"
14
            android:layout_marginTop="3dp" />
8
        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
9
              android:id="@+id/button4dLayout"
10
              android:layout_width="match_parent"
11
              android:layout_height="match_parent"
12
              android:orientation="horizontal">
13

  
14
                <TextView
15
                    android:id="@+id/effect4dText"
16
                    android:layout_width="wrap_content"
17
                    android:layout_height="wrap_content"
18
                    android:layout_marginEnd="5dp"
19
                    android:layout_marginStart="5dp"
20
                    android:layout_marginTop="3dp"
21
                    android:layout_weight="1"/>
22

  
23
                <Button
24
                    android:text="@string/removebut"
25
                    android:layout_width="wrap_content"
26
                    android:layout_height="wrap_content"
27
                    android:id="@+id/button"
28
                    android:layout_weight="0.2"
29
                    android:layout_marginTop="3dp"
30
                    android:onClick="remove"/>
31
        </LinearLayout>
15 32

  
16 33
        <SeekBar
17 34
            android:id="@+id/effect4dbar1"
src/main/res/layout/effect5d.xml
5 5
              android:layout_height="wrap_content"
6 6
              android:orientation="vertical">
7 7

  
8
        <TextView
9
            android:id="@+id/effect5dText"
10
            android:layout_width="wrap_content"
11
            android:layout_height="wrap_content"
12
            android:layout_marginEnd="5dp"
13
            android:layout_marginStart="5dp"
14
            android:layout_marginTop="3dp" />
8
        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
9
              android:id="@+id/button5dLayout"
10
              android:layout_width="match_parent"
11
              android:layout_height="match_parent"
12
              android:orientation="horizontal">
13

  
14
                <TextView
15
                    android:id="@+id/effect5dText"
16
                    android:layout_width="wrap_content"
17
                    android:layout_height="wrap_content"
18
                    android:layout_marginEnd="5dp"
19
                    android:layout_marginStart="5dp"
20
                    android:layout_marginTop="3dp"
21
                    android:layout_weight="1"/>
22

  
23
                <Button
24
                    android:text="@string/removebut"
25
                    android:layout_width="wrap_content"
26
                    android:layout_height="wrap_content"
27
                    android:id="@+id/button"
28
                    android:layout_weight="0.2"
29
                    android:layout_marginTop="3dp"
30
                    android:onClick="remove"/>
31
        </LinearLayout>
15 32

  
16 33
        <SeekBar
17 34
            android:id="@+id/effect5dbar1"

Also available in: Unified diff