A lot of improvements for the RPI. Uses images cached on the gpu.
This commit is contained in:
@@ -2,8 +2,11 @@ package image;
|
|||||||
|
|
||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
import java.awt.GraphicsConfiguration;
|
import java.awt.GraphicsConfiguration;
|
||||||
|
import java.awt.GraphicsDevice;
|
||||||
import java.awt.GraphicsEnvironment;
|
import java.awt.GraphicsEnvironment;
|
||||||
|
import java.awt.Transparency;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.awt.image.VolatileImage;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -78,6 +81,26 @@ public class Images {
|
|||||||
g2d.dispose();
|
g2d.dispose();
|
||||||
|
|
||||||
// return the new optimized image
|
// return the new optimized image
|
||||||
|
new_image.setAccelerationPriority(1);
|
||||||
|
new_image.flush();
|
||||||
return new_image;
|
return new_image;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static BufferedImage initBufferedImage(int width, int height){
|
||||||
|
GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
|
||||||
|
GraphicsDevice device = env.getDefaultScreenDevice();
|
||||||
|
GraphicsConfiguration config = device.getDefaultConfiguration();
|
||||||
|
return config.createCompatibleImage(width, height, Transparency.TRANSLUCENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static VolatileImage initVolatileImage(int width, int height, int opc){
|
||||||
|
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
|
||||||
|
GraphicsConfiguration gc = ge.getDefaultScreenDevice().getDefaultConfiguration();
|
||||||
|
VolatileImage image = null;
|
||||||
|
image = gc.createCompatibleVolatileImage(width, height, opc);
|
||||||
|
int valid = image.validate(gc);
|
||||||
|
if (valid == VolatileImage.IMAGE_INCOMPATIBLE)
|
||||||
|
image = initVolatileImage(width, height, opc);
|
||||||
|
return image;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,9 @@ import java.awt.GradientPaint;
|
|||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
import java.awt.Polygon;
|
import java.awt.Polygon;
|
||||||
import java.awt.RenderingHints;
|
import java.awt.RenderingHints;
|
||||||
|
import java.awt.Transparency;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.awt.image.VolatileImage;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -34,7 +36,7 @@ public class MenuState extends GameState {
|
|||||||
|
|
||||||
private int animationcounter;
|
private int animationcounter;
|
||||||
private boolean subscreen, startanimation;
|
private boolean subscreen, startanimation;
|
||||||
private BufferedImage mainScreenBackground;
|
private VolatileImage mainScreenBackground;
|
||||||
|
|
||||||
int yPosDiffButton = 900;
|
int yPosDiffButton = 900;
|
||||||
private int difSelect=0;
|
private int difSelect=0;
|
||||||
@@ -195,7 +197,7 @@ public class MenuState extends GameState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void generateMainScreenBackground(){
|
public void generateMainScreenBackground(){
|
||||||
mainScreenBackground = new BufferedImage(1280, 1024, BufferedImage.TYPE_4BYTE_ABGR);
|
mainScreenBackground = Images.initVolatileImage(1280, 1024, Transparency.OPAQUE);
|
||||||
Graphics2D g2 = mainScreenBackground.createGraphics();
|
Graphics2D g2 = mainScreenBackground.createGraphics();
|
||||||
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
||||||
g2.setRenderingHints(rh);
|
g2.setRenderingHints(rh);
|
||||||
@@ -220,8 +222,8 @@ public class MenuState extends GameState {
|
|||||||
|
|
||||||
g2.setColor(Color.BLACK);
|
g2.setColor(Color.BLACK);
|
||||||
g2.drawString("Main Menu", 30, 60);
|
g2.drawString("Main Menu", 30, 60);
|
||||||
|
g2.dispose();
|
||||||
mainScreenBackground.createGraphics();
|
mainScreenBackground.createGraphics();
|
||||||
mainScreenBackground = Images.toCompatibleImage(mainScreenBackground);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void buttonInAnimation(int button){
|
public void buttonInAnimation(int button){
|
||||||
|
|||||||
@@ -7,8 +7,13 @@ import java.awt.Color;
|
|||||||
import java.awt.Font;
|
import java.awt.Font;
|
||||||
import java.awt.GradientPaint;
|
import java.awt.GradientPaint;
|
||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
|
import java.awt.GraphicsConfiguration;
|
||||||
|
import java.awt.GraphicsDevice;
|
||||||
|
import java.awt.GraphicsEnvironment;
|
||||||
import java.awt.RenderingHints;
|
import java.awt.RenderingHints;
|
||||||
|
import java.awt.Transparency;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.awt.image.VolatileImage;
|
||||||
|
|
||||||
import model.SongHandler;
|
import model.SongHandler;
|
||||||
import control.GameStateManager;
|
import control.GameStateManager;
|
||||||
@@ -20,7 +25,7 @@ public class TitleState extends GameState {
|
|||||||
|
|
||||||
BufferedImage pressStart = Images.getImage(ImageType.pressstart);
|
BufferedImage pressStart = Images.getImage(ImageType.pressstart);
|
||||||
BufferedImage colorStrike = Images.getImage(ImageType.colorstrike);
|
BufferedImage colorStrike = Images.getImage(ImageType.colorstrike);
|
||||||
BufferedImage background;
|
VolatileImage background;
|
||||||
Font textFont = new Font("OCR A Extended", Font.BOLD, 15);
|
Font textFont = new Font("OCR A Extended", Font.BOLD, 15);
|
||||||
Font textFont2 = new Font("OCR A Extended", Font.BOLD, 130);
|
Font textFont2 = new Font("OCR A Extended", Font.BOLD, 130);
|
||||||
GradientPaint gp = new GradientPaint(300, 0, new Color(0,0,1, 0.6f),980,1024 ,new Color(0,0,1, 0.2f));
|
GradientPaint gp = new GradientPaint(300, 0, new Color(0,0,1, 0.6f),980,1024 ,new Color(0,0,1, 0.2f));
|
||||||
@@ -48,7 +53,7 @@ public class TitleState extends GameState {
|
|||||||
public void draw(Graphics2D g2) {
|
public void draw(Graphics2D g2) {
|
||||||
g2.drawImage(background, 0, 0, 1280, 1024, null);
|
g2.drawImage(background, 0, 0, 1280, 1024, null);
|
||||||
int image_x = ((frame / 6) % 6) * 49;
|
int image_x = ((frame / 6) % 6) * 49;
|
||||||
g2.drawImage(pressStart.getSubimage(image_x, 0, 49, 26), 640-122, 512, 245, 130, null);
|
g2.drawImage(pressStart.getSubimage(image_x, 0, 49, 26), 640-122, 512, 245, 130, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -71,7 +76,7 @@ public class TitleState extends GameState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void createBackground(){
|
public void createBackground(){
|
||||||
background = new BufferedImage(1280, 1024, BufferedImage.TYPE_4BYTE_ABGR);
|
background = Images.initVolatileImage(1280, 1024, Transparency.OPAQUE);
|
||||||
Graphics2D g2 = background.createGraphics();
|
Graphics2D g2 = background.createGraphics();
|
||||||
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
||||||
g2.setRenderingHints(rh);
|
g2.setRenderingHints(rh);
|
||||||
@@ -101,8 +106,8 @@ public class TitleState extends GameState {
|
|||||||
g2.setFont(textFont2);
|
g2.setFont(textFont2);
|
||||||
g2.drawString("Color", 385, 212);
|
g2.drawString("Color", 385, 212);
|
||||||
g2.drawString("Strike", 390, 342);
|
g2.drawString("Strike", 390, 342);
|
||||||
|
g2.dispose();
|
||||||
background.createGraphics();
|
background.createGraphics();
|
||||||
background = Images.toCompatibleImage(background);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ import java.awt.Color;
|
|||||||
import java.awt.Font;
|
import java.awt.Font;
|
||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
import java.awt.RenderingHints;
|
import java.awt.RenderingHints;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.Transparency;
|
||||||
|
import java.awt.image.VolatileImage;
|
||||||
|
|
||||||
import model.gameState.PlayState;
|
import model.gameState.PlayState;
|
||||||
|
|
||||||
@@ -16,7 +17,7 @@ public class InfoPanel {
|
|||||||
private int lifePercent;
|
private int lifePercent;
|
||||||
private int upgradeScore = 0;
|
private int upgradeScore = 0;
|
||||||
private int x, y;
|
private int x, y;
|
||||||
private BufferedImage infoPanel;
|
private VolatileImage infoPanel;
|
||||||
|
|
||||||
public InfoPanel(int x, int y){
|
public InfoPanel(int x, int y){
|
||||||
this.x = x;
|
this.x = x;
|
||||||
@@ -40,7 +41,7 @@ public class InfoPanel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void generateInfoPanel(){
|
private void generateInfoPanel(){
|
||||||
infoPanel = new BufferedImage(1280, 1024, BufferedImage.TYPE_INT_ARGB);
|
infoPanel = Images.initVolatileImage(256, 1024, Transparency.OPAQUE);
|
||||||
Graphics2D g2 = infoPanel.createGraphics();
|
Graphics2D g2 = infoPanel.createGraphics();
|
||||||
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
||||||
g2.setRenderingHints(rh);
|
g2.setRenderingHints(rh);
|
||||||
@@ -57,11 +58,11 @@ public class InfoPanel {
|
|||||||
|
|
||||||
g2.setColor(Color.YELLOW);
|
g2.setColor(Color.YELLOW);
|
||||||
g2.fillRect(25, 1000 - 7 * upgradeScore, 200, 0 + 7 * upgradeScore);
|
g2.fillRect(25, 1000 - 7 * upgradeScore, 200, 0 + 7 * upgradeScore);
|
||||||
|
g2.dispose();
|
||||||
infoPanel.createGraphics();
|
infoPanel.createGraphics();
|
||||||
infoPanel = Images.toCompatibleImage(infoPanel);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void draw(Graphics2D g2){
|
public void draw(Graphics2D g2){
|
||||||
g2.drawImage(infoPanel, 0, 0, 1280,1024,null);
|
g2.drawImage(infoPanel, 0, 0, 256,1024,null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,20 @@
|
|||||||
package model.objects;
|
package model.objects;
|
||||||
|
|
||||||
|
import image.Images;
|
||||||
|
|
||||||
|
import java.awt.AlphaComposite;
|
||||||
import java.awt.BasicStroke;
|
import java.awt.BasicStroke;
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
|
import java.awt.Composite;
|
||||||
import java.awt.Font;
|
import java.awt.Font;
|
||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
import java.awt.LinearGradientPaint;
|
import java.awt.LinearGradientPaint;
|
||||||
import java.awt.Paint;
|
import java.awt.Paint;
|
||||||
import java.awt.RenderingHints;
|
import java.awt.RenderingHints;
|
||||||
|
import java.awt.Transparency;
|
||||||
import java.awt.geom.GeneralPath;
|
import java.awt.geom.GeneralPath;
|
||||||
import java.awt.geom.Point2D;
|
import java.awt.geom.Point2D;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.VolatileImage;
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import audio.Song;
|
import audio.Song;
|
||||||
|
|
||||||
@@ -21,7 +25,7 @@ public class MenuButton {
|
|||||||
private Color buttoncolor;
|
private Color buttoncolor;
|
||||||
|
|
||||||
private boolean selected;
|
private boolean selected;
|
||||||
private BufferedImage background;
|
private VolatileImage background;
|
||||||
|
|
||||||
private Song song;
|
private Song song;
|
||||||
|
|
||||||
@@ -32,7 +36,6 @@ public class MenuButton {
|
|||||||
this.rounding = rounding;
|
this.rounding = rounding;
|
||||||
this.buttoncolor = c0;
|
this.buttoncolor = c0;
|
||||||
setSong(song);
|
setSong(song);
|
||||||
calculateButton();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void calculateButton(){
|
public void calculateButton(){
|
||||||
@@ -52,10 +55,13 @@ public class MenuButton {
|
|||||||
new float[]{0.0f, 1.0f},
|
new float[]{0.0f, 1.0f},
|
||||||
new Color[]{new Color(c1.getRed(), c1.getGreen(), c1.getBlue(), 10), buttoncolor});
|
new Color[]{new Color(c1.getRed(), c1.getGreen(), c1.getBlue(), 10), buttoncolor});
|
||||||
//Draw the generated button to the buffered image
|
//Draw the generated button to the buffered image
|
||||||
background = new BufferedImage(1280, 1024, BufferedImage.TYPE_4BYTE_ABGR);
|
background = Images.initVolatileImage(1280, 500, Transparency.TRANSLUCENT);
|
||||||
Graphics2D g2d = background.createGraphics();
|
Graphics2D g2d = background.createGraphics();
|
||||||
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
||||||
g2d.setRenderingHints(rh);
|
g2d.setRenderingHints(rh);
|
||||||
|
g2d.setComposite(AlphaComposite.DstOut);
|
||||||
|
g2d.fillRect(0, 0, background.getWidth(), background.getHeight());
|
||||||
|
g2d.setComposite(AlphaComposite.SrcOver);
|
||||||
|
|
||||||
g2d.setColor(c2);
|
g2d.setColor(c2);
|
||||||
g2d.fill(arrayToGeneralpath(new int[][]{{449, 1}, {449, 68},{113, 103}, {106, 35}}));
|
g2d.fill(arrayToGeneralpath(new int[][]{{449, 1}, {449, 68},{113, 103}, {106, 35}}));
|
||||||
@@ -84,7 +90,7 @@ public class MenuButton {
|
|||||||
g2d.translate((160+358)*scalefactor, (74)*scalefactor);
|
g2d.translate((160+358)*scalefactor, (74)*scalefactor);
|
||||||
g2d.rotate(-0.1);
|
g2d.rotate(-0.1);
|
||||||
g2d.drawString(song.getTitle(), 0, 0);
|
g2d.drawString(song.getTitle(), 0, 0);
|
||||||
|
g2d.dispose();
|
||||||
background.createGraphics();
|
background.createGraphics();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,7 +105,7 @@ public class MenuButton {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void draw(Graphics2D g2d){
|
public void draw(Graphics2D g2d){
|
||||||
g2d.drawImage(background, (int)((x-320)*scalefactor), (int) ((y)*scalefactor), 1280, 1024, null);
|
g2d.drawImage(background, (int)((x-320)*scalefactor), (int) ((y)*scalefactor), 1280, 500, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void update(){
|
public void update(){
|
||||||
@@ -130,5 +136,6 @@ public class MenuButton {
|
|||||||
|
|
||||||
public void setSong(Song song) {
|
public void setSong(Song song) {
|
||||||
this.song = song;
|
this.song = song;
|
||||||
|
calculateButton();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,12 @@ import java.awt.Color;
|
|||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
import java.awt.Polygon;
|
import java.awt.Polygon;
|
||||||
import java.awt.RenderingHints;
|
import java.awt.RenderingHints;
|
||||||
|
import java.awt.Transparency;
|
||||||
import java.awt.geom.Line2D;
|
import java.awt.geom.Line2D;
|
||||||
import java.awt.geom.Point2D;
|
import java.awt.geom.Point2D;
|
||||||
import java.awt.geom.Rectangle2D;
|
import java.awt.geom.Rectangle2D;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.awt.image.VolatileImage;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -21,7 +23,7 @@ public class PlayArea {
|
|||||||
public List<Path> paths;
|
public List<Path> paths;
|
||||||
private Polygon octagon,hitArea;
|
private Polygon octagon,hitArea;
|
||||||
public Rectangle2D[] hitAreas; //de area voor elk path die de enemy moet raken
|
public Rectangle2D[] hitAreas; //de area voor elk path die de enemy moet raken
|
||||||
private BufferedImage background;
|
private VolatileImage background;
|
||||||
|
|
||||||
public PlayArea(double xToRight,double heightOfGameScreen,double widthOfGameScreen, int sizeOctagon) {
|
public PlayArea(double xToRight,double heightOfGameScreen,double widthOfGameScreen, int sizeOctagon) {
|
||||||
super();
|
super();
|
||||||
@@ -96,7 +98,9 @@ public class PlayArea {
|
|||||||
paths.add(new Path(hitArea.xpoints[4] - Enemy.distanceToOctagon,hitArea.ypoints[4] ,hitArea.xpoints[4],hitArea.ypoints[4]));//left
|
paths.add(new Path(hitArea.xpoints[4] - Enemy.distanceToOctagon,hitArea.ypoints[4] ,hitArea.xpoints[4],hitArea.ypoints[4]));//left
|
||||||
paths.add(new Path(hitArea.xpoints[5] - angleX,hitArea.ypoints[5] - angleY ,hitArea.xpoints[5],hitArea.ypoints[5]));//left -top
|
paths.add(new Path(hitArea.xpoints[5] - angleX,hitArea.ypoints[5] - angleY ,hitArea.xpoints[5],hitArea.ypoints[5]));//left -top
|
||||||
|
|
||||||
background = new BufferedImage(1280, 1024, BufferedImage.TYPE_INT_ARGB);
|
|
||||||
|
//drawing into buffer
|
||||||
|
background = Images.initVolatileImage(1280,1024, Transparency.BITMASK);
|
||||||
Graphics2D g2 = background.createGraphics();
|
Graphics2D g2 = background.createGraphics();
|
||||||
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
||||||
g2.setRenderingHints(rh);
|
g2.setRenderingHints(rh);
|
||||||
@@ -110,8 +114,8 @@ public class PlayArea {
|
|||||||
}
|
}
|
||||||
g2.draw(octagon);
|
g2.draw(octagon);
|
||||||
g2.draw(hitArea);
|
g2.draw(hitArea);
|
||||||
|
g2.dispose();
|
||||||
background.createGraphics();
|
background.createGraphics();
|
||||||
background = Images.toCompatibleImage(background);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void draw(Graphics2D g2){
|
public void draw(Graphics2D g2){
|
||||||
|
|||||||
Reference in New Issue
Block a user