Merge pull request #4 from matcool/main

Add option for alternative shader

Author: Alphalaneous

mod.json

@@ -23,5 +23,13 @@
         "source": "https://github.com/Alphalaneous/FineOutline",
         "community": "https://discord.gg/Txn2CA5dHF"
     },
-	"tags": ["enhancement", "customization"]
+	"tags": ["enhancement", "customization"],
+	"settings": {
+		"alternative-shader": {
+			"type": "bool",
+			"default": false,
+			"name": "Alternative Shader",
+			"description": "Use an alternative shader for the outline. This may work better on some icons, but can look bad on lighter outlines"
+		}
+	}
 }

src/ShaderCache.cpp

@@ -7,7 +7,6 @@ void ShaderCache::init() {
 }
 
 void ShaderCache::add(std::string name, CCGLProgram* program) {
-    program->retain();
     m_shaders->setObject(program, name);
 }
 
@@ -25,7 +24,7 @@ void ShaderCache::createShader(std::string name, std::string frag) {
     prg->addAttribute(kCCAttributeNameColor, kCCVertexAttrib_Color);
     prg->addAttribute(kCCAttributeNameTexCoord, kCCVertexAttrib_TexCoords);
 
-    prg->retain();
+    prg->autorelease();
     prg->link();
     prg->updateUniforms();
     add(name, prg);

src/main.cpp

@@ -15,7 +15,8 @@
 using namespace geode::prelude;
 
 void loadShaders() {
-	
+	bool alt = Mod::get()->getSettingValue<bool>("alternative-shader");
+
 	std::string fragIcon = R"(
 		#ifdef GL_ES
 		precision mediump float;
@@ -35,6 +36,21 @@ void loadShaders() {
 			gl_FragColor = v_fragmentColor * c;
 		}
 	)";
+	if (alt) {
+		fragIcon = R"(
+			#ifdef GL_ES
+			precision mediump float;
+			#endif
+
+			varying vec4 v_fragmentColor;
+			varying vec2 v_texCoord;
+			uniform sampler2D CC_Texture0;
+
+			void main() {
+				gl_FragColor = texture2D(CC_Texture0, v_texCoord) * v_fragmentColor;
+			}
+		)";
+	}
 
 	ShaderCache::get()->createShader("icon", fragIcon);
 
@@ -59,12 +75,34 @@ void loadShaders() {
 			gl_FragColor = v_fragmentColor * c;
 		}
 	)";
+	if (alt) {
+		fragOutline = R"(
+			#ifdef GL_ES
+			precision mediump float;
+			#endif
+
+			varying vec4 v_fragmentColor;
+			varying vec2 v_texCoord;
+			uniform sampler2D CC_Texture0;
+
+			void main() {
+				vec4 c = texture2D(CC_Texture0, v_texCoord);
+				float brightness = dot(c.rgb, vec3(1./3.)) / c.a;
+				float isOutline = smoothstep(0.9, 0.0, brightness);
+				c = vec4(c.a * isOutline);
+				gl_FragColor = c * v_fragmentColor;
+			}
+		)";
+	}
 
 	ShaderCache::get()->createShader("outline", fragOutline);
 };
 
 $on_mod(Loaded) {
 	loadShaders();
+	listenForSettingChanges("alternative-shader", [](bool) {
+		loadShaders();
+	});
 }
 
 class $modify(MyGameManager, GameManager) {
@@ -87,6 +125,8 @@ void removeShaders(CCSprite* spr) {
 void updateSprite(CCSprite* spr, ccColor3B color = {0, 0, 0}) {
 	if (!spr || color == ccColor3B{0, 0, 0}) return;
 
+	bool alt = Mod::get()->getSettingValue<bool>("alternative-shader");
+
 	spr->setCascadeOpacityEnabled(true);
 
 	CCSprite* blackOutline = CCSprite::createWithSpriteFrame(spr->displayFrame());
@@ -100,14 +140,16 @@ void updateSprite(CCSprite* spr, ccColor3B color = {0, 0, 0}) {
 		prgOutline->setUniformsForBuiltins();
 		blackOutline->setShaderProgram(prgOutline);
 		prgOutline->use();
-		blackOutline->setBlendFunc({GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA});
+		if (!alt)
+			blackOutline->setBlendFunc({GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA});
 	}
 
 	if (CCGLProgram* progIcon = ShaderCache::get()->getProgram("icon")) {
 		progIcon->setUniformsForBuiltins();
 		spr->setShaderProgram(progIcon);
 		progIcon->use();
-		spr->setBlendFunc({GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA});
+		if (!alt)
+			spr->setBlendFunc({GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA});
 	}
 
 	spr->removeChildByID("black_outline"_spr);