TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

initial port of the new interpreter

Browse source
This commit is contained in:
Jeff Hutchinson 2021-03-30 19:33:19 -04:00
parent 5d2654b1ba
commit 35500a87c6
47 changed files with 3675 additions and 5839 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/shaderGen/GLSL/customFeatureGLSL.cpp
View file

@ -238,7 +238,7 @@ void CustomFeatureGLSL::addVertTexCoord(String name)
mVars.push_back(newVarHolder);
}
void CustomFeatureGLSL::writeLine(String format, S32 argc, ConsoleValueRef * argv)
void CustomFeatureGLSL::writeLine(String format, S32 argc, ConsoleValue * argv)
{
//do the var/arg fetching here
Vector<Var*> varList;
@ -246,7 +246,7 @@ void CustomFeatureGLSL::writeLine(String format, S32 argc, ConsoleValueRef * arg
for (U32 i = 0; i < argc; i++)
{
String varName = argv[i].getStringValue();
String varName = argv[i].getString();
Var* newVar = (Var*)LangElement::find(varName.c_str());
if (!newVar)
{
@ -304,7 +304,7 @@ void CustomFeatureGLSL::writeLine(String format, S32 argc, ConsoleValueRef * arg
if (!newVar)
{
//couldn't find that variable, bail out
Con::errorf("CustomShaderFeature::writeLine: unable to find variable %s, meaning it was not declared before being used!", argv[i].getStringValue());
Con::errorf("CustomShaderFeature::writeLine: unable to find variable %s, meaning it was not declared before being used!", argv[i].getString());
return;
}
}

2
Engine/source/shaderGen/GLSL/customFeatureGLSL.h
View file

@ -128,5 +128,5 @@ public:
void addTexture(String name, String type, String samplerState, U32 arraySize);
void addConnector(String name, String type, String elementName);
void addVertTexCoord(String name);
void writeLine(String format, S32 argc, ConsoleValueRef* argv);
void writeLine(String format, S32 argc, ConsoleValue* argv);
};

6
Engine/source/shaderGen/HLSL/customFeatureHLSL.cpp
View file

@ -385,7 +385,7 @@ void CustomFeatureHLSL::addVertTexCoord(String name)
mVars.push_back(newVarHolder);
}
void CustomFeatureHLSL::writeLine(String format, S32 argc, ConsoleValueRef * argv)
void CustomFeatureHLSL::writeLine(String format, S32 argc, ConsoleValue *argv)
{
//do the var/arg fetching here
Vector<Var*> varList;
@ -393,7 +393,7 @@ void CustomFeatureHLSL::writeLine(String format, S32 argc, ConsoleValueRef * arg
for (U32 i = 0; i < argc; i++)
{
String varName = argv[i].getStringValue();
String varName = argv[i].getString();
Var* newVar = (Var*)LangElement::find(varName.c_str());
if (!newVar)
{
@ -451,7 +451,7 @@ void CustomFeatureHLSL::writeLine(String format, S32 argc, ConsoleValueRef * arg
if (!newVar)
{
//couldn't find that variable, bail out
Con::errorf("CustomShaderFeature::writeLine: unable to find variable %s, meaning it was not declared before being used!", argv[i].getStringValue());
Con::errorf("CustomShaderFeature::writeLine: unable to find variable %s, meaning it was not declared before being used!", argv[i].getString());
return;
}
}

2
Engine/source/shaderGen/HLSL/customFeatureHLSL.h
View file

@ -128,5 +128,5 @@ public:
void addTexture(String name, String type, String samplerState, U32 arraySize);
void addConnector(String name, String type, String elementName);
void addVertTexCoord(String name);
void writeLine(String format, S32 argc, ConsoleValueRef* argv);
void writeLine(String format, S32 argc, ConsoleValue* argv);
};

2
Engine/source/shaderGen/customShaderFeature.cpp
View file

@ -189,7 +189,7 @@ bool CustomShaderFeatureData::hasFeature(String name)
return false;
}
void CustomShaderFeatureData::writeLine(String format, S32 argc, ConsoleValueRef* argv)
void CustomShaderFeatureData::writeLine(String format, S32 argc, ConsoleValue* argv)
{
#ifdef TORQUE_D3D11
if (GFX->getAdapterType() == GFXAdapterType::Direct3D11)

2
Engine/source/shaderGen/customShaderFeature.h
View file

@ -77,7 +77,7 @@ public:
void addVertTexCoord(String name);
bool hasFeature(String name);
void writeLine(String format, S32 argc, ConsoleValueRef *argv);
void writeLine(String format, S32 argc, ConsoleValue *argv);
};
#endif