Fixed faster rendering and ball bouncing.

Jonathan / BallJumper

Browse code Fixed faster rendering and ball bouncing. master
1 parent f7d4e50 commit 595a2b59b9c00f1529bf42cc06b63d5cf3a25a5a Jonathan Ström authored on 28 Jul 2017

Patch

Showing 3 changed files

Ignore Space Show notes View app/src/main/java/jonathan/balljumper/GameSurfaceView.java
package jonathan.balljumper; import android.app.Activity; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.LightingColorFilter; import android.graphics.Paint; import android.graphics.Point; import android.graphics.Rect; import android.view.SurfaceHolder; import android.view.SurfaceView; import jonathan.balljumper.classes.Ball; import jonathan.balljumper.classes.Panel; import jonathan.balljumper.classes.Sprite; /** * Created by Jonathan on 27/07/2017. / public class GameSurfaceView extends SurfaceView implements Runnable { private boolean isRunning = false; private Thread gameThread; private SurfaceHolder holder; private Point screenSize; private Ball ball; private Panel[] panelList; private final static int MAX_FPS = 40; private final static int FRAME_PERIOD = 1000 / MAX_FPS; public GameSurfaceView(Context context) { super(context); // Get and set window size. screenSize = new Point(); ((Activity)getContext()).getWindowManager() .getDefaultDisplay() .getSize(screenSize); holder = getHolder(); holder.addCallback(new SurfaceHolder.Callback() { @Override public void surfaceCreated(SurfaceHolder holder) { } @Override public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { screenSize.x = width; screenSize.y = height; } @Override public void surfaceDestroyed(SurfaceHolder holder) { } }); // Initialize ball. int ballRadius = 35; ball = new Ball(screenSize.x / 2 - ballRadius / 2, (screenSize.y / 3) 2 - ballRadius, ballRadius, Color.argb(255, 200, 34, 34)); // Initialize all panels. panelList = new Panel[10]; } /** * Start or resume the game. / public void resume() { isRunning = true; gameThread = new Thread(this); gameThread.start(); } /* * Pause the game loop / public void pause() { isRunning = false; boolean retry = true; while (retry) { try { gameThread.join(); retry = false; } catch (InterruptedException e) { // Try shutting down the thread again. } } } /* * Updates each frame. / protected void update() { // Game mechanics if (ball.getBottom() >= screenSize.y) { ball.bounce(); } else if (ball.getTop() <= 0) { ball.bounce(); } ball.setY(ball.getY() + ball.getSpeed() ball.getDirectionY()); } /** * Render everything to the screen. * @param canvas / protected void render(Canvas canvas) { // Reset background canvas.drawColor(Color.GREEN); // Render ball Paint p = new Paint(); ColorFilter filter = new LightingColorFilter(ball.getColor(), 0); p.setColorFilter(filter); p.setColor(ball.getColor()); canvas.drawCircle(ball.getX(), ball.getY(), ball.getRadius(), p); } @Override public void run() { while(isRunning) { // Make sure the surface is ready if (! holder.getSurface().isValid()) { continue; } long started = System.currentTimeMillis(); // Update objects. update(); // Render objects to screen. Canvas canvas = holder.lockCanvas(); if (canvas != null) { render(canvas); holder.unlockCanvasAndPost(canvas); } // Make sure update, updates accordingly to the FPS. float deltaTime = (System.currentTimeMillis() - started); int sleepTime = (int) (FRAME_PERIOD - deltaTime); if (sleepTime > 0) { try { gameThread.sleep(sleepTime / 2); } catch (InterruptedException e) { } } while (sleepTime < 0) { update(); sleepTime += FRAME_PERIOD; } } } } package jonathan.balljumper; import android.app.Activity; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.LightingColorFilter; import android.graphics.Paint; import android.graphics.Point; import android.graphics.Rect; import android.view.SurfaceHolder; import android.view.SurfaceView; import jonathan.balljumper.classes.Ball; import jonathan.balljumper.classes.Panel; import jonathan.balljumper.classes.Sprite; /* * Created by Jonathan on 27/07/2017. / public class GameSurfaceView extends SurfaceView implements Runnable { private boolean isRunning = false; private Thread gameThread; private SurfaceHolder holder; private Point screenSize; private Ball ball; private Panel[] panelList; private final static int MAX_FPS = 40; private final static int FRAME_PERIOD = 1000 / MAX_FPS; public GameSurfaceView(Context context) { super(context); // Get and set window size. screenSize = new Point(); ((Activity)getContext()).getWindowManager() .getDefaultDisplay() .getSize(screenSize); holder = getHolder(); holder.addCallback(new SurfaceHolder.Callback() { @Override public void surfaceCreated(SurfaceHolder holder) { } @Override public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { screenSize.x = width; screenSize.y = height; } @Override public void surfaceDestroyed(SurfaceHolder holder) { } }); // Initialize ball. int ballRadius = 35; ball = new Ball(screenSize.x / 2 - ballRadius / 2, (screenSize.y / 3) 2 - ballRadius, ballRadius, Color.argb(255, 200, 34, 34)); // Initialize all panels. panelList = new Panel[10]; } /** * Start or resume the game. / public void resume() { isRunning = true; gameThread = new Thread(this); gameThread.start(); } /* * Pause the game loop / public void pause() { isRunning = false; boolean retry = true; while (retry) { try { gameThread.join(); retry = false; } catch (InterruptedException e) { // Try shutting down the thread again. } } } /* * Updates each frame. / protected void update() { // Game mechanics ball.setY(ball.getY() + ball.getSpeed()); } /* * Render everything to the screen. * @param canvas */ protected void render(Canvas canvas) { // Reset background canvas.drawColor(Color.GREEN); // Render ball Paint p = new Paint(); ColorFilter filter = new LightingColorFilter(ball.getColor(), 0); p.setColorFilter(filter); p.setColor(ball.getColor()); canvas.drawCircle(ball.getX(), ball.getY(), ball.getRadius(), p); } @Override public void run() { while(isRunning) { // Make sure the surface is ready if (! holder.getSurface().isValid()) { continue; } long started = System.currentTimeMillis(); // Update objects. update(); // Render objects to screen. Canvas canvas = holder.lockCanvas(); if (canvas != null) { render(canvas); holder.unlockCanvasAndPost(canvas); } // Make sure update, updates accordingly to the FPS. float deltaTime = (System.currentTimeMillis() - started); int sleepTime = (int) (FRAME_PERIOD - deltaTime); if (sleepTime > 0) { try { gameThread.sleep(sleepTime); } catch (InterruptedException e) { } } while (sleepTime < 0) { update(); sleepTime += FRAME_PERIOD; } } } }

Ignore Space Show notes View

app/src/main/java/jonathan/balljumper/GameSurfaceView.java

package jonathan.balljumper;

import android.app.Activity;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.LightingColorFilter;
import android.graphics.Paint;
import android.graphics.Point;
import android.graphics.Rect;
import android.view.SurfaceHolder;
import android.view.SurfaceView;

import jonathan.balljumper.classes.Ball;
import jonathan.balljumper.classes.Panel;
import jonathan.balljumper.classes.Sprite;

/**
 * Created by Jonathan on 27/07/2017.
 */

public class GameSurfaceView extends SurfaceView implements Runnable {
    private boolean isRunning = false;
    private Thread gameThread;
    private SurfaceHolder holder;

private Point screenSize;

private Ball ball;
    private Panel[] panelList;

private final static int MAX_FPS = 40;
    private final static int FRAME_PERIOD = 1000 / MAX_FPS;

public GameSurfaceView(Context context) {
        super(context);

// Get and set window size.
        screenSize = new Point();
        ((Activity)getContext()).getWindowManager()
                                .getDefaultDisplay()
                                .getSize(screenSize);

holder = getHolder();
        holder.addCallback(new SurfaceHolder.Callback() {
            @Override
            public void surfaceCreated(SurfaceHolder holder) {
            }

@Override
            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
                screenSize.x = width;
                screenSize.y = height;
            }

@Override
            public void surfaceDestroyed(SurfaceHolder holder) {
            }
        });

// Initialize ball.
        int ballRadius = 35;
        ball = new Ball(screenSize.x / 2 - ballRadius / 2,
                       (screenSize.y / 3) * 2 - ballRadius,
                        ballRadius,
                        Color.argb(255, 200, 34, 34));

// Initialize all panels.
        panelList = new Panel[10];
    }

/**
     * Start or resume the game.
     */
    public void resume() {
        isRunning = true;
        gameThread = new Thread(this);
        gameThread.start();
    }

/**
     * Pause the game loop
     */
    public void pause() {
        isRunning = false;
        boolean retry = true;
        while (retry) {
            try {
                gameThread.join();
                retry = false;
            } catch (InterruptedException e) {
                // Try shutting down the thread again.
            }
        }
    }

/**
     * Updates each frame.
     */
    protected void update() {
        // Game mechanics
        if (ball.getBottom() >= screenSize.y) {
            ball.bounce();
        } else if (ball.getTop() <= 0) {
            ball.bounce();
        }

ball.setY(ball.getY() + ball.getSpeed() * ball.getDirectionY());
    }

/**
     * Render everything to the screen.
     * @param canvas
     */
    protected void render(Canvas canvas) {
        // Reset background
        canvas.drawColor(Color.GREEN);

// Render ball
        Paint p = new Paint();
        ColorFilter filter = new LightingColorFilter(ball.getColor(), 0);
        p.setColorFilter(filter);
        p.setColor(ball.getColor());
        canvas.drawCircle(ball.getX(), ball.getY(), ball.getRadius(), p);
    }

@Override
    public void run() {
        while(isRunning) {
            // Make sure the surface is ready
            if (! holder.getSurface().isValid()) {
                continue;
            }
            long started = System.currentTimeMillis();

// Update objects.
            update();

// Render objects to screen.
            Canvas canvas = holder.lockCanvas();
            if (canvas != null) {
                render(canvas);
                holder.unlockCanvasAndPost(canvas);
            }

// Make sure update, updates accordingly to the FPS.
            float deltaTime = (System.currentTimeMillis() - started);
            int sleepTime = (int) (FRAME_PERIOD - deltaTime);
            if (sleepTime > 0) {
                try {
                    gameThread.sleep(sleepTime / 2);
                }
                catch (InterruptedException e) {
                }
            }
            while (sleepTime < 0) {
                update();
                sleepTime += FRAME_PERIOD;
            }
        }
    }
}

package jonathan.balljumper;

import jonathan.balljumper.classes.Ball;
import jonathan.balljumper.classes.Panel;
import jonathan.balljumper.classes.Sprite;

/**
 * Created by Jonathan on 27/07/2017.
 */

public class GameSurfaceView extends SurfaceView implements Runnable {
    private boolean isRunning = false;
    private Thread gameThread;
    private SurfaceHolder holder;

private Point screenSize;

private Ball ball;
    private Panel[] panelList;

private final static int MAX_FPS = 40;
    private final static int FRAME_PERIOD = 1000 / MAX_FPS;

public GameSurfaceView(Context context) {
        super(context);

holder = getHolder();
        holder.addCallback(new SurfaceHolder.Callback() {
            @Override
            public void surfaceCreated(SurfaceHolder holder) {
            }

@Override
            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
                screenSize.x = width;
                screenSize.y = height;
            }

@Override
            public void surfaceDestroyed(SurfaceHolder holder) {
            }
        });

// Initialize all panels.
        panelList = new Panel[10];
    }

/**
     * Start or resume the game.
     */
    public void resume() {
        isRunning = true;
        gameThread = new Thread(this);
        gameThread.start();
    }

/**
     * Updates each frame.
     */
    protected void update() {
        // Game mechanics
        ball.setY(ball.getY() + ball.getSpeed());
    }

/**
     * Render everything to the screen.
     * @param canvas
     */
    protected void render(Canvas canvas) {
        // Reset background
        canvas.drawColor(Color.GREEN);

// Update objects.
            update();

// Make sure update, updates accordingly to the FPS.
            float deltaTime = (System.currentTimeMillis() - started);
            int sleepTime = (int) (FRAME_PERIOD - deltaTime);
            if (sleepTime > 0) {
                try {
                    gameThread.sleep(sleepTime);
                }
                catch (InterruptedException e) {
                }
            }
            while (sleepTime < 0) {
                update();
                sleepTime += FRAME_PERIOD;
            }
        }
    }
}

Ignore Space Show notes View app/src/main/java/jonathan/balljumper/classes/Ball.java
package jonathan.balljumper.classes; /** * Created by Jonathan on 27/07/2017. / public class Ball extends Sprite { private int radius; public Ball(int x, int y, int radius, int color) { super(x, y, radius 2, radius * 2); this.radius = radius; setColor(color); setSpeed(8); } public void bounce() { // Simple bounce. setDirectionY(getDirectionY() * -1); } public int getRadius() { return radius; } public void setRadius(int radius) { this.radius = radius; } public int getTop() { return getY() - getRadius(); } public int getBottom() { return getY() + getRadius(); } } package jonathan.balljumper.classes; /** * Created by Jonathan on 27/07/2017. / public class Ball extends Sprite { private float radius; public Ball(int x, int y, float radius, int color) { super(x, y); this.radius = radius; setColor(color); } public void bounce() { // Simple bounce. setY(getY() -1); } public float getRadius() { return radius; } public void setRadius(float radius) { this.radius = radius; } }

Ignore Space Show notes View

app/src/main/java/jonathan/balljumper/classes/Ball.java

Ignore Space Show notes View app/src/main/java/jonathan/balljumper/classes/Sprite.java
package jonathan.balljumper.classes; import android.graphics.Bitmap; /** * Created by Jonathan on 27/07/2017. / public class Sprite { protected int x, y, width, height; protected int directionX = 1; protected int directionY = 1; protected int speed = 0; protected int color = 0; protected Bitmap image; public Sprite(int x, int y) { this.x = x; this.y = y; } public Sprite(int x, int y, int width, int height) { this(x, y); this.width = width; this.height = height; } public Sprite(int x, int y, int width, int height, int color) { this(x, y, width, height); this.color = color; } public Sprite(int x, int y, Bitmap image) { this(x, y); this.image = image; this.width = image.getWidth(); this.height = image.getHeight(); } public Sprite(int x, int y, Bitmap image, int color) { this(x, y, image); this.color = color; } public int getX() { return x; } public void setX(int x) { this.x = x; } public int getY() { return y; } public void setY(int y) { this.y = y; } public int getWidth() { return width; } public void setWidth(int width) { this.width = width; } public int getHeight() { return height; } public void setHeight(int height) { this.height = height; } public int getDirectionX() { return directionX; } public void setDirectionX(int directionX) { this.directionX = directionX; } public int getDirectionY() { return directionY; } public void setDirectionY(int directionY) { this.directionY = directionY; } public int getSpeed() { return speed; } public void setSpeed(int speed) { this.speed = speed; } public int getColor() { return color; } public void setColor(int color) { this.color = color; } public Bitmap getImage() { return image; } public void setImage(Bitmap image) { this.image = image; } } package jonathan.balljumper.classes; import android.graphics.Bitmap; /* * Created by Jonathan on 27/07/2017. */ public class Sprite { protected int x, y, width, height; protected int directionX = 1; protected int directionY = 1; protected int speed = 10; protected int color = 0; protected Bitmap image; public Sprite(int x, int y) { this.x = x; this.y = y; } public Sprite(int x, int y, int width, int height) { this(x, y); this.width = width; this.height = height; } public Sprite(int x, int y, int width, int height, int color) { this(x, y, width, height); this.color = color; } public Sprite(int x, int y, Bitmap image) { this(x, y); this.image = image; this.width = image.getWidth(); this.height = image.getHeight(); } public Sprite(int x, int y, Bitmap image, int color) { this(x, y, image); this.color = color; } public int getX() { return x; } public void setX(int x) { this.x = x; } public int getY() { return y; } public void setY(int y) { this.y = y; } public int getWidth() { return width; } public void setWidth(int width) { this.width = width; } public int getHeight() { return height; } public void setHeight(int height) { this.height = height; } public int getDirectionX() { return directionX; } public void setDirectionX(int directionX) { this.directionX = directionX; } public int getDirectionY() { return directionY; } public void setDirectionY(int directionY) { this.directionY = directionY; } public int getSpeed() { return speed; } public void setSpeed(int speed) { this.speed = speed; } public int getColor() { return color; } public void setColor(int color) { this.color = color; } public Bitmap getImage() { return image; } public void setImage(Bitmap image) { this.image = image; } }

Ignore Space Show notes View

app/src/main/java/jonathan/balljumper/classes/Sprite.java

package jonathan.balljumper.classes;

import android.graphics.Bitmap;

/**
 * Created by Jonathan on 27/07/2017.
 */

public class Sprite {
    protected int x, y, width, height;
    protected int directionX = 1;
    protected int directionY = 1;
    protected int speed = 0;
    protected int color = 0;
    protected Bitmap image;

public Sprite(int x, int y) {
        this.x = x;
        this.y = y;
    }

public Sprite(int x, int y, int width, int height) {
        this(x, y);
        this.width = width;
        this.height = height;
    }

public Sprite(int x, int y, int width, int height, int color) {
        this(x, y, width, height);
        this.color = color;
    }

public Sprite(int x, int y, Bitmap image) {
        this(x, y);
        this.image = image;
        this.width = image.getWidth();
        this.height = image.getHeight();
    }

public Sprite(int x, int y, Bitmap image, int color) {
        this(x, y, image);
        this.color = color;
    }

public int getX() {
        return x;
    }

public void setX(int x) {
        this.x = x;
    }

public int getY() {
        return y;
    }

public void setY(int y) {
        this.y = y;
    }

public int getWidth() {
        return width;
    }

public void setWidth(int width) {
        this.width = width;
    }

public int getHeight() {
        return height;
    }

public void setHeight(int height) {
        this.height = height;
    }

public int getDirectionX() {
        return directionX;
    }

public void setDirectionX(int directionX) {
        this.directionX = directionX;
    }

public int getDirectionY() {
        return directionY;
    }

public void setDirectionY(int directionY) {
        this.directionY = directionY;
    }

public int getSpeed() {
        return speed;
    }

public void setSpeed(int speed) {
        this.speed = speed;
    }

public int getColor() {
        return color;
    }

public void setColor(int color) {
        this.color = color;
    }

public Bitmap getImage() {
        return image;
    }

public void setImage(Bitmap image) {
        this.image = image;
    }
}

package jonathan.balljumper.classes;

import android.graphics.Bitmap;

/**
 * Created by Jonathan on 27/07/2017.
 */

public class Sprite {
    protected int x, y, width, height;
    protected int directionX = 1;
    protected int directionY = 1;
    protected int speed = 10;
    protected int color = 0;
    protected Bitmap image;

public Sprite(int x, int y) {
        this.x = x;
        this.y = y;
    }

public Sprite(int x, int y, int width, int height) {
        this(x, y);
        this.width = width;
        this.height = height;
    }

public Sprite(int x, int y, int width, int height, int color) {
        this(x, y, width, height);
        this.color = color;
    }

public Sprite(int x, int y, Bitmap image) {
        this(x, y);
        this.image = image;
        this.width = image.getWidth();
        this.height = image.getHeight();
    }

public Sprite(int x, int y, Bitmap image, int color) {
        this(x, y, image);
        this.color = color;
    }

public int getX() {
        return x;
    }

public void setX(int x) {
        this.x = x;
    }

public int getY() {
        return y;
    }

public void setY(int y) {
        this.y = y;
    }

public int getWidth() {
        return width;
    }

public void setWidth(int width) {
        this.width = width;
    }

public int getHeight() {
        return height;
    }

public void setHeight(int height) {
        this.height = height;
    }

public int getDirectionX() {
        return directionX;
    }

public void setDirectionX(int directionX) {
        this.directionX = directionX;
    }

public int getDirectionY() {
        return directionY;
    }

public void setDirectionY(int directionY) {
        this.directionY = directionY;
    }

public int getSpeed() {
        return speed;
    }

public void setSpeed(int speed) {
        this.speed = speed;
    }

public int getColor() {
        return color;
    }

public void setColor(int color) {
        this.color = color;
    }

public Bitmap getImage() {
        return image;
    }

public void setImage(Bitmap image) {
        this.image = image;
    }
}

Show line notes below