Browse Source

Rename `SurfaceManager::addSurface(...)` to `createSurface` where it creates surface

There has to be a difference between creational and "additional" methods.
master
Krisjanis Rijnieks 10 years ago
parent
commit
ac2a2e7834
  1. 4
      src/Commands/AddSurfaceCmd.cpp
  2. 12
      src/Surfaces/SurfaceManager.cpp
  3. 5
      src/Surfaces/SurfaceManager.h
  4. 4
      src/ofxPiMapper.cpp

4
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

12
src/Surfaces/SurfaceManager.cpp

@ -19,7 +19,7 @@ void SurfaceManager::draw(){
}
}
void SurfaceManager::addSurface(int surfaceType, vector <ofVec2f> vertices,
void SurfaceManager::createSurface(int surfaceType, vector <ofVec2f> vertices,
vector <ofVec2f> texCoords){
if(surfaceType == SurfaceType::TRIANGLE_SURFACE){
if(vertices.size() < 3){
@ -57,7 +57,7 @@ void SurfaceManager::addSurface(int surfaceType, vector <ofVec2f> vertices,
}
}
void SurfaceManager::addSurface(int surfaceType, BaseSource * newSource,
void SurfaceManager::createSurface(int surfaceType, BaseSource * newSource,
vector <ofVec2f> vertices,
vector <ofVec2f> 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);
}
}

5
src/Surfaces/SurfaceManager.h

@ -24,10 +24,9 @@ class SurfaceManager {
void draw();
// TODO: These should be renamed to createSurface
void addSurface(int surfaceType, vector <ofVec2f> vertices,
void createSurface(int surfaceType, vector <ofVec2f> vertices,
vector <ofVec2f> texCoords);
void addSurface(int surfaceType, BaseSource * newSource,
void createSurface(int surfaceType, BaseSource * newSource,
vector <ofVec2f> vertices, vector <ofVec2f> texCoords);
// Except this, as it adds existing surface

4
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);

Loading…
Cancel
Save