Project

General

Profile

« Previous | Next » 

Revision 50ac40a6

Added by Leszek Koltunski almost 8 years ago

some improvements for the way we test DistortedObjects.

View differences:

src/main/java/org/distorted/examples/effects2d/Effects2DActivity.java
43 43

  
44 44
public class Effects2DActivity extends Activity implements AdapterView.OnItemSelectedListener
45 45
  {
46
  private Spinner mID, mName, mType;
47
  private static ArrayAdapter<String> mAdapterName, mAdapterType;
46
  private Spinner mAdd, mID, mName, mType;
47
  private static ArrayAdapter<String> mAdapterAdd, mAdapterName, mAdapterType;
48 48
  private static ArrayAdapter<Long> mAdapterID;
49 49

  
50 50
  private int mPosID, mPosName, mPosType;
......
65 65
    mPosName = 0;
66 66
    mPosType = 0;
67 67

  
68
    mAdd  = (Spinner)findViewById(R.id.effects2d_spinnerAdd );
68 69
    mID   = (Spinner)findViewById(R.id.effects2d_spinnerID  );
69 70
    mName = (Spinner)findViewById(R.id.effects2d_spinnerName);
70 71
    mType = (Spinner)findViewById(R.id.effects2d_spinnerType);
71 72

  
73
    mAdd.setOnItemSelectedListener(this);
72 74
    mID.setOnItemSelectedListener(this);
73 75
    mName.setOnItemSelectedListener(this);
74 76
    mType.setOnItemSelectedListener(this);
......
83 85

  
84 86
    String[] itemsType = new String[] {"VERTEX", "FRAGMENT"};
85 87

  
88
    mAdapterAdd = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, itemsName);
89
    mAdapterAdd.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
90
    mAdd.setAdapter(mAdapterAdd);
91

  
86 92
    mAdapterID = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, itemsID);
87 93
    mAdapterID.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
88 94
    mID.setAdapter(mAdapterID);
......
136 142
    Distorted.onDestroy();
137 143
    super.onDestroy();
138 144
    }     
139
 
140
///////////////////////////////////////////////////////////////////////////////////////////////////
141
    
142
  public void Distort(View v)
143
    {
144
    Effects2DSurfaceView.setEffect(0);
145
    }     
146
    
147
///////////////////////////////////////////////////////////////////////////////////////////////////
148

  
149
  public void Sink(View v)
150
    {
151
    Effects2DSurfaceView.setEffect(1);
152
    }       
153

  
154
///////////////////////////////////////////////////////////////////////////////////////////////////
155
    
156
  public void Transparency(View v)
157
    {
158
    Effects2DSurfaceView.setEffect(2);
159
    }     
160
    
161
///////////////////////////////////////////////////////////////////////////////////////////////////
162

  
163
  public void Macroblock(View v)
164
    {
165
    Effects2DSurfaceView.setEffect(3);
166
    }       
167
 
168
///////////////////////////////////////////////////////////////////////////////////////////////////
169

  
170
  public void Chroma(View v)
171
    {
172
    Effects2DSurfaceView.setEffect(4);
173
    }
174 145

  
175 146
///////////////////////////////////////////////////////////////////////////////////////////////////
176 147

  
......
178 149
    {
179 150
    switch(parent.getId())
180 151
      {
152
      case R.id.effects2d_spinnerAdd : Effects2DSurfaceView.setEffect(pos); break;
181 153
      case R.id.effects2d_spinnerID  : mPosID   = pos; break;
182 154
      case R.id.effects2d_spinnerName: mPosName = pos; break;
183 155
      case R.id.effects2d_spinnerType: mPosType = pos; break;

Also available in: Unified diff