Project

General

Profile

« Previous | Next » 

Revision 1da3c7db

Added by Leszek Koltunski over 7 years ago

Revert "One more APP converted. Only 2 remain."

This reverts commit 00d86f0fc5d827d8d6d30db9a69f18df56d63428.

View differences:

src/main/java/org/distorted/examples/matrix3d/Matrix3DEffect.java
131 131
                              float sinAnorm = (float)Math.sin(qa/2)/len;
132 132
                              mSta4.set(sinAnorm*qx,sinAnorm*qy,sinAnorm*qz, cosA);
133 133
                              break;
134
      case MOVE             : float s  = 0.04f;
135
                              float xm = (mInter[0]-50)*s;
136
                              float ym = (mInter[1]-50)*s;
137
                              float zm = (mInter[2]-50)*s;
134
      case MOVE             : float sw = mAct.get().getScreenWidth()/50.0f;
135
                              float sh = mAct.get().getScreenWidth()/50.0f;
136
                              float xm = (mInter[0]-50)*sw;
137
                              float ym = (mInter[1]-50)*sh;
138
                              float zm = (mInter[2]-50)*(sw+sh)/2;
138 139
                              mSta3.set(xm,ym,zm);
139 140
                              break;
140
      case SCALE            : double coeff = Math.PI / 100;
141

  
142
                              if( mInter[0]<=  0 ) mInter[0]= 1;
143
                              if( mInter[0]>=100 ) mInter[0]=99;
144
                              if( mInter[1]<=  0 ) mInter[1]= 1;
145
                              if( mInter[1]>=100 ) mInter[1]=99;
146
                              if( mInter[2]<=  0 ) mInter[2]= 1;
147
                              if( mInter[2]>=100 ) mInter[2]=99;
148

  
149
                              float xs = (float)Math.tan((mInter[0]-50)*coeff);
150
                              float ys = (float)Math.tan((mInter[1]-50)*coeff);
151
                              float zs = (float)Math.tan((mInter[2]-50)*coeff);
141
      case SCALE            : float xs = (mInter[0]-50)/10.0f;
142
                              float ys = (mInter[1]-50)/10.0f;
143
                              float zs = (mInter[2]-50)/10.0f;
152 144
                              mSta3.set(xs,ys,zs);
153 145
                              break;
154 146
      case SHEAR            : float xsh = (mInter[0]-50)/25.0f;
......
219 211
      }
220 212
    if( mName==EffectNames.SCALE )
221 213
      {
222
      mInter[0]= 75;
223
      mInter[1]= 75;
224
      mInter[2]= 75;
214
      mInter[0]= 60;
215
      mInter[1]= 60;
216
      mInter[2]= 60;
225 217
      }
226 218
    }
227 219

  
......
278 270

  
279 271
  private void fillCenterStatics()
280 272
    {
281
    float x = (mInterCenter[0]-50)*0.02f;
282
    float y = (mInterCenter[1]-50)*0.02f;
283
    float z = (mInterCenter[2]-50)*0.02f;
273
    Matrix3DActivity act = mAct.get();
274

  
275
    float x = (mInterCenter[0]*0.012f - 0.1f)*act.getWidth();
276
    float y = (mInterCenter[1]*0.012f - 0.1f)*act.getHeight();
277
    float z = (mInterCenter[2]*0.012f - 0.1f)*act.getDepth();
284 278

  
285 279
    mCenterSta.set(x,y,z);
286 280
    }
......
298 292

  
299 293
  private void setCenterText()
300 294
    {
301
    float f0 = ((int)(mCenterSta.getX()*100))/100.0f;
302
    float f1 = ((int)(mCenterSta.getY()*100))/100.0f;
303
    float f2 = ((int)(mCenterSta.getZ()*100))/100.0f;
295
    int f0 = (int)mCenterSta.getX();
296
    int f1 = (int)mCenterSta.getY();
297
    int f2 = (int)mCenterSta.getZ();
304 298

  
305 299
    mTextCenter.setText("center ("+f0+","+f1+","+f2+")");
306 300
    }

Also available in: Unified diff