diff --git a/src/Application/Gui.cpp b/src/Application/Gui.cpp index 7b8f23e..5688009 100644 --- a/src/Application/Gui.cpp +++ b/src/Application/Gui.cpp @@ -92,6 +92,10 @@ SurfaceHighlightWidget & Gui::getSurfaceHighlightWidget(){ return _surfaceHighlightWidget; } +TextureHighlightWidget & Gui::getTextureHighlightWidget(){ + return _textureHighlightWidget; +} + void Gui::onScaleWidgetEvent(GuiWidgetEvent & event){ GuiEvent e; e.args = event.args; diff --git a/src/Application/Gui.h b/src/Application/Gui.h index f4d0ffc..e9de336 100644 --- a/src/Application/Gui.h +++ b/src/Application/Gui.h @@ -7,6 +7,7 @@ #include "ScaleWidget.h" #include "LayerPanelWidget.h" #include "SurfaceHighlightWidget.h" +#include "TextureHighlightWidget.h" namespace ofx { namespace piMapper { @@ -65,6 +66,7 @@ class Gui { ScaleWidget & getScaleWidget(); LayerPanelWidget & getLayerPanelWidget(); SurfaceHighlightWidget & getSurfaceHighlightWidget(); + TextureHighlightWidget & getTextureHighlightWidget(); void onMousePressed(ofMouseEventArgs & args); void onMouseReleased(ofMouseEventArgs & args); @@ -83,6 +85,7 @@ class Gui { ScaleWidget _scaleWidget; LayerPanelWidget _layerPanelWidget; SurfaceHighlightWidget _surfaceHighlightWidget; + TextureHighlightWidget _textureHighlightWidget; }; } // piMapper diff --git a/src/Application/TextureMappingState.cpp b/src/Application/TextureMappingState.cpp index 512e662..9065346 100644 --- a/src/Application/TextureMappingState.cpp +++ b/src/Application/TextureMappingState.cpp @@ -17,6 +17,9 @@ void TextureMappingState::draw(Application * app){ Gui::instance()->getSurfaceHighlightWidget().setSurfaceManager(app->getSurfaceManager()); Gui::instance()->getSurfaceHighlightWidget().draw(); + + Gui::instance()->getTextureHighlightWidget().setSurfaceManager(app->getSurfaceManager()); + Gui::instance()->getTextureHighlightWidget().draw(); } void TextureMappingState::onKeyPressed(Application * app, ofKeyEventArgs & args){