TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cmake_adjustments' of https://github.com/Ragora/Torque3D into alpha41/cmake_adjustments

Browse source 
# Conflicts:
#	Engine/lib/assimp/INSTALL
#	Engine/source/console/fileSystemFunctions.cpp
#	Tools/CMake/basics.cmake
#	Tools/CMake/modules/module_testing.cmake
This commit is contained in:
AzaezelX 2023-05-27 18:18:17 -05:00
commit c61439c2f9
5655 changed files with 2646874 additions and 17396 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Engine/source/console/fileSystemFunctions.cpp
View file

@ -97,11 +97,11 @@ static S32 buildFileList(const char* pattern, bool recurse, bool multiMatch)
Torque::FS::FileSystemRef fs = Torque::FS::GetFileSystem(givenPath);
//Torque::Path path = fs->mapTo(givenPath);
Torque::Path path = givenPath;
// Make sure that we have a root so the correct file system can be determined when using zips
if(givenPath.isRelative())
path = Torque::Path::Join(Torque::FS::GetCwd(), '/', givenPath);
path.setFileName(String::EmptyString);
path.setExtension(String::EmptyString);
if(!Torque::FS::IsDirectory(path))
@ -361,11 +361,11 @@ DefineEngineFunction(getFileCountMultiExpr, S32, ( const char* pattern, bool rec
DefineEngineFunction(getFileCRC, S32, ( const char* fileName ),,
"@brief Provides the CRC checksum of the given file.\n\n"
"@param fileName The path to the file.\n"
"@return The calculated CRC checksum of the file, or -1 if the file "
"could not be found.\n"
"@ingroup FileSystem")
{
Torque::FS::FileNodeRef fileRef = Torque::FS::GetFileNode( fileName );
@ -381,10 +381,10 @@ DefineEngineFunction(getFileCRC, S32, ( const char* fileName ),,
DefineEngineFunction(isFile, bool, ( const char* fileName ),,
"@brief Determines if the specified file exists or not\n\n"
"@param fileName The path to the file.\n"
"@return Returns true if the file was found.\n"
"@ingroup FileSystem")
{
String cleanfilename(Torque::Path::CleanSeparators(fileName));
@ -576,7 +576,12 @@ DefineEngineFunction( fileCreatedTime, String, ( const char* fileName ),,
{
Platform::LocalTime lt = node->getCreatedTime().toLocalTime();
<<<<<<< HEAD
String fileStr = Platform::localTimeToString(lt);
=======
Platform::LocalTime lt = {0};
Platform::fileToLocalTime( ft, &lt );
>>>>>>> 2f1d21eea6a3a78b6e91144149879893b4156723
char *buffer = Con::getReturnBuffer(fileStr.size());
dStrcpy(buffer, fileStr, fileStr.size());
@ -846,7 +851,17 @@ DefineEngineFunction( pathCopy, bool, ( const char* fromFile, const char* toFile
"@note Only present in a Tools build of Torque.\n"
"@ingroup FileSystem")
{
<<<<<<< HEAD
return Torque::FS::CopyFile(fromFile, toFile, noOverwrite);
=======
char qualifiedFromFile[ 2048 ];
char qualifiedToFile[ 2048 ];
Platform::makeFullPathName( fromFile, qualifiedFromFile, sizeof( qualifiedFromFile ) );
Platform::makeFullPathName( toFile, qualifiedToFile, sizeof( qualifiedToFile ) );
return dPathCopy( qualifiedFromFile, qualifiedToFile, noOverwrite );
>>>>>>> 2f1d21eea6a3a78b6e91144149879893b4156723
}
//-----------------------------------------------------------------------------