Move Finger out of Touch namespace

Change 'namespace' hack from final abstract class to interface
Dgame · May 31, 2015 · ac846f0 · ac846f0
1 parent 96c4070
commit ac846f0
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 43 deletions.
diff --git a/source/Dgame/System/Battery.d b/source/Dgame/System/Battery.d
@@ -61,7 +61,7 @@ struct Battery {
  * 
  * Author: Randy Schuett (rswhite4@googlemail.com)k
  */
-final abstract class System {
+interface System {
     /**
      * Returns the PowerInfo structure with the currently power informations
      * 

diff --git a/source/Dgame/System/Keyboard.d b/source/Dgame/System/Keyboard.d
@@ -35,8 +35,7 @@ public:
  *
  * Author: Randy Schuett (rswhite4@googlemail.com)
  */
-final abstract class Keyboard {
+interface Keyboard {
-public:
     /**
      * Returns if the given Keyboard.Code is pressed.
      * 

diff --git a/source/Dgame/System/Touch.d b/source/Dgame/System/Touch.d
@@ -7,35 +7,35 @@ import derelict.sdl2.sdl;
 public:
 
 /**
- * Represent Touch-Events
+ * The Finger structure
- *
- * Author: Randy Schuett (rswhite4@googlemail.com)
  */
-final abstract class Touch {
+struct Finger {
     /**
-     * The Finger structure
+     * The Finger ID
      */
-    static struct Finger {
+    long id; // TODO: change to (u)int?
-        /**
+    /**
-         * The Finger ID
+     * The x coordinate in range of 0 .. 1
-         */
+     * Multiply it with the width of the Window to get the real x coordinate
-        long id;
+     */
-        /**
+    float x;
-         * The x coordinate in range of 0 .. 1
+    /**
-         * Multiply it with the width of the Window to get the real x coordinate
+     * The y coordinate in range of 0 .. 1
-         */
+     * Multiply it with the height of the Window to get the real y coordinate
-        float x;
+     */
-        /**
+    float y;
-         * The y coordinate in range of 0 .. 1
+    /**
-         * Multiply it with the height of the Window to get the real y coordinate
+     * The quantity of pressure applied in range of 0 .. 1
-         */
+     */
-        float y;
+    float pressure;
-        /**
+}
-         * The quantity of pressure applied in range of 0 .. 1
-         */
-        float pressure;
-    }
 
+/**
+ * Represent Touch-Events
+ *
+ * Author: Randy Schuett (rswhite4@googlemail.com)
+ */
+interface Touch {
     /**
      * Returns of many Touch-Devices exist
      */

diff --git a/source/Dgame/docs/Battery.html b/source/Dgame/docs/Battery.html
@@ -52,7 +52,7 @@ <h1>Dgame.System.Battery</h1>
 </dd>
 </dl>
 </dd>
-<dt><big><a name="System"></a>abstract class <u>System</u>;
+<dt><big><a name="System"></a>interface <u>System</u>;
 </big></dt>
 <dd>The <u>System</u> struct contains the Power struct,
  which give information about your current battery

diff --git a/source/Dgame/docs/Keyboard.html b/source/Dgame/docs/Keyboard.html
@@ -5,7 +5,7 @@
         <h1>Dgame.System.Keyboard</h1>
         <!-- Generated by Ddoc from ..\System\Keyboard.d -->
 <br><br>
-<dl><dt><big><a name="Keyboard"></a>abstract class <u>Keyboard</u>;
+<dl><dt><big><a name="Keyboard"></a>interface <u>Keyboard</u>;
 </big></dt>
 <dd>Represent the <u>Keyboard</u>
 <br><br>

diff --git a/source/Dgame/docs/Touch.html b/source/Dgame/docs/Touch.html
@@ -5,42 +5,42 @@
         <h1>Dgame.System.Touch</h1>
         <!-- Generated by Ddoc from ..\System\Touch.d -->
 <br><br>
-<dl><dt><big><a name="Touch"></a>abstract class <u>Touch</u>;
+<dl><dt><big><a name="Finger"></a>struct <u>Finger</u>;
-</big></dt>
-<dd>Represent <u>Touch</u>-Events
-<br><br>
-<b>Author:</b><br>
-Randy Schuett (rswhite4@googlemail.com)<br><br>
-
-<dl><dt><big><a name="Touch.Finger"></a>struct <u>Finger</u>;
 </big></dt>
 <dd>The <u>Finger</u> structure<br><br>
 
-<dl><dt><big><a name="Touch.Finger.id"></a>long <u>id</u>;
+<dl><dt><big><a name="Finger.id"></a>long <u>id</u>;
 </big></dt>
 <dd>The Finger ID<br><br>
 
 </dd>
-<dt><big><a name="Touch.Finger.x"></a>float <u>x</u>;
+<dt><big><a name="Finger.x"></a>float <u>x</u>;
 </big></dt>
 <dd>The <u>x</u> coordinate in range of 0 .. 1
  Multiply it with the width of the Window to get the real <u>x</u> coordinate<br><br>
 
 </dd>
-<dt><big><a name="Touch.Finger.y"></a>float <u>y</u>;
+<dt><big><a name="Finger.y"></a>float <u>y</u>;
 </big></dt>
 <dd>The <u>y</u> coordinate in range of 0 .. 1
  Multiply it with the height of the Window to get the real <u>y</u> coordinate<br><br>
 
 </dd>
-<dt><big><a name="Touch.Finger.pressure"></a>float <u>pressure</u>;
+<dt><big><a name="Finger.pressure"></a>float <u>pressure</u>;
 </big></dt>
 <dd>The quantity of <u>pressure</u> applied in range of 0 .. 1<br><br>
 
 </dd>
 </dl>
 </dd>
-<dt><big><a name="Touch.getNumOfDevices"></a>static nothrow @nogc int <u>getNumOfDevices</u>();
+<dt><big><a name="Touch"></a>interface <u>Touch</u>;
+</big></dt>
+<dd>Represent <u>Touch</u>-Events
+<br><br>
+<b>Author:</b><br>
+Randy Schuett (rswhite4@googlemail.com)<br><br>
+
+<dl><dt><big><a name="Touch.getNumOfDevices"></a>static nothrow @nogc int <u>getNumOfDevices</u>();
 </big></dt>
 <dd>Returns of many Touch-Devices exist<br><br>