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
Torque3D/Engine/source/T3D/assets/MaterialAsset.cpp

670 lines
21 KiB
C++
Raw Normal View History

Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
//-----------------------------------------------------------------------------
// Copyright (c) 2013 GarageGames, LLC
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#ifndef MATERIALASSET_H
#include "MaterialAsset.h"
#endif
#ifndef _ASSET_MANAGER_H_
#include "assets/assetManager.h"
#endif
#ifndef _CONSOLETYPES_H_
#include "console/consoleTypes.h"
#endif
#ifndef _TAML_
#include "persistence/taml/taml.h"
#endif
#ifndef _ASSET_PTR_H_
#include "assets/assetPtr.h"
#endif
Fixes some minor errors on MacOS regarding compiling in clang
2021-01-15 00:00:56 +00:00
#include "T3D/assets/assetImporter.h"
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
MacOS fixes This fixes an issue where Con::getVariable can't be used in the global scope before the console system is initialized. I'm honestly surprised this error didn't happen on any other platform.
2021-08-22 00:48:26 +00:00
StringTableEntry MaterialAsset::smNoMaterialAssetFallback = NULL;
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
//-----------------------------------------------------------------------------
IMPLEMENT_CONOBJECT(MaterialAsset);
ConsoleType(MaterialAssetPtr, TypeMaterialAssetPtr, MaterialAsset, ASSET_ID_FIELD_PREFIX)
//-----------------------------------------------------------------------------
ConsoleGetType(TypeMaterialAssetPtr)
{
// Fetch asset Id.
return (*((AssetPtr<MaterialAsset>*)dptr)).getAssetId();
}
//-----------------------------------------------------------------------------
ConsoleSetType(TypeMaterialAssetPtr)
{
// Was a single argument specified?
if (argc == 1)
{
// Yes, so fetch field value.
const char* pFieldValue = argv[0];
// Fetch asset pointer.
AssetPtr<MaterialAsset>* pAssetPtr = dynamic_cast<AssetPtr<MaterialAsset>*>((AssetPtrBase*)(dptr));
// Is the asset pointer the correct type?
if (pAssetPtr == NULL)
{
// No, so fail.
//Con::warnf("(TypeMaterialAssetPtr) - Failed to set asset Id '%d'.", pFieldValue);
return;
}
// Set asset.
pAssetPtr->setAssetId(pFieldValue);
return;
}
// Warn.
Con::warnf("(TypeMaterialAssetPtr) - Cannot set multiple args to a single asset.");
}
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
ConsoleType(assetIdString, TypeMaterialAssetId, const char*, ASSET_ID_FIELD_PREFIX)
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
ConsoleGetType(TypeMaterialAssetId)
{
// Fetch asset Id.
return *((const char**)(dptr));
}
ConsoleSetType(TypeMaterialAssetId)
{
// Was a single argument specified?
if (argc == 1)
{
// Yes, so fetch field value.
const char* pFieldValue = argv[0];
// Fetch asset Id.
StringTableEntry* assetId = (StringTableEntry*)(dptr);
// Update asset value.
*assetId = StringTable->insert(pFieldValue);
return;
}
// Warn.
Con::warnf("(TypeMaterialAssetId) - Cannot set multiple args to a single asset.");
}
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
//-----------------------------------------------------------------------------
MaterialAsset::MaterialAsset()
{
mShaderGraphFile = "";
Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development
2019-05-06 06:49:58 +00:00
mScriptFile = StringTable->EmptyString();
Updates the rest of the asset types to utilize separate expanded path variables to avoid breaking assetDef saving Fixes select mode for the Asset Browser to properly filter to the selecting type Fixes the imageType in the asset import window inspector to properly set to the importing image asset's discovered type if valid Fixes AssetBrowser asset selection return so it returns back a valid assetId Fixes TerrainMaterial save crash by ensuring we fill in the diffuseMapAsset Removes saving of TerrainMaterial being saved to a generic script file if one isn't found for an existing TerrainMaterialAssets
2020-08-09 06:32:27 +00:00
mScriptPath = StringTable->EmptyString();
Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development
2019-05-06 06:49:58 +00:00
mMatDefinitionName = StringTable->EmptyString();
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
mMaterialDefinition = nullptr;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
}
//-----------------------------------------------------------------------------
MaterialAsset::~MaterialAsset()
{
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
//SAFE_DELETE(mMaterialDefinition);
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
}
//-----------------------------------------------------------------------------
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
void MaterialAsset::consoleInit()
{
Parent::consoleInit();
Con::addVariable("$Core::NoMaterialAssetFallback", TypeString, &smNoMaterialAssetFallback,
"The assetId of the material to display when the requested material asset is missing.\n"
"@ingroup GFX\n");
MacOS fixes This fixes an issue where Con::getVariable can't be used in the global scope before the console system is initialized. I'm honestly surprised this error didn't happen on any other platform.
2021-08-22 00:48:26 +00:00
smNoMaterialAssetFallback = StringTable->insert(Con::getVariable("$Core::NoMaterialAssetFallback"));
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
}
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
void MaterialAsset::initPersistFields()
{
// Call parent.
Parent::initPersistFields();
//addField("shaderGraph", TypeRealString, Offset(mShaderGraphFile, MaterialAsset), "");
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file Also updates importers to correctly handle this change Adds ability for taml XML serialization to properly assign array'd fields Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 17:50:16 +00:00
//addProtectedField("scriptFile", TypeAssetLooseFilePath, Offset(mScriptFile, MaterialAsset),
// &setScriptFile, &getScriptFile, "Path to the file containing the material definition.");
addField("scriptFile", TypeAssetLooseFilePath, Offset(mScriptFile, MaterialAsset), "");
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development
2019-05-06 06:49:58 +00:00
addField("materialDefinitionName", TypeString, Offset(mMatDefinitionName, MaterialAsset), "Name of the material definition this asset is for.");
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
}
void MaterialAsset::initializeAsset()
{
// Call parent.
Parent::initializeAsset();
Updates the rest of the asset types to utilize separate expanded path variables to avoid breaking assetDef saving Fixes select mode for the Asset Browser to properly filter to the selecting type Fixes the imageType in the asset import window inspector to properly set to the importing image asset's discovered type if valid Fixes AssetBrowser asset selection return so it returns back a valid assetId Fixes TerrainMaterial save crash by ensuring we fill in the diffuseMapAsset Removes saving of TerrainMaterial being saved to a generic script file if one isn't found for an existing TerrainMaterialAssets
2020-08-09 06:32:27 +00:00
mScriptPath = getOwned() ? expandAssetFilePath(mScriptFile) : mScriptPath;
Adds test shapes of Kork and SpaceOrc Sidestep of memleak from CSF at the moment Minor fixes and corrections with asset importing and loose files WIP of updated options menu
2019-05-28 22:24:29 +00:00
Tweaks the MaterialAsset loading logic to continue to see if the matDefinition already points to an existing object(to avoid needlessly re-executing files over and over), but also validate other cases, and ensures that if we DO have an existing definition, we still process and load it in the asset itself properly.
2021-10-09 05:07:01 +00:00
if (mMatDefinitionName == StringTable->EmptyString())
{
mLoadedState = Failed;
return;
}
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file Also updates importers to correctly handle this change Adds ability for taml XML serialization to properly assign array'd fields Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 17:50:16 +00:00
if (size() != 0 && mScriptPath == StringTable->EmptyString())
{
mLoadedState = EmbeddedDefinition;
}
else if (Torque::FS::IsScriptFile(mScriptPath))
Adds load status to MaterialAsset for if the Script file itself has been loaded, but the material itself hasn't yet been processed. Fixed String -> StringTableEntry conversion in prefab file to correct corruption when setting the filename Cleaned up message spam from the MaterialSlot fields on TSStatics Added getter/setters for terrain file and assets Removed unneeded exec of tools profiles for MainMenuGUI Add logic to remove creators section of AB if in select mode Fixed misc. messageBox invokes that were erroneously converted to 'toolsMessageBox' Fix classname for NotesObject in AB Creator Entry Fix issue where ConvexShapeEditor toolbar would hide after being seen once Changed keybind for quick AB access from 'space' to 'shift space' to avoid input issues when typing in fields in some cases Fixed default image assignments for River objects on foam/ripple/depth Added handling for Material, Sound and Shape asset fields in Object Builder, and updated various objectBuilder class entries to utilize them now. Updated various fields' defaults for ObjectBuilder to utilize correct assetId's Fixed editor SceneTree tooltips for TSShape and GroundCovert to correctly reference assets as needed Added logic to properly check terrain asset validity when prompting to save changes, which would break saving actions before Added menubar items in the Object category to take control and release control of control objects quickly for testing
2021-09-19 06:01:47 +00:00
{
if (!Sim::findObject(mMatDefinitionName))
* BugFix: Clear a lot of warnings and correct a few actual programming errors along the way.
2021-10-05 00:04:21 +00:00
{
if (Con::executeFile(mScriptPath, false, false))
{
mLoadedState = ScriptLoaded;
}
else
{
mLoadedState = Failed;
}
}
Tweaks the MaterialAsset loading logic to continue to see if the matDefinition already points to an existing object(to avoid needlessly re-executing files over and over), but also validate other cases, and ensures that if we DO have an existing definition, we still process and load it in the asset itself properly.
2021-10-09 05:07:01 +00:00
else
{
mLoadedState = DefinitionAlreadyExists;
}
Adds load status to MaterialAsset for if the Script file itself has been loaded, but the material itself hasn't yet been processed. Fixed String -> StringTableEntry conversion in prefab file to correct corruption when setting the filename Cleaned up message spam from the MaterialSlot fields on TSStatics Added getter/setters for terrain file and assets Removed unneeded exec of tools profiles for MainMenuGUI Add logic to remove creators section of AB if in select mode Fixed misc. messageBox invokes that were erroneously converted to 'toolsMessageBox' Fix classname for NotesObject in AB Creator Entry Fix issue where ConvexShapeEditor toolbar would hide after being seen once Changed keybind for quick AB access from 'space' to 'shift space' to avoid input issues when typing in fields in some cases Fixed default image assignments for River objects on foam/ripple/depth Added handling for Material, Sound and Shape asset fields in Object Builder, and updated various objectBuilder class entries to utilize them now. Updated various fields' defaults for ObjectBuilder to utilize correct assetId's Fixed editor SceneTree tooltips for TSShape and GroundCovert to correctly reference assets as needed Added logic to properly check terrain asset validity when prompting to save changes, which would break saving actions before Added menubar items in the Object category to take control and release control of control objects quickly for testing
2021-09-19 06:01:47 +00:00
}
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
loadMaterial();
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
}
void MaterialAsset::onAssetRefresh()
{
Updates the rest of the asset types to utilize separate expanded path variables to avoid breaking assetDef saving Fixes select mode for the Asset Browser to properly filter to the selecting type Fixes the imageType in the asset import window inspector to properly set to the importing image asset's discovered type if valid Fixes AssetBrowser asset selection return so it returns back a valid assetId Fixes TerrainMaterial save crash by ensuring we fill in the diffuseMapAsset Removes saving of TerrainMaterial being saved to a generic script file if one isn't found for an existing TerrainMaterialAssets
2020-08-09 06:32:27 +00:00
mScriptPath = getOwned() ? expandAssetFilePath(mScriptFile) : mScriptPath;
Adds test shapes of Kork and SpaceOrc Sidestep of memleak from CSF at the moment Minor fixes and corrections with asset importing and loose files WIP of updated options menu
2019-05-28 22:24:29 +00:00
Tweaks the MaterialAsset loading logic to continue to see if the matDefinition already points to an existing object(to avoid needlessly re-executing files over and over), but also validate other cases, and ensures that if we DO have an existing definition, we still process and load it in the asset itself properly.
2021-10-09 05:07:01 +00:00
if (mMatDefinitionName == StringTable->EmptyString())
{
mLoadedState = Failed;
return;
}
refactor new IsScriptFile method to be zip-safe
2021-07-23 01:55:46 +00:00
if (Torque::FS::IsScriptFile(mScriptPath))
Adds load status to MaterialAsset for if the Script file itself has been loaded, but the material itself hasn't yet been processed. Fixed String -> StringTableEntry conversion in prefab file to correct corruption when setting the filename Cleaned up message spam from the MaterialSlot fields on TSStatics Added getter/setters for terrain file and assets Removed unneeded exec of tools profiles for MainMenuGUI Add logic to remove creators section of AB if in select mode Fixed misc. messageBox invokes that were erroneously converted to 'toolsMessageBox' Fix classname for NotesObject in AB Creator Entry Fix issue where ConvexShapeEditor toolbar would hide after being seen once Changed keybind for quick AB access from 'space' to 'shift space' to avoid input issues when typing in fields in some cases Fixed default image assignments for River objects on foam/ripple/depth Added handling for Material, Sound and Shape asset fields in Object Builder, and updated various objectBuilder class entries to utilize them now. Updated various fields' defaults for ObjectBuilder to utilize correct assetId's Fixed editor SceneTree tooltips for TSShape and GroundCovert to correctly reference assets as needed Added logic to properly check terrain asset validity when prompting to save changes, which would break saving actions before Added menubar items in the Object category to take control and release control of control objects quickly for testing
2021-09-19 06:01:47 +00:00
{
//Since we're refreshing, we can assume that the file we're executing WILL have an existing definition.
//But that definition, whatever it is, is the 'correct' one, so we enable the Replace Existing behavior
//when the engine encounters a named object conflict.
String redefineBehaviorPrev = Con::getVariable("$Con::redefineBehavior");
Con::setVariable("$Con::redefineBehavior", "replaceExisting");
if (Con::executeFile(mScriptPath, false, false))
mLoadedState = ScriptLoaded;
else
mLoadedState = Failed;
//And now that we've executed, switch back to the prior behavior
Con::setVariable("$Con::redefineBehavior", redefineBehaviorPrev.c_str());
}
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
loadMaterial();
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
}
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
void MaterialAsset::setScriptFile(const char* pScriptFile)
{
// Sanity!
AssertFatal(pScriptFile != NULL, "Cannot use a NULL script file.");
Enforces filename string case sensitivity for assets' internal filenames, which avoids the stringtable messing with the case preventing file name case sensitivity issues.
2021-08-22 04:12:37 +00:00
pScriptFile = StringTable->insert(pScriptFile, true);
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
// Update.
Adds test shapes of Kork and SpaceOrc Sidestep of memleak from CSF at the moment Minor fixes and corrections with asset importing and loose files WIP of updated options menu
2019-05-28 22:24:29 +00:00
mScriptFile = getOwned() ? expandAssetFilePath(pScriptFile) : pScriptFile;
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
// Refresh the asset.
refreshAsset();
}
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
//------------------------------------------------------------------------------
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
void MaterialAsset::loadMaterial()
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
{
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
if (mMaterialDefinition)
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file Also updates importers to correctly handle this change Adds ability for taml XML serialization to properly assign array'd fields Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 17:50:16 +00:00
{
mMaterialDefinition->safeDeleteObject();
}
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file Also updates importers to correctly handle this change Adds ability for taml XML serialization to properly assign array'd fields Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 17:50:16 +00:00
if (mLoadedState == EmbeddedDefinition)
{
if (size() != 0)
{
for (U32 i = 0; i < size(); i++)
{
mMaterialDefinition = dynamic_cast<Material*>(getObject(i));
if (mMaterialDefinition)
{
mLoadedState = Ok;
mMaterialDefinition->setInternalName(getAssetId());
mMaterialDefinition->reload();
return;
}
}
}
}
else if ((mLoadedState == ScriptLoaded || mLoadedState == DefinitionAlreadyExists) && mMatDefinitionName != StringTable->EmptyString())
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
{
Material* matDef;
if (!Sim::findObject(mMatDefinitionName, matDef))
{
Con::errorf("MaterialAsset: Unable to find the Material %s", mMatDefinitionName);
mLoadedState = BadFileReference;
return;
}
mMaterialDefinition = matDef;
mLoadedState = Ok;
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file Also updates importers to correctly handle this change Adds ability for taml XML serialization to properly assign array'd fields Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 17:50:16 +00:00
mMaterialDefinition->setInternalName(getAssetId());
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
mMaterialDefinition->reload();
return;
}
mLoadedState = Failed;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
}
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
//------------------------------------------------------------------------------
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
void MaterialAsset::copyTo(SimObject* object)
{
// Call to parent.
Parent::copyTo(object);
}
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
//------------------------------------------------------------------------------
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
U32 MaterialAsset::getAssetByMaterialName(StringTableEntry matName, AssetPtr<MaterialAsset>* matAsset)
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
{
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
AssetQuery query;
U32 foundAssetcount = AssetDatabase.findAssetType(&query, "MaterialAsset");
if (foundAssetcount == 0)
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
{
//Didn't work, so have us fall back to a placeholder asset
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
matAsset->setAssetId(MaterialAsset::smNoMaterialAssetFallback);
if (matAsset->isNull())
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
{
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
//Well that's bad, loading the fallback failed.
Con::warnf("MaterialAsset::getAssetByMaterialName - Finding of asset associated with material name %s failed with no fallback asset", matName);
return AssetErrCode::Failed;
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
}
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
//handle noshape not being loaded itself
if ((*matAsset)->mLoadedState == BadFileReference)
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
{
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file Also updates importers to correctly handle this change Adds ability for taml XML serialization to properly assign array'd fields Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 17:50:16 +00:00
Con::warnf("MaterialAsset::getAssetByMaterialName - Finding of associated with aterial name %s failed, and fallback asset reported error of Bad File Reference.", matName);
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
return AssetErrCode::BadFileReference;
}
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file Also updates importers to correctly handle this change Adds ability for taml XML serialization to properly assign array'd fields Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 17:50:16 +00:00
Con::warnf("MaterialAsset::getAssetByMaterialName - Finding of associated with aterial name %s failed, utilizing fallback asset", matName);
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
(*matAsset)->mLoadedState = AssetErrCode::UsingFallback;
return AssetErrCode::UsingFallback;
}
else
{
for (U32 i = 0; i < foundAssetcount; i++)
{
MaterialAsset* tMatAsset = AssetDatabase.acquireAsset<MaterialAsset>(query.mAssetList[i]);
if (tMatAsset && tMatAsset->getMaterialDefinitionName() == matName)
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
{
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
matAsset->setAssetId(query.mAssetList[i]);
AssetDatabase.releaseAsset(query.mAssetList[i]);
return (*matAsset)->mLoadedState;
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
}
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
AssetDatabase.releaseAsset(query.mAssetList[i]); //cleanup if that's not the one we needed
}
}
Added fallback handling to MaterialAssets if the asset was found but the matDef was not Added import config handling for prepending Directory to asset name Added handling for import config of appending a sound suffix Integrated handling of directory prepend and asset type suffix to rename issue resolution of asset importing Corrected miswording of warn message for duplicate object names Correct GUI issues with verve tools Convert verve tools to utilize assets for their GUI elements Fix window binding/naming issue depending on window mode for verve Fix popup menus formatting for verve WIP fix for material swap in Material editor. Corrects crash, but swap action is unreliable depending on object type Fix display issue with mission area editor toolbar button image Fix tooltip display of SFXEmitters in editor tree to correctly show the bound asset Changed network graph accelerator keybind from just N to Ctrl N to avoid keybind issues when typing Fixed Create New Emitter button in particle emitter that was showing as no texture
2021-10-29 04:52:58 +00:00
//Somehow we failed to bind an asset, so just use the fallback and mark the failure
matAsset->setAssetId(MaterialAsset::smNoMaterialAssetFallback);
(*matAsset)->mLoadedState = AssetErrCode::UsingFallback;
return AssetErrCode::UsingFallback;
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
}
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
StringTableEntry MaterialAsset::getAssetIdByMaterialName(StringTableEntry matName)
{
if (matName == StringTable->EmptyString())
return StringTable->EmptyString();
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
StringTableEntry materialAssetId = MaterialAsset::smNoMaterialAssetFallback;
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
AssetQuery query;
U32 foundCount = AssetDatabase.findAssetType(&query, "MaterialAsset");
if (foundCount != 0)
{
for (U32 i = 0; i < foundCount; i++)
{
MaterialAsset* matAsset = AssetDatabase.acquireAsset<MaterialAsset>(query.mAssetList[i]);
if (matAsset && matAsset->getMaterialDefinitionName() == matName)
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
{
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
materialAssetId = matAsset->getAssetId();
AssetDatabase.releaseAsset(query.mAssetList[i]);
break;
Adds autoimport logic for materials if the materialDefinition already exists Adds some additional utility functions to AssetImporter for easier access to setup Corrects handling for legacy field names with meshRoad
2021-01-05 06:58:18 +00:00
}
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
AssetDatabase.releaseAsset(query.mAssetList[i]);
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
}
}
return materialAssetId;
}
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
U32 MaterialAsset::getAssetById(StringTableEntry assetId, AssetPtr<MaterialAsset>* materialAsset)
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
{
(*materialAsset) = assetId;
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
if (materialAsset->notNull())
{
return (*materialAsset)->mLoadedState;
}
else
{
//Didn't work, so have us fall back to a placeholder asset
materialAsset->setAssetId(MaterialAsset::smNoMaterialAssetFallback);
if (materialAsset->isNull())
{
//Well that's bad, loading the fallback failed.
Con::warnf("MaterialAsset::getAssetById - Finding of asset with id %s failed with no fallback asset", assetId);
return AssetErrCode::Failed;
}
//handle noshape not being loaded itself
if ((*materialAsset)->mLoadedState == BadFileReference)
{
Con::warnf("MaterialAsset::getAssetById - Finding of asset with id %s failed, and fallback asset reported error of Bad File Reference.", assetId);
return AssetErrCode::BadFileReference;
}
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
Con::warnf("MaterialAsset::getAssetById - Finding of asset with id %s failed, utilizing fallback asset", assetId);
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
(*materialAsset)->mLoadedState = AssetErrCode::UsingFallback;
return AssetErrCode::UsingFallback;
}
}
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file Also updates importers to correctly handle this change Adds ability for taml XML serialization to properly assign array'd fields Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 17:50:16 +00:00
SimObjectPtr<Material> MaterialAsset::findMaterialDefinitionByAssetId(StringTableEntry assetId)
{
SimSet* matSet = MATMGR->getMaterialSet();
if (matSet)
{
SimObjectPtr<Material> matDef = dynamic_cast<Material*>(matSet->findObjectByInternalName(assetId));
return matDef;
}
return nullptr;
}
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
#ifdef TORQUE_TOOLS
DefineEngineStaticMethod(MaterialAsset, getAssetIdByMaterialName, const char*, (const char* materialName), (""),
"Queries the Asset Database to see if any asset exists that is associated with the provided material name.\n"
"@return The AssetId of the associated asset, if any.")
{
return MaterialAsset::getAssetIdByMaterialName(StringTable->insert(materialName));
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
}
Adds console function to compare file modified times Adds console function to save a scaled image Improved logic of generating previews for shape, material and image assets to regen if original asset loose file was modified Added logic to generate scaled preview image for material and image assets to improve load times of AB
2021-08-08 21:20:58 +00:00
Shifts handling of material and terrain material definitions to be written into the asset definition taml file instead of having an extra loose file Also updates importers to correctly handle this change Adds ability for taml XML serialization to properly assign array'd fields Adds 'inheritFrom' field to simobjects for when objects with parent objects are serialized AssetBase how inherits from SimGroup so it can have objects like material definitions embedded in them for save/load in the taml definition file Updated loading/handling logic in terrain material asset to be more similar to regular material assets
2022-01-30 17:50:16 +00:00
//MaterialAsset::findMaterialDefinitionByAssetId("Prototyping:Detail")
DefineEngineStaticMethod(MaterialAsset, findMaterialDefinitionByAssetId, S32, (const char* assetId), (""),
"Queries the MaterialSet to see if any MaterialDefinition exists that is associated to the provided assetId.\n"
"@return The MaterialDefinition Id associated to the assetId, if any")
{
SimObjectPtr<Material> matDef = MaterialAsset::findMaterialDefinitionByAssetId(StringTable->insert(assetId));
if (matDef.isNull())
return SimObjectId(0);
else
return matDef->getId();
}
Adds console function to compare file modified times Adds console function to save a scaled image Improved logic of generating previews for shape, material and image assets to regen if original asset loose file was modified Added logic to generate scaled preview image for material and image assets to improve load times of AB
2021-08-08 21:20:58 +00:00
DefineEngineMethod(MaterialAsset, getScriptPath, const char*, (), ,
Removed unneeded default irradiance and prefilter cubemaps, and their convars Added getGUIPath console function to guiAsset Corrected console function documentation for getScriptPath in MaterialAsset Added getter console functions to PostEffectAsset Added getAnimationPath console function to PostEffectAsset Fixes handling of mapto with the reskin usage when generating preview renders for ShapeAssets Standardizes getShapeFile to getShapePath on ShapeAsset to better match formatting of other getters on assets Adds sanity checking for getStringWidth to prevent crash if there's an issue with the font being ready at time of request(from Az) Earlies out on rendering of impostors if it's the deferred bin to prevent unneeded duplicate rendering messing up results(from Az) Fixed duplicate naming of quality levels on LightingQualityList Added check so if _makePrettyResString is handed a 'human formatted' resolution string(as in, has <width> x <height> it can handle that properly Shifted yes/no and on/off option lists to globals for ease and consistency of handling on options menu Improves check for unapplied graphics options on options menu and applies them all at once Add sanitizing of variable names so getVariable doesn't have issues when looking up array variables in optionsMenu logic Adds better tracking of what options menu category is shown so refreshes don't reset it Add better handling for changing resolution in options menu and getting it to apply properly Adds better utility functions for setting bools vs optionsLists vs quality lists and updates options fields to use the most appropriate Removes redundant setting of $pref::SFX::channelVolume vars in defaults.tscript Removed unneeded extra logging from asset browser drag-n-drop actions Adds item to RMB context menu in AB to regenerate preview images Fixes move command for asset types(needed to properly reference the full path of the associated files) and added it for shapes, animations and terrains Added logic so when the dropdown for selecting a target module on the Create New Asset window is changed, it forcefully updates the target path to point to the module to avoid erroneous paths being provided Adds proper clamping of values to Forest Editor's brush size in the editor bar. Could be set to below 1 even though it would visually clamp to 1. Temporarily disables fields and handling of 'open in Torsion'. Fixes bad pixel in gui/images/tab_border.png which was causing it to fail to generate bitmap array properly Makes the New GUI option from menubar in GUI Editor use same Create New Asset method as everything else Disables access to the CubemapDesc reflector field in the material editor as it's not nominally used now in favor of probes Adds proper loading of roughness and metalness fields in material editor Fixes the default ReflectProbePreviewMat to use a better base DiffuseMap (No Material) rather than the occluder Fixes disable display for some options in the advanced panel in the shape editor so they look more fitting to everything else Adds check to avoid spam of markItem errors in the event requested tree item is invalid Fixed remove material button and command in TerrainMaterial Editor
2022-04-04 01:00:30 +00:00
"Gets the script file path for the asset.")
Adds console function to compare file modified times Adds console function to save a scaled image Improved logic of generating previews for shape, material and image assets to regen if original asset loose file was modified Added logic to generate scaled preview image for material and image assets to improve load times of AB
2021-08-08 21:20:58 +00:00
{
return object->getScriptPath();
}
Converts all game, gui editor, and system classes to utilize assets Processed core, tools and default modules to utilize assets Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption Removed unneeded MainEditor mockup module Removed some unused/duplicate image assets from the tools
2021-07-19 06:07:08 +00:00
#endif
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
fix TORQUE_TOOLS = off compilation
2022-06-13 17:38:08 +00:00
#ifdef TORQUE_TOOLS
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
IMPLEMENT_CONOBJECT(GuiInspectorTypeMaterialAssetPtr);
ConsoleDocClass(GuiInspectorTypeMaterialAssetPtr,
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
"@brief Inspector field type for Shapes\n\n"
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
"Editor use only.\n\n"
"@internal"
);
void GuiInspectorTypeMaterialAssetPtr::consoleInit()
{
Parent::consoleInit();
ConsoleBaseType::getType(TypeMaterialAssetPtr)->setInspectorFieldType("GuiInspectorTypeMaterialAssetPtr");
}
GuiControl* GuiInspectorTypeMaterialAssetPtr::constructEditControl()
{
// Create base filename edit controls
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
GuiControl* retCtrl = Parent::constructEditControl();
if (retCtrl == NULL)
return retCtrl;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
// Change filespec
char szBuffer[512];
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
const char* previewImage;
* Fixes handling for Image, Material and Shape Assets' inspector fields so they properly work with non-object targeted inspectors, such as the PostFXEditor * Updated PostFXEditor scripts to handle refreshing properly when certainl field types(assetId fields) are changed * Adjusted display handling of slider values on guiGameSettingsCtrl to show 0.x decimal format instead of 0.xxxxx * Fixed pad length of item names in guiTreeView for items that are marked to avoid console spam * Fixed local offseting for popupMenus so scaled/offset window position doesn't cause the popup menu to offset from mouse click position(courtesy OTHG_Mars) * Fix issue with terrain where, due to default value save validation, the global scope for the terrain collision list would be whiped when saving, causing players to fall through terrain. Moved to per-terrain convexLists * Fixed issue with the core camera model mesh and updated references so camera bookmarks display properly * Fixed console spam during asset browser initialization where it would try and expand the directory tree even though the dir tree isn't populated yet * Fixed handling of Open File Location RMB menu action to properly deal with script and datablock types * Removed unusuable "Create ___" asset type prompts from the RMB menus for the AB to avoid confusion * Improved slider offset positioning for various popup sliders on editor toolbars * Anchored the visibility popup menu to the button for more consistent formatting and better feel * Shifted various visibility toggles from 'in place' on the menu buttons to functions, allowing it to also properly mark the menu entries as checked or not, improving usability
2022-08-26 20:25:17 +00:00
if (mInspector->getInspectObject() != nullptr)
{
dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.showDialog(\"MaterialAsset\", \"AssetBrowser.changeAsset\", %s, %s);",
mInspector->getIdString(), mCaption);
mBrowseButton->setField("Command", szBuffer);
setDataField(StringTable->insert("targetObject"), NULL, mInspector->getInspectObject()->getIdString());
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
previewImage = mInspector->getInspectObject()->getDataField(mCaption, NULL);
* Fixes handling for Image, Material and Shape Assets' inspector fields so they properly work with non-object targeted inspectors, such as the PostFXEditor * Updated PostFXEditor scripts to handle refreshing properly when certainl field types(assetId fields) are changed * Adjusted display handling of slider values on guiGameSettingsCtrl to show 0.x decimal format instead of 0.xxxxx * Fixed pad length of item names in guiTreeView for items that are marked to avoid console spam * Fixed local offseting for popupMenus so scaled/offset window position doesn't cause the popup menu to offset from mouse click position(courtesy OTHG_Mars) * Fix issue with terrain where, due to default value save validation, the global scope for the terrain collision list would be whiped when saving, causing players to fall through terrain. Moved to per-terrain convexLists * Fixed issue with the core camera model mesh and updated references so camera bookmarks display properly * Fixed console spam during asset browser initialization where it would try and expand the directory tree even though the dir tree isn't populated yet * Fixed handling of Open File Location RMB menu action to properly deal with script and datablock types * Removed unusuable "Create ___" asset type prompts from the RMB menus for the AB to avoid confusion * Improved slider offset positioning for various popup sliders on editor toolbars * Anchored the visibility popup menu to the button for more consistent formatting and better feel * Shifted various visibility toggles from 'in place' on the menu buttons to functions, allowing it to also properly mark the menu entries as checked or not, improving usability
2022-08-26 20:25:17 +00:00
}
else
{
//if we don't have a target object, we'll be manipulating the desination value directly
Fixes setter issue for image/shape/material custom inspector fields where it was not correctly passing through the changed value from the Asset Browser select Swapped the water's disableTrueReflections variable to be enableTrueReflections for simplicity and consistency(also fixed a persistent typo) Swapped disableVerticalSync to be enableVerticalSync for simplicity and consistency Swapped disableParallaxMapping to be enableParallaxMapping for simplicity and consistency Fix click detection on slider mode entries for guiGameSettingsCtrl so the click position correctly matches the percentage Fixed problem where postFX initialization would always exec default.postfxpreset.tscript, even if a level's got it's own preset, which can cause problems Fixed range field type behavior so that editing the values applies in real time, and also consistently applies between slider and text field
2022-08-30 06:29:39 +00:00
dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.showDialog(\"MaterialAsset\", \"AssetBrowser.changeAsset\", %s, \"%s\");",
* Fixes handling for Image, Material and Shape Assets' inspector fields so they properly work with non-object targeted inspectors, such as the PostFXEditor * Updated PostFXEditor scripts to handle refreshing properly when certainl field types(assetId fields) are changed * Adjusted display handling of slider values on guiGameSettingsCtrl to show 0.x decimal format instead of 0.xxxxx * Fixed pad length of item names in guiTreeView for items that are marked to avoid console spam * Fixed local offseting for popupMenus so scaled/offset window position doesn't cause the popup menu to offset from mouse click position(courtesy OTHG_Mars) * Fix issue with terrain where, due to default value save validation, the global scope for the terrain collision list would be whiped when saving, causing players to fall through terrain. Moved to per-terrain convexLists * Fixed issue with the core camera model mesh and updated references so camera bookmarks display properly * Fixed console spam during asset browser initialization where it would try and expand the directory tree even though the dir tree isn't populated yet * Fixed handling of Open File Location RMB menu action to properly deal with script and datablock types * Removed unusuable "Create ___" asset type prompts from the RMB menus for the AB to avoid confusion * Improved slider offset positioning for various popup sliders on editor toolbars * Anchored the visibility popup menu to the button for more consistent formatting and better feel * Shifted various visibility toggles from 'in place' on the menu buttons to functions, allowing it to also properly mark the menu entries as checked or not, improving usability
2022-08-26 20:25:17 +00:00
mInspector->getIdString(), mVariableName);
mBrowseButton->setField("Command", szBuffer);
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
previewImage = Con::getVariable(mVariableName);
* Fixes handling for Image, Material and Shape Assets' inspector fields so they properly work with non-object targeted inspectors, such as the PostFXEditor * Updated PostFXEditor scripts to handle refreshing properly when certainl field types(assetId fields) are changed * Adjusted display handling of slider values on guiGameSettingsCtrl to show 0.x decimal format instead of 0.xxxxx * Fixed pad length of item names in guiTreeView for items that are marked to avoid console spam * Fixed local offseting for popupMenus so scaled/offset window position doesn't cause the popup menu to offset from mouse click position(courtesy OTHG_Mars) * Fix issue with terrain where, due to default value save validation, the global scope for the terrain collision list would be whiped when saving, causing players to fall through terrain. Moved to per-terrain convexLists * Fixed issue with the core camera model mesh and updated references so camera bookmarks display properly * Fixed console spam during asset browser initialization where it would try and expand the directory tree even though the dir tree isn't populated yet * Fixed handling of Open File Location RMB menu action to properly deal with script and datablock types * Removed unusuable "Create ___" asset type prompts from the RMB menus for the AB to avoid confusion * Improved slider offset positioning for various popup sliders on editor toolbars * Anchored the visibility popup menu to the button for more consistent formatting and better feel * Shifted various visibility toggles from 'in place' on the menu buttons to functions, allowing it to also properly mark the menu entries as checked or not, improving usability
2022-08-26 20:25:17 +00:00
}
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
mLabel = new GuiTextCtrl();
mLabel->registerObject();
mLabel->setControlProfile(mProfile);
mLabel->setText(mCaption);
addObject(mLabel);
//
GuiTextEditCtrl* editTextCtrl = static_cast<GuiTextEditCtrl*>(retCtrl);
GuiControlProfile* toolEditProfile;
if (Sim::findObject("ToolsGuiTextEditProfile", toolEditProfile))
editTextCtrl->setControlProfile(toolEditProfile);
GuiControlProfile* toolDefaultProfile = nullptr;
Sim::findObject("ToolsGuiDefaultProfile", toolDefaultProfile);
//
mPreviewImage = new GuiBitmapCtrl();
mPreviewImage->registerObject();
if(toolDefaultProfile)
mPreviewImage->setControlProfile(toolDefaultProfile);
updatePreviewImage();
addObject(mPreviewImage);
//
mPreviewBorderButton = new GuiBitmapButtonCtrl();
mPreviewBorderButton->registerObject();
if(toolDefaultProfile)
mPreviewBorderButton->setControlProfile(toolDefaultProfile);
mPreviewBorderButton->_setBitmap(StringTable->insert("ToolsModule:cubemapBtnBorder_n_image"));
mPreviewBorderButton->setField("Command", szBuffer); //clicking the preview does the same thing as the edit button, for simplicity
addObject(mPreviewBorderButton);
//
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
// Create "Open in Editor" button
mEditButton = new GuiBitmapButtonCtrl();
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.editAsset(%d.getText());", retCtrl->getId());
mEditButton->setField("Command", szBuffer);
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
mEditButton->setText("Edit");
mEditButton->setSizing(horizResizeLeft, vertResizeAspectTop);
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
mEditButton->setDataField(StringTable->insert("Profile"), NULL, "ToolsGuiButtonProfile");
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
mEditButton->setDataField(StringTable->insert("tooltipprofile"), NULL, "GuiToolTipProfile");
mEditButton->setDataField(StringTable->insert("hovertime"), NULL, "1000");
Removed unneeded duplicate of blank sky skybox Fixed various inspector field editor button icons Fixed drag-n-drop apply logic for material assets Fixed up some convex shape editor material references Fixed tools overlay gui profile opaqueness flag Fixed uvEditor image asset binding/lookups Fixed decal editor preview display Fixed shape editor would you like to save your changes prompt Added additional sanity check for bad material reference in tsMesh Fixed saving of terrain asset when working in editor default level
2021-08-06 06:06:36 +00:00
mEditButton->setDataField(StringTable->insert("tooltip"), NULL, "Open this asset in the Material Editor");
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
mEditButton->registerObject();
addObject(mEditButton);
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
//
mUseHeightOverride = true;
mHeightOverride = 72;
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
return retCtrl;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
}
bool GuiInspectorTypeMaterialAssetPtr::updateRects()
{
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
S32 rowSize = 18;
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
S32 dividerPos, dividerMargin;
mInspector->getDivider(dividerPos, dividerMargin);
Point2I fieldExtent = getExtent();
Point2I fieldPos = getPosition();
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
mEditCtrlRect.set(0, 0, fieldExtent.x, fieldExtent.y);
mLabel->resize(Point2I(mProfile->mTextOffset.x, 0), Point2I(fieldExtent.x, rowSize));
RectI previewRect = RectI(Point2I(mProfile->mTextOffset.x, rowSize), Point2I(50, 50));
mPreviewBorderButton->resize(previewRect.point, previewRect.extent);
mPreviewImage->resize(previewRect.point, previewRect.extent);
mEdit->resize(Point2I(previewRect.point.x + previewRect.extent.x + 10, rowSize * 1.5), Point2I(200, rowSize));
mEditButton->resize(Point2I(fieldExtent.x - 100, fieldExtent.y - rowSize), Point2I(100, rowSize));
mBrowseButton->setHidden(true);
return true;
}
void GuiInspectorTypeMaterialAssetPtr::updateValue()
{
Parent::updateValue();
updatePreviewImage();
}
void GuiInspectorTypeMaterialAssetPtr::updatePreviewImage()
{
const char* previewImage;
if (mInspector->getInspectObject() != nullptr)
previewImage = mInspector->getInspectObject()->getDataField(mCaption, NULL);
else
previewImage = Con::getVariable(mVariableName);
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
String matPreviewAssetId = String(previewImage) + "_PreviewImage";
matPreviewAssetId.replace(":", "_");
matPreviewAssetId = "ToolsModule:" + matPreviewAssetId;
if (AssetDatabase.isDeclaredAsset(matPreviewAssetId.c_str()))
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
{
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
mPreviewImage->setBitmap(StringTable->insert(matPreviewAssetId.c_str()));
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
}
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
else
{
if (AssetDatabase.isDeclaredAsset(previewImage))
{
MaterialAsset* matAsset = AssetDatabase.acquireAsset<MaterialAsset>(previewImage);
if (matAsset && matAsset->getMaterialDefinition())
{
mPreviewImage->_setBitmap(matAsset->getMaterialDefinition()->mDiffuseMapAssetId[0]);
}
}
}
if (mPreviewImage->getBitmapAsset().isNull())
mPreviewImage->_setBitmap(StringTable->insert("ToolsModule:genericAssetIcon_image"));
}
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
void GuiInspectorTypeMaterialAssetPtr::setPreviewImage(StringTableEntry assetId)
{
String matPreviewAssetId = String(assetId) + "_PreviewImage";
matPreviewAssetId.replace(":", "_");
matPreviewAssetId = "ToolsModule:" + matPreviewAssetId;
if (AssetDatabase.isDeclaredAsset(matPreviewAssetId.c_str()))
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
{
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
mPreviewImage->setBitmap(StringTable->insert(matPreviewAssetId.c_str()));
}
else
{
if (AssetDatabase.isDeclaredAsset(assetId))
{
MaterialAsset* matAsset = AssetDatabase.acquireAsset<MaterialAsset>(assetId);
if (matAsset && matAsset->getMaterialDefinition())
{
mPreviewImage->_setBitmap(matAsset->getMaterialDefinition()->mDiffuseMapAssetId[0]);
}
}
Asset Browser initial implementation - Asset updates. Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 20:48:02 +00:00
}
Updates the behavior and layout of the ImageAsset, MaterialAsset and ShapeAsset inspector field types to be clearer, with previews and obvious edit buttons Also fixes drag-n-drop behavior from the AB into the image and shape fields to ensure they update as expected.
2022-12-09 02:00:55 +00:00
if (mPreviewImage->getBitmapAsset().isNull())
mPreviewImage->_setBitmap(StringTable->insert("ToolsModule:genericAssetIcon_image"));
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
}
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
IMPLEMENT_CONOBJECT(GuiInspectorTypeMaterialAssetId);
Corrects lookup/in-place auto import logic for ImageAssets Fixed sizing issue for material asset ptr fields Fixed type of comment in Particle Asset Hooked GLSL and HLSL shader files to be proper asset loose files for PostEffectAsset Adjusted some default values for default ImportConfig Corrected field type of multiple fields for the importConfig Corrected loading of PopulateMaterialMaps config setting from config file Corrected field types of multiple fields for AssetImportObjects Exposed several utility fields for the Importer to script Added ability to create an AssetImportObject in script and add it to the Importer's current session Ensured stable naming behavior(replacing spaces, -, and . in names with _ Improved getAssetTypeByFile logical lookup so it doesn't accidentally grab cached.dts files Added ability to hard reset an import session, wiping all inbound files for a full reset Added ability to process DTS files to shape import so it can parse out content such as materials for associated asset imports Added better handling for shape materials that are just colors Added callback hook-in so if the importer doesn't have a defined function for importing a given asset type, it'll try calling down into the editor Stabilized imageAsset processing logic when generating a material for it Improved imageType lookup/processing logic in Importer Improved logic for binding in associated image files to materialAssets Improved logic for processing shapes to get related materials and images, ensuring better likelyhood of finding and associating related assets Cleaned up validation logic Added ability to properly look up the editor's default import config if it's set to be used for autoimport Improved handling of originalFilePath logic, so if it's an in-place import, it doesn't bother populating the field Set default UP axis value on shape importing to ensure better default behavior
2020-07-11 21:20:10 +00:00
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
ConsoleDocClass(GuiInspectorTypeMaterialAssetId,
"@brief Inspector field type for Material Assets\n\n"
"Editor use only.\n\n"
"@internal"
);
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
void GuiInspectorTypeMaterialAssetId::consoleInit()
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
{
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
Parent::consoleInit();
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
Implements material asset handling for GroundPlane object Adds handling for finding material asset akin to shape and image assets Updates the material asset inspector field to follow the current standard Updates prototyping material assets to correctly have materialDefinitionName assigned Fixed material asset import step to properly assign materialDefinitionName Fixed typo in material editor icon name Added logic to editAsset function call so it can also parse assetIds Changed DefaultEditorLevel to utilize FloorGray material Adds proper NoMaterial asset for fallback purposes
2020-11-02 05:32:34 +00:00
ConsoleBaseType::getType(TypeMaterialAssetId)->setInspectorFieldType("GuiInspectorTypeMaterialAssetId");
Expands/Cleans up a lot of the asset functionality, including management, file association, and creation/importing
2019-05-04 16:49:42 +00:00
}
fix TORQUE_TOOLS = off compilation
2022-06-13 17:38:08 +00:00
#endif
Reference in a new issue Copy permalink