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

Added shapeFile field to TSForestItemData convert setting

Browse source 
Fixed modulePath not setting in some cases for project importer
Fixed not assigning drop and splash textures in precipitation
Fixed stringtable insert for sfxProfile
This commit is contained in:
Areloch 2021-07-28 12:01:17 -05:00
parent abf5a09bc3
commit 52c83d19e1
4 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/fx/precipitation.cpp
View file

@ -629,6 +629,8 @@ void Precipitation::initMaterials()
if(pd->mDrop.isNull())
Con::warnf("Precipitation::initMaterials - failed to locate texture '%s'!", pd->getDrop());
else
mDropHandle = pd->mDrop;
if ( dStrlen(pd->mDropShaderName) > 0 )
{
@ -650,6 +652,8 @@ void Precipitation::initMaterials()
if (pd->mSplash.isNull())
Con::warnf("Precipitation::initMaterials - failed to locate texture '%s'!", pd->getSplash());
else
mSplashHandle = pd->mSplash;
if ( dStrlen(pd->mSplashShaderName) > 0 )
{

2
Engine/source/sfx/sfxProfile.cpp
View file

@ -90,7 +90,7 @@ SFXProfile::SFXProfile()
SFXProfile::SFXProfile( SFXDescription* desc, const String& filename, bool preload )
: Parent( desc ),
mFilename( filename ),
mFilename( StringTable->insert(filename.c_str()) ),
mPreload( preload )
{
}

16
Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript
View file

@ -205,11 +205,6 @@ function T3Dpre4ProjectImporter::beginMaterialFilesImport(%this)
%currentPage-->processingText.setText("Processing material script file: " @ %file);
Canvas.repaint();
if(%file $= "data/FPSGameplay/art/terrains/materials.tscript")
{
%agafdgadfgsdfg = true;
}
if ( $ProjectImporter::fileObject.openForRead( %file ) )
{
echo("Legacy Project Importer - Beginning process of file: " @ %file);
@ -426,6 +421,9 @@ function T3Dpre4ProjectImporter::beginCodeFilesImport(%this)
if(strIsMatchExpr("*new*(*)*", %line))
{
%className = findObjectClass(%line, "new");
%objectClassStack.push_back(%className);
%objectName = findObjectName(%line, "new");
if(%objectName !$= "")
@ -482,6 +480,9 @@ function T3Dpre4ProjectImporter::beginCodeFilesImport(%this)
else if(strIsMatchExpr("*singleton*(*)*", %line))
{
%className = findObjectClass(%line, "singleton");
%objectClassStack.push_back(%className);
%objectName = findObjectName(%line, "singleton");
if(%objectName !$= "")
@ -507,6 +508,9 @@ function T3Dpre4ProjectImporter::beginCodeFilesImport(%this)
else if(strIsMatchExpr("*datablock*(*)*", %line))
{
%className = findObjectClass(%line, "datablock");
%objectClassStack.push_back(%className);
%objectName = findObjectName(%line, "datablock");
if(%objectName !$= "")
@ -721,7 +725,7 @@ T3Dpre4ProjectImporter::genProcessor("GroundCover", "material materialAsset shap
T3Dpre4ProjectImporter::genProcessor("GroundPlane", "material materialAsset");
T3Dpre4ProjectImporter::genProcessor("LevelInfo", "accuTexture accuTextureAsset");
T3Dpre4ProjectImporter::genProcessor("TSStatic", "shape shapeAsset shapeName shapeAsset");
T3Dpre4ProjectImporter::genProcessor("TSForestItemData", "shape shapeAsset shapeName shapeAsset");
T3Dpre4ProjectImporter::genProcessor("TSForestItemData", "shape shapeAsset shapeName shapeAsset shapeFile shapeAsset");
//==============================================================================
// Levels
//==============================================================================

3
Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript
View file

@ -246,8 +246,11 @@ function ProjectImportWizardPage4::openPage(%this)
ProjectImportWindow-->backButton.setHidden(true);
ProjectImportWindow-->nextButton.setActive(false);
if(!$ProjectImporter::useExistingModule)
$ProjectImporter::moduleName = ProjectImportWizardPage3-->newModuleName.getText();
$ProjectImporter::modulePath = "data/" @ $ProjectImporter::moduleName;
if(!$ProjectImporter::useExistingModule)
$ProjectImporter::importTool.setupModule();