Moved assets to assets folder

ucsb-cs56-projects · Jun 6, 2013 · 6b5e6e6 · 6b5e6e6
1 parent 674d006
commit 6b5e6e6
Show file tree

Hide file tree

Showing 31 changed files with 16 additions and 16 deletions.
diff --git a/pacpix/ghost.png → assets/ghost.png b/pacpix/ghost.png → assets/ghost.png
diff --git a/pacpix/down1.png → assets/pacman/down1.png b/pacpix/down1.png → assets/pacman/down1.png
diff --git a/pacpix/down2.png → assets/pacman/down2.png b/pacpix/down2.png → assets/pacman/down2.png
diff --git a/pacpix/down3.png → assets/pacman/down3.png b/pacpix/down3.png → assets/pacman/down3.png
diff --git a/pacpix/left1.png → assets/pacman/left1.png b/pacpix/left1.png → assets/pacman/left1.png
diff --git a/pacpix/left2.png → assets/pacman/left2.png b/pacpix/left2.png → assets/pacman/left2.png
diff --git a/pacpix/left3.png → assets/pacman/left3.png b/pacpix/left3.png → assets/pacman/left3.png
diff --git a/pacpix/pacman.png → assets/pacman/pacman.png b/pacpix/pacman.png → assets/pacman/pacman.png
diff --git a/pacpix/right1.png → assets/pacman/right1.png b/pacpix/right1.png → assets/pacman/right1.png
diff --git a/pacpix/right2.png → assets/pacman/right2.png b/pacpix/right2.png → assets/pacman/right2.png
diff --git a/pacpix/right3.png → assets/pacman/right3.png b/pacpix/right3.png → assets/pacman/right3.png
diff --git a/pacpix/up1.png → assets/pacman/up1.png b/pacpix/up1.png → assets/pacman/up1.png
diff --git a/pacpix/up2.png → assets/pacman/up2.png b/pacpix/up2.png → assets/pacman/up2.png
diff --git a/pacpix/up3.png → assets/pacman/up3.png b/pacpix/up3.png → assets/pacman/up3.png
diff --git a/pacpix1/down1.png → assets/pacpix1/down1.png b/pacpix1/down1.png → assets/pacpix1/down1.png
diff --git a/pacpix1/down2.png → assets/pacpix1/down2.png b/pacpix1/down2.png → assets/pacpix1/down2.png
diff --git a/pacpix1/down3.png → assets/pacpix1/down3.png b/pacpix1/down3.png → assets/pacpix1/down3.png
diff --git a/pacpix1/ghost.png → assets/pacpix1/ghost.png b/pacpix1/ghost.png → assets/pacpix1/ghost.png
diff --git a/pacpix1/left1.png → assets/pacpix1/left1.png b/pacpix1/left1.png → assets/pacpix1/left1.png
diff --git a/pacpix1/left2.png → assets/pacpix1/left2.png b/pacpix1/left2.png → assets/pacpix1/left2.png
diff --git a/pacpix1/left3.png → assets/pacpix1/left3.png b/pacpix1/left3.png → assets/pacpix1/left3.png
diff --git a/pacpix1/pacman.png → assets/pacpix1/pacman.png b/pacpix1/pacman.png → assets/pacpix1/pacman.png
diff --git a/pacpix1/right1.png → assets/pacpix1/right1.png b/pacpix1/right1.png → assets/pacpix1/right1.png
diff --git a/pacpix1/right2.png → assets/pacpix1/right2.png b/pacpix1/right2.png → assets/pacpix1/right2.png
diff --git a/pacpix1/right3.png → assets/pacpix1/right3.png b/pacpix1/right3.png → assets/pacpix1/right3.png
diff --git a/pacpix1/up1.png → assets/pacpix1/up1.png b/pacpix1/up1.png → assets/pacpix1/up1.png
diff --git a/pacpix1/up2.png → assets/pacpix1/up2.png b/pacpix1/up2.png → assets/pacpix1/up2.png
diff --git a/pacpix1/up3.png → assets/pacpix1/up3.png b/pacpix1/up3.png → assets/pacpix1/up3.png
diff --git a/build.xml b/build.xml
@@ -4,7 +4,7 @@
 
    <property environment="env"/> <!-- load the environment variables --> 
    <property name="projectPackage" value="edu.ucsb.cs56.projects.games.pacman" />
-   <property name="out.assets.dir" value="build/edu/ucsb/cs56/projects/games/pacman/pacpix" />
+   <property name="out.assets.dir" value="build/edu/ucsb/cs56/projects/games/pacman/assets" />
    <property name="webRoot" value="${env.HOME}/public_html/cs56" />
    <property name="webBaseURL"
 	     value="http://www.cs.ucsb.edu/~${env.USER}/cs56" />
@@ -26,7 +26,7 @@
     <mkdir dir="build" />
     <mkdir dir="${out.assets.dir}" />
     <copy includeemptydirs="false" todir="${out.assets.dir}">
-      <fileset dir="pacpix"/>
+      <fileset dir="assets"/>
     </copy>
     <javac srcdir="src" destdir="build" debug="true" debuglevel="lines,source" 
 	   includeantruntime="false" >

diff --git a/src/edu/ucsb/cs56/projects/games/pacman/Ghost.java b/src/edu/ucsb/cs56/projects/games/pacman/Ghost.java
@@ -47,7 +47,7 @@ public void draw(Graphics2D g, JComponent canvas) {
     @Override
     public void loadImages() {
 	try {
-	    ghost = ImageIO.read(getClass().getResource("pacpix/ghost.png"));
+	    ghost = ImageIO.read(getClass().getResource("assets/ghost.png"));
 	} catch (IOException e) {
 	    e.printStackTrace();
 	}

diff --git a/src/edu/ucsb/cs56/projects/games/pacman/PacPlayer.java b/src/edu/ucsb/cs56/projects/games/pacman/PacPlayer.java
@@ -301,19 +301,19 @@ else if ((key == KeyEvent.VK_A || key == KeyEvent.VK_D ||
 	@Override
 	public void loadImages() {
 	    try {
-		pacman1 = ImageIO.read(getClass().getResource("pacpix/pacman.png"));
-		pacman2up = ImageIO.read(getClass().getResource("pacpix/up1.png"));
-		pacman3up = ImageIO.read(getClass().getResource("pacpix/up2.png"));
-		pacman4up = ImageIO.read(getClass().getResource("pacpix/up3.png"));
-		pacman2down = ImageIO.read(getClass().getResource("pacpix/down1.png"));
-		pacman3down = ImageIO.read(getClass().getResource("pacpix/down2.png"));
-		pacman4down = ImageIO.read(getClass().getResource("pacpix/down3.png"));
-		pacman2left = ImageIO.read(getClass().getResource("pacpix/left1.png"));
-		pacman3left = ImageIO.read(getClass().getResource("pacpix/left2.png"));
-		pacman4left = ImageIO.read(getClass().getResource("pacpix/left3.png"));
-		pacman2right = ImageIO.read(getClass().getResource("pacpix/right1.png"));
-		pacman3right = ImageIO.read(getClass().getResource("pacpix/right2.png"));
-		pacman4right = ImageIO.read(getClass().getResource("pacpix/right3.png"));
+		pacman1 = ImageIO.read(getClass().getResource("assets/pacman/pacman.png"));
+		pacman2up = ImageIO.read(getClass().getResource("assets/pacman/up1.png"));
+		pacman3up = ImageIO.read(getClass().getResource("assets/pacman/up2.png"));
+		pacman4up = ImageIO.read(getClass().getResource("assets/pacman/up3.png"));
+		pacman2down = ImageIO.read(getClass().getResource("assets/pacman/down1.png"));
+		pacman3down = ImageIO.read(getClass().getResource("assets/pacman/down2.png"));
+		pacman4down = ImageIO.read(getClass().getResource("assets/pacman/down3.png"));
+		pacman2left = ImageIO.read(getClass().getResource("assets/pacman/left1.png"));
+		pacman3left = ImageIO.read(getClass().getResource("assets/pacman/left2.png"));
+		pacman4left = ImageIO.read(getClass().getResource("assets/pacman/left3.png"));
+		pacman2right = ImageIO.read(getClass().getResource("assets/pacman/right1.png"));
+		pacman3right = ImageIO.read(getClass().getResource("assets/pacman/right2.png"));
+		pacman4right = ImageIO.read(getClass().getResource("assets/pacman/right3.png"));
 	    } 
         catch (IOException e) {
 	        e.printStackTrace();