Get rid of namespaces in commands.

4 files changed, 24 insertions, 186 deletions

diff --git a/ShiftOS.WinForms/Applications/CoherenceOverlay.Designer.cs b/ShiftOS.WinForms/Applications/CoherenceOverlay.Designer.cs
deleted file mode 100644
index 0764059..0000000
--- a/ShiftOS.WinForms/Applications/CoherenceOverlay.Designer.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace ShiftOS.WinForms.Applications
-{
-    partial class CoherenceOverlay
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-        }
-
-        #endregion
-    }
-}
diff --git a/ShiftOS.WinForms/Applications/CoherenceOverlay.cs b/ShiftOS.WinForms/Applications/CoherenceOverlay.cs
deleted file mode 100644
index 1bfc8e8..0000000
--- a/ShiftOS.WinForms/Applications/CoherenceOverlay.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using ShiftOS.Engine;
-using System.Threading;
-
-namespace ShiftOS.WinForms.Applications
-{
-    public partial class CoherenceOverlay : UserControl, IShiftOSWindow
-    {
-        public CoherenceOverlay(IntPtr handle, CoherenceCommands.RECT rect)
-        {
-            InitializeComponent();
-            this.Load += (o, a) =>
-            {
-                try
-                {
-                    int left = this.ParentForm.Left;
-                    int top = this.ParentForm.Top;
-                    int oldwidth = this.ParentForm.Width;
-                    int oldheight = this.ParentForm.Height;
-
-                    var t = new Thread(new ThreadStart(() =>
-                    {
-                        while (CoherenceCommands.GetWindowRect(handle, ref rect))
-                        {
-
-                            if (left != rect.Left - SkinEngine.LoadedSkin.LeftBorderWidth)
-                            {
-                                this.Invoke(new Action(() =>
-                                {
-                                    this.ParentForm.Left = rect.Left - SkinEngine.LoadedSkin.LeftBorderWidth;
-                                    left = rect.Left - SkinEngine.LoadedSkin.LeftBorderWidth;
-                                }));
-                            }
-                            if (top != rect.Top - SkinEngine.LoadedSkin.TitlebarHeight)
-                            {
-                                this.Invoke(new Action(() =>
-                                {
-
-                                    this.ParentForm.Top = rect.Top - SkinEngine.LoadedSkin.TitlebarHeight;
-                                    top = rect.Top - SkinEngine.LoadedSkin.TitlebarHeight;
-                                }));
-                            }
-                            int width = (rect.Right - rect.Left) + 1;
-                            int height = (rect.Bottom - rect.Top) + 1;
-
-                            if (oldheight != SkinEngine.LoadedSkin.TitlebarHeight + height + SkinEngine.LoadedSkin.BottomBorderWidth)
-                            {
-                                this.Invoke(new Action(() =>
-                                {
-                                    this.ParentForm.Height = SkinEngine.LoadedSkin.TitlebarHeight + height + SkinEngine.LoadedSkin.BottomBorderWidth;
-                                    oldheight = SkinEngine.LoadedSkin.TitlebarHeight + height + SkinEngine.LoadedSkin.BottomBorderWidth;
-                                }));
-                            }
-                            if (oldwidth != SkinEngine.LoadedSkin.LeftBorderWidth + width + SkinEngine.LoadedSkin.RightBorderWidth)
-                            {
-                                this.Invoke(new Action(() =>
-                                {
-                                    this.ParentForm.Width = SkinEngine.LoadedSkin.LeftBorderWidth + width + SkinEngine.LoadedSkin.RightBorderWidth;
-                                    oldwidth = SkinEngine.LoadedSkin.LeftBorderWidth + width + SkinEngine.LoadedSkin.RightBorderWidth;
-                                }));
-                            }
-                        }
-                    }));
-                    t.IsBackground = true;
-                    t.Start();
-                }
-                catch
-                {
-
-                }
-            };
-        }
-
-        public void OnLoad()
-        {
-        }
-
-        public void OnSkinLoad()
-        {
-        }
-
-        public bool OnUnload()
-        {
-            return true;
-        }
-
-        public void OnUpgrade()
-        {
-        }
-    }
-}
diff --git a/ShiftOS.WinForms/Applications/Downloader.cs b/ShiftOS.WinForms/Applications/Downloader.cs
index b3d2cea..bcad56a 100644
--- a/ShiftOS.WinForms/Applications/Downloader.cs
+++ b/ShiftOS.WinForms/Applications/Downloader.cs
@@ -216,7 +216,6 @@ namespace ShiftOS.WinForms.Applications
         public int Progress { get; set; }
     }
 
-    [Namespace("dev")]
     public static class DownloaderDebugCommands
     {
         [Command("setsubscription", description ="Use to set the current shiftnet subscription.", usage ="{value:int32}")]
diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs
index 87b7a93..3f06676 100644
--- a/ShiftOS.WinForms/Applications/Pong.cs
+++ b/ShiftOS.WinForms/Applications/Pong.cs
@@ -42,6 +42,15 @@ namespace ShiftOS.WinForms.Applications
                     LevelComplete();
                 }
             };
+#if DEBUG
+            this.KeyDown += (o, a) =>
+            {
+                if(a.KeyCode == Keys.D)
+                {
+                    drawAiBall = !drawAiBall;                
+                }
+            };
+#endif
         }
 
         private double ballX = 0.0f;
@@ -266,11 +275,14 @@ namespace ShiftOS.WinForms.Applications
             ballX = 0;
             ballY = 0;
             opponentY = 0;
+            xVel = 1;
             aiBallX = 0;
             aiBallY = 0;
             doAi = true;
         }
 
+        private bool drawAiBall = false;
+
         private void pnlcanvas_Paint(object sender, PaintEventArgs e)
         {
 
@@ -281,11 +293,22 @@ namespace ShiftOS.WinForms.Applications
             ballXLocal -= ((double)paddleWidth / 2);
             ballYLocal -= ((double)paddleWidth / 2);
 
+            double aiballXLocal = linear(aiBallX, -1.0, 1.0, 0, pnlcanvas.Width);
+            double aiballYLocal = linear(aiBallY, -1.0, 1.0, 0, pnlcanvas.Height);
+
+            aiballXLocal -= ((double)paddleWidth / 2);
+            aiballYLocal -= ((double)paddleWidth / 2);
+
 
             e.Graphics.Clear(pnlcanvas.BackColor);
 
+            //draw the ai ball
+            if (drawAiBall)
+                e.Graphics.FillEllipse(new SolidBrush(Color.Gray), new RectangleF((float)aiballXLocal, (float)aiballYLocal, (float)paddleWidth, (float)paddleWidth));
+
+
             //draw the ball
-            if(doBallCalc)
+            if (doBallCalc)
             e.Graphics.FillEllipse(new SolidBrush(pnlcanvas.ForeColor), new RectangleF((float)ballXLocal, (float)ballYLocal, (float)paddleWidth, (float)paddleWidth));
 
             double playerYLocal = linear(playerY, -1.0, 1.0, 0, pnlcanvas.Height);