Project

General

Profile

« Previous | Next » 

Revision 0ba5de00

Added by Leszek Koltunski about 4 years ago

Fixes for the merge.

View differences:

src/main/java/org/distorted/examples/postprocesstree/PostprocessTreeRenderer.java
35 35
import org.distorted.library.main.DistortedScreen;
36 36
import org.distorted.library.main.DistortedTexture;
37 37
import org.distorted.library.mesh.MeshQuad;
38
import org.distorted.library.mesh.MeshRectangles;
39 38
import org.distorted.library.type.Dynamic1D;
40 39
import org.distorted.library.type.Static1D;
41 40
import org.distorted.library.type.Static3D;
......
111 110
      for(int j=0; j<NUM_LEAVES; j++)
112 111
        {
113 112
        outerLeafEffects[j] = new DistortedEffects();
114
        outerLeafEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, center) );
115 113
        outerLeafEffects[j].apply(new MatrixEffectMove(outerMoveVector));
114
        outerLeafEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, center) );
116 115

  
117 116
        root.attach(mLeaf, outerLeafEffects[j], leafMesh);
118 117
        }
......
127 126
      for(int j=0; j<NUM_LEAVES; j++)
128 127
        {
129 128
        innerLeafEffects[j] = new DistortedEffects();
130
        innerLeafEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, center) );
131 129
        innerLeafEffects[j].apply(new MatrixEffectMove(innerMoveVector));
130
        innerLeafEffects[j].apply( new MatrixEffectRotate(new Static1D(j*(360/NUM_LEAVES)), axis, center) );
132 131

  
133 132
        innerNode.attach( mLeaf, innerLeafEffects[j], leafMesh );
134 133
        }

Also available in: Unified diff