[Scummvm-git-logs] scummvm master -> 2178eb790b55550ca213b31fec731fb2f61bcaa8
aquadran
noreply at scummvm.org
Sun Oct 13 13:05:05 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2178eb790b WINTERMUTE: Sync cleanup with original code
Commit: 2178eb790b55550ca213b31fec731fb2f61bcaa8
https://github.com/scummvm/scummvm/commit/2178eb790b55550ca213b31fec731fb2f61bcaa8
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2024-10-13T15:05:00+02:00
Commit Message:
WINTERMUTE: Sync cleanup with original code
Changed paths:
engines/wintermute/base/gfx/xmodel.cpp
diff --git a/engines/wintermute/base/gfx/xmodel.cpp b/engines/wintermute/base/gfx/xmodel.cpp
index f6a30049120..fe2e0eab5ae 100644
--- a/engines/wintermute/base/gfx/xmodel.cpp
+++ b/engines/wintermute/base/gfx/xmodel.cpp
@@ -62,8 +62,7 @@ XModel::XModel(BaseGame *inGame, BaseObject *owner) : BaseObject(inGame) {
_lastProjMat.setToIdentity();
_lastOffsetX = _lastOffsetY = 0;
- _BBoxStart = Math::Vector3d(0.0f, 0.0f, 0.0f);
- _BBoxEnd = Math::Vector3d(0.0f, 0.0f, 0.0f);
+ _BBoxStart = _BBoxEnd = Math::Vector3d(0.0f, 0.0f, 0.0f);
_boundingRect.setEmpty();
for (int i = 0; i < X_NUM_ANIMATION_CHANNELS; i++) {
@@ -553,17 +552,14 @@ bool XModel::isTransparentAt(int x, int y) {
//////////////////////////////////////////////////////////////////////////
void XModel::updateBoundingRect() {
- _BBoxStart = Math::Vector3d(0, 0, 0);
- _BBoxStart = Math::Vector3d(0, 0, 0);
+ _BBoxStart = _BBoxEnd = Math::Vector3d(0, 0, 0);
if (_rootFrame) {
_rootFrame->getBoundingBox(&_BBoxStart, &_BBoxEnd);
}
- _boundingRect.left = INT_MAX_VALUE;
- _boundingRect.top = INT_MAX_VALUE;
- _boundingRect.right = INT_MIN_VALUE;
- _boundingRect.bottom = INT_MIN_VALUE;
+ _boundingRect.left = _boundingRect.top = INT_MAX_VALUE;
+ _boundingRect.right = _boundingRect.bottom = INT_MIN_VALUE;
Math::Vector3d vec2d(0, 0, 0);
More information about the Scummvm-git-logs
mailing list