Fixed ReturnType and Parameters translation to follow .Net naming conventions.

This commit is contained in:
the_fiddler 2007-11-04 15:21:50 +00:00
parent 5ec74af8a4
commit e5f52f2410

View file

@ -182,7 +182,7 @@ namespace Bind.Structures
get { return _return_type; } get { return _return_type; }
set set
{ {
_return_type = Type.Translate(value); _return_type = value;
} }
} }
@ -341,7 +341,7 @@ namespace Bind.Structures
public void CreateWrappers() public void CreateWrappers()
{ {
if (this.Name.Contains("EndList")) if (this.Name.Contains("GetBoolean"))
{ {
} }
@ -425,11 +425,15 @@ namespace Bind.Structures
/// </remarks> /// </remarks>
void TranslateReturnType() void TranslateReturnType()
{ {
/*
if (Bind.Structures.Type.GLTypes.ContainsKey(ReturnType.CurrentType)) if (Bind.Structures.Type.GLTypes.ContainsKey(ReturnType.CurrentType))
ReturnType.CurrentType = Bind.Structures.Type.GLTypes[ReturnType.CurrentType]; ReturnType.CurrentType = Bind.Structures.Type.GLTypes[ReturnType.CurrentType];
if (Bind.Structures.Type.CSTypes.ContainsKey(ReturnType.CurrentType)) if (Bind.Structures.Type.CSTypes.ContainsKey(ReturnType.CurrentType))
ReturnType.CurrentType = Bind.Structures.Type.CSTypes[ReturnType.CurrentType]; ReturnType.CurrentType = Bind.Structures.Type.CSTypes[ReturnType.CurrentType];
*/
ReturnType.Translate(this.Category);
if (ReturnType.CurrentType.ToLower().Contains("void") && ReturnType.Pointer) if (ReturnType.CurrentType.ToLower().Contains("void") && ReturnType.Pointer)
{ {
@ -451,11 +455,8 @@ namespace Bind.Structures
if (ReturnType.CurrentType.Contains("GLenum")) if (ReturnType.CurrentType.Contains("GLenum"))
{ {
if (Settings.Compatibility == Settings.Legacy.None) if ((Settings.Compatibility & Settings.Legacy.ConstIntEnums) == Settings.Legacy.None)
ReturnType.CurrentType = ReturnType.CurrentType = String.Format("{0}.{1}", Settings.EnumsOutput, Settings.CompleteEnumName);
String.Format("{0}.{1}",
Settings.NormalEnumsClass,
Settings.CompleteEnumName);
else else
ReturnType.CurrentType = "int"; ReturnType.CurrentType = "int";
} }
@ -489,27 +490,22 @@ namespace Bind.Structures
for (int i = 0; i < Parameters.Count; i++) for (int i = 0; i < Parameters.Count; i++)
{ {
Parameters[i] = Parameter.Translate(Parameters[i], this.Category); Parameters[i].Translate(this.Category);
if (Parameters[i].CurrentType == "UInt16" && Name.Contains("LineStipple")) if (Parameters[i].CurrentType == "UInt16" && Name.Contains("LineStipple"))
{
Parameters[i].WrapperType = WrapperTypes.UncheckedParameter; Parameters[i].WrapperType = WrapperTypes.UncheckedParameter;
}
if (Name.Contains("ShaderSource") && Parameters[i].CurrentType.ToLower().Contains("string"))
{
// Special case: these functions take a string[] // Special case: these functions take a string[]
//IsPointer = true; if (Name.Contains("ShaderSource") && Parameters[i].CurrentType.ToLower().Contains("string"))
Parameters[i].Array = 1; Parameters[i].Array = 1;
} }
} }
}
#endregion #endregion
internal void Translate() internal void Translate()
{ {
if (Name.Contains("String")) if (Name.Contains("GetError"))
{ {
} }
TranslateReturnType(); TranslateReturnType();