Skip to content

Commit 3eac01b

Browse files
author
Nicolas Gramlich
committed
Fixed merge fail.
1 parent c1591a6 commit 3eac01b

1 file changed

Lines changed: 0 additions & 23 deletions

File tree

‎src/org/andengine/examples/CardinalSplineMoveModifierExample.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,9 @@ public class CardinalSplineMoveModifierExample extends SimpleBaseGameActivity {
3939
private static final int CAMERA_WIDTH = 720;
4040
private static final int CAMERA_HEIGHT = 480;
4141

42-
<<<<<<< HEAD
43-
private static final int COUNT = 500;
44-
private static final float DURATION = 4;
45-
private static final float SIZE = 20;
46-
=======
4742
private static final int COUNT = 400;
4843
private static final float DURATION = 4;
4944
private static final float SIZE = 25;
50-
>>>>>>> GLES2
5145

5246
private static final float[] CONTROLPOINT_1_XS = {
5347
2 * (CAMERA_WIDTH / 4),
@@ -106,23 +100,15 @@ public Scene onCreateScene() {
106100
scene.setBackground(new Background(0, 0, 0));
107101

108102
for(int i = 0; i < COUNT; i++) {
109-
<<<<<<< HEAD
110-
this.addRectangleWithTension(scene, MathUtils.random(-1f, 1f), MathUtils.random(0, DURATION * 2f));
111-
=======
112103
final float tension = MathUtils.random(-0.5f, 0.5f);
113104
this.addRectangleWithTension(scene, tension, MathUtils.random(0, DURATION * 2f));
114-
>>>>>>> GLES2
115105
}
116106

117107
return scene;
118108
}
119109

120110
private void addRectangleWithTension(final Scene pScene, final float pTension, float pDelay) {
121-
<<<<<<< HEAD
122-
final Rectangle rectangle = new Rectangle(0, 0, SIZE, SIZE, this.getVertexBufferObjectManager());
123-
=======
124111
final Rectangle rectangle = new Rectangle(-SIZE, -SIZE, SIZE, SIZE, this.getVertexBufferObjectManager());
125-
>>>>>>> GLES2
126112
rectangle.setBlendFunction(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE);
127113
if(pTension < 0) {
128114
rectangle.setColor(1 - pTension, 0, 0, 0.5f);
@@ -144,21 +130,12 @@ private void addRectangleWithTension(final Scene pScene, final float pTension, f
144130
new LoopEntityModifier(
145131
new SequenceEntityModifier(
146132
new ParallelEntityModifier(
147-
<<<<<<< HEAD
148-
new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig1),
149-
new RotationModifier(CardinalSplineMoveModifierExample.DURATION, 0, 360)
150-
),
151-
new ParallelEntityModifier(
152-
new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig2),
153-
new RotationModifier(CardinalSplineMoveModifierExample.DURATION, 0, 360)
154-
=======
155133
new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig1, EaseLinear.getInstance()),
156134
new RotationModifier(CardinalSplineMoveModifierExample.DURATION, -45, -315)
157135
),
158136
new ParallelEntityModifier(
159137
new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig2, EaseLinear.getInstance()),
160138
new RotationModifier(CardinalSplineMoveModifierExample.DURATION, 45, 315)
161-
>>>>>>> GLES2
162139
)
163140
)
164141
)

0 commit comments

Comments
 (0)