Add ofSetDepthWrite(bool) method, remove glDepthMask from ofGraphics.

libs/openFrameworks/app/ofAppNoWindow.cpp

@@ -155,6 +155,7 @@ class ofNoopRenderer: public ofBaseRenderer{
 	void enablePointSprites(){};
 	void disablePointSprites(){};
 	void setDepthTest(bool){};
+	void setDepthWrite(bool write){};
 
 	// color options
 	void setColor(float r, float g, float b){}; // 0-1

libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp

@@ -1158,6 +1158,11 @@ void ofGLProgrammableRenderer::setDepthTest(bool depthTest) {
 	}
 }
 
+//----------------------------------------------------------
+void ofGLProgrammableRenderer::setDepthWrite(bool write) {
+	glDepthMask(write);
+}
+
 //----------------------------------------------------------
 void ofGLProgrammableRenderer::setLineSmoothing(bool smooth) {
 	currentStyle.smoothing = smooth;

libs/openFrameworks/gl/ofGLProgrammableRenderer.h

@@ -129,6 +129,7 @@ class ofGLProgrammableRenderer: public ofBaseGLRenderer{
 	void setLineWidth(float lineWidth);
 	void setPointSize(float pointSize);
 	void setDepthTest(bool depthTest);
+	void setDepthWrite(bool write);
 	void setLineSmoothing(bool smooth);
 	void setBlendMode(ofBlendMode blendMode);
 	void enablePointSprites();

libs/openFrameworks/gl/ofGLRenderer.cpp

@@ -1275,6 +1275,11 @@ void ofGLRenderer::setDepthTest(bool depthTest) {
 	}
 }
 
+//----------------------------------------------------------
+void ofGLRenderer::setDepthWrite(bool write) {
+	glDepthMask(write);
+}
+
 //----------------------------------------------------------
 void ofGLRenderer::setLineSmoothing(bool smooth) {
 	currentStyle.smoothing = smooth;

libs/openFrameworks/gl/ofGLRenderer.h

@@ -114,6 +114,7 @@ class ofGLRenderer: public ofBaseGLRenderer{
 	void setLineWidth(float lineWidth);
 	void setPointSize(float pointSize);
 	void setDepthTest(bool depthTest);
+	void setDepthWrite(bool write);
 	void setLineSmoothing(bool smooth);
 	void setBlendMode(ofBlendMode blendMode);
 	void enablePointSprites();

libs/openFrameworks/graphics/ofCairoRenderer.h

@@ -90,6 +90,7 @@ class ofCairoRenderer: public ofBaseRenderer{
 	void enablePointSprites() {};
 	void disablePointSprites() {};
 	void setDepthTest(bool depthTest);
+	void setDepthWrite(bool write) {};
 	void setBlendMode(ofBlendMode blendMode);
 	void setLineSmoothing(bool smooth);
 	void enableAntiAliasing();

libs/openFrameworks/graphics/ofGraphics.cpp

@@ -489,6 +489,11 @@ void ofDisableDepthTest() {
 	ofSetDepthTest(false);
 }
 
+//----------------------------------------------------------
+void ofSetDepthWrite(bool write) {
+	ofGetCurrentRenderer()->setDepthWrite(write);
+}
+
 //----------------------------------------
 void ofSetCurveResolution(int res) {
 	ofGetCurrentRenderer()->setCurveResolution(res);
@@ -1213,7 +1218,7 @@ void ofDrawBitmapStringHighlight(string text, int x, int y, const ofColor & back
 	int width = maxLineLength * fontSize;
 
 	ofPushStyle();
-	glDepthMask(false);
+	ofSetDepthWrite(false);
 	ofSetColor(background);
 	ofFill();
 	ofPushMatrix();
@@ -1231,7 +1236,7 @@ void ofDrawBitmapStringHighlight(string text, int x, int y, const ofColor & back
 	ofSetColor(foreground);
 	ofNoFill();
 	ofDrawBitmapString(text, x, y);
-	glDepthMask(true);
+	ofSetDepthWrite(true);
 	ofPopStyle();
 }
 

libs/openFrameworks/graphics/ofGraphics.h

@@ -829,6 +829,10 @@ void ofEnableDepthTest();
 /// \sa ofEnableDepthTest()
 void ofDisableDepthTest();
 
+/// \brief Enable / disable writing to the depth buffer.
+/// Helpful when drawing transparent objects while depth testing is enabled.
+void ofSetDepthWrite(bool write);
+
 /// \brief Sets and enables the blend mode for drawing. The options are:
 ///
 ///     OF_BLENDMODE_DISABLED

libs/openFrameworks/graphics/ofGraphicsBaseTypes.h

@@ -875,6 +875,9 @@ class ofBaseRenderer {
 	///
 	/// \param depthTest True to enable depth testing.
 	virtual void setDepthTest(bool depthTest) = 0;
+
+	/// \brief Enable / disable writing to the depth buffer.
+	virtual void setDepthWrite( bool write ) = 0;
 
 	/// \brief Set this renderer's current blend mode.
 	///

libs/openFrameworks/graphics/ofRendererCollection.cpp

@@ -562,6 +562,12 @@ void ofRendererCollection::setDepthTest(bool depthTest) {
    }
 }
 
+void ofRendererCollection::setDepthWrite(bool write) {
+	for(auto renderer: renderers){
+		renderer->setDepthWrite(write);
+	}
+}
+
 void ofRendererCollection::setBlendMode(ofBlendMode blendMode){
    for(auto renderer: renderers){
 	   renderer->setBlendMode(blendMode);

libs/openFrameworks/graphics/ofRendererCollection.h

@@ -184,6 +184,7 @@ class ofRendererCollection: public ofBaseRenderer{
 	void setLineWidth(float lineWidth);
 	void setPointSize(float pointSize);
 	void setDepthTest(bool depthTest);
+	void setDepthWrite(bool write);
 
 	void setBlendMode(ofBlendMode blendMode);
 	void setLineSmoothing(bool smooth);