townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

LOGINFO -> URHO3D_LOGINFO

Browse Source
This commit is contained in:
Ivan K 2015-10-22 23:59:47 +04:00
parent 0c3f67abfe
commit d53fc4b94b
19 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Tools/SpritePacker/SpritePacker.cpp
View File

@ -174,7 +174,7 @@ void Run(Vector<String>& arguments)
if (inputFiles.Size() > 1)
{
outputFile = inputFiles[inputFiles.Size() - 1];
LOGINFO("Output file set to " + outputFile + ".");
URHO3D_LOGINFO("Output file set to " + outputFile + ".");
inputFiles.Erase(inputFiles.Size() - 1);
}
@ -188,7 +188,7 @@ void Run(Vector<String>& arguments)
// check all input files exist
for (unsigned i = 0; i < inputFiles.Size(); ++i)
{
LOGINFO("Checking " + inputFiles[i] + " to see if file exists.");
URHO3D_LOGINFO("Checking " + inputFiles[i] + " to see if file exists.");
if (!fileSystem->FileExists(inputFiles[i]))
ErrorExit("File " + inputFiles[i] + " does not exist.");
}
@ -362,7 +362,7 @@ void Run(Vector<String>& arguments)
subTexture.SetInt("offsetY", packerInfo->offsetY);
}
LOGINFO("Transfering " + packerInfo->path + " to sprite sheet.");
URHO3D_LOGINFO("Transfering " + packerInfo->path + " to sprite sheet.");
File file(context, packerInfo->path);
Image image(context);
@ -386,7 +386,7 @@ void Run(Vector<String>& arguments)
unsigned OUTER_BOUNDS_DEBUG_COLOR = Color::BLUE.ToUInt();
unsigned INNER_BOUNDS_DEBUG_COLOR = Color::GREEN.ToUInt();
LOGINFO("Drawing debug information.");
URHO3D_LOGINFO("Drawing debug information.");
for (unsigned i = 0; i < packerInfos.Size(); ++i)
{
SharedPtr<PackerInfo> packerInfo = packerInfos[i];
@ -417,10 +417,10 @@ void Run(Vector<String>& arguments)
}
}
LOGINFO("Saving output image.");
URHO3D_LOGINFO("Saving output image.");
spriteSheetImage.SavePNG(outputFile);
LOGINFO("Saving SpriteSheet xml file.");
URHO3D_LOGINFO("Saving SpriteSheet xml file.");
File spriteSheetFile(context);
spriteSheetFile.Open(spriteSheetFileName, FILE_WRITE);
xml.Save(spriteSheetFile);

2
Source/Urho3D/AngelScript/Script.cpp
View File

@ -236,7 +236,7 @@ void Script::MessageCallback(const asSMessageInfo* msg)
break;
default:
LOGINFO(message);
URHO3D_LOGINFO(message);
break;
}
}

4
Source/Urho3D/AngelScript/ScriptFile.cpp
View File

@ -161,7 +161,7 @@ bool ScriptFile::EndLoad()
if (scriptModule_->LoadByteCode(&deserializer) >= 0)
{
LOGINFO("Loaded script module " + GetName() + " from bytecode");
URHO3D_LOGINFO("Loaded script module " + GetName() + " from bytecode");
success = true;
}
}
@ -170,7 +170,7 @@ bool ScriptFile::EndLoad()
int result = scriptModule_->Build();
if (result >= 0)
{
LOGINFO("Compiled script module " + GetName());
URHO3D_LOGINFO("Compiled script module " + GetName());
success = true;
}
else

2
Source/Urho3D/Audio/Audio.cpp
View File

@ -133,7 +133,7 @@ bool Audio::SetMode(int bufferLengthMSec, int mixRate, bool stereo, bool interpo
interpolation_ = interpolation;
clipBuffer_ = new int[stereo ? fragmentSize_ << 1 : fragmentSize_];
LOGINFO("Set audio mode " + String(mixRate_) + " Hz " + (stereo_ ? "stereo" : "mono") + " " +
URHO3D_LOGINFO("Set audio mode " + String(mixRate_) + " Hz " + (stereo_ ? "stereo" : "mono") + " " +
(interpolation_ ? "interpolated" : ""));
return Play();

2
Source/Urho3D/Engine/Engine.cpp
View File

@ -409,7 +409,7 @@ bool Engine::Initialize(const VariantMap& parameters)
frameTimer_.Reset();
LOGINFO("Initialized engine");
URHO3D_LOGINFO("Initialized engine");
initialized_ = true;
return true;
}

2
Source/Urho3D/Graphics/Direct3D11/D3D11Graphics.cpp
View File

@ -489,7 +489,7 @@ bool Graphics::SetMode(int width, int height, bool fullscreen, bool borderless,
msg.Append(" resizable");
if (multiSample > 1)
msg.AppendWithFormat(" multisample %d", multiSample);
LOGINFO(msg);
URHO3D_LOGINFO(msg);
#endif
using namespace ScreenMode;

6
Source/Urho3D/Graphics/Direct3D9/D3D9Graphics.cpp
View File

@ -562,7 +562,7 @@ bool Graphics::SetMode(int width, int height, bool fullscreen, bool borderless,
msg.Append(" resizable");
if (multiSample > 1)
msg.AppendWithFormat(" multisample %d", multiSample);
LOGINFO(msg);
URHO3D_LOGINFO(msg);
#endif
using namespace ScreenMode;
@ -2488,7 +2488,7 @@ bool Graphics::CreateDevice(unsigned adapter, unsigned deviceType)
OnDeviceReset();
LOGINFO("Created Direct3D9 device");
URHO3D_LOGINFO("Created Direct3D9 device");
return true;
}
@ -2588,7 +2588,7 @@ void Graphics::ResetDevice()
void Graphics::OnDeviceLost()
{
LOGINFO("Device lost");
URHO3D_LOGINFO("Device lost");
if (impl_->defaultColorSurface_)
{

4
Source/Urho3D/Graphics/OpenGL/OGLGraphics.cpp
View File

@ -546,7 +546,7 @@ bool Graphics::SetMode(int width, int height, bool fullscreen, bool borderless,
msg.Append(" resizable");
if (multiSample > 1)
msg.AppendWithFormat(" multisample %d", multiSample);
LOGINFO(msg);
URHO3D_LOGINFO(msg);
#endif
using namespace ScreenMode;
@ -2382,7 +2382,7 @@ void Graphics::Release(bool clearGPUObjects, bool closeWindow)
{
// Do not log this message if we are exiting
if (!clearGPUObjects)
LOGINFO("OpenGL context lost");
URHO3D_LOGINFO("OpenGL context lost");
SDL_GL_DeleteContext(impl_->context_);
impl_->context_ = 0;

2
Source/Urho3D/Graphics/Renderer.cpp
View File

@ -1492,7 +1492,7 @@ void Renderer::Initialize()
SubscribeToEvent(E_RENDERUPDATE, URHO3D_HANDLER(Renderer, HandleRenderUpdate));
LOGINFO("Initialized renderer");
URHO3D_LOGINFO("Initialized renderer");
}
void Renderer::LoadShaders()

4
Source/Urho3D/Graphics/ShaderPrecache.cpp
View File

@ -61,12 +61,12 @@ ShaderPrecache::ShaderPrecache(Context* context, const String& fileName) :
if (!xmlFile_.GetRoot())
xmlFile_.CreateRoot("shaders");
LOGINFO("Begin dumping shaders to " + fileName_);
URHO3D_LOGINFO("Begin dumping shaders to " + fileName_);
}
ShaderPrecache::~ShaderPrecache()
{
LOGINFO("End dumping shaders");
URHO3D_LOGINFO("End dumping shaders");
if (usedCombinations_.Empty())
return;

4
Source/Urho3D/IO/Log.h
View File

@ -132,7 +132,7 @@ private:
#ifdef URHO3D_LOGGING
#define URHO3D_LOGDEBUG(message) Urho3D::Log::Write(Urho3D::LOG_DEBUG, message)
#define LOGINFO(message) Urho3D::Log::Write(Urho3D::LOG_INFO, message)
#define URHO3D_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)
#define LOGRAW(message) Urho3D::Log::WriteRaw(message)
@ -143,7 +143,7 @@ private:
#define LOGRAWF(format, ...) Urho3D::Log::WriteRaw(Urho3D::ToString(format, ##__VA_ARGS__))
#else
#define URHO3D_LOGDEBUG(message) ((void)0)
#define LOGINFO(message) ((void)0)
#define URHO3D_LOGINFO(message) ((void)0)
#define LOGWARNING(message) ((void)0)
#define LOGERROR(message) ((void)0)
#define LOGRAW(message) ((void)0)

2
Source/Urho3D/Input/Input.cpp
View File

@ -1184,7 +1184,7 @@ void Input::Initialize()
SubscribeToEvent(E_BEGINFRAME, URHO3D_HANDLER(Input, HandleBeginFrame));
LOGINFO("Initialized input");
URHO3D_LOGINFO("Initialized input");
}
void Input::ResetJoysticks()

4
Source/Urho3D/LuaScript/LuaFile.cpp
View File

@ -108,7 +108,7 @@ bool LuaFile::LoadChunk(lua_State* luaState)
return false;
}
LOGINFO("Loaded Lua script " + GetName());
URHO3D_LOGINFO("Loaded Lua script " + GetName());
hasLoaded_ = true;
return true;
@ -130,7 +130,7 @@ bool LuaFile::LoadAndExecute(lua_State* luaState)
return false;
}
LOGINFO("Executed Lua script " + GetName());
URHO3D_LOGINFO("Executed Lua script " + GetName());
hasExecuted_ = true;
return true;

8
Source/Urho3D/LuaScript/LuaScript.cpp
View File

@ -251,20 +251,20 @@ bool LuaScript::LoadRawFile(const String& fileName)
{
URHO3D_PROFILE(LoadRawFile);
LOGINFO("Finding Lua file on file system: " + fileName);
URHO3D_LOGINFO("Finding Lua file on file system: " + fileName);
ResourceCache* cache = GetSubsystem<ResourceCache>();
String filePath = cache->GetResourceFileName(fileName);
if (filePath.Empty())
{
LOGINFO("Lua file not found: " + fileName);
URHO3D_LOGINFO("Lua file not found: " + fileName);
return false;
}
filePath = GetNativePath(filePath);
LOGINFO("Loading Lua file from file system: " + filePath);
URHO3D_LOGINFO("Loading Lua file from file system: " + filePath);
if (luaL_loadfile(luaState_, filePath.CString()))
{
@ -274,7 +274,7 @@ bool LuaScript::LoadRawFile(const String& fileName)
return false;
}
LOGINFO("Lua file loaded: " + filePath);
URHO3D_LOGINFO("Lua file loaded: " + filePath);
return true;
}

12
Source/Urho3D/Network/Connection.cpp
View File

@ -293,7 +293,7 @@ void Connection::SendRemoteEvents()
sprintf(statsBuffer, "RTT %.3f ms Pkt in %d Pkt out %d Data in %.3f KB/s Data out %.3f KB/s", connection_->RoundTripTime(),
(int)connection_->PacketsInPerSec(),
(int)connection_->PacketsOutPerSec(), connection_->BytesInPerSec() / 1000.0f, connection_->BytesOutPerSec() / 1000.0f);
LOGINFO(statsBuffer);
URHO3D_LOGINFO(statsBuffer);
}
#endif
@ -760,7 +760,7 @@ void Connection::ProcessPackageDownload(int msgID, MemoryBuffer& msg)
return;
}
LOGINFO("Transmitting package file " + name + " to client " + ToString());
URHO3D_LOGINFO("Transmitting package file " + name + " to client " + ToString());
uploads_[nameHash].file_ = file;
uploads_[nameHash].fragment_ = 0;
@ -827,7 +827,7 @@ void Connection::ProcessPackageDownload(int msgID, MemoryBuffer& msg)
// Check if all fragments received
if (download.receivedFragments_.Size() == download.totalFragments_)
{
LOGINFO("Package " + download.name_ + " downloaded successfully");
URHO3D_LOGINFO("Package " + download.name_ + " downloaded successfully");
// Instantiate the package and add to the resource system, as we will need it to load the scene
download.file_->Close();
@ -841,7 +841,7 @@ void Connection::ProcessPackageDownload(int msgID, MemoryBuffer& msg)
{
PackageDownload& nextDownload = downloads_.Begin()->second_;
LOGINFO("Requesting package " + nextDownload.name_ + " from server");
URHO3D_LOGINFO("Requesting package " + nextDownload.name_ + " from server");
msg_.Clear();
msg_.WriteString(nextDownload.name_);
SendMessage(MSG_REQUESTPACKAGE, true, true, msg_);
@ -919,7 +919,7 @@ void Connection::ProcessSceneLoaded(int msgID, MemoryBuffer& msg)
if (checksum != scene_->GetChecksum())
{
LOGINFO("Scene checksum error from client " + ToString());
URHO3D_LOGINFO("Scene checksum error from client " + ToString());
msg_.Clear();
SendMessage(MSG_SCENECHECKSUMERROR, true, true, msg_);
OnSceneLoadFailed();
@ -1461,7 +1461,7 @@ void Connection::RequestPackage(const String& name, unsigned fileSize, unsigned
// Start download now only if no existing downloads, else wait for the existing ones to finish
if (downloads_.Size() == 1)
{
LOGINFO("Requesting package " + name + " from server");
URHO3D_LOGINFO("Requesting package " + name + " from server");
msg_.Clear();
msg_.WriteString(name);
SendMessage(MSG_REQUESTPACKAGE, true, true, msg_);

14
Source/Urho3D/Network/Network.cpp
View File

@ -173,7 +173,7 @@ void Network::NewConnectionEstablished(kNet::MessageConnection* connection)
SharedPtr<Connection> newConnection(new Connection(context_, true, kNet::SharedPtr<kNet::MessageConnection>(connection)));
newConnection->ConfigureNetworkSimulator(simulatedLatency_, simulatedPacketLoss_);
clientConnections_[connection] = newConnection;
LOGINFO("Client " + newConnection->ToString() + " connected");
URHO3D_LOGINFO("Client " + newConnection->ToString() + " connected");
using namespace ClientConnected;
@ -191,7 +191,7 @@ void Network::ClientDisconnected(kNet::MessageConnection* connection)
if (i != clientConnections_.End())
{
Connection* connection = i->second_;
LOGINFO("Client " + connection->ToString() + " disconnected");
URHO3D_LOGINFO("Client " + connection->ToString() + " disconnected");
using namespace ClientDisconnected;
@ -223,7 +223,7 @@ bool Network::Connect(const String& address, unsigned short port, Scene* scene,
serverConnection_->SetConnectPending(true);
serverConnection_->ConfigureNetworkSimulator(simulatedLatency_, simulatedPacketLoss_);
LOGINFO("Connecting to server " + serverConnection_->ToString());
URHO3D_LOGINFO("Connecting to server " + serverConnection_->ToString());
return true;
}
else
@ -252,7 +252,7 @@ bool Network::StartServer(unsigned short port)
if (network_->StartServer(port, kNet::SocketOverUDP, this, true) != 0)
{
LOGINFO("Started server on port " + String(port));
URHO3D_LOGINFO("Started server on port " + String(port));
return true;
}
else
@ -271,7 +271,7 @@ void Network::StopServer()
clientConnections_.Clear();
network_->StopServer();
LOGINFO("Stopped server");
URHO3D_LOGINFO("Stopped server");
}
void Network::BroadcastMessage(int msgID, bool reliable, bool inOrder, const VectorBuffer& msg, unsigned contentID)
@ -558,7 +558,7 @@ void Network::OnServerConnected()
{
serverConnection_->SetConnectPending(false);
LOGINFO("Connected to server");
URHO3D_LOGINFO("Connected to server");
// Send the identity map now
VectorBuffer msg;
@ -576,7 +576,7 @@ void Network::OnServerDisconnected()
if (!failedConnect)
{
LOGINFO("Disconnected from server");
URHO3D_LOGINFO("Disconnected from server");
SendEvent(E_SERVERDISCONNECTED);
}
else

10
Source/Urho3D/Resource/ResourceCache.cpp
View File

@ -127,7 +127,7 @@ bool ResourceCache::AddResourceDir(const String& pathName, unsigned priority)
fileWatchers_.Push(watcher);
}
LOGINFO("Added resource path " + fixedPath);
URHO3D_LOGINFO("Added resource path " + fixedPath);
return true;
}
@ -144,7 +144,7 @@ bool ResourceCache::AddPackageFile(PackageFile* package, unsigned priority)
else
packages_.Push(SharedPtr<PackageFile>(package));
LOGINFO("Added resource package " + package->GetName());
URHO3D_LOGINFO("Added resource package " + package->GetName());
return true;
}
@ -195,7 +195,7 @@ void ResourceCache::RemoveResourceDir(const String& pathName)
break;
}
}
LOGINFO("Removed resource path " + fixedPath);
URHO3D_LOGINFO("Removed resource path " + fixedPath);
return;
}
}
@ -211,7 +211,7 @@ void ResourceCache::RemovePackageFile(PackageFile* package, bool releaseResource
{
if (releaseResources)
ReleasePackageResources(*i, forceRelease);
LOGINFO("Removed resource package " + (*i)->GetName());
URHO3D_LOGINFO("Removed resource package " + (*i)->GetName());
packages_.Erase(i);
return;
}
@ -231,7 +231,7 @@ void ResourceCache::RemovePackageFile(const String& fileName, bool releaseResour
{
if (releaseResources)
ReleasePackageResources(*i, forceRelease);
LOGINFO("Removed resource package " + (*i)->GetName());
URHO3D_LOGINFO("Removed resource package " + (*i)->GetName());
packages_.Erase(i);
return;
}

16
Source/Urho3D/Scene/Scene.cpp
View File

@ -123,7 +123,7 @@ bool Scene::Load(Deserializer& source, bool setInstanceDefault)
return false;
}
LOGINFO("Loading scene from " + source.GetName());
URHO3D_LOGINFO("Loading scene from " + source.GetName());
Clear();
@ -150,7 +150,7 @@ bool Scene::Save(Serializer& dest) const
Deserializer* ptr = dynamic_cast<Deserializer*>(&dest);
if (ptr)
LOGINFO("Saving scene to " + ptr->GetName());
URHO3D_LOGINFO("Saving scene to " + ptr->GetName());
if (Node::Save(dest))
{
@ -206,7 +206,7 @@ bool Scene::LoadXML(Deserializer& source)
if (!xml->Load(source))
return false;
LOGINFO("Loading scene from " + source.GetName());
URHO3D_LOGINFO("Loading scene from " + source.GetName());
Clear();
@ -230,7 +230,7 @@ bool Scene::SaveXML(Serializer& dest, const String& indentation) const
Deserializer* ptr = dynamic_cast<Deserializer*>(&dest);
if (ptr)
LOGINFO("Saving scene to " + ptr->GetName());
URHO3D_LOGINFO("Saving scene to " + ptr->GetName());
if (xml->Save(dest, indentation))
{
@ -267,7 +267,7 @@ bool Scene::LoadAsync(File* file, LoadMode mode)
if (mode > LOAD_RESOURCES_ONLY)
{
LOGINFO("Loading scene from " + file->GetName());
URHO3D_LOGINFO("Loading scene from " + file->GetName());
Clear();
}
@ -307,7 +307,7 @@ bool Scene::LoadAsync(File* file, LoadMode mode)
{
URHO3D_PROFILE(FindResourcesToPreload);
LOGINFO("Preloading resources from " + file->GetName());
URHO3D_LOGINFO("Preloading resources from " + file->GetName());
PreloadResources(file, isSceneFile);
}
@ -330,7 +330,7 @@ bool Scene::LoadAsyncXML(File* file, LoadMode mode)
if (mode > LOAD_RESOURCES_ONLY)
{
LOGINFO("Loading scene from " + file->GetName());
URHO3D_LOGINFO("Loading scene from " + file->GetName());
Clear();
}
@ -376,7 +376,7 @@ bool Scene::LoadAsyncXML(File* file, LoadMode mode)
{
URHO3D_PROFILE(FindResourcesToPreload);
LOGINFO("Preloading resources from " + file->GetName());
URHO3D_LOGINFO("Preloading resources from " + file->GetName());
PreloadResourcesXML(xml->GetRoot());
}

2
Source/Urho3D/UI/UI.cpp
View File

@ -710,7 +710,7 @@ void UI::Initialize()
SubscribeToEvent(E_POSTUPDATE, URHO3D_HANDLER(UI, HandlePostUpdate));
SubscribeToEvent(E_RENDERUPDATE, URHO3D_HANDLER(UI, HandleRenderUpdate));
LOGINFO("Initialized user interface");
URHO3D_LOGINFO("Initialized user interface");
}
void UI::Update(float timeStep, UIElement* element)