From ac2a2e78344511cb817683fbf9bcdb9c0ce272df Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sun, 3 Jan 2016 14:44:47 +0000 Subject: [PATCH] Rename `SurfaceManager::addSurface(...)` to `createSurface` where it creates surface There has to be a difference between creational and "additional" methods. --- src/Commands/AddSurfaceCmd.cpp | 4 ++-- src/Surfaces/SurfaceManager.cpp | 12 ++++++------ src/Surfaces/SurfaceManager.h | 5 ++--- src/ofxPiMapper.cpp | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Commands/AddSurfaceCmd.cpp b/src/Commands/AddSurfaceCmd.cpp index c3eefaf..bbff713 100644 --- a/src/Commands/AddSurfaceCmd.cpp +++ b/src/Commands/AddSurfaceCmd.cpp @@ -34,7 +34,7 @@ void AddSurfaceCmd::addTriangleSurface(){ texCoords.push_back(ofVec2f(0.5f, 0.0f)); texCoords.push_back(ofVec2f(1.0f, 1.0f)); texCoords.push_back(ofVec2f(0.0f, 1.0f)); - _app->getSurfaceManager().addSurface(surfaceType, vertices, texCoords); + _app->getSurfaceManager().createSurface(surfaceType, vertices, texCoords); } void AddSurfaceCmd::addQuadSurface(){ @@ -53,7 +53,7 @@ void AddSurfaceCmd::addQuadSurface(){ texCoords.push_back(ofVec2f(ofVec2f(1.0f, 1.0f))); texCoords.push_back(ofVec2f(ofVec2f(0.0f, 1.0f))); - _app->getSurfaceManager().addSurface(surfaceType, vertices, texCoords); + _app->getSurfaceManager().createSurface(surfaceType, vertices, texCoords); } } // namespace piMapper diff --git a/src/Surfaces/SurfaceManager.cpp b/src/Surfaces/SurfaceManager.cpp index 0574e90..1c460ed 100644 --- a/src/Surfaces/SurfaceManager.cpp +++ b/src/Surfaces/SurfaceManager.cpp @@ -19,7 +19,7 @@ void SurfaceManager::draw(){ } } -void SurfaceManager::addSurface(int surfaceType, vector vertices, +void SurfaceManager::createSurface(int surfaceType, vector vertices, vector texCoords){ if(surfaceType == SurfaceType::TRIANGLE_SURFACE){ if(vertices.size() < 3){ @@ -57,7 +57,7 @@ void SurfaceManager::addSurface(int surfaceType, vector vertices, } } -void SurfaceManager::addSurface(int surfaceType, BaseSource * newSource, +void SurfaceManager::createSurface(int surfaceType, BaseSource * newSource, vector vertices, vector texCoords){ if(surfaceType == SurfaceType::TRIANGLE_SURFACE){ @@ -281,10 +281,10 @@ void SurfaceManager::loadXmlSettings(string fileName){ // now we have variables sourceName and sourceTexture // by checking those we can use one or another addSurface method if(sourceName != "none" && source != 0){ - addSurface(SurfaceType::TRIANGLE_SURFACE, source, vertices, + createSurface(SurfaceType::TRIANGLE_SURFACE, source, vertices, texCoords); }else{ - addSurface(SurfaceType::TRIANGLE_SURFACE, vertices, texCoords); + createSurface(SurfaceType::TRIANGLE_SURFACE, vertices, texCoords); } } // it's a quad ? @@ -341,10 +341,10 @@ void SurfaceManager::loadXmlSettings(string fileName){ // now we have variables sourceName and sourceTexture // by checking those we can use one or another addSurface method if(sourceName != "none" && source != 0){ - addSurface(SurfaceType::QUAD_SURFACE, source, vertices, + createSurface(SurfaceType::QUAD_SURFACE, source, vertices, texCoords); }else{ - addSurface(SurfaceType::QUAD_SURFACE, vertices, texCoords); + createSurface(SurfaceType::QUAD_SURFACE, vertices, texCoords); } } diff --git a/src/Surfaces/SurfaceManager.h b/src/Surfaces/SurfaceManager.h index 61fdcaf..d3495c5 100644 --- a/src/Surfaces/SurfaceManager.h +++ b/src/Surfaces/SurfaceManager.h @@ -24,10 +24,9 @@ class SurfaceManager { void draw(); - // TODO: These should be renamed to createSurface - void addSurface(int surfaceType, vector vertices, + void createSurface(int surfaceType, vector vertices, vector texCoords); - void addSurface(int surfaceType, BaseSource * newSource, + void createSurface(int surfaceType, BaseSource * newSource, vector vertices, vector texCoords); // Except this, as it adds existing surface diff --git a/src/ofxPiMapper.cpp b/src/ofxPiMapper.cpp index 59a6925..f3f0fb7 100644 --- a/src/ofxPiMapper.cpp +++ b/src/ofxPiMapper.cpp @@ -87,7 +87,7 @@ void ofxPiMapper::addTriangleSurface(){ texCoords.push_back(ofVec2f(0.5f, 0.0f)); texCoords.push_back(ofVec2f(1.0f, 1.0f)); texCoords.push_back(ofVec2f(0.0f, 1.0f)); - surfaceManager.addSurface(surfaceType, vertices, texCoords); + surfaceManager.createSurface(surfaceType, vertices, texCoords); // Select this surface right away surfaceManager.selectSurface(surfaceManager.size() - 1); @@ -109,7 +109,7 @@ void ofxPiMapper::addQuadSurface(){ texCoords.push_back(ofVec2f(ofVec2f(1.0f, 1.0f))); texCoords.push_back(ofVec2f(ofVec2f(0.0f, 1.0f))); - surfaceManager.addSurface(surfaceType, vertices, texCoords); + surfaceManager.createSurface(surfaceType, vertices, texCoords); // select this surface right away surfaceManager.selectSurface(surfaceManager.size() - 1);