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

Fixed, Visual mode: texture coordinate generated to test if double-sided middle texture is transparent was shifted 1 pixel up.

Browse source 
Fixed, Visual mode: offsets of GLDEFS lights were not affected by thing's angle.
Updated SharpCompress (0.10.3 -> 0.11.1).
Updated ZDoom_DECORATE.cfg.
This commit is contained in:
MaxED 2015-08-28 19:22:28 +00:00
parent 54bf4afdff
commit ee719bd943
7 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Build/Scripting/ZDoom_DECORATE.cfg
View file

@ -184,7 +184,7 @@ keywords
A_SetShootable = "A_SetShootable";
A_SetSolid = "A_SetSolid";
A_SetSpecial = "A_SetSpecial(int special, int arg0, int arg1, int arg2, int arg3, int arg4)";
A_SetSpecies = "A_SetSpecies(str species [, int pointer = AAPTR_DEFAULT])";
A_SetSpecies = "A_SetSpecies(str species[, int pointer = AAPTR_DEFAULT])";
A_SetSpeed = "A_SetSpeed(float speed[, int pointer = AAPTR_DEFAULT])";
A_SetTics = "A_SetTics(int tics)";
A_SetTranslucent = "A_SetTranslucent(float alpha[, int mode = 0])";
@ -205,7 +205,7 @@ keywords
A_FaceTracer = "A_FaceTracer[(float angle = 0.0[, float pitch = 0.0])]\nA_FaceTracer(float max_turn, float max_pitch, float ang_offset, float pitch_offset, int flags)";
A_Fire = "A_Fire[(float height = 0.0)]";
A_Weave = "A_Weave(int horzspeed, int vertspeed, float horzdist, float vertdist)";
A_Warp = "A_Warp(int ptr_destination, float x-offset, float y-offset, float z-offset, float angle, int flags, str success_state)\nflags: WARPF flags.";
A_Warp = "A_Warp(int ptr_destination[, float x-offset = 0[, float y-offset = 0[, float z-offset = 0[, float angle = 0[, int flags = 0[, str success_state = \"\"[, float heightoffset = 0]]]]]]])\nflags: WARPF flags.";
A_Countdown = "A_Countdown";
A_CountdownArg = "A_CountdownArg(int arg[, str targetstate])";
A_Stop = "A_Stop";

BIN
Build/SharpCompress.3.5.dll
View file

Binary file not shown.

4
Source/Core/Builder.csproj
View file

@ -506,9 +506,7 @@
<Compile Include="Rendering\WorldVertex.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="SharpCompress.3.5, Version=0.10.3.0, Culture=neutral, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="SharpCompress.3.5, Version=0.11.1.0, Culture=neutral, processorArchitecture=x86" />
<Reference Include="SlimDX, Version=2.0.13.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=x86" />
<Reference Include="System" />
<Reference Include="System.Core">

7
Source/Core/Data/DirectoryReader.cs
View file

@ -375,7 +375,7 @@ namespace CodeImp.DoomBuilder.Data
{
string title = Path.GetFileNameWithoutExtension(beginswith);
string ext = Path.GetExtension(beginswith);
if(ext.Length > 1) ext = ext.Substring(1); else ext = "";
ext = (!string.IsNullOrEmpty(ext) && ext.Length > 1 ? ext.Substring(1) : string.Empty);
return files.GetFirstFile(path, title, subfolders, ext);
}
@ -387,7 +387,10 @@ namespace CodeImp.DoomBuilder.Data
try
{
s = new MemoryStream(File.ReadAllBytes(Path.Combine(location.location, filename)));
lock(this)
{
s = new MemoryStream(File.ReadAllBytes(Path.Combine(location.location, filename)));
}
}
catch(Exception e)
{

5
Source/Core/VisualModes/VisualThing.cs
View file

@ -523,12 +523,13 @@ namespace CodeImp.DoomBuilder.VisualModes
//apply settings
lightRenderStyle = light.Subtractive ? DynamicLightRenderStyle.NEGATIVE : DynamicLightRenderStyle.NORMAL;
lightColor = new Color4((float)lightRenderStyle / 100.0f, light.Color.Red * intensity_mod, light.Color.Green * intensity_mod, light.Color.Blue * intensity_mod);
lightOffset = light.Offset;
Vector2D o = new Vector2D(light.Offset.X, light.Offset.Y).GetRotated(thing.Angle - Angle2D.PIHALF);
lightOffset = new Vector3(o.x, o.y, light.Offset.Z);
lightType = light.Type;
if (lightType == DynamicLightType.SECTOR)
{
lightPrimaryRadius = light.Interval * thing.Sector.Brightness / 5;
lightPrimaryRadius = light.Interval * thing.Sector.Brightness / 5.0f;
}
else
{

5
Source/Plugins/BuilderEffects/BuilderEffects.csproj
View file

@ -40,11 +40,6 @@
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="Trackbar, Version=1.0.2486.37933, Culture=neutral, PublicKeyToken=503bf28f63ad27b4">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Build\Trackbar.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="BuilderPlug.cs" />

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

@ -338,7 +338,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(oy < 0) oy = Texture.Height + oy;
// Check pixel alpha
if(Texture.GetBitmap().GetPixel(General.Clamp(ox, 0, Texture.Width - 1), General.Clamp(Texture.Height - oy, 0, Texture.Height - 1)).A > 0)
if(Texture.GetBitmap().GetPixel(General.Clamp(ox, 0, Texture.Width - 1), General.Clamp(Texture.Height - oy - 1, 0, Texture.Height - 1)).A > 0)
{
return base.PickAccurate(from, to, dir, ref u_ray);
}