Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
richelbilderbeek committed Dec 3, 2023
1 parent ae07c89 commit 27547ec
Show file tree
Hide file tree
Showing 38 changed files with 9,079 additions and 27 deletions.
16 changes: 14 additions & 2 deletions activities/20231209_slutpresentation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ Dahlia |8 |P |Vacker regenb...
Angela |9 |A |Neopixel
Enrico |9 |P |Random röd
Gordii |9 |A |Blink
Shushanti |9 |P |Färger
Xiuchang |9 |P |Random
Fredrik |? |B |Wackamole
Sannan |? |B |Fedora Hat
Daniel |10 |P |Grässmatta Quest
Vide |11 |B |?
Sannan |10 |B |Igndominus
Vide |11 |B |Rabbit hat
Teo |12 |P |Pizza
WALL-E 38 |? |ABP |WALL-E 38
Team Smile.exe.co TM |11 |B |Battle Island
Expand All @@ -69,3 +70,14 @@ Mahdiya |? |P |-

* WALL-E 38: David L, Emil, Vidar
* Team Smile.exe.co TM: Daniel H, David H, Felix

## Notes for next time

* About 0.9 pizza per student
* Strong preference for margarita
* Vesuvio was second, Hawaii third





Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
float [][] position;
import ddf.minim.*;
Minim minim;
AudioPlayer player;
PImage bild;
PImage bild2;
float x = 0;
float x5 = -50;
float y5 = -50;
Expand All @@ -8,8 +12,8 @@ float copies = 200;
float size = 50;
float speedX = 0;
float speedY = 0;
float enemyX = 0;
float enemyY = 0;
float spelplanX = 0;
float spelplanY = 0;
float enemySpeedX = 1;
float enemySpeedY = 1;
float eyeX = x;
Expand All @@ -19,6 +23,10 @@ float eY = 0;
boolean[] keys;
void setup()
{
minim = new Minim(this);
player= minim.loadFile("t.mp3");
bild2 = loadImage("mus.png");
noCursor();
fullScreen();
x = width / 2 - 25;
y = height / 2 - 25;
Expand All @@ -40,29 +48,29 @@ void setup()
}
void draw()
{
if (enemyX > 0) enemyX-= 100;
if (enemyX + width / 10 < 0) enemyX = enemyX + 100;
if (enemyY > 0) enemyY-= 100;
if (enemyY + width / 10 < 0) enemyY = enemyY + 100;
player.play();
if (spelplanX > 0) spelplanX-= 100;
if (spelplanX + width / 10 < 0) spelplanX += 100;
if (spelplanY > 0) spelplanY-= 100;
if (spelplanY + width / 10 < 0) spelplanY += 100;
if (eX < x + 25) eX = eX + 1;
if (eX > x + 25) eX = eX - 1;
if (eY > y + 25) eY -= 1;
if (eY < y + 25) eY += 1;
fill(0, 180, 0);
if (dist(eX, eY, x + 25 , y + 25) < 50) exit();
stroke(0, 255, 0);
rect(enemyX, enemyY, width / 2 * 2, width / 2 * 2);
fill(255, 255, 255);

fill(255, 0, 0);
image(bild, enemyX, enemyY);
image(bild, spelplanX, spelplanY);
ellipse(eX, eY, 50, 50);
for (int i = 0; i > 200; ++i)
{
ellipse(enemyX, enemyY, 100, 100);
enemyX += 100;
ellipse(spelplanX, spelplanY, 100, 100);
spelplanX += 100;
}

player.play();
fill(0, 0, 0);
rect(x, y, size , size);
fill(255, 0, 0);
Expand All @@ -79,14 +87,14 @@ void draw()

position[i][2]=0;
}
image(bild2, mouseX, mouseY);
k();
}
void makeRect(float X, float Y, float Width, float Height){
int i=0;
for(i=0;i<position.length-1&&(position[i][2]==1);i++){
}
position[i][0]=X;
position[i][1]=Y;
position[i][0]=X;
position[i][2]=1;
position[i][3]=Width;
position[i][4]=Height;
Expand All @@ -109,35 +117,47 @@ void k()
if (keys[38])
{
y5 += 3;
enemyY = enemyY + 3;
spelplanY = spelplanY + 3;
eyeY = height / 2 - 10;
eyeX = width / 2;
eY += 2;
if (dist(x5, y5, x + 75 , y + 75) < 50) enemyY -= 3;
if (dist(x5 + 100, y5 + 100, x + 50 , y + 50) < 125){
spelplanY -= 3;
y5 -=3;
}
}
if (keys[40])
{
enemyY = enemyY - 3;
spelplanY = spelplanY - 3;
eyeY = height / 2 + 10;
eyeX = width / 2;
eY -= 2;
y5 -= 3;
if (dist(x5, y5, x + 75 , y + 75) < 50) enemyY += 3;
if (dist(x5 + 100, y5 + 100, x + 50 , y + 50) < 125){
spelplanY += 3;
y5 += 3;
}
}
if (keys[37])
{
x5 += 3;
enemyX = enemyX + 3;
spelplanX = spelplanX + 3;
eyeX = width / 2 - 10;
eyeY = height / 2;
eX += 2;
if (dist(x5, y5, x + 75 , y + 75) < 50) enemyX -= 3;
if (dist(x5 + 100, y5 + 100, x + 50 , y + 50) < 125){
spelplanX -= 3;
x5 -= 3;
}
}
if (keys[39])
{
x5 -= 3;
if (dist(x5, y5, x + 75 , y + 75) < 50) enemyX += 3;
enemyX = enemyX - 3;
if (dist(x5 + 100, y5 + 100, x + 50 , y + 50) < 125){
spelplanX += 3;
x5 += 3;
}
spelplanX = spelplanX - 3;
eyeX = width / 2 + 10;
eyeY = height / 2;
eX -= 2;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 27547ec

Please sign in to comment.