TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 05:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Parametrize script extension, default to 'tscript'

Browse source
This commit is contained in:
Lukas Aldershaab 2020-12-12 16:54:16 +01:00
parent b8b62292bd
commit 099dd4f1f3
542 changed files with 774 additions and 783 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/ts/collada/colladaAppMaterial.h
View file

@ -40,7 +40,7 @@ public:
ColladaExtension_effect* effectExt; ///< effect extension
String name; ///< Name of this material (cleaned)
// Settings extracted from the Collada file, and optionally saved to materials.cs
// Settings extracted from the Collada file, and optionally saved to materials.tscript
String diffuseMap;
String normalMap;

6
Engine/source/ts/collada/colladaShapeLoader.cpp
View file

@ -453,7 +453,7 @@ void copySketchupTexture(const Torque::Path &path, String &textureFilename)
}
//-----------------------------------------------------------------------------
/// Add collada materials to materials.cs
/// Add collada materials to materials.tscript
void updateMaterialsScript(const Torque::Path &path, bool copyTextures = false)
{
#ifdef DAE2DTS_TOOL
@ -463,7 +463,7 @@ void updateMaterialsScript(const Torque::Path &path, bool copyTextures = false)
Torque::Path scriptPath(path);
scriptPath.setFileName("materials");
scriptPath.setExtension("cs");
scriptPath.setExtension(TORQUE_SCRIPT_EXTENSION);
// First see what materials we need to update
PersistenceManager persistMgr;
@ -731,7 +731,7 @@ TSShape* loadColladaShape(const Torque::Path &path)
#endif // DAE2DTS_TOOL
// Add collada materials to materials.cs
// Add collada materials to materials.tscript
updateMaterialsScript(path, isSketchup);
}
}

2
Engine/source/ts/collada/colladaUtils.cpp
View file

@ -181,7 +181,7 @@ String ColladaUtils::resolveImagePath(const domImage* image)
// it is inside the Torque folder, otherwise force textures
// to be in the same folder as the shape.
// 2. If the URI string contains a relative path, append it
// to the shape path (since materials.cs cannot handle
// to the shape path (since materials.tscript cannot handle
// relative paths).
Torque::Path imagePath;

2
Engine/source/ts/collada/colladaUtils.h
View file

@ -101,7 +101,7 @@ namespace ColladaUtils
bool ignoreNodeScale; // Ignore <scale> elements in <node>s
bool adjustCenter; // Translate model so origin is at the center
bool adjustFloor; // Translate model so origin is at the bottom
bool forceUpdateMaterials; // Force update of materials.cs
bool forceUpdateMaterials; // Force update of materials.tscript
bool useDiffuseNames; // Use diffuse texture as the material name
// Assimp specific preprocess import options