Skip to content

Commit f294a99

Browse files
eduardodoriaeduardodoria
committed
Renamed S macros
1 parent a86aad4 commit f294a99

14 files changed

Lines changed: 754 additions & 754 deletions

File tree

‎editor/Platform.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ void editor::Platform::platformLog(const int type, const char *fmt, va_list args
3838
vsnprintf(buf, sizeof(buf), fmt, args);
3939

4040
switch (type) {
41-
case S_LOG_WARN:
41+
case D_LOG_WARN:
4242
editor::Out::warning(buf);
4343
break;
44-
case S_LOG_ERROR:
44+
case D_LOG_ERROR:
4545
editor::Out::error(buf);
4646
break;
4747
default:

‎editor/window/SceneWindow.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -547,19 +547,19 @@ void editor::SceneWindow::forwardPlayKeyboardInput(ImGuiIO& io, int mods){
547547
}
548548
};
549549

550-
forwardKeyPress(ImGuiKey_Tab, S_KEY_TAB, L'\t', false);
551-
forwardKeyPress(ImGuiKey_Backspace, S_KEY_BACKSPACE, L'\b');
552-
forwardKeyPress(ImGuiKey_Enter, S_KEY_ENTER, L'\r', false);
553-
forwardKeyPress(ImGuiKey_KeypadEnter, S_KEY_ENTER, L'\r', false);
554-
forwardKeyPress(ImGuiKey_Escape, S_KEY_ESCAPE, L'\e', false);
555-
forwardKeyPress(ImGuiKey_LeftArrow, S_KEY_LEFT);
556-
forwardKeyPress(ImGuiKey_RightArrow, S_KEY_RIGHT);
557-
forwardKeyPress(ImGuiKey_Home, S_KEY_HOME, 0, false);
558-
forwardKeyPress(ImGuiKey_End, S_KEY_END, 0, false);
559-
forwardKeyPress(ImGuiKey_Delete, S_KEY_DELETE);
560-
561-
if ((mods & S_MODIFIER_CONTROL) != 0){
562-
forwardKeyPress(ImGuiKey_A, S_KEY_A, 0, false);
550+
forwardKeyPress(ImGuiKey_Tab, D_KEY_TAB, L'\t', false);
551+
forwardKeyPress(ImGuiKey_Backspace, D_KEY_BACKSPACE, L'\b');
552+
forwardKeyPress(ImGuiKey_Enter, D_KEY_ENTER, L'\r', false);
553+
forwardKeyPress(ImGuiKey_KeypadEnter, D_KEY_ENTER, L'\r', false);
554+
forwardKeyPress(ImGuiKey_Escape, D_KEY_ESCAPE, L'\e', false);
555+
forwardKeyPress(ImGuiKey_LeftArrow, D_KEY_LEFT);
556+
forwardKeyPress(ImGuiKey_RightArrow, D_KEY_RIGHT);
557+
forwardKeyPress(ImGuiKey_Home, D_KEY_HOME, 0, false);
558+
forwardKeyPress(ImGuiKey_End, D_KEY_END, 0, false);
559+
forwardKeyPress(ImGuiKey_Delete, D_KEY_DELETE);
560+
561+
if ((mods & D_MODIFIER_CONTROL) != 0){
562+
forwardKeyPress(ImGuiKey_A, D_KEY_A, 0, false);
563563
}
564564
}
565565

@@ -586,10 +586,10 @@ void editor::SceneWindow::sceneEventHandler(SceneProject* sceneProject) {
586586
float y = mousePos.y - windowPos.y;
587587

588588
int mods = 0;
589-
if (io.KeyShift) mods |= S_MODIFIER_SHIFT;
590-
if (io.KeyCtrl) mods |= S_MODIFIER_CONTROL;
591-
if (io.KeyAlt) mods |= S_MODIFIER_ALT;
592-
if (io.KeySuper) mods |= S_MODIFIER_SUPER;
589+
if (io.KeyShift) mods |= D_MODIFIER_SHIFT;
590+
if (io.KeyCtrl) mods |= D_MODIFIER_CONTROL;
591+
if (io.KeyAlt) mods |= D_MODIFIER_ALT;
592+
if (io.KeySuper) mods |= D_MODIFIER_SUPER;
593593

594594
Engine::systemMouseMove(x, y, mods);
595595

‎engine/core/Engine.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -919,9 +919,9 @@ void Engine::systemTouchStart(int pointer, float x, float y){
919919
//-----------------
920920
if (Engine::isCallMouseInTouchEvent()){
921921
//-----------------
922-
Input::addMousePressed(S_MOUSE_BUTTON_1);
922+
Input::addMousePressed(D_MOUSE_BUTTON_1);
923923
Input::setMousePosition(x, y);
924-
Engine::onMouseDown.call(S_MOUSE_BUTTON_1, x, y, 0);
924+
Engine::onMouseDown.call(D_MOUSE_BUTTON_1, x, y, 0);
925925
//-----------------
926926
}
927927
}
@@ -946,9 +946,9 @@ void Engine::systemTouchEnd(int pointer, float x, float y){
946946
//-----------------
947947
if (Engine::isCallMouseInTouchEvent()){
948948
//-----------------
949-
Input::releaseMousePressed(S_MOUSE_BUTTON_1);
949+
Input::releaseMousePressed(D_MOUSE_BUTTON_1);
950950
Input::setMousePosition(x, y);
951-
Engine::onMouseUp.call(S_MOUSE_BUTTON_1, x, y, 0);
951+
Engine::onMouseUp.call(D_MOUSE_BUTTON_1, x, y, 0);
952952
//-----------------
953953
}
954954
}
@@ -1000,7 +1000,7 @@ void Engine::systemMouseDown(int button, float x, float y, int mods){
10001000
uiEventReceived = false;
10011001
for (int i = 0; i < scenes.size(); i++){
10021002
if (scenes[i]->canReceiveUIEvents())
1003-
if (button == S_MOUSE_BUTTON_1)
1003+
if (button == D_MOUSE_BUTTON_1)
10041004
if (scenes[i]->getSystem<UISystem>()->eventOnPointerDown(x, y))
10051005
uiEventReceived = true;
10061006
}
@@ -1029,7 +1029,7 @@ void Engine::systemMouseUp(int button, float x, float y, int mods){
10291029
uiEventReceived = false;
10301030
for (int i = 0; i < scenes.size(); i++){
10311031
if (scenes[i]->canReceiveUIEvents())
1032-
if (button == S_MOUSE_BUTTON_1)
1032+
if (button == D_MOUSE_BUTTON_1)
10331033
if (scenes[i]->getSystem<UISystem>()->eventOnPointerUp(x, y))
10341034
uiEventReceived = true;
10351035
}
@@ -1067,7 +1067,7 @@ void Engine::systemMouseMove(float x, float y, int mods){
10671067
//-----------------
10681068
if (Engine::isCallTouchInMouseEvent()){
10691069
//-----------------
1070-
if (Input::isMousePressed(S_MOUSE_BUTTON_LEFT) || Input::isMousePressed(S_MOUSE_BUTTON_RIGHT)){
1070+
if (Input::isMousePressed(D_MOUSE_BUTTON_LEFT) || Input::isMousePressed(D_MOUSE_BUTTON_RIGHT)){
10711071
Input::setTouchPosition(0, x, y);
10721072
Engine::onTouchMove.call(0, x, y);
10731073
}

0 commit comments

Comments
 (0)