Project

General

Profile

« Previous | Next » 

Revision 2666a48c

Added by Leszek Koltunski about 5 years ago

1. Change the API of Dynamic: split makeNowRunFor into two separate 'setDuration' and 'resetToBeginning'
2. Major changes to the 'Dynamic' app so that we can check more about the Dynamics.

View differences:

src/main/java/org/distorted/examples/dynamic/DynamicActivity.java
20 20
package org.distorted.examples.dynamic;
21 21

  
22 22
import org.distorted.library.main.DistortedLibrary;
23
import org.distorted.library.type.Dynamic;
23 24
import org.distorted.library.type.Dynamic1D;
24 25
import org.distorted.examples.R;
25 26

  
......
27 28
import android.opengl.GLSurfaceView;
28 29
import android.os.Bundle;
29 30
import android.view.View;
31
import android.widget.AdapterView;
32
import android.widget.ArrayAdapter;
30 33
import android.widget.SeekBar;
34
import android.widget.Spinner;
31 35
import android.widget.TextView;
32 36
import android.widget.SeekBar.OnSeekBarChangeListener;
33 37

  
34 38
///////////////////////////////////////////////////////////////////////////////////////////////////
35 39

  
36
public class DynamicActivity extends Activity implements OnSeekBarChangeListener
40
public class DynamicActivity extends Activity implements OnSeekBarChangeListener, AdapterView.OnItemSelectedListener
37 41
    {
38
    private TextView textD, textN;
42
    private TextView textD, textC, textN;
39 43
    private int p0,p1,p2;
40 44
    private int mDim, mMode;
41 45

  
......
46 50
      super.onCreate(savedState);
47 51
      setContentView(R.layout.dynamicslayout);
48 52

  
49
      textD = (TextView)findViewById(R.id.dynamicTextDuration);
50
      textN = (TextView)findViewById(R.id.dynamicTextNoise);
53
      textD = findViewById(R.id.dynamicTextDuration);
54
      textC = findViewById(R.id.dynamicTextCount);
55
      textN = findViewById(R.id.dynamicTextNoise);
51 56

  
52 57
      p0=p1=p2=0;
53 58
      mDim = DynamicSurfaceView.DIM_2D;
54 59
      mMode= Dynamic1D.MODE_LOOP;
55 60

  
56
      SeekBar barD = (SeekBar)findViewById(R.id.dynamicSeekDuration);
61
      SeekBar barD = findViewById(R.id.dynamicSeekDuration);
57 62
      barD.setOnSeekBarChangeListener(this);
58
      SeekBar bar0 = (SeekBar)findViewById(R.id.dynamicSeekNoise0);
63
      SeekBar barC = findViewById(R.id.dynamicSeekCount);
64
      barC.setOnSeekBarChangeListener(this);
65
      SeekBar bar0 = findViewById(R.id.dynamicSeekNoise0);
59 66
      bar0.setOnSeekBarChangeListener(this);
60
      SeekBar bar1 = (SeekBar)findViewById(R.id.dynamicSeekNoise1);
67
      SeekBar bar1 = findViewById(R.id.dynamicSeekNoise1);
61 68
      bar1.setOnSeekBarChangeListener(this);
62
      SeekBar bar2 = (SeekBar)findViewById(R.id.dynamicSeekNoise2);
69
      SeekBar bar2 = findViewById(R.id.dynamicSeekNoise2);
63 70
      bar2.setOnSeekBarChangeListener(this);
64 71

  
72
      Spinner dimensionSpinner  = findViewById(R.id.dynamicSpinnerDimension);
73
      dimensionSpinner.setOnItemSelectedListener(this);
74
      String[] dimensions = { "Dimension 1" , "Dimension 2" , "Dimension 3 (XY)" , "Dimension 3 (XZ)" };
75

  
76
      ArrayAdapter<String> adapterDim = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, dimensions );
77
      adapterDim.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
78
      dimensionSpinner.setAdapter(adapterDim);
79
      dimensionSpinner.setSelection(1);
80

  
81
      Spinner modeSpinner  = findViewById(R.id.dynamicSpinnerMode);
82
      modeSpinner.setOnItemSelectedListener(this);
83
      String[] modes = { "MODE_LOOP" , "MODE_PATH" , "MODE_JUMP" };
84

  
85
      ArrayAdapter<String> adapterMode = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, modes );
86
      adapterMode.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
87
      modeSpinner.setAdapter(adapterMode);
88

  
65 89
      if( savedState==null )
66 90
        {
67 91
        barD.setProgress(50);
92
        barC.setProgress(20);
68 93
        bar0.setProgress(0);
69 94
        bar1.setProgress(0);
70 95
        bar2.setProgress(0);
......
77 102
      {
78 103
      super.onResume();
79 104
      
80
      GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
105
      GLSurfaceView view = findViewById(R.id.dynamicSurfaceView);
81 106
      view.onResume();
82 107
      }
83 108

  
......
85 110
    @Override
86 111
    protected void onPause() 
87 112
      {
88
      GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
113
      GLSurfaceView view = findViewById(R.id.dynamicSurfaceView);
89 114
      view.onPause();
90 115

  
91 116
      DistortedLibrary.onPause();
......
106 131
      DistortedLibrary.onDestroy();
107 132
      super.onDestroy();
108 133
      }     
109
 
110
///////////////////////////////////////////////////////////////////////////////////////////////////
111
    
112
    public void Loop(View v)
113
      {
114
      DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
115
      view.setMode(Dynamic1D.MODE_LOOP);
116
      mMode = Dynamic1D.MODE_LOOP;
117
      }     
118
    
119
///////////////////////////////////////////////////////////////////////////////////////////////////
120

  
121
    public void Path(View v)
122
      {
123
      DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
124
      view.setMode(Dynamic1D.MODE_PATH);
125
      mMode = Dynamic1D.MODE_PATH;
126
      }  
127 134

  
128 135
///////////////////////////////////////////////////////////////////////////////////////////////////
129 136

  
130
    public void Jump(View v)
137
    public void setDim(int dim)
131 138
      {
132
      DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
133
      view.setMode(Dynamic1D.MODE_JUMP);
134
      mMode = Dynamic1D.MODE_JUMP;
135
      }  
136
    
139
      DynamicSurfaceView view = findViewById(R.id.dynamicSurfaceView);
140
      view.setDimension(dim);
141
      mDim = dim;
142
      }
143

  
137 144
///////////////////////////////////////////////////////////////////////////////////////////////////
138 145

  
139
    public void Dim1D(View v)
146
    public void setMode(int mode)
140 147
      {
141
      DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
142
      view.setDimension(DynamicSurfaceView.DIM_1D);
143
      mDim = DynamicSurfaceView.DIM_1D;
144
      }  
148
      DynamicSurfaceView view = findViewById(R.id.dynamicSurfaceView);
149
      view.setMode(mode);
150
      mMode = mode;
151
      }
145 152

  
146 153
///////////////////////////////////////////////////////////////////////////////////////////////////
147 154

  
148
    public void Dim2D(View v)
155
    public void Start(View v)
149 156
      {
150
      DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
151
      view.setDimension(DynamicSurfaceView.DIM_2D);
152
      mDim = DynamicSurfaceView.DIM_2D;
153
      }  
154
    
157
      DynamicSurfaceView view = findViewById(R.id.dynamicSurfaceView);
158
      view.startDynamic();
159
      }
160

  
155 161
///////////////////////////////////////////////////////////////////////////////////////////////////
156 162

  
157
    public void Dim3DXY(View v)
163
    public void Reset(View v)
158 164
      {
159
      DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
160
      view.setDimension(DynamicSurfaceView.DIM_3DXY);
161
      mDim = DynamicSurfaceView.DIM_3DXY;
162
      }  
165
      DynamicSurfaceView view = findViewById(R.id.dynamicSurfaceView);
166
      view.resetPoints();
167
      view.stopDynamic();
168
      }
163 169

  
164 170
///////////////////////////////////////////////////////////////////////////////////////////////////
165 171

  
166
    public void Dim3DXZ(View v)
172
    public void onItemSelected(AdapterView<?> parent, View view, int pos, long id)
167 173
      {
168
      DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
169
      view.setDimension(DynamicSurfaceView.DIM_3DXZ);
170
      mDim = DynamicSurfaceView.DIM_3DXZ;
171
      }  
174
      int spinnerID = parent.getId();
175

  
176
      if( spinnerID == R.id.dynamicSpinnerDimension )
177
        {
178
        switch(pos)
179
          {
180
          case 0: setDim(DynamicSurfaceView.DIM_1D  ); break;
181
          case 1: setDim(DynamicSurfaceView.DIM_2D  ); break;
182
          case 2: setDim(DynamicSurfaceView.DIM_3DXY); break;
183
          case 3: setDim(DynamicSurfaceView.DIM_3DXZ); break;
184
          }
185
        }
186
      else if( spinnerID == R.id.dynamicSpinnerMode )
187
        {
188
        switch(pos)
189
          {
190
          case 0: setMode(Dynamic.MODE_LOOP); break;
191
          case 1: setMode(Dynamic.MODE_PATH); break;
192
          case 2: setMode(Dynamic.MODE_JUMP); break;
193
          }
194
        }
195
      }
172 196

  
173 197
///////////////////////////////////////////////////////////////////////////////////////////////////
174 198

  
......
191 215
      mDim = savedInstanceState.getInt("dim");
192 216
      mMode= savedInstanceState.getInt("mode");
193 217

  
194
      switch(mDim)
195
        {
196
        case DynamicSurfaceView.DIM_1D  : Dim1D(null)  ; break;
197
        case DynamicSurfaceView.DIM_2D  : Dim2D(null)  ; break;
198
        case DynamicSurfaceView.DIM_3DXY: Dim3DXY(null); break;
199
        case DynamicSurfaceView.DIM_3DXZ: Dim3DXZ(null); break;
200
        }
201

  
202
      switch(mMode)
203
        {
204
        case Dynamic1D.MODE_JUMP: Jump(null); break;
205
        case Dynamic1D.MODE_PATH: Path(null); break;
206
        case Dynamic1D.MODE_LOOP: Loop(null); break;
207
        }
218
      setDim(mDim);
219
      setMode(mMode);
208 220
      }
209 221

  
210
///////////////////////////////////////////////////////////////////
211
    
222
///////////////////////////////////////////////////////////////////////////////////////////////////
223

  
212 224
    public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) 
213 225
      {
214
      DynamicSurfaceView view = (DynamicSurfaceView) this.findViewById(R.id.dynamicSurfaceView);
226
      DynamicSurfaceView view = findViewById(R.id.dynamicSurfaceView);
215 227
      int id = bar.getId();
216 228

  
217 229
      if( id == R.id.dynamicSeekDuration )
......
220 232
        int i = (int)(v/100);
221 233
        float t = i/10.0f;
222 234
        view.setDuration((int)v);
223
        textD.setText("Duration: "+(int)t+" s");
235
        textD.setText(getString(R.string.duration_placeholder, (int)t ));
236
        }
237
      else if( id == R.id.dynamicSeekCount )
238
        {
239
        float count = progress*0.05f;
240
        view.setCount(count);
241
        textC.setText(getString(R.string.count_placeholder, count ));
224 242
        }
225 243
      else
226 244
        {
......
232 250
          }
233 251

  
234 252
        view.setNoise(p0/100.0f,p1/100.0f,p2/100.0f);
235
        textN.setText("Noise: "+(p0/100.f)+" "+(p1/100.f)+" "+(p2/100.f));
253
        textN.setText(getString(R.string.noise2_placeholder, (p0/100.f) , (p1/100.f), (p2/100.f) ));
236 254
        }
237 255
      }
238 256

  
239
///////////////////////////////////////////////////////////////////
257
///////////////////////////////////////////////////////////////////////////////////////////////////
240 258

  
241 259
    public void onStartTrackingTouch(SeekBar bar) { }
242
    
243
///////////////////////////////////////////////////////////////////
244

  
245 260
    public void onStopTrackingTouch(SeekBar bar)  { }
246
    
247
///////////////////////////////////////////////////////////////////
248
// end of file
261
    public void onNothingSelected(AdapterView<?> parent) { }
249 262
}

Also available in: Unified diff