Browse Source

Integrate TextureConsumersWidget into Application

Now in TextureMappingMode one can see the texture coordinates of other surfaces consuming the source.
master
Krisjanis Rijnieks 9 years ago
parent
commit
64f7fa5d29
  1. 2
      src/Application/Modes/TextureMappingMode.cpp
  2. 1
      src/Commands/SetApplicationModeCmd.cpp
  3. 4
      src/Gui/Gui.cpp
  4. 3
      src/Gui/Gui.h

2
src/Application/Modes/TextureMappingMode.cpp

@ -21,6 +21,7 @@ TextureMappingMode::TextureMappingMode(){
void TextureMappingMode::setup(Application * app){
Gui::instance()->getTextureHighlightWidget().setSurfaceManager(app->getSurfaceManager());
Gui::instance()->getTextureConsumersWidget().setSurfaceManager(app->getSurfaceManager());
}
void TextureMappingMode::update(Application * app){
@ -67,6 +68,7 @@ void TextureMappingMode::draw(Application * app){
ofPushMatrix();
ofTranslate(_canvasTranslate.x, _canvasTranslate.y);
Gui::instance()->getTextureConsumersWidget().draw();
Gui::instance()->getTextureHighlightWidget().draw();
Gui::instance()->getTextureEditorWidget().draw();
ofPopMatrix();

1
src/Commands/SetApplicationModeCmd.cpp

@ -20,6 +20,7 @@ void SetApplicationModeCmd::exec(){
Gui::instance()->getTextureEditorWidget().setSurface(
_application->getSurfaceManager()->getSelectedSurface());
Gui::instance()->getTextureConsumersWidget().findConsumerSurfaces();
if(_applicationState != PresentationMode::instance()){
ofShowCursor();

4
src/Gui/Gui.cpp

@ -108,6 +108,10 @@ SourcesEditorWidget & Gui::getSourcesEditorWidget(){
return _sourcesEditorWidget;
}
TextureConsumersWidget & Gui::getTextureConsumersWidget(){
return _textureConsumersWidget;
}
void Gui::onScaleWidgetEvent(GuiWidgetEvent & event){
GuiEvent e;
e.args = event.args;

3
src/Gui/Gui.h

@ -11,6 +11,7 @@
#include "TextureEditorWidget.h"
#include "ProjectionEditorWidget.h"
#include "SourcesEditorWidget.h"
#include "TextureConsumersWidget.h"
namespace ofx {
namespace piMapper {
@ -73,6 +74,7 @@ class Gui {
TextureEditorWidget & getTextureEditorWidget();
ProjectionEditorWidget & getProjectionEditorWidget();
SourcesEditorWidget & getSourcesEditorWidget();
TextureConsumersWidget & getTextureConsumersWidget();
// Consider these as a part of the application states/modes.
void onMousePressed(ofMouseEventArgs & args);
@ -96,6 +98,7 @@ class Gui {
TextureEditorWidget _textureEditorWidget;
ProjectionEditorWidget _projectionEditorWidget;
SourcesEditorWidget _sourcesEditorWidget;
TextureConsumersWidget _textureConsumersWidget;
};
} // piMapper

Loading…
Cancel
Save