|
@ -234,6 +234,8 @@ void SurfaceManagerGui::setSurfaceManager(SurfaceManager * newSurfaceManager){ |
|
|
ofRemoveListener(newSurfaceManager->verticesChangedEvent, this, &SurfaceManagerGui::onVerticesChanged); |
|
|
ofRemoveListener(newSurfaceManager->verticesChangedEvent, this, &SurfaceManagerGui::onVerticesChanged); |
|
|
ofRemoveListener(newSurfaceManager->surfaceSelectedEvent, this, &SurfaceManagerGui::onSurfaceSelected); |
|
|
ofRemoveListener(newSurfaceManager->surfaceSelectedEvent, this, &SurfaceManagerGui::onSurfaceSelected); |
|
|
ofRemoveListener(newSurfaceManager->vertexSelectedEvent, this, &SurfaceManagerGui::onVertexSelected); |
|
|
ofRemoveListener(newSurfaceManager->vertexSelectedEvent, this, &SurfaceManagerGui::onVertexSelected); |
|
|
|
|
|
ofRemoveListener(newSurfaceManager->vertexUnselectedEvent, this, &SurfaceManagerGui::onVertexUnselected); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
surfaceManager = newSurfaceManager; |
|
|
surfaceManager = newSurfaceManager; |
|
@ -242,6 +244,7 @@ void SurfaceManagerGui::setSurfaceManager(SurfaceManager * newSurfaceManager){ |
|
|
ofAddListener(newSurfaceManager->verticesChangedEvent, this, &SurfaceManagerGui::onVerticesChanged); |
|
|
ofAddListener(newSurfaceManager->verticesChangedEvent, this, &SurfaceManagerGui::onVerticesChanged); |
|
|
ofAddListener(newSurfaceManager->surfaceSelectedEvent, this, &SurfaceManagerGui::onSurfaceSelected); |
|
|
ofAddListener(newSurfaceManager->surfaceSelectedEvent, this, &SurfaceManagerGui::onSurfaceSelected); |
|
|
ofAddListener(newSurfaceManager->vertexSelectedEvent, this, &SurfaceManagerGui::onVertexSelected); |
|
|
ofAddListener(newSurfaceManager->vertexSelectedEvent, this, &SurfaceManagerGui::onVertexSelected); |
|
|
|
|
|
ofAddListener(newSurfaceManager->vertexUnselectedEvent, this, &SurfaceManagerGui::onVertexUnselected); |
|
|
|
|
|
|
|
|
projectionEditor.setSurfaceManager(surfaceManager); |
|
|
projectionEditor.setSurfaceManager(surfaceManager); |
|
|
sourcesEditor.setSurfaceManager(surfaceManager); |
|
|
sourcesEditor.setSurfaceManager(surfaceManager); |
|
@ -373,5 +376,13 @@ void SurfaceManagerGui::onVertexSelected(int & vertexIndex){ |
|
|
projectionEditor.getJoints()->at(vertexIndex)->select(); |
|
|
projectionEditor.getJoints()->at(vertexIndex)->select(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void SurfaceManagerGui::onVertexUnselected(int & vertexIndex){ |
|
|
|
|
|
if(projectionEditor.getJoints()->size() == 0){ |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
projectionEditor.unselectAllJoints(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} // namespace piMapper
|
|
|
} // namespace piMapper
|
|
|
} // namespace ofx
|
|
|
} // namespace ofx
|