TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-27 07:15:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1016 from Azaezel/alpha41/mangledMath

Browse source 
clean up math varsize complaints
This commit is contained in:
Brian Roberts 2023-05-08 21:28:49 -05:00 • committed by GitHub
commit a6f03897ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 73 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/materials/materialDefinition.cpp
View file

@ -661,7 +661,7 @@ void Material::_mapMaterial()
mMapTo = mDiffuseMapName[0];
else
// use everything after the last slash
mMapTo = String(mDiffuseMapName[0]).substr(slashPos + 1, strlen(mDiffuseMapName[0]) - slashPos - 1);
mMapTo = String(mDiffuseMapName[0]).substr(slashPos + 1, (U32)strlen(mDiffuseMapName[0]) - slashPos - 1);
}
else if (!mDiffuseMapAsset->isNull())
{

2
Engine/source/materials/processedShaderMaterial.cpp
View file

@ -230,7 +230,7 @@ bool ProcessedShaderMaterial::init( const FeatureSet &features,
}
if (mMaterial && mMaterial->mDiffuseMapName[0] != StringTable->EmptyString() && String(mMaterial->mDiffuseMapName[0]).startsWith("#"))
{
String texTargetBufferName = String(mMaterial->mDiffuseMapName[0]).substr(1, strlen(mMaterial->mDiffuseMapName[0]) - 1);
String texTargetBufferName = String(mMaterial->mDiffuseMapName[0]).substr(1, (U32)strlen(mMaterial->mDiffuseMapName[0]) - 1);
NamedTexTarget *texTarget = NamedTexTarget::find(texTargetBufferName);
RenderPassData* rpd = getPass(0);