From 96e92bcb56304cfc4cc0587a00b8ba8aa03b79a9 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Wed, 17 Aug 2016 21:13:18 +0200 Subject: [PATCH] Add pure virtual `BaseSurface::scaleTo()` method --- src/Surfaces/BaseSurface.h | 1 + src/Surfaces/GridWarpSurface.h | 1 + src/Surfaces/QuadSurface.h | 1 + src/Surfaces/TriangleSurface.cpp | 4 ++++ src/Surfaces/TriangleSurface.h | 1 + 5 files changed, 8 insertions(+) diff --git a/src/Surfaces/BaseSurface.h b/src/Surfaces/BaseSurface.h index 676748c..02eee35 100644 --- a/src/Surfaces/BaseSurface.h +++ b/src/Surfaces/BaseSurface.h @@ -22,6 +22,7 @@ class BaseSurface { virtual void setTexCoord(int index, ofVec2f t) = 0; virtual void setTexCoords(vector t) = 0; virtual void moveBy(ofVec2f v) = 0; + virtual void scaleTo(float scale) = 0; virtual int getType() = 0; diff --git a/src/Surfaces/GridWarpSurface.h b/src/Surfaces/GridWarpSurface.h index 122405c..ab03d0c 100644 --- a/src/Surfaces/GridWarpSurface.h +++ b/src/Surfaces/GridWarpSurface.h @@ -15,6 +15,7 @@ class GridWarpSurface : public BaseSurface { void setup(); void draw(); void moveBy(ofVec2f v); + void scaleTo(float scale){} int getType(); int getGridRows(); diff --git a/src/Surfaces/QuadSurface.h b/src/Surfaces/QuadSurface.h index 4c6642b..9cdaa5d 100644 --- a/src/Surfaces/QuadSurface.h +++ b/src/Surfaces/QuadSurface.h @@ -27,6 +27,7 @@ class QuadSurface : public BaseSurface { void setTexCoords(vector t); void moveBy(ofVec2f v); + void scaleTo(float scale){} // TODO: fill this int getType(); bool hitTest(ofVec2f p); diff --git a/src/Surfaces/TriangleSurface.cpp b/src/Surfaces/TriangleSurface.cpp index 3d0d937..f935644 100644 --- a/src/Surfaces/TriangleSurface.cpp +++ b/src/Surfaces/TriangleSurface.cpp @@ -133,6 +133,10 @@ void TriangleSurface::moveBy(ofVec2f v){ ofNotifyEvent(verticesChangedEvent, mesh.getVertices(), this); } +void TriangleSurface::scaleTo(float scale){ + cout << "TriangleSurface::scaleTo()" << endl; +} + int TriangleSurface::getType(){ return SurfaceType::TRIANGLE_SURFACE; } diff --git a/src/Surfaces/TriangleSurface.h b/src/Surfaces/TriangleSurface.h index f3797e9..c0f8184 100644 --- a/src/Surfaces/TriangleSurface.h +++ b/src/Surfaces/TriangleSurface.h @@ -25,6 +25,7 @@ class TriangleSurface : public BaseSurface { void setTexCoords(vector t); void moveBy(ofVec2f v); + void scaleTo(float scale); int getType(); bool hitTest(ofVec2f p);