Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleaned up code and renamed Material, Mesh, and Object to NJS_MATERIA…
…L, NJS_MESHSET, and NJS_OBJECT respectively to help prevent conflicts with DirectX and the standard library.
  • Loading branch information
michael-fadely committed May 28, 2015
1 parent a37cbe4 commit 02c0d55
Show file tree
Hide file tree
Showing 72 changed files with 4,564 additions and 4,142 deletions.
8 changes: 4 additions & 4 deletions DLLModGenerator/MainForm.cs
Expand Up @@ -143,7 +143,7 @@ private List<string> ExportCPP(TextWriter writer, bool SA2)
labels.AddRange(tbl.GetLabels());
break;
case "model":
SonicRetro.SAModel.Object mdl = new ModelFile(item.Key).Model;
SonicRetro.SAModel.NJS_OBJECT mdl = new ModelFile(item.Key).Model;
writer.WriteLine(mdl.ToStructVariables(modelfmt == ModelFormat.BasicDX, new List<string>()));
labels.AddRange(mdl.GetLabels());
break;
Expand Down Expand Up @@ -237,7 +237,7 @@ private void button6_Click(object sender, EventArgs e)
case "basicmodel":
case "chunkmodel":
case "basicdxmodel":
SonicRetro.SAModel.Object mdl = new ModelFile(item.Key).Model;
SonicRetro.SAModel.NJS_OBJECT mdl = new ModelFile(item.Key).Model;
labels.AddRange(mdl.GetLabels());
break;
case "animation":
Expand Down Expand Up @@ -279,13 +279,13 @@ internal static List<string> GetLabels(this LandTable land)
return labels;
}

internal static List<string> GetLabels(this SonicRetro.SAModel.Object obj)
internal static List<string> GetLabels(this SonicRetro.SAModel.NJS_OBJECT obj)
{
List<string> labels = new List<string>() { obj.Name };
if (obj.Attach != null)
labels.AddRange(obj.Attach.GetLabels());
if (obj.Children != null)
foreach (SonicRetro.SAModel.Object o in obj.Children)
foreach (SonicRetro.SAModel.NJS_OBJECT o in obj.Children)
labels.AddRange(o.GetLabels());
return labels;
}
Expand Down
14 changes: 7 additions & 7 deletions LevelConverter/Program.cs
Expand Up @@ -34,7 +34,7 @@ static void Main(string[] args)
{
COL newcol = new COL() { Bounds = col.Bounds };
newcol.SurfaceFlags = SurfaceFlags.Visible;
newcol.Model = new SonicRetro.SAModel.Object() { Name = col.Model.Name + "_cnk" };
newcol.Model = new SonicRetro.SAModel.NJS_OBJECT() { Name = col.Model.Name + "_cnk" };
newcol.Model.Position = col.Model.Position;
newcol.Model.Rotation = col.Model.Rotation;
newcol.Model.Scale = col.Model.Scale;
Expand All @@ -52,14 +52,14 @@ static void Main(string[] args)
vcnk.VertexCount = (ushort)basatt.Vertex.Length;
vcnk.Size = (ushort)((vcnk.Type == ChunkType.Vertex_VertexNormal ? vcnk.VertexCount * 6 : vcnk.VertexCount * 3) + 1);
cnkatt.Vertex.Add(vcnk);
foreach (Mesh mesh in basatt.Mesh)
foreach (NJS_MESHSET mesh in basatt.Mesh)
{
if (mesh.PolyType != Basic_PolyType.Strips)
{
Console.WriteLine("Warning: Skipping non-strip mesh in {0} ({1}).", basatt.MeshName, mesh.PolyType);
continue;
}
Material mat = null;
NJS_MATERIAL mat = null;
if (basatt.Material != null && mesh.MaterialID < basatt.Material.Count)
{
mat = basatt.Material[mesh.MaterialID];
Expand Down Expand Up @@ -155,7 +155,7 @@ static void Main(string[] args)
Array.Copy(chunk.Vertices.ToArray(), 0, VertexBuffer, chunk.IndexOffset, chunk.Vertices.Count);
Array.Copy(chunk.Normals.ToArray(), 0, NormalBuffer, chunk.IndexOffset, chunk.Normals.Count);
}
Material material = new Material() { UseTexture = true };
NJS_MATERIAL material = new NJS_MATERIAL() { UseTexture = true };
int minVtx = int.MaxValue;
int maxVtx = int.MinValue;
foreach (PolyChunk chunk in cnkatt.Poly)
Expand Down Expand Up @@ -265,23 +265,23 @@ static void Main(string[] args)
if (hasVColor)
vcolors.AddRange(strip.VColors);
}
Mesh mesh = new Mesh(strips.ToArray(), false, hasUV, hasVColor);
NJS_MESHSET mesh = new NJS_MESHSET(strips.ToArray(), false, hasUV, hasVColor);
if (hasUV)
uvs.CopyTo(mesh.UV);
if (hasVColor)
vcolors.CopyTo(mesh.VColor);
mesh.MaterialID = (ushort)basatt.Material.Count;
basatt.Mesh.Add(mesh);
basatt.Material.Add(material);
material = new Material(material.GetBytes(), 0);
material = new NJS_MATERIAL(material.GetBytes(), 0);
}
break;
}
int numVtx = maxVtx - minVtx + 1;
basatt.ResizeVertexes(numVtx);
Array.Copy(VertexBuffer, minVtx, basatt.Vertex, 0, numVtx);
Array.Copy(NormalBuffer, minVtx, basatt.Normal, 0, numVtx);
foreach (Mesh mesh in basatt.Mesh)
foreach (NJS_MESHSET mesh in basatt.Mesh)
foreach (Poly poly in mesh.Poly)
for (int i = 0; i < poly.Indexes.Length; i++)
poly.Indexes[i] = (ushort)(poly.Indexes[i] - minVtx);
Expand Down
5 changes: 2 additions & 3 deletions ModelRelabeler/Program.cs
Expand Up @@ -3,7 +3,6 @@
using System.Linq;
using System.Text;
using SonicRetro.SAModel;
using ModelObject = SonicRetro.SAModel.Object;

namespace ModelRelabeler
{
Expand All @@ -24,7 +23,7 @@ static void Main(string[] args)
mdlfilename = Console.ReadLine();
}
ModelFile model = new ModelFile(mdlfilename);
ModelObject[] objects = model.Model.GetObjects();
NJS_OBJECT[] objects = model.Model.GetObjects();
string repmdlfilename;
if (argq.Count > 0)
{
Expand All @@ -37,7 +36,7 @@ static void Main(string[] args)
repmdlfilename = Console.ReadLine();
}
ModelFile repmodel = new ModelFile(repmdlfilename);
ModelObject[] repobjects = repmodel.Model.GetObjects();
NJS_OBJECT[] repobjects = repmodel.Model.GetObjects();
if (model.Format != repmodel.Format)
Console.WriteLine("Format mismatch between files! Most data will be unable to be relabeled.");
if (objects.Length != repobjects.Length)
Expand Down
4 changes: 2 additions & 2 deletions SADXObjectDefinitions/Common/Cube.cs
Expand Up @@ -11,7 +11,7 @@ namespace SADXObjectDefinitions.Common
{
public class Cube : ObjectDefinition
{
private Object model;
private NJS_OBJECT model;
private Mesh[] meshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down Expand Up @@ -47,7 +47,7 @@ public override List<RenderInfo> Render(SETItem item, Device dev, EditorCamera c

public override string Name { get { return "Solid Cube"; } }

public override BoundingSphere GetBounds(SETItem item, Object model)
public override BoundingSphere GetBounds(SETItem item, NJS_OBJECT model)
{
float largestScale = (item.Scale.X + 10) / 5f;
if (item.Scale.Y > largestScale) largestScale = (item.Scale.Y + 10) / 5f;
Expand Down
4 changes: 2 additions & 2 deletions SADXObjectDefinitions/Common/Cylinder.cs
Expand Up @@ -11,7 +11,7 @@ namespace SADXObjectDefinitions.Common
{
public class Cylinder : ObjectDefinition
{
private Object model;
private NJS_OBJECT model;
private Mesh[] meshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down Expand Up @@ -55,7 +55,7 @@ public override List<RenderInfo> Render(SETItem item, Device dev, EditorCamera c
return result;
}

public override BoundingSphere GetBounds(SETItem item, Object model)
public override BoundingSphere GetBounds(SETItem item, NJS_OBJECT model)
{
float largestScale = (item.Scale.X + 10) / 5f;
if (item.Scale.Y > largestScale) largestScale = (item.Scale.Y + 10) / 5f;
Expand Down
2 changes: 1 addition & 1 deletion SADXObjectDefinitions/Common/DashPanel.cs
Expand Up @@ -12,7 +12,7 @@ namespace SADXObjectDefinitions.Common
{
public class DashPanel : ObjectDefinition
{
private Object model;
private NJS_OBJECT model;
private Mesh[] meshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down
8 changes: 4 additions & 4 deletions SADXObjectDefinitions/Common/FallSpikeBall.cs
Expand Up @@ -12,11 +12,11 @@ namespace SADXObjectDefinitions.Common
{
public class FallSpikeBall : ObjectDefinition
{
private Object ballmodel;
private NJS_OBJECT ballmodel;
private Mesh[] ballmeshes;
private Object cylindermodel;
private NJS_OBJECT cylindermodel;
private Mesh[] cylindermeshes;
private Object spheremodel;
private NJS_OBJECT spheremodel;
private Mesh[] spheremeshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down Expand Up @@ -79,7 +79,7 @@ public override List<RenderInfo> Render(SETItem item, Device dev, EditorCamera c
return result;
}

public override BoundingSphere GetBounds(SETItem item, Object model)
public override BoundingSphere GetBounds(SETItem item, NJS_OBJECT model)
{
BoundingSphere bounds = new BoundingSphere(item.Position, item.Scale.X);

Expand Down
3 changes: 1 addition & 2 deletions SADXObjectDefinitions/Common/ItemBox.cs
Expand Up @@ -8,13 +8,12 @@
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Extensions = SonicRetro.SAModel.Direct3D.Extensions;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;
using Object = SonicRetro.SAModel.Object;

namespace SADXObjectDefinitions.Common
{
public abstract class ItemBoxBase : ObjectDefinition
{
protected Object model;
protected NJS_OBJECT model;
protected Mesh[] meshes;
protected int childindex;

Expand Down
2 changes: 1 addition & 1 deletion SADXObjectDefinitions/Common/JumpPanel.cs
Expand Up @@ -12,7 +12,7 @@ namespace SADXObjectDefinitions.Common
{
public class JumpPanel : ObjectDefinition
{
private Object model;
private NJS_OBJECT model;
private Mesh[] meshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down
4 changes: 2 additions & 2 deletions SADXObjectDefinitions/Common/Ottoto.cs
Expand Up @@ -11,7 +11,7 @@ namespace SADXObjectDefinitions.Common
{
class Ottoto : ObjectDefinition
{
private Object model;
private NJS_OBJECT model;
private Mesh[] meshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down Expand Up @@ -45,7 +45,7 @@ public override List<RenderInfo> Render(SETItem item, Device dev, EditorCamera c
return result;
}

public override BoundingSphere GetBounds(SETItem item, Object model)
public override BoundingSphere GetBounds(SETItem item, NJS_OBJECT model)
{
float largestScale = (item.Scale.X + 10) / 5f;
if (item.Scale.Y > largestScale) largestScale = (item.Scale.Y + 10) / 5f;
Expand Down
7 changes: 3 additions & 4 deletions SADXObjectDefinitions/Common/PUWind.cs
Expand Up @@ -6,21 +6,20 @@
using SonicRetro.SAModel.Direct3D;
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Material = SonicRetro.SAModel.Material;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;

namespace SADXObjectDefinitions.Common
{
class PUWind : ObjectDefinition
{
Material material;
NJS_MATERIAL material;
Texture texture;
Mesh mesh;

public override void Init(ObjectData data, string name, Device dev)
{
mesh = Mesh.Box(dev, 1f, 1f, 1f);
material = new Material();
material = new NJS_MATERIAL();
material.DiffuseColor = Color.FromArgb(180, 180, 180, 180);
material.UseAlpha = true;
texture = new Texture(dev, new Bitmap(2, 2), 0, Pool.Managed);
Expand Down Expand Up @@ -65,7 +64,7 @@ public override List<RenderInfo> Render(SETItem item, Device dev, EditorCamera c
return result;
}

public override BoundingSphere GetBounds(SETItem item, Object model)
public override BoundingSphere GetBounds(SETItem item, NJS_OBJECT model)
{
float largestScale = (item.Scale.X + 10) / 5f;
if (item.Scale.Y > largestScale) largestScale = (item.Scale.Y + 10) / 5f;
Expand Down
5 changes: 2 additions & 3 deletions SADXObjectDefinitions/Common/RingGroup.cs
Expand Up @@ -7,13 +7,12 @@
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;
using Object = SonicRetro.SAModel.Object;

namespace SADXObjectDefinitions.Common
{
public class RingGroup : ObjectDefinition
{
private Object model;
private NJS_OBJECT model;
private Mesh[] meshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down Expand Up @@ -108,7 +107,7 @@ public override List<RenderInfo> Render(SETItem item, Device dev, EditorCamera c
return result;
}

public override BoundingSphere GetBounds(SETItem item, Object model)
public override BoundingSphere GetBounds(SETItem item, NJS_OBJECT model)
{
return base.GetBounds(item, model);
}
Expand Down
4 changes: 2 additions & 2 deletions SADXObjectDefinitions/Common/Sphere.cs
Expand Up @@ -11,7 +11,7 @@ namespace SADXObjectDefinitions.Common
{
public class Sphere : ObjectDefinition
{
private Object model;
private NJS_OBJECT model;
private Mesh[] meshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down Expand Up @@ -45,7 +45,7 @@ public override List<RenderInfo> Render(SETItem item, Device dev, EditorCamera c
return result;
}

public override BoundingSphere GetBounds(SETItem item, Object model)
public override BoundingSphere GetBounds(SETItem item, NJS_OBJECT model)
{
float largestScale = (item.Scale.X + 10) / 5f;
if (item.Scale.Y > largestScale) largestScale = (item.Scale.Y + 10) / 5f;
Expand Down
3 changes: 1 addition & 2 deletions SADXObjectDefinitions/Common/Spikes.cs
Expand Up @@ -8,13 +8,12 @@
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Extensions = SonicRetro.SAModel.Direct3D.Extensions;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;
using Object = SonicRetro.SAModel.Object;

namespace SADXObjectDefinitions.Common
{
public class Spikes : ObjectDefinition
{
private Object model;
private NJS_OBJECT model;
private Mesh[] meshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down
2 changes: 1 addition & 1 deletion SADXObjectDefinitions/Common/Spring.cs
Expand Up @@ -12,7 +12,7 @@ namespace SADXObjectDefinitions.Common
{
public abstract class SpringBase : ObjectDefinition
{
protected Object model;
protected NJS_OBJECT model;
protected Mesh[] meshes;

public override HitResult CheckHit(SETItem item, Vector3 Near, Vector3 Far, Viewport Viewport, Matrix Projection, Matrix View, MatrixStack transform)
Expand Down
9 changes: 4 additions & 5 deletions SADXObjectDefinitions/Common/SwingSpikeBall.cs
Expand Up @@ -7,17 +7,16 @@
using SonicRetro.SAModel.SAEditorCommon.DataTypes;
using SonicRetro.SAModel.SAEditorCommon.SETEditing;
using Mesh = Microsoft.DirectX.Direct3D.Mesh;
using Object = SonicRetro.SAModel.Object;

namespace SADXObjectDefinitions.Common
{
public class SwingSpikeBall : ObjectDefinition
{
private Object centermodel;
private NJS_OBJECT centermodel;
private Mesh[] centermeshes;
private Object cylindermodel;
private NJS_OBJECT cylindermodel;
private Mesh[] cylindermeshes;
private Object ballmodel;
private NJS_OBJECT ballmodel;
private Mesh[] ballmeshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down Expand Up @@ -152,7 +151,7 @@ public static void SetVerticalSpeed(SETItem item, object value)
UpdateZScale(item, (bool)GetOneBall(item), (ShadowType)GetShadow(item), (bool)GetChain(item), (long)value);
}

public override BoundingSphere GetBounds(SETItem item, Object model)
public override BoundingSphere GetBounds(SETItem item, NJS_OBJECT model)
{
return base.GetBounds(item, model);
}
Expand Down
4 changes: 2 additions & 2 deletions SADXObjectDefinitions/Common/Wall.cs
Expand Up @@ -11,7 +11,7 @@ namespace SADXObjectDefinitions.Common
{
public class Wall : ObjectDefinition
{
private Object model;
private NJS_OBJECT model;
private Mesh[] meshes;

public override void Init(ObjectData data, string name, Device dev)
Expand Down Expand Up @@ -90,7 +90,7 @@ public override List<RenderInfo> Render(SETItem item, Device dev, EditorCamera c
return result;
}

public override BoundingSphere GetBounds(SETItem item, Object model)
public override BoundingSphere GetBounds(SETItem item, NJS_OBJECT model)
{
float largestScale = (item.Scale.X + 10) / 5f;
if (item.Scale.Y > largestScale) largestScale = (item.Scale.Y + 10) / 5f;
Expand Down
2 changes: 1 addition & 1 deletion SADXObjectDefinitions/Level Effects/EmeraldCoast.cs
Expand Up @@ -13,7 +13,7 @@ namespace SADXObjectDefinitions.Level_Effects
{
class EmeraldCoast : LevelDefinition
{
Object model1, model2;
NJS_OBJECT model1, model2;
Mesh[] mesh1, mesh2;
Vector3 Skybox_Scale;

Expand Down
2 changes: 1 addition & 1 deletion SADXObjectDefinitions/Level Effects/SkyChase.cs
Expand Up @@ -11,7 +11,7 @@ namespace SADXObjectDefinitions.Level_Effects
{
class SkyChase : LevelDefinition
{
Object carriermdl;
NJS_OBJECT carriermdl;
Mesh[] carriermesh;

public override void Init(IniLevelData data, byte act, Device dev)
Expand Down

0 comments on commit 02c0d55

Please sign in to comment.