Skip to content

Commit 0c7d06a

Browse files
comradeshookcomradeshook
committed
Undid change to DislodgePixel return value, as it caused problems with meson
1 parent 01f1775 commit 0c7d06a

File tree

4 files changed

+38
-40
lines changed

4 files changed

+38
-40
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
134134

135135
- New `SceneMan` Lua function `CastTerrainPenetrationRay(Vector start, Vector ray, Vector endPos, int strengthLimit, int skip)`, which adds up the material strength of the terrain pixels encountered along the way, and stops when the accumulated value meets or exceeds `strengthLimit`. `endPos` is filled out with the ending position of the ray, returns `true` or `false` depending on whether the ray was stopped early or not.
136136

137-
- Exposed `MOPixel` property `Color` to Lua. It gets and sets the index of the MOPixel's color.
137+
- Exposed `MOPixel` property `Color` to Lua. It gets and sets the index of the MOPixel's color. You may need to use `ToMOPixel()` to access it.
138138

139139
</details>
140140

@@ -180,8 +180,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
180180

181181
- `SceneMan` Lua function `DislodgePixel()` now optionally accepts a third boolean argument to delete the found pixel immediately. Format is `DislodgePixel(int posX, int posY, bool deletePixel)`. `DislodgePixel()` now also automatically accounts for scene wrapping.
182182

183-
- `SceneMan` Lua function `DislodgePixel()` and all of its derivatives now return `MOPixel` instead of `MovableObject` to save on typecasting in Lua.
184-
185183
</details>
186184

187185
<details><summary><b>Fixed</b></summary>

‎Source/Lua/LuaBindingsManagers.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ LuaBindingRegisterFunctionDefinitionForType(ManagerLuaBindings, SceneMan) {
333333
.def("CheckAndRemoveOrphans", (int(SceneMan::*)(int, int, int, int, bool)) & SceneMan::RemoveOrphans)
334334
.def("DislodgePixel", &SceneMan::DislodgePixel)
335335
.def("DislodgePixel", &SceneMan::DislodgePixelBool)
336-
.def("DislodgePixelLine", (const std::vector<MOPixel*>* (SceneMan::*)(const Vector& start, const Vector& ray, int skip, bool deletePixels) const) & SceneMan::DislodgePixelLine, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
337-
.def("DislodgePixelLine", (const std::vector<MOPixel*>* (SceneMan::*)(const Vector& start, const Vector& ray, int skip) const) & SceneMan::DislodgePixelLineNoBool, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
338-
.def("DislodgePixelCircle", (const std::vector<MOPixel*>* (SceneMan::*)(const Vector& centre, float radius, bool deletePixels) const) & SceneMan::DislodgePixelCircle, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
339-
.def("DislodgePixelCircle", (const std::vector<MOPixel*>* (SceneMan::*)(const Vector& centre, float radius) const) & SceneMan::DislodgePixelCircleNoBool, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
340-
.def("DislodgePixelBox", (const std::vector<MOPixel*>* (SceneMan::*)(const Vector& upperLeftCorner, const Vector& lowerRightCorner, bool deletePixels) const) & SceneMan::DislodgePixelBox, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
341-
.def("DislodgePixelBox", (const std::vector<MOPixel*>* (SceneMan::*)(const Vector& upperLeftCorner, const Vector& lowerRightCorner) const) & SceneMan::DislodgePixelBoxNoBool, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
342-
.def("DislodgePixelRing", (const std::vector<MOPixel*>* (SceneMan::*)(const Vector& centre, float innerRadius, float outerRadius, bool deletePixels) const) & SceneMan::DislodgePixelRing, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
343-
.def("DislodgePixelRing", (const std::vector<MOPixel*>* (SceneMan::*)(const Vector& centre, float innerRadius, float outerRadius) const) & SceneMan::DislodgePixelRingNoBool, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator);
336+
.def("DislodgePixelLine", (const std::vector<MovableObject*>* (SceneMan::*)(const Vector& start, const Vector& ray, int skip, bool deletePixels) const) & SceneMan::DislodgePixelLine, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
337+
.def("DislodgePixelLine", (const std::vector<MovableObject*>* (SceneMan::*)(const Vector& start, const Vector& ray, int skip) const) & SceneMan::DislodgePixelLineNoBool, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
338+
.def("DislodgePixelCircle", (const std::vector<MovableObject*>* (SceneMan::*)(const Vector& centre, float radius, bool deletePixels) const) & SceneMan::DislodgePixelCircle, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
339+
.def("DislodgePixelCircle", (const std::vector<MovableObject*>* (SceneMan::*)(const Vector& centre, float radius) const) & SceneMan::DislodgePixelCircleNoBool, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
340+
.def("DislodgePixelBox", (const std::vector<MovableObject*>* (SceneMan::*)(const Vector& upperLeftCorner, const Vector& lowerRightCorner, bool deletePixels) const) & SceneMan::DislodgePixelBox, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
341+
.def("DislodgePixelBox", (const std::vector<MovableObject*>* (SceneMan::*)(const Vector& upperLeftCorner, const Vector& lowerRightCorner) const) & SceneMan::DislodgePixelBoxNoBool, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
342+
.def("DislodgePixelRing", (const std::vector<MovableObject*>* (SceneMan::*)(const Vector& centre, float innerRadius, float outerRadius, bool deletePixels) const) & SceneMan::DislodgePixelRing, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator)
343+
.def("DislodgePixelRing", (const std::vector<MovableObject*>* (SceneMan::*)(const Vector& centre, float innerRadius, float outerRadius) const) & SceneMan::DislodgePixelRingNoBool, luabind::adopt(luabind::return_value) + luabind::return_stl_iterator);
344344
}
345345

346346
LuaBindingRegisterFunctionDefinitionForType(ManagerLuaBindings, CameraMan) {

‎Source/Managers/SceneMan.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ bool SceneMan::TryPenetrate(int posX,
892892
return false;
893893
}
894894

895-
MOPixel* SceneMan::DislodgePixel(int posX, int posY) {
895+
MovableObject* SceneMan::DislodgePixel(int posX, int posY) {
896896
WrapPosition(posX, posY);
897897
int materialID = getpixel(m_pCurrentScene->GetTerrain()->GetMaterialBitmap(), posX, posY);
898898
if (materialID <= MaterialColorKeys::g_MaterialAir) {
@@ -924,16 +924,16 @@ MOPixel* SceneMan::DislodgePixel(int posX, int posY) {
924924
}
925925

926926
// Bool variant to avoid changing the original
927-
MOPixel* SceneMan::DislodgePixelBool(int posX, int posY, bool deletePixel) {
928-
MOPixel* pixelMO = DislodgePixel(posX, posY);
927+
MovableObject* SceneMan::DislodgePixelBool(int posX, int posY, bool deletePixel) {
928+
MovableObject* pixelMO = DislodgePixel(posX, posY);
929929
if (pixelMO) {
930930
pixelMO->SetToDelete(deletePixel);
931931
}
932932
return pixelMO;
933933
}
934934

935-
std::vector<MOPixel*>* SceneMan::DislodgePixelCircle(const Vector& centre, float radius, bool deletePixels) {
936-
std::vector<MOPixel*>* pixelList = new std::vector<MOPixel*>();
935+
std::vector<MovableObject*>* SceneMan::DislodgePixelCircle(const Vector& centre, float radius, bool deletePixels) {
936+
std::vector<MovableObject*>* pixelList = new std::vector<MovableObject*>();
937937
int limit = static_cast<int>(radius) * 2;
938938
for (int x = 0; x <= limit; x++) {
939939
for (int y = 0; y <= limit; y++) {
@@ -945,7 +945,7 @@ std::vector<MOPixel*>* SceneMan::DislodgePixelCircle(const Vector& centre, float
945945
}
946946

947947
if (!distance.MagnitudeIsGreaterThan(radius)) {
948-
MOPixel* px = DislodgePixelBool(checkPos.m_X, checkPos.m_Y, deletePixels);
948+
MovableObject* px = DislodgePixelBool(checkPos.m_X, checkPos.m_Y, deletePixels);
949949
if (px) {
950950
pixelList->push_back(px);
951951
}
@@ -956,17 +956,17 @@ std::vector<MOPixel*>* SceneMan::DislodgePixelCircle(const Vector& centre, float
956956
return pixelList;
957957
}
958958

959-
std::vector<MOPixel*>* SceneMan::DislodgePixelCircleNoBool(const Vector& centre, float radius) {
959+
std::vector<MovableObject*>* SceneMan::DislodgePixelCircleNoBool(const Vector& centre, float radius) {
960960
return DislodgePixelCircle(centre, radius, false);
961961
}
962962

963-
std::vector<MOPixel*>* SceneMan::DislodgePixelRing(const Vector& centre, float innerRadius, float outerRadius, bool deletePixels) {
963+
std::vector<MovableObject*>* SceneMan::DislodgePixelRing(const Vector& centre, float innerRadius, float outerRadius, bool deletePixels) {
964964
// Account for users inputting radii in the wrong order
965965
if (outerRadius < innerRadius) {
966966
std::swap(outerRadius, innerRadius);
967967
}
968968

969-
std::vector<MOPixel*>* pixelList = new std::vector<MOPixel*>();
969+
std::vector<MovableObject*>* pixelList = new std::vector<MovableObject*>();
970970
int limit = static_cast<int>(outerRadius) * 2;
971971
for (int x = 0; x <= limit; x++) {
972972
for (int y = 0; y <= limit; y++) {
@@ -983,7 +983,7 @@ std::vector<MOPixel*>* SceneMan::DislodgePixelRing(const Vector& centre, float i
983983
}
984984

985985
if (!distance.MagnitudeIsGreaterThan(outerRadius) && !distance.MagnitudeIsLessThan(innerRadius)) {
986-
MOPixel* px = DislodgePixelBool(checkPos.m_X, checkPos.m_Y, deletePixels);
986+
MovableObject* px = DislodgePixelBool(checkPos.m_X, checkPos.m_Y, deletePixels);
987987
if (px) {
988988
pixelList->push_back(px);
989989
}
@@ -994,12 +994,12 @@ std::vector<MOPixel*>* SceneMan::DislodgePixelRing(const Vector& centre, float i
994994
return pixelList;
995995
}
996996

997-
std::vector<MOPixel*>* SceneMan::DislodgePixelRingNoBool(const Vector& centre, float innerRadius, float outerRadius) {
997+
std::vector<MovableObject*>* SceneMan::DislodgePixelRingNoBool(const Vector& centre, float innerRadius, float outerRadius) {
998998
return DislodgePixelRing(centre, innerRadius, outerRadius, false);
999999
}
10001000

1001-
std::vector<MOPixel*>* SceneMan::DislodgePixelBox(const Vector& upperLeftCorner, const Vector& lowerRightCorner, bool deletePixels) {
1002-
std::vector<MOPixel*>* pixelList = new std::vector<MOPixel*>();
1001+
std::vector<MovableObject*>* SceneMan::DislodgePixelBox(const Vector& upperLeftCorner, const Vector& lowerRightCorner, bool deletePixels) {
1002+
std::vector<MovableObject*>* pixelList = new std::vector<MovableObject*>();
10031003

10041004
// Make sure it works even if people input corners in the wrong order
10051005
Vector start = Vector(std::min(upperLeftCorner.m_X, lowerRightCorner.m_X), std::min(upperLeftCorner.m_Y, lowerRightCorner.m_Y));
@@ -1010,7 +1010,7 @@ std::vector<MOPixel*>* SceneMan::DislodgePixelBox(const Vector& upperLeftCorner,
10101010
for (int x = 0; x <= static_cast<int>(width) * 2; x++) {
10111011
for (int y = 0; y <= static_cast<int>(height) * 2; y++) {
10121012
Vector checkPos = start + Vector(static_cast<float>(x), static_cast<float>(y));
1013-
MOPixel* px = DislodgePixelBool(checkPos.m_X, checkPos.m_Y, deletePixels);
1013+
MovableObject* px = DislodgePixelBool(checkPos.m_X, checkPos.m_Y, deletePixels);
10141014
if (px) {
10151015
pixelList->push_back(px);
10161016
}
@@ -1020,12 +1020,12 @@ std::vector<MOPixel*>* SceneMan::DislodgePixelBox(const Vector& upperLeftCorner,
10201020
return pixelList;
10211021
}
10221022

1023-
std::vector<MOPixel*>* SceneMan::DislodgePixelBoxNoBool(const Vector& upperLeftCorner, const Vector& lowerRightCorner) {
1023+
std::vector<MovableObject*>* SceneMan::DislodgePixelBoxNoBool(const Vector& upperLeftCorner, const Vector& lowerRightCorner) {
10241024
return DislodgePixelBox(upperLeftCorner, lowerRightCorner, false);
10251025
}
10261026

1027-
std::vector<MOPixel*>* SceneMan::DislodgePixelLine(const Vector& start, const Vector& ray, int skip, bool deletePixels) {
1028-
std::vector<MOPixel*>* pixelList = new std::vector<MOPixel*>();
1027+
std::vector<MovableObject*>* SceneMan::DislodgePixelLine(const Vector& start, const Vector& ray, int skip, bool deletePixels) {
1028+
std::vector<MovableObject*>* pixelList = new std::vector<MovableObject*>();
10291029
int error, dom, sub, domSteps, skipped = skip;
10301030
int intPos[2], delta[2], delta2[2], increment[2];
10311031

@@ -1080,7 +1080,7 @@ std::vector<MOPixel*>* SceneMan::DislodgePixelLine(const Vector& start, const Ve
10801080
// Scene wrapping
10811081
g_SceneMan.WrapPosition(intPos[X], intPos[Y]);
10821082

1083-
MOPixel* px = DislodgePixelBool(intPos[X], intPos[Y], deletePixels);
1083+
MovableObject* px = DislodgePixelBool(intPos[X], intPos[Y], deletePixels);
10841084
if (px) {
10851085
pixelList->push_back(px);
10861086
}
@@ -1093,7 +1093,7 @@ std::vector<MOPixel*>* SceneMan::DislodgePixelLine(const Vector& start, const Ve
10931093
return pixelList;
10941094
}
10951095

1096-
std::vector<MOPixel*>* SceneMan::DislodgePixelLineNoBool(const Vector& start, const Vector& ray, int skip) {
1096+
std::vector<MovableObject*>* SceneMan::DislodgePixelLineNoBool(const Vector& start, const Vector& ray, int skip) {
10971097
return DislodgePixelLine(start, ray, skip, false);
10981098
}
10991099

‎Source/Managers/SceneMan.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -401,70 +401,70 @@ namespace RTE {
401401
/// @param posX The X coordinate of the terrain pixel.
402402
/// @param posX The Y coordinate of the terrain pixel.
403403
/// @return The newly dislodged pixel, if one was found.
404-
MOPixel* DislodgePixel(int posX, int posY);
404+
MovableObject* DislodgePixel(int posX, int posY);
405405

406406
/// Removes a pixel from the terrain and adds it to MovableMan.
407407
/// @param posX The X coordinate of the terrain pixel.
408408
/// @param posX The Y coordinate of the terrain pixel.
409409
/// @param deletePixel Whether or not to immediately mark the pixel for deletion.
410410
/// @return The newly dislodged pixel, if one was found.
411-
MOPixel* DislodgePixelBool(int posX, int posY, bool deletePixel);
411+
MovableObject* DislodgePixelBool(int posX, int posY, bool deletePixel);
412412

413413
/// Removes a circle of pixels from the terrain and adds them to MovableMan.
414414
/// @param centre The vector position of the centre of the circle.
415415
/// @param radius The radius of the circle of pixels to remove.
416416
/// @param deletePixels Whether or not to immediately mark all found pixels for deletion.
417417
/// @return A list of the removed pixels, if any.
418-
std::vector<MOPixel*>* DislodgePixelCircle(const Vector& centre, float radius, bool deletePixels);
418+
std::vector<MovableObject*>* DislodgePixelCircle(const Vector& centre, float radius, bool deletePixels);
419419

420420
/// Removes a circle of pixels from the terrain and adds them to MovableMan.
421421
/// @param centre The vector position of the centre of the circle.
422422
/// @param radius The radius of the circle of pixels to remove.
423423
/// @return A list of the removed pixels, if any.
424-
std::vector<MOPixel*>* DislodgePixelCircleNoBool(const Vector& centre, float radius);
424+
std::vector<MovableObject*>* DislodgePixelCircleNoBool(const Vector& centre, float radius);
425425

426426
/// Removes a ring of pixels from the terrain and adds them to MovableMan.
427427
/// @param centre The vector position of the centre of the ring.
428428
/// @param innerRadius The inner radius of the ring of pixels to remove.
429429
/// @param outerRadius The outer radius of the ring of pixels to remove.
430430
/// @param deletePixels Whether or not to immediately mark all found pixels for deletion.
431431
/// @return A list of the removed pixels, if any.
432-
std::vector<MOPixel*>* DislodgePixelRing(const Vector& centre, float innerRadius, float outerRadius, bool deletePixels);
432+
std::vector<MovableObject*>* DislodgePixelRing(const Vector& centre, float innerRadius, float outerRadius, bool deletePixels);
433433

434434
/// Removes a ring of pixels from the terrain and adds them to MovableMan.
435435
/// @param centre The vector position of the centre of the ring.
436436
/// @param innerRadius The inner radius of the ring of pixels to remove.
437437
/// @param outerRadius The outer radius of the ring of pixels to remove.
438438
/// @return A list of the removed pixels, if any.
439-
std::vector<MOPixel*>* DislodgePixelRingNoBool(const Vector& centre, float innerRadius, float outerRadius);
439+
std::vector<MovableObject*>* DislodgePixelRingNoBool(const Vector& centre, float innerRadius, float outerRadius);
440440

441441
/// Removes a box of pixels from the terrain and adds them to MovableMan.
442442
/// @param upperLeftCorner The vector position of the upper left corner of the box.
443443
/// @param lowerRightCorner The vector position of the lower right corner of the box.
444444
/// @param deletePixels Whether or not to immediately mark all found pixels for deletion.
445445
/// @return A list of the removed pixels, if any.
446-
std::vector<MOPixel*>* DislodgePixelBox(const Vector& upperLeftCorner, const Vector& lowerRightCorner, bool deletePixels);
446+
std::vector<MovableObject*>* DislodgePixelBox(const Vector& upperLeftCorner, const Vector& lowerRightCorner, bool deletePixels);
447447

448448
/// Removes a box of pixels from the terrain and adds them to MovableMan.
449449
/// @param upperLeftCorner The vector position of the upper left corner of the box.
450450
/// @param lowerRightCorner The vector position of the lower right corner of the box.
451451
/// @return A list of the removed pixels, if any.
452-
std::vector<MOPixel*>* DislodgePixelBoxNoBool(const Vector& upperLeftCorner, const Vector& lowerRightCorner);
452+
std::vector<MovableObject*>* DislodgePixelBoxNoBool(const Vector& upperLeftCorner, const Vector& lowerRightCorner);
453453

454454
/// Removes a line of pixels from the terrain and adds them to MovableMan.
455455
/// @param start The starting position.
456456
/// @param ray The vector to trace along.
457457
/// @param skip For every pixel checked along the line, how many to skip between them.
458458
/// @param deletePixels Whether or not to immediately mark all found pixels for deletion.
459459
/// @return A list of the removed pixels, if any.
460-
std::vector<MOPixel*>* DislodgePixelLine(const Vector& start, const Vector& ray, int skip, bool deletePixels);
460+
std::vector<MovableObject*>* DislodgePixelLine(const Vector& start, const Vector& ray, int skip, bool deletePixels);
461461

462462
/// Removes a line of pixels from the terrain and adds them to MovableMan.
463463
/// @param start The starting position.
464464
/// @param ray The vector to trace along.
465465
/// @param skip For every pixel checked along the line, how many to skip between them.
466466
/// @return A list of the removed pixels, if any.
467-
std::vector<MOPixel*>* DislodgePixelLineNoBool(const Vector& start, const Vector& ray, int skip);
467+
std::vector<MovableObject*>* DislodgePixelLineNoBool(const Vector& start, const Vector& ray, int skip);
468468

469469
/// Sets one team's view of the scene to be unseen, using a generated map
470470
/// of a specific resolution chunkiness.

0 commit comments

Comments
 (0)