Skip to content
Snippets Groups Projects
Commit 92b4047a authored by Vesa Lappalainen's avatar Vesa Lappalainen :bicyclist:
Browse files

pong attribuutteja pois

parent 39ef570e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
luennot/live09/Pong/Pong.cs
+ 34
− 57
View file @ 92b4047a
......@@ -12,18 +12,10 @@ public class Pong : PhysicsGame
private PhysicsObject maila1;
private PhysicsObject maila2;
private PhysicsObject vasenReuna;
private PhysicsObject oikeaReuna;
private IntMeter pelaajan1Pisteet;
private IntMeter pelaajan2Pisteet;
public override void Begin()
{
LuoKentta();
AsetaOhjaimet();
LisaaLaskurit();
AloitaPeli();
}
......@@ -38,21 +30,26 @@ public class Pong : PhysicsGame
pallo.KineticFriction = 0.0;
pallo.MomentOfInertia = Double.PositiveInfinity;
Add(pallo);
AddCollisionHandler(pallo, KasittelePallonTormays);
maila1 = LuoMaila(Level.Left + 20.0, 0.0);
maila2 = LuoMaila(Level.Right - 20.0, 0.0);
vasenReuna = Level.CreateLeftBorder();
PhysicsObject vasenReuna = Level.CreateLeftBorder();
vasenReuna.Restitution = 1.0;
vasenReuna.KineticFriction = 0.0;
vasenReuna.IsVisible = false;
oikeaReuna = Level.CreateRightBorder();
PhysicsObject oikeaReuna = Level.CreateRightBorder();
oikeaReuna.Restitution = 1.0;
oikeaReuna.KineticFriction = 0.0;
oikeaReuna.IsVisible = false;
IntMeter pelaajan1Pisteet = LuoPisteLaskuri(this,Screen.Left + 100.0, Screen.Top - 100.0);
IntMeter pelaajan2Pisteet = LuoPisteLaskuri(this,Screen.Right - 100.0, Screen.Top - 100.0);
AddCollisionHandler(pallo, oikeaReuna, (_, _) => pelaajan1Pisteet.Value += 1);
AddCollisionHandler(pallo, vasenReuna, (_, _) => pelaajan2Pisteet.Value += 1);
PhysicsObject ylaReuna = Level.CreateTopBorder();
ylaReuna.Restitution = 1.0;
ylaReuna.KineticFriction = 0.0;
......@@ -82,14 +79,7 @@ public class Pong : PhysicsGame
}
private void LisaaLaskurit()
{
pelaajan1Pisteet = LuoPisteLaskuri(Screen.Left + 100.0, Screen.Top - 100.0);
pelaajan2Pisteet = LuoPisteLaskuri(Screen.Right - 100.0, Screen.Top - 100.0);
}
private IntMeter LuoPisteLaskuri(double x, double y)
public static IntMeter LuoPisteLaskuri(PhysicsGame peli, double x, double y)
{
IntMeter laskuri = new IntMeter(0);
laskuri.MaxValue = 10;
......@@ -99,27 +89,14 @@ public class Pong : PhysicsGame
naytto.X = x;
naytto.Y = y;
naytto.TextColor = Color.White;
naytto.BorderColor = Level.BackgroundColor;
naytto.Color = Level.BackgroundColor;
Add(naytto);
naytto.BorderColor = peli.Level.BackgroundColor;
naytto.Color = peli.Level.BackgroundColor;
peli.Add(naytto);
return laskuri;
}
private void KasittelePallonTormays(PhysicsObject _, PhysicsObject kohde)
{
if (kohde == oikeaReuna)
{
pelaajan1Pisteet.Value += 1;
}
else if (kohde == vasenReuna)
{
pelaajan2Pisteet.Value += 1;
}
}
private void AloitaPeli()
{
Vector impulssi = new Vector(500.0, 0.0);
......@@ -129,46 +106,46 @@ public class Pong : PhysicsGame
private void AsetaOhjaimet()
{
Keyboard.Listen(Key.A, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa ylös", maila1, nopeusYlos);
Keyboard.Listen(Key.A, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
Keyboard.Listen(Key.Z, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa alas", maila1, nopeusAlas);
Keyboard.Listen(Key.Z, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
Keyboard.Listen(Key.A, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa ylös",this, maila1, nopeusYlos);
Keyboard.Listen(Key.A, ButtonState.Released, AsetaNopeus, null,this, maila1, Vector.Zero);
Keyboard.Listen(Key.Z, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa alas",this, maila1, nopeusAlas);
Keyboard.Listen(Key.Z, ButtonState.Released, AsetaNopeus, null,this, maila1, Vector.Zero);
Keyboard.Listen(Key.Up, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa ylös", maila2, nopeusYlos);
Keyboard.Listen(Key.Up, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
Keyboard.Listen(Key.Down, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa alas", maila2, nopeusAlas);
Keyboard.Listen(Key.Down, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
Keyboard.Listen(Key.Up, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa ylös",this, maila2, nopeusYlos);
Keyboard.Listen(Key.Up, ButtonState.Released, AsetaNopeus, null,this, maila2, Vector.Zero);
Keyboard.Listen(Key.Down, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa alas",this, maila2, nopeusAlas);
Keyboard.Listen(Key.Down, ButtonState.Released, AsetaNopeus, null,this, maila2, Vector.Zero);
Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
ControllerOne.Listen(Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös", maila1, nopeusYlos);
ControllerOne.Listen(Button.DPadUp, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
ControllerOne.Listen(Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas", maila1, nopeusAlas);
ControllerOne.Listen(Button.DPadDown, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
ControllerOne.Listen(Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös",this, maila1, nopeusYlos);
ControllerOne.Listen(Button.DPadUp, ButtonState.Released, AsetaNopeus, null,this, maila1, Vector.Zero);
ControllerOne.Listen(Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas",this, maila1, nopeusAlas);
ControllerOne.Listen(Button.DPadDown, ButtonState.Released, AsetaNopeus, null,this, maila1, Vector.Zero);
ControllerTwo.Listen(Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös", maila2, nopeusYlos);
ControllerTwo.Listen(Button.DPadUp, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
ControllerTwo.Listen(Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas", maila2, nopeusAlas);
ControllerTwo.Listen(Button.DPadDown, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
ControllerTwo.Listen(Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös",this, maila2, nopeusYlos);
ControllerTwo.Listen(Button.DPadUp, ButtonState.Released, AsetaNopeus, null,this, maila2, Vector.Zero);
ControllerTwo.Listen(Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas",this, maila2, nopeusAlas);
ControllerTwo.Listen(Button.DPadDown, ButtonState.Released, AsetaNopeus, null,this, maila2, Vector.Zero);
ControllerOne.Listen(Button.Back, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
ControllerTwo.Listen(Button.Back, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
}
private void AsetaNopeus(PhysicsObject maila, Vector nopeus)
public static void AsetaNopeus(PhysicsGame peli, PhysicsObject olio, Vector nopeus)
{
if ((nopeus.Y < 0) && (maila.Bottom < Level.Bottom))
if ((nopeus.Y < 0) && (olio.Bottom < peli.Level.Bottom))
{
maila.Velocity = Vector.Zero;
olio.Velocity = Vector.Zero;
return;
}
if ((nopeus.Y > 0) && (maila.Top > Level.Top))
if ((0 < nopeus.Y) && (olio.Top > peli.Level.Top))
{
maila.Velocity = Vector.Zero;
olio.Velocity = Vector.Zero;
return;
}
maila.Velocity = nopeus;
olio.Velocity = nopeus;
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment