Merged linux changes, water effect using a BasicEffect and a simpler pixel shader, multi-colored wires

This commit is contained in:
Regalis
2015-09-08 21:55:27 +03:00
parent 7eae6fb026
commit ea15397725
18 changed files with 221 additions and 197 deletions

View File

@@ -17,12 +17,12 @@ namespace Subsurface
public BackgroundSpriteManager(string configPath)
{
XDocument doc = ToolBox.TryLoadXml(configPath);
if (doc == null) return;
activeSprites = new List<BackgroundSprite>();
prefabs = new List<BackgroundSpritePrefab>();
XDocument doc = ToolBox.TryLoadXml(configPath);
if (doc == null) return;
foreach (XElement element in doc.Root.Elements())
{
prefabs.Add(new BackgroundSpritePrefab(element));
@@ -31,10 +31,13 @@ namespace Subsurface
public void SpawnSprites(int count)
{
count = Math.Min(count, MaxSprites);
activeSprites.Clear();
if (prefabs.Count == 0) return;
count = Math.Min(count, MaxSprites);
for (int i = 0; i < count; i++ )
{
Vector2 pos = Vector2.Zero;