[Scummvm-git-logs] scummvm master -> 3916b1b3452a2e54481c30af3dcbabaa4ad1c324
mgerhardy
martin.gerhardy at gmail.com
Sat Aug 14 09:39:09 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
236a31ac71 TWINE: added return values to setBaseRotation methods
3916b1b345 TWINE: add ADGF_CD to the detection entries
Commit: 236a31ac714e9b1e5c24584e958b3ec66860c1d6
https://github.com/scummvm/scummvm/commit/236a31ac714e9b1e5c24584e958b3ec66860c1d6
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-14T11:26:58+02:00
Commit Message:
TWINE: added return values to setBaseRotation methods
Changed paths:
engines/twine/renderer/renderer.cpp
engines/twine/renderer/renderer.h
diff --git a/engines/twine/renderer/renderer.cpp b/engines/twine/renderer/renderer.cpp
index 2c86f3a03c..f2a3378312 100644
--- a/engines/twine/renderer/renderer.cpp
+++ b/engines/twine/renderer/renderer.cpp
@@ -66,7 +66,7 @@ void Renderer::init(int32 w, int32 h) {
}
const IVec3 &Renderer::projectXYPositionOnScreen(int32 x, int32 y, int32 z) {
- if (_isUsingOrthoProjection == 1) {
+ if (_isUsingOrthoProjection) {
_projPos.x = ((x - z) * 24) / BRICK_SIZE + _orthoProjPos.x;
_projPos.y = y;
return _projPos;
@@ -148,7 +148,7 @@ void Renderer::baseMatrixTranspose() {
SWAP(_baseMatrix.row2.z, _baseMatrix.row3.y);
}
-void Renderer::setBaseRotation(int32 x, int32 y, int32 z, bool transpose) {
+const IVec3 &Renderer::setBaseRotation(int32 x, int32 y, int32 z, bool transpose) {
const double Xradians = (double)((ANGLE_90 - x) % ANGLE_360) * 2 * M_PI / ANGLE_360;
const double Yradians = (double)((ANGLE_90 - y) % ANGLE_360) * 2 * M_PI / ANGLE_360;
const double Zradians = (double)((ANGLE_90 - z) % ANGLE_360) * 2 * M_PI / ANGLE_360;
@@ -177,6 +177,7 @@ void Renderer::setBaseRotation(int32 x, int32 y, int32 z, bool transpose) {
getBaseRotationPosition(_baseTransPos.x, _baseTransPos.y, _baseTransPos.z);
_baseRotPos = _destPos;
+ return _baseRotPos;
}
const IVec3 &Renderer::getBaseRotationPosition(int32 x, int32 y, int32 z) {
diff --git a/engines/twine/renderer/renderer.h b/engines/twine/renderer/renderer.h
index a3416a114e..e0f319d6bc 100644
--- a/engines/twine/renderer/renderer.h
+++ b/engines/twine/renderer/renderer.h
@@ -241,10 +241,10 @@ public:
void setCameraAngle(int32 transPosX, int32 transPosY, int32 transPosZ, int32 rotPosX, int32 rotPosY, int32 rotPosZ, int32 param6);
const IVec3 &updateCameraAnglePositions(int zShift = 0);
void setBaseTranslation(int32 x, int32 y, int32 z);
- void setBaseRotation(int32 x, int32 y, int32 z, bool transpose = false);
+ const IVec3 &setBaseRotation(int32 x, int32 y, int32 z, bool transpose = false);
- inline void setBaseRotation(const IVec3 &rot, bool transpose = false) {
- setBaseRotation(rot.x, rot.y, rot.z, transpose);
+ inline const IVec3 &setBaseRotation(const IVec3 &rot, bool transpose = false) {
+ return setBaseRotation(rot.x, rot.y, rot.z, transpose);
}
void setOrthoProjection(int32 x, int32 y, int32 z);
Commit: 3916b1b3452a2e54481c30af3dcbabaa4ad1c324
https://github.com/scummvm/scummvm/commit/3916b1b3452a2e54481c30af3dcbabaa4ad1c324
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-14T11:26:58+02:00
Commit Message:
TWINE: add ADGF_CD to the detection entries
Changed paths:
engines/twine/detection.cpp
diff --git a/engines/twine/detection.cpp b/engines/twine/detection.cpp
index 3dd53dafa3..580cd0d44a 100644
--- a/engines/twine/detection.cpp
+++ b/engines/twine/detection.cpp
@@ -114,7 +114,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("LBA.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_TESTING | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -123,7 +123,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("LBA.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::FR_FRA,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_TESTING | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -132,7 +132,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("LBA.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::DE_DEU,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_TESTING | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -141,7 +141,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("LBA.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::IT_ITA,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_TESTING | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -150,7 +150,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("LBA.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::ES_ESP,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_TESTING | ADGF_CD,
GUIO1(GUIO_NONE)
},
@@ -163,7 +163,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_TESTING | TwinE::TF_VERSION_USA,
+ ADGF_TESTING | TwinE::TF_VERSION_USA | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -172,7 +172,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::FR_FRA,
Common::kPlatformDOS,
- ADGF_TESTING | TwinE::TF_VERSION_USA,
+ ADGF_TESTING | TwinE::TF_VERSION_USA | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -181,7 +181,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::DE_DEU,
Common::kPlatformDOS,
- ADGF_TESTING | TwinE::TF_VERSION_USA,
+ ADGF_TESTING | TwinE::TF_VERSION_USA | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -190,7 +190,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::IT_ITA,
Common::kPlatformDOS,
- ADGF_TESTING | TwinE::TF_VERSION_USA,
+ ADGF_TESTING | TwinE::TF_VERSION_USA | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -199,7 +199,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("RELENT.EXE", "c1a887e38283d43f271249ad9f2a73ef", 258513),
Common::ES_ESP,
Common::kPlatformDOS,
- ADGF_TESTING | TwinE::TF_VERSION_USA,
+ ADGF_TESTING | TwinE::TF_VERSION_USA | ADGF_CD,
GUIO1(GUIO_NONE)
},
More information about the Scummvm-git-logs
mailing list