LOGDEBUG -> URHO3D_LOGDEBUG

Source/Urho3D/Graphics/DecalSet.cpp

@@ -463,7 +463,7 @@ bool DecalSet::AddDecal(Drawable* target, const Vector3& worldPosition, const Qu
     while (decals_.Size() && (numVertices_ > maxVertices_ || numIndices_ > maxIndices_))
         RemoveDecals(1);
 
-    LOGDEBUG("Added decal with " + String(newDecal.vertices_.Size()) + " vertices");
+    URHO3D_LOGDEBUG("Added decal with " + String(newDecal.vertices_.Size()) + " vertices");
 
     // If new decal is time limited, subscribe to scene post-update
     if (newDecal.timeToLive_ > 0.0f && !subscribed_)

Source/Urho3D/Graphics/Direct3D11/D3D11Graphics.cpp

@@ -1962,7 +1962,7 @@ void* Graphics::ReserveScratchBuffer(unsigned size)
             i->size_ = size;
             i->reserved_ = true;
 
-            LOGDEBUG("Resized scratch buffer to size " + String(size));
+            URHO3D_LOGDEBUG("Resized scratch buffer to size " + String(size));
 
             return i->data_.Get();
         }
@@ -1976,7 +1976,7 @@ void* Graphics::ReserveScratchBuffer(unsigned size)
     scratchBuffers_.Push(newBuffer);
     return newBuffer.data_.Get();
 
-    LOGDEBUG("Allocated scratch buffer with size " + String(size));
+    URHO3D_LOGDEBUG("Allocated scratch buffer with size " + String(size));
 }
 
 void Graphics::FreeScratchBuffer(void* buffer)
@@ -2005,7 +2005,7 @@ void Graphics::CleanupScratchBuffers()
             i->data_ = maxScratchBufferRequest_ > 0 ? new unsigned char[maxScratchBufferRequest_] : 0;
             i->size_ = maxScratchBufferRequest_;
 
-            LOGDEBUG("Resized scratch buffer to size " + String(maxScratchBufferRequest_));
+            URHO3D_LOGDEBUG("Resized scratch buffer to size " + String(maxScratchBufferRequest_));
         }
     }
 

Source/Urho3D/Graphics/Direct3D11/D3D11ShaderVariation.cpp

@@ -212,9 +212,9 @@ bool ShaderVariation::LoadByteCode(const String& binaryShaderName)
         file->Read(&byteCode_[0], byteCodeSize);
 
         if (type_ == VS)
-            LOGDEBUG("Loaded cached vertex shader " + GetFullName());
+            URHO3D_LOGDEBUG("Loaded cached vertex shader " + GetFullName());
         else
-            LOGDEBUG("Loaded cached pixel shader " + GetFullName());
+            URHO3D_LOGDEBUG("Loaded cached pixel shader " + GetFullName());
 
         CalculateConstantBufferSizes();
         return true;
@@ -298,9 +298,9 @@ bool ShaderVariation::Compile()
     else
     {
         if (type_ == VS)
-            LOGDEBUG("Compiled vertex shader " + GetFullName());
+            URHO3D_LOGDEBUG("Compiled vertex shader " + GetFullName());
         else
-            LOGDEBUG("Compiled pixel shader " + GetFullName());
+            URHO3D_LOGDEBUG("Compiled pixel shader " + GetFullName());
 
         unsigned char* bufData = (unsigned char*)shaderCode->GetBufferPointer();
         unsigned bufSize = (unsigned)shaderCode->GetBufferSize();

Source/Urho3D/Graphics/Direct3D9/D3D9Graphics.cpp

@@ -2156,7 +2156,7 @@ void* Graphics::ReserveScratchBuffer(unsigned size)
             i->size_ = size;
             i->reserved_ = true;
 
-            LOGDEBUG("Resized scratch buffer to size " + String(size));
+            URHO3D_LOGDEBUG("Resized scratch buffer to size " + String(size));
 
             return i->data_.Get();
         }
@@ -2170,7 +2170,7 @@ void* Graphics::ReserveScratchBuffer(unsigned size)
     scratchBuffers_.Push(newBuffer);
     return newBuffer.data_.Get();
 
-    LOGDEBUG("Allocated scratch buffer with size " + String(size));
+    URHO3D_LOGDEBUG("Allocated scratch buffer with size " + String(size));
 }
 
 void Graphics::FreeScratchBuffer(void* buffer)
@@ -2199,7 +2199,7 @@ void Graphics::CleanupScratchBuffers()
             i->data_ = maxScratchBufferRequest_ > 0 ? new unsigned char[maxScratchBufferRequest_] : 0;
             i->size_ = maxScratchBufferRequest_;
 
-            LOGDEBUG("Resized scratch buffer to size " + String(maxScratchBufferRequest_));
+            URHO3D_LOGDEBUG("Resized scratch buffer to size " + String(maxScratchBufferRequest_));
         }
     }
 

Source/Urho3D/Graphics/Direct3D9/D3D9ShaderVariation.cpp

@@ -205,9 +205,9 @@ bool ShaderVariation::LoadByteCode(PODVector<unsigned>& byteCode, const String&
         file->Read(&byteCode[0], byteCodeSize);
 
         if (type_ == VS)
-            LOGDEBUG("Loaded cached vertex shader " + GetFullName());
+            URHO3D_LOGDEBUG("Loaded cached vertex shader " + GetFullName());
         else
-            LOGDEBUG("Loaded cached pixel shader " + GetFullName());
+            URHO3D_LOGDEBUG("Loaded cached pixel shader " + GetFullName());
 
         return true;
     }
@@ -289,9 +289,9 @@ bool ShaderVariation::Compile(PODVector<unsigned>& byteCode)
     else
     {
         if (type_ == VS)
-            LOGDEBUG("Compiled vertex shader " + GetFullName());
+            URHO3D_LOGDEBUG("Compiled vertex shader " + GetFullName());
         else
-            LOGDEBUG("Compiled pixel shader " + GetFullName());
+            URHO3D_LOGDEBUG("Compiled pixel shader " + GetFullName());
 
         // Inspect the produced bytecode using MojoShader, then strip and store it
         unsigned char* bufData = (unsigned char*)shaderCode->GetBufferPointer();

Source/Urho3D/Graphics/OcclusionBuffer.cpp

@@ -95,7 +95,7 @@ bool OcclusionBuffer::SetSize(int width, int height)
             break;
     }
 
-    LOGDEBUG("Set occlusion buffer size " + String(width_) + "x" + String(height_) + " with " +
+    URHO3D_LOGDEBUG("Set occlusion buffer size " + String(width_) + "x" + String(height_) + " with " +
              String(mipBuffers_.Size()) + " mip levels");
 
     CalculateViewport();

Source/Urho3D/Graphics/OpenGL/OGLGraphics.cpp

@@ -965,7 +965,7 @@ void Graphics::SetShaders(ShaderVariation* vs, ShaderVariation* ps)
 
             bool success = vs->Create();
             if (success)
-                LOGDEBUG("Compiled vertex shader " + vs->GetFullName());
+                URHO3D_LOGDEBUG("Compiled vertex shader " + vs->GetFullName());
             else
             {
                 LOGERROR("Failed to compile vertex shader " + vs->GetFullName() + ":\n" + vs->GetCompilerOutput());
@@ -984,7 +984,7 @@ void Graphics::SetShaders(ShaderVariation* vs, ShaderVariation* ps)
 
             bool success = ps->Create();
             if (success)
-                LOGDEBUG("Compiled pixel shader " + ps->GetFullName());
+                URHO3D_LOGDEBUG("Compiled pixel shader " + ps->GetFullName());
             else
             {
                 LOGERROR("Failed to compile pixel shader " + ps->GetFullName() + ":\n" + ps->GetCompilerOutput());
@@ -1032,7 +1032,7 @@ void Graphics::SetShaders(ShaderVariation* vs, ShaderVariation* ps)
             SharedPtr<ShaderProgram> newProgram(new ShaderProgram(this, vs, ps));
             if (newProgram->Link())
             {
-                LOGDEBUG("Linked vertex shader " + vs->GetFullName() + " and pixel shader " + ps->GetFullName());
+                URHO3D_LOGDEBUG("Linked vertex shader " + vs->GetFullName() + " and pixel shader " + ps->GetFullName());
                 // Note: Link() calls glUseProgram() to set the texture sampler uniforms,
                 // so it is not necessary to call it again
                 shaderProgram_ = newProgram;

Source/Urho3D/Graphics/Renderer.cpp

@@ -1010,7 +1010,7 @@ Texture* Renderer::GetScreenBuffer(int width, int height, unsigned format, bool
         newBuffer->ResetUseTimer();
         screenBuffers_[searchKey].Push(newBuffer);
 
-        LOGDEBUG("Allocated new screen buffer size " + String(width) + "x" + String(height) + " format " + String(format));
+        URHO3D_LOGDEBUG("Allocated new screen buffer size " + String(width) + "x" + String(height) + " format " + String(format));
         return newBuffer;
     }
     else
@@ -1288,7 +1288,7 @@ bool Renderer::ResizeInstancingBuffer(unsigned numInstances)
         return false;
     }
 
-    LOGDEBUG("Resized instancing buffer to " + String(newSize));
+    URHO3D_LOGDEBUG("Resized instancing buffer to " + String(newSize));
     return true;
 }
 
@@ -1417,7 +1417,7 @@ void Renderer::RemoveUnusedBuffers()
     {
         if (occlusionBuffers_[i]->GetUseTimer() > MAX_BUFFER_AGE)
         {
-            LOGDEBUG("Removed unused occlusion buffer");
+            URHO3D_LOGDEBUG("Removed unused occlusion buffer");
             occlusionBuffers_.Erase(i);
         }
     }
@@ -1431,7 +1431,7 @@ void Renderer::RemoveUnusedBuffers()
             Texture* buffer = buffers[j];
             if (buffer->GetUseTimer() > MAX_BUFFER_AGE)
             {
-                LOGDEBUG("Removed unused screen buffer size " + String(buffer->GetWidth()) + "x" + String(buffer->GetHeight()) +
+                URHO3D_LOGDEBUG("Removed unused screen buffer size " + String(buffer->GetWidth()) + "x" + String(buffer->GetHeight()) +
                          " format " + String(buffer->GetFormat()));
                 buffers.Erase(j);
             }
@@ -1497,7 +1497,7 @@ void Renderer::Initialize()
 
 void Renderer::LoadShaders()
 {
-    LOGDEBUG("Reloading shaders");
+    URHO3D_LOGDEBUG("Reloading shaders");
 
     // Release old material shaders, mark them for reload
     ReleaseMaterialShaders();

Source/Urho3D/Graphics/ShaderPrecache.cpp

@@ -106,7 +106,7 @@ void ShaderPrecache::StoreShaders(ShaderVariation* vs, ShaderVariation* ps)
 
 void ShaderPrecache::LoadShaders(Graphics* graphics, Deserializer& source)
 {
-    LOGDEBUG("Begin precaching shaders");
+    URHO3D_LOGDEBUG("Begin precaching shaders");
 
     XMLFile xmlFile(graphics->GetContext());
     xmlFile.Load(source);
@@ -138,7 +138,7 @@ void ShaderPrecache::LoadShaders(Graphics* graphics, Deserializer& source)
         shader = shader.GetNext("shader");
     }
 
-    LOGDEBUG("End precaching shaders");
+    URHO3D_LOGDEBUG("End precaching shaders");
 }
 
 }

Source/Urho3D/IO/FileSystem.cpp

@@ -340,7 +340,7 @@ bool FileSystem::CreateDir(const String& pathName)
 #endif
 
     if (success)
-        LOGDEBUG("Created directory " + pathName);
+        URHO3D_LOGDEBUG("Created directory " + pathName);
     else
         LOGERROR("Failed to create directory " + pathName);
 

Source/Urho3D/IO/FileWatcher.cpp

@@ -104,7 +104,7 @@ bool FileWatcher::StartWatching(const String& pathName, bool watchSubDirs)
         watchSubDirs_ = watchSubDirs;
         Run();
         
-        LOGDEBUG("Started watching path " + pathName);
+        URHO3D_LOGDEBUG("Started watching path " + pathName);
         return true;
     }
     else
@@ -153,7 +153,7 @@ bool FileWatcher::StartWatching(const String& pathName, bool watchSubDirs)
         }
         Run();
 
-        LOGDEBUG("Started watching path " + pathName);
+        URHO3D_LOGDEBUG("Started watching path " + pathName);
         return true;
     }
 #elif defined(__APPLE__) && !defined(IOS)
@@ -170,7 +170,7 @@ bool FileWatcher::StartWatching(const String& pathName, bool watchSubDirs)
         watchSubDirs_ = watchSubDirs;
         Run();
         
-        LOGDEBUG("Started watching path " + pathName);
+        URHO3D_LOGDEBUG("Started watching path " + pathName);
         return true;
     }
     else
@@ -183,7 +183,7 @@ bool FileWatcher::StartWatching(const String& pathName, bool watchSubDirs)
     return false;
 #endif
 #else
-    LOGDEBUG("FileWatcher feature not enabled");
+    URHO3D_LOGDEBUG("FileWatcher feature not enabled");
     return false;
 #endif
 }
@@ -213,7 +213,7 @@ void FileWatcher::StopWatching()
         CloseFileWatcher(watcher_);
 #endif
 
-        LOGDEBUG("Stopped watching path " + path_);
+        URHO3D_LOGDEBUG("Stopped watching path " + path_);
         path_.Clear();
     }
 }

Source/Urho3D/IO/Log.h

@@ -131,7 +131,7 @@ private:
 };
 
 #ifdef URHO3D_LOGGING
-#define LOGDEBUG(message) Urho3D::Log::Write(Urho3D::LOG_DEBUG, message)
+#define URHO3D_LOGDEBUG(message) Urho3D::Log::Write(Urho3D::LOG_DEBUG, message)
 #define LOGINFO(message) Urho3D::Log::Write(Urho3D::LOG_INFO, message)
 #define LOGWARNING(message) Urho3D::Log::Write(Urho3D::LOG_WARNING, message)
 #define LOGERROR(message) Urho3D::Log::Write(Urho3D::LOG_ERROR, message)
@@ -142,7 +142,7 @@ private:
 #define LOGERRORF(format, ...) Urho3D::Log::Write(Urho3D::LOG_ERROR, Urho3D::ToString(format, ##__VA_ARGS__))
 #define LOGRAWF(format, ...) Urho3D::Log::WriteRaw(Urho3D::ToString(format, ##__VA_ARGS__))
 #else
-#define LOGDEBUG(message) ((void)0)
+#define URHO3D_LOGDEBUG(message) ((void)0)
 #define LOGINFO(message) ((void)0)
 #define LOGWARNING(message) ((void)0)
 #define LOGERROR(message) ((void)0)

Source/Urho3D/Navigation/DynamicNavigationMesh.cpp

@@ -369,7 +369,7 @@ bool DynamicNavigationMesh::Build()
         // not doing so will cause dependent components to crash, like CrowdManager
         tileCache_->update(0, navMesh_);
 
-        LOGDEBUG("Built navigation mesh with " + String(numTiles) + " tiles");
+        URHO3D_LOGDEBUG("Built navigation mesh with " + String(numTiles) + " tiles");
 
         // Send a notification event to concerned parties that we've been fully rebuilt
         {
@@ -457,7 +457,7 @@ bool DynamicNavigationMesh::Build(const BoundingBox& boundingBox)
         }
     }
 
-    LOGDEBUG("Rebuilt " + String(numTiles) + " tiles of the navigation mesh");
+    URHO3D_LOGDEBUG("Rebuilt " + String(numTiles) + " tiles of the navigation mesh");
     return true;
 }
 

Source/Urho3D/Navigation/NavigationMesh.cpp

@@ -418,7 +418,7 @@ bool NavigationMesh::Build()
             }
         }
 
-        LOGDEBUG("Built navigation mesh with " + String(numTiles) + " tiles");
+        URHO3D_LOGDEBUG("Built navigation mesh with " + String(numTiles) + " tiles");
 
         // Send a notification event to concerned parties that we've been fully rebuilt
         {
@@ -472,7 +472,7 @@ bool NavigationMesh::Build(const BoundingBox& boundingBox)
         }
     }
 
-    LOGDEBUG("Rebuilt " + String(numTiles) + " tiles of the navigation mesh");
+    URHO3D_LOGDEBUG("Rebuilt " + String(numTiles) + " tiles of the navigation mesh");
     return true;
 }
 
@@ -770,7 +770,7 @@ void NavigationMesh::SetNavigationDataAttr(const PODVector<unsigned char>& value
             ++numTiles;
     }
 
-    LOGDEBUG("Created navigation mesh with " + String(numTiles) + " tiles from serialized data");
+    URHO3D_LOGDEBUG("Created navigation mesh with " + String(numTiles) + " tiles from serialized data");
 }
 
 PODVector<unsigned char> NavigationMesh::GetNavigationDataAttr() const

Source/Urho3D/Network/HttpRequest.cpp

@@ -51,7 +51,7 @@ HttpRequest::HttpRequest(const String& url, const String& verb, const Vector<Str
     // to maximum value once the request is done, signaling end for Deserializer::IsEof().
     size_ = M_MAX_UNSIGNED;
 
-    LOGDEBUG("HTTP " + verb_ + " request to URL " + url_);
+    URHO3D_LOGDEBUG("HTTP " + verb_ + " request to URL " + url_);
 
 #ifdef URHO3D_THREADING
     // Start the worker thread to actually create the connection and read the response data.

Source/Urho3D/Resource/BackgroundLoader.cpp

@@ -135,7 +135,7 @@ bool BackgroundLoader::QueueResource(StringHash type, const String& name, bool s
         return false;
     }
 
-    LOGDEBUG("Background loading resource " + name);
+    URHO3D_LOGDEBUG("Background loading resource " + name);
 
     item.resource_->SetName(name);
     item.resource_->SetAsyncLoadState(ASYNC_QUEUED);
@@ -193,7 +193,7 @@ void BackgroundLoader::WaitForResource(StringHash type, StringHash nameHash)
             }
 
             if (didWait)
-                LOGDEBUG("Waited " + String(waitTimer.GetUSec(false) / 1000) + " ms for background loaded resource " +
+                URHO3D_LOGDEBUG("Waited " + String(waitTimer.GetUSec(false) / 1000) + " ms for background loaded resource " +
                          resource->GetName());
         }
 
@@ -264,7 +264,7 @@ void BackgroundLoader::FinishBackgroundLoading(BackgroundLoadItem& item)
         if (profiler)
             profiler->BeginBlock(profileBlockName.CString());
 #endif
-        LOGDEBUG("Finishing background loaded resource " + resource->GetName());
+        URHO3D_LOGDEBUG("Finishing background loaded resource " + resource->GetName());
         success = resource->EndLoad();
 
 #ifdef URHO3D_PROFILING

Source/Urho3D/Resource/ResourceCache.cpp

@@ -397,7 +397,7 @@ void ResourceCache::ReloadResourceWithDependencies(const String& fileName)
     const SharedPtr<Resource>& resource = FindResource(fileNameHash);
     if (resource)
     {
-        LOGDEBUG("Reloading changed resource " + fileName);
+        URHO3D_LOGDEBUG("Reloading changed resource " + fileName);
         ReloadResource(resource);
     }
     // Always perform dependency resource check for resource loaded from XML file as it could be used in inheritance
@@ -421,7 +421,7 @@ void ResourceCache::ReloadResourceWithDependencies(const String& fileName)
 
             for (unsigned k = 0; k < dependents.Size(); ++k)
             {
-                LOGDEBUG("Reloading resource " + dependents[k]->GetName() + " depending on " + fileName);
+                URHO3D_LOGDEBUG("Reloading resource " + dependents[k]->GetName() + " depending on " + fileName);
                 ReloadResource(dependents[k]);
             }
         }
@@ -603,7 +603,7 @@ Resource* ResourceCache::GetResource(StringHash type, const String& nameIn, bool
     if (!file)
         return 0;   // Error is already logged
 
-    LOGDEBUG("Loading resource " + name);
+    URHO3D_LOGDEBUG("Loading resource " + name);
     resource->SetName(name);
 
     if (!resource->Load(*(file.Get())))
@@ -682,7 +682,7 @@ SharedPtr<Resource> ResourceCache::GetTempResource(StringHash type, const String
     if (!file)
         return SharedPtr<Resource>();  // Error is already logged
 
-    LOGDEBUG("Loading temporary resource " + name);
+    URHO3D_LOGDEBUG("Loading temporary resource " + name);
     resource->SetName(file->GetName());
 
     if (!resource->Load(*(file.Get())))
@@ -996,7 +996,7 @@ void ResourceCache::UpdateResourceGroup(StringHash type)
         if (i->second_.memoryBudget_ && i->second_.memoryUse_ > i->second_.memoryBudget_ &&
             oldestResource != i->second_.resources_.End())
         {
-            LOGDEBUG("Resource group " + oldestResource->second_->GetTypeName() + " over memory budget, releasing resource " +
+            URHO3D_LOGDEBUG("Resource group " + oldestResource->second_->GetTypeName() + " over memory budget, releasing resource " +
                      oldestResource->second_->GetName());
             i->second_.resources_.Erase(oldestResource);
         }

Source/Urho3D/UI/UI.cpp

@@ -483,7 +483,7 @@ SharedPtr<UIElement> UI::LoadLayout(XMLFile* file, XMLFile* styleFile)
         return root;
     }
 
-    LOGDEBUG("Loading UI layout " + file->GetName());
+    URHO3D_LOGDEBUG("Loading UI layout " + file->GetName());
 
     XMLElement rootElem = file->GetRoot("element");
     if (!rootElem)
@@ -989,7 +989,7 @@ void UI::SetCursorShape(CursorShape shape)
 
 void UI::ReleaseFontFaces()
 {
-    LOGDEBUG("Reloading font faces");
+    URHO3D_LOGDEBUG("Reloading font faces");
 
     PODVector<Font*> fonts;
     GetSubsystem<ResourceCache>()->GetResources<Font>(fonts);