backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fixed a merge issue in GL-RenderSystem

Browse Source
This commit is contained in:
Glatzemann 2011-11-10 07:12:04 +00:00
parent 0a8bdbb9b0
commit 25d2c8dce4
3 changed files with 222 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ANX.Framework.Windows.GL3/GraphicsDeviceWindowsGL3.cs
View File

@ -178,9 +178,7 @@ namespace ANX.Framework.Windows.GL3
}
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
}
#endregion
#region Clear
/// <summary>
/// Clear the current screen by the specified clear color and options.
/// </summary>
@ -293,24 +291,14 @@ namespace ANX.Framework.Windows.GL3
throw new NotImplementedException();
}
<<<<<<< .mine
public void DrawUserPrimitives<T>(PrimitiveType primitiveType, T[] vertexData, int vertexOffset, int primitiveCount, VertexDeclaration vertexDeclaration) where T : struct, IVertexType
public void GetBackBufferData<T>(T[] data, int startIndex, int elementCount) where T : struct
{
throw new NotImplementedException();
}
public void ResizeBuffers(PresentationParameters presentationParameters)
{
throw new NotImplementedException();
}
}
=======
public void GetBackBufferData<T>(T[] data, int startIndex,
int elementCount) where T : struct
{
throw new NotImplementedException();
}
}
>>>>>>> .r12199
}

5
ANX.Framework/Properties/AssemblyInfo.cs
View File

@ -35,4 +35,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("0.4.1.*")]
[assembly: AssemblyFileVersion("0.4.1.0")]
[assembly:InternalsVisibleTo("ANX.Framework.Windows.DX10")]
[assembly:InternalsVisibleTo("ANX.Framework.Windows.DX11.1")]
[assembly:InternalsVisibleTo("ANX.Framework.Windows.GL3")]
[assembly:InternalsVisibleTo("ANX.Framework.Windows.Kinect")]
[assembly:InternalsVisibleTo("ANX.Framework.Windows.XInput")]
[assembly:InternalsVisibleTo("ANX.Framework.Windows.XAudio")]

2
Samples/WindowsGame/Game1.cs
View File

@ -89,7 +89,7 @@ namespace WindowsGame1
protected override void LoadContent()
{
// Create a new SpriteBatch, which can be used to draw textures.
spriteBatch = new SpriteBatch(GraphicsDevice);
//TODO: spriteBatch = new SpriteBatch(GraphicsDevice);
}
/// <summary>