Skip to content

Commit 2ef8ed5

Browse files
FlamefireFlamefire
authored
Merge pull request #40 from morganchristiansson/xy-point-extent
Change x,y->Point w,h->Extent
2 parents 0382df2 + 384b53d commit 2ef8ed5

22 files changed

Lines changed: 916 additions & 870 deletions

‎CDebug.cpp‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CDebug::CDebug(void dbgCallback(int), int quitParam)
2020
dbgWnd = global::s2->RegisterWindow(
2121
std::make_unique<CWindow>(dbgCallback, quitParam, Position(0, 0), Extent(540, 130), "Debugger", WINDOW_GREEN1,
2222
WINDOW_CLOSE | WINDOW_MOVE | WINDOW_MINIMIZE | WINDOW_RESIZE));
23-
dbgWnd->addText("Debugger started", 0, 0, fontsize);
23+
dbgWnd->addText("Debugger started", Position(0, 0), fontsize);
2424
this->dbgCallback_ = dbgCallback;
2525
FrameCounterText = nullptr;
2626
FramesPerSecText = nullptr;
@@ -59,33 +59,33 @@ CDebug::CDebug(void dbgCallback(int), int quitParam)
5959
global::s2->RegisterCallback(dbgCallback);
6060

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

6666
// we draw a vertical line to separate map data on the right side from things on the left side
67-
dbgWnd->addText("#", 240, 10, fontsize);
68-
dbgWnd->addText("#", 240, 20, fontsize);
69-
dbgWnd->addText("#", 240, 30, fontsize);
70-
dbgWnd->addText("#", 240, 40, fontsize);
71-
dbgWnd->addText("#", 240, 50, fontsize);
72-
dbgWnd->addText("#", 240, 60, fontsize);
73-
dbgWnd->addText("#", 240, 70, fontsize);
74-
dbgWnd->addText("#", 240, 80, fontsize);
75-
dbgWnd->addText("#", 240, 90, fontsize);
76-
dbgWnd->addText("#", 240, 100, fontsize);
77-
dbgWnd->addText("#", 240, 110, fontsize);
78-
dbgWnd->addText("#", 240, 120, fontsize);
79-
dbgWnd->addText("#", 240, 130, fontsize);
80-
dbgWnd->addText("#", 240, 140, fontsize);
81-
dbgWnd->addText("#", 240, 150, fontsize);
82-
dbgWnd->addText("#", 240, 160, fontsize);
83-
dbgWnd->addText("#", 240, 170, fontsize);
84-
dbgWnd->addText("#", 240, 180, fontsize);
85-
dbgWnd->addText("#", 240, 190, fontsize);
86-
dbgWnd->addText("#", 240, 200, fontsize);
87-
dbgWnd->addText("#", 240, 210, fontsize);
88-
dbgWnd->addText("#", 240, 220, fontsize);
67+
dbgWnd->addText("#", Position(240, 10), fontsize);
68+
dbgWnd->addText("#", Position(240, 20), fontsize);
69+
dbgWnd->addText("#", Position(240, 30), fontsize);
70+
dbgWnd->addText("#", Position(240, 40), fontsize);
71+
dbgWnd->addText("#", Position(240, 50), fontsize);
72+
dbgWnd->addText("#", Position(240, 60), fontsize);
73+
dbgWnd->addText("#", Position(240, 70), fontsize);
74+
dbgWnd->addText("#", Position(240, 80), fontsize);
75+
dbgWnd->addText("#", Position(240, 90), fontsize);
76+
dbgWnd->addText("#", Position(240, 100), fontsize);
77+
dbgWnd->addText("#", Position(240, 110), fontsize);
78+
dbgWnd->addText("#", Position(240, 120), fontsize);
79+
dbgWnd->addText("#", Position(240, 130), fontsize);
80+
dbgWnd->addText("#", Position(240, 140), fontsize);
81+
dbgWnd->addText("#", Position(240, 150), fontsize);
82+
dbgWnd->addText("#", Position(240, 160), fontsize);
83+
dbgWnd->addText("#", Position(240, 170), fontsize);
84+
dbgWnd->addText("#", Position(240, 180), fontsize);
85+
dbgWnd->addText("#", Position(240, 190), fontsize);
86+
dbgWnd->addText("#", Position(240, 200), fontsize);
87+
dbgWnd->addText("#", Position(240, 210), fontsize);
88+
dbgWnd->addText("#", Position(240, 220), fontsize);
8989
}
9090

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

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

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

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

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

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

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

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

188188
if(!MapNameText)
189-
MapNameText = dbgWnd->addText("", 260, 10, fontsize);
189+
MapNameText = dbgWnd->addText("", Position(260, 10), fontsize);
190190
MapNameText->setText("Map Name: " + map->getName());
191191
if(!MapSizeText)
192-
MapSizeText = dbgWnd->addText("", 260, 20, fontsize);
192+
MapSizeText = dbgWnd->addText("", Position(260, 20), fontsize);
193193
MapSizeText->setText(helpers::format("Width: %d Height: %d", map->width, map->height));
194194
if(!MapAuthorText)
195-
MapAuthorText = dbgWnd->addText("", 260, 30, fontsize);
195+
MapAuthorText = dbgWnd->addText("", Position(260, 30), fontsize);
196196
MapAuthorText->setText("Author: " + map->getAuthor());
197197
if(!MapTypeText)
198-
MapTypeText = dbgWnd->addText("", 260, 40, fontsize);
198+
MapTypeText = dbgWnd->addText("", Position(260, 40), fontsize);
199199
const char* ltStr =
200200
map->type == MAP_GREENLAND ?
201201
"Greenland" :
202202
(map->type == MAP_WASTELAND ? "Wasteland" : (map->type == MAP_WINTERLAND ? "Winterland" : "Unknown"));
203203
MapTypeText->setText(helpers::format("Type: %d (%s)", map->type, ltStr));
204204
if(!MapPlayerText)
205-
MapPlayerText = dbgWnd->addText("", 260, 50, fontsize);
205+
MapPlayerText = dbgWnd->addText("", Position(260, 50), fontsize);
206206
MapPlayerText->setText(helpers::format("Player: %d", map->player));
207207
if(!VertexText)
208-
VertexText = dbgWnd->addText("", 260, 60, fontsize);
208+
VertexText = dbgWnd->addText("", Position(260, 60), fontsize);
209209
VertexText->setText(helpers::format("Vertex: %d, %d", MapObj->Vertex_.x, MapObj->Vertex_.y));
210210
if(!VertexDataText)
211-
VertexDataText = dbgWnd->addText("", 260, 70, fontsize);
211+
VertexDataText = dbgWnd->addText("", Position(260, 70), fontsize);
212212
VertexDataText->setText(helpers::format("Vertex Data: x=%d, y=%d, z=%d i=%.2f h=%#04x", vertex.x, vertex.y,
213213
vertex.z, ((float)vertex.i) / pow(2, 16), vertex.h));
214214
if(!VertexVectorText)
215-
VertexVectorText = dbgWnd->addText("", 260, 80, fontsize);
215+
VertexVectorText = dbgWnd->addText("", Position(260, 80), fontsize);
216216
VertexVectorText->setText(helpers::format("Vertex Vector: (%.2f, %.2f, %.2f)", vertex.normVector.x,
217217
vertex.normVector.y, vertex.normVector.z));
218218
if(!FlatVectorText)
219-
FlatVectorText = dbgWnd->addText("", 260, 90, fontsize);
219+
FlatVectorText = dbgWnd->addText("", Position(260, 90), fontsize);
220220
FlatVectorText->setText(helpers::format("Flat Vector: (%.2f, %.2f, %.2f)", vertex.flatVector.x,
221221
vertex.flatVector.y, vertex.flatVector.z));
222222
if(!rsuTextureText)
223-
rsuTextureText = dbgWnd->addText("", 260, 100, fontsize);
223+
rsuTextureText = dbgWnd->addText("", Position(260, 100), fontsize);
224224
rsuTextureText->setText(helpers::format("RSU-Texture: %#04x", vertex.rsuTexture));
225225
if(!usdTextureText)
226-
usdTextureText = dbgWnd->addText("", 260, 110, fontsize);
226+
usdTextureText = dbgWnd->addText("", Position(260, 110), fontsize);
227227
usdTextureText->setText(helpers::format("USD-Texture: %#04x", vertex.usdTexture));
228228
if(!roadText)
229-
roadText = dbgWnd->addText("", 260, 120, fontsize);
229+
roadText = dbgWnd->addText("", Position(260, 120), fontsize);
230230
roadText->setText(helpers::format("road: %#04x", vertex.road));
231231
if(!objectTypeText)
232-
objectTypeText = dbgWnd->addText("", 260, 130, fontsize);
232+
objectTypeText = dbgWnd->addText("", Position(260, 130), fontsize);
233233
objectTypeText->setText(helpers::format("objectType: %#04x", vertex.objectType));
234234
if(!objectInfoText)
235-
objectInfoText = dbgWnd->addText("", 260, 140, fontsize);
235+
objectInfoText = dbgWnd->addText("", Position(260, 140), fontsize);
236236
objectInfoText->setText(helpers::format("objectInfo: %#04x", vertex.objectInfo));
237237
if(!animalText)
238-
animalText = dbgWnd->addText("", 260, 150, fontsize);
238+
animalText = dbgWnd->addText("", Position(260, 150), fontsize);
239239
animalText->setText(helpers::format("animal: %#04x", vertex.animal));
240240
if(!unknown1Text)
241-
unknown1Text = dbgWnd->addText("", 260, 160, fontsize);
241+
unknown1Text = dbgWnd->addText("", Position(260, 160), fontsize);
242242
unknown1Text->setText(helpers::format("unknown1: %#04x", vertex.unknown1));
243243
if(!buildText)
244-
buildText = dbgWnd->addText("", 260, 170, fontsize);
244+
buildText = dbgWnd->addText("", Position(260, 170), fontsize);
245245
buildText->setText(helpers::format("build: %#04x", vertex.build));
246246
if(!unknown2Text)
247-
unknown2Text = dbgWnd->addText("", 260, 180, fontsize);
247+
unknown2Text = dbgWnd->addText("", Position(260, 180), fontsize);
248248
unknown2Text->setText(helpers::format("unknown2: %#04x", vertex.unknown2));
249249
if(!unknown3Text)
250-
unknown3Text = dbgWnd->addText("", 260, 190, fontsize);
250+
unknown3Text = dbgWnd->addText("", Position(260, 190), fontsize);
251251
unknown3Text->setText(helpers::format("unknown3: %#04x", vertex.unknown3));
252252
if(!resourceText)
253-
resourceText = dbgWnd->addText("", 260, 200, fontsize);
253+
resourceText = dbgWnd->addText("", Position(260, 200), fontsize);
254254
resourceText->setText(helpers::format("resource: %#04x", vertex.resource));
255255
if(!shadingText)
256-
shadingText = dbgWnd->addText("", 260, 210, fontsize);
256+
shadingText = dbgWnd->addText("", Position(260, 210), fontsize);
257257
shadingText->setText(helpers::format("shading: %#04x", vertex.shading));
258258
if(!unknown5Text)
259-
unknown5Text = dbgWnd->addText("", 260, 220, fontsize);
259+
unknown5Text = dbgWnd->addText("", Position(260, 220), fontsize);
260260
unknown5Text->setText(helpers::format("unknown5: %#04x", vertex.unknown5));
261261
if(!editorModeText)
262-
editorModeText = dbgWnd->addText("", 260, 230, fontsize);
262+
editorModeText = dbgWnd->addText("", Position(260, 230), fontsize);
263263
editorModeText->setText(helpers::format("Editor --> Mode: %d Content: %#04x Content2: %#04x", MapObj->mode,
264264
MapObj->modeContent, MapObj->modeContent2));
265265
} else
266266
{
267267
if(!MapNameText)
268-
dbgWnd->addText("", 260, 10, fontsize);
268+
dbgWnd->addText("", Position(260, 10), fontsize);
269269
// write new MapNameText and draw it
270270
MapNameText->setText("No Map loaded!");
271271
if(MapSizeText)

‎CGame.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ boost::program_options::variables_map parse_cmdline_args(int argc, char* argv[])
3434

3535
CGame::CGame(Extent GameResolution_, bool fullscreen_)
3636
: GameResolution(GameResolution_), fullscreen(fullscreen_), Running(true), showLoadScreen(true),
37-
lastFps("", 0, 0, FontSize::Medium)
37+
lastFps("", Position{0, 0}, FontSize::Medium)
3838
{
3939
global::bmpArray.resize(MAXBOBBMP);
4040
global::shadowArray.resize(MAXBOBSHADOW);

‎CGame_Render.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,22 @@ void CGame::Render()
6565
std::array<char, 100> textBuffer;
6666
// text for x and y of vertex (shown in upper left corner)
6767
std::snprintf(textBuffer.data(), textBuffer.size(), "%d %d", MapObj->getVertexX(), MapObj->getVertexY());
68-
CFont::writeText(Surf_Display, textBuffer.data(), 20, 20);
68+
CFont::writeText(Surf_Display, textBuffer.data(), Position(20, 20));
6969
// text for MinReduceHeight and MaxRaiseHeight
7070
std::snprintf(textBuffer.data(), textBuffer.size(),
7171
"min. height: %#04x/0x3C max. height: %#04x/0x3C NormalNull: 0x0A",
7272
MapObj->getMinReduceHeight(), MapObj->getMaxRaiseHeight());
73-
CFont::writeText(Surf_Display, textBuffer.data(), 100, 20);
73+
CFont::writeText(Surf_Display, textBuffer.data(), Position(100, 20));
7474
// text for MovementLocked
7575
if(MapObj->isHorizontalMovementLocked() && MapObj->isVerticalMovementLocked())
76-
CFont::writeText(Surf_Display, "Movement locked (F9 or F10 to unlock)", 20, 40, FontSize::Large,
76+
CFont::writeText(Surf_Display, "Movement locked (F9 or F10 to unlock)", Position(20, 40), FontSize::Large,
7777
FontColor::Orange);
7878
else if(MapObj->isHorizontalMovementLocked())
79-
CFont::writeText(Surf_Display, "Horizontal movement locked (F9 to unlock)", 20, 40, FontSize::Large,
80-
FontColor::Orange);
79+
CFont::writeText(Surf_Display, "Horizontal movement locked (F9 to unlock)", Position(20, 40),
80+
FontSize::Large, FontColor::Orange);
8181
else if(MapObj->isVerticalMovementLocked())
82-
CFont::writeText(Surf_Display, "Vertical movement locked (F10 to unlock)", 20, 40, FontSize::Large,
83-
FontColor::Orange);
82+
CFont::writeText(Surf_Display, "Vertical movement locked (F10 to unlock)", Position(20, 40),
83+
FontSize::Large, FontColor::Orange);
8484
}
8585

8686
// render active menus

0 commit comments

Comments
 (0)