thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

EMI: removed unnecessary comments, made getBoundingBox const

Browse source
This commit is contained in:
sietschie 2013-12-12 14:46:53 +01:00
parent 98e9b41010
commit d06762ec52
5 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/grim/costume.cpp
View file

@ -439,7 +439,6 @@ void Costume::getBoundingBox(int *x1, int *y1, int *x2, int *y2) {
c->getBoundingBox(x1, y1, x2, y2); c->getBoundingBox(x1, y1, x2, y2);
} }
//TODO: why is it lowercase 'mesh'?
if (_components[i] &&(_components[i]->isComponentType('m','e','s','h'))) { if (_components[i] &&(_components[i]->isComponentType('m','e','s','h'))) {
EMIMeshComponent *c = static_cast<EMIMeshComponent *>(_components[i]); EMIMeshComponent *c = static_cast<EMIMeshComponent *>(_components[i]);
c->getBoundingBox(x1, y1, x2, y2); c->getBoundingBox(x1, y1, x2, y2);

2
engines/grim/emi/costume/emimesh_component.cpp
View file

@ -87,7 +87,7 @@ void EMIMeshComponent::draw() {
//translateObject(true); //translateObject(true);
} }
void EMIMeshComponent::getBoundingBox(int *x1, int *y1, int *x2, int *y2) { void EMIMeshComponent::getBoundingBox(int *x1, int *y1, int *x2, int *y2) const {
// If the object was drawn by being a component // If the object was drawn by being a component
// of it's parent then don't draw it // of it's parent then don't draw it

2
engines/grim/emi/costume/emimesh_component.h
View file

@ -37,7 +37,7 @@ public:
int update(uint time); int update(uint time);
void reset(); void reset();
void draw(); void draw();
void getBoundingBox(int *x1, int *y1, int *x2, int *y2); void getBoundingBox(int *x1, int *y1, int *x2, int *y2) const;
public: public:
bool _hierShared; bool _hierShared;

6
engines/grim/gfx_opengl.cpp
View file

@ -442,12 +442,6 @@ void GfxOpenGL::getBoundingBoxPos(const EMIModel *model, int *x1, int *y1, int *
return; return;
} }
//*x1 = (int)left;
//*y1 = (int)top;
//*x2 = (int)right;
//*y2 = (int)bottom;
//TODO: For some reasons the x axis needs to be flipped to get the correct positioned texts?
*x1 = (int)left; *x1 = (int)left;
*y1 = (int)(_gameHeight - bottom); *y1 = (int)(_gameHeight - bottom);
*x2 = (int)right; *x2 = (int)right;

6
engines/grim/gfx_tinygl.cpp
View file

@ -575,12 +575,6 @@ void GfxTinyGL::getBoundingBoxPos(const EMIModel *model, int *x1, int *y1, int *
return; return;
} }
//*x1 = (int)left;
//*y1 = (int)top;
//*x2 = (int)right;
//*y2 = (int)bottom;
//TODO: For some reasons the x axis needs to be flipped to get the correct positioned texts?
*x1 = (int)left; *x1 = (int)left;
*y1 = (int)(_gameHeight - bottom); *y1 = (int)(_gameHeight - bottom);
*x2 = (int)right; *x2 = (int)right;