TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-27 18:43:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
This commit is contained in:
Azaezel 2018-03-28 15:42:34 -05:00
commit cbce2ee805
154 changed files with 2950 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/shaderGen/GLSL/shaderCompGLSL.cpp
View file

@ -142,7 +142,7 @@ void AppVertConnectorGLSL::sortVars()
void AppVertConnectorGLSL::setName( char *newName )
{
dStrcpy( (char*)mName, newName );
dStrcpy( (char*)mName, newName, 32 );
}
void AppVertConnectorGLSL::reset()
@ -287,7 +287,7 @@ void VertPixelConnectorGLSL::sortVars()
void VertPixelConnectorGLSL::setName( char *newName )
{
dStrcpy( (char*)mName, newName );
dStrcpy( (char*)mName, newName, 32 );
}
void VertPixelConnectorGLSL::reset()

2
Engine/source/shaderGen/HLSL/shaderCompHLSL.cpp
View file

@ -232,7 +232,7 @@ void ShaderConnectorHLSL::sortVars()
void ShaderConnectorHLSL::setName( char *newName )
{
dStrcpy( (char*)mName, newName );
dStrcpy( (char*)mName, newName, 32 );
}
void ShaderConnectorHLSL::reset()

4
Engine/source/shaderGen/langElement.cpp
View file

@ -87,7 +87,7 @@ U32 Var::texUnitCount = 0;
Var::Var()
{
dStrcpy( (char*)type, "float4" );
dStrcpy( (char*)type, "float4", 32 );
structName[0] = '\0';
connectName[0] = '\0';
constSortPos = cspUninit;
@ -209,4 +209,4 @@ void MultiLine::print( Stream &stream )
{
mStatementList[i]->print( stream );
}
}
}

4
Engine/source/shaderGen/shaderGen.cpp
View file

@ -153,8 +153,8 @@ void ShaderGen::generateShader( const MaterialFeatureData &featureData,
dSprintf( vertShaderName, sizeof(vertShaderName), "shadergen:/%s_V.%s", cacheName, mFileEnding.c_str() );
dSprintf( pixShaderName, sizeof(pixShaderName), "shadergen:/%s_P.%s", cacheName, mFileEnding.c_str() );
dStrcpy( vertFile, vertShaderName );
dStrcpy( pixFile, pixShaderName );
dStrcpy( vertFile, vertShaderName, 256 );
dStrcpy( pixFile, pixShaderName, 256 );
// this needs to change - need to optimize down to ps v.1.1
*pixVersion = GFX->getPixelShaderVersion();