stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-31 04:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: glow should apply before Doom64 coloring

Browse source
This commit is contained in:
ZZYZX 2017-02-01 09:57:00 +02:00
parent 42c2fc2044
commit 469942d263
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Properties/AssemblyInfo.cs
View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2849")]
[assembly: AssemblyVersion("2.3.0.2851")]
[assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("24c8b04")]
[assembly: AssemblyHash("42c2fc2")]

2
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
View file

@ -29,5 +29,5 @@ using System.Resources;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2849")]
[assembly: AssemblyVersion("2.3.0.2851")]
[assembly: NeutralResourcesLanguageAttribute("en")]

30
Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
View file

@ -290,21 +290,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
//mxd
private static WorldVertex InterpolateVertexColor(WorldVertex v, SectorData data)
{
// [ZZ] process sector top and bottom colors.
// block
{
float cz = data.Ceiling.plane.GetZ(v.x, v.y);
float cgz = data.Floor.plane.GetZ(v.x, v.y);
float delta = 1.0f - (((v.z - cgz) / (cz - cgz)) * 0.9f);
PixelColor vertexcolor = PixelColor.FromInt(v.c);
PixelColor topcolor = PixelColor.Modulate(vertexcolor, data.ColorWallTop);
PixelColor bottomcolor = PixelColor.Modulate(vertexcolor, data.ColorWallBottom);
v.c = InterpolationTools.InterpolateColor(topcolor, bottomcolor, delta).WithAlpha(255).ToInt();
}
// don't process glows if fullbright.
if (v.c == PixelColor.INT_WHITE)
return v;
//if (v.c == PixelColor.INT_WHITE)
// return v;
// Apply ceiling glow?
if(data.CeilingGlow != null)
@ -338,7 +326,19 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
}
return v;
// [ZZ] process sector top and bottom colors.
// block
{
float cz = data.Ceiling.plane.GetZ(v.x, v.y);
float cgz = data.Floor.plane.GetZ(v.x, v.y);
float delta = 1.0f - (((v.z - cgz) / (cz - cgz)) * 0.9f);
PixelColor vertexcolor = PixelColor.FromInt(v.c);
PixelColor topcolor = PixelColor.Modulate(vertexcolor, data.ColorWallTop);
PixelColor bottomcolor = PixelColor.Modulate(vertexcolor, data.ColorWallBottom);
v.c = InterpolationTools.InterpolateColor(topcolor, bottomcolor, delta).WithAlpha(255).ToInt();
}
return v;
}
// This splits a polygon with a plane and returns the other part as a new polygon