Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 70 additions & 7 deletions Game.Client/FunctionProxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ public bool Init(IMaterial material, KeyValues keyValues, ReadOnlySpan<char> key
}

// Look for array specification...
Span<char> pTemp = stackalloc char[256];
// TODO ^^^^^^^^^^^^^^^
FloatVecComp = -1;
int bracket = varName.IndexOf('[');
if (bracket >= 0) {
FloatVecComp = ParseVecComp(varName[(bracket + 1)..]);
varName = varName[..bracket];
}
else
FloatVecComp = -1;

bool foundVar;
FloatVar = material.FindVar(varName, out foundVar, true);
Expand All @@ -45,6 +49,15 @@ public bool Init(IMaterial material, KeyValues keyValues, ReadOnlySpan<char> key
return true;
}

public static int ParseVecComp(ReadOnlySpan<char> str) {
int end = 0;
if (end < str.Length && (str[end] == '-' || str[end] == '+'))
end++;
while (end < str.Length && char.IsAsciiDigit(str[end]))
end++;
return int.TryParse(str[..end], out int value) ? value : 0;
}

public float GetFloat(){
if (FloatVar == null)
return Value;
Expand Down Expand Up @@ -73,10 +86,10 @@ public virtual bool Init(IMaterial material, KeyValues keyValues) {
if (result.IsEmpty)
return false;

Span<char> temp = stackalloc char[256];
if (result.Contains('[')) {
// todo
ResultVecComp = -1;
int bracket = result.IndexOf('[');
if (bracket >= 0) {
ResultVecComp = FloatInput.ParseVecComp(result[(bracket + 1)..]);
result = result[..bracket];
}
else
ResultVecComp = -1;
Expand Down Expand Up @@ -115,3 +128,53 @@ protected void SetFloatResult(float result) {
protected IMaterialVar? Result;
protected int ResultVecComp;
}

public abstract class FunctionProxy : ResultProxy
{
public override bool Init(IMaterial material, KeyValues keyValues) {
if (!base.Init(material, keyValues))
return false;

ReadOnlySpan<char> srcVar1 = keyValues.GetString("srcVar1");
if (srcVar1.IsEmpty)
return false;

bool foundVar;
Src1 = material.FindVar(srcVar1, out foundVar, true);
if (!foundVar)
return false;

ReadOnlySpan<char> srcVar2 = keyValues.GetString("srcVar2");
if (!srcVar2.IsEmpty) {
Src2 = material.FindVar(srcVar2, out foundVar, true);
if (!foundVar)
return false;
}
else
Src2 = null;

return true;
}

protected void ComputeResultType(out MaterialVarType resultType, ref int vecSize) {
resultType = Result!.GetVarType();
if (resultType == MaterialVarType.Vector) {
if (ResultVecComp >= 0)
resultType = MaterialVarType.Float;
vecSize = Result.VectorSize();
}
else if (resultType == MaterialVarType.Undefined) {
resultType = Src1!.GetVarType();
if (resultType == MaterialVarType.Vector)
vecSize = Src1.VectorSize();
else if ((resultType == MaterialVarType.Undefined) && Src2 != null) {
resultType = Src2.GetVarType();
if (resultType == MaterialVarType.Vector)
vecSize = Src2.VectorSize();
}
}
}

protected IMaterialVar? Src1;
protected IMaterialVar? Src2;
}
2 changes: 2 additions & 0 deletions Game.Client/HLClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ public bool DispatchUserMessage(int msgType, bf_read msgData) {
}

public bool Init() {
randomgaussian.AttachToStream(random);

#if GMOD_DLL
get.IntroScreen()!.Start();
get.IntroScreen()!.Update("Start", true);
Expand Down
Loading
Loading