Skip to content

Decouple GL from ofGraphics #8554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickHardeman wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Decouple GL from ofGraphics #8554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b199d12
Remove GL specific code from ofBackgroundGradient and point sprites.
NickHardeman Sep 4, 2026
ce356e9
add enablePointSprites(), disablePointSprites() and drawBackgroundGra…
NickHardeman Sep 4, 2026
cdb43d5
add drawBackgroundGradient(), enablePointSprites and disablePointSpr…
NickHardeman Sep 4, 2026
7b0bca7
remove dependency on ofVboMesh from ofPath.h
NickHardeman Sep 4, 2026
8569c77
add drawBackgroundGradient(), enablePointSprites and disablePointSpr…
NickHardeman Sep 4, 2026
7ff4b72
add drawBackgroundGradient to ofNoopRenderer.
NickHardeman Sep 4, 2026
5de5072
include ofVboMesh in cube map
NickHardeman Sep 4, 2026
d114d8a
add drawBackgroundGradient to GL renderers.
NickHardeman Sep 4, 2026
e8c9443
include ofVboMesh.h
NickHardeman Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/ofxGui/src/ofxToggle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include "ofParameter.h"
#include "ofxBaseGui.h"
#include "ofPath.h"
#include "ofVboMesh.h"

class ofxToggle : public ofxBaseGui{
public:
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/app/ofAppNoWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ class ofNoopRenderer: public ofBaseRenderer{
void draw(const ofFloatImage & image, float x, float y, float z, float w, float h, float sx, float sy, float sw, float sh) const{}
void draw(const ofShortImage & image, float x, float y, float z, float w, float h, float sx, float sy, float sw, float sh) const{}
void draw(const ofBaseVideoDraws & video, float x, float y, float w, float h) const{}
void drawBackgroundGradient(const ofFloatColor& start, const ofFloatColor& end, ofGradientMode mode) const {};

//--------------------------------------------
// transformations
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/gl/ofCubeMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "ofTexture.h"
#include "ofFileUtils.h"
#include "ofMaterial.h"
#include "ofVboMesh.h"

#ifdef TARGET_ANDROID
#include "ofAppAndroidWindow.h"
Expand Down
62 changes: 62 additions & 0 deletions libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ bool ofIsGLProgrammableRenderer() {
return programmableRendererCreated;
}

static ofVboMesh gradientMesh;

//----------------------------------------------------------
ofGLProgrammableRenderer::ofGLProgrammableRenderer(const ofAppBaseWindow * _window)
: matrixStack(_window)
Expand Down Expand Up @@ -619,6 +621,66 @@ void ofGLProgrammableRenderer::drawElementsInstanced(const ofVbo & vbo, GLuint d
}
}

//----------------------------------------------------------
void ofGLProgrammableRenderer::drawBackgroundGradient(const ofFloatColor& start, const ofFloatColor& end, ofGradientMode mode) const {
float w = getViewportWidth(), h = getViewportHeight();
gradientMesh.clear();
gradientMesh.setMode(OF_PRIMITIVE_TRIANGLE_FAN);
#ifndef TARGET_EMSCRIPTEN
gradientMesh.setUsage(GL_STREAM_DRAW);
#endif
if (mode == OF_GRADIENT_CIRCULAR) {
// this could be optimized by building a single mesh once, then copying
// it and just adding the colors whenever the function is called.
///TODO: revert to glm::vec2!!
glm::vec2 center(w / 2, h / 2);
gradientMesh.addVertex(glm::vec3(center, 0.f));
gradientMesh.addColor(start);
float n = 32; // circular gradient resolution
float angleBisector = glm::two_pi<float>() / (n * 2.0);
float smallRadius = ofDist(0, 0, w / 2, h / 2);
float bigRadius = smallRadius / std::cos(angleBisector);
for (int i = 0; i <= n; i++) {
float theta = i * glm::two_pi<float>() / n;
gradientMesh.addVertex(glm::vec3(center + glm::vec2(std::sin(theta), std::cos(theta)) * bigRadius, 0));
gradientMesh.addColor(end);
}
} else if (mode == OF_GRADIENT_LINEAR) {
gradientMesh.addVertex({ 0.f, 0.f, 0.f });
gradientMesh.addVertex({ w, 0.f, 0.f });
gradientMesh.addVertex({ w, h, 0.f });
gradientMesh.addVertex({ 0.f, h, 0.f });
gradientMesh.addColor(start);
gradientMesh.addColor(start);
gradientMesh.addColor(end);
gradientMesh.addColor(end);
} else if (mode == OF_GRADIENT_BAR) {
gradientMesh.addVertex({ w / 2.f, h / 2.f, 0.f });
gradientMesh.addVertex({ 0.f, h / 2.f, 0.f });
gradientMesh.addVertex({ 0.f, 0.f, 0.f });
gradientMesh.addVertex({ w, 0.f, 0.f });
gradientMesh.addVertex({ w, h / 2.f, 0.f });
gradientMesh.addVertex({ w, h, 0.f });
gradientMesh.addVertex({ 0.f, h, 0.f });
gradientMesh.addVertex({ 0.f, h / 2, 0.f });
gradientMesh.addColor(start);
gradientMesh.addColor(start);
gradientMesh.addColor(end);
gradientMesh.addColor(end);
gradientMesh.addColor(start);
gradientMesh.addColor(end);
gradientMesh.addColor(end);
gradientMesh.addColor(start);
}
GLboolean depthMaskEnabled;
glGetBooleanv(GL_DEPTH_WRITEMASK, &depthMaskEnabled);
glDepthMask(GL_FALSE);
gradientMesh.draw();
if (depthMaskEnabled) {
glDepthMask(GL_TRUE);
}
}

//----------------------------------------------------------
ofPath & ofGLProgrammableRenderer::getPath() {
return path;
Expand Down
3 changes: 3 additions & 0 deletions libs/openFrameworks/gl/ofGLProgrammableRenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "ofPolyline.h"
#include "ofBitmapFont.h"
#include "ofPath.h"
#include "ofVbo.h"

class ofShapeTessellation;
class ofFbo;
Expand Down Expand Up @@ -44,6 +45,8 @@ class ofGLProgrammableRenderer: public ofBaseGLRenderer{
void drawElementsInstanced(const ofVbo & vbo, GLuint drawMode, int amt, int primCount) const;
void draw(const ofVboMesh & mesh, ofPolyRenderMode renderType) const;
void drawInstanced(const ofVboMesh & mesh, ofPolyRenderMode renderType, int primCount) const;
void drawBackgroundGradient(const ofFloatColor& start, const ofFloatColor& end, ofGradientMode mode) const;

ofPath & getPath();


Expand Down
62 changes: 62 additions & 0 deletions libs/openFrameworks/gl/ofGLRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ using std::vector;

const std::string ofGLRenderer::TYPE = "GL";

static ofVboMesh gradientMesh;

//----------------------------------------------------------
ofGLRenderer::ofGLRenderer(const ofAppBaseWindow * _window)
: matrixStack(_window)
Expand Down Expand Up @@ -432,6 +434,66 @@ void ofGLRenderer::drawElementsInstanced(const ofVbo & vbo, GLuint drawMode, int
}
}

//----------------------------------------------------------
void ofGLRenderer::drawBackgroundGradient(const ofFloatColor& start, const ofFloatColor& end, ofGradientMode mode) const {
float w = getViewportWidth(), h = getViewportHeight();
gradientMesh.clear();
gradientMesh.setMode(OF_PRIMITIVE_TRIANGLE_FAN);
#ifndef TARGET_EMSCRIPTEN
gradientMesh.setUsage(GL_STREAM_DRAW);
#endif
if (mode == OF_GRADIENT_CIRCULAR) {
// this could be optimized by building a single mesh once, then copying
// it and just adding the colors whenever the function is called.
///TODO: revert to glm::vec2!!
glm::vec2 center(w / 2, h / 2);
gradientMesh.addVertex(glm::vec3(center, 0.f));
gradientMesh.addColor(start);
float n = 32; // circular gradient resolution
float angleBisector = glm::two_pi<float>() / (n * 2.0);
float smallRadius = ofDist(0, 0, w / 2, h / 2);
float bigRadius = smallRadius / std::cos(angleBisector);
for (int i = 0; i <= n; i++) {
float theta = i * glm::two_pi<float>() / n;
gradientMesh.addVertex(glm::vec3(center + glm::vec2(std::sin(theta), std::cos(theta)) * bigRadius, 0));
gradientMesh.addColor(end);
}
} else if (mode == OF_GRADIENT_LINEAR) {
gradientMesh.addVertex({ 0.f, 0.f, 0.f });
gradientMesh.addVertex({ w, 0.f, 0.f });
gradientMesh.addVertex({ w, h, 0.f });
gradientMesh.addVertex({ 0.f, h, 0.f });
gradientMesh.addColor(start);
gradientMesh.addColor(start);
gradientMesh.addColor(end);
gradientMesh.addColor(end);
} else if (mode == OF_GRADIENT_BAR) {
gradientMesh.addVertex({ w / 2.f, h / 2.f, 0.f });
gradientMesh.addVertex({ 0.f, h / 2.f, 0.f });
gradientMesh.addVertex({ 0.f, 0.f, 0.f });
gradientMesh.addVertex({ w, 0.f, 0.f });
gradientMesh.addVertex({ w, h / 2.f, 0.f });
gradientMesh.addVertex({ w, h, 0.f });
gradientMesh.addVertex({ 0.f, h, 0.f });
gradientMesh.addVertex({ 0.f, h / 2, 0.f });
gradientMesh.addColor(start);
gradientMesh.addColor(start);
gradientMesh.addColor(end);
gradientMesh.addColor(end);
gradientMesh.addColor(start);
gradientMesh.addColor(end);
gradientMesh.addColor(end);
gradientMesh.addColor(start);
}
GLboolean depthMaskEnabled;
glGetBooleanv(GL_DEPTH_WRITEMASK, &depthMaskEnabled);
glDepthMask(GL_FALSE);
gradientMesh.draw();
if (depthMaskEnabled) {
glDepthMask(GL_TRUE);
}
}

//----------------------------------------------------------
ofPath & ofGLRenderer::getPath() {
return path;
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/gl/ofGLRenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class ofGLRenderer: public ofBaseGLRenderer{
void drawElementsInstanced(const ofVbo & vbo, GLuint drawMode, int amt, int primCount) const;
void draw(const ofVboMesh & mesh, ofPolyRenderMode renderType) const;
void drawInstanced(const ofVboMesh & mesh, ofPolyRenderMode renderType, int primCount) const;
void drawBackgroundGradient(const ofFloatColor& start, const ofFloatColor& end, ofGradientMode mode) const;
ofPath & getPath();


Expand Down
4 changes: 4 additions & 0 deletions libs/openFrameworks/graphics/ofCairoRenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class ofCairoRenderer: public ofBaseRenderer{
void draw(const ofFloatImage & image, float x, float y, float z, float w, float h, float sx, float sy, float sw, float sh) const;
void draw(const ofShortImage & image, float x, float y, float z, float w, float h, float sx, float sy, float sw, float sh) const;
void draw(const ofBaseVideoDraws & video, float x, float y, float w, float h) const;
// TODO: This could probably be implemented.
void drawBackgroundGradient(const ofFloatColor& start, const ofFloatColor& end, ofGradientMode mode) const {};
ofPath & getPath();

//--------------------------------------------
Expand Down Expand Up @@ -85,6 +87,8 @@ class ofCairoRenderer: public ofBaseRenderer{
ofFillFlag getFillMode();
void setLineWidth(float lineWidth);
void setPointSize(float pointSize);
void enablePointSprites() {};
void disablePointSprites() {};
void setDepthTest(bool depthTest);
void setBlendMode(ofBlendMode blendMode);
void setLineSmoothing(bool smooth);
Expand Down
73 changes: 5 additions & 68 deletions libs/openFrameworks/graphics/ofGraphics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "ofGLRenderer.h"
//#include "ofGLRenderer.h"
#include "ofGraphics.h"
#include "ofRendererCollection.h"
#include "ofRectangle.h"
Expand All @@ -11,7 +11,7 @@ using std::shared_ptr;
using std::string;
using std::vector;

static ofVboMesh gradientMesh;
//static ofVboMesh gradientMesh;

void ofSetCurrentRenderer(shared_ptr<ofBaseRenderer> renderer, bool setDefaults) {
if (setDefaults) {
Expand Down Expand Up @@ -409,66 +409,7 @@ void ofBackgroundHex(int hexColor, int alpha){

//----------------------------------------------------------
void ofBackgroundGradient(const ofFloatColor& start, const ofFloatColor& end, ofGradientMode mode) {
float w = ofGetViewportWidth(), h = ofGetViewportHeight();
gradientMesh.clear();
gradientMesh.setMode(OF_PRIMITIVE_TRIANGLE_FAN);
#ifndef TARGET_EMSCRIPTEN
#ifdef TARGET_OPENGLES
if (ofIsGLProgrammableRenderer()) gradientMesh.setUsage(GL_STREAM_DRAW);
#else
gradientMesh.setUsage(GL_STREAM_DRAW);
#endif
#endif
if (mode == OF_GRADIENT_CIRCULAR) {
// this could be optimized by building a single mesh once, then copying
// it and just adding the colors whenever the function is called.
///TODO: revert to glm::vec2!!
glm::vec2 center(w / 2, h / 2);
gradientMesh.addVertex(glm::vec3(center, 0.f));
gradientMesh.addColor(start);
float n = 32; // circular gradient resolution
float angleBisector = glm::two_pi<float>() / (n * 2.0);
float smallRadius = ofDist(0, 0, w / 2, h / 2);
float bigRadius = smallRadius / std::cos(angleBisector);
for (int i = 0; i <= n; i++) {
float theta = i * glm::two_pi<float>() / n;
gradientMesh.addVertex(glm::vec3(center + glm::vec2(std::sin(theta), std::cos(theta)) * bigRadius, 0));
gradientMesh.addColor(end);
}
} else if (mode == OF_GRADIENT_LINEAR) {
gradientMesh.addVertex({ 0.f, 0.f, 0.f });
gradientMesh.addVertex({ w, 0.f, 0.f });
gradientMesh.addVertex({ w, h, 0.f });
gradientMesh.addVertex({ 0.f, h, 0.f });
gradientMesh.addColor(start);
gradientMesh.addColor(start);
gradientMesh.addColor(end);
gradientMesh.addColor(end);
} else if (mode == OF_GRADIENT_BAR) {
gradientMesh.addVertex({ w / 2.f, h / 2.f, 0.f });
gradientMesh.addVertex({ 0.f, h / 2.f, 0.f });
gradientMesh.addVertex({ 0.f, 0.f, 0.f });
gradientMesh.addVertex({ w, 0.f, 0.f });
gradientMesh.addVertex({ w, h / 2.f, 0.f });
gradientMesh.addVertex({ w, h, 0.f });
gradientMesh.addVertex({ 0.f, h, 0.f });
gradientMesh.addVertex({ 0.f, h / 2, 0.f });
gradientMesh.addColor(start);
gradientMesh.addColor(start);
gradientMesh.addColor(end);
gradientMesh.addColor(end);
gradientMesh.addColor(start);
gradientMesh.addColor(end);
gradientMesh.addColor(end);
gradientMesh.addColor(start);
}
GLboolean depthMaskEnabled;
glGetBooleanv(GL_DEPTH_WRITEMASK, &depthMaskEnabled);
glDepthMask(GL_FALSE);
gradientMesh.draw();
if (depthMaskEnabled) {
glDepthMask(GL_TRUE);
}
ofGetCurrentRenderer()->drawBackgroundGradient(start, end, mode);
}

//----------------------------------------------------------
Expand Down Expand Up @@ -638,16 +579,12 @@ void ofEnableBlendMode(ofBlendMode blendMode){

//----------------------------------------------------------
void ofEnablePointSprites() {
if (ofGetCurrentRenderer()->getType() == "GL" || ofGetCurrentRenderer()->getType() == "ProgrammableGL") {
static_cast<ofBaseGLRenderer *>(ofGetCurrentRenderer().get())->enablePointSprites();
}
ofGetCurrentRenderer()->enablePointSprites();
}

//----------------------------------------------------------
void ofDisablePointSprites() {
if (ofGetCurrentRenderer()->getType() == "GL" || ofGetCurrentRenderer()->getType() == "ProgrammableGL") {
static_cast<ofBaseGLRenderer *>(ofGetCurrentRenderer().get())->disablePointSprites();
}
ofGetCurrentRenderer()->disablePointSprites();
}

//----------------------------------------------------------
Expand Down
16 changes: 16 additions & 0 deletions libs/openFrameworks/graphics/ofGraphicsBaseTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,10 @@ class ofBaseRenderer {
///
/// \param pointSize The points size to request this renderer to use.
virtual void setPointSize(float pointSize) = 0;
/// \brief Enable point sprites via a shader.
virtual void enablePointSprites() = 0;
/// \brief Disable point sprites via a shader.
virtual void disablePointSprites() = 0;

/// \brief Enable/disable depth testing with this renderer.
///
Expand Down Expand Up @@ -1137,6 +1141,18 @@ class ofBaseRenderer {
/// \param x The x position for the bottom of \p text.
/// \param y The y position for the left alignment of \p text.
virtual void drawString(const ofTrueTypeFont & font, std::string text, float x, float y) const = 0;

/// \brief Sets the background color to a gradient.
///
/// It takes as input 2 ofColor() objects and a Gradient Mode.
/// Must be called in the draw() function.
///
/// Accepted modes are:
///
/// - Circular: `OF_GRADIENT_CIRCULAR`
/// - Linear: `OF_GRADIENT_LINEAR`
/// - Bar: `OF_GRADIENT_BAR`
virtual void drawBackgroundGradient(const ofFloatColor& start, const ofFloatColor& end, ofGradientMode mode) const = 0;

// returns true an ofPath to draw with, this allows to keep
// immediate mode rendering working in multiwindow with multiple
Expand Down
11 changes: 6 additions & 5 deletions libs/openFrameworks/graphics/ofPath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#pragma once

#include "ofPolyline.h"
#include "ofVboMesh.h"
//#include "ofVboMesh.h"
#include "ofMesh.h"
#include "ofTessellator.h"
// MARK: ofConstants targets
#include "ofConstants.h"
Expand Down Expand Up @@ -432,11 +433,11 @@ class ofPath{
std::vector<ofPolyline> polylines;
std::vector<ofPolyline> tessellatedContour; // if winding mode != ODD

#ifdef TARGET_OPENGLES
//#ifdef TARGET_OPENGLES
ofMesh cachedTessellation;
#else
ofVboMesh cachedTessellation;
#endif
//#else
// ofVboMesh cachedTessellation;
//#endif
#if defined(TARGET_EMSCRIPTEN)
static ofTessellator tessellator;
#elif HAS_TLS
Expand Down
Loading
Loading