|
@ -32,10 +32,8 @@ void SurfaceManagerGui::setSurfaceManager(SurfaceManager * newSurfaceManager){ |
|
|
sourcesEditor.setSurfaceManager(surfaceManager); |
|
|
sourcesEditor.setSurfaceManager(surfaceManager); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Set external media server so we can access it from wherever we need
|
|
|
|
|
|
void SurfaceManagerGui::setMediaServer(MediaServer * newMediaServer){ |
|
|
void SurfaceManagerGui::setMediaServer(MediaServer * newMediaServer){ |
|
|
mediaServer = newMediaServer; |
|
|
mediaServer = newMediaServer; |
|
|
// Set the media server of the sources editor here
|
|
|
|
|
|
sourcesEditor.setMediaServer(mediaServer); |
|
|
sourcesEditor.setMediaServer(mediaServer); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -61,15 +59,12 @@ void SurfaceManagerGui::setMode(int newGuiMode){ |
|
|
|
|
|
|
|
|
if(guiMode == GuiMode::SOURCE_SELECTION){ |
|
|
if(guiMode == GuiMode::SOURCE_SELECTION){ |
|
|
sourcesEditor.enable(); |
|
|
sourcesEditor.enable(); |
|
|
//string sourceName = surfaceManager->getSelectedSurfaceSourceName();
|
|
|
|
|
|
//sourcesEditor.selectImageSourceRadioButton(sourceName);
|
|
|
|
|
|
}else{ |
|
|
}else{ |
|
|
sourcesEditor.disable(); |
|
|
sourcesEditor.disable(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if(guiMode == GuiMode::TEXTURE_MAPPING){ |
|
|
if(guiMode == GuiMode::TEXTURE_MAPPING){ |
|
|
textureEditor.enable(); |
|
|
textureEditor.enable(); |
|
|
// refresh texture editor surface reference
|
|
|
|
|
|
textureEditor.setSurface(surfaceManager->getSelectedSurface()); |
|
|
textureEditor.setSurface(surfaceManager->getSelectedSurface()); |
|
|
}else{ |
|
|
}else{ |
|
|
textureEditor.disable(); |
|
|
textureEditor.disable(); |
|
|