ENSEEIHT/projet-programmation-orientee-objet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: used MathUtils's random

Browse source
This commit is contained in:
Laureηt 2021-05-12 22:14:28 +02:00
parent d664987ff8
commit b327e748aa
5 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
core/assets/arrow0.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
core/assets/arrow1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
core/assets/arrow2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

8
core/src/sagittarius/model/Arrow.java
View file

@ -1,9 +1,5 @@
package sagittarius.model; package sagittarius.model;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Random;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap;
@ -11,6 +7,7 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.math.Intersector; import com.badlogic.gdx.math.Intersector;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.Actor;
@ -52,8 +49,7 @@ public class Arrow extends EntityQuad {
this.landed = false; this.landed = false;
if (!preview) { if (!preview) {
Random random = new Random(); Pixmap pm = new Pixmap(new FileHandle("core/assets/arrow" + MathUtils.random(1) + ".png"));
Pixmap pm = new Pixmap(new FileHandle("core/assets/arrow" + (random.nextInt(2) + 1) + ".png"));
pm.setBlending(Pixmap.Blending.None); pm.setBlending(Pixmap.Blending.None);
for (int x = 0; x < pm.getWidth(); x++) { for (int x = 0; x < pm.getWidth(); x++) {
for (int y = 0; y < pm.getHeight(); y++) { for (int y = 0; y < pm.getHeight(); y++) {

5
core/src/sagittarius/model/Planet.java
View file

@ -1,7 +1,5 @@
package sagittarius.model; package sagittarius.model;
import java.util.Random;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap;
@ -22,8 +20,7 @@ public class Planet extends EntityCircle {
public Planet(Vector2 position, float mass, float radius, Color color) { public Planet(Vector2 position, float mass, float radius, Color color) {
super(0, mass, color, position, radius); super(0, mass, color, position, radius);
Random random = new Random(); Pixmap pm = new Pixmap(new FileHandle("core/assets/planet" + MathUtils.random(4) + ".png"));
Pixmap pm = new Pixmap(new FileHandle("core/assets/planet" + random.nextInt(5) + ".png"));
pm.setBlending(Pixmap.Blending.None); pm.setBlending(Pixmap.Blending.None);
for (int x = 0; x < pm.getWidth(); x++) { for (int x = 0; x < pm.getWidth(); x++) {