[Scummvm-git-logs] scummvm master -> c17976ea3eff517ad28bf7069a1cf99fda2ada1f
mduggan
noreply at scummvm.org
Tue Jan 31 08:18:56 UTC 2023
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7a337a818b TETRAEDGE: Clean whitespace
7643020114 TETRAEDGE: Improve comments
23719b7b5d TETRAEDGE: Avoid integer underflow on empty point list
c17976ea3e TETRAEDGE: Fix rendering of character shadow
Commit: 7a337a818bcbbc72164e09641268b23d80847f52
https://github.com/scummvm/scummvm/commit/7a337a818bcbbc72164e09641268b23d80847f52
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-01-31T17:18:40+09:00
Commit Message:
TETRAEDGE: Clean whitespace
Changed paths:
engines/tetraedge/te/te_mesh.h
engines/tetraedge/tetraedge.cpp
engines/tetraedge/tetraedge.h
diff --git a/engines/tetraedge/te/te_mesh.h b/engines/tetraedge/te/te_mesh.h
index 34211174fee..5936830b3fd 100644
--- a/engines/tetraedge/te/te_mesh.h
+++ b/engines/tetraedge/te/te_mesh.h
@@ -43,7 +43,7 @@ class TeModelVertexAnimation;
class TeMesh : public Te3DObject2 {
public:
TeMesh();
-
+
virtual ~TeMesh() {};
enum Mode {
diff --git a/engines/tetraedge/tetraedge.cpp b/engines/tetraedge/tetraedge.cpp
index da30680072b..57a65500729 100644
--- a/engines/tetraedge/tetraedge.cpp
+++ b/engines/tetraedge/tetraedge.cpp
@@ -268,11 +268,11 @@ Graphics::RendererType TetraedgeEngine::preferredRendererType() const {
// Currently no difference between shaders and otherwise for this engine.
if (matchingRendererType == Graphics::kRendererTypeOpenGLShaders)
matchingRendererType = Graphics::kRendererTypeOpenGL;
-
+
if (matchingRendererType == 0) {
error("No supported renderer available.");
}
-
+
return matchingRendererType;
}
diff --git a/engines/tetraedge/tetraedge.h b/engines/tetraedge/tetraedge.h
index 6daa7d1f1ad..0b853ddb97d 100644
--- a/engines/tetraedge/tetraedge.h
+++ b/engines/tetraedge/tetraedge.h
@@ -125,7 +125,7 @@ public:
bool onKeyUp(const Common::KeyState &state);
static Common::StringArray splitString(const Common::String &text, char c);
-
+
/* Pick the renderer type to use.
Currently will only return kRendererTypeOpenGL or kRendererTypeTinyGL */
Graphics::RendererType preferredRendererType() const;
Commit: 7643020114631b8fca1cba92ee6f14cfc38fc960
https://github.com/scummvm/scummvm/commit/7643020114631b8fca1cba92ee6f14cfc38fc960
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-01-31T17:18:40+09:00
Commit Message:
TETRAEDGE: Improve comments
Changed paths:
engines/tetraedge/game/bonus_menu.h
diff --git a/engines/tetraedge/game/bonus_menu.h b/engines/tetraedge/game/bonus_menu.h
index e9ee8f19878..1baa34ee24c 100644
--- a/engines/tetraedge/game/bonus_menu.h
+++ b/engines/tetraedge/game/bonus_menu.h
@@ -34,9 +34,13 @@ class BonusMenu : public TeLuaGUI {
public:
BonusMenu();
+ // This is called a "save button", but actually it's used for
+ // bonus artwork in this context. Bad naming is copied from
+ // the original.
class SaveButton : public TeLayout {
public:
SaveButton(TeButtonLayout *btn, const Common::String &name, BonusMenu *owner);
+ // another confusing name - actually just shows the bonus artwork
bool onLoadSave();
Common::String path() const;
Commit: 23719b7b5d461a94a4ee112b71410dfa3b10a964
https://github.com/scummvm/scummvm/commit/23719b7b5d461a94a4ee112b71410dfa3b10a964
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-01-31T17:18:40+09:00
Commit Message:
TETRAEDGE: Avoid integer underflow on empty point list
Changed paths:
engines/tetraedge/te/te_free_move_zone.cpp
diff --git a/engines/tetraedge/te/te_free_move_zone.cpp b/engines/tetraedge/te/te_free_move_zone.cpp
index 55cafdf5396..3c0e2f9acf1 100644
--- a/engines/tetraedge/te/te_free_move_zone.cpp
+++ b/engines/tetraedge/te/te_free_move_zone.cpp
@@ -219,7 +219,7 @@ TeIntrusivePtr<TeBezierCurve> TeFreeMoveZone::curve(const TeVector3f32 &startpt,
Common::Array<TeVector3f32> pts3d;
// Skip first and last points and use the exact start/end values.
pts3d.push_back(startpt);
- for (uint i = 1; i < points.size() - 1; i++) {
+ for (int i = 1; i < (int)points.size() - 1; i++) {
pts3d.push_back(transformAStarGridInWorldSpace(points[i]));
}
pts3d.push_back(endpt);
Commit: c17976ea3eff517ad28bf7069a1cf99fda2ada1f
https://github.com/scummvm/scummvm/commit/c17976ea3eff517ad28bf7069a1cf99fda2ada1f
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-01-31T17:18:40+09:00
Commit Message:
TETRAEDGE: Fix rendering of character shadow
Changed paths:
engines/tetraedge/game/characters_shadow_opengl.cpp
engines/tetraedge/game/characters_shadow_tinygl.cpp
diff --git a/engines/tetraedge/game/characters_shadow_opengl.cpp b/engines/tetraedge/game/characters_shadow_opengl.cpp
index d118f49bebd..d472b654634 100644
--- a/engines/tetraedge/game/characters_shadow_opengl.cpp
+++ b/engines/tetraedge/game/characters_shadow_opengl.cpp
@@ -104,30 +104,26 @@ void CharactersShadowOpenGL::draw(InGameScene *scene) {
matrix = matrix * cammatrix;
- glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-
float f[4];
- for (uint i = 0; i < 4; i++)
- f[i] = matrix(i, 0);
+ glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
+ for (uint i = 0; i < 4; i++)
+ f[i] = matrix(0, i);
glTexGenfv(GL_S, GL_EYE_PLANE, f);
- glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
+ glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
for (uint i = 0; i < 4; i++)
- f[i] = matrix(i, 1);
-
+ f[i] = matrix(1, i);
glTexGenfv(GL_T, GL_EYE_PLANE, f);
- glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
+ glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
for (uint i = 0; i < 4; i++)
- f[i] = matrix(i, 2);
-
+ f[i] = matrix(2, i);
glTexGenfv(GL_R, GL_EYE_PLANE, f);
- glTexGeni(GL_Q, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
+ glTexGeni(GL_Q, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
for (uint i = 0; i < 4; i++)
- f[i] = matrix(i, 3);
-
+ f[i] = matrix(3, i);
glTexGenfv(GL_Q, GL_EYE_PLANE, f);
Te3DTextureOpenGL::unbind();
diff --git a/engines/tetraedge/game/characters_shadow_tinygl.cpp b/engines/tetraedge/game/characters_shadow_tinygl.cpp
index 12c9463eebd..5b3a1c5b29d 100644
--- a/engines/tetraedge/game/characters_shadow_tinygl.cpp
+++ b/engines/tetraedge/game/characters_shadow_tinygl.cpp
@@ -92,25 +92,25 @@ void CharactersShadowTinyGL::draw(InGameScene *scene) {
float f[4];
for (uint i = 0; i < 4; i++)
- f[i] = matrix(i, 0);
+ f[i] = matrix(0, i);
tglTexGenfv(TGL_S, TGL_EYE_PLANE, f);
tglTexGeni(TGL_T, TGL_TEXTURE_GEN_MODE, TGL_EYE_LINEAR);
for (uint i = 0; i < 4; i++)
- f[i] = matrix(i, 1);
+ f[i] = matrix(1, i);
tglTexGenfv(TGL_T, TGL_EYE_PLANE, f);
tglTexGeni(TGL_R, TGL_TEXTURE_GEN_MODE, TGL_EYE_LINEAR);
for (uint i = 0; i < 4; i++)
- f[i] = matrix(i, 2);
+ f[i] = matrix(2, i);
tglTexGenfv(TGL_R, TGL_EYE_PLANE, f);
tglTexGeni(TGL_Q, TGL_TEXTURE_GEN_MODE, TGL_EYE_LINEAR);
for (uint i = 0; i < 4; i++)
- f[i] = matrix(i, 3);
+ f[i] = matrix(3, i);
tglTexGenfv(TGL_Q, TGL_EYE_PLANE, f);
*/
More information about the Scummvm-git-logs
mailing list