clean up

Author: NotMyWing

package.json

@@ -18,7 +18,7 @@
     "rebuild": "gulp rebuild",
     "watch": "gulp watch",
     "clean": "gulp clean",
-	"compile:shaders": "node tools/shaders.js",
+    "compile:shaders": "node tools/shaders.js",
     "package:gma": "npm run rebuild && node tools/gma.js create --input dest --output artifacts/moonpanel.gma --manifest artifacts/moonpanel.manifest.json",
     "package:zip": "npm run rebuild && gulp packageZip",
     "verify:package": "node tools/package_smoke.js --require-gma --gma artifacts/moonpanel.gma --manifest artifacts/moonpanel.manifest.json",

shadersrc/common.hlsl

@@ -1,17 +1,9 @@
 sampler TexBase : register(s0);
 sampler Tex1 : register(s1);
-sampler Tex2 : register(s2);
-sampler Tex3 : register(s3);
-
-float2 TexBaseSize : register(c4);
-float2 Tex1Size : register(c5);
-float2 Tex2Size : register(c6);
-float2 Tex3Size : register(c7);
 
 const float4 Constants0 : register(c0);
 const float4 Constants1 : register(c1);
 const float4 Constants2 : register(c2);
-const float4 Constants3 : register(c3);
 
 struct PS_INPUT
 {

shadersrc/moonpanel_display_v21_ps2x.hlsl shadersrc/moonpanel_display_ps2x.hlslshadersrc/moonpanel_display_v21_ps2x.hlsl renamed to shadersrc/moonpanel_display_ps2x.hlsl

@@ -6,6 +6,7 @@ float4 main(PS_INPUT input) : COLOR
 	float3 view = normalize(Constants1.xyz - input.localPosition);
 	float facing = abs(dot(normal, view));
 	float grazing = 1.0 - smoothstep(0.08, 0.55, facing);
+	// pillars drive me mad
 	float pillar = step(0.5, Constants2.y);
 	float radialLength = max(length(normal.xy), 0.0001);
 	float3 pillarTangentU = float3(-normal.y / radialLength,
@@ -40,24 +41,27 @@ float4 main(PS_INPUT input) : COLOR
 		matrixAngle * 0.2);
 	screenColor = lerp(screenColor, float3(0.17, 0.18, 0.2),
 		matrixAngle * 0.12);
+	float3 modulation = input.color.rgb * Constants0.x;
+
+	// if backlit, return early. if not backlit, leave hope here
+	if (Constants0.y < 0.5)
+		return float4(screenColor * modulation, albedo.a);
 
 	float inverseW = 1.0 / max(abs(input.projected.w), 0.0001);
 	float2 lightUV = float2(
 		input.projected.x * inverseW * 0.5 + 0.5,
 		-input.projected.y * inverseW * 0.5 + 0.5
 	);
-	float3 light = lerp(float3(1.0, 1.0, 1.0),
-		saturate(tex2D(Tex1, lightUV).rgb), Constants0.w);
+	float3 light = saturate(tex2D(Tex1, lightUV).rgb);
 	float lightMaximum = max(light.r, max(light.g, light.b));
 	float lightMinimum = min(light.r, min(light.g, light.b));
-	float lightRange = lightMaximum - lightMinimum;
-	float lightSaturation = lightRange / max(lightMaximum, 0.0001);
-	float lightEnergy = smoothstep(0.0005, 0.004, lightMaximum);
-	float coloredLight = smoothstep(0.12, 0.58, lightSaturation) *
-		lightEnergy * Constants0.w;
+	float lightSaturation = 1.0 - lightMinimum / max(lightMaximum, 0.0001);
+	float spectralMix = smoothstep(0.12, 0.58, lightSaturation) *
+		smoothstep(0.0005, 0.004, lightMaximum);
 
-	// The sampled Witness response preserves tiny non-zero lamp values and
-	// approaches a square-root curve before its highlight shoulder.
+	// this took an unreasonable amount of staring at witness panels
+	// (like 580 screenshots from the game, ask me about them)
+	// what do they mean mason
 	float3 curvedLight = pow(light, float3(0.45, 0.45, 0.45));
 	curvedLight = saturate(curvedLight * (2.4 - 1.4 * curvedLight));
 
@@ -66,29 +70,27 @@ float4 main(PS_INPUT input) : COLOR
 
 	float sourceMaximum = max(screenColor.r,
 		max(screenColor.g, screenColor.b));
-	float stark = smoothstep(0.58, 0.82, sourceMaximum);
-	float3 membership = step(sourceMaximum * 0.38, screenColor);
+	float clueWeight = smoothstep(0.58, 0.82, sourceMaximum);
+	float3 spectralMask = step(sourceMaximum * 0.38, screenColor);
 	float3 normalizedColor = screenColor / max(sourceMaximum, 0.0001);
-	float3 clueReflectance = normalizedColor * membership;
+	float3 clueReflectance = normalizedColor * spectralMask;
 	float3 clueLit = curvedLight * clueReflectance;
 	float3 neutralClueLit = screenColor * neutralLight;
-	float3 drivenClueLit = lerp(neutralClueLit, clueLit, coloredLight);
+	float3 drivenClueLit = lerp(neutralClueLit, clueLit, spectralMix);
 
-	// Dark panel materials use a much straighter response than clue pixels.
+	// clue special case doohickery
 	float surfaceGamma = lerp(0.95, 0.62,
 		smoothstep(0.12, 0.72, sourceMaximum));
 	float3 surfaceLight = pow(light,
 		float3(surfaceGamma, surfaceGamma, surfaceGamma));
 	float3 surfaceLit = screenColor * surfaceLight;
-	float3 lightDrivenResult = lerp(surfaceLit, drivenClueLit, stark);
-	float3 reflected = lerp(screenColor, lightDrivenResult, Constants0.y);
-	reflected *= input.color.rgb * Constants0.x;
+	float3 lightDrivenResult = lerp(surfaceLit, drivenClueLit, clueWeight);
+	float3 reflected = lightDrivenResult * modulation;
 
-	// HDR overbright values feed Source's normal bloom pass. Backlit panels
-	// keep their authored emission in gamut; their glare is a separate pass.
+	// the source bloom/hdr just turns this into soup
 	float visibleMaximum = max(reflected.r, max(reflected.g, reflected.b));
 	float bloom = smoothstep(0.72, 0.96, sourceMaximum) *
-		smoothstep(0.58, 0.92, visibleMaximum) * Constants0.z * Constants0.y;
+		smoothstep(0.58, 0.92, visibleMaximum) * Constants0.z;
 	reflected *= 1.0 + bloom;
 
 	return float4(reflected, albedo.a);

shadersrc/moonpanel_display_v21_vs20.hlsl shadersrc/moonpanel_display_vs20.hlslshadersrc/moonpanel_display_v21_vs20.hlsl renamed to shadersrc/moonpanel_display_vs20.hlsl

@@ -131,7 +131,7 @@ CANVAS.DestroyWorldMeshes = =>
 			for meshObject in *meshes
 				meshObject\Destroy! if meshObject.Destroy
 	@__worldMeshes, @__worldReliefMeshes, @__worldWallMeshes = nil, nil, nil
-	@__worldMeshesPillar, @__worldMeshBase, @__worldMeshVersion = nil, nil, nil
+	@__worldMeshesPillar, @__worldMeshBase = nil, nil
 
 CANVAS.HasBunkerRelief = => @__data and @__data.Appearance and
 	@__data.Appearance.BunkerRelief == true
@@ -146,8 +146,7 @@ CANVAS.GetWorldMeshes = (fallback, pillar = false) =>
 	return { fallback } unless @__clientData and @__clientData.paths and
 		@__clientData.visibleNodes
 	if not @__worldMeshes or @__worldMeshesPillar ~= pillar or
-			@__worldMeshBase ~= fallback or
-			@__worldMeshVersion ~= Moonpanel.Canvas.ReliefMeshVersion
+			@__worldMeshBase ~= fallback
 		@DestroyWorldMeshes!
 		topology = reliefTopology @
 		buildMeshes = Moonpanel.Canvas.BuildReliefMeshes
@@ -157,7 +156,6 @@ CANVAS.GetWorldMeshes = (fallback, pillar = false) =>
 			@__worldMeshes[#@__worldMeshes + 1] = meshObject
 		@__worldMeshesPillar = pillar
 		@__worldMeshBase = fallback
-		@__worldMeshVersion = Moonpanel.Canvas.ReliefMeshVersion
 	@__worldMeshes
 
 CANVAS.GetWorldWallMeshes = (fallback, pillar = false) =>

src/lua/moonpanel/canvas/cl_canvas.moon

@@ -1,6 +1,5 @@
 RELIEF_CIRCLE_SEGMENTS = 48
 RELIEF_MESH_VERTICES = 60000
-Moonpanel.Canvas.ReliefMeshVersion = 8
 
 reliefPrimitives = (topology) ->
 	paths, nodes = {}, {}

src/lua/moonpanel/canvas/cl_relief.moon

@@ -1,5 +1,4 @@
 MAX_RT_PAGES = 256
-DISPLAY_MATERIAL_VERSION = 23
 DISPLAY_SHEAR = 0.012
 DISPLAY_BLOOM = 1.1
 WALL_UNLIT_BRIGHTNESS = 0.42
@@ -13,8 +12,8 @@ createDisplayMaterial = (name, texture) ->
 	parameters =
 		["$basetexture"]: texture\GetName!
 		["$texture1"]: "color/black"
-		["$pixshader"]: "moonpanel_display_v21_ps20"
-		["$vertexshader"]: "moonpanel_display_v21_vs20"
+		["$pixshader"]: "moonpanel_display_ps20"
+		["$vertexshader"]: "moonpanel_display_vs20"
 		["$vertexcolor"]: 1
 		["$vertexalpha"]: 1
 		["$translucent"]: 1
@@ -24,17 +23,16 @@ createDisplayMaterial = (name, texture) ->
 		["$c0_x"]: 1
 		["$c0_y"]: 0
 		["$c0_z"]: DISPLAY_BLOOM
-		["$c0_w"]: 0
 		["$c1_x"]: 0
 		["$c1_y"]: 0
 		["$c1_z"]: 0
 		["$c2_x"]: 0
 		["$c2_y"]: 0
 		["$c2_z"]: 0
-	CreateMaterial "#{name} Display #{DISPLAY_MATERIAL_VERSION}",
+	CreateMaterial "#{name} Display",
 		"screenspace_general", parameters
 
-wallMaterial = CreateMaterial "TheMP Relief Wall Metal 2", "VertexLitGeneric",
+wallMaterial = CreateMaterial "TheMP Relief Wall Metal", "VertexLitGeneric",
 	["$basetexture"]: "color/white"
 	["$color2"]: "[0.42 0.44 0.46]"
 	["$envmap"]: "env_cubemap"
@@ -51,12 +49,12 @@ wallMaterial = CreateMaterial "TheMP Relief Wall Metal 2", "VertexLitGeneric",
 	["$vertexcolor"]: 1
 Moonpanel.Canvas.ReliefWallMaterial = wallMaterial
 
-wallUnlitMaterial = CreateMaterial "TheMP Relief Wall Gray 1", "UnlitGeneric",
+wallUnlitMaterial = CreateMaterial "TheMP Relief Wall Gray", "UnlitGeneric",
 	["$basetexture"]: "color/white"
 	["$model"]: 1
 	["$vertexcolor"]: 1
 
-screenGlassMaterial = CreateMaterial "TheMP Screen Glass 5", "VertexLitGeneric",
+screenGlassMaterial = CreateMaterial "TheMP Screen Glass", "VertexLitGeneric",
 	["$basetexture"]: "color/white"
 	["$color2"]: "[0.015 0.017 0.02]"
 	["$envmap"]: "env_cubemap"
@@ -98,11 +96,9 @@ createRT = (name, worldMaterial = false) ->
 	texture, material, displayMaterial
 
 ensureDisplayMaterial = (rt) ->
-	return rt.displayMaterial if rt.displayMaterial and
-		rt.displayMaterialVersion == DISPLAY_MATERIAL_VERSION
+	return rt.displayMaterial if rt.displayMaterial
 	name = rt.texture\GetName!
 	rt.displayMaterial = createDisplayMaterial name, rt.texture
-	rt.displayMaterialVersion = DISPLAY_MATERIAL_VERSION
 	rt.displayMaterial
 
 initializePool = (canvas) ->
@@ -130,7 +126,6 @@ growPool = (canvas) ->
 			:texture
 			:material
 			:displayMaterial
-			displayMaterialVersion: DISPLAY_MATERIAL_VERSION
 		}
 
 	canvas.__rtPageCount = target
@@ -223,15 +218,14 @@ drawWorldRT = (rt, meshObjects, power, worldLighting, strongColorResponse,
 		strongColorResponse and 1 or 0
 	else
 		0
-	displayMaterial\SetFloat "$c0_w", worldLighting and 1 or 0
 	displayMaterial\SetFloat "$c2_x", shear and DISPLAY_SHEAR or 0
 	displayMaterial\SetFloat "$c2_y", pillar and 1 or 0
 	displayMaterial\SetFloat "$c2_z", matrixResponse and 1 or 0
 	if viewPosition
 		displayMaterial\SetFloat "$c1_x", viewPosition.x
 		displayMaterial\SetFloat "$c1_y", viewPosition.y
 		displayMaterial\SetFloat "$c1_z", viewPosition.z
-	if worldLighting
+	if worldLighting and strongColorResponse
 		getLightTexture = Moonpanel.Canvas.GetWorldLightTexture
 		if lightTexture = getLightTexture and getLightTexture!
 			displayMaterial\SetTexture "$texture1", lightTexture

src/lua/moonpanel/canvas/cl_rtpool.moon

@@ -7,13 +7,13 @@ target, targetWidth, targetHeight, renderedFrame = nil, 0, 0, -1
 targetPushed = false
 activeDescriptors = nil
 
-probeMaterial = CreateMaterial "TheMP World Light Probe 2", "VertexLitGeneric",
+probeMaterial = CreateMaterial "TheMP World Light Probe", "VertexLitGeneric",
 	["$basetexture"]: "color/white"
 	["$model"]: 1
 	["$translucent"]: 1
 	["$additive"]: 1
 
-dynamicMaterial = CreateMaterial "TheMP Dynamic Light Probe 1", "UnlitGeneric",
+dynamicMaterial = CreateMaterial "TheMP Dynamic Light Probe", "UnlitGeneric",
 	["$basetexture"]: "color/white"
 	["$model"]: 1
 	["$vertexcolor"]: 1
@@ -29,7 +29,7 @@ ensureTarget = ->
 		CREATERENDERTARGETFLAGS_HDR, IMAGE_FORMAT_RGBA8888
 	target
 
-flatDescriptor = (entity, record, canvas) ->
+flatDescriptor = (entity, record) ->
 	return unless entity.ScreenMatrix
 	entity\SetupBones! if entity.SetupBones
 	bone = entity\GetBoneMatrix 0
@@ -44,7 +44,7 @@ flatDescriptor = (entity, record, canvas) ->
 		meshes: { Canvas.GetFlatScreenMesh! }
 	}
 
-pillarDescriptor = (entity, record, canvas) ->
+pillarDescriptor = (entity, record) ->
 	radius = math.max 1, entity\GetPillarRadius! + PROBE_BIAS
 	height = math.max 1, entity\GetPillarHeight!
 	segments = if radius >= 128 then 128 elseif radius >= 48 then 64 else 32
@@ -65,10 +65,11 @@ collectDescriptors = ->
 		continue unless IsValid entity
 		canvas = entity\GetCanvas!
 		continue unless canvas and canvas\CanRender!
+		continue unless canvas\HasStrongColorResponse!
 		descriptor = if entity.MoonpanelPillar
-			pillarDescriptor entity, record, canvas
+			pillarDescriptor entity, record
 		else
-			flatDescriptor entity, record, canvas
+			flatDescriptor entity, record
 		descriptors[#descriptors + 1] = descriptor if descriptor
 	descriptors
 

src/lua/moonpanel/canvas/cl_worldlighting.moon

@@ -14,5 +14,5 @@ if SERVER
 
 	add "materials/moonpanel"
 	add "sound/moonpanel"
-	resource.AddSingleFile "shaders/fxc/moonpanel_display_v21_ps20b.vcs"
-	resource.AddSingleFile "shaders/fxc/moonpanel_display_v21_vs20.vcs"
+	resource.AddSingleFile "shaders/fxc/moonpanel_display_ps20b.vcs"
+	resource.AddSingleFile "shaders/fxc/moonpanel_display_vs20.vcs"