- added missing ProjectData.cs

- fixed OGL window size, swap crash when window is closed
- closing the run loop when window closed
This commit is contained in:
SND\AstrorEnales_cp 2011-11-10 21:17:03 +00:00
parent 71bec46d54
commit 2961704067
4 changed files with 424 additions and 289 deletions

View File

@ -225,9 +225,13 @@ namespace ANX.Framework.Windows.GL3
/// Swap the graphics buffers.
/// </summary>
public void Present()
{
if (WindowsGameWindow.Form != null &&
WindowsGameWindow.Form.IsDisposed == false)
{
nativeContext.SwapBuffers();
}
}
#endregion
public void DrawIndexedPrimitives(PrimitiveType primitiveType,

View File

@ -53,10 +53,13 @@ namespace ANX.Framework.Windows.GL3
{
public class WindowsGameHost : GameHost
{
#region Private
private Game game;
private WindowsGameWindow gameWindow;
private bool isQuitting;
#endregion
#region Public
public override GameWindow Window
{
get
@ -64,16 +67,15 @@ namespace ANX.Framework.Windows.GL3
return this.gameWindow;
}
}
#endregion
#region Constructor
public WindowsGameHost(Game setGame)
: base(setGame)
{
isQuitting = false;
game = setGame;
gameWindow = new WindowsGameWindow();
//Mouse.WindowHandle = gameWindow.Handle;
//TouchPanel.WindowHandle = gameWindow.Handle;
//gameWindow.IsMouseVisible = game.IsMouseVisible;
gameWindow.Activated += delegate
{
OnActivated();
@ -82,13 +84,17 @@ namespace ANX.Framework.Windows.GL3
{
OnDeactivated();
};
//gameWindow.Suspend += GameWindowSuspend;
//gameWindow.Resume += GameWindowResume;
WindowsGameWindow.Form.FormClosing += delegate
{
isQuitting = true;
};
}
#endregion
#region Run
public override void Run()
{
gameWindow.Form.Show();
WindowsGameWindow.Form.Show();
while (isQuitting == false)
{
Application.DoEvents();
@ -96,10 +102,13 @@ namespace ANX.Framework.Windows.GL3
}
gameWindow.Close();
}
#endregion
#region Exit
public override void Exit()
{
isQuitting = true;
}
#endregion
}
}

View File

@ -55,7 +55,7 @@ namespace ANX.Framework.Windows.GL3
internal class WindowsGameWindow : ANX.Framework.GameWindow
{
#region Public
public Form Form
internal static Form Form
{
get;
private set;
@ -76,6 +76,43 @@ namespace ANX.Framework.Windows.GL3
return Form.WindowState == FormWindowState.Minimized;
}
}
#region AllowUserResizing
public override bool AllowUserResizing
{
get
{
return Form.FormBorderStyle == FormBorderStyle.Sizable;
}
set
{
Form.FormBorderStyle = value ?
FormBorderStyle.Sizable :
FormBorderStyle.Fixed3D;
}
}
#endregion
#region ClientBounds
public override Rectangle ClientBounds
{
get
{
System.Drawing.Rectangle rect = Form.ClientRectangle;
return new Rectangle(rect.X, rect.Y, rect.Width, rect.Height);
}
}
#endregion
#region CurrentOrientation
public override DisplayOrientation CurrentOrientation
{
get
{
return DisplayOrientation.Default;
}
}
#endregion
#endregion
#region Constructor
@ -84,6 +121,9 @@ namespace ANX.Framework.Windows.GL3
Form = new Form()
{
Text = "ANX Framework",
MaximizeBox = false,
FormBorderStyle = FormBorderStyle.Fixed3D,
ClientSize = new System.Drawing.Size(800, 600),
};
}
#endregion
@ -100,46 +140,30 @@ namespace ANX.Framework.Windows.GL3
}
#endregion
#region SetTitle
protected override void SetTitle(string title)
{
Form.Text = title;
}
#endregion
public override void BeginScreenDeviceChange(bool willBeFullScreen)
{
throw new NotImplementedException();
}
public override void EndScreenDeviceChange(string screenDeviceName, int clientWidth, int clientHeight)
public override void EndScreenDeviceChange(string screenDeviceName,
int clientWidth, int clientHeight)
{
throw new NotImplementedException();
}
protected override void SetTitle(string title)
{
throw new NotImplementedException();
}
public override bool AllowUserResizing
public override string ScreenDeviceName
{
get
{
throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
}
}
public override Rectangle ClientBounds
{
get { throw new NotImplementedException(); }
}
public override string ScreenDeviceName
{
get { throw new NotImplementedException(); }
}
public override DisplayOrientation CurrentOrientation
{
get { throw new NotImplementedException(); }
}
}
}

View File

@ -0,0 +1,98 @@
using System;
using System.Collections.Generic;
using System.Xml;
using System.Xml.Linq;
using System.IO;
namespace XNAToANXConverter
{
public static class ProjectData
{
private const string XnaBaseName = "Microsoft.Xna.Framework";
private const string AnxBaseName = "ANX.Framework";
#region Convert
public static void Convert(string sourceFilepath, string destinationFilepath)
{
string sourceFolderPath =
sourceFilepath.Replace(Path.GetFileName(sourceFilepath), "");
string destinationFolderPath =
destinationFilepath.Replace(Path.GetFileName(destinationFilepath), "");
if (Directory.Exists(destinationFolderPath) == false)
{
Directory.CreateDirectory(destinationFolderPath);
}
XDocument doc = XDocument.Load(sourceFilepath);
XElement root = doc.Root;
foreach (XElement propertyGroup in root.Elements())
{
if (propertyGroup.Name.LocalName != "ItemGroup")
{
continue;
}
List<XElement> elements = new List<XElement>(propertyGroup.Elements());
foreach (XElement item in elements)
{
if (item.Name.LocalName == "Reference")
{
#region Process Reference
string assemblyPath = item.Attribute("Include").Value;
if (assemblyPath.Contains(XnaBaseName))
{
item.Remove();
string anxPath = assemblyPath.Replace(XnaBaseName, AnxBaseName);
if (anxPath.Contains(", Version"))
{
anxPath = anxPath.Substring(0, anxPath.IndexOf(',')) + ".dll";
}
propertyGroup.Add(new XElement("Reference",
new XAttribute("Include", anxPath)));
}
#endregion
}
else if (item.Name.LocalName == "Compile")
{
#region Process Compile
string codeFilepath = item.Attribute("Include").Value;
string absolutePath = Path.Combine(sourceFolderPath, codeFilepath);
string text = File.ReadAllText(absolutePath);
text = text.Replace(XnaBaseName, AnxBaseName);
string destCodeFolderPath = codeFilepath.Replace(
Path.GetFileName(codeFilepath), "");
destCodeFolderPath = Path.Combine(destinationFolderPath,
destCodeFolderPath);
if (Directory.Exists(destCodeFolderPath) == false)
{
Directory.CreateDirectory(destCodeFolderPath);
}
File.WriteAllText(Path.Combine(destinationFolderPath,
codeFilepath), text);
#endregion
}
else if (item.Name.LocalName == "BootstrapperPackage")
{
#region Process BootstrapperPackage
// Remove all bootstrapper tasks for XNA.
string includeName = item.Attribute("Include").Value;
if (includeName.Contains(XnaBaseName))
{
item.Remove();
}
#endregion
}
}
}
doc.Save(destinationFilepath);
}
#endregion
}
}