reworked a few textures

This commit is contained in:
Harrison Deng 2017-06-01 00:41:38 -05:00
parent b17cc61839
commit 0adee4b058
66 changed files with 44 additions and 29 deletions

0
android/assets/1280x720/PolyjetTitle.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

0
android/assets/1280x720/Tech-Circle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

0
android/assets/1280x720/cybercircle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
android/assets/1280x720/cybercircle3B.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
android/assets/1280x720/laser.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 155 B

BIN
android/assets/1280x720/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 364 B

After

Width:  |  Height:  |  Size: 679 B

0
android/assets/1280x720/splashlogo.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
android/assets/1280x720/square.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 96 B

After

Width:  |  Height:  |  Size: 96 B

0
android/assets/1280x800/PolyjetTitle.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
android/assets/1280x800/Tech-Circle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

0
android/assets/1280x800/cybercircle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

0
android/assets/1280x800/cybercircle3B.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

BIN
android/assets/1280x800/laser.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 B

After

Width:  |  Height:  |  Size: 173 B

BIN
android/assets/1280x800/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 507 B

After

Width:  |  Height:  |  Size: 771 B

0
android/assets/1280x800/splashlogo.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
android/assets/1280x800/square.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 100 B

After

Width:  |  Height:  |  Size: 100 B

0
android/assets/1366x768/PolyjetTitle.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

0
android/assets/1366x768/Tech-Circle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

0
android/assets/1366x768/cybercircle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
android/assets/1366x768/cybercircle3B.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

BIN
android/assets/1366x768/laser.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 171 B

BIN
android/assets/1366x768/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 421 B

After

Width:  |  Height:  |  Size: 720 B

0
android/assets/1366x768/splashlogo.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
android/assets/1366x768/square.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 98 B

After

Width:  |  Height:  |  Size: 98 B

0
android/assets/1920x1080/PolyjetTitle.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
android/assets/1920x1080/Tech-Circle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

0
android/assets/1920x1080/cybercircle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

0
android/assets/1920x1080/cybercircle3B.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

BIN
android/assets/1920x1080/laser.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 242 B

BIN
android/assets/1920x1080/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 1.1 KiB

0
android/assets/1920x1080/splashlogo.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
android/assets/1920x1080/square.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 114 B

After

Width:  |  Height:  |  Size: 114 B

0
android/assets/1920x1200/PolyjetTitle.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
android/assets/1920x1200/Tech-Circle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 93 KiB

0
android/assets/1920x1200/cybercircle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

0
android/assets/1920x1200/cybercircle3B.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

BIN
android/assets/1920x1200/laser.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 297 B

BIN
android/assets/1920x1200/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 839 B

After

Width:  |  Height:  |  Size: 1.3 KiB

0
android/assets/1920x1200/splashlogo.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
android/assets/1920x1200/square.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 122 B

After

Width:  |  Height:  |  Size: 122 B

0
android/assets/2560x1440/PolyjetTitle.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

0
android/assets/2560x1440/Tech-Circle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 123 KiB

0
android/assets/2560x1440/cybercircle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 61 KiB

0
android/assets/2560x1440/cybercircle3B.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 68 KiB

BIN
android/assets/2560x1440/laser.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 440 B

After

Width:  |  Height:  |  Size: 338 B

BIN
android/assets/2560x1440/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1022 B

After

Width:  |  Height:  |  Size: 1.8 KiB

0
android/assets/2560x1440/splashlogo.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

0
android/assets/2560x1440/square.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 139 B

After

Width:  |  Height:  |  Size: 139 B

BIN
android/assets/3840x2160/laser.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 603 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1019 B

After

Width:  |  Height:  |  Size: 3.0 KiB

0
android/assets/800x480/PolyjetTitle.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

0
android/assets/800x480/Tech-Circle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
android/assets/800x480/cybercircle1.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
android/assets/800x480/cybercircle3B.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
android/assets/800x480/laser.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 B

After

Width:  |  Height:  |  Size: 136 B

BIN
android/assets/800x480/polyjet-standard.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 387 B

0
android/assets/800x480/splashlogo.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

0
android/assets/800x480/square.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 84 B

After

Width:  |  Height:  |  Size: 84 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -21,7 +21,7 @@ timeline0: 0.0
lowMin: 0.0
lowMax: 0.0
highMin: 400.0
highMax: 400.0
highMax: 300.0
relative: false
scalingCount: 1
scaling0: 1.0
@ -57,7 +57,7 @@ timelineCount: 1
timeline0: 0.0
- Scale -
lowMin: 0.0
lowMax: 0.0
lowMax: 1.0
highMin: 1.0
highMax: 1.0
relative: false
@ -65,7 +65,7 @@ scalingCount: 4
scaling0: 1.0
scaling1: 0.92156863
scaling2: 0.627451
scaling3: 0.15686275
scaling3: 0.0
timelineCount: 4
timeline0: 0.0
timeline1: 0.5273973
@ -91,27 +91,36 @@ highMax: 90.0
relative: false
scalingCount: 5
scaling0: 0.0
scaling1: 0.27450982
scaling2: 0.33333334
scaling3: 1.0
scaling1: 0.0
scaling2: 0.23529412
scaling3: 0.8235294
scaling4: 1.0
timelineCount: 5
timeline0: 0.0
timeline1: 0.21232876
timeline2: 0.32876712
timeline3: 0.74657536
timeline1: 0.2260274
timeline2: 0.43835616
timeline3: 0.82191783
timeline4: 1.0
- Rotation -
active: false
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 4.0
highMax: 120.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Wind -
active: false
- Gravity -
active: false
- Tint -
colorsCount: 3
colors0: 0.047058824
colors1: 0.7647059
colors2: 1.0
colors0: 0.14901961
colors1: 0.14901961
colors2: 0.14901961
timelineCount: 1
timeline0: 0.0
- Transparency -
@ -120,18 +129,20 @@ lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 5
scalingCount: 6
scaling0: 0.0
scaling1: 0.3508772
scaling2: 1.0
scaling3: 1.0
scaling4: 0.0
timelineCount: 5
scaling3: 0.84210527
scaling4: 0.64912283
scaling5: 0.40350878
timelineCount: 6
timeline0: 0.0
timeline1: 0.12328767
timeline2: 0.25342464
timeline3: 0.89041096
timeline4: 1.0
timeline2: 0.26027396
timeline3: 0.63013697
timeline4: 0.9246575
timeline5: 1.0
- Options -
attached: false
continuous: true
@ -140,4 +151,4 @@ additive: false
behind: false
premultipliedAlpha: false
- Image Path -
cube.png
square.png

View File

@ -157,8 +157,8 @@ default-slider-knob
vertical-slider-knob
rotate: false
xy: 27, 1
size: 13, 5
orig: 13, 5
size: 14, 5
orig: 14, 5
offset: 0, 0
index: -1
default-splitpane

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -1,6 +1,5 @@
package zero1hd.polyjet.entity;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;

View File

@ -1,6 +1,5 @@
package zero1hd.polyjet.entity.ally;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.math.Rectangle;
@ -19,21 +18,21 @@ public class Laser extends Actor implements Entity, Poolable {
public Laser(Texture laserTexture) {
this.laserTexture = laserTexture;
setSize(0.25f, 1f);
setSize(0.25f, 2f);
}
public void init(float x, float y, float rate) {
Gdx.app.debug("Laser", "Pos: " + x + "," + y);
setX(x);
setY(y);
this.rate = rate;
hitBox = new Rectangle();
hitBox.setSize(getWidth(), getHeight());
toBack();
}
@Override
public void act(float delta) {
toBack();
moveBy(0, delta*rate);
hitBox.setX(getX());
hitBox.setY(getY());
@ -61,6 +60,9 @@ public class Laser extends Actor implements Entity, Poolable {
@Override
public void collided(Entity entity) {
if (entity.getEntityType() == Entities.VOID_CIRCLE) {
dead = true;
}
}
@Override

View File

@ -1,6 +1,5 @@
package zero1hd.polyjet.entity.enemies;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
@ -24,6 +23,7 @@ public class VoidCircle extends Actor implements Entity, Poolable {
private boolean done;
private boolean begin;
private Vector2 center;
public VoidCircle(ShapeRenderer shapeRenderer) {
hitBox = new Rectangle();
this.shapeRenderer = shapeRenderer;
@ -42,6 +42,8 @@ public VoidCircle(ShapeRenderer shapeRenderer) {
@Override
public void act(float delta) {
toFront();
center.x = getX()+getWidth()/2f;
center.y = getY()+getHeight()/2f;
hitBox.setCenter(center.x, center.y);

View File

@ -37,6 +37,7 @@ public class GamePlayArea extends Stage {
shapes.setProjectionMatrix(getCamera().combined);
entityController = new EntityController(assetManager, shapes);
collisionDetector = new CollisionDetector(entityController.activeAllies, entityController.activeEnemies);
entityController.activeAllies.add(polyjet);
addActor(polyjet);
}