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/triblur/TriblurActivity.java
25 25
import android.view.View;
26 26
import android.widget.AdapterView;
27 27
import android.widget.ArrayAdapter;
28
import android.widget.CheckBox;
29 28
import android.widget.SeekBar;
30 29
import android.widget.Spinner;
31 30

  
......
106 105
        {
107 106
        case R.id.triblur_spinnerQuality: privateQuality(pos);
108 107
                                          break;
109
        case R.id.triblur_spinnerMode   : TriblurSurfaceView v = this.findViewById(R.id.triblurSurfaceView);
108
        case R.id.triblur_spinnerMode   : TriblurSurfaceView v = findViewById(R.id.triblurSurfaceView);
110 109
                                          TriblurRenderer renderer = v.getRenderer();
111 110
                                          renderer.setRenderModeToOIT(pos==1);
112 111
                                          break;
......
124 123
    @Override
125 124
    protected void onPause() 
126 125
      {
127
      GLSurfaceView view = this.findViewById(R.id.triblurSurfaceView);
126
      GLSurfaceView view = findViewById(R.id.triblurSurfaceView);
128 127
      view.onPause();
129 128
      Distorted.onPause();
130 129
      super.onPause();
......
136 135
    protected void onResume() 
137 136
      {
138 137
      super.onResume();
139
      GLSurfaceView view = this.findViewById(R.id.triblurSurfaceView);
138
      GLSurfaceView view = findViewById(R.id.triblurSurfaceView);
140 139
      view.onResume();
141 140
      }
142 141
    
......
156 155
      {
157 156
      super.onSaveInstanceState(savedInstanceState);
158 157

  
159
      TriblurSurfaceView view = this.findViewById(R.id.triblurSurfaceView);
158
      TriblurSurfaceView view = findViewById(R.id.triblurSurfaceView);
160 159
      TriblurRenderer renderer = view.getRenderer();
161 160

  
162 161
      savedInstanceState.putIntArray("effects", renderer.getEffects() );
......
173 172

  
174 173
      int[] effects = savedInstanceState.getIntArray("effects");
175 174

  
176
      TriblurSurfaceView view = this.findViewById(R.id.triblurSurfaceView);
175
      TriblurSurfaceView view = findViewById(R.id.triblurSurfaceView);
177 176
      TriblurRenderer renderer = view.getRenderer();
178 177

  
179 178
      if( effects!=null )
......
197 196
      {
198 197
      switch (bar.getId())
199 198
        {
200
        case R.id.triblurSeek0: TriblurSurfaceView view0 = this.findViewById(R.id.triblurSurfaceView);
199
        case R.id.triblurSeek0: TriblurSurfaceView view0 = findViewById(R.id.triblurSurfaceView);
201 200
                                view0.getRenderer().setRange(0,progress);
202 201
                                break;
203
        case R.id.triblurSeek1: TriblurSurfaceView view1 = this.findViewById(R.id.triblurSurfaceView);
202
        case R.id.triblurSeek1: TriblurSurfaceView view1 = findViewById(R.id.triblurSurfaceView);
204 203
                                view1.getRenderer().setRange(1,progress);
205 204
                                break;
206
        case R.id.triblurSeek2: TriblurSurfaceView view2 = this.findViewById(R.id.triblurSurfaceView);
205
        case R.id.triblurSeek2: TriblurSurfaceView view2 = findViewById(R.id.triblurSurfaceView);
207 206
                                view2.getRenderer().setRange(2,progress);
208 207
                                break;
209 208
        }
......
239 238

  
240 239
  private void privateEffect(int index)
241 240
    {
242
    TriblurSurfaceView view = this.findViewById(R.id.triblurSurfaceView);
241
    TriblurSurfaceView view = findViewById(R.id.triblurSurfaceView);
243 242
    TriblurRenderer renderer = view.getRenderer();
244 243

  
245 244
    switch(index)
......
272 271

  
273 272
  private void privateBackgroundColor(int index)
274 273
    {
275
    TriblurSurfaceView view = this.findViewById(R.id.triblurSurfaceView);
274
    TriblurSurfaceView view = findViewById(R.id.triblurSurfaceView);
276 275
    TriblurRenderer renderer = view.getRenderer();
277 276

  
278 277
    switch(index)
......
287 286

  
288 287
  private void privateQuality(int index)
289 288
    {
290
    TriblurSurfaceView view = this.findViewById(R.id.triblurSurfaceView);
289
    TriblurSurfaceView view = findViewById(R.id.triblurSurfaceView);
291 290
    TriblurRenderer renderer = view.getRenderer();
292 291

  
293 292
    switch(index)

Also available in: Unified diff