From 3febb4dda01425aca24964bff6de1a4cbdaa9bcb Mon Sep 17 00:00:00 2001 From: thefiddler Date: Tue, 13 May 2014 23:25:56 +0200 Subject: [PATCH] [Input] Renamed MouseScrollWheel to MouseScroll This better describes the functionality of this structure. --- Source/OpenTK/Input/MouseScroll.cs | 40 +++++------ Source/OpenTK/Input/MouseScrollWheel.cs | 119 -------------------------------- Source/OpenTK/Input/MouseState.cs | 4 +- Source/OpenTK/OpenTK.csproj | 2 +- 4 files changed, 23 insertions(+), 142 deletions(-) delete mode 100644 Source/OpenTK/Input/MouseScrollWheel.cs diff --git a/Source/OpenTK/Input/MouseScroll.cs b/Source/OpenTK/Input/MouseScroll.cs index 2be06b6..c9f024f 100644 --- a/Source/OpenTK/Input/MouseScroll.cs +++ b/Source/OpenTK/Input/MouseScroll.cs @@ -34,7 +34,7 @@ namespace OpenTK.Input /// /// Represents the state of a mouse wheel. /// - public struct MouseScrollWheel : IEquatable + public struct MouseScroll : IEquatable { #region Public Members @@ -52,31 +52,31 @@ namespace OpenTK.Input /// The y. public float Y { get; internal set; } - /// A instance to test for equality. - /// A instance to test for equality. - public static bool operator ==(MouseScrollWheel left, MouseScrollWheel right) + /// A instance to test for equality. + /// A instance to test for equality. + public static bool operator ==(MouseScroll left, MouseScroll right) { return left.Equals(right); } - /// A instance to test for inequality. - /// A instance to test for inequality. - public static bool operator !=(MouseScrollWheel left, MouseScrollWheel right) + /// A instance to test for inequality. + /// A instance to test for inequality. + public static bool operator !=(MouseScroll left, MouseScroll right) { return !left.Equals(right); } /// - /// Returns a that represents the current . + /// Returns a that represents the current . /// - /// A that represents the current . + /// A that represents the current . public override string ToString() { return string.Format("[X={0:0.00}, Y={1:0.00}]", X, Y); } /// - /// Serves as a hash function for a object. + /// Serves as a hash function for a object. /// /// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a /// hash table. @@ -86,16 +86,16 @@ namespace OpenTK.Input } /// - /// Determines whether the specified is equal to the current . + /// Determines whether the specified is equal to the current . /// - /// The to compare with the current . + /// The to compare with the current . /// true if the specified is equal to the current - /// ; otherwise, false. + /// ; otherwise, false. public override bool Equals(object obj) { return - obj is MouseScrollWheel && - Equals((MouseScrollWheel)obj); + obj is MouseScroll && + Equals((MouseScroll)obj); } #endregion @@ -103,12 +103,12 @@ namespace OpenTK.Input #region IEquatable Members /// - /// Determines whether the specified is equal to the current . + /// Determines whether the specified is equal to the current . /// - /// The to compare with the current . - /// true if the specified is equal to the current - /// ; otherwise, false. - public bool Equals(MouseScrollWheel other) + /// The to compare with the current . + /// true if the specified is equal to the current + /// ; otherwise, false. + public bool Equals(MouseScroll other) { return X == other.X && Y == other.Y; } diff --git a/Source/OpenTK/Input/MouseScrollWheel.cs b/Source/OpenTK/Input/MouseScrollWheel.cs deleted file mode 100644 index 2be06b6..0000000 --- a/Source/OpenTK/Input/MouseScrollWheel.cs +++ /dev/null @@ -1,119 +0,0 @@ -#region License -// -// MouseWheel.cs -// -// Author: -// Stefanos A. -// -// Copyright (c) 2006-2014 Stefanos Apostolopoulos -// -// 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. -// -#endregion - -using System; - -namespace OpenTK.Input -{ - /// - /// Represents the state of a mouse wheel. - /// - public struct MouseScrollWheel : IEquatable - { - #region Public Members - - /// - /// Gets the absolute horizontal offset of the wheel, - /// or 0 if no horizontal scroll wheel exists. - /// - /// The x. - public float X { get; internal set; } - - /// - /// Gets the absolute vertical offset of the wheel, - /// or 0 if no vertical scroll wheel exists. - /// - /// The y. - public float Y { get; internal set; } - - /// A instance to test for equality. - /// A instance to test for equality. - public static bool operator ==(MouseScrollWheel left, MouseScrollWheel right) - { - return left.Equals(right); - } - - /// A instance to test for inequality. - /// A instance to test for inequality. - public static bool operator !=(MouseScrollWheel left, MouseScrollWheel right) - { - return !left.Equals(right); - } - - /// - /// Returns a that represents the current . - /// - /// A that represents the current . - public override string ToString() - { - return string.Format("[X={0:0.00}, Y={1:0.00}]", X, Y); - } - - /// - /// Serves as a hash function for a object. - /// - /// A hash code for this instance that is suitable for use in hashing algorithms and data structures such as a - /// hash table. - public override int GetHashCode() - { - return X.GetHashCode() ^ Y.GetHashCode(); - } - - /// - /// Determines whether the specified is equal to the current . - /// - /// The to compare with the current . - /// true if the specified is equal to the current - /// ; otherwise, false. - public override bool Equals(object obj) - { - return - obj is MouseScrollWheel && - Equals((MouseScrollWheel)obj); - } - - #endregion - - #region IEquatable Members - - /// - /// Determines whether the specified is equal to the current . - /// - /// The to compare with the current . - /// true if the specified is equal to the current - /// ; otherwise, false. - public bool Equals(MouseScrollWheel other) - { - return X == other.X && Y == other.Y; - } - - #endregion - } -} - diff --git a/Source/OpenTK/Input/MouseState.cs b/Source/OpenTK/Input/MouseState.cs index a07567c..3a74a0f 100644 --- a/Source/OpenTK/Input/MouseState.cs +++ b/Source/OpenTK/Input/MouseState.cs @@ -39,7 +39,7 @@ namespace OpenTK.Input #region Fields int x, y; - MouseScrollWheel scroll; + MouseScroll scroll; ushort buttons; bool is_connected; @@ -104,7 +104,7 @@ namespace OpenTK.Input /// Gets a instance, /// representing the current state of the mouse scroll wheel. /// - public MouseScrollWheel Scroll + public MouseScroll Scroll { get { return scroll; } } diff --git a/Source/OpenTK/OpenTK.csproj b/Source/OpenTK/OpenTK.csproj index 333f516..502877f 100644 --- a/Source/OpenTK/OpenTK.csproj +++ b/Source/OpenTK/OpenTK.csproj @@ -790,7 +790,6 @@ - @@ -799,6 +798,7 @@ Code + -- 2.7.4