Browse Source

Change vertex changed event to contain index of the vertex

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

2
src/Surfaces/BaseSurface.h

@ -43,7 +43,7 @@ class BaseSurface {
// TODO: The surface should emit an event once vertex has changed
ofEvent <vector<ofVec3f>> verticesChangedEvent;
ofEvent <ofVec3f> vertexChangedEvent;
ofEvent <int> vertexChangedEvent;
protected:
ofMesh mesh;

2
src/Surfaces/GridWarpSurface.cpp

@ -145,7 +145,7 @@ void GridWarpSurface::setVertex(int index, ofVec2f p){
mesh.setVertex(index, p);
ofVec3f v = mesh.getVertex(index);
ofNotifyEvent(vertexChangedEvent, v, this);
ofNotifyEvent(vertexChangedEvent, index, this);
}
void GridWarpSurface::setVertices(vector<ofVec2f> v){

2
src/Surfaces/QuadSurface.cpp

@ -97,7 +97,7 @@ void QuadSurface::setVertex(int index, ofVec2f p){
mesh.setVertex(index, p);
ofVec3f v = mesh.getVertex(index);
ofNotifyEvent(vertexChangedEvent, v, this);
ofNotifyEvent(vertexChangedEvent, index, this);
}
void QuadSurface::setVertices(vector<ofVec2f> v){

4
src/Surfaces/SurfaceStack.cpp

@ -52,8 +52,8 @@ void SurfaceStack::onVerticesChanged(vector<ofVec3f> & vertices){
ofNotifyEvent(verticesChangedEvent, vertices, this);
}
void SurfaceStack::onVertexChanged(ofVec3f & vertex){
ofNotifyEvent(vertexChangedEvent, vertex, this);
void SurfaceStack::onVertexChanged(int & i){
ofNotifyEvent(vertexChangedEvent, i, this);
}
} // namespace piMapper

4
src/Surfaces/SurfaceStack.h

@ -23,10 +23,10 @@ class SurfaceStack {
BaseSurface * back();
ofEvent <vector<ofVec3f>> verticesChangedEvent;
ofEvent <ofVec3f> vertexChangedEvent;
ofEvent <int> vertexChangedEvent;
void onVerticesChanged(vector<ofVec3f> & vertices);
void onVertexChanged(ofVec3f & vertex);
void onVertexChanged(int & i);
private:
vector<BaseSurface *> _surfaces;

2
src/Surfaces/TriangleSurface.cpp

@ -64,7 +64,7 @@ void TriangleSurface::setVertex(int index, ofVec2f p){
mesh.setVertex(index, p);
ofVec3f v = mesh.getVertex(index);
ofNotifyEvent(vertexChangedEvent, v, this);
ofNotifyEvent(vertexChangedEvent, index, this);
}
void TriangleSurface::setVertices(vector<ofVec2f> v){

Loading…
Cancel
Save