Mikescher/CannonShooter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Progress on CannonHearth

Browse Source
This commit is contained in:
Mike Schwörer 2015-09-17 16:11:58 +02:00
parent aa006a5c0b
commit 9c63975f2c
5 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/assets/cannon_hearth.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 74 KiB

5
core/src/de/samdev/cannonshooter/entities/CannonBarrel.java
View File

@ -1,5 +1,9 @@
package de.samdev.cannonshooter.entities;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import de.samdev.absgdx.framework.entities.Entity;
import de.samdev.absgdx.framework.entities.colliosiondetection.CollisionGeometryOwner;
import de.samdev.absgdx.framework.entities.colliosiondetection.geometries.CollisionGeometry;
@ -10,7 +14,6 @@ import de.samdev.cannonshooter.ZLayers;
public class CannonBarrel extends Entity {
private static final float ANIMATION_DURATION = 1000;
private float rotation = 0;
public CannonBarrel(Cannon owner) {

23
core/src/de/samdev/cannonshooter/entities/CannonHearth.java
View File

@ -1,5 +1,9 @@
package de.samdev.cannonshooter.entities;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import de.samdev.absgdx.framework.entities.Entity;
import de.samdev.absgdx.framework.entities.colliosiondetection.CollisionGeometryOwner;
import de.samdev.absgdx.framework.entities.colliosiondetection.geometries.CollisionGeometry;
@ -8,6 +12,8 @@ import de.samdev.cannonshooter.Textures;
import de.samdev.cannonshooter.ZLayers;
public class CannonHearth extends Entity {
private static final Color COLOR_NEUTRAL = new Color(0.75f, 0.75f, 0.75f, 1f);
private float rotation = 0;
public CannonHearth(Cannon owner) {
@ -18,6 +24,19 @@ public class CannonHearth extends Entity {
setZLayer(ZLayers.LAYER_CANNON_HEARTH);
}
@Override
public void render(SpriteBatch sbatch, ShapeRenderer srenderer) {
sbatch.setColor(COLOR_NEUTRAL);
renderTexture(sbatch, Textures.cannon_hearth[63], 0, 0);
sbatch.setColor(Color.RED);
renderTexture(sbatch, Textures.cannon_hearth[(int)(rotation/4f) % 64], 0, 0);
sbatch.setColor(Color.WHITE);
}
@Override
public void onActiveCollide(CollisionGeometryOwner passiveCollider, CollisionGeometry myGeo, CollisionGeometry otherGeo) {
// TODO Auto-generated method stub
@ -54,12 +73,12 @@ public class CannonHearth extends Entity {
@Override
public void beforeUpdate(float delta) {
rotation = (rotation + 360 - delta / 8) % 360;
rotation = (rotation + 360 + delta / 8) % 360;
}
@Override
public float getTextureRotation() {
return rotation;
return 0;//rotation;
}
@Override

8
data/CreateSpriteSheet_Hearth.linq
View File

@ -11,8 +11,8 @@ void Main()
Image output = new Bitmap(input.Width * 8, input.Height * 8, PixelFormat.Format32bppArgb);
var b1 = new SolidBrush(Color.Black);
var b2 = new SolidBrush(Color.Magenta);
var b1 = new SolidBrush(Color.Transparent);
var b2 = new SolidBrush(Color.White);
using (Graphics g = Graphics.FromImage(output))
{
@ -20,7 +20,7 @@ void Main()
{
for (int y = 0; y < 8; y++)
{
var rad = ((y*8 + x) / 64.0) * 2 * Math.PI;
var rad = ((y*8 + x) / 63.0) * 2 * Math.PI;
for (int ix = 0; ix < input.Width; ix++)
{
@ -31,7 +31,7 @@ void Main()
if (input.GetPixel(ix, iy).A > 0)
{
if (GetAngle(new Vector2(ix - input.Width / 2f, iy - input.Height / 2f)) < rad)
if (GetAngle(new Vector2(ix - input.Width / 2f, iy - input.Height / 2f)) >= rad)
{
g.FillRectangle(b1, dx, dy, 1, 1);
}

BIN
lib/absGDX-framework-1.0.jar
View File

Binary file not shown.