stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 22:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: color_absolute is not actually in GZDoom

Browse source
This commit is contained in:
ZZYZX 2017-02-02 07:34:21 +02:00
parent cb8473fa09
commit 7e502a1fa2
7 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Build/Configurations/Includes/ZDoom_misc.cfg
View file

@ -464,12 +464,6 @@ universalfields
default = "FFFFFF";
}
color_absolute
{
type = 3;
default = false;
}
comment
{
type = 2;

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

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2855")]
[assembly: AssemblyVersion("2.3.0.2856")]
[assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("76b2b1b")]
[assembly: AssemblyHash("cb8473f")]

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

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

9
Source/Plugins/BuilderModes/VisualModes/Effect3DFloor.cs
View file

@ -202,13 +202,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
if (VavoomType)
{
ColorFloor = sd.ColorFloor;
ColorCeiling = sd.ColorCeiling;
ColorFloor = sd.ColorCeiling;
ColorCeiling = sd.ColorFloor;
}
else
{
ColorFloor = sd.ColorCeiling;
ColorCeiling = sd.ColorFloor;
ColorFloor = sd.ColorFloor;
ColorCeiling = sd.ColorCeiling;
}
}
}

2
Source/Plugins/BuilderModes/VisualModes/SectorData.cs
View file

@ -46,7 +46,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
internal PixelColor ColorWallBottom;
internal PixelColor ColorWallTop;
internal PixelColor ColorSprites;
internal bool Doom64Absolute;
// Sectors that must be updated when this sector is changed
// The boolean value is the 'includeneighbours' of the UpdateSectorGeometry function which
@ -318,7 +317,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
ColorSprites = PixelColor.FromInt(sector.Fields.GetValue("color_sprites", PixelColor.INT_WHITE));
ColorWallTop = PixelColor.FromInt(sector.Fields.GetValue("color_walltop", PixelColor.INT_WHITE));
ColorWallBottom = PixelColor.FromInt(sector.Fields.GetValue("color_wallbottom", PixelColor.INT_WHITE));
Doom64Absolute = sector.Fields.GetValue("color_absolute", false);
PixelColor floorbrightness = PixelColor.FromInt(mode.CalculateBrightness(lightfloor));
PixelColor ceilingbrightness = PixelColor.FromInt(mode.CalculateBrightness(lightceiling));

2
Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs
View file

@ -151,7 +151,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
// [ZZ] Apply Doom 64 lighting here (for extrafloor)
if (extrafloor != null) color = PixelColor.Modulate(PixelColor.FromInt(color), extrafloor.VavoomType ? extrafloor.ColorCeiling : extrafloor.ColorFloor).WithAlpha(alpha).ToInt();
if (extrafloor != null) color = PixelColor.Modulate(PixelColor.FromInt(color), extrafloor.ColorCeiling).WithAlpha(alpha).ToInt();
//mxd. Determine fog density
fogfactor = CalculateFogFactor(targetbrightness);

2
Source/Plugins/BuilderModes/VisualModes/VisualFloor.cs
View file

@ -137,7 +137,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
// [ZZ] Apply Doom 64 lighting here (for extrafloor)
if (extrafloor != null) color = PixelColor.Modulate(PixelColor.FromInt(color), extrafloor.VavoomType ? extrafloor.ColorFloor : extrafloor.ColorCeiling).WithAlpha(alpha).ToInt();
if (extrafloor != null) color = PixelColor.Modulate(PixelColor.FromInt(color), extrafloor.ColorFloor).WithAlpha(alpha).ToInt();
//mxd. Determine fog density
fogfactor = CalculateFogFactor(targetbrightness);