Merge remote-tracking branch 'origin/master'
# Conflicts: # src/project/Colors.java # src/project/Main.java # src/project/Sprites/player.java
This commit is contained in:
commit
684bac312f
@ -1,5 +1,3 @@
|
||||
// This module was created by Quentin Snow
|
||||
|
||||
package project;
|
||||
|
||||
import java.awt.*;
|
||||
@ -9,4 +7,5 @@ public class Colors {
|
||||
static final Color lineWhite = new Color(235, 235, 235);
|
||||
static final Color lineYellow = new Color(218, 190, 93);
|
||||
static final Color startGreen = new Color(13, 255, 0);
|
||||
static final Color startBlue = new Color(112, 113, 255);
|
||||
}
|
||||
|
13
src/project/Sprites/colorsTemp.java
Normal file
13
src/project/Sprites/colorsTemp.java
Normal file
@ -0,0 +1,13 @@
|
||||
package project.Sprites;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
public class colorsTemp {
|
||||
static final Color roadGrey = new Color(68,68,68);
|
||||
static final Color lineWhite = new Color(235, 235, 235);
|
||||
static final Color lineYellow = new Color(218, 190, 93);
|
||||
static final Color startGreen = new Color(13, 255, 0);
|
||||
static final Color startBlue = new Color(112, 113, 255);
|
||||
static final Color playerBody = new Color(247, 17, 17);
|
||||
static final Color Tires = new Color(0, 0, 0);
|
||||
}
|
@ -1,13 +1,16 @@
|
||||
package project.Sprites;
|
||||
|
||||
import project.Colors;
|
||||
import project.Expo;
|
||||
import java.applet.Applet;
|
||||
import java.awt.*;
|
||||
|
||||
public class player extends Applet {
|
||||
public static void make(Graphics g){
|
||||
Expo.fillRectangle(g,100,100,125,150);
|
||||
Expo.fillRectangle(g,105,110,95,120);
|
||||
|
||||
public static void make(Graphics g) {
|
||||
Expo.setColor(g,colorsTemp.playerBody);
|
||||
Expo.fillRectangle(g, 100, 100, 135, 160);
|
||||
Expo.setColor(g,colorsTemp.Tires);
|
||||
Expo.fillRectangle(g, 105, 108, 90, 128);
|
||||
Expo.fillRectangle(g, 105, 108, 90, 128);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user