|
|
@ -1,181 +1,166 @@ |
|
|
#include "SurfaceManager.h" |
|
|
#include "SurfaceManager.h" |
|
|
|
|
|
|
|
|
namespace ofx{ |
|
|
namespace ofx { |
|
|
namespace piMapper{ |
|
|
namespace piMapper { |
|
|
SurfaceManager::SurfaceManager() |
|
|
SurfaceManager::SurfaceManager() {} |
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
SurfaceManager::~SurfaceManager() { clear(); } |
|
|
|
|
|
|
|
|
SurfaceManager::~SurfaceManager() |
|
|
|
|
|
{ |
|
|
|
|
|
clear(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void SurfaceManager::draw() |
|
|
void SurfaceManager::draw() { |
|
|
{ |
|
|
for (int i = 0; i < surfaces.size(); i++) { |
|
|
for ( int i=0; i<surfaces.size(); i++ ) { |
|
|
|
|
|
surfaces[i]->draw(); |
|
|
surfaces[i]->draw(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void SurfaceManager::addSurface(int surfaceType) |
|
|
void SurfaceManager::addSurface(int surfaceType) { |
|
|
{ |
|
|
if (surfaceType == SurfaceType::TRIANGLE_SURFACE) { |
|
|
if ( surfaceType == SurfaceType::TRIANGLE_SURFACE ) { |
|
|
surfaces.push_back(new TriangleSurface()); |
|
|
surfaces.push_back( new TriangleSurface() ); |
|
|
} else if (surfaceType == SurfaceType::QUAD_SURFACE) { |
|
|
} |
|
|
surfaces.push_back(new QuadSurface()); |
|
|
else if (surfaceType == SurfaceType::QUAD_SURFACE ) { |
|
|
} else { |
|
|
surfaces.push_back( new QuadSurface() ); |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
throw std::runtime_error("Attempt to add non-existing surface type."); |
|
|
throw std::runtime_error("Attempt to add non-existing surface type."); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void SurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr) |
|
|
void SurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr) { |
|
|
{ |
|
|
if (surfaceType == SurfaceType::TRIANGLE_SURFACE) { |
|
|
if ( surfaceType == SurfaceType::TRIANGLE_SURFACE ) { |
|
|
surfaces.push_back(new TriangleSurface()); |
|
|
surfaces.push_back( new TriangleSurface() ); |
|
|
|
|
|
surfaces.back()->setTexture(texturePtr); |
|
|
surfaces.back()->setTexture(texturePtr); |
|
|
} |
|
|
} else if (surfaceType == SurfaceType::QUAD_SURFACE) { |
|
|
else if (surfaceType == SurfaceType::QUAD_SURFACE ) { |
|
|
surfaces.push_back(new QuadSurface()); |
|
|
surfaces.push_back( new QuadSurface() ); |
|
|
|
|
|
surfaces.back()->setTexture(texturePtr); |
|
|
surfaces.back()->setTexture(texturePtr); |
|
|
} |
|
|
} else { |
|
|
else { |
|
|
|
|
|
throw std::runtime_error("Attempt to add non-existing surface type."); |
|
|
throw std::runtime_error("Attempt to add non-existing surface type."); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void SurfaceManager::addSurface(int surfaceType, vector<ofVec2f> vertices, vector<ofVec2f> texCoords) |
|
|
void SurfaceManager::addSurface(int surfaceType, vector<ofVec2f> vertices, |
|
|
{ |
|
|
vector<ofVec2f> texCoords) { |
|
|
if ( surfaceType == SurfaceType::TRIANGLE_SURFACE ) { |
|
|
if (surfaceType == SurfaceType::TRIANGLE_SURFACE) { |
|
|
|
|
|
if (vertices.size() < 3) { |
|
|
if ( vertices.size() < 3 ) { |
|
|
throw std::runtime_error( |
|
|
throw std::runtime_error("There must be 3 vertices for a triangle surface."); |
|
|
"There must be 3 vertices for a triangle surface."); |
|
|
} else if (texCoords.size() < 3) { |
|
|
} else if (texCoords.size() < 3) { |
|
|
throw std::runtime_error("There must be 3 texture coordinates for a triangle surface."); |
|
|
throw std::runtime_error( |
|
|
|
|
|
"There must be 3 texture coordinates for a triangle surface."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
surfaces.push_back( new TriangleSurface() ); |
|
|
surfaces.push_back(new TriangleSurface()); |
|
|
|
|
|
|
|
|
for ( int i=0; i<3; i++ ) { |
|
|
for (int i = 0; i < 3; i++) { |
|
|
surfaces.back()->setVertex(i, vertices[i]); |
|
|
surfaces.back()->setVertex(i, vertices[i]); |
|
|
surfaces.back()->setTexCoord(i, texCoords[i]); |
|
|
surfaces.back()->setTexCoord(i, texCoords[i]); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} else if (surfaceType == SurfaceType::QUAD_SURFACE) { |
|
|
else if (surfaceType == SurfaceType::QUAD_SURFACE ) { |
|
|
if (vertices.size() < 4) { |
|
|
if ( vertices.size() < 4 ) { |
|
|
|
|
|
throw std::runtime_error("There must be 4 vertices for a quad surface."); |
|
|
throw std::runtime_error("There must be 4 vertices for a quad surface."); |
|
|
} else if (texCoords.size() < 4) { |
|
|
} else if (texCoords.size() < 4) { |
|
|
throw std::runtime_error("There must be 4 texture coordinates for a quad surface."); |
|
|
throw std::runtime_error( |
|
|
|
|
|
"There must be 4 texture coordinates for a quad surface."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
surfaces.push_back( new QuadSurface() ); |
|
|
surfaces.push_back(new QuadSurface()); |
|
|
|
|
|
|
|
|
for ( int i=0; i<4; i++ ) { |
|
|
for (int i = 0; i < 4; i++) { |
|
|
surfaces.back()->setVertex(i, vertices[i]); |
|
|
surfaces.back()->setVertex(i, vertices[i]); |
|
|
surfaces.back()->setTexCoord(i, texCoords[i]); |
|
|
surfaces.back()->setTexCoord(i, texCoords[i]); |
|
|
} |
|
|
} |
|
|
} |
|
|
} else { |
|
|
else { |
|
|
|
|
|
throw std::runtime_error("Attempt to add non-existing surface type."); |
|
|
throw std::runtime_error("Attempt to add non-existing surface type."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void SurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr, vector<ofVec2f> vertices, vector<ofVec2f> texCoords) |
|
|
void SurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr, |
|
|
{ |
|
|
vector<ofVec2f> vertices, |
|
|
if ( surfaceType == SurfaceType::TRIANGLE_SURFACE ) { |
|
|
vector<ofVec2f> texCoords) { |
|
|
|
|
|
if (surfaceType == SurfaceType::TRIANGLE_SURFACE) { |
|
|
if ( vertices.size() < 3 ) { |
|
|
if (vertices.size() < 3) { |
|
|
throw std::runtime_error("There must be 3 vertices for a triangle surface."); |
|
|
throw std::runtime_error( |
|
|
|
|
|
"There must be 3 vertices for a triangle surface."); |
|
|
} else if (texCoords.size() < 3) { |
|
|
} else if (texCoords.size() < 3) { |
|
|
throw std::runtime_error("Thre must be 3 texture coordinates for a triangle surface."); |
|
|
throw std::runtime_error( |
|
|
|
|
|
"Thre must be 3 texture coordinates for a triangle surface."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
surfaces.push_back( new TriangleSurface() ); |
|
|
surfaces.push_back(new TriangleSurface()); |
|
|
surfaces.back()->setTexture(texturePtr); |
|
|
surfaces.back()->setTexture(texturePtr); |
|
|
|
|
|
|
|
|
for ( int i=0; i<3; i++ ) { |
|
|
for (int i = 0; i < 3; i++) { |
|
|
surfaces.back()->setVertex(i, vertices[i]); |
|
|
surfaces.back()->setVertex(i, vertices[i]); |
|
|
surfaces.back()->setTexCoord(i, texCoords[i]); |
|
|
surfaces.back()->setTexCoord(i, texCoords[i]); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} else if (surfaceType == SurfaceType::QUAD_SURFACE) { |
|
|
else if (surfaceType == SurfaceType::QUAD_SURFACE ) { |
|
|
if (vertices.size() < 4) { |
|
|
if ( vertices.size() < 4 ) { |
|
|
|
|
|
throw std::runtime_error("There must be 4 vertices for a quad surface."); |
|
|
throw std::runtime_error("There must be 4 vertices for a quad surface."); |
|
|
} else if (texCoords.size() < 4) { |
|
|
} else if (texCoords.size() < 4) { |
|
|
throw std::runtime_error("Thre must be 4 texture coordinates for a quad surface."); |
|
|
throw std::runtime_error( |
|
|
|
|
|
"Thre must be 4 texture coordinates for a quad surface."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
surfaces.push_back( new QuadSurface() ); |
|
|
surfaces.push_back(new QuadSurface()); |
|
|
surfaces.back()->setTexture(texturePtr); |
|
|
surfaces.back()->setTexture(texturePtr); |
|
|
|
|
|
|
|
|
for ( int i=0; i<4; i++ ) { |
|
|
for (int i = 0; i < 4; i++) { |
|
|
surfaces.back()->setVertex(i, vertices[i]); |
|
|
surfaces.back()->setVertex(i, vertices[i]); |
|
|
surfaces.back()->setTexCoord(i, texCoords[i]); |
|
|
surfaces.back()->setTexCoord(i, texCoords[i]); |
|
|
} |
|
|
} |
|
|
} |
|
|
} else { |
|
|
else { |
|
|
|
|
|
throw std::runtime_error("Attempt to add non-existing surface type."); |
|
|
throw std::runtime_error("Attempt to add non-existing surface type."); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void SurfaceManager::removeSelectedSurface() |
|
|
void SurfaceManager::removeSelectedSurface() { |
|
|
{ |
|
|
if (selectedSurface == NULL) return; |
|
|
if ( selectedSurface == NULL ) return; |
|
|
|
|
|
|
|
|
|
|
|
for ( int i=0; i<surfaces.size(); i++ ) { |
|
|
for (int i = 0; i < surfaces.size(); i++) { |
|
|
if ( surfaces[i] == selectedSurface ) { |
|
|
if (surfaces[i] == selectedSurface) { |
|
|
delete surfaces[i]; |
|
|
delete surfaces[i]; |
|
|
surfaces.erase(surfaces.begin()+i); |
|
|
surfaces.erase(surfaces.begin() + i); |
|
|
selectedSurface = NULL; |
|
|
selectedSurface = NULL; |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void SurfaceManager::manageMemory() |
|
|
void SurfaceManager::manageMemory() { |
|
|
{ |
|
|
|
|
|
// check if each of the sources is assigned to a surface or not
|
|
|
// check if each of the sources is assigned to a surface or not
|
|
|
for ( int i=0; i<loadedImageSources.size(); i++ ) { |
|
|
for (int i = 0; i < loadedImageSources.size(); i++) { |
|
|
bool bAssigned = false; |
|
|
bool bAssigned = false; |
|
|
|
|
|
|
|
|
for ( int j=0; j<surfaces.size(); j++ ) { |
|
|
for (int j = 0; j < surfaces.size(); j++) { |
|
|
if ( surfaces[j]->getTexture() == &loadedImageSources[i]->getTextureReference() ) { |
|
|
if (surfaces[j]->getTexture() == |
|
|
|
|
|
&loadedImageSources[i]->getTextureReference()) { |
|
|
bAssigned = true; |
|
|
bAssigned = true; |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if ( !bAssigned ) { |
|
|
if (!bAssigned) { |
|
|
// purge the image source from memory
|
|
|
// purge the image source from memory
|
|
|
delete loadedImageSources[i]; |
|
|
delete loadedImageSources[i]; |
|
|
loadedImageSources.erase(loadedImageSources.begin()+i); |
|
|
loadedImageSources.erase(loadedImageSources.begin() + i); |
|
|
cout << "Deleting image source: " << loadedImageSourceNames[i] << endl; |
|
|
cout << "Deleting image source: " << loadedImageSourceNames[i] << endl; |
|
|
loadedImageSourceNames.erase(loadedImageSourceNames.begin()+i); |
|
|
loadedImageSourceNames.erase(loadedImageSourceNames.begin() + i); |
|
|
i--; |
|
|
i--; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void SurfaceManager::clear() |
|
|
void SurfaceManager::clear() { |
|
|
{ |
|
|
|
|
|
// delete all extra allocations from the heap
|
|
|
// delete all extra allocations from the heap
|
|
|
while ( surfaces.size() ) { |
|
|
while (surfaces.size()) { |
|
|
delete surfaces.back(); |
|
|
delete surfaces.back(); |
|
|
surfaces.pop_back(); |
|
|
surfaces.pop_back(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
while ( loadedImageSources.size() ) { |
|
|
while (loadedImageSources.size()) { |
|
|
delete loadedImageSources.back(); |
|
|
delete loadedImageSources.back(); |
|
|
loadedImageSources.pop_back(); |
|
|
loadedImageSources.pop_back(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
while ( loadedImageSourceNames.size() ) { |
|
|
while (loadedImageSourceNames.size()) { |
|
|
loadedImageSourceNames.pop_back(); |
|
|
loadedImageSourceNames.pop_back(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -190,15 +175,13 @@ void SurfaceManager::clear() |
|
|
// }
|
|
|
// }
|
|
|
// }
|
|
|
// }
|
|
|
|
|
|
|
|
|
void SurfaceManager::saveXmlSettings(string fileName) |
|
|
void SurfaceManager::saveXmlSettings(string fileName) { |
|
|
{ |
|
|
|
|
|
xmlSettings.clear(); |
|
|
xmlSettings.clear(); |
|
|
|
|
|
|
|
|
// save surfaces
|
|
|
// save surfaces
|
|
|
xmlSettings.addTag("surfaces"); |
|
|
xmlSettings.addTag("surfaces"); |
|
|
xmlSettings.pushTag("surfaces"); |
|
|
xmlSettings.pushTag("surfaces"); |
|
|
for ( int i=0; i<surfaces.size(); i++ ) { |
|
|
for (int i = 0; i < surfaces.size(); i++) { |
|
|
|
|
|
|
|
|
xmlSettings.addTag("surface"); |
|
|
xmlSettings.addTag("surface"); |
|
|
xmlSettings.pushTag("surface", i); |
|
|
xmlSettings.pushTag("surface", i); |
|
|
BaseSurface* surface = surfaces[i]; |
|
|
BaseSurface* surface = surfaces[i]; |
|
|
@ -206,7 +189,7 @@ void SurfaceManager::saveXmlSettings(string fileName) |
|
|
xmlSettings.addTag("vertices"); |
|
|
xmlSettings.addTag("vertices"); |
|
|
xmlSettings.pushTag("vertices"); |
|
|
xmlSettings.pushTag("vertices"); |
|
|
vector<ofVec3f>* vertices = &surface->getVertices(); |
|
|
vector<ofVec3f>* vertices = &surface->getVertices(); |
|
|
for ( int j=0; j<vertices->size(); j++ ) { |
|
|
for (int j = 0; j < vertices->size(); j++) { |
|
|
xmlSettings.addTag("vertex"); |
|
|
xmlSettings.addTag("vertex"); |
|
|
xmlSettings.pushTag("vertex", j); |
|
|
xmlSettings.pushTag("vertex", j); |
|
|
ofVec3f* vertex = &(*vertices)[j]; |
|
|
ofVec3f* vertex = &(*vertices)[j]; |
|
|
@ -222,7 +205,7 @@ void SurfaceManager::saveXmlSettings(string fileName) |
|
|
xmlSettings.addTag("texCoords"); |
|
|
xmlSettings.addTag("texCoords"); |
|
|
xmlSettings.pushTag("texCoords"); |
|
|
xmlSettings.pushTag("texCoords"); |
|
|
vector<ofVec2f>* texCoords = &surface->getTexCoords(); |
|
|
vector<ofVec2f>* texCoords = &surface->getTexCoords(); |
|
|
for ( int j=0; j<texCoords->size(); j++ ) { |
|
|
for (int j = 0; j < texCoords->size(); j++) { |
|
|
xmlSettings.addTag("texCoord"); |
|
|
xmlSettings.addTag("texCoord"); |
|
|
xmlSettings.pushTag("texCoord", j); |
|
|
xmlSettings.pushTag("texCoord", j); |
|
|
ofVec2f* texCoord = &(*texCoords)[j]; |
|
|
ofVec2f* texCoord = &(*texCoords)[j]; |
|
|
@ -237,10 +220,9 @@ void SurfaceManager::saveXmlSettings(string fileName) |
|
|
|
|
|
|
|
|
xmlSettings.addValue("source-type", "image"); |
|
|
xmlSettings.addValue("source-type", "image"); |
|
|
xmlSettings.addValue("source-name", getSurfaceSourceName(surface)); |
|
|
xmlSettings.addValue("source-name", getSurfaceSourceName(surface)); |
|
|
//xmlSettings.addValue("source-path", "/root/etc/image.jpg");
|
|
|
// xmlSettings.addValue("source-path", "/root/etc/image.jpg");
|
|
|
xmlSettings.popTag(); // source
|
|
|
xmlSettings.popTag(); // source
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// xmlSettings.addTag("type");
|
|
|
// xmlSettings.addTag("type");
|
|
|
// xmlSettings.pushTag("type");
|
|
|
// xmlSettings.pushTag("type");
|
|
|
// // surfaceType == SurfaceType::TRIANGLE_SURFACE
|
|
|
// // surfaceType == SurfaceType::TRIANGLE_SURFACE
|
|
|
@ -255,16 +237,13 @@ void SurfaceManager::saveXmlSettings(string fileName) |
|
|
xmlSettings.save(fileName); |
|
|
xmlSettings.save(fileName); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void SurfaceManager::loadXmlSettings(string fileName) |
|
|
void SurfaceManager::loadXmlSettings(string fileName) { |
|
|
{ |
|
|
if (!xmlSettings.loadFile(fileName)) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!xmlSettings.loadFile(fileName)){ |
|
|
|
|
|
ofLog(OF_LOG_WARNING, "Could not load XML settings."); |
|
|
ofLog(OF_LOG_WARNING, "Could not load XML settings."); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (!xmlSettings.tagExists("surfaces")){ |
|
|
if (!xmlSettings.tagExists("surfaces")) { |
|
|
ofLog(OF_LOG_WARNING, "XML settings is empty or has wrong markup."); |
|
|
ofLog(OF_LOG_WARNING, "XML settings is empty or has wrong markup."); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
@ -272,14 +251,14 @@ void SurfaceManager::loadXmlSettings(string fileName) |
|
|
xmlSettings.pushTag("surfaces"); |
|
|
xmlSettings.pushTag("surfaces"); |
|
|
|
|
|
|
|
|
int numSurfaces = xmlSettings.getNumTags("surface"); |
|
|
int numSurfaces = xmlSettings.getNumTags("surface"); |
|
|
for ( int i=0; i<numSurfaces; i++ ) { |
|
|
for (int i = 0; i < numSurfaces; i++) { |
|
|
xmlSettings.pushTag("surface", i); |
|
|
xmlSettings.pushTag("surface", i); |
|
|
// attempt to load surface source
|
|
|
// attempt to load surface source
|
|
|
xmlSettings.pushTag("source"); |
|
|
xmlSettings.pushTag("source"); |
|
|
string sourceType = xmlSettings.getValue("source-type", "image"); |
|
|
string sourceType = xmlSettings.getValue("source-type", "image"); |
|
|
string sourceName = xmlSettings.getValue("source-name", "none"); |
|
|
string sourceName = xmlSettings.getValue("source-name", "none"); |
|
|
ofTexture* sourceTexture = NULL; |
|
|
ofTexture* sourceTexture = NULL; |
|
|
if ( sourceName != "none" ) { |
|
|
if (sourceName != "none") { |
|
|
stringstream ss; |
|
|
stringstream ss; |
|
|
ss << "sources/images/" << sourceName; // TODO: reuse constants here
|
|
|
ss << "sources/images/" << sourceName; // TODO: reuse constants here
|
|
|
sourceTexture = loadImageSource(sourceName, ss.str()); |
|
|
sourceTexture = loadImageSource(sourceName, ss.str()); |
|
|
@ -289,30 +268,31 @@ void SurfaceManager::loadXmlSettings(string fileName) |
|
|
// // attempt to load surface type
|
|
|
// // attempt to load surface type
|
|
|
// ofLog(OF_LOG_WARNING, "Attempt to load surface type.");
|
|
|
// ofLog(OF_LOG_WARNING, "Attempt to load surface type.");
|
|
|
// xmlSettings.pushTag("type");
|
|
|
// xmlSettings.pushTag("type");
|
|
|
// string surfaceType = xmlSettings.getValue("surface-type", "TRIANGLE_SURFACE");
|
|
|
// string surfaceType = xmlSettings.getValue("surface-type",
|
|
|
|
|
|
// "TRIANGLE_SURFACE");
|
|
|
// xmlSettings.popTag(); // type
|
|
|
// xmlSettings.popTag(); // type
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
xmlSettings.pushTag("vertices"); |
|
|
xmlSettings.pushTag("vertices"); |
|
|
vector<ofVec2f> vertices; |
|
|
vector<ofVec2f> vertices; |
|
|
|
|
|
|
|
|
int vertexCount = xmlSettings.getNumTags("vertex"); |
|
|
int vertexCount = xmlSettings.getNumTags("vertex"); |
|
|
|
|
|
|
|
|
|
|
|
// it's a triangle ?
|
|
|
//it's a triangle ?
|
|
|
if (vertexCount == 3) { |
|
|
if (vertexCount == 3) |
|
|
|
|
|
{ |
|
|
|
|
|
ofLog(OF_LOG_NOTICE, "create Triangle"); |
|
|
ofLog(OF_LOG_NOTICE, "create Triangle"); |
|
|
xmlSettings.pushTag("vertex", 0); |
|
|
xmlSettings.pushTag("vertex", 0); |
|
|
vertices.push_back( ofVec2f( xmlSettings.getValue("x", 0.0f), xmlSettings.getValue("y", 0.0f) ) ); |
|
|
vertices.push_back(ofVec2f(xmlSettings.getValue("x", 0.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 0.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("vertex", 1); |
|
|
xmlSettings.pushTag("vertex", 1); |
|
|
vertices.push_back( ofVec2f( xmlSettings.getValue("x", 100.0f), xmlSettings.getValue("y", 0.0f) ) ); |
|
|
vertices.push_back(ofVec2f(xmlSettings.getValue("x", 100.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 0.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("vertex", 2); |
|
|
xmlSettings.pushTag("vertex", 2); |
|
|
vertices.push_back( ofVec2f( xmlSettings.getValue("x", 0.0f), xmlSettings.getValue("y", 100.0f) ) ); |
|
|
vertices.push_back(ofVec2f(xmlSettings.getValue("x", 0.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 100.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.popTag(); // vertices
|
|
|
xmlSettings.popTag(); // vertices
|
|
|
@ -322,24 +302,27 @@ void SurfaceManager::loadXmlSettings(string fileName) |
|
|
vector<ofVec2f> texCoords; |
|
|
vector<ofVec2f> texCoords; |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("texCoord", 0); |
|
|
xmlSettings.pushTag("texCoord", 0); |
|
|
texCoords.push_back( ofVec2f( xmlSettings.getValue("x", 0.0f), xmlSettings.getValue("y", 0.0f) ) ); |
|
|
texCoords.push_back(ofVec2f(xmlSettings.getValue("x", 0.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 0.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("texCoord", 1); |
|
|
xmlSettings.pushTag("texCoord", 1); |
|
|
texCoords.push_back( ofVec2f( xmlSettings.getValue("x", 1.0f), xmlSettings.getValue("y", 0.0f) ) ); |
|
|
texCoords.push_back(ofVec2f(xmlSettings.getValue("x", 1.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 0.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("texCoord", 2); |
|
|
xmlSettings.pushTag("texCoord", 2); |
|
|
texCoords.push_back( ofVec2f( xmlSettings.getValue("x", 0.0f), xmlSettings.getValue("y", 1.0f) ) ); |
|
|
texCoords.push_back(ofVec2f(xmlSettings.getValue("x", 0.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 1.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.popTag(); // texCoords
|
|
|
xmlSettings.popTag(); // texCoords
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// now we have variables sourceName and sourceTexture
|
|
|
// now we have variables sourceName and sourceTexture
|
|
|
// by checking those we can use one or another addSurface method
|
|
|
// by checking those we can use one or another addSurface method
|
|
|
if ( sourceName != "none" && sourceTexture != NULL ) { |
|
|
if (sourceName != "none" && sourceTexture != NULL) { |
|
|
addSurface(SurfaceType::TRIANGLE_SURFACE, sourceTexture, vertices, texCoords); |
|
|
addSurface(SurfaceType::TRIANGLE_SURFACE, sourceTexture, vertices, |
|
|
|
|
|
texCoords); |
|
|
} else { |
|
|
} else { |
|
|
addSurface(SurfaceType::TRIANGLE_SURFACE, vertices, texCoords); |
|
|
addSurface(SurfaceType::TRIANGLE_SURFACE, vertices, texCoords); |
|
|
} |
|
|
} |
|
|
@ -349,19 +332,23 @@ void SurfaceManager::loadXmlSettings(string fileName) |
|
|
// if (surface-type == QUAD_SURFACE)
|
|
|
// if (surface-type == QUAD_SURFACE)
|
|
|
{ |
|
|
{ |
|
|
xmlSettings.pushTag("vertex", 0); |
|
|
xmlSettings.pushTag("vertex", 0); |
|
|
vertices.push_back( ofVec2f( xmlSettings.getValue("x", 0.0f), xmlSettings.getValue("y", 0.0f) ) ); |
|
|
vertices.push_back(ofVec2f(xmlSettings.getValue("x", 0.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 0.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("vertex", 1); |
|
|
xmlSettings.pushTag("vertex", 1); |
|
|
vertices.push_back( ofVec2f( xmlSettings.getValue("x", 100.0f), xmlSettings.getValue("y", 0.0f) ) ); |
|
|
vertices.push_back(ofVec2f(xmlSettings.getValue("x", 100.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 0.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("vertex", 2); |
|
|
xmlSettings.pushTag("vertex", 2); |
|
|
vertices.push_back( ofVec2f( xmlSettings.getValue("x", 100.0f), xmlSettings.getValue("y", 100.0f) ) ); |
|
|
vertices.push_back(ofVec2f(xmlSettings.getValue("x", 100.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 100.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("vertex", 3); |
|
|
xmlSettings.pushTag("vertex", 3); |
|
|
vertices.push_back( ofVec2f( xmlSettings.getValue("x", 0.0f), xmlSettings.getValue("y", 100.0f) ) ); |
|
|
vertices.push_back(ofVec2f(xmlSettings.getValue("x", 0.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 100.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.popTag(); // vertices
|
|
|
xmlSettings.popTag(); // vertices
|
|
|
@ -371,33 +358,35 @@ void SurfaceManager::loadXmlSettings(string fileName) |
|
|
vector<ofVec2f> texCoords; |
|
|
vector<ofVec2f> texCoords; |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("texCoord", 0); |
|
|
xmlSettings.pushTag("texCoord", 0); |
|
|
texCoords.push_back( ofVec2f( xmlSettings.getValue("x", 0.0f), xmlSettings.getValue("y", 0.0f) ) ); |
|
|
texCoords.push_back(ofVec2f(xmlSettings.getValue("x", 0.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 0.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("texCoord", 1); |
|
|
xmlSettings.pushTag("texCoord", 1); |
|
|
texCoords.push_back( ofVec2f( xmlSettings.getValue("x", 1.0f), xmlSettings.getValue("y", 0.0f) ) ); |
|
|
texCoords.push_back(ofVec2f(xmlSettings.getValue("x", 1.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 0.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("texCoord", 2); |
|
|
xmlSettings.pushTag("texCoord", 2); |
|
|
texCoords.push_back( ofVec2f( xmlSettings.getValue("x", 1.0f), xmlSettings.getValue("y", 1.0f) ) ); |
|
|
texCoords.push_back(ofVec2f(xmlSettings.getValue("x", 1.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 1.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.pushTag("texCoord", 3); |
|
|
xmlSettings.pushTag("texCoord", 3); |
|
|
texCoords.push_back( ofVec2f( xmlSettings.getValue("x", 0.0f), xmlSettings.getValue("y", 1.0f) ) ); |
|
|
texCoords.push_back(ofVec2f(xmlSettings.getValue("x", 0.0f), |
|
|
|
|
|
xmlSettings.getValue("y", 1.0f))); |
|
|
xmlSettings.popTag(); |
|
|
xmlSettings.popTag(); |
|
|
|
|
|
|
|
|
xmlSettings.popTag(); // texCoords
|
|
|
xmlSettings.popTag(); // texCoords
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// now we have variables sourceName and sourceTexture
|
|
|
// now we have variables sourceName and sourceTexture
|
|
|
// by checking those we can use one or another addSurface method
|
|
|
// by checking those we can use one or another addSurface method
|
|
|
if ( sourceName != "none" && sourceTexture != NULL ) { |
|
|
if (sourceName != "none" && sourceTexture != NULL) { |
|
|
addSurface(SurfaceType::QUAD_SURFACE, sourceTexture, vertices, texCoords); |
|
|
addSurface(SurfaceType::QUAD_SURFACE, sourceTexture, vertices, |
|
|
|
|
|
texCoords); |
|
|
} else { |
|
|
} else { |
|
|
addSurface(SurfaceType::QUAD_SURFACE, vertices, texCoords); |
|
|
addSurface(SurfaceType::QUAD_SURFACE, vertices, texCoords); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
xmlSettings.popTag(); // surface
|
|
|
xmlSettings.popTag(); // surface
|
|
|
@ -406,9 +395,8 @@ void SurfaceManager::loadXmlSettings(string fileName) |
|
|
xmlSettings.popTag(); // surfaces
|
|
|
xmlSettings.popTag(); // surfaces
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
BaseSurface* SurfaceManager::selectSurface(int index) |
|
|
BaseSurface* SurfaceManager::selectSurface(int index) { |
|
|
{ |
|
|
if (index >= surfaces.size()) { |
|
|
if ( index >= surfaces.size() ) { |
|
|
|
|
|
throw std::runtime_error("Surface index out of bounds."); |
|
|
throw std::runtime_error("Surface index out of bounds."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -418,21 +406,14 @@ BaseSurface* SurfaceManager::selectSurface(int index) |
|
|
ofSendMessage("surfaceSelected"); |
|
|
ofSendMessage("surfaceSelected"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
BaseSurface* SurfaceManager::getSelectedSurface() |
|
|
BaseSurface* SurfaceManager::getSelectedSurface() { return selectedSurface; } |
|
|
{ |
|
|
|
|
|
return selectedSurface; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void SurfaceManager::deselectSurface() |
|
|
void SurfaceManager::deselectSurface() { selectedSurface = NULL; } |
|
|
{ |
|
|
|
|
|
selectedSurface = NULL; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ofTexture* SurfaceManager::loadImageSource(string name, string path) |
|
|
ofTexture* SurfaceManager::loadImageSource(string name, string path) { |
|
|
{ |
|
|
|
|
|
// check if it is loaded
|
|
|
// check if it is loaded
|
|
|
for ( int i=0; i<loadedImageSourceNames.size(); i++ ) { |
|
|
for (int i = 0; i < loadedImageSourceNames.size(); i++) { |
|
|
if ( loadedImageSourceNames[i] == name ) { |
|
|
if (loadedImageSourceNames[i] == name) { |
|
|
// this image is already loaded
|
|
|
// this image is already loaded
|
|
|
return &loadedImageSources[i]->getTextureReference(); |
|
|
return &loadedImageSources[i]->getTextureReference(); |
|
|
} |
|
|
} |
|
|
@ -440,7 +421,7 @@ ofTexture* SurfaceManager::loadImageSource(string name, string path) |
|
|
|
|
|
|
|
|
// not loaded - load
|
|
|
// not loaded - load
|
|
|
ofImage* image = new ofImage(); |
|
|
ofImage* image = new ofImage(); |
|
|
if ( !image->loadImage(path) ){ |
|
|
if (!image->loadImage(path)) { |
|
|
return NULL; |
|
|
return NULL; |
|
|
} |
|
|
} |
|
|
loadedImageSources.push_back(image); |
|
|
loadedImageSources.push_back(image); |
|
|
@ -448,19 +429,17 @@ ofTexture* SurfaceManager::loadImageSource(string name, string path) |
|
|
return &image->getTextureReference(); |
|
|
return &image->getTextureReference(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
string SurfaceManager::getSelectedSurfaceSourceName() |
|
|
string SurfaceManager::getSelectedSurfaceSourceName() { |
|
|
{ |
|
|
if (selectedSurface == NULL) { |
|
|
if ( selectedSurface == NULL ) { |
|
|
|
|
|
return "none"; |
|
|
return "none"; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return getSurfaceSourceName( selectedSurface ); |
|
|
return getSurfaceSourceName(selectedSurface); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
string SurfaceManager::getSurfaceSourceName(BaseSurface *surface) |
|
|
string SurfaceManager::getSurfaceSourceName(BaseSurface* surface) { |
|
|
{ |
|
|
|
|
|
ofTexture* tex = surface->getTexture(); |
|
|
ofTexture* tex = surface->getTexture(); |
|
|
for ( int i=0; i<loadedImageSources.size(); i++ ) { |
|
|
for (int i = 0; i < loadedImageSources.size(); i++) { |
|
|
if (tex == &loadedImageSources[i]->getTextureReference()) { |
|
|
if (tex == &loadedImageSources[i]->getTextureReference()) { |
|
|
return loadedImageSourceNames[i]; |
|
|
return loadedImageSourceNames[i]; |
|
|
} |
|
|
} |
|
|
@ -469,9 +448,8 @@ string SurfaceManager::getSurfaceSourceName(BaseSurface *surface) |
|
|
return "none"; |
|
|
return "none"; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
BaseSurface* SurfaceManager::getSurface(int index) |
|
|
BaseSurface* SurfaceManager::getSurface(int index) { |
|
|
{ |
|
|
if (index >= surfaces.size()) { |
|
|
if ( index >= surfaces.size() ) { |
|
|
|
|
|
throw std::runtime_error("Surface index out of bounds."); |
|
|
throw std::runtime_error("Surface index out of bounds."); |
|
|
return NULL; |
|
|
return NULL; |
|
|
} |
|
|
} |
|
|
@ -479,10 +457,6 @@ BaseSurface* SurfaceManager::getSurface(int index) |
|
|
return surfaces[index]; |
|
|
return surfaces[index]; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
int SurfaceManager::size() |
|
|
int SurfaceManager::size() { return surfaces.size(); } |
|
|
{ |
|
|
} |
|
|
return surfaces.size(); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
}} |
|
|
|
|
|
|
|
|
|
|
|
|
Felix Dubrownik
11 years ago