Skip to content

Commit

Permalink
move assets in data
Browse files Browse the repository at this point in the history
  • Loading branch information
steviegalluscio committed Apr 21, 2023
1 parent dc91344 commit 70df4a1
Show file tree
Hide file tree
Showing 25 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions Car.pde
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Car{

//Constructor
Car(float intialY){
carSprite = loadImage("assets\\carYellow\\carYellow_0005.png");
carSprite = loadImage("data\\assets\\carYellow\\carYellow_0005.png");
carX = width/2;
carY = intialY;
vx = 0;
Expand Down Expand Up @@ -49,31 +49,31 @@ class Car{
vy -= carSpeedIso;
vx += carSpeed;
}
carSprite = loadImage("assets\\carYellow\\carYellow_0005.png");
carSprite = loadImage("data\\assets\\carYellow\\carYellow_0005.png");
}

void moveDown(){
if(vx > -maxv && vy < maxv){
vy += carSpeedIso;
vx -= carSpeed;
}
carSprite = loadImage("assets\\carYellow\\carYellow_0011.png");
carSprite = loadImage("data\\assets\\carYellow\\carYellow_0011.png");
}

void moveLeft(){
if(vy > -maxv && vx > -maxv){
vx-= carSpeed;
vy-= carSpeedIso;
}
carSprite = loadImage("assets\\carYellow\\carYellow_0007.png");
carSprite = loadImage("data\\assets\\carYellow\\carYellow_0007.png");
}

void moveRight(){
if(vy < maxv && vx < maxv){
vx+= carSpeed;
vy+= carSpeedIso;
}
carSprite = loadImage("assets\\carYellow\\carYellow_0001.png");
carSprite = loadImage("data\\assets\\carYellow\\carYellow_0001.png");
}

//Stops car from moving and displays in place, used for win
Expand Down
4 changes: 2 additions & 2 deletions IsometricGrid.pde
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class IsometricGrid{
//Constructor
IsometricGrid(String gstr){
//println("gstr"+gstr);
ice = loadImage("assets\\tiles\\voxelTile_07_small_fix.png");
goal = loadImage("assets\\tiles\\abstractTile_10_small.png");
ice = loadImage("data\\assets\\tiles\\voxelTile_07_small_fix.png");
goal = loadImage("data\\assets\\tiles\\abstractTile_10_small.png");
imageMode(CENTER);
grid = new int[9][9];
for(int i = 0; i < 81; i++){
Expand Down
2 changes: 1 addition & 1 deletion MenuScene.pde
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class MenuScene extends Scene{

//display logo spinning
imageMode(CENTER);
taxiLogo = loadImage("assets\\carYellow\\carYellow_"+ String.format("%04d", taxiLogoAnimationFrame) +".png");
taxiLogo = loadImage("data\\assets\\carYellow\\carYellow_"+ String.format("%04d", taxiLogoAnimationFrame) +".png");
//update logo animation frame number
if(frameCount%10 == 0){ taxiLogoAnimationFrame = taxiLogoAnimationFrame < 11 ? taxiLogoAnimationFrame + 1 : 0; }
image(taxiLogo,width/2,(height/2)-textAscent()*5);
Expand Down
14 changes: 7 additions & 7 deletions TaxiTundra.pde
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ void setup(){
new MapEditorScene(),
new GameScene()
};
font = createFont("assets\\fonts\\Dongle-Bold.ttf", 32);
font = createFont("data\\assets\\fonts\\Dongle-Bold.ttf", 32);
textFont(font);
carSound = new SoundFile(this, "assets\\audio\\tires_squal_loop.wav");
menuOptionSound = new SoundFile(this, "assets\\audio\\ui.wav");
gameplayBgSound = new SoundFile(this, "assets\\audio\\Ludum-Dare-38-Track-Four.wav");
winSound = new SoundFile(this, "assets\\audio\\fupicat__congrats.wav");
lossSound = new SoundFile(this, "assets\\audio\\cabled_mess__lose_funny_retro_video-game.wav");
menuBgSound = new SoundFile(this, "assets\\audio\\Ludum-Dare-38-Track-Two.wav");
carSound = new SoundFile(this, "data\\assets\\audio\\tires_squal_loop.wav");
menuOptionSound = new SoundFile(this, "data\\assets\\audio\\ui.wav");
gameplayBgSound = new SoundFile(this, "data\\assets\\audio\\Ludum-Dare-38-Track-Four.wav");
winSound = new SoundFile(this, "data\\assets\\audio\\fupicat__congrats.wav");
lossSound = new SoundFile(this, "data\\assets\\audio\\cabled_mess__lose_funny_retro_video-game.wav");
menuBgSound = new SoundFile(this, "data\\assets\\audio\\Ludum-Dare-38-Track-Two.wav");
menuBgSound.loop();
}

Expand Down
Binary file added data/assets/audio/Ludum-Dare-38-Track-Four.wav
Binary file not shown.
Binary file added data/assets/audio/Ludum-Dare-38-Track-Two.wav
Binary file not shown.
Binary file not shown.
Binary file added data/assets/audio/fupicat__congrats.wav
Binary file not shown.
Binary file added data/assets/audio/tires_squal_loop.wav
Binary file not shown.
Binary file added data/assets/audio/ui.wav
Binary file not shown.
Binary file added data/assets/carYellow/carYellow_0000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0006.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0007.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0008.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0009.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0010.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/carYellow/carYellow_0011.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/fonts/Dongle-Bold.ttf
Binary file not shown.
Binary file added data/assets/tiles/abstractTile_10_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/assets/tiles/voxelTile_07_small_fix.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 70df4a1

Please sign in to comment.