Cleanup, moved Map lifecycle into Director, added renderer_info command

lib/map.rb

@@ -4,8 +4,8 @@ class IMICFPS
     include LightManager
     include CommonMethods
 
-    attr_reader :collision_manager
-    attr_reader :gravity
+    attr_reader :collision_manager, :gravity
+
     def initialize(map_parser:, gravity: IMICFPS::EARTH_GRAVITY)
       @map_parser = map_parser
       @gravity = gravity
@@ -18,24 +18,92 @@ class IMICFPS
     end
 
     def setup
-      add_entity(Terrain.new(map_entity: @map_parser.terrain, manifest: Manifest.new(package: @map_parser.terrain.package, name: @map_parser.terrain.name)))
+      add_terrain
+      add_skybox
+      add_lights
+      add_entities
 
-      add_entity(Skydome.new(map_entity: @map_parser.skydome, manifest: Manifest.new(package: @map_parser.skydome.package, name: @map_parser.skydome.name), backface_culling: false))
+      # TODO: Add player entity from director
+      add_entity(
+        Player.new(
+          spawnpoint: @map_parser.spawnpoints.sample,
+          manifest: Manifest.new(
+            package: "base",
+            name: "character"
+          )
+        )
+      )
+    end
 
+    def add_terrain
+      add_entity(
+        Terrain.new(
+          map_entity: @map_parser.terrain,
+          manifest: Manifest.new(
+            package: @map_parser.terrain.package,
+            name: @map_parser.terrain.name
+          )
+        )
+      )
+    end
+
+    def add_skybox
+      add_entity(
+        Skydome.new(
+          map_entity: @map_parser.skydome,
+          backface_culling: false,
+          manifest: Manifest.new(
+            package: @map_parser.skydome.package,
+            name: @map_parser.skydome.name
+          )
+        )
+      )
+    end
+
+    def add_lights
       @map_parser.lights.each do |l|
-        add_light(Light.new(id: available_light, type: l.type, position: l.position, diffuse: l.diffuse, ambient: l.ambient, specular: l.specular, intensity: l.intensity))
+        add_light(
+          Light.new(
+            id: available_light,
+            type: l.type,
+            position: l.position,
+            diffuse: l.diffuse,
+            ambient: l.ambient,
+            specular: l.specular,
+            intensity: l.intensity
+          )
+        )
       end
 
-      @map_parser.entities.each do |ent|
-        add_entity(Entity.new(map_entity: ent, manifest: Manifest.new(package: ent.package, name: ent.name)))
-      end
-
-      add_entity(Player.new(spawnpoint: @map_parser.spawnpoints.sample, manifest: Manifest.new(package: "base", name: "character")))
-
       # Default lights if non are defined
-      if @map_parser.lights.size == 0
-        add_light(Light.new(id: available_light, position: Vector.new(30, 10.0, 30)))
-        add_light(Light.new(id: available_light, position: Vector.new(0, 100, 0), diffuse: Color.new(1.0, 0.5, 0.1)))
+      return unless @map_parser.lights.size.zero?
+
+      add_light(
+        Light.new(
+          id: available_light,
+          position: Vector.new(30, 10.0, 30)
+        )
+      )
+
+      add_light(
+        Light.new(
+          id: available_light,
+          position: Vector.new(0, 100, 0), diffuse: Color.new(1.0, 0.5, 0.1)
+        )
+      )
+    end
+
+    def add_entities
+      @map_parser.entities.each do |ent|
+        add_entity(
+          Entity.new(
+            map_entity: ent,
+            manifest: Manifest.new(
+              package: ent.package,
+              name: ent.name
+            )
+          )
+        )
       end
     end
 
@@ -48,7 +116,7 @@ class IMICFPS
 
       Gosu.gl do
         gl_error?
-        glClearColor(0,0.2,0.5,1) # skyish blue
+        glClearColor(0, 0.2, 0.5, 1) # skyish blue
         gl_error?
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) # clear the screen and the depth buffer
         gl_error?