Shared/IWorld.cs

@@ -3,5 +3,6 @@
 namespace SemiColinGames {
   public interface IWorld : IDisposable {
     void Update(float modelTime, History<Input> input);
+    Camera Camera { get; }
   }
 }

Shared/Scene.cs

@@ -7,20 +7,20 @@ namespace SemiColinGames {
   public sealed class Scene : IScene {
     const float DESIRED_ASPECT_RATIO = 1920.0f / 1080.0f;
 
-    private readonly Color backgroundColor = Color.CornflowerBlue;
+    Color backgroundColor = Color.CornflowerBlue;
 
-    private readonly GraphicsDevice graphics;
+    readonly GraphicsDevice graphics;
-    private readonly Camera camera;
+    readonly Camera camera;
 
-    private readonly RenderTarget2D sceneTarget;
+    readonly RenderTarget2D sceneTarget;
-    private readonly BasicEffect basicEffect;
+    readonly BasicEffect basicEffect;
-    private readonly SpriteBatch spriteBatch;
+    readonly SpriteBatch spriteBatch;
-    private readonly SoundEffectInstance music;
+    readonly SoundEffectInstance music;
 
     // Draw() needs to be called without IsRunningSlowly this many times before we actually
     // attempt to draw the scene. This is a workaround for the fact that otherwise the first few
     // frames can be really slow to draw.
-    private int framesToSuppress = 2;
+    int framesToSuppress = 2;
 
     public Scene(GraphicsDevice graphics, Camera camera) {
       this.graphics = graphics;

Shared/Shared.projitems

@@ -34,8 +34,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Scene.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SneakGame.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Timer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)TreeScene.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)TreeWorld.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)World.cs" />
   </ItemGroup>
 </Project>

Shared/SneakGame.cs

@@ -64,11 +64,9 @@ namespace SemiColinGames {
 
     private void LoadLevel() {
       world?.Dispose();
-      // world = new World(GraphicsDevice, Content.LoadString("levels/demo.json"));
+      world = new World(GraphicsDevice, Content.LoadString("levels/demo.json"));
-      world = new TreeWorld();
       scene?.Dispose();
-      // scene = new Scene(GraphicsDevice, ((World) world).Camera);
+      scene = new Scene(GraphicsDevice, world.Camera);
-      scene = new TreeScene(GraphicsDevice);
 
       GC.Collect();
       GC.WaitForPendingFinalizers();

Shared/TreeScene.cs

@@ -1,25 +0,0 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Audio;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-
-namespace SemiColinGames {
-  public sealed class TreeScene : IScene {
-
-    readonly Color backgroundColor = Color.SkyBlue;
-
-    readonly GraphicsDevice graphics;
-
-    public TreeScene(GraphicsDevice graphics) {
-      this.graphics = graphics;
-    }
-
-    public void Dispose() {
-      GC.SuppressFinalize(this);
-    }
-
-    public void Draw(bool isRunningSlowly, IWorld iworld, bool paused) {
-      graphics.Clear(backgroundColor);
-    }
-  }
-}

Shared/TreeWorld.cs

@@ -1,15 +0,0 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-
-namespace SemiColinGames {
-  public sealed class TreeWorld : IWorld {
-    public void Dispose() {
-      GC.SuppressFinalize(this);
-    }
-
-    public void Update(float modelTime, History<Input> input) {
-    }
-  }
-}

Shared/World.cs

@@ -26,7 +26,6 @@ namespace SemiColinGames {
     public readonly int Width;
     public readonly int Height;
 
-    // TODO: it seems weird that World takes in a GraphicsDevice. Remove it?
     public World(GraphicsDevice graphics, string json) {
       Camera = new Camera();
       LinesOfSight = new LinesOfSight(graphics);