diff --git a/Source/OpenTK/DisplayMode.cs b/Source/OpenTK/DisplayMode.cs index 02620778..d9a8ef1e 100644 --- a/Source/OpenTK/DisplayMode.cs +++ b/Source/OpenTK/DisplayMode.cs @@ -186,7 +186,7 @@ namespace OpenTK /// /// Gets a System.Boolean indicating whether this DisplayMode is stereoscopic. /// - [Obsolete("Use GraphicsFormat.Stereo instead.")] + [Obsolete("Use GraphicsMode.Stereo instead.")] public bool Stereo { get { return this.stereo; } @@ -201,7 +201,7 @@ namespace OpenTK /// Gets a System.Int32 containing the number of buffers associated with this /// DisplayMode. /// - [Obsolete("Use GraphicsFormat.Buffers instead.")] + [Obsolete("Use GraphicsMode.Buffers instead.")] public int Buffers { get { return this.buffers; } @@ -233,7 +233,7 @@ namespace OpenTK #region public ColorDepth Color - [Obsolete("Use GraphicsFormat.Color instead.")] + [Obsolete("Use GraphicsMode.Color instead.")] public ColorMode Color { get { return this.color_format; } @@ -282,21 +282,21 @@ namespace OpenTK #endregion - [Obsolete("Use GraphicsFormat.Depth instead.")] + [Obsolete("Use GraphicsMode.Depth instead.")] public int DepthBits { get { return this.depthBits; } internal set { this.depthBits = value; } } - [Obsolete("Use GraphicsFormat.Stencil instead.")] + [Obsolete("Use GraphicsMode.Stencil instead.")] public int StencilBits { get { return this.stencilBits; } internal set { this.stencilBits = value; } } - [Obsolete("Use GraphicsFormat.AuxilliaryColorFormat instead.")] + [Obsolete("Use GraphicsMode.AuxilliaryColorFormat instead.")] public int AuxBits { get { return this.auxilliary_color_format.BitsPerPixel; } @@ -307,7 +307,7 @@ namespace OpenTK #endregion - internal GraphicsMode ToGraphicsFormat() + internal GraphicsMode ToGraphicsMode() { return new GraphicsMode(this.Color.BitsPerPixel, this.DepthBits, this.StencilBits, 0, this.AuxBits, this.Buffers, this.Stereo); } diff --git a/Source/OpenTK/GLControl.cs b/Source/OpenTK/GLControl.cs index 18383ef2..67f512bc 100644 --- a/Source/OpenTK/GLControl.cs +++ b/Source/OpenTK/GLControl.cs @@ -40,7 +40,7 @@ namespace OpenTK /// /// public GLControl(DisplayMode mode) - : this(mode.ToGraphicsFormat()) + : this(mode.ToGraphicsMode()) { } public GLControl(GraphicsMode format) @@ -213,17 +213,17 @@ namespace OpenTK #endregion - #region public GraphicsFormat GraphicsFormat + #region public GraphicsMode GraphicsMode /// - /// Gets the GraphicsFormat of the GraphicsContext attached to this GLControl. + /// Gets the GraphicsMode of the GraphicsContext attached to this GLControl. /// /// - /// To change the GraphicsFormat, you must destroy and recreate the GLControl. + /// To change the GraphicsMode, you must destroy and recreate the GLControl. /// - public GraphicsMode GraphicsFormat + public GraphicsMode GraphicsMode { - get { return (Context as IGLContextInternal).GraphicsFormat; } + get { return (Context as IGLContextInternal).GraphicsMode; } } #endregion diff --git a/Source/OpenTK/GameWindow.cs b/Source/OpenTK/GameWindow.cs index 4d318707..6e8df556 100644 --- a/Source/OpenTK/GameWindow.cs +++ b/Source/OpenTK/GameWindow.cs @@ -156,7 +156,7 @@ namespace OpenTK public GameWindow(DisplayMode mode) : this("OpenTK Game Window", mode.Width, mode.Height, mode.Fullscreen ? DisplayDevice.PrimaryDisplay.SelectResolution( - mode.Width, mode.Height, mode.Color.BitsPerPixel, 0) : null, mode.ToGraphicsFormat()) { } + mode.Width, mode.Height, mode.Color.BitsPerPixel, 0) : null, mode.ToGraphicsMode()) { } /// /// Constructs a new GameWindow with the specified title, and opens a render window with the @@ -166,7 +166,7 @@ namespace OpenTK /// The Title of the GameWindow. [Obsolete] public GameWindow(DisplayMode mode, string title) - : this(title, mode.Width, mode.Height, mode.ToGraphicsFormat()) + : this(title, mode.Width, mode.Height, mode.ToGraphicsMode()) { } diff --git a/Source/OpenTK/Graphics/ColorDepth.cs b/Source/OpenTK/Graphics/ColorDepth.cs index f71f00d8..c826c9ae 100644 --- a/Source/OpenTK/Graphics/ColorDepth.cs +++ b/Source/OpenTK/Graphics/ColorDepth.cs @@ -12,7 +12,7 @@ using System.Text; namespace OpenTK.Graphics { - /// Defines the ColorDepth component of a GraphicsFormat. + /// Defines the ColorDepth component of a GraphicsMode. /// /// A ColorDepth contains Red, Green, Blue and Alpha components that descibe /// the allocated bits per pixel for the corresponding color. diff --git a/Source/OpenTK/Graphics/GraphicsContext.cs b/Source/OpenTK/Graphics/GraphicsContext.cs index 0747471c..c5e7e55b 100644 --- a/Source/OpenTK/Graphics/GraphicsContext.cs +++ b/Source/OpenTK/Graphics/GraphicsContext.cs @@ -36,7 +36,7 @@ namespace OpenTK.Graphics /// /// public GraphicsContext(DisplayMode mode, IWindowInfo window) - : this(mode.ToGraphicsFormat(), window) + : this(mode.ToGraphicsMode(), window) { } public GraphicsContext(GraphicsMode format, IWindowInfo window) @@ -247,9 +247,9 @@ namespace OpenTK.Graphics /// /// Gets the DisplayMode of the context. /// - GraphicsMode IGLContextInternal.GraphicsFormat + GraphicsMode IGLContextInternal.GraphicsMode { - get { return (implementation as IGLContextInternal).GraphicsFormat; } + get { return (implementation as IGLContextInternal).GraphicsMode; } } ///// diff --git a/Source/OpenTK/Graphics/GraphicsFormat.cs b/Source/OpenTK/Graphics/GraphicsFormat.cs deleted file mode 100644 index eab963ba..00000000 --- a/Source/OpenTK/Graphics/GraphicsFormat.cs +++ /dev/null @@ -1,263 +0,0 @@ -#region --- License --- -/* Licensed under the MIT/X11 license. - * Copyright (c) 2006-2008 the OpenTK Team. - * This notice may not be removed from any source distribution. - * See license.txt for licensing detailed licensing details. - */ -#endregion - -using System; -using System.Collections.Generic; -using System.Text; - -namespace OpenTK.Graphics -{ - /// Defines the format for graphics operations. - public class GraphicsMode - { - ColorDepth color_format, accumulator_format; - int depth, stencil, buffers, samples; - bool stereo; - - #region --- Constructors --- - - #region internal GraphicsFormat(GraphicsFormat mode) - - /// - /// Constructs a new GraphicsFormat from the given GraphicsFormat. - /// - internal GraphicsMode(GraphicsMode mode) - : this(mode.ColorFormat, mode.Depth, mode.Stencil, mode.Samples, mode.AccumulatorFormat, mode.Buffers, mode.Stereo) { } - - #endregion - - #region public GraphicsFormat() - - /// Constructs a new GraphicsFormat with sensible default parameters. - public GraphicsMode() - : this(Default) - { } - - #endregion - - #region public GraphicsFormat(ColorFormat color) - - /// Constructs a new GraphicsFormat with the specified parameters. - /// The ColorFormat of the color buffer. - public GraphicsMode(ColorDepth color) - : this(color, Default.Depth, Default.Stencil, Default.Samples, Default.AccumulatorFormat, Default.Buffers, Default.Stereo) - { } - - #endregion - - #region public GraphicsFormat(ColorFormat color, int depth) - - /// Constructs a new GraphicsFormat with the specified parameters. - /// The ColorFormat of the color buffer. - /// The number of bits in the depth buffer. - public GraphicsMode(ColorDepth color, int depth) - : this(color, depth, Default.Stencil, Default.Samples, Default.AccumulatorFormat, Default.Buffers, Default.Stereo) - { } - - #endregion - - #region public GraphicsFormat(ColorFormat color, int depth, int stencil) - - /// Constructs a new GraphicsFormat with the specified parameters. - /// The ColorFormat of the color buffer. - /// The number of bits in the depth buffer. - /// The number of bits in the stencil buffer. - public GraphicsMode(ColorDepth color, int depth, int stencil) - : this(color, depth, stencil, Default.Samples, Default.AccumulatorFormat, Default.Buffers, Default.Stereo) - { } - - #endregion - - #region public GraphicsFormat(ColorFormat color, int depth, int stencil, int samples) - - /// Constructs a new GraphicsFormat with the specified parameters. - /// The ColorFormat of the color buffer. - /// The number of bits in the depth buffer. - /// The number of bits in the stencil buffer. - /// The number of samples for FSAA. - public GraphicsMode(ColorDepth color, int depth, int stencil, int samples) - : this(color, depth, stencil, samples, Default.AccumulatorFormat, Default.Buffers, Default.Stereo) - { } - - #endregion - - #region public GraphicsFormat(ColorFormat color, int depth, int stencil, int samples, ColorFormat accum) - - /// Constructs a new GraphicsFormat with the specified parameters. - /// The ColorFormat of the color buffer. - /// The number of bits in the depth buffer. - /// The number of bits in the stencil buffer. - /// The number of samples for FSAA. - /// The ColorFormat of the accumilliary buffer. - public GraphicsMode(ColorDepth color, int depth, int stencil, int samples, ColorDepth accum) - : this(color, depth, stencil, samples, accum, Default.Buffers, Default.Stereo) - { } - - #endregion - - #region public GraphicsFormat(ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers) - - /// Constructs a new GraphicsFormat with the specified parameters. - /// The ColorFormat of the color buffer. - /// The number of bits in the depth buffer. - /// The number of bits in the stencil buffer. - /// The number of samples for FSAA. - /// The ColorFormat of the accumilliary buffer. - /// The number of render buffers. Typical values include one (single-), two (double-) or three (triple-buffering). - public GraphicsMode(ColorDepth color, int depth, int stencil, int samples, ColorDepth accum, int buffers) - : this(color, depth, stencil, samples, accum, buffers, Default.Stereo) - { } - - #endregion - - #region public GraphicsFormat(ColorFormat color, int depth, int stencil, int samples, ColorFormat accum, int buffers, bool stereo) - - /// Constructs a new GraphicsFormat with the specified parameters. - /// The ColorFormat of the color buffer. - /// The number of bits in the depth buffer. - /// The number of bits in the stencil buffer. - /// The number of samples for FSAA. - /// The ColorFormat of the accumilliary buffer. - /// Set to true for a GraphicsFormat with stereographic capabilities. - /// The number of render buffers. Typical values include one (single-), two (double-) or three (triple-buffering). - public GraphicsMode(ColorDepth color, int depth, int stencil, int samples, ColorDepth accum, int buffers, bool stereo) - { - if (depth < 0) throw new ArgumentOutOfRangeException("depth", "Must be greater than, or equal to zero."); - if (stencil < 0) throw new ArgumentOutOfRangeException("stencil", "Must be greater than, or equal to zero."); - if (buffers <= 0) throw new ArgumentOutOfRangeException("buffers", "Must be greater than zero."); - if (samples < 0) throw new ArgumentOutOfRangeException("samples", "Must be greater than, or equal to zero."); - - this.ColorFormat = color; - this.Depth = depth; - this.Stencil = stencil; - this.AccumulatorFormat = accum; - this.Buffers = buffers; - this.Stereo = stereo; - } - - #endregion - - #endregion - - #region --- Public Methods --- - - #region public int ColorFormat - - /// - /// Gets an OpenTK.Graphics.ColorFormat that describes the color format for this GraphicsFormat. - /// - public ColorDepth ColorFormat - { - get { return color_format; } - private set { color_format = value; } - } - - #endregion - - #region public int AccumulatorFormat - - /// - /// Gets an OpenTK.Graphics.ColorFormat that describes the accumulator format for this GraphicsFormat. - /// - public ColorDepth AccumulatorFormat - { - get { return accumulator_format; } - private set { accumulator_format = value; } - } - - #endregion - - #region public int Depth - - /// - /// Gets a System.Int32 that contains the bits per pixel for the depth buffer - /// for this GraphicsFormat. - /// - public int Depth - { - get { return depth; } - private set { depth = value; } - } - - #endregion - - #region public int Stencil - - /// - /// Gets a System.Int32 that contains the bits per pixel for the stencil buffer - /// of this GraphicsFormat. - /// - public int Stencil - { - get { return stencil; } - private set { stencil = value; } - } - - #endregion - - /// - /// Gets a System.Int32 that contains the number of FSAA samples per pixel for this GraphicsFormat. - /// - public int Samples - { - get { return samples; } - private set { samples = value; } - } - - #region public bool Stereo - - /// - /// Gets a System.Boolean indicating whether this DisplayMode is stereoscopic. - /// - public bool Stereo - { - get { return this.stereo; } - private set { this.stereo = value; } - } - - #endregion - - #region public int Buffers - - /// - /// Gets a System.Int32 containing the number of buffers associated with this - /// DisplayMode. - /// - public int Buffers - { - get { return this.buffers; } - private set { this.buffers = value; } - } - - #endregion - - #region public static GraphicsFormat Default - - /// Returns an OpenTK.GraphicsFormat compatible with the underlying platform. - public static GraphicsMode Default - { - get { return new GraphicsMode(DisplayDevice.PrimaryDisplay.BitsPerPixel, 16, 0, 0, 0, 2, false); } - } - - #endregion - - #endregion - - #region --- Overrides --- - - /// Returns a System.String describing the current GraphicsFormat. - /// ! System.String describing the current GraphicsFormat. - public override string ToString() - { - return String.Format("Color: {0}, Depth: {1}, Stencil: {2}, Samples: {3}, Accum: {4}, Buffers: {5}, Stereo: {6}", - ColorFormat, Depth, Stereo, Samples, AccumulatorFormat, Buffers, Stereo); - } - - #endregion - } -} diff --git a/Source/OpenTK/Graphics/IGraphicsContext.cs b/Source/OpenTK/Graphics/IGraphicsContext.cs index 81c513d6..c15f690f 100644 --- a/Source/OpenTK/Graphics/IGraphicsContext.cs +++ b/Source/OpenTK/Graphics/IGraphicsContext.cs @@ -78,8 +78,8 @@ namespace OpenTK.Graphics /// IWindowInfo Info { get; } - /// Gets the GraphicsFormat of the context. - GraphicsMode GraphicsFormat { get; } + /// Gets the GraphicsMode of the context. + GraphicsMode GraphicsMode { get; } ///// ///// Gets a System.IntPtr containing the handle to the OpenGL context which is current in the diff --git a/Source/OpenTK/Platform/DummyGLContext.cs b/Source/OpenTK/Platform/DummyGLContext.cs index a0d3fe02..8e432435 100644 --- a/Source/OpenTK/Platform/DummyGLContext.cs +++ b/Source/OpenTK/Platform/DummyGLContext.cs @@ -29,7 +29,7 @@ namespace OpenTK.Platform #region --- IGraphicsContext Members --- public IntPtr Context { get { return IntPtr.Zero; } } - public GraphicsMode GraphicsFormat { get { return format; } } + public GraphicsMode GraphicsMode { get { return format; } } public void CreateContext() { } public void CreateContext(bool direct) { } diff --git a/Source/OpenTK/Platform/INativeGLWindow.cs b/Source/OpenTK/Platform/INativeGLWindow.cs index 5b3cbe1d..1ae31282 100644 --- a/Source/OpenTK/Platform/INativeGLWindow.cs +++ b/Source/OpenTK/Platform/INativeGLWindow.cs @@ -21,7 +21,7 @@ namespace OpenTK.Platform internal interface INativeGLWindow : IResizable, IDisposable { //void CreateWindow(int width, int height, DisplayMode mode, out IGraphicsContext context); - void CreateWindow(int width, int height);//, GraphicsFormat mode, out IGraphicsContext context); + void CreateWindow(int width, int height);//, GraphicsMode mode, out IGraphicsContext context); void DestroyWindow(); void ProcessEvents(); void PointToClient(ref System.Drawing.Point p); diff --git a/Source/OpenTK/Platform/Windows/WinGLContext.cs b/Source/OpenTK/Platform/Windows/WinGLContext.cs index 3bc2d588..c93ee8a5 100644 --- a/Source/OpenTK/Platform/Windows/WinGLContext.cs +++ b/Source/OpenTK/Platform/Windows/WinGLContext.cs @@ -78,7 +78,7 @@ namespace OpenTK.Platform.Windows throw new ArgumentException("window", "Must be a valid window."); Debug.Print("Setting pixel format..."); - this.format = this.SetGraphicsFormatPFD(format); + this.format = this.SetGraphicsModePFD(format); Debug.Write("Creating render context... "); // Do not rely on OpenTK.Platform.Windows.Wgl - the context is not ready yet, @@ -220,9 +220,9 @@ namespace OpenTK.Platform.Windows #endregion - #region GraphicsFormat IGLContextInternal.GraphicsFormat + #region GraphicsMode IGLContextInternal.GraphicsMode - GraphicsMode IGLContextInternal.GraphicsFormat + GraphicsMode IGLContextInternal.GraphicsMode { get { return format; } } @@ -269,9 +269,9 @@ namespace OpenTK.Platform.Windows #region --- Private Methods --- - #region GraphicsFormat SetGraphicsFormatPFD(GraphicsFormat format) + #region GraphicsMode SetGraphicsModePFD(GraphicsMode format) - GraphicsMode SetGraphicsFormatPFD(GraphicsMode format) + GraphicsMode SetGraphicsModePFD(GraphicsMode format) { deviceContext = Functions.GetDC(this.windowInfo.Handle); Debug.WriteLine(String.Format("Device context: {0}", deviceContext)); @@ -327,7 +327,7 @@ namespace OpenTK.Platform.Windows (pfd.Flags & PixelFormatDescriptorFlags.STEREO) != 0); if (!Functions.SetPixelFormat(deviceContext, pixel, ref pixelFormat)) - throw new GraphicsContextException(String.Format("Requested GraphicsFormat not available. SetPixelFormat error: {0}", + throw new GraphicsContextException(String.Format("Requested GraphicsMode not available. SetPixelFormat error: {0}", Marshal.GetLastWin32Error())); Debug.Print("done! (format: {0})", pixel); @@ -336,9 +336,9 @@ namespace OpenTK.Platform.Windows #endregion - #region GraphicsFormat SetGraphicsFormatARB(GraphicsFormat format) + #region GraphicsMode SetGraphicsModeARB(GraphicsMode format) - GraphicsMode SetGraphicsFormatARB(GraphicsMode format) + GraphicsMode SetGraphicsModeARB(GraphicsMode format) { return null; } diff --git a/Source/OpenTK/Platform/Windows/WinGLNative.cs b/Source/OpenTK/Platform/Windows/WinGLNative.cs index ef91e582..487d0930 100644 --- a/Source/OpenTK/Platform/Windows/WinGLNative.cs +++ b/Source/OpenTK/Platform/Windows/WinGLNative.cs @@ -322,11 +322,11 @@ namespace OpenTK.Platform.Windows #region public void CreateWindow(int width, int height) - public void CreateWindow(int width, int height)//, GraphicsFormat format, out IGraphicsContext context) + public void CreateWindow(int width, int height)//, GraphicsMode format, out IGraphicsContext context) { Debug.Print("Creating native window."); Debug.Indent(); - //Debug.Print("GraphicsFormat: {0}", format.ToString()); + //Debug.Print("GraphicsMode: {0}", format.ToString()); CreateParams cp = new CreateParams(); cp.ClassStyle = diff --git a/Source/OpenTK/Platform/X11/X11GLContext.cs b/Source/OpenTK/Platform/X11/X11GLContext.cs index 074d216f..5ac21e2e 100644 --- a/Source/OpenTK/Platform/X11/X11GLContext.cs +++ b/Source/OpenTK/Platform/X11/X11GLContext.cs @@ -306,7 +306,7 @@ namespace OpenTK.Platform.X11 #region public DisplayMode Mode - GraphicsMode IGLContextInternal.GraphicsFormat + GraphicsMode IGLContextInternal.GraphicsMode { get { return format; } } diff --git a/Source/OpenTK/Platform/X11/X11GLNative.cs b/Source/OpenTK/Platform/X11/X11GLNative.cs index b354d051..0613e499 100644 --- a/Source/OpenTK/Platform/X11/X11GLNative.cs +++ b/Source/OpenTK/Platform/X11/X11GLNative.cs @@ -495,7 +495,7 @@ namespace OpenTK.Platform.X11 /// public void CreateWindow(int width, int height, DisplayMode mode, out IGraphicsContext glContext) { - this.CreateWindow(width, height);//, mode.ToGraphicsFormat(), out glContext); + this.CreateWindow(width, height);//, mode.ToGraphicsMode(), out glContext); glContext = null; }