Skip to content

Adding SchematicObjectDataList as an argument for spawning schematics. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MathMot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding SchematicObjectDataList as an argument for spawning schematics. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Features/ObjectSpawner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ public static SchematicObject SpawnSchematic(SerializableSchematic serializableS
return gameObject.GetComponent<SchematicObject>();
}

public static SchematicObject SpawnSchematic(string schematicName, Vector3 position) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position });
public static SchematicObject SpawnSchematic(string schematicName, Vector3 position, SchematicObjectDataList? data = null) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position, Data = data });

public static SchematicObject SpawnSchematic(string schematicName, Vector3 position, Quaternion rotation) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = rotation.eulerAngles });
public static SchematicObject SpawnSchematic(string schematicName, Vector3 position, Quaternion rotation, SchematicObjectDataList? data = null) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = rotation.eulerAngles, Data = data });

public static SchematicObject SpawnSchematic(string schematicName, Vector3 position, Vector3 eulerAngles) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = eulerAngles });
public static SchematicObject SpawnSchematic(string schematicName, Vector3 position, Vector3 eulerAngles, SchematicObjectDataList? data = null) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = eulerAngles, Data = data });

public static SchematicObject SpawnSchematic(string schematicName, Vector3 position, Quaternion rotation, Vector3 scale) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = rotation.eulerAngles, Scale = scale });
public static SchematicObject SpawnSchematic(string schematicName, Vector3 position, Quaternion rotation, Vector3 scale, SchematicObjectDataList? data = null) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = rotation.eulerAngles, Scale = scale, Data = data });

public static SchematicObject SpawnSchematic(string schematicName, Vector3 position, Vector3 eulerAngles, Vector3 scale) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = eulerAngles, Scale = scale });
public static SchematicObject SpawnSchematic(string schematicName, Vector3 position, Vector3 eulerAngles, Vector3 scale, SchematicObjectDataList? data = null) =>
SpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = eulerAngles, Scale = scale, Data = data });

public static bool TrySpawnSchematic(SerializableSchematic serializableSchematic, out SchematicObject schematic)
{
Expand All @@ -52,18 +52,18 @@ public static bool TrySpawnSchematic(SerializableSchematic serializableSchematic
}
}

public static bool TrySpawnSchematic(string schematicName, Vector3 position, out SchematicObject schematic) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position }, out schematic);
public static bool TrySpawnSchematic(string schematicName, Vector3 position, out SchematicObject schematic, SchematicObjectDataList? data = null) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position, Data = data }, out schematic);

public static bool TrySpawnSchematic(string schematicName, Vector3 position, Quaternion rotation, out SchematicObject schematic) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = rotation.eulerAngles }, out schematic);
public static bool TrySpawnSchematic(string schematicName, Vector3 position, Quaternion rotation, out SchematicObject schematic, SchematicObjectDataList? data = null) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = rotation.eulerAngles, Data = data }, out schematic);

public static bool TrySpawnSchematic(string schematicName, Vector3 position, Vector3 eulerAngles, out SchematicObject schematic) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = eulerAngles }, out schematic);
public static bool TrySpawnSchematic(string schematicName, Vector3 position, Vector3 eulerAngles, out SchematicObject schematic, SchematicObjectDataList? data = null) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = eulerAngles, Data = data }, out schematic);

public static bool TrySpawnSchematic(string schematicName, Vector3 position, Quaternion rotation, Vector3 scale, out SchematicObject schematic) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = rotation.eulerAngles, Scale = scale }, out schematic);
public static bool TrySpawnSchematic(string schematicName, Vector3 position, Quaternion rotation, Vector3 scale, out SchematicObject schematic, SchematicObjectDataList? data = null) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = rotation.eulerAngles, Scale = scale, Data = data }, out schematic);

public static bool TrySpawnSchematic(string schematicName, Vector3 position, Vector3 eulerAngles, Vector3 scale, out SchematicObject schematic) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = eulerAngles, Scale = scale }, out schematic);
public static bool TrySpawnSchematic(string schematicName, Vector3 position, Vector3 eulerAngles, Vector3 scale, out SchematicObject schematic, SchematicObjectDataList? data = null) =>
TrySpawnSchematic(new() { SchematicName = schematicName, Position = position, Rotation = eulerAngles, Scale = scale, Data = data }, out schematic);
}
14 changes: 12 additions & 2 deletions Features/Serializable/Schematics/SerializableSchematic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,18 @@ public class SerializableSchematic : SerializableObject
}

return schematic.gameObject;
}
}
public SchematicObjectDataList? Data
{
get
{
return _data ??= MapUtils.TryGetSchematicDataByName(SchematicName, out SchematicObjectDataList data) ? data : null;
}
set
{
_data = value;
}
}

private SchematicObjectDataList? Data => _data ??= MapUtils.TryGetSchematicDataByName(SchematicName, out SchematicObjectDataList data) ? data : null;
private SchematicObjectDataList? _data;
}