Skip to content

Change x,y->Point w,h->Extent #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Flamefire merged 11 commits into from
Jun 25, 2026
Merged

Change x,y->Point w,h->Extent #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a47e263
Use Position/Extent for x,y/w,h values
morganchristiansson Jun 18, 2026
001edc8
Merge branch 'master' into xy-point-extent
Jun 18, 2026
442eeec
Fix GH actions failure
Jun 18, 2026
fecdae7
Apply PR feedback: init lists, IsPointInRect, static_cast, cleanup
Jun 18, 2026
be4e71f
Remove unnecessary static_cast<int> casts
Jun 18, 2026
8a46597
Fix GH actions failure
Jun 18, 2026
e94fd30
Merge remote-tracking branch 'upstream/master' into xy-point-extent
Jun 18, 2026
7e38250
Push Position/Extent all the way to SDL boundary
morganchristiansson Jun 23, 2026
89c0f88
Address PR feedback: Position usage, signed offset, loop cleanup
morganchristiansson Jun 23, 2026
d8647dd
Fix duplicate pic variable
morganchristiansson Jun 23, 2026
384b53d
Merge remote-tracking branch 'upstream/master' into xy-point-extent
morganchristiansson Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 58 additions & 58 deletions CDebug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ CDebug::CDebug(void dbgCallback(int), int quitParam)
dbgWnd = global::s2->RegisterWindow(
std::make_unique<CWindow>(dbgCallback, quitParam, Position(0, 0), Extent(540, 130), "Debugger", WINDOW_GREEN1,
WINDOW_CLOSE | WINDOW_MOVE | WINDOW_MINIMIZE | WINDOW_RESIZE));
dbgWnd->addText("Debugger started", 0, 0, fontsize);
dbgWnd->addText("Debugger started", Position(0, 0), fontsize);
this->dbgCallback_ = dbgCallback;
FrameCounterText = nullptr;
FramesPerSecText = nullptr;
Expand Down Expand Up @@ -59,33 +59,33 @@ CDebug::CDebug(void dbgCallback(int), int quitParam)
global::s2->RegisterCallback(dbgCallback);

// add buttons for in-/decrementing msWait
dbgWnd->addButton(dbgCallback, DECREMENT_MSWAIT, 75, 30, 15, 15, BUTTON_GREY, "-");
dbgWnd->addButton(dbgCallback, SETZERO_MSWAIT, 90, 30, 15, 15, BUTTON_GREY, "0");
dbgWnd->addButton(dbgCallback, INCREMENT_MSWAIT, 105, 30, 15, 15, BUTTON_GREY, "+");
dbgWnd->addButton(dbgCallback, DECREMENT_MSWAIT, Position(75, 30), Extent(15, 15), BUTTON_GREY, "-");
dbgWnd->addButton(dbgCallback, SETZERO_MSWAIT, Position(90, 30), Extent(15, 15), BUTTON_GREY, "0");
dbgWnd->addButton(dbgCallback, INCREMENT_MSWAIT, Position(105, 30), Extent(15, 15), BUTTON_GREY, "+");

// we draw a vertical line to separate map data on the right side from things on the left side
dbgWnd->addText("#", 240, 10, fontsize);
dbgWnd->addText("#", 240, 20, fontsize);
dbgWnd->addText("#", 240, 30, fontsize);
dbgWnd->addText("#", 240, 40, fontsize);
dbgWnd->addText("#", 240, 50, fontsize);
dbgWnd->addText("#", 240, 60, fontsize);
dbgWnd->addText("#", 240, 70, fontsize);
dbgWnd->addText("#", 240, 80, fontsize);
dbgWnd->addText("#", 240, 90, fontsize);
dbgWnd->addText("#", 240, 100, fontsize);
dbgWnd->addText("#", 240, 110, fontsize);
dbgWnd->addText("#", 240, 120, fontsize);
dbgWnd->addText("#", 240, 130, fontsize);
dbgWnd->addText("#", 240, 140, fontsize);
dbgWnd->addText("#", 240, 150, fontsize);
dbgWnd->addText("#", 240, 160, fontsize);
dbgWnd->addText("#", 240, 170, fontsize);
dbgWnd->addText("#", 240, 180, fontsize);
dbgWnd->addText("#", 240, 190, fontsize);
dbgWnd->addText("#", 240, 200, fontsize);
dbgWnd->addText("#", 240, 210, fontsize);
dbgWnd->addText("#", 240, 220, fontsize);
dbgWnd->addText("#", Position(240, 10), fontsize);
dbgWnd->addText("#", Position(240, 20), fontsize);
dbgWnd->addText("#", Position(240, 30), fontsize);
dbgWnd->addText("#", Position(240, 40), fontsize);
dbgWnd->addText("#", Position(240, 50), fontsize);
dbgWnd->addText("#", Position(240, 60), fontsize);
dbgWnd->addText("#", Position(240, 70), fontsize);
dbgWnd->addText("#", Position(240, 80), fontsize);
dbgWnd->addText("#", Position(240, 90), fontsize);
dbgWnd->addText("#", Position(240, 100), fontsize);
dbgWnd->addText("#", Position(240, 110), fontsize);
dbgWnd->addText("#", Position(240, 120), fontsize);
dbgWnd->addText("#", Position(240, 130), fontsize);
dbgWnd->addText("#", Position(240, 140), fontsize);
dbgWnd->addText("#", Position(240, 150), fontsize);
dbgWnd->addText("#", Position(240, 160), fontsize);
dbgWnd->addText("#", Position(240, 170), fontsize);
dbgWnd->addText("#", Position(240, 180), fontsize);
dbgWnd->addText("#", Position(240, 190), fontsize);
dbgWnd->addText("#", Position(240, 200), fontsize);
dbgWnd->addText("#", Position(240, 210), fontsize);
dbgWnd->addText("#", Position(240, 220), fontsize);
}

CDebug::~CDebug()
Expand Down Expand Up @@ -116,7 +116,7 @@ void CDebug::sendParam(int Param)
void CDebug::actualizeData()
{
if(!FrameCounterText)
FrameCounterText = dbgWnd->addText("", 0, 10, fontsize);
FrameCounterText = dbgWnd->addText("", Position(0, 10), fontsize);
// write new FrameCounterText and draw it
FrameCounterText->setText("Actual Frame: " + std::to_string(global::s2->FrameCounter));

Expand All @@ -126,7 +126,7 @@ void CDebug::actualizeData()
{
// write new FramesPerSecText and draw it
if(!FramesPerSecText)
FramesPerSecText = dbgWnd->addText("", 0, 20, fontsize);
FramesPerSecText = dbgWnd->addText("", Position(0, 20), fontsize);
FramesPerSecText->setText(
helpers::format("Frames per Sec: %.2f", tmpFrameCtr / (((float)SDL_GetTicks() - tmpTickCtr) / 1000)));
// set new values
Expand All @@ -137,13 +137,13 @@ void CDebug::actualizeData()

// del msWaitText before drawing new
if(!msWaitText)
msWaitText = dbgWnd->addText("", 0, 35, fontsize);
msWaitText = dbgWnd->addText("", Position(0, 35), fontsize);
// write new msWaitText and draw it
msWaitText->setText("Wait: " + std::to_string(global::s2->msWait));

// del MouseText before drawing new
if(!MouseText)
MouseText = dbgWnd->addText("", 0, 50, fontsize);
MouseText = dbgWnd->addText("", Position(0, 50), fontsize);
// write new MouseText and draw it
const char* clickedStr =
global::s2->Cursor.clicked ?
Expand All @@ -155,24 +155,24 @@ void CDebug::actualizeData()

// del RegisteredMenusText before drawing new
if(!RegisteredMenusText)
RegisteredMenusText = dbgWnd->addText("", 0, 60, fontsize);
RegisteredMenusText = dbgWnd->addText("", Position(0, 60), fontsize);
// write new RegisteredMenusText and draw it
RegisteredMenusText->setText(helpers::format("Registered Menus: %d", global::s2->Menus.size()));

// del RegisteredWindowsText before drawing new
if(!RegisteredWindowsText)
RegisteredWindowsText = dbgWnd->addText("", 0, 70, fontsize);
RegisteredWindowsText = dbgWnd->addText("", Position(0, 70), fontsize);
// write new RegisteredWindowsText and draw it
RegisteredWindowsText->setText(helpers::format("Registered Windows: %d", global::s2->Windows.size()));

// del RegisteredCallbacksText before drawing new
if(!RegisteredCallbacksText)
RegisteredCallbacksText = dbgWnd->addText("", 0, 80, fontsize);
RegisteredCallbacksText = dbgWnd->addText("", Position(0, 80), fontsize);
// write new RegisteredCallbacksText and draw it
RegisteredCallbacksText->setText(helpers::format("Registered Callbacks: %d", global::s2->Callbacks.size()));

if(!DisplayRectText)
DisplayRectText = dbgWnd->addText("", 0, 90, fontsize);
DisplayRectText = dbgWnd->addText("", Position(0, 90), fontsize);
auto const displayRect = MapObj->getDisplayRect();
DisplayRectText->setText(helpers::format("DisplayRect: (%d,%d)->(%d,%d)\n= size(%d, %d)", displayRect.left,
displayRect.top, displayRect.right, displayRect.bottom,
Expand All @@ -186,86 +186,86 @@ void CDebug::actualizeData()
const MapNode& vertex = map->getVertex(MapObj->Vertex_);

if(!MapNameText)
MapNameText = dbgWnd->addText("", 260, 10, fontsize);
MapNameText = dbgWnd->addText("", Position(260, 10), fontsize);
MapNameText->setText("Map Name: " + map->getName());
if(!MapSizeText)
MapSizeText = dbgWnd->addText("", 260, 20, fontsize);
MapSizeText = dbgWnd->addText("", Position(260, 20), fontsize);
MapSizeText->setText(helpers::format("Width: %d Height: %d", map->width, map->height));
if(!MapAuthorText)
MapAuthorText = dbgWnd->addText("", 260, 30, fontsize);
MapAuthorText = dbgWnd->addText("", Position(260, 30), fontsize);
MapAuthorText->setText("Author: " + map->getAuthor());
if(!MapTypeText)
MapTypeText = dbgWnd->addText("", 260, 40, fontsize);
MapTypeText = dbgWnd->addText("", Position(260, 40), fontsize);
const char* ltStr =
map->type == MAP_GREENLAND ?
"Greenland" :
(map->type == MAP_WASTELAND ? "Wasteland" : (map->type == MAP_WINTERLAND ? "Winterland" : "Unknown"));
MapTypeText->setText(helpers::format("Type: %d (%s)", map->type, ltStr));
if(!MapPlayerText)
MapPlayerText = dbgWnd->addText("", 260, 50, fontsize);
MapPlayerText = dbgWnd->addText("", Position(260, 50), fontsize);
MapPlayerText->setText(helpers::format("Player: %d", map->player));
if(!VertexText)
VertexText = dbgWnd->addText("", 260, 60, fontsize);
VertexText = dbgWnd->addText("", Position(260, 60), fontsize);
VertexText->setText(helpers::format("Vertex: %d, %d", MapObj->Vertex_.x, MapObj->Vertex_.y));
if(!VertexDataText)
VertexDataText = dbgWnd->addText("", 260, 70, fontsize);
VertexDataText = dbgWnd->addText("", Position(260, 70), fontsize);
VertexDataText->setText(helpers::format("Vertex Data: x=%d, y=%d, z=%d i=%.2f h=%#04x", vertex.x, vertex.y,
vertex.z, ((float)vertex.i) / pow(2, 16), vertex.h));
if(!VertexVectorText)
VertexVectorText = dbgWnd->addText("", 260, 80, fontsize);
VertexVectorText = dbgWnd->addText("", Position(260, 80), fontsize);
VertexVectorText->setText(helpers::format("Vertex Vector: (%.2f, %.2f, %.2f)", vertex.normVector.x,
vertex.normVector.y, vertex.normVector.z));
if(!FlatVectorText)
FlatVectorText = dbgWnd->addText("", 260, 90, fontsize);
FlatVectorText = dbgWnd->addText("", Position(260, 90), fontsize);
FlatVectorText->setText(helpers::format("Flat Vector: (%.2f, %.2f, %.2f)", vertex.flatVector.x,
vertex.flatVector.y, vertex.flatVector.z));
if(!rsuTextureText)
rsuTextureText = dbgWnd->addText("", 260, 100, fontsize);
rsuTextureText = dbgWnd->addText("", Position(260, 100), fontsize);
rsuTextureText->setText(helpers::format("RSU-Texture: %#04x", vertex.rsuTexture));
if(!usdTextureText)
usdTextureText = dbgWnd->addText("", 260, 110, fontsize);
usdTextureText = dbgWnd->addText("", Position(260, 110), fontsize);
usdTextureText->setText(helpers::format("USD-Texture: %#04x", vertex.usdTexture));
if(!roadText)
roadText = dbgWnd->addText("", 260, 120, fontsize);
roadText = dbgWnd->addText("", Position(260, 120), fontsize);
roadText->setText(helpers::format("road: %#04x", vertex.road));
if(!objectTypeText)
objectTypeText = dbgWnd->addText("", 260, 130, fontsize);
objectTypeText = dbgWnd->addText("", Position(260, 130), fontsize);
objectTypeText->setText(helpers::format("objectType: %#04x", vertex.objectType));
if(!objectInfoText)
objectInfoText = dbgWnd->addText("", 260, 140, fontsize);
objectInfoText = dbgWnd->addText("", Position(260, 140), fontsize);
objectInfoText->setText(helpers::format("objectInfo: %#04x", vertex.objectInfo));
if(!animalText)
animalText = dbgWnd->addText("", 260, 150, fontsize);
animalText = dbgWnd->addText("", Position(260, 150), fontsize);
animalText->setText(helpers::format("animal: %#04x", vertex.animal));
if(!unknown1Text)
unknown1Text = dbgWnd->addText("", 260, 160, fontsize);
unknown1Text = dbgWnd->addText("", Position(260, 160), fontsize);
unknown1Text->setText(helpers::format("unknown1: %#04x", vertex.unknown1));
if(!buildText)
buildText = dbgWnd->addText("", 260, 170, fontsize);
buildText = dbgWnd->addText("", Position(260, 170), fontsize);
buildText->setText(helpers::format("build: %#04x", vertex.build));
if(!unknown2Text)
unknown2Text = dbgWnd->addText("", 260, 180, fontsize);
unknown2Text = dbgWnd->addText("", Position(260, 180), fontsize);
unknown2Text->setText(helpers::format("unknown2: %#04x", vertex.unknown2));
if(!unknown3Text)
unknown3Text = dbgWnd->addText("", 260, 190, fontsize);
unknown3Text = dbgWnd->addText("", Position(260, 190), fontsize);
unknown3Text->setText(helpers::format("unknown3: %#04x", vertex.unknown3));
if(!resourceText)
resourceText = dbgWnd->addText("", 260, 200, fontsize);
resourceText = dbgWnd->addText("", Position(260, 200), fontsize);
resourceText->setText(helpers::format("resource: %#04x", vertex.resource));
if(!shadingText)
shadingText = dbgWnd->addText("", 260, 210, fontsize);
shadingText = dbgWnd->addText("", Position(260, 210), fontsize);
shadingText->setText(helpers::format("shading: %#04x", vertex.shading));
if(!unknown5Text)
unknown5Text = dbgWnd->addText("", 260, 220, fontsize);
unknown5Text = dbgWnd->addText("", Position(260, 220), fontsize);
unknown5Text->setText(helpers::format("unknown5: %#04x", vertex.unknown5));
if(!editorModeText)
editorModeText = dbgWnd->addText("", 260, 230, fontsize);
editorModeText = dbgWnd->addText("", Position(260, 230), fontsize);
editorModeText->setText(helpers::format("Editor --> Mode: %d Content: %#04x Content2: %#04x", MapObj->mode,
MapObj->modeContent, MapObj->modeContent2));
} else
{
if(!MapNameText)
dbgWnd->addText("", 260, 10, fontsize);
dbgWnd->addText("", Position(260, 10), fontsize);
// write new MapNameText and draw it
MapNameText->setText("No Map loaded!");
if(MapSizeText)
Expand Down
2 changes: 1 addition & 1 deletion CGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ boost::program_options::variables_map parse_cmdline_args(int argc, char* argv[])

CGame::CGame(Extent GameResolution_, bool fullscreen_)
: GameResolution(GameResolution_), fullscreen(fullscreen_), Running(true), showLoadScreen(true),
lastFps("", 0, 0, FontSize::Medium)
lastFps("", Position{0, 0}, FontSize::Medium)
{
global::bmpArray.resize(MAXBOBBMP);
global::shadowArray.resize(MAXBOBSHADOW);
Expand Down
14 changes: 7 additions & 7 deletions CGame_Render.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,22 +65,22 @@ void CGame::Render()
std::array<char, 100> textBuffer;
// text for x and y of vertex (shown in upper left corner)
std::snprintf(textBuffer.data(), textBuffer.size(), "%d %d", MapObj->getVertexX(), MapObj->getVertexY());
CFont::writeText(Surf_Display, textBuffer.data(), 20, 20);
CFont::writeText(Surf_Display, textBuffer.data(), Position(20, 20));
// text for MinReduceHeight and MaxRaiseHeight
std::snprintf(textBuffer.data(), textBuffer.size(),
"min. height: %#04x/0x3C max. height: %#04x/0x3C NormalNull: 0x0A",
MapObj->getMinReduceHeight(), MapObj->getMaxRaiseHeight());
CFont::writeText(Surf_Display, textBuffer.data(), 100, 20);
CFont::writeText(Surf_Display, textBuffer.data(), Position(100, 20));
// text for MovementLocked
if(MapObj->isHorizontalMovementLocked() && MapObj->isVerticalMovementLocked())
CFont::writeText(Surf_Display, "Movement locked (F9 or F10 to unlock)", 20, 40, FontSize::Large,
CFont::writeText(Surf_Display, "Movement locked (F9 or F10 to unlock)", Position(20, 40), FontSize::Large,
FontColor::Orange);
else if(MapObj->isHorizontalMovementLocked())
CFont::writeText(Surf_Display, "Horizontal movement locked (F9 to unlock)", 20, 40, FontSize::Large,
FontColor::Orange);
CFont::writeText(Surf_Display, "Horizontal movement locked (F9 to unlock)", Position(20, 40),
FontSize::Large, FontColor::Orange);
else if(MapObj->isVerticalMovementLocked())
CFont::writeText(Surf_Display, "Vertical movement locked (F10 to unlock)", 20, 40, FontSize::Large,
FontColor::Orange);
CFont::writeText(Surf_Display, "Vertical movement locked (F10 to unlock)", Position(20, 40),
FontSize::Large, FontColor::Orange);
}

// render active menus
Expand Down
Loading