Changeset 5354

Timestamp:

2014-07-03 13:40:12 (9 years ago)

Author:

mijoilmo

Message:

 

Location:

2014/27/AleksanteriV/Protokolla236

Files:

• Protokolla236.suo (modified) (previous)
• Protokolla236/Protokolla236/MikonPhysicsObject.cs (modified) (3 diffs)
• Protokolla236/Protokolla236/bin/x86/Debug/Protokolla236.exe (modified) (previous)
• Protokolla236/Protokolla236/bin/x86/Debug/Protokolla236.pdb (modified) (previous)
• Protokolla236/Protokolla236/obj/x86/Debug/Protokolla236.exe (modified) (previous)
• Protokolla236/Protokolla236/obj/x86/Debug/Protokolla236.pdb (modified) (previous)

2014/27/AleksanteriV/Protokolla236/Protokolla236/Protokolla236/MikonPhysicsObject.cs

@@ -12 +12 @@
     private Vector velocity;
     public Vector Velocity { get { return velocity; } set { velocity = value; } }
+    private Angle angularVelocity;
+    public Angle AngularVelocity { get { return angularVelocity; } set { angularVelocity = value; } }
     private double mass;
     public double Mass { get { return mass; } set { mass = value; } }
+    private bool ignoresGravity;
+    public bool IgnoresGravity { get { return ignoresGravity; } set { ignoresGravity = value; } }
     public override void Update(Time time)
     {
-        this.Position += this.velocity / this.mass / 40;
-        if (this.parent.Level.Left > this.Position.X || this.parent.Level.Right < this.Position.X) {
+        this.Position += this.velocity / this.mass / 20;
+        if (!this.ignoresGravity)
+        {
+            this.Velocity += this.parent.Gravity / 120;
+        }
+        this.Angle += this.angularVelocity;
+        if (this.parent.Level.Left > this.Position.X || this.parent.Level.Right < this.Position.X)
+        {
             this.Destroy();
         }
-        if (this.parent.Level.Bottom > this.Position.Y || this.parent.Level.Top < this.Position.Y) {
+        if (this.parent.Level.Bottom > this.Position.Y || this.parent.Level.Top < this.Position.Y)
+        {
             this.Destroy();
         }
         base.Update(time);
     }
-    public MikonParticle(Protokolla236 parent,double w, double h)
+    public MikonParticle(Protokolla236 parent, double w, double h)
         : base(w, h)
     {
@@ -91 +102 @@
                         else
                         {
-                            MikonParticle childBox = new MikonParticle(this.game,pieceWidth, pieceHeight);
+                            MikonParticle childBox = new MikonParticle(this.game, pieceWidth, pieceHeight);
                             childBox.Tag = this.Tag;
-                            //childBox.IgnoresGravity = this.IgnoresGravity;
+                            childBox.IgnoresGravity = this.IgnoresGravity;
                             childBox.Image = imageArea;
                             childBox.Mass = this.Mass;
 
                             childBox.AbsoluteAngle = this.AbsoluteAngle;
-                            //childBox.AngularVelocity = this.AngularVelocity;
+                            childBox.AngularVelocity = Angle.FromDegrees(this.AngularVelocity * 7);
 
                             childBox.Position = this.Position + startCorner
@@ -104 +115 @@
                                 + Vector.FromLengthAndAngle(y * pieceHeight, this.AbsoluteAngle + Angle.RightAngle); //plus y                                          
 
-                            childBox.Velocity = this.Velocity;
+                            childBox.Velocity = this.Velocity + RandomGen.NextVector(10, 30);
 
                             //if (RandomGen.NextDouble(0, 1) < 0.2)