git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1317 993157c7-ee19-0410-b2c4-bb4e9862e678

OpenRa.DataStructures/OpenRa.DataStructures.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRa.DataStructures</RootNamespace>
+    <RootNamespace>OpenRa</RootNamespace>
     <AssemblyName>OpenRa.DataStructures</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,6 +34,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="float2.cs" />
     <Compile Include="int2.cs" />
     <Compile Include="PriorityQueue.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

OpenRa.DataStructures/PriorityQueue.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Diagnostics;
 
-namespace OpenRa.DataStructures
+namespace OpenRa
 {
 	public class PriorityQueue<T>
 		where T : IComparable<T>

OpenRa.DataStructures/Tuple.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenRa.DataStructures
+namespace OpenRa
 {
 	public class Tuple<A>
 	{

OpenRa.DataStructures/float2.cs

@@ -3,12 +3,11 @@ using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
 using System.Drawing;
-using BluntDirectX.Direct3D;
 
-namespace OpenRa.Game
+namespace OpenRa
 {
 	[StructLayout(LayoutKind.Sequential)]
-	struct float2
+	public struct float2
 	{
 		public float X, Y;
 
@@ -20,10 +19,7 @@ namespace OpenRa.Game
 
 		public PointF ToPointF() { return new PointF(X, Y); }
 
-		public static implicit operator float2( int2 src )
+		public static implicit operator float2(int2 src) { return new float2(src.X, src.Y); }
-		{
-			return new float2( src.X, src.Y );
-		}
 
 		public static float2 operator +(float2 a, float2 b) { return new float2(a.X + b.X, a.Y + b.Y); }
 		public static float2 operator -(float2 a, float2 b) { return new float2(a.X - b.X, a.Y - b.Y); }
@@ -46,30 +42,22 @@ namespace OpenRa.Game
 				Lerp(a.Y, b.Y, t.Y));
 		}
 
-		public static float2 FromAngle(float a)
+		public static float2 FromAngle(float a) { return new float2((float)Math.Sin(a), (float)Math.Cos(a)); }
-		{
-			return new float2((float)Math.Sin(a), (float)Math.Cos(a));
-		}
 
-		public float2 Constrain(Range<float2> r)
+		static float Constrain(float x, float a, float b) { return x < a ? a : x > b ? b : x; }
+
+		public float2 Constrain(float2 min, float2 max)
 		{
 			return new float2(
-				Util.Constrain(X, new Range<float>(r.Start.X, r.End.X)),
+				Constrain(X, min.X, max.X),
-				Util.Constrain(Y, new Range<float>(r.Start.Y, r.End.Y)));
+				Constrain(Y, min.Y, max.Y));
 		}
 
-		public static float2 operator *(float a, float2 b)
+		public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
-		{
+		public static float2 operator /(float2 a, float2 b) { return new float2(a.X / b.X, a.Y / b.Y); }
-			return new float2(a * b.X, a * b.Y);
-		}
 
 		public static readonly float2 Zero = new float2(0, 0);
 
-		public static float2 operator /(float2 a, float2 b)
-		{
-			return new float2(a.X / b.X, a.Y / b.Y);
-		}
-
 		public static bool WithinEpsilon(float2 a, float2 b, float e)
 		{
 			float2 d = a - b;

OpenRa.Game/OpenRa.Game.csproj

@@ -48,7 +48,6 @@
     <Compile Include="PathFinder.cs" />
     <Compile Include="Sequence.cs" />
     <Compile Include="ConstructionYard.cs" />
-    <Compile Include="float2.cs" />
     <Compile Include="ISelectable.cs" />
     <Compile Include="MoveOrder.cs" />
     <Compile Include="Region.cs" />

OpenRa.Game/PathFinder.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using OpenRa.FileFormats;
-using OpenRa.DataStructures;
 using System.Windows.Forms;
 
 namespace OpenRa.Game

OpenRa.Game/Util.cs

@@ -9,11 +9,6 @@ namespace OpenRa.Game
 {
 	static class Util
 	{
-		public static float Constrain(float x, Range<float> range)
-		{
-			return x < range.Start ? range.Start : x > range.End ? range.End : x;
-		}
-
 		static float2 EncodeVertexAttributes(TextureChannel channel, int paletteLine)
 		{
 			Converter<TextureChannel, float> channelEncoder = delegate(TextureChannel c)

OpenRa.Game/Viewport.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Text;
 using System.Drawing;
 using System.Windows.Forms;
-using BluntDirectX.Direct3D;
 
 namespace OpenRa.Game
 {
@@ -22,8 +21,7 @@ namespace OpenRa.Game
 
 		public void Scroll(float2 delta)
 		{
-			scrollPosition = (scrollPosition + delta).Constrain(
+			scrollPosition = (scrollPosition + delta).Constrain(float2.Zero, mapSize);
-				new Range<float2>(float2.Zero, mapSize));
 		}
 
 		public Viewport(float2 size, float2 mapSize, Renderer renderer)

OpenRa.TechTree/Item.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Text;
-using OpenRa.DataStructures;
 using OpenRa.FileFormats;
 
 namespace OpenRa.TechTree

OpenRa.TechTree/TechTree.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
-using OpenRa.DataStructures;
 using OpenRa.FileFormats;
 
 namespace OpenRa.TechTree