Documentation updates. Getting rid of warnings.

This commit is contained in:
the_fiddler 2008-01-20 19:00:03 +00:00
Родитель 2c0de25dfd
Коммит 3d2bc15a84
10 изменённых файлов: 106 добавлений и 86 удалений

Просмотреть файл

@ -147,8 +147,6 @@ namespace Examples
public override void OnLoad(EventArgs e)
{
IntPtr tess;
double[][] rect = new double[4][] {
new double[] {50.0, 50.0, 0.0},
new double[] {200.0, 50.0, 0.0},

Просмотреть файл

@ -35,7 +35,7 @@ namespace Examples.Tutorial
public int VboID, EboID, NumElements;
}
Vbo[] vbo = new Vbo[2];
float angle;
//float angle;
public static readonly int order = 8;

Просмотреть файл

@ -314,6 +314,7 @@ namespace OpenTK
{
implementation.Dispose();
}
disposed = true;
}
}

Просмотреть файл

@ -192,7 +192,6 @@ namespace OpenTK.Math
#endregion
#region Constructors
/// <summary>Constructs left matrix with the same components as the given matrix.</summary>
@ -293,12 +292,12 @@ namespace OpenTK.Math
#endregion
#region Equality
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
/// <param name="matrix">An matrix to compare with this matrix.</param>
/// <param name="matrix">The OpenTK.Math.Matrix3d structure to compare with.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
[CLSCompliant(false)]
public bool Equals(Matrix3d matrix)
{
return
@ -313,6 +312,9 @@ namespace OpenTK.Math
R2C2 == matrix.R2C2;
}
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
/// <param name="matrix">The OpenTK.Math.Matrix3d structure to compare to.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
public bool Equals(ref Matrix3d matrix)
{
return
@ -327,6 +329,10 @@ namespace OpenTK.Math
R2C2 == matrix.R2C2;
}
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
/// <param name="left">The left-hand operand.</param>
/// <param name="right">The right-hand operand.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
public static bool Equals(ref Matrix3d left, ref Matrix3d right)
{
return
@ -341,6 +347,10 @@ namespace OpenTK.Math
left.R2C2 == right.R2C2;
}
/// <summary>Indicates whether the current matrix is approximately equal to another matrix.</summary>
/// <param name="matrix">The OpenTK.Math.Matrix3d structure to compare with.</param>
/// <param name="tolerance">The limit below which the matrices are considered equal.</param>
/// <returns>true if the current matrix is approximately equal to the matrix parameter; otherwise, false.</returns>
public bool EqualsApprox(ref Matrix3d matrix, double tolerance)
{
return
@ -355,6 +365,11 @@ namespace OpenTK.Math
System.Math.Abs(R2C2 - matrix.R2C2) <= tolerance;
}
/// <summary>Indicates whether the current matrix is approximately equal to another matrix.</summary>
/// <param name="left">The left-hand operand.</param>
/// <param name="right">The right-hand operand.</param>
/// <param name="tolerance">The limit below which the matrices are considered equal.</param>
/// <returns>true if the current matrix is approximately equal to the matrix parameter; otherwise, false.</returns>
public static bool EqualsApprox(ref Matrix3d left, ref Matrix3d right, double tolerance)
{
return
@ -371,7 +386,6 @@ namespace OpenTK.Math
#endregion
#region Arithmetic Operators
@ -584,7 +598,6 @@ namespace OpenTK.Math
#endregion
#region Functions
public double Determinant
@ -628,7 +641,6 @@ namespace OpenTK.Math
#endregion
#region Transformation Functions
public void Transform(ref Vector3d vector)
@ -734,7 +746,6 @@ namespace OpenTK.Math
#endregion
#region Constants
/// <summary>The identity matrix.</summary>
@ -755,7 +766,6 @@ namespace OpenTK.Math
#endregion
#region HashCode
/// <summary>Returns the hash code for this instance.</summary>
@ -770,7 +780,6 @@ namespace OpenTK.Math
#endregion
#region String
/// <summary>Returns the fully qualified type name of this instance.</summary>

Просмотреть файл

@ -259,7 +259,6 @@ namespace OpenTK.Math
#endregion
#region Constructors
/// <summary>Constructs left matrix with the same components as the given matrix.</summary>
@ -403,12 +402,12 @@ namespace OpenTK.Math
#endregion
#region Equality
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
/// <param name="matrix">An matrix to compare with this matrix.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
[CLSCompliant(false)]
public bool Equals(Matrix4d matrix)
{
return
@ -431,6 +430,9 @@ namespace OpenTK.Math
}
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
/// <param name="matrix">The OpenTK.Math.Matrix4d structure to compare to.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
public bool Equals(ref Matrix4d matrix)
{
return
@ -453,6 +455,10 @@ namespace OpenTK.Math
}
/// <summary>Indicates whether the current matrix is equal to another matrix.</summary>
/// <param name="left">The left-hand operand.</param>
/// <param name="right">The right-hand operand.</param>
/// <returns>true if the current matrix is equal to the matrix parameter; otherwise, false.</returns>
public static bool Equals(ref Matrix4d left, ref Matrix4d right)
{
return
@ -474,6 +480,10 @@ namespace OpenTK.Math
left.R3C3 == right.R3C3;
}
/// <summary>Indicates whether the current matrix is approximately equal to another matrix.</summary>
/// <param name="matrix">The OpenTK.Math.Matrix4d structure to compare with.</param>
/// <param name="tolerance">The limit below which the matrices are considered equal.</param>
/// <returns>true if the current matrix is approximately equal to the matrix parameter; otherwise, false.</returns>
public bool EqualsApprox(ref Matrix4d matrix, double tolerance)
{
return
@ -495,6 +505,11 @@ namespace OpenTK.Math
System.Math.Abs(R3C3 - matrix.R3C3) <= tolerance;
}
/// <summary>Indicates whether the current matrix is approximately equal to another matrix.</summary>
/// <param name="left">The left-hand operand.</param>
/// <param name="right">The right-hand operand.</param>
/// <param name="tolerance">The limit below which the matrices are considered equal.</param>
/// <returns>true if the current matrix is approximately equal to the matrix parameter; otherwise, false.</returns>
public static bool EqualsApprox(ref Matrix4d left, ref Matrix4d right, double tolerance)
{
return
@ -518,7 +533,6 @@ namespace OpenTK.Math
#endregion
#region Arithmetic Operators
@ -819,7 +833,6 @@ namespace OpenTK.Math
#endregion
#region Functions
public double Cofacter(int row, int column)
@ -1336,7 +1349,6 @@ namespace OpenTK.Math
#endregion
#region Transformation Functions
public void Transform(ref Vector4d vector)
@ -2283,7 +2295,6 @@ namespace OpenTK.Math
#endregion
#region Constants
/// <summary>The identity matrix.</summary>
@ -2306,7 +2317,6 @@ namespace OpenTK.Math
#endregion
#region HashCode
/// <summary>Returns the hash code for this instance.</summary>
@ -2322,7 +2332,6 @@ namespace OpenTK.Math
#endregion
#region String
/// <summary>Returns the fully qualified type name of this instance.</summary>

Просмотреть файл

@ -73,21 +73,21 @@ namespace OpenTK.Math
/// <summary>Converts the vector into left double-precision floating point number pointer.</summary>
/// <param name="vector">The vector being converted.</param>
/// <returns>A double-precision floating point number pointer to the vector coordinates.</returns>
unsafe public static explicit operator double*(Vector3d vector)
{
return &vector.X;
}
//unsafe public static explicit operator double*(Vector3d vector)
//{
// return &vector.X;
//}
/// <summary>Converts the vector into an IntPtr.</summary>
/// <param name="vector">The vector being converted.</param>
/// <returns>An IntPtr to the vector coordinates.</returns>
public static explicit operator IntPtr(Vector3d vector)
{
unsafe
{
return (IntPtr)(&vector.X);
}
}
//public static explicit operator IntPtr(Vector3d vector)
//{
// unsafe
// {
// return (IntPtr)(&vector.X);
// }
//}
#endregion
@ -142,6 +142,7 @@ namespace OpenTK.Math
/// <summary>Indicates whether the current vector is equal to another vector.</summary>
/// <param name="vector">An vector to compare with this vector.</param>
/// <returns>true if the current vector is equal to the vector parameter; otherwise, false.</returns>
[CLSCompliant(false)]
public bool Equals(Vector3d vector)
{
return

Просмотреть файл

@ -83,21 +83,21 @@ namespace OpenTK.Math
/// <summary>Converts the vector into left double-precision floating point number pointer.</summary>
/// <param name="vector">The vector being converted.</param>
/// <returns>A double-precision floating point number pointer to the vector coordinates.</returns>
unsafe public static explicit operator double*(Vector4d vector)
{
return &vector.X;
}
//unsafe public static explicit operator double*(Vector4d vector)
//{
// return &vector.X;
//}
/// <summary>Converts the vector into an IntPtr.</summary>
/// <param name="vector">The vector being converted.</param>
/// <returns>An IntPtr to the vector coordinates.</returns>
public static explicit operator IntPtr(Vector4d vector)
{
unsafe
{
return (IntPtr)(&vector.X);
}
}
//public static explicit operator IntPtr(Vector4d vector)
//{
// unsafe
// {
// return (IntPtr)(&vector.X);
// }
//}
#endregion
@ -167,6 +167,7 @@ namespace OpenTK.Math
/// <summary>Indicates whether the current vector is equal to another vector.</summary>
/// <param name="vector">An vector to compare with this vector.</param>
/// <returns>true if the current vector is equal to the vector parameter; otherwise, false.</returns>
[CLSCompliant(false)]
public bool Equals(Vector4d vector)
{
return

Просмотреть файл

@ -14,7 +14,6 @@ using OpenTK.Math;
namespace OpenTK.OpenAL
{
public partial class EfxExtension
{
#region Effect Object
@ -25,7 +24,7 @@ namespace OpenTK.OpenAL
[CLSCompliant(false)]
unsafe private delegate void Delegate_alGenEffects( int n,[Out] uint* effects );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alGenEffects Imported_alGenEffects;
/// <summary>The alGenEffects function is used to create one or more Effect objects. An Effect object stores an effect type and a set of parameter values to control that Effect. In order to use an Effect it must be attached to an Auxiliary Effect Slot object</summary>
@ -67,7 +66,7 @@ namespace OpenTK.OpenAL
[CLSCompliant(false)]
unsafe private delegate void Delegate_alDeleteEffects( int n,[In] uint* effects );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alDeleteEffects Imported_alDeleteEffects;
/// <summary>The alDeleteEffects function is used to delete and free resources for Effect objects previously created with alGenEffects.</summary>
@ -104,15 +103,16 @@ namespace OpenTK.OpenAL
#region alIsEffect
// typedef ALboolean (__cdecl *LPALISEFFECT)( ALuint eid );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private delegate bool Delegate_alIsEffect( uint eid );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alIsEffect Imported_alIsEffect;
/// <summary>The alIsEffect function is used to determine if an object identifier is a valid Effect object.</summary>
/// <param name="eid">Effect identifier to validate.</param>
/// <returns>True if the identifier is a valid Effect, False otherwise.</returns>
[CLSCompliant(false)]
public bool IsEffect( uint eid )
{
return Imported_alIsEffect(eid);
@ -123,10 +123,10 @@ namespace OpenTK.OpenAL
#region alEffecti
// typedef void (__cdecl *LPALEFFECTI)( ALuint eid, ALenum param, ALint value);
[CLSCompliant(false)]
//[CLSCompliant(false)]
private delegate void Delegate_alEffecti( uint eid,Enums.EfxEffecti param,int value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alEffecti Imported_alEffecti;
/// <summary>This function is used to set integer properties on Effect objects.</summary>
@ -153,10 +153,10 @@ namespace OpenTK.OpenAL
#region alEffectf
// typedef void (__cdecl *LPALEFFECTF)( ALuint eid, ALenum param, ALfloat value);
[CLSCompliant(false)]
//[CLSCompliant(false)]
private delegate void Delegate_alEffectf( uint eid,Enums.EfxEffectf param,float value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alEffectf Imported_alEffectf;
/// <summary>This function is used to set floating point properties on Effect objects.</summary>
@ -197,10 +197,10 @@ namespace OpenTK.OpenAL
#region alGetEffecti
// typedef void (__cdecl *LPALGETEFFECTI)( ALuint eid, ALenum pname, ALint* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alGetEffecti( uint eid,Enums.EfxEffecti pname,[Out] int* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alGetEffecti Imported_alGetEffecti;
/// <summary>This function is used to retrieve integer properties from Effect objects.</summary>
@ -224,10 +224,10 @@ namespace OpenTK.OpenAL
#region alGetEffectf
// typedef void (__cdecl *LPALGETEFFECTF)( ALuint eid, ALenum pname, ALfloat* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alGetEffectf( uint eid,Enums.EfxEffectf pname,[Out]float* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alGetEffectf Imported_alGetEffectf;
/// <summary>This function is used to retrieve floating point properties from Effect objects.</summary>
@ -251,11 +251,11 @@ namespace OpenTK.OpenAL
#region alGetEffectfv
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alGetEffectfv( uint eid,Enums.EfxEffect3f param,[Out] float* values );
// typedef void (__cdecl *LPALGETEFFECTFV)( ALuint eid, ALenum pname, ALfloat* values );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alGetEffectfv Imported_alGetEffectfv;
[CLSCompliant(false)]
@ -286,10 +286,10 @@ namespace OpenTK.OpenAL
#region alGenFilters
// typedef void (__cdecl *LPALGENFILTERS)( ALsizei n, ALuint* filters );
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alGenFilters( int n,[Out] uint* filters );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alGenFilters Imported_alGenFilters;
/// <summary>The alGenFilters function is used to create one or more Filter objects. A Filter object stores a filter type and a set of parameter values to control that Filter. Filter objects can be attached to Sources as Direct Filters or Auxiliary Send Filters.</summary>
@ -328,10 +328,10 @@ namespace OpenTK.OpenAL
#region alDeleteFilters
// typedef void (__cdecl *LPALDELETEFILTERS)( ALsizei n, ALuint* filters );
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alDeleteFilters( int n,[In] uint* filters );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alDeleteFilters Imported_alDeleteFilters;
/// <summary>The alDeleteFilters function is used to delete and free resources for Filter objects previously created with alGenFilters.</summary>
@ -368,10 +368,10 @@ namespace OpenTK.OpenAL
#region alIsFilter
// typedef ALboolean (__cdecl *LPALISFILTER)( ALuint fid );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private delegate bool Delegate_alIsFilter( uint fid );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alIsFilter Imported_alIsFilter;
/// <summary>The alIsFilter function is used to determine if an object identifier is a valid Filter object.</summary>
@ -388,10 +388,10 @@ namespace OpenTK.OpenAL
#region alFilteri
// typedef void (__cdecl *LPALFILTERI)( ALuint fid, ALenum param, ALint value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private delegate void Delegate_alFilteri( uint fid,Enums.EfxFilteri param,int value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alFilteri Imported_alFilteri;
/// <summary>This function is used to set integer properties on Filter objects.</summary>
@ -409,10 +409,10 @@ namespace OpenTK.OpenAL
#region alFilterf
// typedef void (__cdecl *LPALFILTERF)( ALuint fid, ALenum param, ALfloat value);
[CLSCompliant(false)]
//[CLSCompliant(false)]
private delegate void Delegate_alFilterf( uint fid,Enums.EfxFilterf param,float value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alFilterf Imported_alFilterf;
/// <summary>This function is used to set floating point properties on Filter objects.</summary>
@ -430,10 +430,10 @@ namespace OpenTK.OpenAL
#region alGetFilteri
// typedef void (__cdecl *LPALGETFILTERI)( ALuint fid, ALenum pname, ALint* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alGetFilteri( uint fid,Enums.EfxFilteri pname,[Out] int* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alGetFilteri Imported_alGetFilteri;
/// <summary>This function is used to retrieve integer properties from Filter objects.</summary>
@ -457,10 +457,10 @@ namespace OpenTK.OpenAL
#region alGetFilterf
// typedef void (__cdecl *LPALGETFILTERF)( ALuint fid, ALenum pname, ALfloat* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alGetFilterf( uint fid,Enums.EfxFilterf pname,[Out] float* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alGetFilterf Imported_alGetFilterf;
/// <summary>This function is used to retrieve floating point properties from Filter objects.</summary>
@ -494,10 +494,10 @@ namespace OpenTK.OpenAL
#region alGenAuxiliaryEffectSlots
// typedef void (__cdecl *LPALGENAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots );
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alGenAuxiliaryEffectSlots( int n,[Out] uint* slots );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alGenAuxiliaryEffectSlots Imported_alGenAuxiliaryEffectSlots;
/// <summary>The alGenAuxiliaryEffectSlots function is used to create one or more Auxiliary Effect Slots. The number of slots that can be created will be dependant upon the Open AL device used.</summary>
@ -536,10 +536,10 @@ namespace OpenTK.OpenAL
#region alDeleteAuxiliaryEffectSlots
// typedef void (__cdecl *LPALDELETEAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots );
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alDeleteAuxiliaryEffectSlots( int n,[In] uint* slots );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alDeleteAuxiliaryEffectSlots Imported_alDeleteAuxiliaryEffectSlots;
/// <summary>The alDeleteAuxiliaryEffectSlots function is used to delete and free resources for Auxiliary Effect Slots previously created with alGenAuxiliaryEffectSlots.</summary>
@ -576,10 +576,10 @@ namespace OpenTK.OpenAL
#region alIsAuxiliaryEffectSlot
// typedef ALboolean (__cdecl *LPALISAUXILIARYEFFECTSLOT)( ALuint slot );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private delegate bool Delegate_alIsAuxiliaryEffectSlot( uint slot );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alIsAuxiliaryEffectSlot Imported_alIsAuxiliaryEffectSlot;
/// <summary>The alIsAuxiliaryEffectSlot function is used to determine if an object identifier is a valid Auxiliary Effect Slot object.</summary>
@ -596,10 +596,10 @@ namespace OpenTK.OpenAL
#region alAuxiliaryEffectSloti
// typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum param, ALint value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private delegate void Delegate_alAuxiliaryEffectSloti( uint asid,Enums.EfxAuxiliaryi param,int value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alAuxiliaryEffectSloti Imported_alAuxiliaryEffectSloti;
/// <summary>This function is used to set integer properties on Auxiliary Effect Slot objects.</summary>
@ -617,10 +617,10 @@ namespace OpenTK.OpenAL
#region alAuxiliaryEffectSlotf
// typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTF)( ALuint asid, ALenum param, ALfloat value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private delegate void Delegate_alAuxiliaryEffectSlotf( uint asid,Enums.EfxAuxiliaryf param,float value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alAuxiliaryEffectSlotf Imported_alAuxiliaryEffectSlotf;
/// <summary>This function is used to set floating point properties on Auxiliary Effect Slot objects.</summary>
@ -638,10 +638,10 @@ namespace OpenTK.OpenAL
#region alGetAuxiliaryEffectSloti
// typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum pname, ALint* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
unsafe private delegate void Delegate_alGetAuxiliaryEffectSloti( uint asid,Enums.EfxAuxiliaryi pname,[Out] int* value );
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_alGetAuxiliaryEffectSloti Imported_alGetAuxiliaryEffectSloti;
/// <summary>This function is used to retrieve integer properties on Auxiliary Effect Slot objects.</summary>

Просмотреть файл

@ -37,9 +37,9 @@ namespace OpenTK.OpenAL
public delegate int Delegate_GetBufferMode( uint buffer,out int value );
//typedef ALenum (__cdecl *EAXGetBufferMode)(ALuint buffer, ALint *value);
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_SetBufferMode Imported_SetBufferMode;
[CLSCompliant(false)]
//[CLSCompliant(false)]
private Delegate_GetBufferMode Imported_GetBufferMode;
#endregion X-RAM Function pointer definitions

Просмотреть файл

@ -31,7 +31,7 @@ namespace OpenTK.Platform.Windows
private const string opengl32Name = "OPENGL32.DLL";
private WindowInfo windowInfo = new WindowInfo();
private DisplayMode mode;
private DisplayMode mode = null;
private bool vsync_supported;
private bool disposed;
@ -186,6 +186,7 @@ namespace OpenTK.Platform.Windows
#region public DisplayMode Mode
[Obsolete]
DisplayMode IGLContextInternal.Mode
{
get { return new DisplayMode(mode); }