Skip to content

Commit f7b98a1

Browse files
committed
Rename SetLastMessage to PrintMessage
Same for SetLastWarning.
1 parent becdb0d commit f7b98a1

27 files changed

Lines changed: 69 additions & 71 deletions

File tree

3DRadSpace/3DRadSpace_AngelscriptPlugin/AngelscriptWrapper.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ using namespace Engine3DRadSpace::Math;
1919
void AngelScriptWrapper_MessageCallback(const asSMessageInfo* msg, void* param)
2020
{
2121
if(msg->type == asMSGTYPE_WARNING)
22-
SetLastWarning(std::format("({}, {}) : Warning {}", msg->section, msg->row, msg->col, msg->message));
22+
PrintWarning(std::format("({}, {}) : Warning {}", msg->section, msg->row, msg->col, msg->message));
2323
else if(msg->type == asMSGTYPE_INFORMATION)
24-
SetLastMessage(std::format("({}, {}) : Information {}", msg->section, msg->row, msg->col, msg->message));
24+
PrintMessage(std::format("({}, {}) : Information {}", msg->section, msg->row, msg->col, msg->message));
2525
if(msg->type == asMSGTYPE_ERROR)
26-
SetLastWarning(std::format("({}, {}) : Error {}", msg->section, msg->row, msg->col, msg->message));
26+
PrintWarning(std::format("({}, {}) : Error {}", msg->section, msg->row, msg->col, msg->message));
2727
}
2828

2929
static void v2ctor_def(Vector2* self)

3DRadSpace/3DRadSpace_CSharp/Internal/ScriptManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ public static byte InvokeScriptMethod(int scriptId, IntPtr methodName)
167167
/// <summary>
168168
/// Sets a warning message in the engine's logging system.
169169
/// </summary>
170-
private static void SetWarning(string message)
170+
private static void PrintWarning(string message)
171171
{
172172
var warning = new Warning(message, 0, 1, IntPtr.Zero);
173-
Warning.SetLastWarning(ref warning);
173+
Warning.PrintWarning(ref warning);
174174
}
175175

176176
private class ScriptInstance

3DRadSpace/3DRadSpace_CSharp/Logging/Message.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ public Message(string details, int code, IntPtr extra)
1717
Extra = extra;
1818
}
1919

20-
[DllImport("3DRadSpace.FFI.dll", CharSet = CharSet.Ansi, EntryPoint = "E3DRSP_SetLastMessage")]
21-
public extern static void SetLastMessage(ref Message msg);
20+
[DllImport("3DRadSpace.FFI.dll", CharSet = CharSet.Ansi, EntryPoint = "E3DRSP_PrintMessage")]
21+
public extern static void PrintMessage(ref Message msg);
2222
}

3DRadSpace/3DRadSpace_CSharp/Logging/Warning.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ public Warning(string details, int code, int severity, IntPtr extra)
1919
Extra = extra;
2020
}
2121

22-
[DllImport("3DRadSpace.FFI.dll", CharSet = CharSet.Ansi, EntryPoint = "E3DRSP_SetLastWarning")]
23-
public extern static void SetLastWarning(ref Warning wrn);
22+
[DllImport("3DRadSpace.FFI.dll", CharSet = CharSet.Ansi, EntryPoint = "E3DRSP_PrintWarning")]
23+
public extern static void PrintWarning(ref Warning wrn);
2424
}

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Frontend/Windows/EditObjectDialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void EditObjectDialog::createForms()
143143
SetWindowTextA(window, attribute->FieldDesc().c_str());
144144
break;
145145
case 3:
146-
Logging::SetLastWarning("CustomWindow attribute is not supported in EditObjectDialog. Ignoring.");
146+
Logging::PrintWarning("CustomWindow attribute is not supported in EditObjectDialog. Ignoring.");
147147
break;
148148
default:
149149
break;

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Main.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void LoadAllPlugins()
9191
}
9292
}
9393

94-
Logging::SetLastMessage(std::format("Found {} plugins:", numPlugins));
94+
Logging::PrintMessage(std::format("Found {} plugins:", numPlugins));
9595

9696
dirIterator = std::filesystem::directory_iterator("Plugins");
9797

@@ -109,10 +109,10 @@ void LoadAllPlugins()
109109
auto& [info, handle] = plugin;
110110
plugins.push_back(handle);
111111

112-
Logging::SetLastMessage(std::format("Loaded plugin {} ver {} handle 0x{:x}", info.Name, info.Version, reinterpret_cast<intptr_t>(handle)));
112+
Logging::PrintMessage(std::format("Loaded plugin {} ver {} handle 0x{:x}", info.Name, info.Version, reinterpret_cast<intptr_t>(handle)));
113113

114114
auto numLoadedObjects = Plugins::LoadCustomObjectsFromLibHandle(handle);
115-
Logging::SetLastMessage(std::format("Loaded {} custom object types from plugin {}", numLoadedObjects, info.Name));
115+
Logging::PrintMessage(std::format("Loaded {} custom object types from plugin {}", numLoadedObjects, info.Name));
116116

117117
return plugin;
118118
}
@@ -134,7 +134,7 @@ void LoadAllPlugins()
134134
break;
135135
}
136136

137-
Logging::SetLastWarning(std::format("Failed to load plugin at {}!\r\n{}", file.string(), msg));
137+
Logging::PrintWarning(std::format("Failed to load plugin at {}!\r\n{}", file.string(), msg));
138138
return std::unexpected(err);
139139
}
140140
);
@@ -205,7 +205,7 @@ int __stdcall WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
205205
auto f = Native::GetFunctionFromLibrary<Plugins::PluginUnload>(plugin, "PluginUnload");
206206
if (f != nullptr)
207207
{
208-
if (!f()) Logging::SetLastMessage(std::format("PluginUnload() returned false! Handle {:x}", reinterpret_cast<intptr_t>(plugin)));
208+
if (!f()) Logging::PrintMessage(std::format("PluginUnload() returned false! Handle {:x}", reinterpret_cast<intptr_t>(plugin)));
209209
}
210210
}
211211

3DRadSpace/Engine3DRadSpace/Content/ContentManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void ContentManager::Reload(unsigned id)
5757
auto uuid = _assets[id].Entry->GetUUID();
5858
auto path = _assets[id].Path;
5959

60-
Logging::SetLastMessage(std::format("Loaded asset ID {} path {} UUID {}", id, path.string(), uuid));
60+
Logging::PrintMessage(std::format("Loaded asset ID {} path {} UUID {}", id, path.string(), uuid));
6161
auto asset = _factory.Create(uuid, path);
6262
_assets[id].Entry.reset(asset);
6363
}

3DRadSpace/Engine3DRadSpace/FFI/Logging/Message.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
using namespace Engine3DRadSpace::Logging;
55

6-
void E3DRSP_SetLastMessage(const E3DRSP_Message* message)
6+
void E3DRSP_PrintMessage(const E3DRSP_Message* message)
77
{
8-
SetLastMessage(Message(
8+
PrintMessage(Message(
99
message->Code,
1010
message->Details,
1111
message->Extra

3DRadSpace/Engine3DRadSpace/FFI/Logging/Message.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ typedef struct E3DRSP_Message
1212
extern "C"
1313
{
1414
#endif
15-
void E3DRSP_FFI_EXPORT E3DRSP_SetLastMessage(const E3DRSP_Message* message);
15+
void E3DRSP_FFI_EXPORT E3DRSP_PrintMessage(const E3DRSP_Message* message);
1616
#ifdef __cplusplus
1717
}
1818
#endif

3DRadSpace/Engine3DRadSpace/FFI/Logging/Warning.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
using namespace Engine3DRadSpace::Logging;
55

6-
void E3DRSP_SetLastWarning(const E3DRSP_Warning* warning)
6+
void E3DRSP_PrintWarning(const E3DRSP_Warning* warning)
77
{
8-
SetLastWarning(Warning(
8+
PrintWarning(Warning(
99
warning->Code,
1010
warning->Details,
1111
warning->Severity,

0 commit comments

Comments
 (0)