mirror of
https://github.com/Ryujinx/Opentk.git
synced 2025-01-11 08:35:39 +00:00
Marked all classes as obsolete.
Silenced all compiler warnings.
This commit is contained in:
parent
dcd76ebebf
commit
3c51d81aa9
|
@ -15,6 +15,7 @@ namespace OpenTK.Graphics
|
||||||
/// Defines the interface for TextPrinter implementations.
|
/// Defines the interface for TextPrinter implementations.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Obsolete("Use ITextOutputProvider instead")]
|
[Obsolete("Use ITextOutputProvider instead")]
|
||||||
|
[CLSCompliant(false)]
|
||||||
public interface ITextPrinterImplementation
|
public interface ITextPrinterImplementation
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -35,6 +35,7 @@ namespace OpenTK.Graphics
|
||||||
}
|
}
|
||||||
|
|
||||||
private int handle;
|
private int handle;
|
||||||
|
[CLSCompliant(false)]
|
||||||
protected TextureFont font;
|
protected TextureFont font;
|
||||||
protected bool disposed;
|
protected bool disposed;
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@ namespace OpenTK.Graphics
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Encapsulates an OpenGL texture.
|
/// Encapsulates an OpenGL texture.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[Obsolete]
|
||||||
class AlphaTexture2D : Texture2D
|
class AlphaTexture2D : Texture2D
|
||||||
{
|
{
|
||||||
#region Constructors
|
#region Constructors
|
||||||
|
|
|
@ -42,6 +42,7 @@ namespace OpenTK.Graphics
|
||||||
//
|
//
|
||||||
// Make sure that no error checking is added to the GetError function,
|
// Make sure that no error checking is added to the GetError function,
|
||||||
// as that would cause infinite recursion!
|
// as that would cause infinite recursion!
|
||||||
|
[Obsolete]
|
||||||
struct ErrorHelper : IDisposable
|
struct ErrorHelper : IDisposable
|
||||||
{
|
{
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
|
@ -32,6 +32,7 @@ using OpenTK.Graphics.OpenGL;
|
||||||
|
|
||||||
namespace OpenTK.Graphics
|
namespace OpenTK.Graphics
|
||||||
{
|
{
|
||||||
|
[Obsolete]
|
||||||
class RgbaTexture2D : Texture2D
|
class RgbaTexture2D : Texture2D
|
||||||
{
|
{
|
||||||
public RgbaTexture2D(int width, int height)
|
public RgbaTexture2D(int width, int height)
|
||||||
|
|
|
@ -32,6 +32,7 @@ using System.Drawing;
|
||||||
|
|
||||||
namespace OpenTK.Graphics.Text
|
namespace OpenTK.Graphics.Text
|
||||||
{
|
{
|
||||||
|
[Obsolete]
|
||||||
struct CachedGlyphInfo
|
struct CachedGlyphInfo
|
||||||
{
|
{
|
||||||
public readonly Texture2D Texture;
|
public readonly Texture2D Texture;
|
||||||
|
|
|
@ -6,6 +6,7 @@ using OpenTK.Graphics.OpenGL;
|
||||||
|
|
||||||
namespace OpenTK.Graphics.Text
|
namespace OpenTK.Graphics.Text
|
||||||
{
|
{
|
||||||
|
[Obsolete]
|
||||||
sealed class GL11TextOutputProvider : GL1TextOutputProvider
|
sealed class GL11TextOutputProvider : GL1TextOutputProvider
|
||||||
{
|
{
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
|
@ -7,6 +7,7 @@ using OpenTK.Graphics.OpenGL;
|
||||||
|
|
||||||
namespace OpenTK.Graphics.Text
|
namespace OpenTK.Graphics.Text
|
||||||
{
|
{
|
||||||
|
[Obsolete]
|
||||||
sealed class GL12TextOutputProvider : GL1TextOutputProvider
|
sealed class GL12TextOutputProvider : GL1TextOutputProvider
|
||||||
{
|
{
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
|
@ -33,6 +33,7 @@ using OpenTK.Graphics.OpenGL;
|
||||||
|
|
||||||
namespace OpenTK.Graphics.Text
|
namespace OpenTK.Graphics.Text
|
||||||
{
|
{
|
||||||
|
[Obsolete]
|
||||||
abstract class GL1TextOutputProvider : ITextOutputProvider
|
abstract class GL1TextOutputProvider : ITextOutputProvider
|
||||||
{
|
{
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
|
@ -31,6 +31,7 @@ using System.Drawing;
|
||||||
|
|
||||||
namespace OpenTK.Graphics.Text
|
namespace OpenTK.Graphics.Text
|
||||||
{
|
{
|
||||||
|
[Obsolete]
|
||||||
abstract class GlyphCache : IGlyphCache
|
abstract class GlyphCache : IGlyphCache
|
||||||
{
|
{
|
||||||
#region IGlyphCache Members
|
#region IGlyphCache Members
|
||||||
|
@ -48,6 +49,7 @@ namespace OpenTK.Graphics.Text
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete]
|
||||||
sealed class GlyphCache<T> : GlyphCache where T : Texture2D
|
sealed class GlyphCache<T> : GlyphCache where T : Texture2D
|
||||||
{
|
{
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
|
@ -32,6 +32,7 @@ using System.Drawing;
|
||||||
|
|
||||||
namespace OpenTK.Graphics.Text
|
namespace OpenTK.Graphics.Text
|
||||||
{
|
{
|
||||||
|
[Obsolete]
|
||||||
class GlyphSheet<T> : IDisposable where T : Texture2D
|
class GlyphSheet<T> : IDisposable where T : Texture2D
|
||||||
{
|
{
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
|
@ -29,6 +29,7 @@ using System;
|
||||||
|
|
||||||
namespace OpenTK.Graphics.Text
|
namespace OpenTK.Graphics.Text
|
||||||
{
|
{
|
||||||
|
[Obsolete]
|
||||||
interface IGlyphCache : IDisposable
|
interface IGlyphCache : IDisposable
|
||||||
{
|
{
|
||||||
void Add(Glyph glyph, IGlyphRasterizer rasterizer, TextQuality quality);
|
void Add(Glyph glyph, IGlyphRasterizer rasterizer, TextQuality quality);
|
||||||
|
|
|
@ -25,6 +25,7 @@ namespace OpenTK.Graphics
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Provides methods to perform layout and print hardware accelerated text.
|
/// Provides methods to perform layout and print hardware accelerated text.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[Obsolete]
|
||||||
public sealed class TextPrinter : ITextPrinter
|
public sealed class TextPrinter : ITextPrinter
|
||||||
{
|
{
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
|
@ -34,6 +34,7 @@ using System.Diagnostics;
|
||||||
|
|
||||||
namespace OpenTK.Graphics
|
namespace OpenTK.Graphics
|
||||||
{
|
{
|
||||||
|
[Obsolete]
|
||||||
abstract class Texture2D : IGraphicsResource, IEquatable<Texture2D>
|
abstract class Texture2D : IGraphicsResource, IEquatable<Texture2D>
|
||||||
{
|
{
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
|
@ -279,7 +279,7 @@ namespace OpenTK.Math
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="left">The left instance.</param>
|
/// <param name="left">The left instance.</param>
|
||||||
/// <param name="right">The right instance.</param>
|
/// <param name="right">The right instance.</param>
|
||||||
/// <returns>The result of the operation.</returns>
|
/// <param name="result">The result of the operation.</param>
|
||||||
public static void Sub(ref Quaternion left, ref Quaternion right, out Quaternion result)
|
public static void Sub(ref Quaternion left, ref Quaternion right, out Quaternion result)
|
||||||
{
|
{
|
||||||
result = new Quaternion(
|
result = new Quaternion(
|
||||||
|
|
|
@ -279,7 +279,7 @@ namespace OpenTK.Math
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="left">The left instance.</param>
|
/// <param name="left">The left instance.</param>
|
||||||
/// <param name="right">The right instance.</param>
|
/// <param name="right">The right instance.</param>
|
||||||
/// <returns>The result of the operation.</returns>
|
/// <param name="result">The result of the operation.</param>
|
||||||
public static void Sub(ref Quaterniond left, ref Quaterniond right, out Quaterniond result)
|
public static void Sub(ref Quaterniond left, ref Quaterniond right, out Quaterniond result)
|
||||||
{
|
{
|
||||||
result = new Quaterniond(
|
result = new Quaterniond(
|
||||||
|
|
|
@ -30,6 +30,7 @@ namespace Tao.OpenAl
|
||||||
using System;
|
using System;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
[Obsolete]
|
||||||
internal static class Delegates
|
internal static class Delegates
|
||||||
{
|
{
|
||||||
static Delegates()
|
static Delegates()
|
||||||
|
|
|
@ -32743,7 +32743,7 @@ namespace Tao.OpenGl
|
||||||
/// </para>
|
/// </para>
|
||||||
/// <para>
|
/// <para>
|
||||||
/// <b>gluGetString</b> is an initialization routine. Calling it after a
|
/// <b>gluGetString</b> is an initialization routine. Calling it after a
|
||||||
/// <see cref="Gl.glNewList" /> results in undefined behavior.
|
/// <see cref="Gl.glNewList(int, int)" /> results in undefined behavior.
|
||||||
/// </para>
|
/// </para>
|
||||||
/// <para>
|
/// <para>
|
||||||
/// <b>ERRORS</b>
|
/// <b>ERRORS</b>
|
||||||
|
|
45
Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.Designer.cs
generated
Normal file
45
Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.Designer.cs
generated
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
namespace Tao.Platform.Windows
|
||||||
|
{
|
||||||
|
partial class SimpleOpenGlControl
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Component Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
this.SuspendLayout();
|
||||||
|
//
|
||||||
|
// NewGLControl
|
||||||
|
//
|
||||||
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
|
this.BackColor = System.Drawing.Color.Black;
|
||||||
|
this.Name = "NewGLControl";
|
||||||
|
this.ResumeLayout(false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
|
@ -43,12 +43,10 @@ namespace Tao.Platform.Windows
|
||||||
/// OpenGL applications. Relies on OpenTK.GLControl for cross-platform compatibility.
|
/// OpenGL applications. Relies on OpenTK.GLControl for cross-platform compatibility.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Obsolete("Use OpenTK.GLControl instead.")]
|
[Obsolete("Use OpenTK.GLControl instead.")]
|
||||||
public class SimpleOpenGlControl : OpenTK.GLControl
|
public partial class SimpleOpenGlControl : OpenTK.GLControl
|
||||||
{
|
{
|
||||||
#region Fields
|
#region Fields
|
||||||
|
|
||||||
private IContainer components; // Required for designer support
|
|
||||||
|
|
||||||
private bool autoCheckErrors = false; // Should we provide glGetError()?
|
private bool autoCheckErrors = false; // Should we provide glGetError()?
|
||||||
private bool autoFinish = false; // Should we provide a glFinish()?
|
private bool autoFinish = false; // Should we provide a glFinish()?
|
||||||
private bool autoMakeCurrent = true; // Should we automatically make the rendering context current?
|
private bool autoMakeCurrent = true; // Should we automatically make the rendering context current?
|
||||||
|
@ -425,23 +423,6 @@ namespace Tao.Platform.Windows
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region InitializeComponent
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Required for designer support.
|
|
||||||
/// </summary>
|
|
||||||
private void InitializeComponent()
|
|
||||||
{
|
|
||||||
this.components = new System.ComponentModel.Container();
|
|
||||||
//
|
|
||||||
// SimpleOpenGlControl
|
|
||||||
//
|
|
||||||
this.BackColor = System.Drawing.Color.Black;
|
|
||||||
this.Size = new System.Drawing.Size(50, 50);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region InitializeStyles
|
#region InitializeStyles
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -459,28 +440,5 @@ namespace Tao.Platform.Windows
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region IDisposable Members
|
|
||||||
|
|
||||||
#region Dispose(bool disposing)
|
|
||||||
/// <summary>
|
|
||||||
/// Disposes the control.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="disposing">Was the disposed manually called?</param>
|
|
||||||
protected override void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (disposing)
|
|
||||||
{
|
|
||||||
if (components != null)
|
|
||||||
{
|
|
||||||
components.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
DestroyContexts();
|
|
||||||
base.Dispose(disposing);
|
|
||||||
}
|
|
||||||
#endregion Dispose(bool disposing)
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,101 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 1.3
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">1.3</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1">this is my long string</data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
[base64 mime encoded serialized .NET Framework object]
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
[base64 mime encoded string representing a byte array form of the .NET Framework object]
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>1.3</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
</root>
|
Loading…
Reference in a new issue