Browse Source

Remove `BaseSurface::getBoundingBox()` method

master
Krisjanis Rijnieks 9 years ago
parent
commit
a8700b5b52
  1. 2
      src/Surfaces/BaseSurface.h
  2. 2
      src/Surfaces/GridWarpSurface.h
  3. 2
      src/Surfaces/QuadSurface.h
  4. 32
      src/Surfaces/TriangleSurface.cpp
  5. 2
      src/Surfaces/TriangleSurface.h

2
src/Surfaces/BaseSurface.h

@ -34,8 +34,6 @@ class BaseSurface {
virtual vector <ofVec3f> & getVertices() = 0;
virtual vector <ofVec2f> & getTexCoords() = 0;
virtual ofRectangle getBoundingBox() = 0;
virtual BaseSurface * clone() = 0;
void drawTexture(ofVec2f position);

2
src/Surfaces/GridWarpSurface.h

@ -36,8 +36,6 @@ class GridWarpSurface : public BaseSurface {
vector <ofVec3f> & getVertices();
vector <ofVec2f> & getTexCoords();
ofRectangle getBoundingBox(){}
void createGridMesh();
BaseSurface * clone();

2
src/Surfaces/QuadSurface.h

@ -38,8 +38,6 @@ class QuadSurface : public BaseSurface {
vector <ofVec3f> & getVertices();
vector <ofVec2f> & getTexCoords();
ofRectangle getBoundingBox(){}
void setPerspectiveWarping(bool b);
bool getPerspectiveWarping();

32
src/Surfaces/TriangleSurface.cpp

@ -210,38 +210,6 @@ vector <ofVec2f> & TriangleSurface::getTexCoords(){
return mesh.getTexCoords();
}
ofRectangle TriangleSurface::getBoundingBox(){
ofRectangle rect;
// Find top left
rect.x = 999999;
rect.y = 999999;
for(unsigned int i = 0; i < mesh.getVertices().size(); ++i){
if(mesh.getVertices()[i].x < rect.x){
rect.x = mesh.getVertices()[i].x;
}
if(mesh.getVertices()[i].y < rect.y){
rect.y = mesh.getVertices()[i].y;
}
}
// Find bottom right
rect.width = -999999;
rect.height = -999999;
for(unsigned int i = 0; i < mesh.getVertices().size(); ++i){
if(rect.x + rect.width > mesh.getVertices()[i].x){
rect.width = mesh.getVertices()[i].x - rect.x;
}
if(rect.y + rect.height > mesh.getVertices()[i].y){
rect.height = mesh.getVertices()[i].y - rect.y;
}
}
return rect;
}
BaseSurface * TriangleSurface::clone(){
TriangleSurface * s = new TriangleSurface();
s->setVertices(getVertices());

2
src/Surfaces/TriangleSurface.h

@ -36,8 +36,6 @@ class TriangleSurface : public BaseSurface {
vector <ofVec3f> & getVertices();
vector <ofVec2f> & getTexCoords();
ofRectangle getBoundingBox();
BaseSurface * clone();
};

Loading…
Cancel
Save