diff --git a/android/assets/1280x720/PolyjetTitle.png b/android/assets/1280x720/PolyjetTitle.png old mode 100644 new mode 100755 index ea10cf1..7320f6a Binary files a/android/assets/1280x720/PolyjetTitle.png and b/android/assets/1280x720/PolyjetTitle.png differ diff --git a/android/assets/1280x720/Tech-Circle1.png b/android/assets/1280x720/Tech-Circle1.png old mode 100644 new mode 100755 index 2b38094..4229dfe Binary files a/android/assets/1280x720/Tech-Circle1.png and b/android/assets/1280x720/Tech-Circle1.png differ diff --git a/android/assets/1280x720/cybercircle1.png b/android/assets/1280x720/cybercircle1.png old mode 100644 new mode 100755 index 35c2e1f..c40498d Binary files a/android/assets/1280x720/cybercircle1.png and b/android/assets/1280x720/cybercircle1.png differ diff --git a/android/assets/1280x720/cybercircle3B.png b/android/assets/1280x720/cybercircle3B.png old mode 100644 new mode 100755 index 1e0e957..a8a2dd6 Binary files a/android/assets/1280x720/cybercircle3B.png and b/android/assets/1280x720/cybercircle3B.png differ diff --git a/android/assets/1280x720/laser.png b/android/assets/1280x720/laser.png old mode 100644 new mode 100755 index 742c241..7394d7d Binary files a/android/assets/1280x720/laser.png and b/android/assets/1280x720/laser.png differ diff --git a/android/assets/1280x720/pellet.png b/android/assets/1280x720/pellet.png old mode 100644 new mode 100755 index 9ba2e74..6456f07 Binary files a/android/assets/1280x720/pellet.png and b/android/assets/1280x720/pellet.png differ diff --git a/android/assets/1280x720/polyjet-standard.png b/android/assets/1280x720/polyjet-standard.png old mode 100644 new mode 100755 index fcec042..89ab4ac Binary files a/android/assets/1280x720/polyjet-standard.png and b/android/assets/1280x720/polyjet-standard.png differ diff --git a/android/assets/1280x720/splashlogo.png b/android/assets/1280x720/splashlogo.png old mode 100644 new mode 100755 index 564992d..52e86e3 Binary files a/android/assets/1280x720/splashlogo.png and b/android/assets/1280x720/splashlogo.png differ diff --git a/android/assets/1280x720/square.png b/android/assets/1280x720/square.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x800/PolyjetTitle.png b/android/assets/1280x800/PolyjetTitle.png old mode 100644 new mode 100755 index c4d6607..2f32320 Binary files a/android/assets/1280x800/PolyjetTitle.png and b/android/assets/1280x800/PolyjetTitle.png differ diff --git a/android/assets/1280x800/Tech-Circle1.png b/android/assets/1280x800/Tech-Circle1.png old mode 100644 new mode 100755 index 1faac69..bd661d3 Binary files a/android/assets/1280x800/Tech-Circle1.png and b/android/assets/1280x800/Tech-Circle1.png differ diff --git a/android/assets/1280x800/cybercircle1.png b/android/assets/1280x800/cybercircle1.png old mode 100644 new mode 100755 index 68e96a2..2edc4d1 Binary files a/android/assets/1280x800/cybercircle1.png and b/android/assets/1280x800/cybercircle1.png differ diff --git a/android/assets/1280x800/cybercircle3B.png b/android/assets/1280x800/cybercircle3B.png old mode 100644 new mode 100755 index 64e8079..6f5ab4e Binary files a/android/assets/1280x800/cybercircle3B.png and b/android/assets/1280x800/cybercircle3B.png differ diff --git a/android/assets/1280x800/laser.png b/android/assets/1280x800/laser.png old mode 100644 new mode 100755 index 628c29d..5e3956b Binary files a/android/assets/1280x800/laser.png and b/android/assets/1280x800/laser.png differ diff --git a/android/assets/1280x800/pellet.png b/android/assets/1280x800/pellet.png old mode 100644 new mode 100755 index 537a166..a35fc4d Binary files a/android/assets/1280x800/pellet.png and b/android/assets/1280x800/pellet.png differ diff --git a/android/assets/1280x800/polyjet-standard.png b/android/assets/1280x800/polyjet-standard.png old mode 100644 new mode 100755 index 7a319d8..152e04d Binary files a/android/assets/1280x800/polyjet-standard.png and b/android/assets/1280x800/polyjet-standard.png differ diff --git a/android/assets/1280x800/splashlogo.png b/android/assets/1280x800/splashlogo.png old mode 100644 new mode 100755 index ea009a7..45390b5 Binary files a/android/assets/1280x800/splashlogo.png and b/android/assets/1280x800/splashlogo.png differ diff --git a/android/assets/1280x800/square.png b/android/assets/1280x800/square.png old mode 100644 new mode 100755 diff --git a/android/assets/1366x768/PolyjetTitle.png b/android/assets/1366x768/PolyjetTitle.png old mode 100644 new mode 100755 index d86a727..d86c04c Binary files a/android/assets/1366x768/PolyjetTitle.png and b/android/assets/1366x768/PolyjetTitle.png differ diff --git a/android/assets/1366x768/Tech-Circle1.png b/android/assets/1366x768/Tech-Circle1.png old mode 100644 new mode 100755 index 3a65576..bb78f62 Binary files a/android/assets/1366x768/Tech-Circle1.png and b/android/assets/1366x768/Tech-Circle1.png differ diff --git a/android/assets/1366x768/cybercircle1.png b/android/assets/1366x768/cybercircle1.png old mode 100644 new mode 100755 index c50ca81..2d205ef Binary files a/android/assets/1366x768/cybercircle1.png and b/android/assets/1366x768/cybercircle1.png differ diff --git a/android/assets/1366x768/cybercircle3B.png b/android/assets/1366x768/cybercircle3B.png old mode 100644 new mode 100755 index 8c823c9..8af9f1e Binary files a/android/assets/1366x768/cybercircle3B.png and b/android/assets/1366x768/cybercircle3B.png differ diff --git a/android/assets/1366x768/laser.png b/android/assets/1366x768/laser.png old mode 100644 new mode 100755 index b191ea8..113d796 Binary files a/android/assets/1366x768/laser.png and b/android/assets/1366x768/laser.png differ diff --git a/android/assets/1366x768/pellet.png b/android/assets/1366x768/pellet.png old mode 100644 new mode 100755 index e8b1a8a..6570352 Binary files a/android/assets/1366x768/pellet.png and b/android/assets/1366x768/pellet.png differ diff --git a/android/assets/1366x768/polyjet-standard.png b/android/assets/1366x768/polyjet-standard.png old mode 100644 new mode 100755 index 1089369..aed5cc0 Binary files a/android/assets/1366x768/polyjet-standard.png and b/android/assets/1366x768/polyjet-standard.png differ diff --git a/android/assets/1366x768/splashlogo.png b/android/assets/1366x768/splashlogo.png old mode 100644 new mode 100755 index 28eea52..07c1aa4 Binary files a/android/assets/1366x768/splashlogo.png and b/android/assets/1366x768/splashlogo.png differ diff --git a/android/assets/1366x768/square.png b/android/assets/1366x768/square.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1080/PolyjetTitle.png b/android/assets/1920x1080/PolyjetTitle.png old mode 100644 new mode 100755 index 59adeef..2b66436 Binary files a/android/assets/1920x1080/PolyjetTitle.png and b/android/assets/1920x1080/PolyjetTitle.png differ diff --git a/android/assets/1920x1080/Tech-Circle1.png b/android/assets/1920x1080/Tech-Circle1.png old mode 100644 new mode 100755 index ad14c5f..73d6ecd Binary files a/android/assets/1920x1080/Tech-Circle1.png and b/android/assets/1920x1080/Tech-Circle1.png differ diff --git a/android/assets/1920x1080/cybercircle1.png b/android/assets/1920x1080/cybercircle1.png old mode 100644 new mode 100755 index 7ab48d2..f3c7512 Binary files a/android/assets/1920x1080/cybercircle1.png and b/android/assets/1920x1080/cybercircle1.png differ diff --git a/android/assets/1920x1080/cybercircle3B.png b/android/assets/1920x1080/cybercircle3B.png old mode 100644 new mode 100755 index 2fe3009..13f13ef Binary files a/android/assets/1920x1080/cybercircle3B.png and b/android/assets/1920x1080/cybercircle3B.png differ diff --git a/android/assets/1920x1080/laser.png b/android/assets/1920x1080/laser.png old mode 100644 new mode 100755 index 097b078..8987e67 Binary files a/android/assets/1920x1080/laser.png and b/android/assets/1920x1080/laser.png differ diff --git a/android/assets/1920x1080/pellet.png b/android/assets/1920x1080/pellet.png old mode 100644 new mode 100755 index 87753a4..0e62290 Binary files a/android/assets/1920x1080/pellet.png and b/android/assets/1920x1080/pellet.png differ diff --git a/android/assets/1920x1080/polyjet-standard.png b/android/assets/1920x1080/polyjet-standard.png old mode 100644 new mode 100755 index f2a4585..facfddd Binary files a/android/assets/1920x1080/polyjet-standard.png and b/android/assets/1920x1080/polyjet-standard.png differ diff --git a/android/assets/1920x1080/splashlogo.png b/android/assets/1920x1080/splashlogo.png old mode 100644 new mode 100755 index 2630d50..23efe16 Binary files a/android/assets/1920x1080/splashlogo.png and b/android/assets/1920x1080/splashlogo.png differ diff --git a/android/assets/1920x1080/square.png b/android/assets/1920x1080/square.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1200/PolyjetTitle.png b/android/assets/1920x1200/PolyjetTitle.png old mode 100644 new mode 100755 index 9dd8afe..719af2e Binary files a/android/assets/1920x1200/PolyjetTitle.png and b/android/assets/1920x1200/PolyjetTitle.png differ diff --git a/android/assets/1920x1200/Tech-Circle1.png b/android/assets/1920x1200/Tech-Circle1.png old mode 100644 new mode 100755 index 00cd1d3..973956b Binary files a/android/assets/1920x1200/Tech-Circle1.png and b/android/assets/1920x1200/Tech-Circle1.png differ diff --git a/android/assets/1920x1200/cybercircle1.png b/android/assets/1920x1200/cybercircle1.png old mode 100644 new mode 100755 index c6350b4..6938404 Binary files a/android/assets/1920x1200/cybercircle1.png and b/android/assets/1920x1200/cybercircle1.png differ diff --git a/android/assets/1920x1200/cybercircle3B.png b/android/assets/1920x1200/cybercircle3B.png old mode 100644 new mode 100755 index e3ea89d..de638f3 Binary files a/android/assets/1920x1200/cybercircle3B.png and b/android/assets/1920x1200/cybercircle3B.png differ diff --git a/android/assets/1920x1200/laser.png b/android/assets/1920x1200/laser.png old mode 100644 new mode 100755 index 965130c..72cef57 Binary files a/android/assets/1920x1200/laser.png and b/android/assets/1920x1200/laser.png differ diff --git a/android/assets/1920x1200/pellet.png b/android/assets/1920x1200/pellet.png old mode 100644 new mode 100755 index 1635f8e..9c7eb61 Binary files a/android/assets/1920x1200/pellet.png and b/android/assets/1920x1200/pellet.png differ diff --git a/android/assets/1920x1200/polyjet-standard.png b/android/assets/1920x1200/polyjet-standard.png old mode 100644 new mode 100755 index c4fa809..feb5314 Binary files a/android/assets/1920x1200/polyjet-standard.png and b/android/assets/1920x1200/polyjet-standard.png differ diff --git a/android/assets/1920x1200/splashlogo.png b/android/assets/1920x1200/splashlogo.png old mode 100644 new mode 100755 index 8c4efa6..f9f53dc Binary files a/android/assets/1920x1200/splashlogo.png and b/android/assets/1920x1200/splashlogo.png differ diff --git a/android/assets/1920x1200/square.png b/android/assets/1920x1200/square.png old mode 100644 new mode 100755 diff --git a/android/assets/2560x1440/PolyjetTitle.png b/android/assets/2560x1440/PolyjetTitle.png old mode 100644 new mode 100755 index 06d2cba..f7ee3e9 Binary files a/android/assets/2560x1440/PolyjetTitle.png and b/android/assets/2560x1440/PolyjetTitle.png differ diff --git a/android/assets/2560x1440/Tech-Circle1.png b/android/assets/2560x1440/Tech-Circle1.png old mode 100644 new mode 100755 index 1899dbb..076a8ca Binary files a/android/assets/2560x1440/Tech-Circle1.png and b/android/assets/2560x1440/Tech-Circle1.png differ diff --git a/android/assets/2560x1440/cybercircle1.png b/android/assets/2560x1440/cybercircle1.png old mode 100644 new mode 100755 index 5cd365e..2771c97 Binary files a/android/assets/2560x1440/cybercircle1.png and b/android/assets/2560x1440/cybercircle1.png differ diff --git a/android/assets/2560x1440/cybercircle3B.png b/android/assets/2560x1440/cybercircle3B.png old mode 100644 new mode 100755 index 1585079..f66907f Binary files a/android/assets/2560x1440/cybercircle3B.png and b/android/assets/2560x1440/cybercircle3B.png differ diff --git a/android/assets/2560x1440/laser.png b/android/assets/2560x1440/laser.png old mode 100644 new mode 100755 index 0751bfb..f2c4e5b Binary files a/android/assets/2560x1440/laser.png and b/android/assets/2560x1440/laser.png differ diff --git a/android/assets/2560x1440/pellet.png b/android/assets/2560x1440/pellet.png old mode 100644 new mode 100755 index cb50eb2..6f24641 Binary files a/android/assets/2560x1440/pellet.png and b/android/assets/2560x1440/pellet.png differ diff --git a/android/assets/2560x1440/polyjet-standard.png b/android/assets/2560x1440/polyjet-standard.png old mode 100644 new mode 100755 index 05b4a5b..bf716e2 Binary files a/android/assets/2560x1440/polyjet-standard.png and b/android/assets/2560x1440/polyjet-standard.png differ diff --git a/android/assets/2560x1440/splashlogo.png b/android/assets/2560x1440/splashlogo.png old mode 100644 new mode 100755 index 8a56653..f2fab6d Binary files a/android/assets/2560x1440/splashlogo.png and b/android/assets/2560x1440/splashlogo.png differ diff --git a/android/assets/2560x1440/square.png b/android/assets/2560x1440/square.png old mode 100644 new mode 100755 diff --git a/android/assets/3840x2160/pellet.png b/android/assets/3840x2160/pellet.png old mode 100644 new mode 100755 index 2a3b119..9205ae1 Binary files a/android/assets/3840x2160/pellet.png and b/android/assets/3840x2160/pellet.png differ diff --git a/android/assets/3840x2160/polyjet-standard.png b/android/assets/3840x2160/polyjet-standard.png index ee9d987..6262caa 100755 Binary files a/android/assets/3840x2160/polyjet-standard.png and b/android/assets/3840x2160/polyjet-standard.png differ diff --git a/android/assets/800x480/PolyjetTitle.png b/android/assets/800x480/PolyjetTitle.png old mode 100644 new mode 100755 index de39b05..6cf71ba Binary files a/android/assets/800x480/PolyjetTitle.png and b/android/assets/800x480/PolyjetTitle.png differ diff --git a/android/assets/800x480/Tech-Circle1.png b/android/assets/800x480/Tech-Circle1.png old mode 100644 new mode 100755 index dddfe05..acf3162 Binary files a/android/assets/800x480/Tech-Circle1.png and b/android/assets/800x480/Tech-Circle1.png differ diff --git a/android/assets/800x480/cybercircle1.png b/android/assets/800x480/cybercircle1.png old mode 100644 new mode 100755 index adc051d..467fceb Binary files a/android/assets/800x480/cybercircle1.png and b/android/assets/800x480/cybercircle1.png differ diff --git a/android/assets/800x480/cybercircle3B.png b/android/assets/800x480/cybercircle3B.png old mode 100644 new mode 100755 index 06643cc..cf3174f Binary files a/android/assets/800x480/cybercircle3B.png and b/android/assets/800x480/cybercircle3B.png differ diff --git a/android/assets/800x480/laser.png b/android/assets/800x480/laser.png old mode 100644 new mode 100755 index 4a10e44..f798f65 Binary files a/android/assets/800x480/laser.png and b/android/assets/800x480/laser.png differ diff --git a/android/assets/800x480/pellet.png b/android/assets/800x480/pellet.png old mode 100644 new mode 100755 index 33bcf67..0f415e6 Binary files a/android/assets/800x480/pellet.png and b/android/assets/800x480/pellet.png differ diff --git a/android/assets/800x480/polyjet-standard.png b/android/assets/800x480/polyjet-standard.png old mode 100644 new mode 100755 index d97e271..40d868c Binary files a/android/assets/800x480/polyjet-standard.png and b/android/assets/800x480/polyjet-standard.png differ diff --git a/android/assets/800x480/splashlogo.png b/android/assets/800x480/splashlogo.png old mode 100644 new mode 100755 index b6326d4..96fdfd0 Binary files a/android/assets/800x480/splashlogo.png and b/android/assets/800x480/splashlogo.png differ diff --git a/android/assets/800x480/square.png b/android/assets/800x480/square.png old mode 100644 new mode 100755 diff --git a/core/src/zero1hd/polyjet/entity/CollisionDetector.java b/core/src/zero1hd/polyjet/entity/CollisionDetector.java index 6ed03bc..07c566b 100755 --- a/core/src/zero1hd/polyjet/entity/CollisionDetector.java +++ b/core/src/zero1hd/polyjet/entity/CollisionDetector.java @@ -24,6 +24,7 @@ public class CollisionDetector { fe.collided(se); se.collided(fe); + break; } } } diff --git a/core/src/zero1hd/polyjet/entity/EntityController.java b/core/src/zero1hd/polyjet/entity/EntityController.java index 455b271..f2ceba1 100755 --- a/core/src/zero1hd/polyjet/entity/EntityController.java +++ b/core/src/zero1hd/polyjet/entity/EntityController.java @@ -96,4 +96,18 @@ public class EntityController { break; } } + + public void deathClean() { + for (int i = 0; i < activeAllies.size; i ++) { + if (activeAllies.get(i).isDead()) { + free(activeAllies.get(i)); + } + } + for (int i = 0; i < activeEnemies.size; i++) { + if (activeEnemies.get(i).isDead()) { + free(activeEnemies.get(i)); + } + } + } + } diff --git a/core/src/zero1hd/polyjet/entity/ally/Laser.java b/core/src/zero1hd/polyjet/entity/ally/Laser.java index 47d6129..740170f 100755 --- a/core/src/zero1hd/polyjet/entity/ally/Laser.java +++ b/core/src/zero1hd/polyjet/entity/ally/Laser.java @@ -60,8 +60,10 @@ public class Laser extends Actor implements Entity, Poolable { @Override public void collided(Entity entity) { - if (entity.getEntityType() == Entities.VOID_CIRCLE) { + switch (entity.getEntityType()) { + default: dead = true; + break; } } diff --git a/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java b/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java index 09ea7c6..9929f82 100755 --- a/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java +++ b/core/src/zero1hd/polyjet/entity/ally/PolyJetEntity.java @@ -1,6 +1,7 @@ package zero1hd.polyjet.entity.ally; import com.badlogic.gdx.assets.AssetManager; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.ParticleEffect; @@ -40,7 +41,7 @@ public class PolyJetEntity extends Actor implements Entity { public void act(float delta) { hitbox.setPosition(getX(), getY()); - thrust.setPosition(getX()+(getWidth())/2 - 1f/16f, getY()-0.15f); + thrust.setPosition(getX()+(getWidth())/2 - 1f/16f, getY()-0.2f); thrust.update(delta); teleportCloak.setPosition(getX() +(getWidth()-1)/2, getY() + (getHeight()-1)/2); @@ -66,6 +67,7 @@ public class PolyJetEntity extends Actor implements Entity { @Override public void draw(Batch batch, float parentAlpha) { thrust.draw(batch); + batch.setColor(Color.BLACK); batch.draw(polyjet, getX(), getY(), getWidth(), getHeight()); super.draw(batch, parentAlpha); } diff --git a/core/src/zero1hd/polyjet/entity/enemies/Pellet.java b/core/src/zero1hd/polyjet/entity/enemies/Pellet.java old mode 100644 new mode 100755 index a5dc000..81e093b --- a/core/src/zero1hd/polyjet/entity/enemies/Pellet.java +++ b/core/src/zero1hd/polyjet/entity/enemies/Pellet.java @@ -1,7 +1,9 @@ package zero1hd.polyjet.entity.enemies; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Batch; +import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.scenes.scene2d.Actor; @@ -24,16 +26,19 @@ public class Pellet extends Actor implements Entity, Poolable { this.texture = texture; } - public void init(float x, float y, float direction, float rate) { + public void init(float x, float y, float angle, float rate, float colorG) { setPosition(x, y); - this.direction.setAngle(direction); - rate = 0; - setSize(0.5f, 0.5f); + direction.set(MathUtils.sinDeg(angle), MathUtils.cosDeg(angle)); + setSize(0.75f, 0.75f); + hitBox.setSize(getWidth(), getHeight()); + this.rate = rate; + setColor(1f, colorG, 0f, 1f); } @Override public void act(float delta) { moveBy(direction.x*delta*rate, direction.y*delta*rate); + hitBox.setPosition(getX(), getY()); super.act(delta); if (getX() > Polyjet.GAME_AREA_WIDTH || getY() > Polyjet.GAME_AREA_HEIGHT || getX()-getWidth() < 0 || getY()-getHeight() < 0) { @@ -43,13 +48,15 @@ public class Pellet extends Actor implements Entity, Poolable { @Override public void draw(Batch batch, float parentAlpha) { + batch.setColor(getColor().r, getColor().g, getColor().b, getColor().a); batch.draw(texture, getX(), getY(), getWidth(), getHeight()); + batch.setColor(Color.WHITE); super.draw(batch, parentAlpha); } @Override public void collided(Entity entity) { - if (entity.getEntityType() == Entities.VOID_CIRCLE) { + if (entity.getEntityType() == Entities.LASER) { dead = true; } } @@ -76,6 +83,8 @@ public class Pellet extends Actor implements Entity, Poolable { setPosition(0, 0); direction.set(0,0); rate = 0; + dead = false; + setColor(1f, 1f, 1f, 1f); } } diff --git a/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java b/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java index ece9c2a..c172a58 100755 --- a/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java +++ b/core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java @@ -44,18 +44,7 @@ public class GamePlayArea extends Stage { @Override public void act(float delta) { collisionDetector.collisionCheck(); - - for (int i = 0; i < entityController.activeAllies.size; i ++) { - if (entityController.activeAllies.get(i).isDead()) { - entityController.free(entityController.activeAllies.get(i)); - } - } - - for (int i = 0; i < entityController.activeEnemies.size; i++) { - if (entityController.activeEnemies.get(i).isDead()) { - entityController.free(entityController.activeEnemies.get(i)); - } - } + entityController.deathClean(); if (polyjet.getX() <= 1) { polyjet.moveLeft = false; diff --git a/core/src/zero1hd/polyjet/ui/windows/SpawnerWindow.java b/core/src/zero1hd/polyjet/ui/windows/SpawnerWindow.java index 4d09a0f..7ce0025 100755 --- a/core/src/zero1hd/polyjet/ui/windows/SpawnerWindow.java +++ b/core/src/zero1hd/polyjet/ui/windows/SpawnerWindow.java @@ -33,7 +33,7 @@ public class SpawnerWindow extends Window { stage = stageForEntities; mod1 = new Slider(0.1f, 50f, 0.01f, true, skin); - mod2 = new Slider(0.1f, 15f, 0.01f, true, skin); + mod2 = new Slider(0f, 15f, 0.01f, true, skin); mod3 = new Slider(0.1f, 15f, 0.01f, true, skin); listOfEntities = new List<>(skin); @@ -71,12 +71,12 @@ public class SpawnerWindow extends Window { break; case PELLET: Pellet pellet = (Pellet) entity; - pellet.init(coords.x, coords.y, mod2.getValue(), mod3.getValue()); + pellet.init(coords.x, coords.y, mod2.getValue()/mod2.getMaxValue()*360f, mod1.getValue(), mod3.getValue()/mod3.getMaxValue()); stage.addActor(pellet); break; case VOID_CIRCLE: VoidCircle voidCircle = (VoidCircle) entity; - voidCircle.init(mod3.getValue(), coords.x, coords.y, mod1.getValue(), mod2.getValue()); + voidCircle.init(mod2.getValue(), coords.x, coords.y, mod1.getValue(), mod3.getValue()); stage.addActor(voidCircle); break; default: diff --git a/desktop/src/zero1hd/polyjet/desktop/DesktopLauncher.java b/desktop/src/zero1hd/polyjet/desktop/DesktopLauncher.java index 5b6e035..ccb41ce 100755 --- a/desktop/src/zero1hd/polyjet/desktop/DesktopLauncher.java +++ b/desktop/src/zero1hd/polyjet/desktop/DesktopLauncher.java @@ -12,7 +12,7 @@ public class DesktopLauncher { config.width = 800; config.height = 480; config.resizable = false; - System.setProperty("org.lwjgl.opengl.Window.undecorated", "true"); +// System.setProperty("org.lwjgl.opengl.Window.undecorated", "true"); new LwjglApplication(new Polyjet(), config);