Browse Source

Remove ofSetColor from surface draw() calls

master
Krisjanis Rijnieks 9 years ago
parent
commit
1dafb81faa
  1. 5
      src/Surfaces/GridWarpSurface.cpp
  2. 5
      src/Surfaces/QuadSurface.cpp
  3. 5
      src/Surfaces/TriangleSurface.cpp

5
src/Surfaces/GridWarpSurface.cpp

@ -25,15 +25,10 @@ void GridWarpSurface::draw(){
bool normalizedTexCoords = ofGetUsingNormalizedTexCoords(); bool normalizedTexCoords = ofGetUsingNormalizedTexCoords();
ofEnableNormalizedTexCoords(); ofEnableNormalizedTexCoords();
ofPushStyle();
ofSetColor(255, 255, 255);
source->getTexture()->bind(); source->getTexture()->bind();
mesh.draw(); mesh.draw();
source->getTexture()->unbind(); source->getTexture()->unbind();
ofPopStyle();
if(!normalizedTexCoords){ if(!normalizedTexCoords){
ofDisableNormalizedTexCoords(); ofDisableNormalizedTexCoords();
} }

5
src/Surfaces/QuadSurface.cpp

@ -81,16 +81,11 @@ void QuadSurface::draw(){
bool normalizedTexCoords = ofGetUsingNormalizedTexCoords(); bool normalizedTexCoords = ofGetUsingNormalizedTexCoords();
ofEnableNormalizedTexCoords(); ofEnableNormalizedTexCoords();
ofPushStyle();
ofSetColor(255, 255, 255);
glMultMatrixf(_matrix); glMultMatrixf(_matrix);
source->getTexture()->bind(); source->getTexture()->bind();
m.draw(); m.draw();
source->getTexture()->unbind(); source->getTexture()->unbind();
ofPopStyle();
if(!normalizedTexCoords){ if(!normalizedTexCoords){
ofDisableNormalizedTexCoords(); ofDisableNormalizedTexCoords();
} }

5
src/Surfaces/TriangleSurface.cpp

@ -54,15 +54,10 @@ void TriangleSurface::draw(){
bool normalizedTexCoords = ofGetUsingNormalizedTexCoords(); bool normalizedTexCoords = ofGetUsingNormalizedTexCoords();
ofEnableNormalizedTexCoords(); ofEnableNormalizedTexCoords();
ofPushStyle();
ofSetColor(255, 255, 255);
source->getTexture()->bind(); source->getTexture()->bind();
mesh.draw(); mesh.draw();
source->getTexture()->unbind(); source->getTexture()->unbind();
ofPopStyle();
if(!normalizedTexCoords){ if(!normalizedTexCoords){
ofDisableNormalizedTexCoords(); ofDisableNormalizedTexCoords();
} }

Loading…
Cancel
Save