From 1606f38b924db37d8f155b7cbf7c94b88a73bb21 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sun, 3 Jan 2016 15:08:48 +0000 Subject: [PATCH] Remove `addTriangleSurface()` and `addQuadSurface()` methods from `ofxPiMapper` class --- src/ofxPiMapper.cpp | 41 ----------------------------------------- src/ofxPiMapper.h | 2 -- 2 files changed, 43 deletions(-) diff --git a/src/ofxPiMapper.cpp b/src/ofxPiMapper.cpp index 4e939dd..dd0da47 100644 --- a/src/ofxPiMapper.cpp +++ b/src/ofxPiMapper.cpp @@ -71,47 +71,6 @@ bool ofxPiMapper::loadXmlSettings(string fileName){ return true; } -void ofxPiMapper::addTriangleSurface(){ - int surfaceType = ofx::piMapper::SurfaceType::TRIANGLE_SURFACE; - - vector vertices; - float margin = 50.0f; - vertices.push_back(ofVec2f((float)ofGetWidth() / 2.0f, margin)); - vertices.push_back(ofVec2f((float)ofGetWidth() - margin, (float)ofGetHeight() - margin)); - vertices.push_back(ofVec2f(margin, (float)ofGetHeight() - margin)); - - vector texCoords; - 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.createSurface(surfaceType, vertices, texCoords); - - // Select this surface right away - surfaceManager.selectSurface(surfaceManager.size() - 1); -} // addTriangleSurface - -void ofxPiMapper::addQuadSurface(){ - int surfaceType = ofx::piMapper::SurfaceType::QUAD_SURFACE; - - vector vertices; - float margin = 50.0f; - vertices.push_back(ofVec2f(margin, margin)); - vertices.push_back(ofVec2f((float)ofGetWidth() - margin, margin)); - vertices.push_back(ofVec2f((float)ofGetWidth() - margin, (float)ofGetHeight() - margin)); - vertices.push_back(ofVec2f(margin, (float)ofGetHeight() - margin)); - - vector texCoords; - texCoords.push_back(ofVec2f(ofVec2f(0.0f, 0.0f))); - texCoords.push_back(ofVec2f(ofVec2f(1.0f, 0.0f))); - texCoords.push_back(ofVec2f(ofVec2f(1.0f, 1.0f))); - texCoords.push_back(ofVec2f(ofVec2f(0.0f, 1.0f))); - - surfaceManager.createSurface(surfaceType, vertices, texCoords); - - // select this surface right away - surfaceManager.selectSurface(surfaceManager.size() - 1); -} // addQuadSurface - ofx::piMapper::CmdManager & ofxPiMapper::getCmdManager(){ return cmdManager; } diff --git a/src/ofxPiMapper.h b/src/ofxPiMapper.h index ce975ac..e640a87 100644 --- a/src/ofxPiMapper.h +++ b/src/ofxPiMapper.h @@ -28,8 +28,6 @@ class ofxPiMapper { void draw(); void registerFboSource(ofx::piMapper::FboSource & fboSource); bool loadXmlSettings(string fileName); - void addTriangleSurface(); - void addQuadSurface(); void showInfo(){ bShowInfo = true; }