Changeset 5369 for 2014/27


Ignore:
Timestamp:
2014-07-03 14:57:04 (9 years ago)
Author:
mijoilmo
Message:
 
Location:
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor
Files:
4 added
12 edited

Legend:

Unmodified
Added
Removed

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.cs

    r5359 r5369  
    3434    void LoadAllImages() 
    3535    { 
    36         images["background0"] = LoadImage("graphics/backgrounds/space_background"); 
    37         images["backgroundmars"] = LoadImage("graphics/backgrounds/Mars"); 
    38         images["backgroundplanet1"] = LoadImage("graphics/backgrounds/planet1"); 
    39         images["player"] = LoadImage("graphics/ships/player"); 
    40         images["tile0"] = LoadImage("graphics/tiles/tile0"); 
    41         imageLists["player_thruster"] = LoadImages("graphics/effects/thrusters/thruster0.1", "graphics/effects/thrusters/thruster0.2"); 
    42         imageLists["enemy1"] = LoadImages("graphics/Enemy/Enemy1.0","graphics/Enemy/Enemy1.1","graphics/Enemy/Enemy1.2"); 
     36        images["background0"]               = LoadImage("graphics/backgrounds/space_background"); 
     37        images["backgroundmars"]            = LoadImage("graphics/backgrounds/Mars"); 
     38        images["backgroundplanet1"]         = LoadImage("graphics/backgrounds/planet1"); 
     39        images["player"]                    = LoadImage("graphics/ships/player"); 
     40        images["tile0"]                     = LoadImage("graphics/tiles/tile0"); 
     41        images["HUD_radar"]                 = LoadImage("graphics/HUD/HUD_radar"); 
     42        imageLists["player_thruster"]       = LoadImages("graphics/effects/thrusters/thruster0.1", "graphics/effects/thrusters/thruster0.2"); 
     43        imageLists["enemy1"]                = LoadImages("graphics/Enemy/Enemy1.0", "graphics/Enemy/Enemy1.1", "graphics/Enemy/Enemy1.2"); 
    4344    } 
    4445    void LoadLevel(ProtoLevel level) 
    … …  
    137138        this.player.attachWeapon(); 
    138139        this.player.IsUpdated = true; 
    139         LoadLevel(new ProtoLevel(this, "0", true));//tää on huono metodi, TODO: luo level-classit ennen lataamista 
     140        LoadLevel(new ProtoLevel(this, "standardi", true));//tää on huono metodi, TODO: luo level-classit ennen lataamista 
    140141    } 
    141142} 

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.csproj.Debug.cachefile

    r5342 r5369  
    1111Content\graphics\backgrounds\Mars.xnb 
    1212Content\graphics\backgrounds\planet1.xnb 
     13Content\graphics\HUD\HUD_radar.xnb 
     14Content\graphics\levels\standardi.xnb 

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Radar.cs

    r5361 r5369  
    99class Radar : GameObject 
    1010{ 
     11    private GameObject planet; 
     12    private GameObject ship; 
     13    Proto236b parent; 
    1114    public Radar(Proto236b parent) 
    1215        : base(200, 200) 
    1316    { 
    14         Radar.Image = parent.Images["HUD_radar"]; 
     17        this.parent = parent; 
     18        this.Image = parent.Images["HUD_radar"]; 
    1519        if (parent.CurrentLevel.IsPlanet) 
    1620        { 
    1721            //planet radar 
    18             GameObject planet = new GameObject(130,130); 
     22            this.planet = new GameObject(100, 100); 
    1923            planet.Shape = Shape.Circle; 
    20             planet.Color = Color.Red; 
    2124            Add(planet); 
     25            this.ship = new GameObject(10, 10); 
     26            ship.Color = Color.Red; 
     27            Add(ship); 
    2228        } 
    2329        else 
    … …  
    2834    public override void Update(Time time) 
    2935    { 
    30  
     36        this.ship.X = 0; 
     37        this.ship.Y = 0; 
     38        double length = (parent.Player.Y - parent.Level.Bottom)/parent.Level.Height * 20 + 40; 
     39        this.ship.Position += Vector.FromLengthAndAngle(length,Angle.RightAngle); 
    3140        base.Update(time); 
    3241    } 

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/ContentPipeline-{5156C658-EF8C-4216-BA6D-9928D133FE72}.xml

    r5359 r5369  
    110110      <Time>2014-07-03T13:40:04.8381555+03:00</Time> 
    111111    </Item> 
     112    <Item> 
     113      <Source>graphics\HUD\HUD_radar.png</Source> 
     114      <Name>graphics\HUD\HUD_radar</Name> 
     115      <Importer>TextureImporter</Importer> 
     116      <Processor>TextureProcessor</Processor> 
     117      <Options>None</Options> 
     118      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\HUD_radar.xnb</Output> 
     119      <Time>2014-07-03T14:30:42.464032+03:00</Time> 
     120    </Item> 
     121    <Item> 
     122      <Source>graphics\levels\standardi.png</Source> 
     123      <Name>graphics\levels\standardi</Name> 
     124      <Importer>TextureImporter</Importer> 
     125      <Processor>TextureProcessor</Processor> 
     126      <Options>None</Options> 
     127      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\standardi.xnb</Output> 
     128      <Time>2014-07-03T14:55:35.266651+03:00</Time> 
     129    </Item> 
    112130    <BuildSuccessful>true</BuildSuccessful> 
    113131    <Settings> 

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csproj.FileListAbsolute.txt

    r5342 r5369  
    3333C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\Mars.xnb 
    3434C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\planet1.xnb 
     35C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\HUD_radar.xnb 
     36C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\standardi.xnb 

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/cachefile-{5156C658-EF8C-4216-BA6D-9928D133FE72}-targetpath.txt

    r5342 r5369  
    1111Content\graphics\backgrounds\Mars.xnb 
    1212Content\graphics\backgrounds\planet1.xnb 
     13Content\graphics\HUD\HUD_radar.xnb 
     14Content\graphics\levels\standardi.xnb 

  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivorContent/Protokolla236TrueSurvivorContent.contentproj

    r5342 r5369  
    124124    </Compile> 
    125125  </ItemGroup> 
     126  <ItemGroup> 
     127    <Compile Include="graphics\HUD\HUD_radar.png"> 
     128      <Name>HUD_radar</Name> 
     129      <Importer>TextureImporter</Importer> 
     130      <Processor>TextureProcessor</Processor> 
     131    </Compile> 
     132  </ItemGroup> 
     133  <ItemGroup> 
     134    <Compile Include="graphics\levels\standardi.png"> 
     135      <Name>standardi</Name> 
     136      <Importer>TextureImporter</Importer> 
     137      <Processor>TextureProcessor</Processor> 
     138    </Compile> 
     139  </ItemGroup> 
    126140  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    127141  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
Note: See TracChangeset for help on using the changeset viewer.