Thick Lines and Varying Point Sizes for Programmable Renderer

NickHardeman · NickHardeman · commit d68f41534b83 · 2024-06-13T23:26:23.000-04:00
diff --git a/libs/openFrameworks/app/ofAppNoWindow.cpp b/libs/openFrameworks/app/ofAppNoWindow.cpp
@@ -147,6 +147,7 @@ class ofNoopRenderer: public ofBaseRenderer{
 	void setFillMode(ofFillFlag fill){}
 	ofFillFlag getFillMode(){return OF_FILLED;}
 	void setLineWidth(float lineWidth){}
+	void setPointSize(float pointSize) {}
 	void setBlendMode(ofBlendMode blendMode){}
 	void setLineSmoothing(bool smooth){}
 	void setCircleResolution(int res){};
diff --git a/libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp b/libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp
diff --git a/libs/openFrameworks/gl/ofGLProgrammableRenderer.h b/libs/openFrameworks/gl/ofGLProgrammableRenderer.h
@@ -124,13 +124,21 @@ class ofGLProgrammableRenderer: public ofBaseGLRenderer{
 	void setRectMode(ofRectMode mode);
 	ofRectMode getRectMode();
 	void setLineWidth(float lineWidth);
+	void setPointSize(float pointSize);
 	void setDepthTest(bool depthTest);
 	void setLineSmoothing(bool smooth);
 	void setBlendMode(ofBlendMode blendMode);
 	void enablePointSprites();
 	void disablePointSprites();
 	void enableAntiAliasing();
 	void disableAntiAliasing();
+	
+	// lines
+	void enableLineSizeAttenuation();
+	void disableLineSizeAttenuation();
+	void enableLinesShaders();
+	void disableLinesShaders();
+	bool areLinesShadersEnabled() const;
     
 	// color options
 	void setColor(float r, float g, float b); // 0-1
@@ -250,6 +258,43 @@ class ofGLProgrammableRenderer: public ofBaseGLRenderer{
 	mutable ofMesh rectMesh;
 	mutable ofMesh lineMesh;
 	mutable ofVbo meshVbo;
+	mutable ofMesh polylineMesh;
+
+	// when adding more draw modes, POINTS, LINES, etc.
+	// store in a structure so we don't have to make a lot of variables
+	// this structure if based on the one from ofMaterial
+	class ShaderCollection {
+	public:
+		void bindAttribute( GLuint location, const std::string & name );
+		void bindDefaults();
+		void linkPrograms();
+		void setupAllVertexShaders(const std::string &aShaderSrc);
+
+		ofShader texRectColor;
+		ofShader texRectNoColor;
+		ofShader tex2DColor;
+		ofShader tex2DNoColor;
+		ofShader noTexColor;
+		ofShader noTexNoColor;
+	};
+	
+	// useful for lines //
+	class LinesBundle {
+	public:
+		std::vector<glm::vec4> lineMeshNextVerts;
+		std::vector<glm::vec4> lineMeshPrevVerts;
+		ofVboMesh vboMesh;
+		int vertAttribPrev = 4;
+		int vertAttribNext = 5;
+	};
+
+	struct TextureUniform {
+		ofTextureData texData;
+		// not going to store a texture since we don't want to retain the texture here
+		// ofTexture texture;
+		int textureLocation;
+		std::string uniformName;
+	};
 
 	void uploadCurrentMatrix();
 
@@ -258,12 +303,20 @@ class ofGLProgrammableRenderer: public ofBaseGLRenderer{
 	void endSmoothing();
 
 	void beginDefaultShader();
+	std::shared_ptr<ShaderCollection>& getShaderCollectionForMode(GLuint drawMode);
 	void uploadMatrices();
 	void setDefaultUniforms();
 
-	void setAttributes(bool vertices, bool color, bool tex, bool normals);
+	// adding a drawMode variable that will switch shaders based on GL_TRIANGLES, GL_POINTS or GL_LINES
+	void setAttributes(bool vertices, bool color, bool tex, bool normals, GLuint drawMode);
+//	void setAttributes(bool vertices, bool color, bool tex, bool normals);
 	void setAlphaBitmapText(bool bitmapText);
-
+	
+	
+	// LINES
+	void configureMeshToMatchWithNewVertsAndIndices(const ofMesh& aSrcMesh, ofVboMesh& aDstMesh, std::size_t aTargetNumVertices, std::size_t aTargetNumIndices);
+	void configureLinesBundleFromMesh(LinesBundle& aLinesBundle, GLuint drawMode, const ofMesh& amesh);
+	
     
 	ofMatrixStack matrixStack;
 
@@ -273,6 +326,7 @@ class ofGLProgrammableRenderer: public ofBaseGLRenderer{
 	const ofShader * currentShader;
 
 	bool verticesEnabled, colorsEnabled, texCoordsEnabled, normalsEnabled, bitmapStringEnabled;
+	bool pointSpritesEnabled;
 	bool usingCustomShader, settingDefaultShader, usingVideoShader;
 	int currentTextureTarget;
 
@@ -293,13 +347,23 @@ class ofGLProgrammableRenderer: public ofBaseGLRenderer{
 	ofBitmapFont bitmapFont;
 	ofPath path;
 	const ofAppBaseWindow * window;
-
-	ofShader defaultTexRectColor;
-	ofShader defaultTexRectNoColor;
-	ofShader defaultTex2DColor;
-	ofShader defaultTex2DNoColor;
-	ofShader defaultNoTexColor;
-	ofShader defaultNoTexNoColor;
+	
+	mutable GLuint mDrawMode = GL_TRIANGLES;
+	std::unordered_map<GLuint, LinesBundle> mLinesBundleMap;
+	mutable bool mBRenderingLines = false;
+	mutable bool mBLineSizeAttenutation = false; // screen space
+	mutable bool mBEnableLinesShaders = true;
+
+	//	the index GL_TRIANGLES store everything that is not GL_POINTS or GL_LINES, GL_LINE_STRIP
+	std::unordered_map<GLuint, std::shared_ptr<ShaderCollection> > mDefaultShadersMap;
+	std::vector<TextureUniform> mUniformsTex;
+
+	//	ofShader defaultTexRectColor;
+	//	ofShader defaultTexRectNoColor;
+	//	ofShader defaultTex2DColor;
+	//	ofShader defaultTex2DNoColor;
+	//	ofShader defaultNoTexColor;
+	//	ofShader defaultNoTexNoColor;
 	ofShader defaultUniqueShader;
 #ifdef TARGET_ANDROID
 	ofShader defaultOESTexColor;
diff --git a/libs/openFrameworks/gl/ofGLRenderer.cpp b/libs/openFrameworks/gl/ofGLRenderer.cpp
@@ -1202,6 +1202,12 @@ void ofGLRenderer::setLineWidth(float lineWidth) {
 	glLineWidth(lineWidth);
 }
 
+//----------------------------------------------------------
+void ofGLRenderer::setPointSize(float pointSize) {
+	currentStyle.pointSize = pointSize;
+	glPointSize(pointSize);
+}
+
 //----------------------------------------------------------
 void ofGLRenderer::setDepthTest(bool depthTest) {
 	if (depthTest) {
diff --git a/libs/openFrameworks/gl/ofGLRenderer.h b/libs/openFrameworks/gl/ofGLRenderer.h
@@ -111,6 +111,7 @@ class ofGLRenderer: public ofBaseGLRenderer{
 	void setRectMode(ofRectMode mode);
 	ofRectMode getRectMode();
 	void setLineWidth(float lineWidth);
+	void setPointSize(float pointSize);
 	void setDepthTest(bool depthTest);
 	void setLineSmoothing(bool smooth);
 	void setBlendMode(ofBlendMode blendMode);
diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp
@@ -954,10 +954,19 @@ void ofShader::setUniformTexture(const string & name, int textureTarget, GLint t
     }
 }
 
+
 //--------------------------------------------------------------
 void ofShader::setUniformTexture(const string & name, const ofTexture & tex, int textureLocation) const {
+	if (bLoaded) {
+		ofTextureData texData = tex.getTextureData();
+		setUniformTexture( name, texData, textureLocation);
+	}
+}
+	
+//--------------------------------------------------------------
+void ofShader::setUniformTexture(const string & name, const ofTextureData & texData, int textureLocation) const{
     if (bLoaded) {
-        ofTextureData texData = tex.getTextureData();
+        //ofTextureData texData = tex.getTextureData();
         glActiveTexture(GL_TEXTURE0 + textureLocation);
         if (!ofIsGLProgrammableRenderer()) {
             glEnable(texData.textureTarget);
diff --git a/libs/openFrameworks/gl/ofShader.h b/libs/openFrameworks/gl/ofShader.h
@@ -17,6 +17,7 @@
 #include <unordered_map>
 
 class ofTexture;
+class ofTextureData;
 class ofMatrix3x3;
 class ofParameterGroup;
 class ofBufferObject;
@@ -150,6 +151,7 @@ class ofShader {
 	void setUniformTexture(const std::string & name, const ofBaseHasTexture& img, int textureLocation) const;
 	void setUniformTexture(const std::string & name, const ofTexture& img, int textureLocation) const;
 	void setUniformTexture(const std::string & name, int textureTarget, GLint textureID, int textureLocation) const;
+	void setUniformTexture(const std::string & name, const ofTextureData& texData, int textureLocation) const;
 
 	// set a single uniform value
 	void setUniform1i(const std::string & name, int v1) const;
diff --git a/libs/openFrameworks/graphics/ofCairoRenderer.cpp b/libs/openFrameworks/graphics/ofCairoRenderer.cpp
@@ -655,6 +655,12 @@ void ofCairoRenderer::setLineWidth(float lineWidth) {
 	cairo_set_line_width(cr, lineWidth);
 }
 
+//--------------------------------------------
+void ofCairoRenderer::setPointSize(float pointSize) {
+	currentStyle.pointSize = pointSize;
+	// no point size for cairo
+}
+
 //----------------------------------------------------------
 void ofCairoRenderer::setDepthTest(bool depthTest) {
 	// cairo does not do any depth testing
diff --git a/libs/openFrameworks/graphics/ofCairoRenderer.h b/libs/openFrameworks/graphics/ofCairoRenderer.h
@@ -83,6 +83,7 @@ class ofCairoRenderer: public ofBaseRenderer{
 	void setFillMode(ofFillFlag fill);
 	ofFillFlag getFillMode();
 	void setLineWidth(float lineWidth);
+	void setPointSize(float pointSize);
 	void setDepthTest(bool depthTest);
 	void setBlendMode(ofBlendMode blendMode);
 	void setLineSmoothing(bool smooth);
diff --git a/libs/openFrameworks/graphics/ofGraphics.cpp b/libs/openFrameworks/graphics/ofGraphics.cpp
@@ -528,6 +528,11 @@ void ofSetLineWidth(float lineWidth) {
 	ofGetCurrentRenderer()->setLineWidth(lineWidth);
 }
 
+//----------------------------------------------------------
+void ofSetPointSize(float pointSize) {
+	ofGetCurrentRenderer()->setPointSize(pointSize);
+}
+
 //----------------------------------------------------------
 void ofSetDepthTest(bool depthTest) {
 	ofGetCurrentRenderer()->setDepthTest(depthTest);
diff --git a/libs/openFrameworks/graphics/ofGraphics.h b/libs/openFrameworks/graphics/ofGraphics.h
@@ -774,6 +774,17 @@ void ofSetCurveResolution(int res);
 /// ~~~~
 void ofSetLineWidth(float lineWidth);
 
+/// \brief Sets the size of the points after mesh.drawVertices() called after.
+/// ~~~~{.cpp}
+/// void ofApp::draw(){
+///     ofSetPointSize(1);          // set point size to 1
+///     mesh.drawVertices(); 		 // draw small points
+///     ofSetPointSize(10);         // set point size to 10
+///     mesh.drawVertices();  		// draw fat points
+/// }
+/// ~~~~
+void ofSetPointSize(float pointSize);
+
 /// \brief Set depth testing on or off to either sort by z-depth (`true`)
 /// or draw order (`false`).
 void ofSetDepthTest(bool depthTest);
diff --git a/libs/openFrameworks/graphics/ofGraphicsBaseTypes.h b/libs/openFrameworks/graphics/ofGraphicsBaseTypes.h
@@ -57,6 +57,7 @@ class ofStyle {
 		sphereResolution = 20;
 		curveResolution = 20;
 		lineWidth = 1.0;
+		pointSize = 1.0;
 		polyMode = OF_POLY_WINDING_ODD;
 		rectMode = OF_RECTMODE_CORNER;
 #ifdef TARGET_OPENGLES
@@ -127,6 +128,9 @@ class ofStyle {
 	/// \warning This is not currently implemented in modern OF renderers.
 	float lineWidth;
 
+	/// \brief The size of rendered points.
+	float pointSize;
+
 	//bool depthTest; removed since it'll break old projects setting depth test through glEnable
 };
 
@@ -834,6 +838,11 @@ class ofBaseRenderer {
 	///
 	/// \param lineWidth The line width to request this renderer to use.
 	virtual void setLineWidth(float lineWidth) = 0;
+	
+	/// \brief Set the point size this renderer should use when drawing points.
+	///
+	/// \param pointSize The points size to request this renderer to use.
+	virtual void setPointSize(float pointSize) = 0;
 
 	/// \brief Enable/disable depth testing with this renderer.
 	///
diff --git a/libs/openFrameworks/graphics/ofRendererCollection.cpp b/libs/openFrameworks/graphics/ofRendererCollection.cpp
@@ -544,6 +544,12 @@ void ofRendererCollection::setLineWidth(float lineWidth){
    }
 }
 
+void ofRendererCollection::setPointSize(float pointSize){
+	for(auto renderer: renderers){
+		renderer->setPointSize(pointSize);
+	}
+}
+
 void ofRendererCollection::setDepthTest(bool depthTest) {
    for(auto renderer: renderers){
 	   renderer->setDepthTest(depthTest);
diff --git a/libs/openFrameworks/graphics/ofRendererCollection.h b/libs/openFrameworks/graphics/ofRendererCollection.h
@@ -180,7 +180,7 @@ class ofRendererCollection: public ofBaseRenderer{
 	ofFillFlag getFillMode();
 
 	void setLineWidth(float lineWidth);
-
+	void setPointSize(float pointSize);
 	void setDepthTest(bool depthTest);
 
 	void setBlendMode(ofBlendMode blendMode);
