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

Merge https://github.com/TorqueGameEngines/Torque3D into feature-vfs-security

Browse source
This commit is contained in:
Robert MacGregor 2022-06-15 18:12:39 -04:00
commit 2b8f9e3999
6 changed files with 105 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/convexShape.cpp
View file

@ -263,7 +263,7 @@ bool ConvexShape::protectedSetSurfaceTexture(void *object, const char *index, co
surfaceMaterial surface;
surface._setMaterial(data);
surface._setMaterial(StringTable->insert(data));
shape->mSurfaceTextures.push_back(surface);

15
Engine/source/console/arrayObject.cpp
View file

@ -155,8 +155,9 @@ bool ArrayObject::_addKeyFromField( void *object, const char *index, const char
S32 ArrayObject::getIndexFromValue( const String &value ) const
{
S32 currentIndex = mMax(mCurrentIndex, 0);
S32 foundIndex = -1;
for ( S32 i = mCurrentIndex; i < mArray.size(); i++ )
for ( S32 i = currentIndex; i < mArray.size(); i++ )
{
if ( isEqual( mArray[i].value, value ) )
{
@ -167,7 +168,7 @@ S32 ArrayObject::getIndexFromValue( const String &value ) const
if( foundIndex < 0 )
{
for ( S32 i = 0; i < mCurrentIndex; i++ )
for ( S32 i = 0; i < currentIndex; i++ )
{
if ( isEqual( mArray[i].value, value ) )
{
@ -184,8 +185,9 @@ S32 ArrayObject::getIndexFromValue( const String &value ) const
S32 ArrayObject::getIndexFromKey( const String &key ) const
{
S32 currentIndex = mMax(mCurrentIndex, 0);
S32 foundIndex = -1;
for ( S32 i = mCurrentIndex; i < mArray.size(); i++ )
for ( S32 i = currentIndex; i < mArray.size(); i++ )
{
if ( isEqual( mArray[i].key, key ) )
{
@ -196,7 +198,7 @@ S32 ArrayObject::getIndexFromKey( const String &key ) const
if( foundIndex < 0 )
{
for ( S32 i = 0; i < mCurrentIndex; i++ )
for ( S32 i = 0; i < currentIndex; i++ )
{
if ( isEqual( mArray[i].key, key ) )
{
@ -213,8 +215,9 @@ S32 ArrayObject::getIndexFromKey( const String &key ) const
S32 ArrayObject::getIndexFromKeyValue( const String &key, const String &value ) const
{
S32 currentIndex = mMax(mCurrentIndex, 0);
S32 foundIndex = -1;
for ( S32 i = mCurrentIndex; i < mArray.size(); i++ )
for ( S32 i = currentIndex; i < mArray.size(); i++ )
{
if ( isEqual( mArray[i].key, key ) && isEqual( mArray[i].value, value ) )
{
@ -225,7 +228,7 @@ S32 ArrayObject::getIndexFromKeyValue( const String &key, const String &value )
if ( foundIndex < 0 )
{
for ( S32 i = 0; i < mCurrentIndex; i++ )
for ( S32 i = 0; i < currentIndex; i++ )
{
if ( isEqual( mArray[i].key, key ) && isEqual( mArray[i].value, value ) )
{

2
Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp
View file

@ -1075,7 +1075,7 @@ void GuiConvexEditorCtrl::renderScene(const RectI & updateRect)
Point3F boxPos = objBox.getCenter();
objMat.mulP( boxPos );
drawer->drawObjectBox( desc, objBox.getExtents(), boxPos, objMat, ColorI::WHITE );
drawer->drawObjectBox( desc, objBox.getExtents() / 2, boxPos, objMat, ColorI::WHITE );
}
else
{

2
Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
View file

@ -3053,7 +3053,7 @@ void ReflectionProbeFeatGLSL::processPix(Vector<ShaderComponent*>& componentList
}
//Reflection vec
String computeForwardProbes = String(" @.rgb = computeForwardProbes(@,@,@,@,@,@,@,@,@,\r\n\t\t");
String computeForwardProbes = String(" @ = computeForwardProbes(@,@,@,@,@,@,@,@,@,\r\n\t\t");
computeForwardProbes += String("@,@,\r\n\t\t");
computeForwardProbes += String("@,@).rgb; \r\n");