Project

General

Profile

« Previous | Next » 

Revision 0dc8ffef

Added by Leszek Koltunski almost 4 years ago

Progress with Predeform.

View differences:

src/main/java/org/distorted/examples/predeform/PredeformActivity2.java
56 56
    @Override
57 57
    protected void onPause() 
58 58
      {
59
      GLSurfaceView mView = this.findViewById(R.id.predeformSurfaceView);
59
      GLSurfaceView mView = findViewById(R.id.predeform2SurfaceView);
60 60
      if( mView!=null ) mView.onPause();
61 61

  
62 62
      DistortedLibrary.onPause();
......
70 70
      {
71 71
      super.onResume();
72 72
      
73
      GLSurfaceView mView = this.findViewById(R.id.predeformSurfaceView);
73
      GLSurfaceView mView = findViewById(R.id.predeform2SurfaceView);
74 74
      if( mView!=null ) mView.onResume();  
75 75
      }
76 76
    
......
107 107

  
108 108
      setContentView(R.layout.predeformlayout);
109 109

  
110
      Spinner renderSpinner = findViewById(R.id.predeformSpinnerMode);
110
      Spinner renderSpinner = findViewById(R.id.predeform2SpinnerMode);
111 111
      renderSpinner.setOnItemSelectedListener(this);
112 112

  
113 113
      String[] objectBitmap = new String[] { "Render: Normal", "Render: OIT" };
......
116 116
      adapterBitmap.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
117 117
      renderSpinner.setAdapter(adapterBitmap);
118 118

  
119
      mTextLevel = findViewById(R.id.predeformInflateText);
119
      mTextLevel = findViewById(R.id.predeform2InflateText);
120 120

  
121
      SeekBar transparencyBar = findViewById(R.id.predeformTransparency);
121
      SeekBar transparencyBar = findViewById(R.id.predeform2Transparency);
122 122
      transparencyBar.setOnSeekBarChangeListener(this);
123 123
      transparencyBar.setProgress(50);
124 124

  
125
      SeekBar inflateBar = findViewById(R.id.predeformInflateLevel);
125
      SeekBar inflateBar = findViewById(R.id.predeform2InflateLevel);
126 126
      inflateBar.setOnSeekBarChangeListener(this);
127 127
      inflateBar.setProgress(50);
128 128
      }
......
195 195

  
196 196
    public void onItemSelected(AdapterView<?> parent, View view, int pos, long id)
197 197
      {
198
      PredeformSurfaceView v = this.findViewById(R.id.predeformSurfaceView);
199
      PredeformRenderer renderer = v.getRenderer();
198
      PredeformSurfaceView2 v = findViewById(R.id.predeform2SurfaceView);
199
      PredeformRenderer2 renderer = v.getRenderer();
200 200

  
201
      if( parent.getId()==R.id.predeformSpinnerMode)
201
      if( parent.getId()==R.id.predeform2SpinnerMode)
202 202
        {
203 203
        renderer.setRenderModeToOIT(pos==1);
204 204
        }
......
216 216
      {
217 217
      switch (bar.getId())
218 218
        {
219
        case R.id.predeformTransparency: PredeformSurfaceView v1 = this.findViewById(R.id.predeformSurfaceView);
220
                                         v1.getRenderer().setTransparency(progress);
221
                                         break;
222
        case R.id.predeformInflateLevel: PredeformSurfaceView v2 = this.findViewById(R.id.predeformSurfaceView);
223
                                         float level = v2.getRenderer().setLevel(progress);
224
                                         mTextLevel.setText(getString(R.string.inflate_placeholder, level));
225
                                         break;
219
        case R.id.predeform2Transparency: PredeformSurfaceView2 v1 = findViewById(R.id.predeform2SurfaceView);
220
                                          v1.getRenderer().setTransparency(progress);
221
                                          break;
222
        case R.id.predeform2InflateLevel: PredeformSurfaceView2 v2 = findViewById(R.id.predeform2SurfaceView);
223
                                          float level = v2.getRenderer().setLevel(progress);
224
                                          mTextLevel.setText(getString(R.string.inflate_placeholder, level));
225
                                          break;
226 226
        }
227 227
      }
228 228

  

Also available in: Unified diff