Changeset 4400

Timestamp:

2013-07-03 14:17:18 (10 years ago)

Author:

mijoilmo

Message:

Talletus.

Location:

2013/27/MikkoI

Files:

• mikonLib (added)
• mikonLib/mikonLib (added)
• mikonLib/mikonLib.sln (added)
• mikonLib/mikonLib/Class1.cs (added)
• mikonLib/mikonLib/Properties (added)
• mikonLib/mikonLib/Properties/AssemblyInfo.cs (added)
• mikonLib/mikonLib/mikonLib.csproj (added)
• omapeli/omapeli.sln (modified) (1 diff)
• omapeli/omapeli/omapeli/omapeli.cs (modified) (1 diff)
• omapeli/omapeli/omapeli/omapeli.csproj (modified) (1 diff)
• omapeli/omapeli/omapeliContent/exp.png (added)
• omapeli/omapeli/omapeliContent/omapeliContent.contentproj (modified) (1 diff)

2013/27/MikkoI/omapeli/omapeli.sln

@@ -4 +4 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "omapeli", "omapeli\omapeli\omapeli.csproj", "{7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}"
 EndProject
-Project("{96E2B04D-8817-42C6-938A-82C39BA4D311}") = "omapeliContent", "omapeli\omapeliContent\omapeliContent.contentproj", "{24AE9396-4A7E-4632-B155-51A465B2CC94}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "omapeliContent", "omapeli\omapeliContent\omapeliContent.contentproj", "{24AE9396-4A7E-4632-B155-51A465B2CC94}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mikonLib", "..\mikonLib\mikonLib\mikonLib.csproj", "{C232E7E2-FD72-4019-A924-0F01400DE899}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|Any CPU = Debug|Any CPU
+                Debug|Mixed Platforms = Debug|Mixed Platforms
                 Debug|x86 = Debug|x86
+                Release|Any CPU = Release|Any CPU
+                Release|Mixed Platforms = Release|Mixed Platforms
                 Release|x86 = Release|x86
         EndGlobalSection
         GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Debug|Any CPU.ActiveCfg = Debug|x86
+                {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+                {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Debug|Mixed Platforms.Build.0 = Debug|x86
                 {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Debug|x86.ActiveCfg = Debug|x86
                 {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Debug|x86.Build.0 = Debug|x86
+                {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Release|Any CPU.ActiveCfg = Release|x86
+                {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Release|Mixed Platforms.ActiveCfg = Release|x86
+                {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Release|Mixed Platforms.Build.0 = Release|x86
                 {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Release|x86.ActiveCfg = Release|x86
                 {7E0624B6-CD0C-45A5-BE56-D8BCF997D4F5}.Release|x86.Build.0 = Release|x86
+                {24AE9396-4A7E-4632-B155-51A465B2CC94}.Debug|Any CPU.ActiveCfg = Debug|x86
+                {24AE9396-4A7E-4632-B155-51A465B2CC94}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
                 {24AE9396-4A7E-4632-B155-51A465B2CC94}.Debug|x86.ActiveCfg = Debug|x86
+                {24AE9396-4A7E-4632-B155-51A465B2CC94}.Release|Any CPU.ActiveCfg = Release|x86
+                {24AE9396-4A7E-4632-B155-51A465B2CC94}.Release|Mixed Platforms.ActiveCfg = Release|x86
                 {24AE9396-4A7E-4632-B155-51A465B2CC94}.Release|x86.ActiveCfg = Release|x86
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Release|Any CPU.Build.0 = Release|Any CPU
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+                {C232E7E2-FD72-4019-A924-0F01400DE899}.Release|x86.ActiveCfg = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

2013/27/MikkoI/omapeli/omapeli/omapeli/omapeli.cs

@@ -11 +11 @@
     public override void Begin()
     {
+        Mouse.IsCursorVisible = true;
+        CreateBox(0, 800, 200, 200, "destroyer", double.MinValue, double.MaxValue);
+        CreateBox(10, 10, 150, 150, "normal", double.MinValue, double.MaxValue);
+        AssignLevel();
+        Keyboard.Listen(Key.Escape, ButtonState.Pressed, delegate { Exit(); }, "Lopeta peli");
+    }
+
+    void CreateShards(double x, double y, double w, double h, Vector velocity)
+    {
+        double shardWidth = w; double shardHeight = h;
+        if (shardWidth < 4) { shardWidth = 4; }
+        if (shardHeight < 4) { shardHeight = 4; }
+
+        for (int i = 0; i < ((w * h) / 10); i++)
+        {
+            PhysicsObject shard = new PhysicsObject(shardWidth / 2, shardHeight / 2);
+            double divider = RandomGen.NextDouble(1, 7);
+
+            //double shardWidth = ((((w * h) / 2) / ((w * h) / 15)) / divider);   //(((w * h) / 2) / ((w * h) / 15)) laskee pinta-alan yhdelle kolmiolle, entäs leveys? 
+            //double shardHeight = ((((w * h) / 2) / ((w * h) / 15)) * divider);
+
+            double randomX = RandomGen.NextDouble((x - w / 2) + (shardWidth / 2), (x + w / 2) - (shardWidth / 2));
+            double randomY = RandomGen.NextDouble((y - h / 2) + (shardHeight / 2), (y + h / 2) - (shardHeight / 2));
+            AddCollisionHandler(shard, "destroyer", CollisionHandler.DestroyObject);
+            shard.Shape = Shape.Triangle;
+            shard.Color = Color.Black;
+            shard.Velocity = velocity;
+            shard.X = randomX;
+            shard.Y = randomY;
+            shard.Width = shardWidth;
+            shard.Height = shardHeight;
+
+            Add(shard);
+        }
+    }
+
+    PhysicsObject CreateBox(double x, double y, double w, double h, string type, double min, double max)
+    {
+
+        if (w < min || w > max)
+        {
+            return null;
+        }
+        if (h < min || h > max)
+        {
+            return null;
+        }
+
+        PhysicsObject box = new PhysicsObject(w, h);
+        box.X = x;
+        box.Y = y;
+        Mouse.ListenOn(box, MouseButton.Left, ButtonState.Pressed, BreakBox, null, box);
+        switch (type)
+        {
+            case "normal":
+                box.Color = Color.Black;
+                box.Restitution = 0.4;
+                AddCollisionHandler(box, "destroyer", delegate(PhysicsObject obj, PhysicsObject toin) { if (toin.Velocity.X > 10 || toin.Velocity.Y > 10) { BreakBox(obj); } });
+                break;
+            case "destroyer":
+                box.Color = Color.Red;
+                box.Tag = "destroyer";
+                box.Mass = 60;
+                break;
+        }
+        Add(box);
+        return box;
+    }
+    void BreakBox(PhysicsObject obj)
+    {
+        //ExplosionSystem explosion = new ExplosionSystem(explosionImage,10);
+        //explosion.MinVelocity = 2.1;
+        //explosion.MaxVelocity = 6.2;
+        //Add(explosion);
+        //explosion.AddEffect(obj.Position,10);
+        Vector maxShardSize = new Vector(obj.Width / 1.6, obj.Height / 1.6);
+        ObjSlicer(obj,
+            RandomGen.NextDouble(obj.Left + (obj.Width / 1.6 / 2), obj.Right - (obj.Width / 1.6 / 2)),
+            RandomGen.NextDouble(obj.Top - (obj.Width / 1.6 / 2), obj.Bottom + (obj.Width / 1.6 / 2)),
+            50, maxShardSize, 4);
+        obj.Destroy();
+    }
+    void ObjSlicer(PhysicsObject obj, double parentBoxX, double parentBoxY, int maxShards, Vector maxShardSize, double minShardSize)
+    {
+        double maxSize = 0;
+        if (maxShardSize.X > maxShardSize.Y) maxSize = maxShardSize.X;
+        else maxSize = maxShardSize.Y;
+
+        PhysicsObject parent = CreateBox(parentBoxX, parentBoxY, maxShardSize.X, maxShardSize.Y, "normal", minShardSize, maxSize); // keski(parent)
+        if (parent == null)
+        {
+            CreateShards(parentBoxX, parentBoxY, maxShardSize.X, maxShardSize.Y, obj.Velocity); 
+            return;
+        }
+        else
+        {
+            parent.Velocity = obj.Velocity; 
+            parent.Angle = obj.Angle;
+        }
+
+        double x = parent.Left - ((parent.Left - obj.Left) / 2);
+        double y = parent.Top + (obj.Top - parent.Top) / 2;
+        double width = parent.Left - obj.Left;
+        double height = obj.Top - parent.Top;
+
+        PhysicsObject box = new PhysicsObject(1, 1);
+
+        box = CreateBox(x, y, width, height, "normal", minShardSize, maxSize);
+
+        if (box == null)
+        {
+            CreateShards(x, y, width, height, obj.Velocity);
+        }
+        else { box.Velocity = obj.Velocity; box.Angle = obj.Angle; }
+
+        x = parentBoxX;
+        width = parent.Width;
+
+        box = CreateBox(x, y, width, height, "normal", minShardSize, maxSize);
+
+        if (box == null)
+        {
+            CreateShards(x, y, width, height, obj.Velocity);
+        }
+        else { box.Velocity = obj.Velocity; box.Angle = obj.Angle; }
+        x = parent.Right + ((obj.Right - parent.Right) / 2);
+        width = obj.Right - parent.Right;
+
+        box = CreateBox(x, y, width, height, "normal", minShardSize, maxSize);
+
+        if (box == null)
+        {
+            CreateShards(x, y, width, height, obj.Velocity);
+        }
+        else { box.Velocity = obj.Velocity; box.Angle = obj.Angle; }
+
+        x = parent.Left - ((parent.Left - obj.Left) / 2);
+        y = parent.Y;
+        width = parent.Left - obj.Left;
+        height = parent.Height;
+
+        box = CreateBox(x, y, width, height, "normal", minShardSize, maxSize);
+
+        if (box == null)
+        {
+            CreateShards(x, y, width, height, obj.Velocity);
+        }
+        else { box.Velocity = obj.Velocity; box.Angle = obj.Angle; }
+        x = parent.Right + ((obj.Right - parent.Right) / 2);
+        width = obj.Right - parent.Right;
+
+        box = CreateBox(x, y, width, height, "normal", minShardSize, maxSize);
+
+        if (box == null)
+        {
+            CreateShards(x, y, width, height, obj.Velocity);
+        }
+        else { box.Velocity = obj.Velocity; box.Angle = obj.Angle; }
+        x = parent.Left - ((parent.Left - obj.Left) / 2);
+        height = (parent.Bottom - obj.Bottom);
+        y = parent.Bottom - height / 2;
+        width = parent.Left - obj.Left;
+
+        box = CreateBox(x, y, width, height, "normal", minShardSize, maxSize);
+
+        if (box == null)
+        {
+            CreateShards(x, y, width, height, obj.Velocity);
+        }
+        else { box.Velocity = obj.Velocity; box.Angle = obj.Angle; }
+        x = parentBoxX;
+        width = parent.Width;
+
+        box = CreateBox(x, y, width, height, "normal", minShardSize, maxSize);
+
+        if (box == null)
+        {
+            CreateShards(x, y, width, height, obj.Velocity);
+        }
+        else { box.Velocity = obj.Velocity; box.Angle = obj.Angle; }
+        x = parent.Right + ((obj.Right - parent.Right) / 2);
+        width = obj.Right - parent.Right;
+
+        box = CreateBox(x, y, width, height, "normal", minShardSize, maxSize);
+
+        if (box == null)
+        {
+            CreateShards(x, y, width, height, obj.Velocity);
+        }
+        else { box.Velocity = obj.Velocity; box.Angle = obj.Angle; }
+
+        //if (parent.Left - obj.Left > minShardSize){ObjSlicer(parent, parent.X, parent.Y, maxShards, (parent.Left - obj.Left), minShardSize);}
+
+    }
+    void AssignLevel()
+    {
         Level.BackgroundColor = Color.White;
-        PhysicsObject box = new PhysicsObject(40,40);
-        box.Color = Color.Green;
-        Add(box);
-        Keyboard.Listen(Key.Escape, ButtonState.Pressed, delegate { Exit(); }, "Lopeta peli");
-    }
-    
+        Gravity = new Vector(0, -500);
+        Level.CreateBottomBorder();
+    }
 }

2013/27/MikkoI/omapeli/omapeli/omapeli/omapeli.csproj

@@ -120 +120 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\mikonLib\mikonLib\mikonLib.csproj">
+      <Project>{C232E7E2-FD72-4019-A924-0F01400DE899}</Project>
+      <Name>mikonLib</Name>
+    </ProjectReference>
     <ProjectReference Include="..\omapeliContent\omapeliContent.contentproj">
       <Name>omapeliContent</Name>

2013/27/MikkoI/omapeli/omapeli/omapeliContent/omapeliContent.contentproj

@@ -45 +45 @@
     <Reference Include="AnimationExtension" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="exp.png">
+      <Name>exp</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.