Project

General

Profile

« Previous | Next » 

Revision e8e54972

Added by Leszek Koltunski about 4 years ago

Fixes for the merge.

View differences:

src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java
132 132 
      for(int j=0; j<NUM_LEAVES; j++)
133 133 
        {
134 134 
        mEffects[j] = new DistortedEffects();
135 
        mEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, center) );
136 135 
        mEffects[j].apply(new MatrixEffectMove(moveVector));
136 
        mEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, center) );
137 137 
        }
138 138 

  		




  139
  139
  
    
      for(int i=0; i<NUM_CIRCLES; i++)


  		




  140
  140
  
    
        {


  		




  141
  141
  
    
        DistortedEffects effects = new DistortedEffects();


  		




  142
  
  
    
        effects.apply( new MatrixEffectMove(new Static3D(positions[2*i], positions[2*i+1], 0)) );


  		




  143
  142
  
    
        effects.apply( new MatrixEffectRotate(rot, axis, center) );


  		




  
  143
  
    
        effects.apply( new MatrixEffectMove(new Static3D(positions[2*i], positions[2*i+1], 0)) );


  		




  144
  144
  
    
        effects.apply( new FragmentEffectChroma(new Static1D(0.5f), new Static3D(colors[3*i],colors[3*i+1], colors[3*i+2])) );


  		




  145
  145
  
    

  		




  146
  146
  
    
        mCircleNode[i] = new DistortedNode( surface, effects, circleMesh);


  		












Also available in:  Unified diff