Skip to content
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

Added PrimitiveSettings + 3 overloads to Primitive::Create method #2107

Merged
merged 7 commits into from
Sep 15, 2023
Merged

Added PrimitiveSettings + 3 overloads to Primitive::Create method #2107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ccff5a9
Added PrimitiveSettings + 3 overloads to Primitive::Create method
SmusiJarviss Sep 11, 2023
7fc50c1
Light::Create overload + Signature fix
SmusiJarviss Sep 12, 2023
3cc586f
Ops
SmusiJarviss Sep 12, 2023
20a4378
Merge branch 'dev' into dev
Thundermaker300 Sep 14, 2023
c21c39c
Update Exiled.API/Features/Toys/Light.cs
NaoUnderscore Sep 15, 2023
493318b
Update Exiled.API/Features/Toys/Primitive.cs
NaoUnderscore Sep 15, 2023
3d67e02
Update Primitive.cs
NaoUnderscore Sep 15, 2023
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
241 changes: 134 additions & 107 deletions Exiled.API/Features/Toys/Light.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,135 @@
// -----------------------------------------------------------------------
// <copyright file="Light.cs" company="Exiled Team">
// Copyright (c) Exiled Team. All rights reserved.
// Licensed under the CC BY-SA 3.0 license.
// </copyright>
// -----------------------------------------------------------------------

namespace Exiled.API.Features.Toys
{
using System.Linq;

using AdminToys;

using Enums;
using Exiled.API.Interfaces;

using UnityEngine;

/// <summary>
/// A wrapper class for <see cref="LightSourceToy"/>.
/// </summary>
public class Light : AdminToy, IWrapper<LightSourceToy>
{
/// <summary>
/// Initializes a new instance of the <see cref="Light"/> class.
/// </summary>
/// <param name="lightSourceToy">The <see cref="LightSourceToy"/> of the toy.</param>
internal Light(LightSourceToy lightSourceToy)
: base(lightSourceToy, AdminToyType.LightSource)
{
Base = lightSourceToy;
}

/// <summary>
/// Gets the base <see cref="LightSourceToy"/>.
/// </summary>
public LightSourceToy Base { get; }

/// <summary>
/// Gets or sets the intensity of the light.
/// </summary>
public float Intensity
{
get => Base.NetworkLightIntensity;
set => Base.NetworkLightIntensity = value;
}

/// <summary>
/// Gets or sets the range of the light.
/// </summary>
public float Range
{
get => Base.NetworkLightRange;
set => Base.NetworkLightRange = value;
}

/// <summary>
/// Gets or sets the color of the primitive.
/// </summary>
public Color Color
{
get => Base.NetworkLightColor;
set => Base.NetworkLightColor = value;
}

/// <summary>
/// Gets or sets a value indicating whether the light should cause shadows from other objects.
/// </summary>
public bool ShadowEmission
{
get => Base.NetworkLightShadows;
set => Base.NetworkLightShadows = value;
}

/// <summary>
/// Creates a new <see cref="Light"/>.
/// </summary>
/// <param name="position">The position of the <see cref="Light"/>.</param>
/// <param name="rotation">The rotation of the <see cref="Light"/>.</param>
/// <param name="scale">The scale of the <see cref="Light"/>.</param>
/// <param name="spawn">Whether the <see cref="Light"/> should be initially spawned.</param>
/// <returns>The new <see cref="Light"/>.</returns>
public static Light Create(Vector3? position = null, Vector3? rotation = null, Vector3? scale = null, bool spawn = true)
{
Light light = new(Object.Instantiate(ToysHelper.LightBaseObject));

light.AdminToyBase.transform.position = position ?? Vector3.zero;
light.AdminToyBase.transform.eulerAngles = rotation ?? Vector3.zero;
light.AdminToyBase.transform.localScale = scale ?? Vector3.one;

if (spawn)
light.Spawn();

return light;
}

/// <summary>
/// Gets the <see cref="Light"/> belonging to the <see cref="LightSourceToy"/>.
/// </summary>
/// <param name="lightSourceToy">The <see cref="LightSourceToy"/> instance.</param>
/// <returns>The corresponding <see cref="LightSourceToy"/> instance.</returns>
public static Light Get(LightSourceToy lightSourceToy)
{
AdminToy adminToy = Map.Toys.FirstOrDefault(x => x.AdminToyBase == lightSourceToy);
return adminToy is not null ? adminToy as Light : new Light(lightSourceToy);
}
}
// -----------------------------------------------------------------------
// <copyright file="Light.cs" company="Exiled Team">
// Copyright (c) Exiled Team. All rights reserved.
// Licensed under the CC BY-SA 3.0 license.
// </copyright>
// -----------------------------------------------------------------------

namespace Exiled.API.Features.Toys
{
using System;
using System.Linq;

using AdminToys;

using Enums;
using Exiled.API.Interfaces;

using UnityEngine;

/// <summary>
/// A wrapper class for <see cref="LightSourceToy"/>.
/// </summary>
public class Light : AdminToy, IWrapper<LightSourceToy>
{
/// <summary>
/// Initializes a new instance of the <see cref="Light"/> class.
/// </summary>
/// <param name="lightSourceToy">The <see cref="LightSourceToy"/> of the toy.</param>
internal Light(LightSourceToy lightSourceToy)
: base(lightSourceToy, AdminToyType.LightSource)
{
Base = lightSourceToy;
}

/// <summary>
/// Gets the base <see cref="LightSourceToy"/>.
/// </summary>
public LightSourceToy Base { get; }

/// <summary>
/// Gets or sets the intensity of the light.
/// </summary>
public float Intensity
{
get => Base.NetworkLightIntensity;
set => Base.NetworkLightIntensity = value;
}

/// <summary>
/// Gets or sets the range of the light.
/// </summary>
public float Range
{
get => Base.NetworkLightRange;
set => Base.NetworkLightRange = value;
}

/// <summary>
/// Gets or sets the color of the primitive.
/// </summary>
public Color Color
{
get => Base.NetworkLightColor;
set => Base.NetworkLightColor = value;
}

/// <summary>
/// Gets or sets a value indicating whether the light should cause shadows from other objects.
/// </summary>
public bool ShadowEmission
{
get => Base.NetworkLightShadows;
set => Base.NetworkLightShadows = value;
}

/// <summary>
/// Creates a new <see cref="Light"/>.
/// </summary>
/// <param name="position">The position of the <see cref="Light"/>.</param>
/// <param name="rotation">The rotation of the <see cref="Light"/>.</param>
/// <param name="scale">The scale of the <see cref="Light"/>.</param>
/// <param name="spawn">Whether the <see cref="Light"/> should be initially spawned.</param>
/// <returns>The new <see cref="Light"/>.</returns>
[Obsolete("Use Create(Vector3, Vector3, Vector3, bool, Color) instead.", true)]
public static Light Create(Vector3? position = null, Vector3? rotation = null, Vector3? scale = null, bool spawn = true)
{
Light light = new(UnityEngine.Object.Instantiate(ToysHelper.LightBaseObject));

light.AdminToyBase.transform.position = position ?? Vector3.zero;
light.AdminToyBase.transform.eulerAngles = rotation ?? Vector3.zero;
light.AdminToyBase.transform.localScale = scale ?? Vector3.one;

if (spawn)
light.Spawn();

return light;
}

/// <summary>
/// Creates a new <see cref="Light"/>.
/// </summary>
/// <param name="position">The position of the <see cref="Light"/>.</param>
/// <param name="rotation">The rotation of the <see cref="Light"/>.</param>
/// <param name="scale">The scale of the <see cref="Light"/>.</param>
/// <param name="spawn">Whether the <see cref="Light"/> should be initially spawned.</param>
/// <param name="color">The color of the <see cref="Light"/>.</param>
/// <returns>The new <see cref="Light"/>.</returns>
public static Light Create(Vector3? position = null, Vector3? rotation = null, Vector3? scale = null, bool spawn = true, Color? color = null)
{
Light light = new(UnityEngine.Object.Instantiate(ToysHelper.LightBaseObject));

light.AdminToyBase.transform.position = position ?? Vector3.zero;
light.AdminToyBase.transform.eulerAngles = rotation ?? Vector3.zero;
light.AdminToyBase.transform.localScale = scale ?? Vector3.one;

if (spawn)
light.Spawn();

light.Color = color ?? Color.gray;

return light;
}

/// <summary>
/// Gets the <see cref="Light"/> belonging to the <see cref="LightSourceToy"/>.
/// </summary>
/// <param name="lightSourceToy">The <see cref="LightSourceToy"/> instance.</param>
/// <returns>The corresponding <see cref="LightSourceToy"/> instance.</returns>
public static Light Get(LightSourceToy lightSourceToy)
{
AdminToy adminToy = Map.Toys.FirstOrDefault(x => x.AdminToyBase == lightSourceToy);
return adminToy is not null ? adminToy as Light : new Light(lightSourceToy);
}
}
}
Loading