Project

General

Profile

« Previous | Next » 

Revision 8664ea2e

Added by Leszek Koltunski about 4 years ago

Fixes for the merge.

View differences:

src/main/java/org/distorted/examples/flag/FlagRenderer.java
54 54 
    private Dynamic5D mWaveDyn;
55 55 
    private Static5D mWaveSta1, mWaveSta2;
56 56 
    private int mObjWidth, mObjHeight, mObjDepth;
57 
    private Static3D mMove, mScale, mCenter;
57 
    private Static3D mScale;
58 58 

  		




  59
  59
  
    
    Static4D mQuat1, mQuat2;


  		




  60
  60
  
    
    int mScreenMin;


  		




  ......




  161
  161
  
    
      {


  		




  162
  162
  
    
      mScreenMin = width<height ? width:height;


  		




  163
  163
  
    
      float factor = ( width*mObjHeight > height*mObjWidth ) ? (0.8f*height)/mObjHeight : (0.8f*width)/mObjWidth;


  		




  164
  
  
    
      mMove.set((width-factor*mObjWidth)/2 , (height-factor*mObjHeight)/2 , 0);


  		




  165
  164
  
    
      mScale.set(factor,factor,factor);


  		




  166
  
  
    
      mCenter.set(mObjWidth/2,mObjHeight/2, 0);


  		




  167
  165
  
    
      mScreen.resize(width, height);


  		




  168
  166
  
    
      }


  		




  169
  167
  
    

  		












Also available in:  Unified diff