neintonine/smrendererv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#MERGE 21eaa49 & 777c2f62

Browse source
This commit is contained in:
Michel Fedde 2021-03-17 17:14:56 +01:00
commit cf22c67e6f
11 changed files with 165 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

23
SMCode/SM.Base/Scene/GenericItemCollection.cs
View file

@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using SM.Base.Drawing;
using SM.Base.Window;
using SM.Base.Windows;
#endregion
@ -12,9 +12,9 @@ namespace SM.Base.Scene
/// <summary>
/// Contains a list of show items.
/// </summary>
public abstract class GenericItemCollection : List<IShowItem>, IShowItem, IShowCollection, IScriptable
public abstract class GenericItemCollection : List<IShowItem>, IShowItem, IShowCollection, IScriptable, IFixedScriptable
{
private readonly List<IScriptable> _scriptableObjects = new List<IScriptable>();
private List<IScriptable> _scriptableObjects = new List<IScriptable>();
/// <summary>
/// Currently active script objects.
@ -43,6 +43,16 @@ namespace SM.Base.Scene
/// <inheritdoc />
public bool RenderActive { get; set; } = true;
public virtual void FixedUpdate(FixedUpdateContext context)
{
if (!Active || !UpdateActive) return;
for (int i = 0; i < _fixedScriptables.Count; i++)
{
_fixedScriptables[i].FixedUpdate(context);
}
}
/// <inheritdoc cref="IShowCollection.Draw" />
public virtual void Draw(DrawContext context)
{
@ -88,6 +98,8 @@ namespace SM.Base.Scene
if (item is IScriptable scriptable)
AddScript(scriptable);
if (item is IFixedScriptable fixedScriptable) _fixedScriptables.Add(fixedScriptable);
}
}
@ -109,6 +121,7 @@ namespace SM.Base.Scene
public void AddScript(IScriptable item)
{
_scriptableObjects.Add(item);
if (item is IFixedScriptable fs) _fixedScriptables.Add(fs);
}
public void Remove(params IShowItem[] items)
@ -119,6 +132,9 @@ namespace SM.Base.Scene
if (item is IScriptable scriptable)
RemoveScript(scriptable);
if (item is IFixedScriptable fixedScriptable)
_fixedScriptables.Remove(fixedScriptable);
}
}
@ -140,6 +156,7 @@ namespace SM.Base.Scene
public void RemoveScript(IScriptable item)
{
_scriptableObjects.Remove(item);
if (item is IFixedScriptable fs) _fixedScriptables.Remove(fs);
}
public ICollection<IShowItem> GetAllItems(bool includeCollections = false)

6
SMCode/SM.Base/Scene/GenericScene.cs
View file

@ -110,6 +110,12 @@ namespace SM.Base.Scene
_hud?.Update(context);
}
public virtual void FixedUpdate(FixedUpdateContext context)
{
_objectCollection?.FixedUpdate(context);
_hud?.FixedUpdate(context);
}
/// <summary>
/// Draws this scene.
/// </summary>

15
SMCode/SM.Base/Scene/IFixedScriptable.cs Normal file
View file

@ -0,0 +1,15 @@
using SM.Base.Window.Contexts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SM.Base.Scene
{
public interface IFixedScriptable
{
void FixedUpdate(FixedUpdateContext context);
}
}