瀏覽代碼

Rename IsDelayProcessTimerElapsed to HasDelayProcessTimerElapsed

Use Trace instead of TracePrintf

Signed-off-by: amzn-mike <[email protected]>
amzn-mike 2 年之前
父節點
當前提交
ac27a2731c

+ 2 - 2
Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp

@@ -468,11 +468,11 @@ void AssetRequestHandler::OnRequestAssetExistsResponse(NetworkRequestID groupID,
 
     if (located == m_pendingAssetRequests.end())
     {
-        AZ_TracePrintf(AssetProcessor::DebugChannel, "OnRequestAssetExistsResponse: No such compile group found, ignoring.\n");
+        AZ_Trace(AssetProcessor::DebugChannel, "OnRequestAssetExistsResponse: No such compile group found, ignoring.\n");
         return;
     }
 
-    AZ_TracePrintf(AssetProcessor::DebugChannel, "GetAssetStatus / CompileAssetSync: Asset %s is %s.\n",
+    AZ_Trace(AssetProcessor::DebugChannel, "GetAssetStatus / CompileAssetSync: Asset %s is %s.\n",
         located.value().GetDisplayString().toUtf8().constData(),
         exists ? "compiled already" : "missing" );
 

+ 3 - 3
Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp

@@ -5919,7 +5919,7 @@ namespace AssetProcessor
         return false;
     }
 
-    bool AssetProcessorManager::IsDelayProcessTimerElapsed(qint64 elapsedTime)
+    bool AssetProcessorManager::HasDelayProcessTimerElapsed(qint64 elapsedTime)
     {
         // QTimer is not a precise timer, it could fire several milliseconds before or after the required wait time.
         // Just check if the elapsed time is relatively close; 30ms is arbitrary but should be sufficient.
@@ -5971,7 +5971,7 @@ namespace AssetProcessor
                 if (m_delayProcessMetadataFiles.contains(absolutePath))
                 {
                     auto duration = m_delayProcessMetadataFiles[absolutePath].msecsTo(QDateTime::currentDateTime());
-                    if (!IsDelayProcessTimerElapsed(duration))
+                    if (!HasDelayProcessTimerElapsed(duration))
                     {
                     // Event 7: Already waiting on file, keep waiting
                     if (!m_delayProcessMetadataQueued)
@@ -6024,7 +6024,7 @@ namespace AssetProcessor
         {
             auto duration = time.msecsTo(now);
 
-            if (IsDelayProcessTimerElapsed(duration))
+            if (HasDelayProcessTimerElapsed(duration))
             {
                 // Times up, process it
                 auto* fileStateCache = AZ::Interface<IFileStateRequests>::Get();

+ 1 - 1
Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h

@@ -505,7 +505,7 @@ namespace AssetProcessor
 
         //! Returns true if elapsed time is close enough to the delay process wait time
         //! This is not an exact check since QTimer is not precise with its event timing
-        bool IsDelayProcessTimerElapsed(qint64 elapsedTime);
+        bool HasDelayProcessTimerElapsed(qint64 elapsedTime);
 
         AssetProcessor::PlatformConfiguration* m_platformConfig = nullptr;