From 1dafb81faae7e457d21c1fffadfd57f9d4814093 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sat, 10 Sep 2016 17:33:02 +0200 Subject: [PATCH] Remove ofSetColor from surface draw() calls --- src/Surfaces/GridWarpSurface.cpp | 7 +------ src/Surfaces/QuadSurface.cpp | 5 ----- src/Surfaces/TriangleSurface.cpp | 5 ----- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/Surfaces/GridWarpSurface.cpp b/src/Surfaces/GridWarpSurface.cpp index 6cabbb8..b43f0de 100644 --- a/src/Surfaces/GridWarpSurface.cpp +++ b/src/Surfaces/GridWarpSurface.cpp @@ -24,16 +24,11 @@ void GridWarpSurface::draw(){ bool normalizedTexCoords = ofGetUsingNormalizedTexCoords(); ofEnableNormalizedTexCoords(); - - ofPushStyle(); - ofSetColor(255, 255, 255); - + source->getTexture()->bind(); mesh.draw(); source->getTexture()->unbind(); - ofPopStyle(); - if(!normalizedTexCoords){ ofDisableNormalizedTexCoords(); } diff --git a/src/Surfaces/QuadSurface.cpp b/src/Surfaces/QuadSurface.cpp index 6844f32..92db8cb 100644 --- a/src/Surfaces/QuadSurface.cpp +++ b/src/Surfaces/QuadSurface.cpp @@ -81,16 +81,11 @@ void QuadSurface::draw(){ bool normalizedTexCoords = ofGetUsingNormalizedTexCoords(); ofEnableNormalizedTexCoords(); - ofPushStyle(); - ofSetColor(255, 255, 255); - glMultMatrixf(_matrix); source->getTexture()->bind(); m.draw(); source->getTexture()->unbind(); - ofPopStyle(); - if(!normalizedTexCoords){ ofDisableNormalizedTexCoords(); } diff --git a/src/Surfaces/TriangleSurface.cpp b/src/Surfaces/TriangleSurface.cpp index 3d0d937..ca6b03c 100644 --- a/src/Surfaces/TriangleSurface.cpp +++ b/src/Surfaces/TriangleSurface.cpp @@ -53,16 +53,11 @@ void TriangleSurface::draw(){ bool normalizedTexCoords = ofGetUsingNormalizedTexCoords(); ofEnableNormalizedTexCoords(); - - ofPushStyle(); - ofSetColor(255, 255, 255); source->getTexture()->bind(); mesh.draw(); source->getTexture()->unbind(); - ofPopStyle(); - if(!normalizedTexCoords){ ofDisableNormalizedTexCoords(); }