Skip to content

Commit 8ef6ca1

Browse files
committed
code cleanup
1 parent d6c5635 commit 8ef6ca1

File tree

51 files changed

+249
-233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+249
-233
lines changed

build/SharpGLTF.CodeGen.Core/CodeGen/EmitCSharp.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ private void AddFieldReflection(FieldInfo finfo)
680680
// fix boolean value
681681
if (vconst is Boolean bconst) vconst = bconst ? "true" : "false";
682682

683-
getter += FormattableString.Invariant($" ?? {vconst}");
683+
getter += Invariant($" ?? {vconst}");
684684
}
685685

686686
// _FieldsReflection.Add($"yield return FIELDINFO.From(\"{finfo.PersistentName}\",this, {getter});");
@@ -768,9 +768,18 @@ public IEnumerable<string> EmitCode()
768768
yield return "#region reflection".Indent(1);
769769
yield return string.Empty;
770770

771-
yield return $"public const string SCHEMANAME = \"{SchemaName}\";".Indent(1);
771+
if (this.HasBaseClass)
772+
{
773+
yield return $"public new const string SCHEMANAME = \"{SchemaName}\";".Indent(1);
774+
}
775+
else
776+
{
777+
yield return $"public const string SCHEMANAME = \"{SchemaName}\";".Indent(1);
778+
}
779+
780+
772781

773-
var pointerPathModifier = HasBaseClass ? "override" : "virtual";
782+
var pointerPathModifier = HasBaseClass ? "override" : "virtual";
774783
yield return $"protected {pointerPathModifier} string GetSchemaName() => SCHEMANAME;".Indent(1);
775784

776785
yield return string.Empty;

build/SharpGLTF.CodeGen.Core/SchemaDownload.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ public static void Syncronize(string remoteUrl, string localDirectory)
1313
{
1414
if (LibGit2Sharp.Repository.Discover(localDirectory) == null)
1515
{
16-
Console.WriteLine($"Cloning {remoteUrl} can take several minutes; Please wait...");
16+
Console.Out.WriteLine($"Cloning {remoteUrl} can take several minutes; Please wait...");
1717

1818
LibGit2Sharp.Repository.Clone(remoteUrl, localDirectory);
1919

20-
Console.WriteLine($"... Clone Completed");
20+
Console.Out.WriteLine($"... Clone Completed");
2121

2222
return;
2323
}
@@ -31,7 +31,7 @@ public static void Syncronize(string remoteUrl, string localDirectory)
3131

3232
var r = LibGit2Sharp.Commands.Pull(repo, new LibGit2Sharp.Signature("Anonymous", "[email protected]", new DateTimeOffset(DateTime.Now)), options);
3333

34-
Console.WriteLine($"{remoteUrl} is {r.Status}");
34+
Console.Out.WriteLine($"{remoteUrl} is {r.Status}");
3535
}
3636
}
3737
}

build/SharpGLTF.CodeGen/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static void Main(string[] args)
3838
{
3939
foreach (var (targetFileName, schema) in processor.ReadSchema())
4040
{
41-
System.Console.WriteLine($"Emitting {targetFileName}...");
41+
System.Console.Out.WriteLine($"Emitting {targetFileName}...");
4242

4343
SchemaProcessing.EmitCodeFromSchema(processor.GetTargetProject(), targetFileName, schema, processors);
4444
}

src/SharpGLTF.Core/Schema2/Generated/ext.AnimPointer.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ partial class AnimationPointer : ExtraProperties
4444

4545
#region reflection
4646

47-
public const string SCHEMANAME = "KHR_animation_pointer";
47+
public new const string SCHEMANAME = "KHR_animation_pointer";
4848
protected override string GetSchemaName() => SCHEMANAME;
4949

5050
protected override IEnumerable<string> ReflectFieldsNames()

src/SharpGLTF.Core/Schema2/Generated/ext.Anisotropy.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ partial class MaterialAnisotropy : ExtraProperties
4444

4545
#region reflection
4646

47-
public const string SCHEMANAME = "KHR_materials_anisotropy";
47+
public new const string SCHEMANAME = "KHR_materials_anisotropy";
4848
protected override string GetSchemaName() => SCHEMANAME;
4949

5050
protected override IEnumerable<string> ReflectFieldsNames()

src/SharpGLTF.Core/Schema2/Generated/ext.ClearCoat.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ partial class MaterialClearCoat : ExtraProperties
4444

4545
#region reflection
4646

47-
public const string SCHEMANAME = "KHR_materials_clearcoat";
47+
public new const string SCHEMANAME = "KHR_materials_clearcoat";
4848
protected override string GetSchemaName() => SCHEMANAME;
4949

5050
protected override IEnumerable<string> ReflectFieldsNames()

src/SharpGLTF.Core/Schema2/Generated/ext.DiffuseTransmission.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ partial class MaterialDiffuseTransmission : ExtraProperties
4444

4545
#region reflection
4646

47-
public const string SCHEMANAME = "KHR_materials_diffuse_transmission";
47+
public new const string SCHEMANAME = "KHR_materials_diffuse_transmission";
4848
protected override string GetSchemaName() => SCHEMANAME;
4949

5050
protected override IEnumerable<string> ReflectFieldsNames()

src/SharpGLTF.Core/Schema2/Generated/ext.Dispersion.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ partial class MaterialDispersion : ExtraProperties
4444

4545
#region reflection
4646

47-
public const string SCHEMANAME = "KHR_materials_dispersion";
47+
public new const string SCHEMANAME = "KHR_materials_dispersion";
4848
protected override string GetSchemaName() => SCHEMANAME;
4949

5050
protected override IEnumerable<string> ReflectFieldsNames()

src/SharpGLTF.Core/Schema2/Generated/ext.Ior.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ partial class MaterialIOR : ExtraProperties
4444

4545
#region reflection
4646

47-
public const string SCHEMANAME = "KHR_materials_ior";
47+
public new const string SCHEMANAME = "KHR_materials_ior";
4848
protected override string GetSchemaName() => SCHEMANAME;
4949

5050
protected override IEnumerable<string> ReflectFieldsNames()

src/SharpGLTF.Core/Schema2/Generated/ext.Iridescence.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ partial class MaterialIridescence : ExtraProperties
4444

4545
#region reflection
4646

47-
public const string SCHEMANAME = "KHR_materials_iridescence";
47+
public new const string SCHEMANAME = "KHR_materials_iridescence";
4848
protected override string GetSchemaName() => SCHEMANAME;
4949

5050
protected override IEnumerable<string> ReflectFieldsNames()

0 commit comments

Comments
 (0)