Project

General

Profile

« Previous | Next » 

Revision d586fda6

Added by Leszek Koltunski over 4 years ago

Dynamics App: add checking a Dynamic4D.

View differences:

src/main/java/org/distorted/examples/dynamic/DynamicActivity.java
41 41

  
42 42
public class DynamicActivity extends Activity implements OnSeekBarChangeListener, AdapterView.OnItemSelectedListener
43 43
    {
44
    private TextView textD, textC, textN, textX;
45
    private int p0,p1,p2;
44
    private TextView textDuration, textCount, textNoise, textConvexity;
45
    private int mNoise0,mNoise1,mNoise2,mNoise3;
46 46
    private int mDim, mMode;
47 47

  
48 48
///////////////////////////////////////////////////////////////////////////////////////////////////
......
53 53
      super.onCreate(savedState);
54 54
      setContentView(R.layout.dynamicslayout);
55 55

  
56
      textD = findViewById(R.id.dynamicTextDuration);
57
      textC = findViewById(R.id.dynamicTextCount);
58
      textX = findViewById(R.id.dynamicTextConvexity);
59
      textN = findViewById(R.id.dynamicTextNoise);
56
      textDuration = findViewById(R.id.dynamicTextDuration);
57
      textCount    = findViewById(R.id.dynamicTextCount);
58
      textConvexity= findViewById(R.id.dynamicTextConvexity);
59
      textNoise    = findViewById(R.id.dynamicTextNoise);
60 60

  
61
      p0=p1=p2=0;
61
      mNoise0=mNoise1=mNoise2=mNoise3=0;
62 62
      mDim = DynamicSurfaceView.DIM_2D;
63 63
      mMode= Dynamic1D.MODE_LOOP;
64 64

  
......
77 77

  
78 78
      Spinner dimensionSpinner  = findViewById(R.id.dynamicSpinnerDimension);
79 79
      dimensionSpinner.setOnItemSelectedListener(this);
80
      String[] dimensions = { "Dimension 1" , "Dimension 2" , "Dimension 3 (XY)" , "Dimension 3 (XZ)" };
80
      String[] dimensions = { "Dimension 1" , "Dimension 2" , "Dimension 3 (XY)" , "Dimension 3 (XZ)" , "Dimension 4 (XY)" , "Dimension 4 (ZW)" };
81 81

  
82 82
      ArrayAdapter<String> adapterDim = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, dimensions );
83 83
      adapterDim.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
......
230 230
          case 1: setDim(DynamicSurfaceView.DIM_2D  ); break;
231 231
          case 2: setDim(DynamicSurfaceView.DIM_3DXY); break;
232 232
          case 3: setDim(DynamicSurfaceView.DIM_3DXZ); break;
233
          case 4: setDim(DynamicSurfaceView.DIM_4DXY); break;
234
          case 5: setDim(DynamicSurfaceView.DIM_4DZW); break;
233 235
          }
234 236
        }
235 237
      else if( spinnerID == R.id.dynamicSpinnerMode )
......
281 283
        int i = (int)(v/100);
282 284
        float t = i/10.0f;
283 285
        view.setDuration((int)v);
284
        textD.setText(getString(R.string.duration_placeholder, (int)t ));
286
        textDuration.setText(getString(R.string.duration_placeholder, (int)t ));
285 287
        }
286 288
      else if( id == R.id.dynamicSeekCount )
287 289
        {
288 290
        float count = progress*0.05f;
289 291
        view.setCount(count);
290
        textC.setText(getString(R.string.count_placeholder, count ));
292
        textCount.setText(getString(R.string.count_placeholder, count ));
291 293
        }
292 294
      else if( id == R.id.dynamicSeekConvexity )
293 295
        {
294 296
        float convexity = progress/25.0f - 1.0f;
295 297
        view.setConvexity(convexity);
296
        textX.setText(getString(R.string.convexity_placeholder, convexity ));
298
        textConvexity.setText(getString(R.string.convexity_placeholder, convexity ));
297 299
        }
298 300
      else
299 301
        {
300 302
        switch(id)
301 303
          {
302
          case R.id.dynamicSeekNoise0  : p0 = progress; break;
303
          case R.id.dynamicSeekNoise1  : p1 = progress; break;
304
          case R.id.dynamicSeekNoise2  : p2 = progress; break;
304
          case R.id.dynamicSeekNoise0  : mNoise0 = progress; break;
305
          case R.id.dynamicSeekNoise1  : mNoise1 = progress; break;
306
          case R.id.dynamicSeekNoise2  : mNoise2 = progress; break;
307
          case R.id.dynamicSeekNoise3  : mNoise3 = progress; break;
305 308
          }
306 309

  
307
        view.setNoise(p0/100.0f,p1/100.0f,p2/100.0f);
308
        textN.setText(getString(R.string.noise2_placeholder, (p0/100.f) , (p1/100.f), (p2/100.f) ));
310
        float n0 = mNoise0/100.f;
311
        float n1 = mNoise1/100.f;
312
        float n2 = mNoise2/100.f;
313
        float n3 = mNoise3/100.f;
314

  
315
        view.setNoise(n0,n1,n2,n3);
316
        textNoise.setText(getString(R.string.noise3_placeholder, n0,n1,n2,n3 ));
309 317
        }
310 318
      }
311 319

  

Also available in: Unified diff