Changeset 5390 for 2014/27


Ignore:
Timestamp:
2014-07-03 15:52:46 (5 years ago)
Author:
mijoilmo
Message:
 
Location:
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor
Files:
2 added
12 edited

Legend:

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

    r5388 r5390  
    3636    void LoadAllImages() 
    3737    { 
    38         images["background0"]               = LoadImage("graphics/backgrounds/space_background"); 
    39         images["backgroundmars"]            = LoadImage("graphics/backgrounds/Mars"); 
    40         images["backgroundplanet1"]         = LoadImage("graphics/backgrounds/planet1"); 
    41         images["player"]                    = LoadImage("graphics/ships/player"); 
    42         images["tile0"]                     = LoadImage("graphics/tiles/tile0"); 
     38        images["background0"] = LoadImage("graphics/backgrounds/space_background"); 
     39        images["backgroundmars"] = LoadImage("graphics/backgrounds/Mars"); 
     40        images["backgroundplanet1"] = LoadImage("graphics/backgrounds/planet1"); 
     41        images["player"] = LoadImage("graphics/ships/player"); 
     42        images["tile0"] = LoadImage("graphics/tiles/tile0"); 
    4343 
    44         imageLists["player_thruster"]       = LoadImages("graphics/effects/thrusters/thruster0.1", "graphics/effects/thrusters/thruster0.2"); 
    45         imageLists["enemy1"]                = LoadImages("graphics/Enemy/Enemy1.0", "graphics/Enemy/Enemy1.1", "graphics/Enemy/Enemy1.2"); 
    46         imageLists["HUD_radar"]             = LoadImages("graphics/HUD/HUD_radar1.0","graphics/HUD/HUD_radar1.1","graphics/HUD/HUD_radar1.2"); 
     44        imageLists["player_thruster"] = LoadImages("graphics/effects/thrusters/thruster0.1", "graphics/effects/thrusters/thruster0.2"); 
     45        imageLists["enemy1"] = LoadImages("graphics/Enemy/Enemy1.0", "graphics/Enemy/Enemy1.1", "graphics/Enemy/Enemy1.2"); 
     46        imageLists["HUD_radar"] = LoadImages("graphics/HUD/HUD_radar1.0", "graphics/HUD/HUD_radar1.1", "graphics/HUD/HUD_radar1.2"); 
     47        imageLists["HUD_ship"] = LoadImages("graphics/HUD/cross1.0", "graphics/HUD/cross1.1"); 
    4748    } 
    4849    void LoadLevel(ProtoLevel level) 
     
    5556            player.LinearDamping = 0.99;//ns ilmanvastus 
    5657        } 
    57         else { 
     58        else 
     59        { 
    5860            Gravity = new Vector(0, 0); 
    5961            player.LinearDamping = 1;//avaruudessa ei ilmanvastusta 
    6062        } 
    61         Add(this.player,1); 
     63        Add(this.player, 1); 
    6264        Camera.Follow(this.player); 
    6365        AssignKeys(); 
     
    6567        LevelFromImage("graphics/levels/" + level.TileMapSrc); 
    6668    } 
    67     void CreateBg(string id,int offset) { 
     69    void CreateBg(string id, int offset) 
     70    { 
    6871        GameObject bg = new GameObject(Level.Width, Level.Height); 
    6972        bg.Image = images[id]; 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.csproj.Debug.cachefile

    r5388 r5390  
    1515Content\graphics\HUD\HUD_radar1.1.xnb 
    1616Content\graphics\HUD\HUD_radar1.2.xnb 
     17Content\graphics\HUD\cross1.0.xnb 
     18Content\graphics\HUD\cross1.1.xnb 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Radar.cs

    r5388 r5390  
    2525            planet.Shape = Shape.Circle; 
    2626            Add(planet); 
    27             this.ship = new GameObject(10, 10); 
     27            this.ship = new GameObject(15, 15); 
     28            ship.Animation = new Animation(parent.ImageLists["HUD_ship"]); 
     29            this.Animation.FPS = 3; 
     30            this.Animation.Start(); 
    2831            Add(ship); 
    2932        } 
     
    3841        this.ship.Y = 0; 
    3942        double length = ((parent.Player.Y-(parent.Level.Bottom+parent.Level.Height/2))/parent.Level.Height)*22+66; 
    40         this.ship.Position += Vector.FromLengthAndAngle(length,Angle.FromRadians(0.9721)); 
     43        Angle shipAngle = Angle.FromRadians((Math.PI*2)*((parent.Player.X+parent.Level.Width/2)/parent.Level.Width)); 
     44        this.ship.Position += Vector.FromLengthAndAngle(length,Angle.FromRadians(0.9721)+shipAngle); 
    4145        base.Update(time); 
    4246    } 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/ContentPipeline-{5156C658-EF8C-4216-BA6D-9928D133FE72}.xml

    r5388 r5390  
    117117      <Options>None</Options> 
    118118      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\standardi.xnb</Output> 
    119       <Time>2014-07-03T15:35:06.7847783+03:00</Time> 
     119      <Time>2014-07-03T15:39:01.9825222+03:00</Time> 
    120120    </Item> 
    121121    <Item> 
     
    145145      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\HUD_radar1.2.xnb</Output> 
    146146      <Time>2014-07-03T15:28:42.8650679+03:00</Time> 
     147    </Item> 
     148    <Item> 
     149      <Source>graphics\HUD\cross1.0.png</Source> 
     150      <Name>graphics\HUD\cross1.0</Name> 
     151      <Importer>TextureImporter</Importer> 
     152      <Processor>TextureProcessor</Processor> 
     153      <Options>None</Options> 
     154      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\cross1.0.xnb</Output> 
     155      <Time>2014-07-03T15:39:25.4170747+03:00</Time> 
     156    </Item> 
     157    <Item> 
     158      <Source>graphics\HUD\cross1.1.png</Source> 
     159      <Name>graphics\HUD\cross1.1</Name> 
     160      <Importer>TextureImporter</Importer> 
     161      <Processor>TextureProcessor</Processor> 
     162      <Options>None</Options> 
     163      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\cross1.1.xnb</Output> 
     164      <Time>2014-07-03T15:39:25.4326748+03:00</Time> 
    147165    </Item> 
    148166    <BuildSuccessful>true</BuildSuccessful> 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csproj.FileListAbsolute.txt

    r5388 r5390  
    3737C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\HUD_radar1.1.xnb 
    3838C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\HUD_radar1.2.xnb 
     39C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\cross1.0.xnb 
     40C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\HUD\cross1.1.xnb 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/cachefile-{5156C658-EF8C-4216-BA6D-9928D133FE72}-targetpath.txt

    r5388 r5390  
    1515Content\graphics\HUD\HUD_radar1.1.xnb 
    1616Content\graphics\HUD\HUD_radar1.2.xnb 
     17Content\graphics\HUD\cross1.0.xnb 
     18Content\graphics\HUD\cross1.1.xnb 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivorContent/Protokolla236TrueSurvivorContent.contentproj

    r5388 r5390  
    148148    </Compile> 
    149149  </ItemGroup> 
     150  <ItemGroup> 
     151    <Compile Include="graphics\HUD\cross1.0.png"> 
     152      <Name>cross1.0</Name> 
     153      <Importer>TextureImporter</Importer> 
     154      <Processor>TextureProcessor</Processor> 
     155    </Compile> 
     156    <Compile Include="graphics\HUD\cross1.1.png"> 
     157      <Name>cross1.1</Name> 
     158      <Importer>TextureImporter</Importer> 
     159      <Processor>TextureProcessor</Processor> 
     160    </Compile> 
     161  </ItemGroup> 
    150162  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    151163  <!--  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.