atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

get/setAngle -> get/setRotation

Browse source
This commit is contained in:
GriffinR 2022-10-15 13:12:40 -04:00 committed by Marcus Huderle
parent ad01ba0feb
commit a2795d089b
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docsrc/manual/scripting-capabilities.rst
View file

@ -1050,21 +1050,21 @@ All overlay functions are callable via the global ``overlay`` object.
:param number scale: the scale to set
.. js:function:: overlay.getAngle(layer = 0)
.. js:function:: overlay.getRotation(layer = 0)
Gets the angle the specified overlay layer is rotated to.
:param number layer: the layer id. Defaults to ``0``
:returns number: the angle
:returns number: the angle the layer is rotated to
.. js:function:: overlay.setAngle(angle, layer)
.. js:function:: overlay.setRotation(angle, layer)
Sets the angle the specified overlay layer is rotated to.
:param number angle: the angle to set
:param number layer: the layer id
.. js:function:: overlay.setAngle(angle)
.. js:function:: overlay.setRotation(angle)
This is an overloaded function. Sets the angle that all active overlay layers are rotated to. Layers that have not been used yet will not have their angle changed.

6
include/ui/mapview.h
View file

@ -50,9 +50,9 @@ public:
Q_INVOKABLE void setHorizontalScale(qreal scale);
Q_INVOKABLE void setVerticalScale(qreal scale, int layer);
Q_INVOKABLE void setVerticalScale(qreal scale);
Q_INVOKABLE int getAngle(int layer = 0);
Q_INVOKABLE void setAngle(int angle, int layer);
Q_INVOKABLE void setAngle(int angle);
Q_INVOKABLE int getRotation(int layer = 0);
Q_INVOKABLE void setRotation(int angle, int layer);
Q_INVOKABLE void setRotation(int angle);
Q_INVOKABLE void rotate(int degrees, int layer);
Q_INVOKABLE void rotate(int degrees);
Q_INVOKABLE void addText(QString text, int x, int y, QString color = "#000000", int fontSize = 12, int layer = 0);

4
include/ui/overlay.h
View file

@ -93,8 +93,8 @@ public:
qreal getVScale();
void setHScale(qreal scale);
void setVScale(qreal scale);
int getAngle();
void setAngle(int angle);
int getRotation();
void setRotation(int angle);
void rotate(int degrees);
void setClippingRect(QRectF rect);
void clearClippingRect();

14
src/scriptapi/apioverlay.cpp
View file

@ -179,19 +179,19 @@ void MapView::setVerticalScale(qreal scale) {
this->scene()->update();
}
int MapView::getAngle(int layer) {
return this->getOverlay(layer)->getAngle();
int MapView::getRotation(int layer) {
return this->getOverlay(layer)->getRotation();
}
void MapView::setAngle(int angle, int layer) {
this->getOverlay(layer)->setAngle(angle);
void MapView::setRotation(int angle, int layer) {
this->getOverlay(layer)->setRotation(angle);
this->scene()->update();
}
// Overload. No layer provided, set angle of all layers
void MapView::setAngle(int angle) {
// Overload. No layer provided, set rotation of all layers
void MapView::setRotation(int angle) {
foreach (Overlay * layer, this->overlayMap)
layer->setAngle(angle);
layer->setRotation(angle);
this->scene()->update();
}

6
src/ui/overlay.cpp
View file

@ -106,11 +106,11 @@ void Overlay::setVScale(qreal scale) {
this->vScale = scale;
}
int Overlay::getAngle() {
int Overlay::getRotation() {
return this->angle;
}
void Overlay::setAngle(int angle) {
void Overlay::setRotation(int angle) {
this->angle = angle;
this->clampAngle();
}
@ -122,7 +122,7 @@ void Overlay::rotate(int degrees) {
void Overlay::clampAngle() {
// transform.rotate would handle this already, but we only
// want to report angles 0-359 for Overlay::getAngle
// want to report angles 0-359 for Overlay::getRotation
this->angle %= 360;
if (this->angle < 0)
this->angle += 360;