Added sector raise/lower by 128mp (PR #215 by JakeSmokie)

This commit is contained in:
JakeSmokie 2018-06-07 11:32:36 +03:00 committed by jewalky
parent 0f469e90ad
commit 6768bc7f37
6 changed files with 81 additions and 24 deletions

2
.gitignore vendored
View file

@ -7,3 +7,5 @@ obj
/.vs
/Build/DevIL.dll
/Build/Plugins/*.dll
/Build/Builder.exe.config
/Build/Builder.pdb

View file

@ -0,0 +1,7 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FElsewhere/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UDMF/@EntryIndexedValue">UDMF</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>

View file

@ -1513,12 +1513,17 @@ echo Copying platform-appropriate SlimDX.dll file.
copy /Y ..\SlimDX\$(PlatformName)\SlimDX.dll .\
echo Copying platform-appropriate Updater.ini.
copy /Y ..\UpdaterConfig\Updater-$(PlatformName).ini Updater.ini</PreBuildEvent>
<PostBuildEvent>if exist "%25VS140COMNTOOLS%25" goto tools140
<PostBuildEvent>if exist "%25VSAPPIDDIR%25" goto tools17
if exist "%25VS140COMNTOOLS%25" goto tools140
if exist "%25VS120COMNTOOLS%25" goto tools120
if exist "%25VS110COMNTOOLS%25" goto tools110
if exist "%25VS100COMNTOOLS%25" goto tools100
if exist "%25VS90COMNTOOLS%25" goto tools90
:tools17
call "%25VSAPPIDDIR%25..\Tools\vsdevcmd" -arch=x86
goto end
:tools140
call "%25VS140COMNTOOLS%25vsvars32.bat"
goto end

View file

@ -632,6 +632,29 @@ raisesector1
repeat = true;
}
lowersector128
{
title = "Lower Floor/Ceiling/Thing by 128 mp";
category = "visual";
description = "Lowers the targeted or selected floors/ceilings by 128 mp. This also lowers selected or targeted things.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
repeat = true;
}
raisesector128
{
title = "Raise Floor/Ceiling/Thing by 128 mp";
category = "visual";
description = "Raises the targeted or selected floors/ceilings by 128 mp. This also raises selected or targeted things.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
repeat = true;
}
//mxd
lowersectortonearest
{

View file

@ -2106,26 +2106,45 @@ namespace CodeImp.DoomBuilder.BuilderModes
PostAction();
}
[BeginAction("raisesector1")]
public void RaiseSector1()
{
PreAction(UndoGroup.SectorHeightChange);
List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
foreach(IVisualEventReceiver i in objs) i.OnChangeTargetHeight(1);
PostAction();
}
[BeginAction("raisesector1")]
public void RaiseSector1() {
PreAction(UndoGroup.SectorHeightChange);
List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
foreach (IVisualEventReceiver i in objs)
i.OnChangeTargetHeight(1);
PostAction();
}
[BeginAction("lowersector1")]
public void LowerSector1()
{
PreAction(UndoGroup.SectorHeightChange);
List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
foreach(IVisualEventReceiver i in objs) i.OnChangeTargetHeight(-1);
PostAction();
}
[BeginAction("lowersector1")]
public void LowerSector1() {
PreAction(UndoGroup.SectorHeightChange);
List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
foreach (IVisualEventReceiver i in objs)
i.OnChangeTargetHeight(-1);
PostAction();
}
//mxd
[BeginAction("raisesectortonearest")]
[BeginAction("raisesector128")]
public void RaiseSector128() {
PreAction(UndoGroup.SectorHeightChange);
List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
foreach (IVisualEventReceiver i in objs)
i.OnChangeTargetHeight(128);
PostAction();
}
[BeginAction("lowersector128")]
public void LowerSector128() {
PreAction(UndoGroup.SectorHeightChange);
List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
foreach (IVisualEventReceiver i in objs)
i.OnChangeTargetHeight(-128);
PostAction();
}
//mxd
[BeginAction("raisesectortonearest")]
public void RaiseSectorToNearest()
{
Dictionary<Sector, VisualFloor> floors = new Dictionary<Sector, VisualFloor>();

View file

@ -88,11 +88,6 @@
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<Reference Include="Builder, Version=1.14.0.2201, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Build\Builder.exe</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@ -134,6 +129,12 @@
<ItemGroup>
<EmbeddedResource Include="Resources\StairIcon.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Core\Builder.csproj">
<Project>{818b3d10-f791-4c3f-9af5-bb2d0079b63c}</Project>
<Name>Builder</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.