Merge remote branch 'pchote/master' into sdl

Makefile

@@ -8,7 +8,7 @@ COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
 fileformats_SRCS	=	$(shell find OpenRa.FileFormats/ -iname '*.cs')
 fileformats_TARGET	=	OpenRa.FileFormats.dll
 fileformats_KIND	=	library
-fileformats_LIBS	=	$(COMMON_LIBS)
+fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Glfw.dll
 
 gl_SRCS				= $(shell find OpenRa.Gl/ -iname '*.cs')
 gl_TARGET			= OpenRa.Gl.dll

OpenRa.FileFormats/OpenRa.FileFormats.csproj

@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -24,6 +25,8 @@
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -33,6 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -42,6 +46,10 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
+    <Reference Include="Tao.Glfw, Version=2.6.0.0, Culture=neutral, PublicKeyToken=2bb092b6587e4402">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\Tao\Tao.Glfw.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AudLoader.cs" />

OpenRa.FileFormats/Support/Stopwatch.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
  * This file is part of OpenRA.
@@ -19,35 +19,26 @@
 #endregion
 
 using System.Runtime.InteropServices;
+using Tao.Glfw;
 
 namespace OpenRa.Support
 {
 	public class Stopwatch
 	{
-		//[DllImport("kernel32.dll")]
+		double start;
-		static bool QueryPerformanceCounter(out long value) { value = 1; return true; }
-		//[DllImport("kernel32.dll")]
-		static bool QueryPerformanceFrequency(out long frequency) { frequency = 1; return true; }
-
-		long freq, start;
-
 		public Stopwatch()
 		{
-			QueryPerformanceFrequency(out freq);
+			Reset();
-			QueryPerformanceCounter(out start);
 		}
 
 		public double ElapsedTime()
 		{
-			long current;
+			return (Glfw.glfwGetTime() - start);
-			QueryPerformanceCounter(out current);
-
-			return (current - start) / (double)freq;
 		}
 
 		public void Reset()
 		{
-			QueryPerformanceCounter(out start);
+			start = Glfw.glfwGetTime();
 		}
 	}
 }

OpenRa.Game/Chrome.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
  * This file is part of OpenRA.
@@ -74,7 +74,6 @@ namespace OpenRa
 		readonly Animation cantBuild;
 		readonly Animation ready;
 		readonly Animation clock;
-		const int NumClockFrames = 54;
 
 		// Radar
 		static float2 radarOpenOrigin = new float2(Game.viewport.Width - 215, 29);
@@ -912,9 +911,8 @@ namespace OpenRa
 				{
 					clock.PlayFetchIndex( "idle", 
 						() => (firstOfThis.TotalTime - firstOfThis.RemainingTime) 
-							* NumClockFrames / firstOfThis.TotalTime);
+							* (clock.CurrentSequence.Length - 1)/ firstOfThis.TotalTime);
 					clock.Tick();
-
 					shpRenderer.DrawSprite(clock.Image, drawPos, "chrome");
 
 					if (firstOfThis.Done)
@@ -1149,7 +1147,7 @@ namespace OpenRa
 
 					clock.PlayFetchIndex("idle",
 						() => (sp.TotalTime - sp.RemainingTime)
-							* NumClockFrames / sp.TotalTime);
+							* (clock.CurrentSequence.Length - 1) / sp.TotalTime);
 					clock.Tick();
 
 					shpRenderer.DrawSprite(clock.Image, drawPos, "chrome");

OpenRa.Game/Game.cs

@@ -359,7 +359,7 @@ namespace OpenRa
 
 		public static void PreInit(Settings settings)
 		{
-			while (!File.Exists("redalert.mix"))
+			while (!Directory.Exists("mods"))
 			{
 				var current = Directory.GetCurrentDirectory();
 				if (Directory.GetDirectoryRoot(current) == current)

OpenRa.Game/Graphics/Renderer.cs

@@ -45,14 +45,8 @@ namespace OpenRa.Graphics
 
 		public ITexture PaletteTexture;
 
-		readonly Font fDebug, fTitle;
+		readonly FTFontGL regularFont, boldFont;
-		readonly FTFontGL testFont, boldFont;
+		const int RenderedFontSize = 48;
-		
-		Sheet textSheet;
-		SpriteRenderer rgbaRenderer;
-		Sprite textSprite;
-
-		const int RenderedSize = 48;
 
 		public Size Resolution { get { return device.WindowSize; } }
 
@@ -60,34 +54,26 @@ namespace OpenRa.Graphics
 		{
 			device = CreateDevice( Assembly.LoadFile( Path.GetFullPath( "OpenRa.Gl.dll" ) ), resolution.Width, resolution.Height, windowed, false );
 
-			SpriteShader = device.CreateShader(FileSystem.Open("world-shp.fx"));
+			SpriteShader = device.CreateShader(FileSystem.Open("shaders/world-shp.fx"));
-			LineShader = device.CreateShader(FileSystem.Open("line.fx"));
+			LineShader = device.CreateShader(FileSystem.Open("shaders/line.fx"));
-			RgbaSpriteShader = device.CreateShader(FileSystem.Open("chrome-rgba.fx"));
+			RgbaSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-rgba.fx"));
-			WorldSpriteShader = device.CreateShader(FileSystem.Open("chrome-shp.fx"));
+			WorldSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-shp.fx"));
-
-			fDebug = new Font("Tahoma", 10.0f, FontStyle.Regular);
-			fTitle = new Font("Tahoma", 10, FontStyle.Bold);
 
 			int Errors;
-			testFont = new FTFontGL("FreeSans.ttf", out Errors);
+			regularFont = new FTFontGL("FreeSans.ttf", out Errors);
 
 			if (Errors > 0)
 				throw new InvalidOperationException("Error(s) loading font");
 
-			testFont.ftRenderToTexture(RenderedSize, 192);
+			regularFont.ftRenderToTexture(RenderedFontSize, 192);
-			testFont.FT_ALIGN = FTFontAlign.FT_ALIGN_LEFT;
+			regularFont.FT_ALIGN = FTFontAlign.FT_ALIGN_LEFT;
 
 			boldFont = new FTFontGL("FreeSansBold.ttf", out Errors);
 			if (Errors > 0)
 				throw new InvalidOperationException("Error(s) loading font");
 
-			boldFont.ftRenderToTexture(RenderedSize, 192);
+			boldFont.ftRenderToTexture(RenderedFontSize, 192);
 			boldFont.FT_ALIGN = FTFontAlign.FT_ALIGN_LEFT;
-
-			
-			textSheet = new Sheet(this, new Size(256, 256));
-			rgbaRenderer = new SpriteRenderer(this, true, RgbaSpriteShader);
-			textSprite = new Sprite(textSheet, new Rectangle(0, 0, 256, 256), TextureChannel.Alpha);
 		}
 
 		IGraphicsDevice CreateDevice( Assembly rendererDll, int width, int height, bool fullscreen, bool vsync )
@@ -100,30 +86,6 @@ namespace OpenRa.Graphics
 			throw new NotImplementedException();
 		}
 
-/*		Bitmap RenderTextToBitmap(string s, Font f, Color c)
-		{
-			Bitmap b = new Bitmap(256, 256);
-			testFont.ftBeginFont(0.9f,0.0f,0.0f,0.5f);
-			testFont.ftWrite("Test",b);
-			testFont.ftEndFont();
-			
-            /*using (var g = System.Drawing.Graphics.FromImage(b))
-            {
-                g.TextRenderingHint = TextRenderingHint.SingleBitPerPixelGridFit;
-                g.DrawString(s, f, new SolidBrush(c), 0, 0);
-                g.Flush();
-            }*/
-//			return b;
-//		}
-
-		int2 GetTextSize(string s, Font f)
-		{
-			return new int2(50,100);
-			/*Bitmap b = new Bitmap(1,1);
-			System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(b);
-			return new int2(g.MeasureString(s, f).ToSize());*/
-		}
-
 		public IGraphicsDevice Device { get { return device; } }
 
 		public void BeginFrame(float2 r1, float2 r2, float2 scroll)
@@ -195,7 +157,7 @@ namespace OpenRa.Graphics
 		{
 			using (new PerfSample("text"))
 			{
-				pos.Y += (int)(emHeight * 2 / 3);
+				pos.Y += (int)(emHeight);
 
 				Gl.glMatrixMode(Gl.GL_MODELVIEW);
 				Gl.glPushMatrix();
@@ -209,7 +171,7 @@ namespace OpenRa.Graphics
 
 				Gl.glMatrixMode(Gl.GL_MODELVIEW);
 				Gl.glTranslatef(pos.X, Resolution.Height - pos.Y, 0);
-				Gl.glScalef(emHeight / RenderedSize, emHeight / RenderedSize, 1);
+				Gl.glScalef(emHeight / RenderedFontSize, emHeight / RenderedFontSize, 1);
 
 				f.ftBeginFont(false);
 				Gl.glColor4f(c.R / 255f, c.G / 255f, c.B / 255f, c.A / 255f);
@@ -226,12 +188,12 @@ namespace OpenRa.Graphics
 			}
 		}
 
-		public void DrawText(string text, int2 pos, Color c) { DrawTextInner(testFont, text, pos, c); }
+		public void DrawText(string text, int2 pos, Color c) { DrawTextInner(regularFont, text, pos, c); }
 		public void DrawText2(string text, int2 pos, Color c) { DrawTextInner(boldFont, text, pos, c); }
 
 		public int2 MeasureText(string text)
 		{
-			return new int2((int)(testFont.ftExtent(ref text) / 3), (int)emHeight);
+			return new int2((int)(regularFont.ftExtent(ref text) / 3), (int)emHeight);
 		}
 
 		public int2 MeasureText2(string text)

OpenRa.Game/OpenRa.Game.csproj

@@ -66,14 +66,14 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Tao.OpenAl, Version=1.1.0.1, Culture=neutral, PublicKeyToken=a7579dda88828311, processorArchitecture=MSIL" />
-    <Reference Include="ISE.FreeType, Version=1.0.2885.37773, Culture=neutral, PublicKeyToken=null">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\ISE.FreeType.dll</HintPath>
-    </Reference>
     <Reference Include="Tao.OpenGl, Version=2.1.0.12, Culture=neutral, PublicKeyToken=1ca010269a4501ef">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\thirdparty\Tao\Tao.OpenGl.dll</HintPath>
     </Reference>
+    <Reference Include="ISE.FreeType, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1b34ab585684d5ea">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\ISE.FreeType.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Chat.cs" />

mods/cnc/mod.yaml

@@ -2,9 +2,12 @@
 
 Folders:
 	./mods/cnc/
+	./mods/ra/packages/
 	./
+
 Packages:
 	mods/cnc/overrides.mix
+# Fully qualify the cnc package names
 	mods/cnc/packages/cclocal.mix
 	mods/cnc/packages/speech.mix
 	mods/cnc/packages/conquer.mix
@@ -12,13 +15,10 @@ Packages:
 	mods/cnc/packages/sounds.mix
 	mods/cnc/packages/tempicnh.mix
 	mods/cnc/packages/updatec.mix
+# Cannot qualify the RA names because they may live inside a mix
 	~main.mix
 	redalert.mix
-	hires.mix
-	local.mix
 	speech.mix
-	allies.mix
-	russian.mix
 	temperat.mix
 	snow.mix
 	interior.mix
@@ -26,7 +26,6 @@ Packages:
 	conquer.mix
 	sounds.mix
 
-
 LegacyRules:
 	mods/cnc/minimal.ini:	Minimal rules definitions
 	mods/cnc/weapons.ini:	Weapons are still in the old format
@@ -54,7 +53,6 @@ Assemblies:
 	mods/cnc/OpenRa.Mods.Cnc.dll: Cnc mod traits
 	mods/ra/OpenRa.Mods.RA.dll:	Red alert mod traits
 	
-	
 Maps:
 	scg01ea.ini: GDI Mission 1
 	scm01ea.ini: Green Acres

mods/cnc/sequences.xml

@@ -2,7 +2,7 @@
 <sequences>
   <!-- build clock - hacked in -->
   <unit name="clock">
-    <sequence name="idle" start="0" length="*" />
+    <sequence name="idle" start="0" length="*" src="hclock" />
   </unit>
   <cursor src="mouse">
     <sequence name="default" start="0" />
@@ -65,17 +65,17 @@
     <sequence name="8" start="0" length="22" src="art-exp1" />
   </unit>
   <unit name="pips">
+	<!-- TODO: Pull these out into their own shp in overrides -->
     <sequence name="groups" start="8" length="10" />
-    <sequence name="medic" start="20" length="1" />
+
-    <sequence name="ready" start="3" length="1" />
+    <sequence name="ready" start="3" length="1" src="hpips" />
-    <sequence name="hold" start="4" length="1" />
+    <sequence name="hold" start="4" length="1" src="hpips" />
-    <sequence name="pip-empty" start="0" length="1" />
+    <sequence name="pip-empty" start="0" length="1" src="hpips" />
-    <sequence name="pip-green" start="1" length="1" />
+    <sequence name="pip-green" start="1" length="1" src="hpips" />
-    <sequence name="pip-yellow" start="5" length="1" />
+    <sequence name="pip-yellow" start="5" length="1" src="hpips" />
-    <sequence name="pip-gray" start="6" length="1" />
+    <sequence name="pip-gray" start="6" length="1" src="hpips" />
-    <sequence name="pip-red" start="7" length="1" />
+    <sequence name="pip-red" start="7" length="1" src="hpips" />
-    <sequence name="tag-fake" start="18" length="1" />
+    <sequence name="tag-primary" start="2" length="1" src="hpips" />
-    <sequence name="tag-primary" start="2" length="1" />
   </unit>
   <unit name="flagfly">
     <sequence name="idle" start="0" length="14" />

mods/ra/mod.yaml

@@ -1,7 +1,8 @@
 # Classic Red Alert Mod -- Package Manifest
 
 Folders:
-	./mods/ra/
+	./mods/ra/packages
+	./mods/ra
 	./
 
 Packages:

mods/ra/tileSet.til

@@ -0,0 +1,353 @@
+; clear ground
+TSI
+1
+ff
+clear1
+
+; clear ground
+TSI
+1
+ffff
+clear1
+
+; sandy shorelines
+TS-
+56
+0003
+sh{0:00}
+
+; plain water
+TS-
+2
+0001
+w{0}
+
+; cliffs
+TS-
+38
+0087
+s{0:00}
+
+; rocky coast
+TS-
+38
+003b
+wc{0:00}
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; ROADS
+
+; roads
+TS-
+43
+00ad
+d{0:00}
+
+; road
+TS-
+1
+00e3
+d44
+
+; road
+TS-
+1
+00e4
+d45
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; RIVERS
+
+; river emerging from cliff
+TS-
+4
+00e7
+rc{0:00}
+
+; rivers
+TS-
+13
+0070
+rv{0:00}
+
+; river
+TS-
+1
+00e5
+rv14
+
+; river
+TS-
+1
+00e6
+rv15
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; BRIDGES
+
+; long bridge (north end)
+TS-
+1
+00eb
+br1a
+
+; long bridge (north end, damaged)
+TS-
+1
+00ec
+br1b
+
+; long bridge (north end, broken)
+TS-
+1
+00ed
+br1c
+
+; long bridge (south end)
+TS-
+1
+00ee
+br2a
+
+; long bridge (south end, damaged)
+TS-
+1
+00ef
+br2b
+
+; long bridge (south end, broken)
+TS-
+1
+00f0
+br2c
+
+; long bridge (middle)
+TS-
+1
+00f1
+br3a
+
+; long bridge (middle, damaged)
+TS-
+1
+00f2
+br3b
+
+; long bridge (middle, broken)
+TS-
+1
+00f3
+br3c
+
+; long bridge (middle, broken, south end missing)
+TS-
+1
+00f4
+br3d
+
+; long bridge (middle, broken, north end missing)
+TS-
+1
+00f5
+br3e
+
+; long bridge (water / totally broken)
+TS-
+1
+00f6
+br3f
+
+; long bridge (north surround)
+TS-
+1
+017c
+br1x
+
+; long bridge (south surround)
+TS-
+1
+017d
+br2x
+
+; short bridge "/"
+TS-
+1
+0083
+bridge1
+
+; short bridge "/" (destroyed)
+TS-
+1
+0084
+bridge1d
+
+; short bridge "/" (damaged)
+TS-
+1
+017a
+bridge1h
+
+; short bridge "/" (surround)
+TS-
+1
+017e
+bridge1x
+
+; short bridge "\"
+TS-
+1
+0085
+bridge2
+
+; short bridge "\" (destroyed)
+TS-
+1
+0086
+bridge2d
+
+; short bridge "\" (damaged)
+TS-
+1
+017b
+bridge2h
+
+; short bridge "\" (surround)
+TS-
+1
+017f
+bridge2x
+
+; fyords
+TS-
+6
+00f7
+f{0:00}
+
+; short fyord
+TS-
+2
+0081
+ford{0}
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; WATERFALLS
+
+; waterfall (E-W)
+TS-
+1
+007d
+falls1
+
+; waterfall (E-W, into sea)
+TS-
+1
+007e
+falls1a
+
+; waterfall (N-S)
+TS-
+1
+007f
+falls2
+
+; waterfall (N-S, into sea)
+TS-
+1
+0080
+falls2a
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; DEBRIS / ROCKS
+
+; random rock chunks (impassable)
+TS-
+3
+0061
+b{0}
+
+; random rock chunks (passable)
+TS-
+11
+00d8
+rf{0:00}
+
+; random debris
+TS-
+4
+0067
+p{0:00}
+
+; random debris
+TS-
+1
+006b
+p07
+
+; random debris
+TS-
+1
+006c
+p08
+
+; random debris
+TS-
+1
+006d
+p13
+
+; random debris
+TS-
+1
+006e
+p14
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; INTERIOR
+
+; walls
+--I
+49
+0149
+wall{0:0000}
+
+; black floor
+--I
+7
+010c
+flor{0:0000}
+
+; walls with stuff, random tiles
+--I
+16
+0180
+xtra{0:0000}
+
+; black/yellow stripe
+--I
+11
+013e
+strp{0:0000}
+
+; red stripe
+--I
+15
+00fd
+arro{0:0000}
+
+; white floor
+--I
+5
+0113
+gflr{0:0000}
+
+; white floor with black/yellow stripe
+--I
+11
+0118
+gstr{0:0000}
+
+; bogus
+TS-
+1
+fffe
+bogus

packaging/osx/package.sh

@@ -6,7 +6,7 @@
 
 # List of game files to copy into the app bundle
 # TODO: This will be significantly shorter once we move the ra files into its mod dir
-GAME_FILES="OpenRA allies.mix conquer.mix expand2.mix general.mix hires.mix interior.mix redalert.mix russian.mix snow.mix sounds.mix temperat.mix line.fx chrome-shp.fx chrome-rgba.fx bogus.SNO bogus.TEM world-shp.fx tileSet.til templates.ini mods maps packaging/osx/settings.ini"
+GAME_FILES="OpenRA shaders mods maps packaging/osx/settings.ini FreeSans.ttf FreeSansBold.ttf"
 
 # List of system files to copy into the app bundle
 # TODO: Sort out whats going on with libglfw so we don't need to do this

packaging/osx/settings.ini

@@ -1,7 +1,7 @@
 [Settings]
 NetworkHost=localhost
 NetworkPort=1234
-InitialMods=ra
 Width=1024
 Height=768
 PerfGraph=false
+InitialMods=ra