Changeset 7767


Ignore:
Timestamp:
2016-07-05 11:31:42 (7 years ago)
Author:
juleppaa
Message:
 
Location:
2016/24/JustusL/Object_Ball
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • 2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/Object_Ball.cs

    r7738 r7767  
    2323    PhysicsObject pallo; 
    2424    PhysicsObject maali; 
    25      
    26  
     25 
     26    Vector hiirenLiike = Vector.Zero; 
    2727 
    2828    GameObject haamu; 
    … …  
    5353        tausta.TextureWrapSize = new Vector(300, 300); 
    5454        Add(tausta, -3); 
    55       Camera.Follow(pallo); 
     55        //Camera.Follow(pallo); 
     56        Camera.StopFollowing(); 
    5657        Palikat(); 
    5758        Ohjaimet(); 
    … …  
    105106                if (haamu != null) haamu.Destroy(); 
    106107                haamu = new GameObject(100, 100); 
     108                haamu.Color = new Color(0, 0, 0, 128); 
    107109                Add(haamu); 
    108                 if (tyokalu == 0) haamu.Image = kaarikuva; 
    109                 if (tyokalu == 2) haamu.Color = Color.Black; 
     110                if (tyokalu == 0)haamu.Shape = Shape.FromImage(kaarikuva); 
     111                
     112                 
    110113            } 
    111114        }; 
    … …  
    126129        Keyboard.Listen(Key.Escape, ButtonState.Pressed, PauseValikko, "Pause"); 
    127130        Keyboard.Listen(Key.Enter, ButtonState.Pressed, PalloLiikkeelle, "Start"); 
     131        Keyboard.Listen(Key.Delete,ButtonState.Down, delegate { 
     132             
     133            Keyboard.Listen(Key.Right, ButtonState.Down, MuutaSkaalaa, null, new Vector(1.5, 0)); 
     134            Keyboard.Listen(Key.Left, ButtonState.Down, MuutaSkaalaa, null, new Vector(-1.5, 0)); 
     135            Keyboard.Listen(Key.Up, ButtonState.Down, MuutaSkaalaa, null, new Vector(0, 1.5)); 
     136            Keyboard.Listen(Key.Down, ButtonState.Down, MuutaSkaalaa, null, new Vector(0, -1.5)); 
     137             
     138        }, null ); 
    128139 
    129140        Keyboard.Listen(Key.NumPad1, ButtonState.Down, MuutaKulmaa, null, 1); 
    … …  
    271282    void HiirenSeuraus(AnalogState hiirenTila) 
    272283    { 
     284        hiirenLiike = hiirenTila.MouseMovement; 
     285 
    273286        hiiri.Position = Mouse.PositionOnWorld; 
    274287        hiiri.Position = Mouse.PositionOnScreen; 
    … …  
    308321    void SeuraajaKamera() 
    309322    { 
    310         Camera.X = Mouse.PositionOnWorld.X * 0.5; 
    311         Camera.Y = Mouse.PositionOnWorld.Y * 0.5; 
     323        Camera.Position += -hiirenLiike; 
     324        //Camera.X = Mouse.PositionOnWorld.X * 0.5; 
     325        //Camera.Y = Mouse.PositionOnWorld.Y * 0.5; 
    312326    } 
    313327    void LuoSlider() 

  • 2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/obj/x86/Debug/ContentPipeline-{CD347656-A8F2-48EE-8097-A4F9AF1242F0}.xml

    r7738 r7767  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
     10<<<<<<< .mine 
     11      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaarikakka.xnb</Output> 
     12      <Time>2016-07-05T10:37:41.3098919+03:00</Time> 
     13======= 
    1014      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaarikakka.xnb</Output> 
    1115      <Time>2016-06-16T11:35:20.4922466+03:00</Time> 
     16>>>>>>> .r7763 
    1217    </Item> 
    1318    <Item> 
    … …  
    6570      <Time>2016-07-04T20:43:40.1219171+03:00</Time> 
    6671    </Item> 
     72<<<<<<< .mine 
     73    <Item> 
     74      <Source>kentta1.png</Source> 
     75      <Name>kentta1</Name> 
     76      <Importer>TextureImporter</Importer> 
     77      <Processor>TextureProcessor</Processor> 
     78      <Options>None</Options> 
     79      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb</Output> 
     80      <Time>2016-07-04T14:53:50.6394709+03:00</Time> 
     81    </Item> 
     82    <Item> 
     83      <Source>kentta2.png</Source> 
     84      <Name>kentta2</Name> 
     85      <Importer>TextureImporter</Importer> 
     86      <Processor>TextureProcessor</Processor> 
     87      <Options>None</Options> 
     88      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb</Output> 
     89      <Time>2016-07-04T14:53:50.6394709+03:00</Time> 
     90    </Item> 
     91======= 
    6792    <Item> 
    6893      <Source>kentta1.png</Source> 
    … …  
    83108      <Time>2016-07-04T20:43:40.2029413+03:00</Time> 
    84109    </Item> 
     110>>>>>>> .r7763 
    85111    <BuildSuccessful>true</BuildSuccessful> 
    86112    <Settings> 

  • 2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/obj/x86/Debug/Object_Ball.csproj.FileListAbsolute.txt

    r7738 r7767  
    4444C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\Object_Ball.exe 
    4545C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\Object_Ball.pdb 
     46<<<<<<< .mine 
     47C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb 
     48C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb 
     49======= 
    4650C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb 
    4751C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb 
     52>>>>>>> .r7763 
Note: See TracChangeset for help on using the changeset viewer.