|
|
@ -6,23 +6,30 @@ namespace piMapper { |
|
|
|
SurfaceManager::SurfaceManager(){ |
|
|
|
mediaServer = 0; |
|
|
|
selectedSurface = 0; |
|
|
|
|
|
|
|
// Create one SurfaceStack instance in the beginning as interphase towards full
|
|
|
|
// preset functionality.
|
|
|
|
|
|
|
|
SurfaceStack * preset = new SurfaceStack(); |
|
|
|
_presets.push_back(preset); |
|
|
|
|
|
|
|
ofAddListener( |
|
|
|
SurfaceStack::instance()->vertexChangedEvent, |
|
|
|
_presets[0]->vertexChangedEvent, |
|
|
|
this, |
|
|
|
&SurfaceManager::onVertexChanged); |
|
|
|
ofAddListener( |
|
|
|
SurfaceStack::instance()->verticesChangedEvent, |
|
|
|
_presets[0]->verticesChangedEvent, |
|
|
|
this, |
|
|
|
&SurfaceManager::onVerticesChanged); |
|
|
|
_selectedVertexIndex = -1; |
|
|
|
} |
|
|
|
|
|
|
|
void SurfaceManager::draw(){ |
|
|
|
SurfaceStack::instance()->draw(); |
|
|
|
_presets[0]->draw(); |
|
|
|
} |
|
|
|
|
|
|
|
void SurfaceManager::addSurface(BaseSurface * surface){ |
|
|
|
SurfaceStack::instance()->push_back(surface); |
|
|
|
_presets[0]->push_back(surface); |
|
|
|
} |
|
|
|
|
|
|
|
void SurfaceManager::removeSelectedSurface(){ |
|
|
@ -30,9 +37,9 @@ void SurfaceManager::removeSelectedSurface(){ |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
for(int i = 0; i < SurfaceStack::instance()->size(); i++){ |
|
|
|
if(SurfaceStack::instance()->at(i) == selectedSurface){ |
|
|
|
SurfaceStack::instance()->erase(i); |
|
|
|
for(int i = 0; i < _presets[0]->size(); i++){ |
|
|
|
if(_presets[0]->at(i) == selectedSurface){ |
|
|
|
_presets[0]->erase(i); |
|
|
|
selectedSurface = 0; |
|
|
|
_selectedVertexIndex = -1; |
|
|
|
break; |
|
|
@ -41,27 +48,27 @@ void SurfaceManager::removeSelectedSurface(){ |
|
|
|
} |
|
|
|
|
|
|
|
void SurfaceManager::removeSurface(){ |
|
|
|
if(SurfaceStack::instance()->size() <= 0){ |
|
|
|
if(_presets[0]->size() <= 0){ |
|
|
|
return; |
|
|
|
} |
|
|
|
BaseSurface * s = SurfaceStack::instance()->back(); |
|
|
|
SurfaceStack::instance()->pop_back(); |
|
|
|
BaseSurface * s = _presets[0]->back(); |
|
|
|
_presets[0]->pop_back(); |
|
|
|
delete s; |
|
|
|
} |
|
|
|
|
|
|
|
void SurfaceManager::deleteSurface(ofx::piMapper::BaseSurface * surface){ |
|
|
|
for(int i = 0; i < SurfaceStack::instance()->size(); ++i){ |
|
|
|
if(SurfaceStack::instance()->at(i) == surface){ |
|
|
|
SurfaceStack::instance()->erase(i); |
|
|
|
for(int i = 0; i < _presets[0]->size(); ++i){ |
|
|
|
if(_presets[0]->at(i) == surface){ |
|
|
|
_presets[0]->erase(i); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
void SurfaceManager::clear(){ |
|
|
|
while(SurfaceStack::instance()->size()){ |
|
|
|
delete SurfaceStack::instance()->back(); |
|
|
|
SurfaceStack::instance()->pop_back(); |
|
|
|
while(_presets[0]->size()){ |
|
|
|
delete _presets[0]->back(); |
|
|
|
_presets[0]->pop_back(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
@ -71,7 +78,7 @@ void SurfaceManager::saveXmlSettings(string fileName){ |
|
|
|
exit(EXIT_FAILURE); |
|
|
|
} |
|
|
|
|
|
|
|
SettingsLoader::instance()->save(*SurfaceStack::instance(), fileName); |
|
|
|
SettingsLoader::instance()->save(*_presets[0], fileName); |
|
|
|
} |
|
|
|
|
|
|
|
bool SurfaceManager::loadXmlSettings(string fileName){ |
|
|
@ -80,7 +87,7 @@ bool SurfaceManager::loadXmlSettings(string fileName){ |
|
|
|
exit(EXIT_FAILURE); |
|
|
|
} |
|
|
|
|
|
|
|
return SettingsLoader::instance()->load(*SurfaceStack::instance(), *mediaServer, fileName); |
|
|
|
return SettingsLoader::instance()->load(*_presets[0], *mediaServer, fileName); |
|
|
|
} |
|
|
|
|
|
|
|
void SurfaceManager::setMediaServer(MediaServer * newMediaServer){ |
|
|
@ -88,11 +95,11 @@ void SurfaceManager::setMediaServer(MediaServer * newMediaServer){ |
|
|
|
} |
|
|
|
|
|
|
|
BaseSurface * SurfaceManager::selectSurface(int index){ |
|
|
|
if(index >= SurfaceStack::instance()->size()){ |
|
|
|
if(index >= _presets[0]->size()){ |
|
|
|
throw runtime_error("Surface index out of bounds."); |
|
|
|
} |
|
|
|
|
|
|
|
selectedSurface = SurfaceStack::instance()->at(index); |
|
|
|
selectedSurface = _presets[0]->at(index); |
|
|
|
_selectedVertexIndex = -1; |
|
|
|
ofSendMessage("surfaceSelected"); |
|
|
|
return selectedSurface; |
|
|
@ -101,8 +108,8 @@ BaseSurface * SurfaceManager::selectSurface(int index){ |
|
|
|
BaseSurface * SurfaceManager::selectSurface(BaseSurface * surface){ |
|
|
|
cout << "SurfaceManager::selectSurface()" << endl; |
|
|
|
|
|
|
|
for(int i = 0; i < SurfaceStack::instance()->size(); i++){ |
|
|
|
if(SurfaceStack::instance()->at(i) == surface){ |
|
|
|
for(int i = 0; i < _presets[0]->size(); i++){ |
|
|
|
if(_presets[0]->at(i) == surface){ |
|
|
|
selectedSurface = surface; |
|
|
|
_selectedVertexIndex = -1; |
|
|
|
ofSendMessage("surfaceSelected"); |
|
|
@ -126,15 +133,15 @@ BaseSurface * SurfaceManager::selectNextSurface(){ |
|
|
|
return selectedSurface; |
|
|
|
} |
|
|
|
|
|
|
|
for(int i = 0; i < SurfaceStack::instance()->size(); ++i){ |
|
|
|
if(SurfaceStack::instance()->at(i) == selectedSurface){ |
|
|
|
if(i < SurfaceStack::instance()->size() - 1){ |
|
|
|
for(int i = 0; i < _presets[0]->size(); ++i){ |
|
|
|
if(_presets[0]->at(i) == selectedSurface){ |
|
|
|
if(i < _presets[0]->size() - 1){ |
|
|
|
next = i + 1; |
|
|
|
}else{ |
|
|
|
next = 0; |
|
|
|
} |
|
|
|
|
|
|
|
selectedSurface = SurfaceStack::instance()->at(next); |
|
|
|
selectedSurface = _presets[0]->at(next); |
|
|
|
ofNotifyEvent(surfaceSelectedEvent, next, this); |
|
|
|
return selectedSurface; |
|
|
|
} |
|
|
@ -148,21 +155,21 @@ BaseSurface * SurfaceManager::selectPrevSurface(){ |
|
|
|
_selectedVertexIndex = -1; |
|
|
|
|
|
|
|
if(selectedSurface == 0){ |
|
|
|
prev = SurfaceStack::instance()->size() - 1; |
|
|
|
prev = _presets[0]->size() - 1; |
|
|
|
selectedSurface = selectSurface(prev); |
|
|
|
ofNotifyEvent(surfaceSelectedEvent, prev, this); |
|
|
|
return selectedSurface; |
|
|
|
} |
|
|
|
|
|
|
|
for(int i = 0; i < SurfaceStack::instance()->size(); ++i){ |
|
|
|
if(SurfaceStack::instance()->at(i) == selectedSurface){ |
|
|
|
for(int i = 0; i < _presets[0]->size(); ++i){ |
|
|
|
if(_presets[0]->at(i) == selectedSurface){ |
|
|
|
if(i > 0){ |
|
|
|
prev = i - 1; |
|
|
|
}else{ |
|
|
|
prev = SurfaceStack::instance()->size() - 1; |
|
|
|
prev = _presets[0]->size() - 1; |
|
|
|
} |
|
|
|
|
|
|
|
selectedSurface = SurfaceStack::instance()->at(prev); |
|
|
|
selectedSurface = _presets[0]->at(prev); |
|
|
|
ofNotifyEvent(surfaceSelectedEvent, prev, this); |
|
|
|
return selectedSurface; |
|
|
|
} |
|
|
@ -247,8 +254,8 @@ void SurfaceManager::moveSelectionBy(ofVec2f v){ |
|
|
|
} |
|
|
|
|
|
|
|
void SurfaceManager::moveAllSurfacesBy(ofVec2f v){ |
|
|
|
for(int i = 0; i < SurfaceStack::instance()->size(); ++i){ |
|
|
|
SurfaceStack::instance()->at(i)->moveBy(v); |
|
|
|
for(int i = 0; i < _presets[0]->size(); ++i){ |
|
|
|
_presets[0]->at(i)->moveBy(v); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
@ -258,16 +265,16 @@ void SurfaceManager::deselectSurface(){ |
|
|
|
} |
|
|
|
|
|
|
|
BaseSurface * SurfaceManager::getSurface(int index){ |
|
|
|
if(index >= SurfaceStack::instance()->size()){ |
|
|
|
if(index >= _presets[0]->size()){ |
|
|
|
throw runtime_error("Surface index out of bounds."); |
|
|
|
return 0; |
|
|
|
} |
|
|
|
|
|
|
|
return SurfaceStack::instance()->at(index); |
|
|
|
return _presets[0]->at(index); |
|
|
|
} |
|
|
|
|
|
|
|
int SurfaceManager::size(){ |
|
|
|
return SurfaceStack::instance()->size(); |
|
|
|
return _presets[0]->size(); |
|
|
|
} |
|
|
|
|
|
|
|
int SurfaceManager::getSelectedVertexIndex(){ |
|
|
@ -282,5 +289,9 @@ void SurfaceManager::onVerticesChanged(vector<ofVec3f> & vertices){ |
|
|
|
ofNotifyEvent(verticesChangedEvent, vertices, this); |
|
|
|
} |
|
|
|
|
|
|
|
SurfaceStack * SurfaceManager::getActivePreset(){ |
|
|
|
return _presets[0]; |
|
|
|
} |
|
|
|
|
|
|
|
} // namespace piMapper
|
|
|
|
} // namespace ofx
|
|
|
|