Changeset 7717 for 2016


Ignore:
Timestamp:
2016-07-04 14:54:28 (3 years ago)
Author:
karkaite
Message:
 
Location:
2016/27/OskariL/Pong
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • 2016/27/OskariL/Pong/Pong/Pong/Pong.cs

    r7701 r7717  
    99public class Pong : PhysicsGame 
    1010{ 
     11    ExplosionSystem rajahtaa = new ExplosionSystem(LoadImage("Pulla"), 200); 
     12 
    1113    Vector nopeusYlos = new Vector(0, 650); 
    1214    Vector nopeusAlas = new Vector(0, -650); 
     
    2325 
    2426    Boolean hasGameEnded = false; 
     27    Boolean hasRajahtanyt = false; 
    2528 
    2629    DoubleMeter alaspainLaskuri; 
     
    156159        { 
    157160            pelaajan1Pisteet.Value += 1; 
    158             Explosion rajahdys = new Explosion(200); 
    159             rajahdys.Position = pallo.Position; 
    160             Add(rajahdys);            
     161            Rajahdys(); 
    161162        } 
    162163        else if (kohde == vasenReuna) 
    163164        { 
    164165            pelaajan2Pisteet.Value += 1; 
    165             Explosion rajahdys = new Explosion(200); 
    166             rajahdys.Position = pallo.Position; 
    167             Add(rajahdys); 
     166            Rajahdys(); 
     167            //TODO: tee erillinen räjähdys Putineista 
    168168        } 
    169169        if (pelaajan1Pisteet == 10) 
     
    171171            MessageDisplay.Add("Pelaaja 1 voittaa"); 
    172172            LuoAikaLaskuri(); 
     173            Rajahdys(); 
    173174        } 
    174175        else if (pelaajan2Pisteet == 10) 
     
    176177            MessageDisplay.Add("Pelaaja 2 voittaa"); 
    177178            LuoAikaLaskuri(); 
     179            Rajahdys(); 
     180            //TODO: tee erillinen räjähdys Putineista 
     181 
    178182        } 
    179183    } 
     
    211215        base.Update(time); 
    212216    } 
    213  
     217    void Rajahdys() 
     218    { 
     219        if (hasRajahtanyt == false) 
     220        { 
     221            hasRajahtanyt = true; 
     222            Add(rajahtaa); 
     223        } 
     224        double x = 0; 
     225        double y = 0; 
     226        int pMaara = 200; 
     227        rajahtaa.AddEffect(x, y, pMaara); 
     228    } 
    214229} 
  • 2016/27/OskariL/Pong/Pong/Pong/obj/x86/Debug/ContentPipeline-{BFDFC922-70FE-421D-A674-E0C408BE6EAF}.xml

    r7699 r7717  
    22<XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline"> 
    33  <Asset Type="Pipeline:BuildItemCollection"> 
     4    <Item> 
     5      <Source>Pulla.png</Source> 
     6      <Name>Pulla</Name> 
     7      <Importer>TextureImporter</Importer> 
     8      <Processor>TextureProcessor</Processor> 
     9      <Options>None</Options> 
     10      <Output>C:\MyTemp\OskariL\Pong\Pong\Pong\bin\x86\Debug\Content\Pulla.xnb</Output> 
     11      <Time>2016-07-04T14:24:56.5987405+03:00</Time> 
     12    </Item> 
    413    <BuildSuccessful>true</BuildSuccessful> 
    514    <Settings> 
     
    1625    <Assemblies> 
    1726      <Assembly> 
     27        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 
     28        <Value>2015-02-09T20:18:44+02:00</Value> 
     29      </Assembly> 
     30      <Assembly> 
     31        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key> 
     32        <Value>2011-09-01T16:22:30+03:00</Value> 
     33      </Assembly> 
     34      <Assembly> 
     35        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key> 
     36        <Value>2011-09-01T16:22:30+03:00</Value> 
     37      </Assembly> 
     38      <Assembly> 
     39        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key> 
     40        <Value>2011-09-01T16:22:30+03:00</Value> 
     41      </Assembly> 
     42      <Assembly> 
     43        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key> 
     44        <Value>2011-09-01T16:22:30+03:00</Value> 
     45      </Assembly> 
     46      <Assembly> 
     47        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key> 
     48        <Value>2011-09-01T16:22:30+03:00</Value> 
     49      </Assembly> 
     50      <Assembly> 
     51        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key> 
     52        <Value>2011-09-01T16:22:30+03:00</Value> 
     53      </Assembly> 
     54      <Assembly> 
     55        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key> 
     56        <Value>2015-02-17T22:27:18+02:00</Value> 
     57      </Assembly> 
     58      <Assembly> 
    1859        <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
    1960        <Value>2015-09-16T18:36:58.6261942+03:00</Value> 
  • 2016/27/OskariL/Pong/Pong/Pong/obj/x86/Debug/Pong.csproj.FileListAbsolute.txt

    r7699 r7717  
    77C:\MyTemp\OskariL\Pong\Pong\Pong\obj\x86\Debug\Pong.exe 
    88C:\MyTemp\OskariL\Pong\Pong\Pong\obj\x86\Debug\Pong.pdb 
     9C:\MyTemp\OskariL\Pong\Pong\Pong\bin\x86\Debug\Content\Pulla.xnb 
  • 2016/27/OskariL/Pong/Pong/PongContent/PongContent.contentproj

    r7699 r7717  
    4545    <Reference Include="AnimationExtension" /> 
    4646  </ItemGroup> 
     47  <ItemGroup> 
     48    <Compile Include="Pulla.png"> 
     49      <Name>Pulla</Name> 
     50      <Importer>TextureImporter</Importer> 
     51      <Processor>TextureProcessor</Processor> 
     52    </Compile> 
     53  </ItemGroup> 
    4754  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    4855  <!--  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.