Project

General

Profile

« Previous | Next » 

Revision 2a261997

Added by Leszek Koltunski almost 7 years ago

Simplify Effect classes.

View differences:

src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java
100 100

  
101 101
    switch(mName)
102 102
      {
103
      case ROTATE           : effect = new MatrixEffectRotate      (mDyn4, mCenterDyn); break;
104
      case QUATERNION       : effect = new MatrixEffectQuaternion  (mDyn4, mCenterDyn); break;
105
      case MOVE             : effect = new MatrixEffectMove        (mDyn3)            ; break;
106
      case SCALE            : effect = new MatrixEffectScale       (mDyn3)            ; break;
107
      case SHEAR            : effect = new MatrixEffectShear       (mDyn3, mCenterDyn); break;
103
      case ROTATE           : effect = new MatrixEffectRotate      (mDyn1, mDyn3, mCenterDyn); break;
104
      case QUATERNION       : effect = new MatrixEffectQuaternion  (mDyn4,        mCenterDyn); break;
105
      case MOVE             : effect = new MatrixEffectMove        (mDyn3                   ); break;
106
      case SCALE            : effect = new MatrixEffectScale       (mDyn3                   ); break;
107
      case SHEAR            : effect = new MatrixEffectShear       (mDyn3,        mCenterDyn); break;
108 108

  
109 109
      case DISTORT          : effect = new VertexEffectDistort     (mDyn3, mCenterDyn, mRegionDyn); break;
110 110
      case DEFORM           : effect = new VertexEffectDeform      (mDyn3, mCenterDyn, mRegionDyn); break;
......
143 143
                              float rx = (mInter[1]-50)/ 50.0f;
144 144
                              float ry = (mInter[2]-50)/ 50.0f;
145 145
                              float rz = (mInter[3]-50)/ 50.0f;
146
                              mSta4.set(an,rx,ry,rz);
146
                              mSta1.set(an);
147
                              mSta3.set(rx,ry,rz);
147 148
                              break;
148 149
      case QUATERNION       : float qx = (mInter[0]-50)/ 50.0f;
149 150
                              float qy = (mInter[1]-50)/ 50.0f;
......
397 398
               mSta3 = new Static3D(0,0,0);
398 399
               mDyn3.add(mSta3);
399 400
               break;
400
      case 4 : if( mName == EffectName.ROTATE || mName == EffectName.QUATERNION )
401
      case 4 : if( mName == EffectName.QUATERNION )
401 402
                 {
402 403
                 mDyn4 = new Dynamic4D();
403 404
                 mSta4 = new Static4D(0,0,0,0);

Also available in: Unified diff