Project

General

Profile

« Previous | Next » 

Revision a4d59c0b

Added by Leszek Koltunski over 5 years ago

Massive: make the coordinate system agree with that of OpenGL (i.e. invert the Y axis).

View differences:

src/main/java/org/distorted/examples/effectqueue/EffectQueueActivity.java
65 65
    mPosName = 0;
66 66
    mPosType = 0;
67 67

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

  
73 73
    mAdd.setOnItemSelectedListener(this);
74 74
    mID.setOnItemSelectedListener(this);
......
101 101
    adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
102 102
    mType.setAdapter(adapterType);
103 103

  
104
    mLayoutList = (TableLayout)findViewById(R.id.effects2dTableList);
104
    mLayoutList = findViewById(R.id.effects2dTableList);
105 105
    }
106 106

  
107 107
///////////////////////////////////////////////////////////////////////////////////////////////////
......
111 111
    {
112 112
    super.onResume();
113 113
      
114
    GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
114
    GLSurfaceView mView = findViewById(R.id.effects2dSurfaceView);
115 115
    mView.onResume();
116 116
    }
117 117

  
......
120 120
  @Override
121 121
  protected void onPause() 
122 122
    {
123
    GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
123
    GLSurfaceView mView = findViewById(R.id.effects2dSurfaceView);
124 124
    mView.onPause();
125 125

  
126 126
    Distorted.onPause();
......
150 150
    {
151 151
    switch(parent.getId())
152 152
      {
153
      case R.id.effects2d_spinnerAdd : EffectQueueSurfaceView v = (EffectQueueSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
153
      case R.id.effects2d_spinnerAdd : EffectQueueSurfaceView v = findViewById(R.id.effects2dSurfaceView);
154 154
                                       v.setEffect(pos); break;
155 155
      case R.id.effects2d_spinnerID  : mPosID   = pos; break;
156 156
      case R.id.effects2d_spinnerName: mPosName = pos; break;
......
171 171
    try
172 172
      {
173 173
      Long currEffect = (Long)mID.getItemAtPosition(mPosID);
174
      EffectQueueSurfaceView v = (EffectQueueSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
174
      EffectQueueSurfaceView v = findViewById(R.id.effects2dSurfaceView);
175 175
      v.getRenderer().getEffects().abortById(currEffect);
176 176
      }
177 177
    catch(IndexOutOfBoundsException ex)
......
196 196
      default: name = EffectName.CONTRAST     ;
197 197
      }
198 198

  
199
    EffectQueueSurfaceView v = (EffectQueueSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
199
    EffectQueueSurfaceView v = findViewById(R.id.effects2dSurfaceView);
200 200
    v.getRenderer().getEffects().abortByName(name);
201 201
    }
202 202

  
......
213 213
      default: type = EffectType.MATRIX;
214 214
      }
215 215

  
216
    EffectQueueSurfaceView v = (EffectQueueSurfaceView) this.findViewById(R.id.effects2dSurfaceView);
216
    EffectQueueSurfaceView v = findViewById(R.id.effects2dSurfaceView);
217 217
    v.getRenderer().getEffects().abortByType(type);
218 218
    }
219 219

  
......
230 230
      tr.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT));
231 231

  
232 232
      TextView b1 = new TextView(this);
233
      b1.setText("ID: "+effect.getID());
233
      b1.setText(getString(R.string.effect_id_placeholder,effect.getID()));
234 234
      b1.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT));
235 235
      tr.addView(b1);
236 236

  
......
245 245
      tr.addView(b3);
246 246

  
247 247
      TextView b4 = new TextView(this);
248
      b4.setText("LIVE");
248
      b4.setText(R.string.effect_live);
249 249
      b4.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT));
250 250
      tr.addView(b4);
251 251

  
......
297 297
        if( row!=null )
298 298
          {
299 299
          TextView v = (TextView)row.getVirtualChildAt(3);
300
          v.setText("FINISHED");
300
          v.setText(R.string.effect_finished);
301 301
          }
302 302
        }
303 303
      });

Also available in: Unified diff