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

Merge pull request #361 from Areloch/LevelAssetLoadConsistency

Browse source 
Updates some level asset functions and script handling
This commit is contained in:
Brian Roberts 2020-10-17 16:21:01 -05:00 • committed by GitHub
commit 3851612b91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Engine/source/T3D/assets/LevelAsset.cpp
View file

@ -362,22 +362,29 @@ void LevelAsset::unloadDependencies()
} }
DefineEngineMethod(LevelAsset, getLevelPath, const char*, (),, DefineEngineMethod(LevelAsset, getLevelPath, const char*, (),,
"Creates a new script asset using the targetFilePath.\n" "Gets the full path of the asset's defined level file.\n"
"@return The bool result of calling exec") "@return The string result of the level path")
{ {
return object->getLevelPath(); return object->getLevelPath();
} }
DefineEngineMethod(LevelAsset, getPreviewImagePath, const char*, (), ,
"Gets the full path of the asset's defined preview image file.\n"
"@return The string result of the level preview image path")
{
return object->getImagePath();
}
DefineEngineMethod(LevelAsset, getPostFXPresetPath, const char*, (), , DefineEngineMethod(LevelAsset, getPostFXPresetPath, const char*, (), ,
"Creates a new script asset using the targetFilePath.\n" "Gets the full path of the asset's defined postFX preset file.\n"
"@return The bool result of calling exec") "@return The string result of the postFX preset path")
{ {
return object->getPostFXPresetPath(); return object->getPostFXPresetPath();
} }
DefineEngineMethod(LevelAsset, getDecalsPath, const char*, (), , DefineEngineMethod(LevelAsset, getDecalsPath, const char*, (), ,
"Creates a new script asset using the targetFilePath.\n" "Gets the full path of the asset's defined decal file.\n"
"@return The bool result of calling exec") "@return The string result of the decal path")
{ {
return object->getDecalsPath(); return object->getDecalsPath();
} }

34
Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.cs
View file

@ -83,9 +83,9 @@ function ChooseLevelDlg::onWake( %this )
for(%i=0; %i < LevelListEntries.count(); %i++) for(%i=0; %i < LevelListEntries.count(); %i++)
{ {
%levelEntry = LevelListEntries.getKey(%i); %levelAsset = LevelListEntries.getKey(%i);
LevelList.addRow(getField(%levelEntry, 0), "", -1, -30); LevelList.addRow(%levelAsset.LevelName, "", -1, -30);
} }
LevelList.setSelected(0); LevelList.setSelected(0);
@ -140,45 +140,33 @@ function ChooseLevelDlg::addMissionFile( %this, %file )
function ChooseLevelDlg::addLevelAsset( %this, %levelAsset ) function ChooseLevelDlg::addLevelAsset( %this, %levelAsset )
{ {
%file = %levelAsset.getAssetId(); LevelListEntries.add( %levelAsset );
%levelName = %levelAsset.LevelName;
%levelDesc = %levelAsset.description;
%levelPreview = %levelAsset.levelPreviewImage;
LevelListEntries.add( %levelName TAB %file TAB %levelDesc TAB %levelPreview );
} }
function LevelList::onChange(%this) function LevelList::onChange(%this)
{ {
%index = %this.getSelectedRow(); %index = %this.getSelectedRow();
%levelEntry = LevelListEntries.getKey(%index); %levelAsset = LevelListEntries.getKey(%index);
// Get the name // Get the name
ChooseLevelWindow->LevelName.text = getField(%levelEntry, 0); ChooseLevelWindow->LevelName.text = %levelAsset.LevelName;
// Get the level file // Get the level id
$selectedLevelAsset = getField(%levelEntry, 1); $selectedLevelAsset = %levelAsset.getAssetId();
// Find the preview image // Find the preview image
%levelPreview = getField(%levelEntry, 3); %levelPreview = %levelAsset.getPreviewImagePath();
// Test against all of the different image formats // Test against all of the different image formats
// This should probably be moved into an engine function // This should probably be moved into an engine function
if (isFile(%levelPreview @ ".png") || if (isFile(%levelPreview))
isFile(%levelPreview @ ".jpg") || ChooseLevelWindow->CurrentPreview.setBitmap(%levelPreview);
isFile(%levelPreview @ ".bmp") ||
isFile(%levelPreview @ ".gif") ||
isFile(%levelPreview @ ".jng") ||
isFile(%levelPreview @ ".mng") ||
isFile(%levelPreview @ ".tga"))
ChooseLevelWindow->CurrentPreview.setBitmap(%previewFile);
else else
ChooseLevelWindow->CurrentPreview.setBitmap("data/ui/images/no-preview"); ChooseLevelWindow->CurrentPreview.setBitmap("data/ui/images/no-preview");
// Get the description // Get the description
%levelDesc = getField(%levelEntry, 2); %levelDesc = %levelAsset.description;
if(%levelDesc !$= "") if(%levelDesc !$= "")
{ {