Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Removed redundant DirectX-related qualitifications and cleaned up cod…
…e as I went along.
  • Loading branch information
michael-fadely committed May 28, 2015
1 parent 02c0d55 commit 147ba78
Show file tree
Hide file tree
Showing 53 changed files with 449 additions and 568 deletions.
48 changes: 25 additions & 23 deletions SADXLVL2/MainForm.cs
Expand Up @@ -42,7 +42,7 @@ void Application_ThreadException(object sender, System.Threading.ThreadException
}

internal Device d3ddevice;
SonicRetro.SAModel.SAEditorCommon.IniData ini;
SAEditorCommon.IniData ini;
EditorCamera cam = new EditorCamera(EditorOptions.RenderDrawDistance);
string levelID;
internal string levelName;
Expand Down Expand Up @@ -188,7 +188,7 @@ public bool OpenFile()
private void LoadINI(string filename)
{
isStageLoaded = false;
ini = SonicRetro.SAModel.SAEditorCommon.IniData.Load(filename);
ini = SAEditorCommon.IniData.Load(filename);
Environment.CurrentDirectory = Path.GetDirectoryName(filename);
levelNames = new Dictionary<string, List<string>>();

Expand Down Expand Up @@ -641,7 +641,7 @@ private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e)
codeaddr = "0";

ObjectData defgroup = objdefini[codeaddr];
ObjectDefinition def = null;
ObjectDefinition def;

if (!string.IsNullOrEmpty(defgroup.CodeFile))
{
Expand Down Expand Up @@ -679,17 +679,19 @@ private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e)
{
CompilerParameters para =
new CompilerParameters(new string[]
{
"System.dll", "System.Core.dll", "System.Drawing.dll", Assembly.GetAssembly(typeof (Vector3)).Location,
Assembly.GetAssembly(typeof (Texture)).Location, Assembly.GetAssembly(typeof (D3DX)).Location,
Assembly.GetExecutingAssembly().Location, Assembly.GetAssembly(typeof (LandTable)).Location,
Assembly.GetAssembly(typeof (EditorCamera)).Location, Assembly.GetAssembly(typeof (SA1LevelAct)).Location,
Assembly.GetAssembly(typeof (ObjectDefinition)).Location
});
para.GenerateExecutable = false;
para.GenerateInMemory = false;
para.IncludeDebugInformation = true;
para.OutputAssembly = Path.Combine(Environment.CurrentDirectory, dllfile);
{
"System.dll", "System.Core.dll", "System.Drawing.dll", Assembly.GetAssembly(typeof (Vector3)).Location,
Assembly.GetAssembly(typeof (Texture)).Location, Assembly.GetAssembly(typeof (D3DX)).Location,
Assembly.GetExecutingAssembly().Location, Assembly.GetAssembly(typeof (LandTable)).Location,
Assembly.GetAssembly(typeof (EditorCamera)).Location, Assembly.GetAssembly(typeof (SA1LevelAct)).Location,
Assembly.GetAssembly(typeof (ObjectDefinition)).Location
})
{
GenerateExecutable = false,
GenerateInMemory = false,
IncludeDebugInformation = true,
OutputAssembly = Path.Combine(Environment.CurrentDirectory, dllfile)
};
CompilerResults res = pr.CompileAssemblyFromFile(para, fp);
if (res.Errors.HasErrors)
{
Expand Down Expand Up @@ -945,7 +947,7 @@ private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e)

if (!string.IsNullOrEmpty(ini.Paths))
{
progress.SetTaskAndStep("Reticulating splines...", null);
progress.SetTaskAndStep("Reticulating splines...");

String splineDirectory = Path.Combine(Path.Combine(Environment.CurrentDirectory, ini.Paths),
levelact.ToString());
Expand Down Expand Up @@ -1278,7 +1280,7 @@ internal void DrawLevel()
d3ddevice.SetTransform(TransformType.View, cam.ToMatrix());
d3ddevice.SetRenderState(RenderStates.FillMode, (int)EditorOptions.RenderFillMode);
d3ddevice.SetRenderState(RenderStates.CullMode, (int)EditorOptions.RenderCullMode);
d3ddevice.Material = new Microsoft.DirectX.Direct3D.Material { Ambient = Color.White };
d3ddevice.Material = new Material { Ambient = Color.White };
d3ddevice.Clear(ClearFlags.Target | ClearFlags.ZBuffer, Color.Black.ToArgb(), 1, 0);
d3ddevice.RenderState.ZBufferEnable = true;
#endregion
Expand Down Expand Up @@ -1643,7 +1645,7 @@ private void panel1_KeyDown(object sender, KeyEventArgs e)

for (int i = 0; i < selectedItems.ItemCount; i++)
{
combinedBounds = SAModel.Direct3D.Extensions.Merge(combinedBounds, selectedItems.GetSelection()[i].Bounds);
combinedBounds = Direct3D.Extensions.Merge(combinedBounds, selectedItems.GetSelection()[i].Bounds);
}

cam.MoveToShowBounds(combinedBounds);
Expand Down Expand Up @@ -2051,8 +2053,8 @@ private void levelPieceToolStripMenuItem_Click(object sender, EventArgs e)

foreach (string s in importFileDialog.FileNames)
{
bool errorFlag = false;
string errorMsg = "";
bool errorFlag;
string errorMsg;

selectedItems.Add(LevelData.ImportFromFile(s, d3ddevice, cam, out errorFlag, out errorMsg, selectedItems));

Expand Down Expand Up @@ -2087,8 +2089,8 @@ private void importToolStripMenuItem_Click(object sender, EventArgs e)

foreach (string s in importFileDialog.FileNames)
{
bool errorFlag = false;
string errorMsg = "";
bool errorFlag;
string errorMsg;

selectedItems.Add(LevelData.ImportFromFile(s, d3ddevice, cam, out errorFlag, out errorMsg, selectedItems));

Expand Down Expand Up @@ -2304,8 +2306,8 @@ private void findReplaceToolStripMenuItem_Click(object sender, EventArgs e)

private void duplicateToolStripMenuItem_Click(object sender, EventArgs e)
{
bool errorFlag = false;
string errorMsg = "";
bool errorFlag;
string errorMsg;
LevelData.DuplicateSelection(d3ddevice, selectedItems, out errorFlag, out errorMsg);

if (errorFlag) MessageBox.Show(errorMsg);
Expand Down
1 change: 0 additions & 1 deletion SADXObjectDefinitions/Common/Cube.cs
Expand Up @@ -5,7 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
1 change: 0 additions & 1 deletion SADXObjectDefinitions/Common/Cylinder.cs
Expand Up @@ -5,7 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
2 changes: 0 additions & 2 deletions SADXObjectDefinitions/Common/DashPanel.cs
Expand Up @@ -5,8 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Extensions = SonicRetro.SAModel.Direct3D.Extensions;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
2 changes: 0 additions & 2 deletions SADXObjectDefinitions/Common/FallSpikeBall.cs
Expand Up @@ -5,8 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Extensions = SonicRetro.SAModel.Direct3D.Extensions;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
2 changes: 0 additions & 2 deletions SADXObjectDefinitions/Common/ItemBox.cs
Expand Up @@ -6,8 +6,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Extensions = SonicRetro.SAModel.Direct3D.Extensions;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
2 changes: 0 additions & 2 deletions SADXObjectDefinitions/Common/JumpPanel.cs
Expand Up @@ -5,8 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Extensions = SonicRetro.SAModel.Direct3D.Extensions;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
1 change: 0 additions & 1 deletion SADXObjectDefinitions/Common/Ottoto.cs
Expand Up @@ -5,7 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
9 changes: 5 additions & 4 deletions SADXObjectDefinitions/Common/PUWind.cs
Expand Up @@ -6,7 +6,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand All @@ -19,9 +18,11 @@ class PUWind : ObjectDefinition
public override void Init(ObjectData data, string name, Device dev)
{
mesh = Mesh.Box(dev, 1f, 1f, 1f);
material = new NJS_MATERIAL();
material.DiffuseColor = Color.FromArgb(180, 180, 180, 180);
material.UseAlpha = true;
material = new NJS_MATERIAL
{
DiffuseColor = Color.FromArgb(180, 180, 180, 180),
UseAlpha = true
};
texture = new Texture(dev, new Bitmap(2, 2), 0, Pool.Managed);
}

Expand Down
1 change: 0 additions & 1 deletion SADXObjectDefinitions/Common/RingGroup.cs
Expand Up @@ -6,7 +6,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
1 change: 0 additions & 1 deletion SADXObjectDefinitions/Common/Sphere.cs
Expand Up @@ -5,7 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
6 changes: 0 additions & 6 deletions SADXObjectDefinitions/Common/Spikes.cs
Expand Up @@ -6,8 +6,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Extensions = SonicRetro.SAModel.Direct3D.Extensions;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand All @@ -30,8 +28,6 @@ public override HitResult CheckHit(SETItem item, Vector3 Near, Vector3 Far, View
transform.Push();
transform.NJTranslate(item.Position);
transform.NJRotateObject(item.Rotation.X & 0xC000, item.Rotation.Y, 0);
double v4 = (1 - cols) * 7.5;
double v5 = (1 - rows) * 7.5;
transform.NJTranslate((1 - rows) * 7.5f, 0, (1 - cols) * 7.5f);
for (int i = 0; i < rows; ++i)
{
Expand All @@ -56,8 +52,6 @@ public override List<RenderInfo> Render(SETItem item, Device dev, EditorCamera c
transform.Push();
transform.NJTranslate(item.Position);
transform.NJRotateObject(item.Rotation.X & 0xC000, item.Rotation.Y, 0);
double v4 = (1 - cols) * 7.5;
double v5 = (1 - rows) * 7.5;
transform.NJTranslate((1 - rows) * 7.5f, 0, (1 - cols) * 7.5f);
for (int i = 0; i < rows; ++i)
{
Expand Down
2 changes: 0 additions & 2 deletions SADXObjectDefinitions/Common/Spring.cs
Expand Up @@ -5,8 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Extensions = SonicRetro.SAModel.Direct3D.Extensions;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
1 change: 0 additions & 1 deletion SADXObjectDefinitions/Common/SwingSpikeBall.cs
Expand Up @@ -6,7 +6,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
1 change: 0 additions & 1 deletion SADXObjectDefinitions/Common/Wall.cs
Expand Up @@ -5,7 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
Expand Down
2 changes: 0 additions & 2 deletions SADXObjectDefinitions/Level Effects/EmeraldCoast.cs
Expand Up @@ -4,10 +4,8 @@
using SA_Tools;
using SonicRetro.SAModel;
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SADXLVL2;
using SonicRetro.SAModel.SAEditorCommon;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Level_Effects
{
Expand Down
1 change: 0 additions & 1 deletion SADXObjectDefinitions/Level Effects/SkyChase.cs
Expand Up @@ -5,7 +5,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Level_Effects
{
Expand Down
2 changes: 0 additions & 2 deletions SADXObjectDefinitions/Level Effects/TwinklePark.cs
Expand Up @@ -3,10 +3,8 @@
using SA_Tools;
using SonicRetro.SAModel;
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SADXLVL2;
using SonicRetro.SAModel.SAEditorCommon;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Level_Effects
{
Expand Down
2 changes: 0 additions & 2 deletions SADXObjectDefinitions/Level Effects/WindyValley1.cs
Expand Up @@ -5,10 +5,8 @@
using SA_Tools;
using SonicRetro.SAModel;
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SADXLVL2;
using SonicRetro.SAModel.SAEditorCommon;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Level_Effects
{
Expand Down
1 change: 0 additions & 1 deletion SADXObjectDefinitions/Level Effects/WindyValley2.cs
Expand Up @@ -6,7 +6,6 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Level_Effects
{
Expand Down
2 changes: 0 additions & 2 deletions SADXObjectDefinitions/Level Effects/WindyValley3.cs
Expand Up @@ -5,10 +5,8 @@
using SA_Tools;
using SonicRetro.SAModel;
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SADXLVL2;
using SonicRetro.SAModel.SAEditorCommon;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Level_Effects
{
Expand Down

0 comments on commit 147ba78

Please sign in to comment.