Project

General

Profile

« Previous | Next » 

Revision 594bbce0

Added by Leszek Koltunski over 2 years ago

Progress with PuzzleTester app.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectPreRender.java
27 27 
import android.content.res.Resources;
28 28 

  		




  29
  29
  
    
import org.distorted.library.message.EffectListener;


  		




  30
  
  
    

  		




  31
  30
  
    
import org.distorted.library.type.Static3D;


  		




  32
  31
  
    

  		




  33
  
  
    
import org.distorted.objectlib.R;


  		




  34
  32
  
    
import org.distorted.objectlib.helpers.ObjectLibInterface;


  		




  35
  33
  
    
import org.distorted.objectlib.effects.BaseEffect;


  		




  36
  34
  
    
import org.distorted.objectlib.effects.scramble.ScrambleEffect;


  		




  ......




  109
  107
  
    
    Static3D move = new Static3D(mMoveX,mMoveY,0);


  		




  110
  108
  
    
    Resources res = mAct.get().getResources();


  		




  111
  109
  
    

  		




  112
  
  
    
    if( object!=ObjectType.TEST )


  		




  
  110
  
    
    long time1 = System.currentTimeMillis();


  		




  
  111
  
    

  		




  
  112
  
    
    int meshID = object.getMeshID();


  		




  
  113
  
    
    InputStream meshStream = ( meshID!=0 && ObjectControl.isInDmeshMode() ) ? res.openRawResource(meshID) : null;


  		




  
  114
  
    

  		




  
  115
  
    
    if( !ObjectControl.isInJsonMode() )


  		




  113
  116
  
    
      {


  		




  114
  
  
    
      mNewObject = object.create( mController.getQuat(), move, res);


  		




  
  117
  
    
      mNewObject = object.create( mController.getQuat(), move, meshStream);


  		




  115
  118
  
    
      }


  		




  116
  119
  
    
    else


  		




  117
  120
  
    
      {


  		




  118
  
  
    
      InputStream jsonStream = res.openRawResource(R.raw.test);


  		




  119
  
  
    
      mNewObject = new TwistyJson(jsonStream, mController.getQuat(), move, null);


  		




  
  121
  
    
      int jsonID = object.getJsonID();


  		




  
  122
  
    
      InputStream jsonStream = jsonID!=0 ? res.openRawResource(jsonID) : null;


  		




  
  123
  
    
      mNewObject = new TwistyJson(jsonStream, mController.getQuat(), move, meshStream);


  		




  120
  124
  
    
      }


  		




  121
  125
  
    

  		




  
  126
  
    
    long time2 = System.currentTimeMillis();


  		




  
  127
  
    
    mInterface.onObjectCreated(time2-time1);


  		




  
  128
  
    

  		




  122
  129
  
    
    if( mNewObject!=null )


  		




  123
  130
  
    
      {


  		




  124
  131
  
    
      TwistyObjectNode node = mController.getNode();


  		












Also available in:  Unified diff