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

Merged in GZDB r2485

Browse source
This commit is contained in:
MascaraSnake 2016-01-26 13:10:30 +01:00
parent 208b3acdd3
commit c4085096a1
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Build/Configurations/Includes/ZDoom_linedefs.cfg
View file

@ -3324,7 +3324,7 @@ zdoom
}
arg3
{
title = "Alpha";
title = "Opacity";
default = 255;
}
}

7
Source/Core/Rendering/D3DShader.cs
View file

@ -112,8 +112,11 @@ namespace CodeImp.DoomBuilder.Rendering
// Compiling failed, try with debug information
try
{
// Compile effect
fx = Effect.FromStream(General.Map.Graphics.Device, fxdata, null, null, null, ShaderFlags.Debug, null, out errors);
//mxd. Rewind before use!
fxdata.Seek(0, SeekOrigin.Begin);
// Compile effect
fx = Effect.FromStream(General.Map.Graphics.Device, fxdata, null, null, null, ShaderFlags.Debug, null, out errors);
if(!string.IsNullOrEmpty(errors))
{
throw new Exception("Errors in effect file " + fxfile + ": " + errors);

8
Source/Core/Resources/world3d.fx
View file

@ -169,7 +169,7 @@ float4 ps_fullbright(PixelData pd) : COLOR
float4 ps_main_highlight(PixelData pd) : COLOR
{
float4 tcolor = tex2D(texturesamp, pd.uv);
if(tcolor.a == 0) clip(-1);
if(tcolor.a == 0) return tcolor;
// Blend texture color and vertex color
float4 ncolor = tcolor * pd.color;
@ -181,7 +181,7 @@ float4 ps_main_highlight(PixelData pd) : COLOR
float4 ps_fullbright_highlight(PixelData pd) : COLOR
{
float4 tcolor = tex2D(texturesamp, pd.uv);
if(tcolor.a == 0) clip(-1);
if(tcolor.a == 0) return tcolor;
// Blend texture color and vertex color
float4 ncolor = tcolor * pd.color;
@ -204,7 +204,7 @@ float4 getFogColor(LitPixelData pd, float4 color)
float4 ps_main_fog(LitPixelData pd) : COLOR
{
float4 tcolor = tex2D(texturesamp, pd.uv);
if(tcolor.a == 0) clip(-1);
if(tcolor.a == 0) return tcolor;
return getFogColor(pd, tcolor * pd.color);
}
@ -213,7 +213,7 @@ float4 ps_main_fog(LitPixelData pd) : COLOR
float4 ps_main_highlight_fog(LitPixelData pd) : COLOR
{
float4 tcolor = tex2D(texturesamp, pd.uv);
if(tcolor.a == 0) clip(-1);
if(tcolor.a == 0) return tcolor;
// Blend texture color and vertex color
float4 ncolor = getFogColor(pd, tcolor * pd.color);