mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-09 21:54:35 +00:00
Updates ImageAsset usage to utilize AssetRef, and standardizes the setter/getter functions and naming conventions, as well as the ability to use and bind named targets.
This commit is contained in:
parent
a858d8624e
commit
34e3f78a22
82 changed files with 1451 additions and 951 deletions
|
|
@ -1030,7 +1030,7 @@ void ColladaUtils::exportColladaMaterials(tinyxml2::XMLElement* rootNode, const
|
|||
{
|
||||
Torque::Path diffusePath;
|
||||
|
||||
if (mat->getDiffuseMap(0))
|
||||
if (mat->getDiffuseMapAsset(0).notNull())
|
||||
diffusePath = Torque::Path(mat->getDiffuseMapAsset(0)->getImageFile());
|
||||
else
|
||||
diffusePath = String("warningMat");
|
||||
|
|
@ -1040,7 +1040,7 @@ void ColladaUtils::exportColladaMaterials(tinyxml2::XMLElement* rootNode, const
|
|||
}
|
||||
else
|
||||
{
|
||||
if (mat->getDiffuseMap(0))
|
||||
if (mat->getDiffuseMapAsset(0).notNull())
|
||||
diffuseMap += Torque::Path(mat->getDiffuseMapAsset(0)->getImageFile());
|
||||
else
|
||||
diffuseMap += "warningMat";
|
||||
|
|
@ -1316,7 +1316,7 @@ void ColladaUtils::exportColladaMaterials(tinyxml2::XMLElement* rootNode, const
|
|||
{
|
||||
Torque::Path diffusePath;
|
||||
|
||||
if (mat->getDiffuseMap(0))
|
||||
if (mat->getDiffuseMapAsset(0).notNull())
|
||||
diffusePath = Torque::Path(mat->getDiffuseMapAsset(0)->getImageFile());
|
||||
else
|
||||
diffusePath = String("warningMat");
|
||||
|
|
@ -1326,7 +1326,7 @@ void ColladaUtils::exportColladaMaterials(tinyxml2::XMLElement* rootNode, const
|
|||
}
|
||||
else
|
||||
{
|
||||
if (mat->getDiffuseMap(0))
|
||||
if (mat->getDiffuseMapAsset(0).notNull())
|
||||
diffuseMap += Torque::Path(mat->getDiffuseMapAsset(0)->getImageFile());
|
||||
else
|
||||
diffuseMap += "warningMat";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue