Project

General

Profile

« Previous | Next » 

Revision 7abd1d00

Added by Leszek Koltunski almost 8 years ago

make the 'Deform' app much more flexible (now we can mix effects atthe same time!)

View differences:

src/main/java/org/distorted/examples/deform/DeformActivity.java
21 21

  
22 22
import org.distorted.library.Distorted;
23 23
import org.distorted.examples.R;
24
import org.distorted.library.EffectNames;
24 25

  
25 26
import android.app.Activity;
26 27
import android.opengl.GLSurfaceView;
......
35 36

  
36 37
public class DeformActivity extends Activity implements OnSeekBarChangeListener
37 38
{
38
    private SeekBar barR;
39 39
    private TextView textR;
40
    private RadioButton effect;
41
    
40

  
42 41
///////////////////////////////////////////////////////////////////////////////////////////////////
43 42
    
44 43
    @Override
......
46 45
      {
47 46
      super.onCreate(icicle);
48 47
      setContentView(R.layout.deformlayout);
49
       
50
      barR = (SeekBar)findViewById(R.id.deformSeekRadius);
48

  
49
      SeekBar barR = (SeekBar)findViewById(R.id.deformSeekRadius);
51 50
      barR.setOnSeekBarChangeListener(this); 
52 51
        
53 52
      textR = (TextView)findViewById(R.id.deformTextRadius);
......
55 54
      barR.setProgress(50);
56 55
      
57 56
      textR.setText("Radius: 50");
58
      
59
      effect = (RadioButton)findViewById(R.id.deformDistortButton);
57

  
58
      RadioButton effect = (RadioButton)findViewById(R.id.deformDistortButton);
60 59
      effect.setChecked(true);
61
      DeformRenderer.setMode(DeformRenderer.MODE_DISTORT);
60
      DeformRenderer.setMode(EffectNames.DISTORT);
62 61
      }
63 62

  
64 63
///////////////////////////////////////////////////////////////////////////////////////////////////
......
90 89
    @Override
91 90
    protected void onDestroy() 
92 91
      {
93
      android.util.Log.e("activity","onDestroy");  
94
      
95
      Distorted.onDestroy();  
92
      Distorted.onDestroy();
96 93
      super.onDestroy();
97 94
      }
98 95
 
......
100 97
    
101 98
    public void Distort(View v)
102 99
      {
103
      DeformRenderer.setMode(DeformRenderer.MODE_DISTORT);
100
      DeformRenderer.setMode(EffectNames.DISTORT);
104 101
      }     
105 102
    
106 103
///////////////////////////////////////////////////////////////////////////////////////////////////
107 104

  
108 105
    public void Deform(View v)
109 106
      {
110
      DeformRenderer.setMode(DeformRenderer.MODE_DEFORM);
107
      DeformRenderer.setMode(EffectNames.DEFORM);
111 108
      }       
112 109

  
113 110
///////////////////////////////////////////////////////////////////////////////////////////////////
114 111

  
115 112
    public void Shear(View v)
116 113
      {
117
      DeformRenderer.setMode(DeformRenderer.MODE_SHEAR);
114
      DeformRenderer.setMode(EffectNames.SHEAR);
118 115
      }       
119 116
    
120 117
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff