Project

General

Profile

« Previous | Next » 

Revision 3f07bedc

Added by Leszek Koltunski over 7 years ago

Tidy up the 'Effects3D'

View differences:

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

  
50 49
  private int mPosID, mPosName, mPosType;
......
85 84

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

  
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 87

  
92 88
    mAdapterID = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, itemsID);
93 89
    mAdapterID.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
94 90
    mID.setAdapter(mAdapterID);
95 91

  
96
    mAdapterName = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, itemsName);
97
    mAdapterName.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
98
    mName.setAdapter(mAdapterName);
92
    ArrayAdapter<String> adapterAdd = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, itemsName);
93
    adapterAdd.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
94
    mAdd.setAdapter(adapterAdd);
99 95

  
100
    mAdapterType = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, itemsType);
101
    mAdapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
102
    mType.setAdapter(mAdapterType);
96
    ArrayAdapter<String> adapterName = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, itemsName);
97
    adapterName.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
98
    mName.setAdapter(adapterName);
99

  
100
    ArrayAdapter<String> adapterType = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, itemsType);
101
    adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
102
    mType.setAdapter(adapterType);
103 103

  
104 104
    mLayoutList = (TableLayout)findViewById(R.id.effects2dTableList);
105 105
    }
......
149 149
    {
150 150
    switch(parent.getId())
151 151
      {
152
      case R.id.effects2d_spinnerAdd : Effects2DSurfaceView.setEffect(pos); break;
152
      case R.id.effects2d_spinnerAdd : Effects2DSurfaceView v = (Effects2DSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
153
                                       v.setEffect(pos); break;
153 154
      case R.id.effects2d_spinnerID  : mPosID   = pos; break;
154 155
      case R.id.effects2d_spinnerName: mPosName = pos; break;
155 156
      case R.id.effects2d_spinnerType: mPosType = pos; break;
......
168 169
    {
169 170
    Long currID = (Long)mID.getItemAtPosition(mPosID);
170 171

  
171
    Effects2DRenderer.mBackground.abortEffect(currID);
172
    Effects2DSurfaceView v = (Effects2DSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
173
    v.getRenderer().mBackground.abortEffect(currID);
172 174
    }
173 175

  
174 176
///////////////////////////////////////////////////////////////////////////////////////////////////
......
187 189
      default: name = EffectNames.CONTRAST     ;
188 190
      }
189 191

  
190
    Effects2DRenderer.mBackground.abortEffects(name);
192
    Effects2DSurfaceView v = (Effects2DSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
193
    v.getRenderer().mBackground.abortEffects(name);
191 194
    }
192 195

  
193 196
///////////////////////////////////////////////////////////////////////////////////////////////////
......
203 206
      default: type = EffectTypes.MATRIX;
204 207
      }
205 208

  
206
    Effects2DRenderer.mBackground.abortEffects(type);
209
    Effects2DSurfaceView v = (Effects2DSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
210
    v.getRenderer().mBackground.abortEffects(type);
207 211
    }
208 212

  
209 213
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff