Status quo

beyond-all-reason · Sep 7, 2024 · fe04e30 · fe04e30
1 parent e5650f3
commit fe04e30
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/cont/base/springcontent/shaders/GLSL/ParticleGeneratorTemplate.glsl b/cont/base/springcontent/shaders/GLSL/ParticleGeneratorTemplate.glsl
@@ -328,6 +328,18 @@ void AddEffectsQuadCamera(
 // Placeholder for automatically formed SaveState() function
 %s
 
+/*
+vec4 PackPosAndRadius(vec3 pos, float rad) {
+	return vec4(
+
+	);
+}
+*/
+
+void SaveStateInfo(uint idx, vec4 packedData) {
+	dataInOut[gl_GlobalInvocationID.x].info[idx] = packedData;
+}
+
 void main()
 {
 	if (gl_LocalInvocationID.x == 0u) {

diff --git a/cont/base/springcontent/shaders/GLSL/ProjFXFragProg.glsl b/cont/base/springcontent/shaders/GLSL/ProjFXFragProg.glsl
@@ -48,7 +48,7 @@ void main() {
 
 	vec4 color = vec4(mix(c0, c1, vBF));
 	fragColor = color * vCol;
-	fragColor = vCol;
+	//fragColor = vCol;
 
 	fragColor.rgb = mix(fragColor.rgb, fogColor * fragColor.a, (1.0 - fogFactor));
 

diff --git a/rts/Rendering/Env/Particles/Generators/ParticleGenerator.h b/rts/Rendering/Env/Particles/Generators/ParticleGenerator.h
@@ -412,7 +412,7 @@ inline Shader::IProgramObject* ParticleGenerator<ParticleDataType, ParticleGenTy
 
 	shaderSrc = fmt::sprintf(shaderSrc,
 		dataStructSS.str(),
-		saveStateSS.str(),
+		/*saveStateSS.str()*/"",
 		dataToFieldsSS.str(),
 		earlyExitAutoSS.str(),
 		earlyExit,