Changeset 7400 for 2016

Timestamp:

2016-06-16 23:31:50 (7 years ago)

Author:

sieerinn

Message:

 

File:

• 2016/24/SimoR/Tasohyppelypeli/Tasohyppelypeli/Tasohyppelypeli/Tasohyppelypeli.cs (modified) (5 diffs)

2016/24/SimoR/Tasohyppelypeli/Tasohyppelypeli/Tasohyppelypeli/Tasohyppelypeli.cs

@@ -139 +139 @@
     float matrixLerp = 0f;
     float cameraRotation = 0f;
+    float norsuRotation = 0f;
+
+    bool rotateStar = false;
+    float starRotation = 0f;
 
     bool perspective = false;
     bool light = false;
-
-
-    protected override void Initialize()
-    {
-        base.Initialize();
-
-        var parameters = new PresentationParameters()
-        {
-            MultiSampleCount = 4
-        };
-
-        //graphics = new GraphicsDevice(GraphicsAdapter.DefaultAdapter, GraphicsProfile.Reach, parameters);
-    }
 
     protected override void LoadContent()
@@ -184 +175 @@
         tahtiTexture = Content.Load<Texture2D>("tahti");
 
+        Keyboard.Listen(Key.W, ButtonState.Pressed, () =>
+        {
+            rotateStar = !rotateStar;
+            if (!rotateStar)
+                starRotation = 0f;
+        }, null);
+
+        Keyboard.Listen(Key.F2, ButtonState.Down, () => { norsuRotation += 0.3f; }, null);
+
         // A ja D pyörittää maailmaa.
         Keyboard.Listen(Key.A, ButtonState.Down, () => { cameraRotation += 0.005f; }, null);
@@ -197 +197 @@
     protected override void Draw(Microsoft.Xna.Framework.GameTime gameTime)
     {
+        float dt = (float)gameTime.ElapsedGameTime.TotalSeconds;
+
         base.Draw(gameTime); // Piirretään Jypeli jutut ensin.
+
+        // Tähtien pyörittely.
+        if (rotateStar)
+            starRotation += -1.3f * dt;
 
         // Sulava muunnos projektiomatriisien välille.
         float dir = perspective ? 1f : -1f;
-        matrixLerp += dir * 0.3f * (float)gameTime.ElapsedGameTime.TotalSeconds;
+        matrixLerp += dir * 0.3f * dt;
         matrixLerp = MathHelper.Clamp(matrixLerp, 0f, 1f);
 
@@ -208 +214 @@
 
         // Piirretään 3D-mallit päälle.
-        DrawModel(norsuModel, norsuTexture, pelaaja1.Position);
+        DrawModel(norsuModel, norsuTexture, pelaaja1.Position, norsuRotation);
         foreach (var taso in tasot)
         {
-            DrawModel(tasoModel, vihreaTexture, taso.Position);
+            DrawModel(tasoModel, vihreaTexture, taso.Position, 0f);
         }
         foreach (var tahti in tahdet)
         {
-            DrawModel(tahtiModel, tahtiTexture, tahti.Position);
-        }
-    }
-
-    void DrawModel(Model model, Texture2D tex, Vector jypeliPos)
+            DrawModel(tahtiModel, tahtiTexture, tahti.Position, starRotation);
+        }
+    }
+
+    void DrawModel(Model model, Texture2D tex, Vector jypeliPos, float rotation)
     {
         var transforms = new Matrix[model.Bones.Count];
@@ -246 +252 @@
                     effect.EnableDefaultLighting();
                     effect.DiffuseColor = new Vector3(1f, 1f, 1f);
-                    //effect.DirectionalLight0.
                 }
 
-                effect.World = transforms[mesh.ParentBone.Index] * Matrix.CreateRotationY(0f) * Matrix.CreateTranslation(modelPosition);
+                effect.World = transforms[mesh.ParentBone.Index] * Matrix.CreateRotationY(rotation) * Matrix.CreateTranslation(modelPosition);
                 effect.View = Matrix.CreateLookAt(cameraPos, Vector3.Zero, Vector3.Up);
                 effect.Projection = finalMat;