TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
parent bd3a990140 2a52d7db1e
commit 2b8f9e3999
6 changed files with 105 additions and 25 deletions
Show stats 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");

20
Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript
View file

@ -38,7 +38,7 @@ function ConvexEditorGui::onWake( %this )
%mat = %matName;
}
ConvexEditorOptionsWindow-->matPreviewBtn.setBitmap( getAssetPreviewImage(%mat.getDiffuseMap(0)));
ConvexEditorOptionsWindow-->matPreviewBtn.bitmapAsset = getAssetPreviewImage(%mat.getDiffuseMap(0));
ConvexEditorOptionsWindow.activeMaterial = %mat;
}
@ -78,7 +78,7 @@ function ConvexEditorGui::onSelectionChanged( %this, %shape, %face )
ConvexEditorOptionsWindow-->defMatPreviewBtn.setText("");
%shapeMat = %shape.getMaterial();
ConvexEditorOptionsWindow-->defMatPreviewBtn.setBitmap(getAssetPreviewImage(%shapeMat.getDiffuseMap(0)));
ConvexEditorOptionsWindow-->defMatPreviewBtn.bitmapAsset = getAssetPreviewImage(%shapeMat.getDiffuseMap(0));
ConvexEditorOptionsWindow.activeShape = %shape;
@ -166,18 +166,8 @@ function ConvexEditorMaterialBtn::gotMaterialName(%this, %name)
//eval(%this.object @ "." @ %this.targetField @ " = " @ %name @ ";");
//%this.object.changeMaterial(getTrailingNumber(%this.targetField), %name);
//%this.object.inspectorApply();
%diffusemap = %materialAsset.materialDefinitionName.getDiffuseMap(0);
if(%diffusemap $= "")
{
%diffuseAsset = %materialAsset.materialDefinitionName.getDiffuseMapAsset(0);
if(%diffuseAsset !$= "")
{
%diffuseAssetDef = AssetDatabase.acquireAsset(%diffuseAsset);
%diffusemap = %diffuseAssetDef.getImagePath();
}
}
ConvexEditorOptionsWindow-->matPreviewBtn.setBitmap(getAssetPreviewImage(%diffusemap));
%diffusemap = %materialAsset.materialDefinitionName.getDiffuseMapAsset(0);
ConvexEditorOptionsWindow-->matPreviewBtn.bitmapAsset = getAssetPreviewImage(%diffusemap);
ConvexEditorOptionsWindow.activeMaterial = %materialAsset.getAssetId();
}
@ -242,7 +232,7 @@ function ConvexEditorDefaultMaterialBtn::gotMaterialName(%this, %name)
}
}
ConvexEditorOptionsWindow-->defMatPreviewBtn.setBitmap(getAssetPreviewImage(%diffusemap));
ConvexEditorOptionsWindow-->defMatPreviewBtn.bitmapAsset = getAssetPreviewImage(%diffusemap);
ConvexEditorOptionsWindow.activeShape.setMaterial(%name);

89
Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui
View file

@ -23,7 +23,7 @@ $guiContnt = new GuiControl(ConvexEditorOptions)
anchorRight = "0";
Position = Canvas.extent.x - 209
SPC getWord(EditorGuiToolbar.extent, 1) - 2;
Extent = "210 485";
Extent = "210 550";
minExtent = "210 298";
horizSizing = "windowRelative";
vertSizing = "windowRelative";
@ -745,6 +745,93 @@ $guiContnt = new GuiControl(ConvexEditorOptions)
};
};
};
new GuiContainer() {
docking = "Top";
margin = "0 0 3 3";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "4 502";
extent = "1432 50";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "bottom";
profile = "inspectorStyleRolloutDarkProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiTextCtrl() {
text = "Brush Actions";
maxLength = "1024";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "5 0";
extent = "121 18";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiButtonCtrl() {
text = "Hollow Selected";
groupNum = "-1";
buttonType = "PushButton";
position = "5 22";
extent = "90 21";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
command = "ConvexEditorGui.hollowSelection();";
};
new GuiButtonCtrl() {
text = "Recenter Selected";
groupNum = "-1";
buttonType = "PushButton";
position = "100 22";
extent = "110 21";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
command = "ConvexEditorGui.recenterSelection();";
};
};
};
};
//--- OBJECT WRITE END ---