Project

General

Profile

« Previous | Next » 

Revision ac02465e

Added by Leszek Koltunski over 8 years ago

minor stuff in layouts

View differences:

src/main/java/org/distorted/examples/vertex3d/Vertex3DRenderer.java
145 145
      {
146 146
      mView = v;
147 147

  
148
      //mObject = new DistortedCubes( Vertex3DActivity.getCols(), Vertex3DActivity.getShape(), SIZE);
149
      mObject = new DistortedBitmap( SIZE, SIZE, 3);
148
      mObject = new DistortedCubes( Vertex3DActivity.getCols(), Vertex3DActivity.getShape(), SIZE);
149
      //mObject = new DistortedBitmap( SIZE, SIZE, 3);
150 150
      mCenter = new DistortedBitmap(SIZE, SIZE, 1);
151 151

  
152 152
      mObjWidth = mObject.getWidth();
src/main/res/layout/matrix3dlayout.xml
15 15
        android:layout_width="fill_parent"
16 16
        android:layout_height="wrap_content"
17 17
        android:onClick="Default"
18
        android:text="@string/Default" />
18
        android:text="@string/reset" />
19 19

  
20 20
    <ScrollView
21 21
        android:id="@+id/matrix3dscrollView"
src/main/res/layout/vertex3ddeform.xml
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
                android:id="@+id/vertex3dRowDeform"
4
                android:orientation="horizontal"
5
                android:layout_width="match_parent"
6
                android:layout_height="wrap_content" >
3
                          android:id="@+id/vertex3dRowDeform"
4
                          android:orientation="horizontal"
5
                          android:layout_width="match_parent"
6
                          android:layout_height="wrap_content"
7
                >
7 8

  
8 9
                <LinearLayout
9 10
                    android:layout_width="0dp"
......
18 19
                        android:layout_marginEnd="5dp"
19 20
                        android:layout_marginStart="5dp"
20 21
                        android:layout_marginTop="3dp"
21
                        android:textAppearance="?android:attr/textAppearanceLarge" />
22
                        />
22 23

  
23 24
                    <SeekBar
24 25
                        android:id="@+id/vertex3ddeformBar1"
src/main/res/layout/vertex3ddistort.xml
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2

  
3 3
            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4
                android:id="@+id/vertex3dRowDistort"
5
                android:layout_width="match_parent"
6
                android:layout_height="wrap_content"
7
                android:orientation="horizontal" >
4
                          android:id="@+id/vertex3dRowDistort"
5
                          android:layout_width="match_parent"
6
                          android:layout_height="wrap_content"
7
                          android:orientation="horizontal"
8
                >
8 9

  
9 10
                <LinearLayout
10 11
                    android:layout_width="0dp"
......
19 20
                        android:layout_marginEnd="5dp"
20 21
                        android:layout_marginStart="5dp"
21 22
                        android:layout_marginTop="3dp"
22
                        android:textAppearance="?android:attr/textAppearanceLarge" />
23
                        />
23 24

  
24 25
                    <SeekBar
25 26
                        android:id="@+id/vertex3ddistortBar1"
src/main/res/layout/vertex3dlayout.xml
14 14
        android:orientation="horizontal"
15 15
        android:layout_width="match_parent"
16 16
        android:layout_height="wrap_content"
17
        >
17
        android:layout_marginBottom="5dp"
18
        android:background="@android:color/holo_green_dark">
18 19

  
19 20
        <LinearLayout
20 21
            android:orientation="vertical"
......
23 24
            android:layout_weight="0.8">
24 25

  
25 26
            <TextView
27
                android:id="@+id/vertex3dcenterText"
26 28
                android:layout_width="wrap_content"
27 29
                android:layout_height="wrap_content"
28
                android:id="@+id/vertex3dcenterText"/>
30
                android:layout_marginEnd="5dp"
31
                android:layout_marginStart="5dp"
32
                android:layout_marginTop="3dp"
33
                />
29 34

  
30 35
            <LinearLayout
31 36
                android:orientation="horizontal"
32 37
                android:layout_width="match_parent"
33
                android:layout_height="match_parent">
38
                android:layout_height="match_parent"
39
                >
34 40

  
35 41
                <SeekBar
36 42
                    android:layout_width="fill_parent"
......
57 63
            android:layout_height="wrap_content"
58 64
            android:onClick="Default"
59 65
            android:text="@string/reset"
60
            android:layout_gravity="right"/>
66
            android:layout_gravity="right"
67
            android:layout_marginTop="3dp"/>
61 68
    </LinearLayout>
62 69

  
63 70
    <ScrollView
src/main/res/layout/vertex3dsink.xml
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2

  
3 3
            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4
                android:id="@+id/vertex3dRowSink"
5
                android:orientation="horizontal"
6
                android:layout_width="match_parent"
7
                android:layout_height="wrap_content" >
4
                          android:id="@+id/vertex3dRowSink"
5
                          android:orientation="horizontal"
6
                          android:layout_width="match_parent"
7
                          android:layout_height="wrap_content"
8
                >
8 9

  
9 10
                <LinearLayout
10 11
                    android:layout_width="0dp"
......
19 20
                        android:layout_marginEnd="5dp"
20 21
                        android:layout_marginStart="5dp"
21 22
                        android:layout_marginTop="3dp"
22
                        android:textAppearance="?android:attr/textAppearanceLarge" />
23
                        />
23 24

  
24 25
                    <SeekBar
25 26
                        android:id="@+id/vertex3dsinkBar1"
src/main/res/layout/vertex3dswirl.xml
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
                android:id="@+id/vertex3dRowSwirl"
4
                android:orientation="horizontal"
5
                android:layout_width="match_parent"
6
                android:layout_height="wrap_content" >
3
                          android:id="@+id/vertex3dRowSwirl"
4
                          android:orientation="horizontal"
5
                          android:layout_width="match_parent"
6
                          android:layout_height="wrap_content"
7
                >
7 8

  
8 9
                <LinearLayout
9 10
                    android:layout_width="0dp"
......
18 19
                        android:layout_marginEnd="5dp"
19 20
                        android:layout_marginStart="5dp"
20 21
                        android:layout_marginTop="3dp"
21
                        android:textAppearance="?android:attr/textAppearanceLarge" />
22
                        />
22 23

  
23 24
                    <SeekBar
24 25
                        android:id="@+id/vertex3dswirlBar1"

Also available in: Unified diff