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/deform/DeformActivity.java
47 47 
      super.onCreate(savedState);
48 48 
      setContentView(R.layout.deformlayout);
49 49 

  		




  50
  
  
    
      textR = (TextView)findViewById(R.id.deformTextRadius);


  		




  
  50
  
    
      textR = findViewById(R.id.deformTextRadius);


  		




  51
  51
  
    

  		




  52
  
  
    
      SeekBar barR = (SeekBar)findViewById(R.id.deformSeekRadius);


  		




  
  52
  
    
      SeekBar barR = findViewById(R.id.deformSeekRadius);


  		




  53
  53
  
    
      barR.setOnSeekBarChangeListener(this);


  		




  54
  54
  
    

  		




  55
  55
  
    
      if( savedState==null )


  		




  56
  56
  
    
        {


  		




  57
  57
  
    
        barR.setProgress(50);


  		




  58
  
  
    
        RadioButton effect = (RadioButton)findViewById(R.id.deformDistortButton);


  		




  
  58
  
    
        RadioButton effect = findViewById(R.id.deformDistortButton);


  		




  59
  59
  
    
        effect.setChecked(true);


  		




  60
  60
  
    
        Distort(null);


  		




  61
  61
  
    
        }


  		




  ......




  66
  66
  
    
    @Override


  		




  67
  67
  
    
    protected void onPause() 


  		




  68
  68
  
    
      {


  		




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


  		




  
  69
  
    
      DeformSurfaceView view = findViewById(R.id.deformSurfaceView);


  		




  70
  70
  
    

  		




  71
  71
  
    
      Distorted.onPause();


  		




  72
  72
  
    
      view.onPause();


  		




  ......




  80
  80
  
    
      {


  		




  81
  81
  
    
      super.onResume();


  		




  82
  82
  
    
      


  		




  83
  
  
    
      GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.deformSurfaceView);


  		




  
  83
  
    
      GLSurfaceView view = findViewById(R.id.deformSurfaceView);


  		




  84
  84
  
    
      view.onResume();


  		




  85
  85
  
    
      }


  		




  86
  86
  
    
 


  		




  ......




  97
  97
  
    
    


  		




  98
  98
  
    
    public void Distort(View v)


  		




  99
  99
  
    
      {


  		




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


  		




  
  100
  
    
      DeformSurfaceView view = findViewById(R.id.deformSurfaceView);


  		




  101
  101
  
    
      view.getRenderer().setMode(EffectName.DISTORT);


  		




  102
  102
  
    
      mCurrEffect = EffectName.DISTORT;


  		




  103
  103
  
    
      }     


  		




  ......




  106
  106
  
    

  		




  107
  107
  
    
    public void Deform(View v)


  		




  108
  108
  
    
      {


  		




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


  		




  
  109
  
    
      DeformSurfaceView view = findViewById(R.id.deformSurfaceView);


  		




  110
  110
  
    
      view.getRenderer().setMode(EffectName.DEFORM);


  		




  111
  111
  
    
      mCurrEffect = EffectName.DEFORM;


  		




  112
  112
  
    
      }       


  		




  ......




  115
  115
  
    

  		




  116
  116
  
    
    public void Shear(View v)


  		




  117
  117
  
    
      {


  		




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


  		




  
  118
  
    
      DeformSurfaceView view = findViewById(R.id.deformSurfaceView);


  		




  119
  119
  
    
      view.getRenderer().setMode(EffectName.SHEAR);


  		




  120
  120
  
    
      mCurrEffect = EffectName.SHEAR;


  		




  121
  121
  
    
      }       


  		




  ......




  149
  149
  
    
      {


  		




  150
  150
  
    
      switch (bar.getId()) 


  		




  151
  151
  
    
        {


  		




  152
  
  
    
        case R.id.deformSeekRadius: DeformSurfaceView view = (DeformSurfaceView) this.findViewById(R.id.deformSurfaceView);


  		




  
  152
  
    
        case R.id.deformSeekRadius: DeformSurfaceView view = findViewById(R.id.deformSurfaceView);


  		




  153
  153
  
    
                                    view.getRenderer().setRegionRadius(progress);


  		




  154
  154
  
    
                                    textR.setText(getString(R.string.radius_placeholder,(progress<100 ? (""+progress): "Infinity") ));


  		




  155
  155
  
    
                                    break;


  		












Also available in:  Unified diff