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

Merge pull request #781 from Areloch/MiscFixes20220510

Browse source 
Misc Fixes for 2022/05/10
This commit is contained in:
Brian Roberts 2022-05-11 01:15:07 -05:00 • committed by GitHub
commit 516163fd5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 59 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript
View file

@ -687,7 +687,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem )
$pref::PostFX::EnableVignette = false; $pref::PostFX::EnableVignette = false;
$pref::Video::AA = 0; $pref::Video::AA = 0;
$pref::Video::disableVerticalSync = 0; $pref::Video::defaultAnisotropy = 0;
} }
else else
{ {
@ -713,7 +713,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem )
$pref::PostFX::EnableVignette = false; $pref::PostFX::EnableVignette = false;
$pref::Video::AA = 0; $pref::Video::AA = 0;
$pref::Video::disableVerticalSync = 0; $pref::Video::defaultAnisotropy = 0;
} }
} }
else else
@ -743,7 +743,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem )
$pref::PostFX::EnableVignette = true; $pref::PostFX::EnableVignette = true;
$pref::Video::AA = 4; $pref::Video::AA = 4;
$pref::Video::disableVerticalSync = 16; $pref::Video::defaultAnisotropy = 16;
} }
else if ( %videoMem > 400 || %videoMem == 0 ) else if ( %videoMem > 400 || %videoMem == 0 )
{ {
@ -769,7 +769,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem )
$pref::PostFX::EnableVignette = true; $pref::PostFX::EnableVignette = true;
$pref::Video::AA = 4; $pref::Video::AA = 4;
$pref::Video::disableVerticalSync = 4; $pref::Video::defaultAnisotropy = 4;
if ( %videoMem == 0 ) if ( %videoMem == 0 )
echo("Torque was unable to detect available video memory. Applying 'Medium' quality."); echo("Torque was unable to detect available video memory. Applying 'Medium' quality.");
@ -798,7 +798,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem )
$pref::PostFX::EnableVignette = false; $pref::PostFX::EnableVignette = false;
$pref::Video::AA = 0; $pref::Video::AA = 0;
$pref::Video::disableVerticalSync = 0; $pref::Video::defaultAnisotropy = 0;
} }
} }

7
Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
View file

@ -334,6 +334,13 @@ function OptionsMenu::refresh(%this)
%command = %this.optionsCategories.getValue(%this.currentCategory); %command = %this.optionsCategories.getValue(%this.currentCategory);
eval(%command); eval(%command);
} }
//now, because we reconstruct the displayed set, we'll force the mouse(if we're using it as our input)
//to be poked so we can re-track to whatever control, if any, we're over
if($activeControllerType !$= "gamepad")
{
Canvas.setCursorPos(Canvas.getCursorPos());
}
} }
function OptionsMenu::getOptionVariableValue(%this, %variableName) function OptionsMenu::getOptionVariableValue(%this, %variableName)

2
Templates/BaseGame/game/data/UI/scripts/profiles.tscript
View file

@ -348,7 +348,7 @@ new GuiControlProfile( GuiPopupMenuItemBorder : GuiButtonProfile )
fixedExtent = false; fixedExtent = false;
justify = "center"; justify = "center";
canKeyFocus = false; canKeyFocus = false;
bitmap = "data/ui/images/button"; bitmapAsset = "UI:menubutton_image";
category = "Core"; category = "Core";
}; };

123
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
View file

@ -671,10 +671,17 @@ function AssetBrowser::loadDirectories( %this )
if(%this.selectMode) if(%this.selectMode)
{ {
//Due to a fluke in how this tracks, it overrides the current addres, so we'll
//store it real fast
%curAdd = AssetBrowser.dirHandler.currentAddress;
//Disable these for this go
AssetBrowser-->filterTree.addSelection(AssetBrowser-->filterTree.collectionsIdx); AssetBrowser-->filterTree.addSelection(AssetBrowser-->filterTree.collectionsIdx);
AssetBrowser-->filterTree.addSelection(AssetBrowser-->filterTree.creatorIdx); AssetBrowser-->filterTree.addSelection(AssetBrowser-->filterTree.creatorIdx);
AssetBrowser-->filterTree.hideSelection(); AssetBrowser-->filterTree.hideSelection();
AssetBrowser-->filterTree.clearSelection();
AssetBrowser.dirHandler.currentAddress = %curAdd;
} }
%this.dirHandler.loadFolders("data", %dataItem); %this.dirHandler.loadFolders("data", %dataItem);
@ -700,49 +707,6 @@ function AssetBrowser::loadDirectories( %this )
%this.dirHandler.loadFolders("tools", %toolsItem); %this.dirHandler.loadFolders("tools", %toolsItem);
} }
//Add Non-Asset Scripted Objects. Datablock, etc based
/*%category = getWord( %breadcrumbPath, 1 );
%dataGroup = "DataBlockGroup";
if(%dataGroup.getCount() != 0)
{
%scriptedItem = AssetBrowser-->filterTree.insertItem(1, "Scripted");
for ( %i = 0; %i < %dataGroup.getCount(); %i++ )
{
%obj = %dataGroup.getObject(%i);
// echo ("Obj: " @ %obj.getName() @ " - " @ %obj.category );
//if ( %obj.category $= "" && %obj.category == 0 )
// continue;
%dbFilename = %obj.getFileName();
%dbFilePath = filePath(%dbFilename);
if(%breadcrumbPath $= %dbFilePath)
{
//if ( %breadcrumbPath $= "" )
//{
%catItem = AssetBrowser-->filterTree.findItemByName(%obj.category);
if(%catItem == 0)
AssetBrowser-->filterTree.insertItem(%scriptedItem, %obj.category, "scripted");
/*%ctrl = %this.findIconCtrl( %obj.category );
if ( %ctrl == -1 )
{
%this.addFolderIcon( %obj.category );
}*/
//}
/*else if ( %breadcrumbPath $= %obj.category )
{
AssetBrowser-->filterTree.insertItem(%scriptedItem, %obj.getName());
}*/
//}
//}
// }
AssetBrowser-->filterTree.buildVisibleTree(true); AssetBrowser-->filterTree.buildVisibleTree(true);
//Remove any modules that have no assets if we have that filter on //Remove any modules that have no assets if we have that filter on
@ -769,9 +733,6 @@ function AssetBrowser::loadDirectories( %this )
AssetBrowser.newModuleId = ""; AssetBrowser.newModuleId = "";
} }
//%dataItem = AssetBrowser-->filterTree.findItemByName("data");
//AssetBrowser-->filterTree.expandItem(%dataItem);
AssetBrowser.dirHandler.expandTreeToAddress(AssetBrowser.dirHandler.currentAddress); AssetBrowser.dirHandler.expandTreeToAddress(AssetBrowser.dirHandler.currentAddress);
%selectedItem = AssetBrowser.dirHandler.getFolderTreeItemFromAddress(AssetBrowser.dirHandler.currentAddress); %selectedItem = AssetBrowser.dirHandler.getFolderTreeItemFromAddress(AssetBrowser.dirHandler.currentAddress);
@ -1476,6 +1437,40 @@ function AssetBrowser::doRebuildAssetArray(%this)
%finalAssetCount = 0; %finalAssetCount = 0;
//Add folders
if(EditorSettings.value("Assets/Browser/showFolders", true) == true)
{
%folders = getDirectoryList(%breadcrumbPath);
for(%f=0; %f < getFieldCount(%folders); %f++)
{
%folderName = getField(%folders, %f);
%searchActive = AssetSearchTerms.count() != 0;
if(%searchActive)
{
if(matchesSearch(%folderName, "Folder", ""))
{
$AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName );
continue;
}
}
else
{
//got it.
if(%folderName $= "shaderCache" || %folderName $= "cache" || %folderName $= ".git")
continue;
if(!%this.coreModulesFilter && %folderName $= "core" && %breadcrumbPath $= "")
continue;
if(!%this.toolsModulesFilter && %folderName $= "tools" && %breadcrumbPath $= "")
continue;
$AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName );
}
}
}
//now, we'll iterate through, and find the assets that are in this module, and this category //now, we'll iterate through, and find the assets that are in this module, and this category
for( %i=0; %i < %numAssetsFound; %i++) for( %i=0; %i < %numAssetsFound; %i++)
{ {
@ -1545,40 +1540,6 @@ function AssetBrowser::doRebuildAssetArray(%this)
} }
} }
//Add folders
if(EditorSettings.value("Assets/Browser/showFolders", true) == true)
{
%folders = getDirectoryList(%breadcrumbPath);
for(%f=0; %f < getFieldCount(%folders); %f++)
{
%folderName = getField(%folders, %f);
%searchActive = AssetSearchTerms.count() != 0;
if(%searchActive)
{
if(matchesSearch(%folderName, "Folder", ""))
{
$AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName );
continue;
}
}
else
{
//got it.
if(%folderName $= "shaderCache" || %folderName $= "cache" || %folderName $= ".git")
continue;
if(!%this.coreModulesFilter && %folderName $= "core" && %breadcrumbPath $= "")
continue;
if(!%this.toolsModulesFilter && %folderName $= "tools" && %breadcrumbPath $= "")
continue;
$AssetBrowser::AssetArray.add( %breadcrumbPath, "Folder" TAB %folderName );
}
}
}
//Add Non-Asset Scripted Objects. Datablock, etc based //Add Non-Asset Scripted Objects. Datablock, etc based
%hasDBFilter = true; %hasDBFilter = true;
if(AssetBrowser.assetTypeFilter !$= "") if(AssetBrowser.assetTypeFilter !$= "")

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript
View file

@ -530,7 +530,7 @@ function AssetBrowser::generateMaterialAssetPreviewImage(%this, %previewButton,
} }
} }
%previewButton.bitmapAsset = %previewAssetName; %previewButton.bitmapAsset = "ToolsModule:" @ %previewAssetName;
return true; return true;
} }
} }

6
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript
View file

@ -361,13 +361,9 @@ function AssetBrowser::generateShapeAssetPreviewImage(%this, %previewButton, %fo
{ {
return false; //failed to register the preview image for some reason? return false; //failed to register the preview image for some reason?
} }
}
else
{
%previewAssetName = "ToolsModule:" @ %previewAssetName;
} }
%previewButton.bitmapAsset = %previewAssetName; %previewButton.bitmapAsset = "ToolsModule:" @ %previewAssetName;
return true; return true;
} }
else else

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.tscript
View file

@ -201,7 +201,7 @@ function AssetBrowser::generateTerrainMaterialAssetPreviewImage(%this, %previewB
} }
} }
%previewButton.bitmapAsset = %previewAssetName; %previewButton.bitmapAsset = "ToolsModule:" @ %previewAssetName;
return true; return true;
} }
} }

32
Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript
View file

@ -92,38 +92,6 @@ function directoryHandler::navigateTo(%this, %address, %historyNav, %selectionNa
//break down the address //break down the address
%folderCount = getTokenCount(%address, "/"); %folderCount = getTokenCount(%address, "/");
/*%rebuiltPath = "";
for(%f=0; %f < %folderCount; %f++)
{
%folderName = getToken(%address, "/", %f);
%rebuiltPath = %f == 0 ? %folderName : %rebuiltPath @ "/" @ %folderName;
%folderNavButton = new GuiButtonCtrl()
{
profile = ToolsGuiButtonProfile;
text = %folderName;
command = "AssetBrowser.navigateTo(\"" @ %rebuiltPath @ "\");";
extent = "100" SPC AssetBrowser_BreadcrumbBar.extent.y;
};
AssetBrowser_BreadcrumbBar.add(%folderNavButton);
if(%f != %folderCount-1)
{
%folderSpacerButton = new GuiBitmapButtonCtrl()
{
profile = ToolsGuiButtonProfile;
bitmapAsset = "ToolsModule:rightArrowWhite_image";
bitmapMode = "Centered";
extent = "25" SPC AssetBrowser_BreadcrumbBar.extent.y;
//command = "AssetBrowser.navigateTo(\"" @ %rebuiltPath @ "\");";
};
AssetBrowser_BreadcrumbBar.add(%folderSpacerButton);
}
}*/
//find our folder tree and action on it tree //find our folder tree and action on it tree
%folderId = %this.getFolderTreeItemFromAddress(%address); %folderId = %this.getFolderTreeItemFromAddress(%address);

2
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript
View file

@ -81,7 +81,7 @@ function GuiEditCanvas::onCreateMenu(%this)
internalName = "FileMenu"; internalName = "FileMenu";
item[0] = "New Gui..." TAB %cmdCtrl SPC "N" TAB %this @ ".create();"; item[0] = "New Gui..." TAB %cmdCtrl SPC "N" TAB %this @ ".create();";
item[1] = "Open..." TAB %cmdCtrl SPC "O" TAB %this @ ".open();"; item[1] = "Open GUI File..." TAB %cmdCtrl SPC "O" TAB %this @ ".open();";
item[2] = "Save" TAB %cmdCtrl SPC "S" TAB %this @ ".save( false, true );"; item[2] = "Save" TAB %cmdCtrl SPC "S" TAB %this @ ".save( false, true );";
item[3] = "Save As..." TAB %cmdCtrl @ "-Shift S" TAB %this @ ".save( false );"; item[3] = "Save As..." TAB %cmdCtrl @ "-Shift S" TAB %this @ ".save( false );";
item[4] = "Save Selected As..." TAB %cmdCtrl @ "-Alt S" TAB %this @ ".save( true );"; item[4] = "Save Selected As..." TAB %cmdCtrl @ "-Alt S" TAB %this @ ".save( true );";