Colored flood fill lighting

fabric/src/main/java/io/vram/canvas/CanvasFabricMod.java

@@ -32,6 +32,7 @@
 import net.fabricmc.loader.api.FabricLoader;
 
 import grondag.canvas.CanvasMod;
+import grondag.canvas.light.color.LightRegistry;
 import grondag.canvas.pipeline.config.PipelineLoader;
 import grondag.canvas.texture.MaterialIndexProvider;
 
@@ -66,6 +67,7 @@ public ResourceLocation getFabricId() {
 			public void onResourceManagerReload(ResourceManager manager) {
 				PipelineLoader.reload(manager);
 				MaterialIndexProvider.reload();
+				LightRegistry.reload(manager);
 			}
 		});
 	}

fabric/src/main/resources/mixins.canvas.client.json

@@ -15,6 +15,7 @@
     "MixinBufferUploader",
     "MixinChunkRenderDispatcher",
     "MixinClientChunkCache",
+    "MixinClientLevel",
     "MixinCompiledChunk",
     "MixinCyclingOption",
     "MixinDebugScreenOverlay",

src/main/java/grondag/canvas/CanvasMod.java

@@ -54,7 +54,6 @@
 //FEAT: pbr textures
 //PERF: disable animated textures when not in view
 //PERF: improve light smoothing performance
-//FEAT: colored lights
 //FEAT: weather uniforms
 //FEAT: biome texture in shader
 

src/main/java/grondag/canvas/apiimpl/CanvasState.java

@@ -20,6 +20,8 @@
 
 package grondag.canvas.apiimpl;
 
+import java.util.Objects;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.language.I18n;
 
@@ -30,9 +32,11 @@
 import grondag.canvas.apiimpl.rendercontext.CanvasEntityBlockRenderContext;
 import grondag.canvas.apiimpl.rendercontext.CanvasItemRenderContext;
 import grondag.canvas.config.Configurator;
+import grondag.canvas.light.color.LightDataManager;
 import grondag.canvas.material.property.TextureMaterialState;
 import grondag.canvas.perf.ChunkRebuildCounters;
 import grondag.canvas.perf.Timekeeper;
+import grondag.canvas.pipeline.Pipeline;
 import grondag.canvas.pipeline.PipelineManager;
 import grondag.canvas.pipeline.config.PipelineLoader;
 import grondag.canvas.shader.GlMaterialProgramManager;
@@ -45,28 +49,73 @@
 import grondag.canvas.terrain.util.ChunkColorCache;
 
 public class CanvasState {
-	public static void recompileIfNeeded(boolean forceRecompile) {
-		while (CanvasMod.RECOMPILE.consumeClick()) {
-			forceRecompile = true;
+	public static void handleRecompileKeybind() {
+		final boolean recompilePressed = CanvasMod.RECOMPILE.consumeClick();
+
+		while (true) {
+			// consume all clicks
+			if (!CanvasMod.RECOMPILE.consumeClick()) {
+				break;
+			}
 		}
 
-		if (forceRecompile) {
-			CanvasMod.LOG.info(I18n.get("info.canvas.recompile"));
-			PipelineLoader.reload(Minecraft.getInstance().getResourceManager());
-			PipelineManager.reload();
-			PreReleaseShaderCompat.reload();
-			MaterialProgram.reload();
-			GlShaderManager.INSTANCE.reload();
-			GlProgramManager.INSTANCE.reload();
-			GlMaterialProgramManager.INSTANCE.reload();
-			// LightmapHdTexture.reload();
-			// LightmapHd.reload();
-			TextureMaterialState.reload();
-			ShaderDataManager.reload();
-			Timekeeper.configOrPipelineReload();
+		if (recompilePressed) {
+			recompile(false);
 		}
 	}
 
+	public static void recompile() {
+		recompile(false);
+	}
+
+	private static int loopCounter = 0;
+
+	private static boolean recompilePipeline() {
+		final var prev_coloredLightsConfig = Pipeline.config().coloredLights;
+		final boolean coloredLights_wasDisabled = !Pipeline.coloredLightsEnabled();
+		final boolean advancedCulling_wasDisabled = !Pipeline.advancedTerrainCulling();
+
+		PipelineLoader.reload(Minecraft.getInstance().getResourceManager());
+		PipelineManager.reload();
+
+		final boolean coloredLightsConfigChanged = !Objects.equals(Pipeline.config().coloredLights, prev_coloredLightsConfig);
+		final boolean coloredLights_requiresRebuild = Pipeline.coloredLightsEnabled() && (coloredLightsConfigChanged || coloredLights_wasDisabled);
+		final boolean culling_requiresRebuild = Pipeline.advancedTerrainCulling() && advancedCulling_wasDisabled;
+
+		return coloredLights_requiresRebuild || culling_requiresRebuild;
+	}
+
+	private static void recompile(boolean wasReloaded) {
+		CanvasMod.LOG.info(I18n.get("info.canvas.recompile"));
+
+		final boolean requireReload = recompilePipeline();
+
+		if (!wasReloaded && loopCounter < 2 && requireReload) {
+			CanvasMod.LOG.info(I18n.get("info.canvas.recompile_needs_reload"));
+			loopCounter++;
+			Minecraft.getInstance().levelRenderer.allChanged();
+			return;
+		}
+
+		LightDataManager.reload(wasReloaded);
+		PreReleaseShaderCompat.reload();
+		MaterialProgram.reload();
+		GlShaderManager.INSTANCE.reload();
+		GlProgramManager.INSTANCE.reload();
+		GlMaterialProgramManager.INSTANCE.reload();
+		// LightmapHdTexture.reload();
+		// LightmapHd.reload();
+		TextureMaterialState.reload();
+		ShaderDataManager.reload();
+		Timekeeper.configOrPipelineReload();
+
+		if (loopCounter > 1) {
+			CanvasMod.LOG.warn("Reloading recursively twice or more. This isn't supposed to happen.");
+		}
+
+		loopCounter = 0;
+	}
+
 	public static void reload() {
 		CanvasMod.LOG.info(I18n.get("info.canvas.reloading"));
 		PackedInputRegion.reload();
@@ -77,6 +126,6 @@ public static void reload() {
 		ChunkColorCache.invalidate();
 		AoFace.clampExteriorVertices(Configurator.clampExteriorVertices);
 
-		recompileIfNeeded(true);
+		recompile(true);
 	}
 }

src/main/java/grondag/canvas/config/CanvasConfigScreen.java

@@ -23,6 +23,7 @@
 import static grondag.canvas.config.ConfigManager.DEFAULTS;
 import static grondag.canvas.config.ConfigManager.Reload.DONT_RELOAD;
 import static grondag.canvas.config.ConfigManager.Reload.RELOAD_EVERYTHING;
+import static grondag.canvas.config.ConfigManager.Reload.RELOAD_PIPELINE;
 
 import java.util.List;
 
@@ -47,6 +48,7 @@
 
 public class CanvasConfigScreen extends BaseScreen {
 	private boolean reload;
+	private boolean recompile;
 	private boolean reloadTimekeeper;
 	private boolean requiresRestart;
 
@@ -59,6 +61,7 @@ public CanvasConfigScreen(Screen parent) {
 		super(parent, Component.translatable("config.canvas.title"));
 
 		reload = false;
+		recompile = false;
 		reloadTimekeeper = false;
 		requiresRestart = false;
 
@@ -95,7 +98,7 @@ protected void init() {
 		list.addItem(optionSession.booleanOption("config.canvas.value.wavy_grass",
 				() -> editing.wavyGrass,
 				b -> {
-					reload |= Configurator.wavyGrass != b;
+					recompile |= Configurator.wavyGrass != b;
 					editing.wavyGrass = b;
 				},
 				DEFAULTS.wavyGrass,
@@ -116,6 +119,24 @@ protected void init() {
 				DEFAULTS.semiFlatLighting,
 				"config.canvas.help.semi_flat_lighting").listItem());
 
+		list.addItem(optionSession.booleanOption("config.canvas.value.colored_lights",
+				() -> editing.coloredLights,
+				b -> {
+					reload |= Configurator.coloredLights != b;
+					editing.coloredLights = b;
+				},
+				DEFAULTS.coloredLights,
+				"config.canvas.help.colored_lights").listItem());
+
+		list.addItem(optionSession.booleanOption("config.canvas.value.entity_light_source",
+				() -> editing.entityLightSource,
+				b -> {
+					reload |= Configurator.entityLightSource != b;
+					editing.entityLightSource = b;
+				},
+				DEFAULTS.entityLightSource,
+				"config.canvas.help.entity_light_source").listItem());
+
 		// TWEAKS
 		final int indexTweaks = list.addCategory("config.canvas.category.tweaks");
 
@@ -332,7 +353,7 @@ protected void init() {
 		list.addItem(optionSession.booleanOption("config.canvas.value.preprocess_shader_source",
 				() -> editing.preprocessShaderSource,
 				b -> {
-					reload |= Configurator.preprocessShaderSource != b;
+					recompile |= Configurator.preprocessShaderSource != b;
 					editing.preprocessShaderSource = b;
 				},
 				DEFAULTS.preprocessShaderSource,
@@ -484,6 +505,15 @@ protected void init() {
 				DEFAULTS.traceTextureLoad,
 				"config.canvas.help.trace_texture_load").listItem());
 
+		list.addItem(optionSession.booleanOption("config.canvas.value.debug_shader_flag",
+				() -> editing.debugShaderFlag,
+				b -> {
+					recompile |= Configurator.debugShaderFlag != b;
+					editing.debugShaderFlag = b;
+				},
+				DEFAULTS.debugShaderFlag,
+				"config.canvas.help.debug_shader_flag").listItem());
+
 		if (sideW > 0) {
 			final ListWidget tabs = new ListWidget(1, list.getY(), sideW, list.getHeight(), true);
 			addRenderableWidget(tabs);
@@ -514,12 +544,22 @@ private void save() {
 
 		Configurator.readFromConfig(editing);
 
-		// for now Config reload does reload everything including Timekeeper
-		if (reloadTimekeeper && !reload) {
-			Timekeeper.configOrPipelineReload();
+		final ConfigManager.Reload configReload;
+
+		if (reload) {
+			configReload = RELOAD_EVERYTHING;
+		} else if (recompile) {
+			configReload = RELOAD_PIPELINE;
+		} else {
+			// the other cases already cover timekeeper reload at the moment.
+			if (reloadTimekeeper) {
+				Timekeeper.configOrPipelineReload();
+			}
+
+			configReload = DONT_RELOAD;
 		}
 
-		ConfigManager.saveUserInput(reload ? RELOAD_EVERYTHING : DONT_RELOAD);
+		ConfigManager.saveCanvasConfig(configReload);
 
 		if (requiresRestart) {
 			this.minecraft.setScreen(new ConfigRestartScreen(this.parent));

src/main/java/grondag/canvas/config/ConfigData.java

@@ -55,6 +55,10 @@ class ConfigData {
 	//boolean moreLightmap = true;
 	@Comment("Models with flat lighting have smoother lighting (but no ambient occlusion).")
 	boolean semiFlatLighting = true;
+	@Comment("Enable colored block lights on pipelines that support it. Replaces vanilla lighting but only visually.")
+	boolean coloredLights = false;
+	@Comment("Enable entity as dynamic light sources. Requires colored lights and supporting pipeline.")
+	boolean entityLightSource = false;
 
 	// TWEAKS
 	@Comment("Adjusts quads on some vanilla models (like iron bars) to avoid z-fighting with neighbor blocks.")
@@ -151,6 +155,8 @@ class ConfigData {
 	boolean debugSpriteAtlas = false;
 	@Comment("Log significant events of texture/sprite atlas loading. For debugging use. Will spam the log.")
 	boolean traceTextureLoad = false;
+	@Comment("Enables debug flag in the shader. Only intended for internal Canvas development purposes.")
+	boolean debugShaderFlag = false;
 
 	// GSON doesn't do this automatically
 	public void clearNulls() {

src/main/java/grondag/canvas/config/ConfigManager.java

@@ -120,7 +120,7 @@ public static void savePipelineOptions(OptionConfig[] options) {
 			CanvasMod.LOG.error("Error loading pipeline config. Using default values.");
 		}
 
-		CanvasState.recompileIfNeeded(true);
+		CanvasState.recompile();
 	}
 
 	private static void saveConfig() {
@@ -163,12 +163,12 @@ static void loadConfig() {
 		Configurator.readFromConfig(config, true);
 	}
 
-	static void saveUserInput(Reload reload) {
+	static void saveCanvasConfig(Reload reload) {
 		saveConfig();
 
 		switch (reload) {
 			case RELOAD_EVERYTHING -> Minecraft.getInstance().levelRenderer.allChanged();
-			case RELOAD_PIPELINE -> CanvasState.recompileIfNeeded(true);
+			case RELOAD_PIPELINE -> CanvasState.recompile();
 			case DONT_RELOAD -> { }
 		}
 	}

src/main/java/grondag/canvas/config/Configurator.java

@@ -40,6 +40,8 @@ public class Configurator {
 	//public static boolean moreLightmap = DEFAULTS.moreLightmap;
 	//public static int maxLightmapDelayFrames = DEFAULTS.maxLightmapDelayFrames;
 	public static boolean semiFlatLighting = DEFAULTS.semiFlatLighting;
+	public static boolean coloredLights = DEFAULTS.coloredLights;
+	public static boolean entityLightSource = DEFAULTS.entityLightSource;
 
 	public static boolean preventDepthFighting = DEFAULTS.preventDepthFighting;
 	public static boolean clampExteriorVertices = DEFAULTS.clampExteriorVertices;
@@ -95,6 +97,7 @@ public class Configurator {
 	public static boolean cullBackfacingTerrain = DEFAULTS.cullBackfacingTerrain;
 	public static boolean debugSpriteAtlas = DEFAULTS.debugSpriteAtlas;
 	public static boolean traceTextureLoad = DEFAULTS.traceTextureLoad;
+	public static boolean debugShaderFlag = DEFAULTS.debugShaderFlag;
 
 	//    @LangKey("config.acuity_fancy_fluids")
 	//    @Comment({"Enable fancy water and lava rendering.",
@@ -136,6 +139,8 @@ static void readFromConfig(ConfigData config, boolean isStartup) {
 		// lightmapNoise = config.lightmapNoise;
 		lightSmoothing = config.lightSmoothing;
 		semiFlatLighting = config.semiFlatLighting;
+		coloredLights = config.coloredLights;
+		entityLightSource = config.entityLightSource;
 
 		//        disableVanillaChunkMatrix = config.disableVanillaChunkMatrix;
 		preventDepthFighting = config.preventDepthFighting;
@@ -185,6 +190,7 @@ static void readFromConfig(ConfigData config, boolean isStartup) {
 		cullBackfacingTerrain = config.cullBackfacingTerrain;
 		debugSpriteAtlas = config.debugSpriteAtlas;
 		traceTextureLoad = config.traceTextureLoad;
+		debugShaderFlag = config.debugShaderFlag;
 	}
 
 	static void writeToConfig(ConfigData config) {
@@ -202,6 +208,8 @@ static void writeToConfig(ConfigData config) {
 		config.lightSmoothing = lightSmoothing;
 		//config.moreLightmap = moreLightmap;
 		config.semiFlatLighting = semiFlatLighting;
+		config.coloredLights = coloredLights;
+		config.entityLightSource = entityLightSource;
 
 		config.preventDepthFighting = preventDepthFighting;
 		config.clampExteriorVertices = clampExteriorVertices;
@@ -250,5 +258,6 @@ static void writeToConfig(ConfigData config) {
 		config.cullBackfacingTerrain = cullBackfacingTerrain;
 		config.debugSpriteAtlas = debugSpriteAtlas;
 		config.traceTextureLoad = traceTextureLoad;
+		config.debugShaderFlag = debugShaderFlag;
 	}
 }

src/main/java/grondag/canvas/config/PipelineOptionScreen.java

@@ -20,7 +20,6 @@
 
 package grondag.canvas.config;
 
-import static grondag.canvas.config.ConfigManager.Reload.RELOAD_EVERYTHING;
 import static grondag.canvas.config.ConfigManager.Reload.RELOAD_PIPELINE;
 
 import java.util.List;
@@ -118,8 +117,7 @@ protected void init() {
 
 	private void savePipelineSelection(ResourceLocation newPipelineId) {
 		Configurator.pipelineId = newPipelineId.toString();
-		// When advanced terrain culling is *soft* disabled, better clear the region storage
-		ConfigManager.saveUserInput(Configurator.advancedTerrainCulling ? RELOAD_PIPELINE : RELOAD_EVERYTHING);
+		ConfigManager.saveCanvasConfig(RELOAD_PIPELINE);
 	}
 
 	private void save() {