diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 Binary files /dev/null and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index a1c2a238a965f004ff76978ac1086aa6fe95caea..146dceaa96687adb797454c8e048acbc3c070434 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +# media files +*.mp4 diff --git a/bagel-starter-pack/.gitignore b/bagel-starter-pack/.gitignore deleted file mode 100644 index f63bc049776ab3ec747d02ffe7c5fade3059026d..0000000000000000000000000000000000000000 --- a/bagel-starter-pack/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -/.idea -*.iml - diff --git a/bagel-starter-pack/pom.xml b/bagel-starter-pack/pom.xml deleted file mode 100644 index 19edbafc627e4d560897199b353fac6ad0463909..0000000000000000000000000000000000000000 --- a/bagel-starter-pack/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>au.edu.unimelb.cis</groupId> - <artifactId>bagel</artifactId> - <version>0.1-SNAPSHOT</version> - <packaging>jar</packaging> - - <build> - <sourceDirectory>src/</sourceDirectory> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>11</source> - <target>11</target> - </configuration> - </plugin> - </plugins> - </build> - - <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>io.github.eleanor-em</groupId> - <artifactId>bagel</artifactId> - <version>1.9.3</version> - </dependency> - </dependencies> -</project> diff --git a/bagel-starter-pack/res/bagel.png b/bagel-starter-pack/res/bagel.png deleted file mode 100644 index 13ad6a70d5ca358b77e98680daa5034fff5c3120..0000000000000000000000000000000000000000 Binary files a/bagel-starter-pack/res/bagel.png and /dev/null differ diff --git a/bagel-starter-pack/res/ball.png b/bagel-starter-pack/res/ball.png deleted file mode 100644 index 3a695bca9a0c3b2243a698236128e8e5961737ea..0000000000000000000000000000000000000000 Binary files a/bagel-starter-pack/res/ball.png and /dev/null differ diff --git a/bagel-starter-pack/res/conformable.otf b/bagel-starter-pack/res/conformable.otf deleted file mode 100644 index 52cf623d896c065914bd1b06c0462919b54f6ff3..0000000000000000000000000000000000000000 Binary files a/bagel-starter-pack/res/conformable.otf and /dev/null differ diff --git a/bagel-starter-pack/res/house.png b/bagel-starter-pack/res/house.png deleted file mode 100644 index 0bb978132c6d6c4bfed143a72f2011ae014cd293..0000000000000000000000000000000000000000 Binary files a/bagel-starter-pack/res/house.png and /dev/null differ diff --git a/bagel-starter-pack/res/player.png b/bagel-starter-pack/res/player.png deleted file mode 100644 index 103a2ff1c64ccd5bf18b9ef8b2ca444dbdf204d1..0000000000000000000000000000000000000000 Binary files a/bagel-starter-pack/res/player.png and /dev/null differ diff --git a/bagel-starter-pack/res/smiley.png b/bagel-starter-pack/res/smiley.png deleted file mode 100644 index 2a0810422a1e894cd405bd2982f9260cc42a9a6f..0000000000000000000000000000000000000000 Binary files a/bagel-starter-pack/res/smiley.png and /dev/null differ diff --git a/bagel-starter-pack/src/BagelTest.java b/bagel-starter-pack/src/BagelTest.java deleted file mode 100644 index cc306fb7f0c7f871eb7dce2458687920a12e5bc0..0000000000000000000000000000000000000000 --- a/bagel-starter-pack/src/BagelTest.java +++ /dev/null @@ -1,59 +0,0 @@ -import bagel.*; - -import java.util.Random; - -/** - * An example Bagel game. - * - * @author Eleanor McMurtry - */ -public class BagelTest extends AbstractGame { - private Image smiley; - private Image bagel; - private double x = 100; - private double y = 100; - - public BagelTest() { - super(800, 600, "Hello World"); - bagel = new Image("res/bagel.png"); - smiley = new Image("res/smiley.png"); - } - - /** - * The entry point for the program. - */ - public static void main(String[] args) { - BagelTest game = new BagelTest(); - game.run(); - } - - /** - * Performs a state update. This simple example shows an image that can be controlled with the arrow keys, and - * allows the game to exit when the escape key is pressed. - */ - @Override - public void update(Input input) { - double speed = 0.5; - - if (input.isDown(Keys.LEFT)) { - x -= speed; - } - if (input.isDown(Keys.RIGHT)) { - x += speed; - } - if (input.isDown(Keys.UP)) { - y -= speed; - } - if (input.isDown(Keys.DOWN)) { - y += speed; - } - - if (input.wasPressed(Keys.ESCAPE)) { - Window.close(); - } - - - bagel.draw(Window.getWidth() / 2.0, Window.getHeight() / 2.0); - smiley.draw(x, y); - } -} diff --git a/project1-4.pdf b/project1-4.pdf new file mode 100644 index 0000000000000000000000000000000000000000..a2ebdc543a1909b57b947d209a744a495464cef4 Binary files /dev/null and b/project1-4.pdf differ