Tweak cloaker effect and try to make it fade in and out.

 * Fade in works but still can be improved.
 * Code is in place for fade out, but the unit position is not updated so I've left lups enabled for now.

Author: GoogleFrog

LuaRules/Gadgets/cus_gl4.lua

@@ -347,6 +347,10 @@ local initiated = false
 local featuresDefsWithAlpha = {} -- featureDefIDs (ie trees) that should be drawn with alpha.
 local unitDefsUseSkinning = {} -- unitDefIDs that use the bones and stretchy skin system
 
+local ENEMY_CLOAK_FRAMES = false -- 4 -- How many extra frames to show enemy units for.
+local cloakDeferFrame = {}
+local keepDrawFlagChecking = false -- a list of units that need draw flag checking
+
 local spGetUnitIsCloaked = Spring.GetUnitIsCloaked
 
 --------------------------------------------------------------------
@@ -1421,47 +1425,65 @@ local function RemoveObject(objectID, reason) -- we get pos/neg objectID here
 	end
 end
 
-local function ProcessUnits(units, drawFlags, reason)
-	for i = 1, #units do
-		local unitID = units[i]
-		local drawFlag = drawFlags[i]
-		if debugmode then Spring.Echo("ProcessUnits", unitID, drawFlag, reason) end
+local function ProcessCusUnit(unitID, drawFlag,  gameFrame, reason)
+	if debugmode then Spring.Echo("ProcessUnits", unitID, drawFlag, reason) end
 
-		if math_bit_and(drawFlag, 34) > 0 then -- has alpha (2) or alphashadow(32) flag
-			-- cloaked units get mapped to pure forward + deferred, no refl/refr either
+	if cloakDeferFrame[unitID] and ((not drawFlag) or drawFlag == 0) then
+		if cloakDeferFrame[unitID] < gameFrame then
+			cloakDeferFrame[unitID] = nil
+		end
+		if not Spring.ValidUnitID(unitID) then
+			return
+		end
+		if cloakDeferFrame[unitID] then
 			drawFlag = 1
+			keepDrawFlagChecking = keepDrawFlagChecking or {}
+			keepDrawFlagChecking[#keepDrawFlagChecking + 1] = unitID
 		end
-		
-		if drawFlag % 4 > 1 then -- check if its at least in opaque or alpha pass
-			if not unitsInViewport[unitID] then
-				-- CALL the UnitViewportAPI
-				numUnitsInViewport = numUnitsInViewport + 1
-			end
-			unitsInViewport[unitID] = drawFlag
-		else
-			if unitsInViewport[unitID] then
-				-- CALL the UnitViewportAPI
-				numUnitsInViewport = numUnitsInViewport - 1
-			end
-			unitsInViewport[unitID] = nil
+	end
+	if not drawFlag then
+		drawFlag = Spring.GetUnitDrawFlag(unitID)
+	end
+
+	if math_bit_and(drawFlag, 34) > 0 then -- has alpha (2) or alphashadow(32) flag
+		-- cloaked units get mapped to pure forward + deferred, no refl/refr either
+		drawFlag = 1
+	end
+	
+	if drawFlag % 4 > 1 then -- check if its at least in opaque or alpha pass
+		if not unitsInViewport[unitID] then
+			-- CALL the UnitViewportAPI
+			numUnitsInViewport = numUnitsInViewport + 1
 		end
-		
-		if (drawFlag == 0) or (drawFlag >= 128) then
-			RemoveObject(unitID, reason)
-		else
-			if not cusUnitIDtoDrawFlag[unitID] then --object was not seen
-				if Spring.ValidUnitID(unitID) and (not spGetUnitIsCloaked(unitID)) then
-					uniformCache[1] = 0
-					gl.SetUnitBufferUniforms(unitID, uniformCache, 12) -- cloak
-				end
-				AddObject(unitID, drawFlag, reason)
-			elseif cusUnitIDtoDrawFlag[unitID] ~= drawFlag then --flags have changed
-				UpdateObject(unitID, drawFlag, reason)
-			end
+		unitsInViewport[unitID] = drawFlag
+	else
+		if unitsInViewport[unitID] then
+			-- CALL the UnitViewportAPI
+			numUnitsInViewport = numUnitsInViewport - 1
+		end
+		unitsInViewport[unitID] = nil
+	end
+	
+	if (drawFlag == 0) or (drawFlag >= 128) then
+		RemoveObject(unitID, reason)
+	else
+		if not cusUnitIDtoDrawFlag[unitID] then --object was not seen
+			--if Spring.ValidUnitID(unitID) and (not spGetUnitIsCloaked(unitID)) then
+			--	uniformCache[1] = 0
+			--	gl.SetUnitBufferUniforms(unitID, uniformCache, 12) -- cloak
+			--end
+			AddObject(unitID, drawFlag, reason)
+		elseif cusUnitIDtoDrawFlag[unitID] ~= drawFlag then --flags have changed
+			UpdateObject(unitID, drawFlag, reason)
 		end
 	end
 end
 
+local function ProcessUnits(units, drawFlags, gameFrame, reason)
+	for i = 1, #units do
+		ProcessCusUnit(units[i], drawFlags and drawFlags[i], gameFrame, reason)
+	end
+end
 
 local function ProcessFeatures(features, drawFlags, reason)
 	for i = 1, #features do
@@ -2041,19 +2063,35 @@ function gadget:UnitGiven(unitID)
 end
 
 function gadget:UnitCloaked(unitID)
-	uniformCache[1] = Spring.GetGameFrame()
-	gl.SetUnitBufferUniforms(unitID, uniformCache, 12)
-	wantTranparent[unitID] = true
+	local frame = Spring.GetGameFrame()
+	if ENEMY_CLOAK_FRAMES then
+		local _, fullview = Spring.GetSpectatingState()
+		local allyUnit = fullview or Spring.IsUnitAllied(unitID)
+		uniformCache[1] = frame + (allyUnit and 0 or 1000000)
+		gl.SetUnitBufferUniforms(unitID, uniformCache, 12)
+		wantTranparent[unitID] = true
+		if not allyUnit then
+			keepDrawFlagChecking = keepDrawFlagChecking or {}
+			keepDrawFlagChecking[#keepDrawFlagChecking + 1] = unitID
+			cloakDeferFrame[unitID] = frame + ENEMY_CLOAK_FRAMES
+		end
+	else
+		uniformCache[1] = frame
+		gl.SetUnitBufferUniforms(unitID, uniformCache, 12)
+		wantTranparent[unitID] = true
+	end
 	UpdateUnit(unitID, Spring.GetUnitDrawFlag(unitID))
 	if debugmode then
 		Spring.Echo("UnitCloaked", unitID, Spring.GetUnitDrawFlag(unitID))
 	end
 end
 
 function gadget:UnitDecloaked(unitID)
+	local _, fullview = Spring.GetSpectatingState()
+	local allyUnit = fullview or Spring.IsUnitAllied(unitID)
 	wantTranparent[unitID] = false
 	UpdateUnit(unitID, Spring.GetUnitDrawFlag(unitID))
-	uniformCache[1] = -1 * Spring.GetGameFrame()
+	uniformCache[1] = -1 * Spring.GetGameFrame() - (allyUnit and 0 or 1000000)
 	gl.SetUnitBufferUniforms(unitID, uniformCache, 12)
 	if debugmode then
 		Spring.Echo("UnitDecloaked", unitID, Spring.GetUnitDrawFlag(unitID))
@@ -2074,6 +2112,7 @@ function gadget:DrawWorldPreUnit()
 	end
 
 	updateframe = (updateframe + 1) % updaterate
+	local gameFrame = Spring.GetGameFrame()
 	if updateframe == 0 then
 		local t0 = Spring.GetTimerMicros()
 		local units, drawFlagsUnits, features, drawFlagsFeatures
@@ -2106,12 +2145,15 @@ function gadget:DrawWorldPreUnit()
 		--	Spring.Echo(printDrawPassStats())
 		--end
 		local totalobjects = #units + #features + numdestroyedUnits + numdestroyedFeatures
+		if keepDrawFlagChecking then
+			totalobjects = totalobjects + #keepDrawFlagChecking
+		end
 
 		-- Why do we also do this processing round if #units > 0?
 		if debugmode and (#destroyedUnitIDs > 0 or #units > 0) then Spring.Echo("Processing destroyedUnitIDs", #units, #destroyedUnitIDs) end
 
 		if numdestroyedUnits > 0 then
-			ProcessUnits(destroyedUnitIDs, destroyedUnitDrawFlags, "destroyed")
+			ProcessUnits(destroyedUnitIDs, destroyedUnitDrawFlags, gameFrame, "destroyed")
 			for i = numdestroyedUnits, 1, -1 do
 				destroyedUnitIDs[i] = nil
 				destroyedUnitDrawFlags[i] = nil
@@ -2147,11 +2189,16 @@ function gadget:DrawWorldPreUnit()
 			for i, unitID in ipairs(firstunits) do
 				firstdrawFlagsUnits[i] = 1 + 4 + 16
 			end
-			ProcessUnits(firstunits, firstdrawFlagsUnits, "firstDraw")
+			ProcessUnits(firstunits, firstdrawFlagsUnits, gameFrame, "firstDraw")
 			firstDraw = false
 		end
 
-		ProcessUnits(units, drawFlagsUnits, "changed")
+		ProcessUnits(units, drawFlagsUnits, gameFrame, "changed")
+		if keepDrawFlagChecking then
+			local checkUnits = keepDrawFlagChecking
+			keepDrawFlagChecking = false
+			ProcessUnits(checkUnits, false, gameFrame, "changed")
+		end
 		ProcessFeatures(features, drawFlagsFeatures, "changed")
 
 		local deltat = Spring.DiffTimers(Spring.GetTimerMicros(), t0,  nil) -- in ms

LuaRules/Gadgets/lups_cloak_fx.lua

@@ -77,7 +77,7 @@ end
 
 local CloakedHitEffect = { class='UnitJitter',options={ life=50, pos={0,0,0}, enemyHit=true, repeatEffect=false} }
 local CloakEffect      = {
-  { class='UnitCloaker',options={ life=30 } },
+  --{ class='UnitCloaker',options={ life=30 } },
   --{ class='UnitJitter',options={ delay=20, life=math.huge } },
   { class='Sound',options={ file="sounds/cloak.wav",volume=0.9 } },
 }
@@ -88,11 +88,11 @@ local EnemyCloakEffect      = {
 
 local DecloakEffect    = {
  -- { class='UnitCloaker',options={ inverse=true, life=16 } },
-  { class='UnitJitter',options={ life=8 } },
+  --{ class='UnitJitter',options={ life=8 } },
   { class='Sound',options={ file="sounds/cloak.wav",volume=0.9 } },
 }
 local EnemyDecloakEffect      = {
-  { class='UnitCloaker',options={ inverse=true, life=16 } },
+  --{ class='UnitCloaker',options={ inverse=true, life=16 } },
   { class='Sound',options={ file="sounds/cloak.wav",volume=0.9 } },
 }
 

ModelMaterials_GL4/templates/cus_gl4.frag.glsl

@@ -775,6 +775,7 @@ void main(void){
 
 	vec3 worldBitangent = normalize(cross(worldNormal, worldTangent));
 	mat3 worldTBN = mat3(worldTangent, worldBitangent, worldNormal);
+	float outlineValue = 255.0;
 
 	// N - worldFragNormal
 	vec3 N;
@@ -1296,29 +1297,50 @@ void main(void){
 	#if ENABLE_OPTION_HEALTH_TEXTURING 
 		float cloakTime = worldVertexPos.w;
 		if (abs(cloakTime) > 0.5){
+			bool isEnemy = abs(cloakTime) > 1000000.0;
 			float cloakedness = 0.0;
 			if (cloakTime > 0){
-				cloakedness = clamp((timeInfo.x - cloakTime) / 15.0, 0.0, 1.0);
+				if (isEnemy) {
+					cloakTime = cloakTime - 1000000.0;
+					cloakedness = (timeInfo.x - cloakTime) / 4.0;
+					if (cloakedness > 2.0) {
+						// Enough time has passed to fully hide the unit, must be a spectator with a bad state
+						isEnemy = false;
+					} else {
+						outlineValue = 0.0;
+					}
+					cloakedness = clamp(cloakedness, 0.0, 1.0);
+				} else {
+					cloakedness = clamp((timeInfo.x - cloakTime) / 8.0, 0.0, 1.0);
+				}
 				//outColor.g = 1.0;
 			}
 			if (cloakTime < 0){
+				if (isEnemy) {
+					cloakTime = cloakTime + 1000000.0;
+				}
 				cloakedness = 1.0 - clamp((timeInfo.x + cloakTime) / 15.0, 0.0, 1.0);
 				//outColor.r = 1.0;
 			}
 			float sintime = fract(simFrame * 0.02); // pulses every 3 seconds
 			myPerlin.g = myPerlin.g * 0.5 + 0.5;
 			texColor2.a = 1.0 - clamp(cloakedness*0.49, 0.0, 0.49);
 			float perlinline1 = clamp(1.0 - 20* abs(myPerlin.g - fract(simFrame * 0.005)), 0.0, 1.0);
-			float perlinline2 = clamp(1.0 - 20* abs(myPerlin.g - fract(simFrame * 0.005 +0.5)), 0.0, 1.0);
+			float perlinline2 = clamp(1.0 - 20* abs(myPerlin.g - fract(simFrame * 0.005 + 0.5)), 0.0, 1.0);
 			float cloaknoise = cloakedness*perlinline1 + cloakedness*perlinline2;
+			if (isEnemy) {
+				texColor2.a = 1.0 - clamp(cloakedness * (1.0 + cloaknoise * 5.0), 0.0, 1.0);
+			} else {
+				outColor.rgb = mix(outColor.rgb, teamCol.rgb, cloakedness*0.5);
+			}
 			outColor.rgb += cloaknoise * 0.85;
 
 			#if 1
 			float dotcamera = dot(worldNormal, V);
 
-			float highLightOpacity = clamp(1.0 - dotcamera, 0, 1);
+			float highLightOpacity = clamp(1.0 - dotcamera, 0, 1)*0.8 + 0.2;
 			highLightOpacity = highLightOpacity * highLightOpacity;
-			outColor.rgb = mix(outColor.rgb, teamCol.rgb * 6.0, highLightOpacity * cloakedness);
+			outColor.rgb = mix(outColor.rgb * (1.0 - cloakedness*0.4), teamCol.rgb * 6.0, highLightOpacity * cloakedness);
 
 			//Add bloom to the perlin noise:
 			outSpecularColor.rgb+= vec3(clamp(cloaknoise * 0.75,0.0,1.0));
@@ -1364,7 +1386,7 @@ void main(void){
 			fragData[GBUFFER_EMITTEX_IDX] = vec4(vec3(albedoColor * emissiveness * 2.0) + outSpecularColor * 0.3, alphaBin);
 		#endif
 		#ifdef ENABLE_OPTION_HEALTH_TEXTURING
-			fragData[GBUFFER_MISCTEX_IDX] = vec4(float(materialIndex) / 255.0, 255.0, 0.0, alphaBin);
+			fragData[GBUFFER_MISCTEX_IDX] = vec4(float(materialIndex) / 255.0, outlineValue, 0.0, alphaBin);
 		#else
 			fragData[GBUFFER_MISCTEX_IDX] = vec4(float(materialIndex) / 255.0, 0.0, 0.0, alphaBin);
 		#endif

gamedata/unitdefs_post.lua

@@ -467,6 +467,7 @@ local TURNRATE_MULT_BOT = 1
 local TURNRATE_MULT_VEH = 1
 local ACCEL_MULT_BOT = 1
 local ACCEL_MULT_VEH = 1
+local TURN_ACCEL_FACTOR = 1
 
 for name, ud in pairs(UnitDefs) do
 	if ud.turnrate and ud.acceleration and ud.brakerate and ud.movementclass then
@@ -484,6 +485,7 @@ for name, ud in pairs(UnitDefs) do
 			ud.brakerate = ud.brakerate * ACCEL_MULT_BOT
 			ud.customparams.turn_accel_factor = ud.customparams.turn_accel_factor or 1.2
 		end
+		ud.customparams.turn_accel_factor = ud.customparams.turn_accel_factor * TURN_ACCEL_FACTOR
 	end
 end