Browse Source

Move mouseDragged texture mapping part to TextureMappingState

master
Krisjanis Rijnieks 9 years ago
parent
commit
bffb98e558
  1. 9
      src/Application/States/TextureMappingState.cpp
  2. 4
      src/Surfaces/SurfaceManagerGui.cpp

9
src/Application/States/TextureMappingState.cpp

@ -159,7 +159,14 @@ void TextureMappingState::onMouseDragged(Application * app, ofMouseEventArgs & a
// Alter mouse event args to match canvas translation // Alter mouse event args to match canvas translation
args.x -= _canvasTranslate.x; args.x -= _canvasTranslate.x;
args.y -= _canvasTranslate.y; args.y -= _canvasTranslate.y;
app->getGui()->mouseDragged(args); app->getGui()->getTextureEditor()->mouseDragged(args);
if(app->getGui()->bDrag){
ofVec2f mousePosition = ofVec2f(args.x, args.y);
ofVec2f distance = mousePosition - app->getGui()->clickPosition;
app->getGui()->getTextureEditor()->moveTexCoords(distance);
app->getGui()->clickPosition = mousePosition;
}
}else{ }else{
ofPoint mousePosition = ofPoint(args.x, args.y); ofPoint mousePosition = ofPoint(args.x, args.y);
ofPoint distance = mousePosition - _clickPosition; ofPoint distance = mousePosition - _clickPosition;

4
src/Surfaces/SurfaceManagerGui.cpp

@ -95,9 +95,10 @@ void SurfaceManagerGui::mousePressed(ofMouseEventArgs & args){
void SurfaceManagerGui::mouseDragged(ofMouseEventArgs & args){ void SurfaceManagerGui::mouseDragged(ofMouseEventArgs & args){
if(guiMode == GuiMode::TEXTURE_MAPPING){ if(guiMode == GuiMode::TEXTURE_MAPPING){
textureEditor.mouseDragged(args); //textureEditor.mouseDragged(args);
} }
/*
if(bDrag){ if(bDrag){
ofVec2f mousePosition = ofVec2f(args.x, args.y); ofVec2f mousePosition = ofVec2f(args.x, args.y);
ofVec2f distance = mousePosition - clickPosition; ofVec2f distance = mousePosition - clickPosition;
@ -107,6 +108,7 @@ void SurfaceManagerGui::mouseDragged(ofMouseEventArgs & args){
} }
clickPosition = mousePosition; clickPosition = mousePosition;
} }
*/
} }
void SurfaceManagerGui::setSurfaceManager(SurfaceManager * newSurfaceManager){ void SurfaceManagerGui::setSurfaceManager(SurfaceManager * newSurfaceManager){

Loading…
Cancel
Save