Project

General

Profile

« Previous | Next » 

Revision c0f5af7b

Added by Leszek Koltunski almost 5 years ago

Fixes for the merge.

View differences:

src/main/java/org/distorted/library/main/DistortedScreen.java
54 54 
  private long lastTime=0;
55 55 
  private long[] durations;
56 56 
  private int currDuration;
57 
  private static Static3D mMoveVector = new Static3D(5,-5,0);
57 
  private static Static3D mMoveVector = new Static3D(0,0,0);
58 58 
  private static MatrixEffectMove mMoveEffect = new MatrixEffectMove(mMoveVector);
59 59 
  ///// END DEBUGGING //////////////////////////
60 60 

  		




  ......




  107
  107
  
    
      fpsCanvas.drawText(fpsString, 0.5f*FPS_W, 0.75f*FPS_H, mPaint);


  		




  108
  108
  
    
      fpsTexture.setTexture(fpsBitmap);


  		




  109
  109
  
    

  		




  110
  
  
    
      mMoveVector.set1(mHeight-FPS_H-5);


  		




  
  110
  
    
      mMoveVector.set( (-mWidth+FPS_W)/2 +5, (mHeight-FPS_H)/2 -5, 0);


  		




  111
  111
  
    

  		




  112
  112
  
    
      lastTime = time;


  		




  113
  113
  
    
      }


  		












Also available in:  Unified diff