Changeset 5270 for 2014/27


Ignore:
Timestamp:
2014-07-02 10:48:59 (5 years ago)
Author:
mijoilmo
Message:
 
Location:
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor
Files:
1 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Player.cs

    r5264 r5270  
    1010{ 
    1111    GameObject thrusterEffect; 
     12    Level level; 
    1213    public void rotate(double rotSpeed) 
    1314    { 
     
    1718    { 
    1819        this.thrusterEffect.IsVisible = true; 
    19         this.Push(Vector.FromLengthAndAngle(speed*800, this.Angle + Angle.RightAngle)); 
     20        this.Push(Vector.FromLengthAndAngle(speed * 800, this.Angle + Angle.RightAngle)); 
    2021    } 
    2122    public void thrusterEnd() 
     
    2425        //if this.ids, enable ids 
    2526    } 
    26     public Player() 
     27    public Player(Level level) 
    2728        : base(40, 40) 
    2829    { 
    2930        this.Image = Proto236b.images["player"]; 
     31        this.level = level; 
    3032        bool IDS = true; //inertial dampening system, katsotaan pistetäänkö ostettavaksi peliin 
    3133        if (IDS == true) 
     
    3941        this.AngularDamping = 0.7; 
    4042 
    41         this.thrusterEffect = new GameObject(40,40); 
     43        this.thrusterEffect = new GameObject(40, 40); 
    4244        thrusterEffect.Image = Proto236b.images["player_thruster"]; 
    4345        thrusterEffect.IsVisible = false; 
     
    4749    public override void Update(Time time) 
    4850    { 
    49         if (this.Position.X>Level.Left){} 
     51        if (this.Position.X > this.level.Right) 
     52        { 
     53            this.X = this.level.Left; 
     54        } 
     55        else if (this.Position.X < this.level.Left) 
     56        { 
     57            this.X = this.level.Right; 
     58        } 
    5059        base.Update(time); 
    5160    } 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.cs

    r5264 r5270  
    6666        // TODO: Kirjoita peli tähän 
    6767        LoadAllImages(); 
    68         this.player = new Player(); 
     68        this.player = new Player(Level); 
    6969        this.player.IsUpdated = true; 
    7070        LoadLevel("0"); 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csproj.FileListAbsolute.txt

    r5264 r5270  
     1C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb 
     2C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb 
     3C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb 
     4C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb 
     5C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb 
    16C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.exe 
    27C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.pdb 
     
    712C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.exe 
    813C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.pdb 
    9 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb 
    10 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb 
    11 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb 
    12 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb 
    13 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb 
    14 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb 
    15 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.exe 
    16 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.pdb 
    17 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.dll 
    18 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.xml 
    19 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.csprojResolveAssemblyReference.cache 
    20 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
    21 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.exe 
    22 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.pdb 
    23 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb 
    24 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb 
    25 D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb 
    26 <<<<<<< .mine 
    27 ======= 
    28 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb 
    29 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb 
    30 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb 
    31 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb 
    32 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb 
    33 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb 
    34 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.exe 
    35 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.pdb 
    36 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.dll 
    37 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.xml 
    38 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.csprojResolveAssemblyReference.cache 
    39 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
    40 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.exe 
    41 C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.pdb 
    42 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb 
    43 >>>>>>> .r5263 
    44 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb 
    45 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb 
    46 >>>>>>> .r5261 
Note: See TracChangeset for help on using the changeset viewer.