Project

General

Profile

« Previous | Next » 

Revision 950511ed

Added by Leszek Koltunski almost 8 years ago

re-add center to Vertex3D

View differences:

src/main/java/org/distorted/examples/vertex3d/Vertex3DActivity.java
69 69

  
70 70
  private ArrayList<Vertex3DEffect> mEffects;
71 71
  private int mEffectAdd;
72
  private float mCenterX, mCenterY;
72 73

  
73 74
///////////////////////////////////////////////////////////////////////////////////////////////////
74 75

  
......
200 201
    tmp.setBackgroundColor(mShape[id] ? COLOR_ON:COLOR_OFF);
201 202
    }
202 203

  
204
///////////////////////////////////////////////////////////////////////////////////////////////////
205

  
206
  public void setCenter(float x, float y)
207
    {
208
    mCenterX = x;
209
    mCenterY = y;
210

  
211
    Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
212

  
213
    view.getRenderer().setCenter( mCenterX, mCenterY );
214
    }
215

  
216
///////////////////////////////////////////////////////////////////////////////////////////////////
217

  
218
  public float getCenterX()
219
    {
220
    return mCenterX;
221
    }
222

  
223
///////////////////////////////////////////////////////////////////////////////////////////////////
224

  
225
  public float getCenterY()
226
    {
227
    return mCenterY;
228
    }
229

  
203 230
///////////////////////////////////////////////////////////////////////////////////////////////////
204 231

  
205 232
  public void Continue(View v)
......
289 316

  
290 317
  private void setVertexView()
291 318
    {
319
    mCenterX = 0.5f*getWidth();
320
    mCenterY = 0.5f*getHeight();
321

  
292 322
    final View view = getLayoutInflater().inflate(R.layout.vertex3dlayout, null);
293 323

  
294 324
    setContentView(view);
......
329 359
    LinearLayout layout = (LinearLayout)findViewById(R.id.vertex3dlayout);
330 360
    View view = eff.createView();
331 361
    layout.addView(view);
362

  
363
    if( mEffectAdd!=1 ) // deform does not support regions
364
      {
365
      View region = eff.createRegion();
366
      layout.addView(region);
367
      }
368

  
332 369
    View center = eff.createCenter();
333 370
    layout.addView(center);
334
    View region = eff.createRegion();
335
    layout.addView(region);
336 371

  
337 372
    Dynamic1D dyn1 = eff.getDyn1();
338 373
    Dynamic2D cent = eff.getCenter();
......
356 391
    LinearLayout layout = (LinearLayout)findViewById(R.id.vertex3dlayout);
357 392
    layout.removeAllViews();
358 393
    mObject.abortEffects(EffectTypes.VERTEX);
394

  
395
    mCenterX = 0.5f*getWidth();
396
    mCenterY = 0.5f*getHeight();
397

  
398
    Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
399
    Vertex3DRenderer renderer= view.getRenderer();
400

  
401
    renderer.setCenter( mCenterX, mCenterY );
402
    renderer.mQuat1.set(0,0,0,1);
403
    renderer.mQuat2.set(0,0,0,1);
359 404
    }
360 405

  
361 406
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff