Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

SwizzleVectorAttribute no longer generates invalid setters

Browse Source
This commit is contained in:
Simon Lübeß
2022-02-21 17:06:48 +01:00
parent 0db85de067
commit 373980d5ad
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Math/SwizzleVectorAttribute.bf
+23 -10
View File
@@ -21,9 +21,9 @@ namespace GlitchyEngine.Math
} }
/** /**
* Determines whether or not a swizzle operator can have a valid setter (e.g. no component assigned twice) * Returns true if the swizzle operator is invalid (same component assigned twice).
*/ */
static bool invalidSetter(int[4] cmp, int vecSize) static bool IsSetterValid(int[4] cmp, int vecSize)
{ {
return cmp[0] == cmp[1] || (vecSize >= 3 && cmp[0] == cmp[2]) || (vecSize == 4 && cmp[0] == cmp[3]) || return cmp[0] == cmp[1] || (vecSize >= 3 && cmp[0] == cmp[2]) || (vecSize == 4 && cmp[0] == cmp[3]) ||
(vecSize >= 3 && cmp[1] == cmp[2]) || (vecSize == 4 && cmp[1] == cmp[3]) || (vecSize >= 3 && cmp[1] == cmp[2]) || (vecSize == 4 && cmp[1] == cmp[3]) ||
@@ -33,8 +33,7 @@ namespace GlitchyEngine.Math
[Comptime] [Comptime]
public void ApplyToType(Type type) public void ApplyToType(Type type)
{ {
// TODO: report bug... sized array not working String[4] componentNames = .("X", "Y", "Z", "W");
String[] componentNames = scope String[]("X", "Y", "Z", "W");
for(int swizzleCount = 2; swizzleCount <= 4; swizzleCount++) for(int swizzleCount = 2; swizzleCount <= 4; swizzleCount++)
{ {
@@ -52,7 +51,16 @@ namespace GlitchyEngine.Math
String swizzleConstructor = scope String(swizzleCount * 3); String swizzleConstructor = scope String(swizzleCount * 3);
String setter = scope String(128); String setter = scope String(128);
bool setterInvalid = invalidSetter(cmp, swizzleCount); bool setterInvalid = IsSetterValid(cmp, swizzleCount);
if (!setterInvalid)
{
setter.Append(
"""
set mut
{
""");
}
for(int c = 0; c < swizzleCount; c++) for(int c = 0; c < swizzleCount; c++)
{ {
@@ -64,21 +72,26 @@ namespace GlitchyEngine.Math
} }
swizzleConstructor.Append(componentNames[cmp[c]]); swizzleConstructor.Append(componentNames[cmp[c]]);
if(!setterInvalid && c < _vectorSize) // if(!setterInvalid && c < _vectorSize)
{ {
setter.AppendF($"\n\t\t{componentNames[cmp[c]]} = value.{componentNames[c]};"); setter.AppendF($"\n\t\t{componentNames[cmp[c]]} = value.{componentNames[c]};");
} }
} }
//{(setterInvalid ? "[Error(\"Cannot assign multiple values to same component.\")]" : String.Empty)} if (!setterInvalid)
{
setter.Append(
"""
}
""");
}
String swizzleString = scope $""" String swizzleString = scope $"""
public {_vectorTypeName}{swizzleCount} {swizzleName} public {_vectorTypeName}{swizzleCount} {swizzleName}
{{ {{
get => .({swizzleConstructor}); get => .({swizzleConstructor});
set mut {setter}
{{{setter}
}}
}} }}
"""; """;