Project

General

Profile

« Previous | Next » 

Revision 0ba5de00

Added by Leszek Koltunski about 4 years ago

Fixes for the merge.

View differences:

src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeActivity.java
41 41 
      {
42 42 
      super.onCreate(savedState);
43 43 
      setContentView(R.layout.postprocesstreelayout);
44 
      mText = (TextView)findViewById(R.id.postprocesstreeText);
45 
      SeekBar bar = (SeekBar)findViewById(R.id.postprocesstreeSeek);
44 
      mText = findViewById(R.id.postprocesstreeText);
45 
      SeekBar bar = findViewById(R.id.postprocesstreeSeek);
46 46 
      bar.setOnSeekBarChangeListener(this);
47 47 
      bar.setProgress(50);
48 48 
      }
......
52 52 
    @Override
53 53 
    protected void onPause()
54 54 
      {
55 
      GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.postprocesstreeSurfaceView);
55 
      GLSurfaceView view = findViewById(R.id.postprocesstreeSurfaceView);
56 56 
      view.onPause();
57 57 
      DistortedLibrary.onPause();
58 58 
      super.onPause();
......
64 64 
    protected void onResume()
65 65 
      {
66 66 
      super.onResume();
67 
      GLSurfaceView view = (GLSurfaceView) this.findViewById(R.id.postprocesstreeSurfaceView);
67 
      GLSurfaceView view = findViewById(R.id.postprocesstreeSurfaceView);
68 68 
      view.onResume();
69 69 
      }
70 70 

  		




  ......




  81
  81
  
    

  		




  82
  82
  
    
    public void onProgressChanged(SeekBar bar, int progress, boolean fromUser)


  		




  83
  83
  
    
      {


  		




  84
  
  
    
      PostprocessTreeSurfaceView view = (PostprocessTreeSurfaceView) this.findViewById(R.id.postprocesstreeSurfaceView);


  		




  
  84
  
    
      PostprocessTreeSurfaceView view = findViewById(R.id.postprocesstreeSurfaceView);


  		




  85
  85
  
    

  		




  86
  86
  
    
      switch (bar.getId())


  		




  87
  87
  
    
        {


  		












Also available in:  Unified diff