Project

General

Profile

« Previous | Next » 

Revision 30c71dd5

Added by Leszek Koltunski over 7 years ago

Remove 'statics' from the Deform app

View differences:

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

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

  
61
      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
62

  
63
      view.getRenderer().setMode(EffectNames.DISTORT);
61 64
      }
62 65

  
63 66
///////////////////////////////////////////////////////////////////////////////////////////////////
......
65 68
    @Override
66 69
    protected void onPause() 
67 70
      {
68
      DeformRenderer.onPause();
69
      
70
      GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView);
71
      mView.onPause();
72
      
71
      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
72

  
73
      view.getRenderer().onPause();
74
      view.onPause();
73 75
      super.onPause();
74 76
      }
75 77

  
......
80 82
      {
81 83
      super.onResume();
82 84
      
83
      GLSurfaceView mView = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView);
84
      mView.onResume();
85
      GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView);
86
      view.onResume();
85 87
      }
86 88
 
87 89
///////////////////////////////////////////////////////////////////////////////////////////////////
......
97 99
    
98 100
    public void Distort(View v)
99 101
      {
100
      DeformRenderer.setMode(EffectNames.DISTORT);
102
      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
103
      view.getRenderer().setMode(EffectNames.DISTORT);
101 104
      }     
102 105
    
103 106
///////////////////////////////////////////////////////////////////////////////////////////////////
104 107

  
105 108
    public void Deform(View v)
106 109
      {
107
      DeformRenderer.setMode(EffectNames.DEFORM);
110
      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
111
      view.getRenderer().setMode(EffectNames.DEFORM);
108 112
      }       
109 113

  
110 114
///////////////////////////////////////////////////////////////////////////////////////////////////
111 115

  
112 116
    public void Shear(View v)
113 117
      {
114
      DeformRenderer.setMode(EffectNames.SHEAR);
118
      DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
119
      view.getRenderer().setMode(EffectNames.SHEAR);
115 120
      }       
116 121
    
117 122
///////////////////////////////////////////////////////////////////////////////////////////////////
......
120 125
      {
121 126
      switch (bar.getId()) 
122 127
        {
123
        case R.id.deformSeekRadius: DeformRenderer.setRegionRadius(progress);
124
                              textR.setText("Radius: "+progress);
125
                              break;
128
        case R.id.deformSeekRadius: DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);
129
                                    view.getRenderer().setRegionRadius(progress);
130
                                    textR.setText("Radius: "+progress);
131
                                    break;
126 132
        }
127 133
      }
128 134

  

Also available in: Unified diff