Added moons

Author: chrismwaite

models/galaxy.lua

@@ -3,7 +3,7 @@ require "models.system"
 Galaxy = {}
 
 -- x, y are coordinates in the universe?
-Galaxy.new = function(x, y, num_systems)
+Galaxy.new = function()
 
   -- variables
   local self = {}

models/moon.lua

@@ -0,0 +1,59 @@
+Moon = {}
+
+Moon.new = function()
+  
+  -- variables
+  local self = {}
+  
+  -- positioning
+  local x = x or 0
+  local y = y or 0
+  local angle = angle or 0
+  local distance = distance or 0
+  local speed = speed or 0
+  
+  -- appearance
+  local radius = radius or 0
+  local red = red or 0
+  local green = green or 0
+  local blue = blue or 0
+
+  -- getters
+  self.getX = function() return x end
+  self.getY = function() return y end
+  self.getAngle = function() return angle end
+  self.getRadius = function() return radius end
+  self.getDistance = function() return distance end
+  self.getSpeed = function() return speed end
+  self.getRed = function() return red end
+  self.getGreen = function() return green end
+  self.getBlue = function() return blue end
+  
+  -- setters
+  self.setX = function(arg) x = arg end
+  self.setY = function(arg) y = arg end
+  self.setAngle = function(arg) angle = arg end
+  self.setRadius = function(arg) radius = arg end
+  self.setDistance = function(arg) distance = arg end
+  self.setSpeed = function(arg) speed = arg end
+  self.setRed = function(arg) red = arg end
+  self.setGreen = function(arg) green = arg end
+  self.setBlue = function(arg) blue = arg end
+
+  -- generation methods
+
+  -- default moon
+  self.generate = function ()
+    -- generate topography
+
+    -- colour
+    red = 255
+    green = 255
+    blue = 255
+    radius = 10
+    distance = 50
+    speed = love.math.random(10,40)*0.001
+  end
+
+  return self
+end

models/planet.lua

@@ -1,4 +1,5 @@
 require "helper"
+require "models.moon"
 
 Planet = {}
 
@@ -7,6 +8,7 @@ Planet.new = function(x, y, radius, red, green, blue)
   -- variables
   local self = {}
   local composition = {}
+  local moons = {}
 
   -- positioning
   local x = x or 0
@@ -32,6 +34,7 @@ Planet.new = function(x, y, radius, red, green, blue)
   self.getGreen = function() return green end
   self.getBlue = function() return blue end
   self.getComposition = function () return composition end
+  self.getMoons = function () return moons end
 
   -- setters
   self.setX = function(arg) x = arg end
@@ -44,6 +47,7 @@ Planet.new = function(x, y, radius, red, green, blue)
   self.setGreen = function(arg) green = arg end
   self.setBlue = function(arg) blue = arg end
   self.setComposition = function(arg) composition = arg end
+  self.setMoons = function(arg) moons = arg end
 
   -- composition
   self.generate_composition = function()
@@ -104,6 +108,22 @@ Planet.new = function(x, y, radius, red, green, blue)
 
     -- generate composition
     self.setComposition(self.generate_composition())
+
+    -- generate moons
+    local num_moons = love.math.random(0,2)
+    for i=1,num_moons do
+      local moon = Moon.new()
+      moon.generate()
+      -- the position should match the planet
+      moon.setX(x)
+      moon.setY(y)
+      -- the distance should be the radius of the planet + the radius of the moon + a bit
+      -- but actually randum
+      moon.setDistance(love.math.random(radius+moon.getRadius()+10,radius+moon.getRadius()+40))
+      -- the radius should be a percentage of the planet radius
+      moon.setRadius(0.25*radius)
+      table.insert(moons, moon)
+    end
   end
 
   -- primary star

models/system.lua

@@ -3,7 +3,7 @@ require "models.planet"
 System = {}
 
 -- x, y are coordinates in a galaxy
-System.new = function(x, y, num_planets)
+System.new = function()
 
   -- variables
   local self = {}

views/system_view.lua

@@ -32,12 +32,20 @@ ViewSystem.new = function()
         local planet = value
         love.graphics.setColor(planet.getRed(), planet.getGreen(), planet.getBlue(), 255)
         love.graphics.circle("fill", planet.getX(), planet.getY(), planet.getRadius(), 100)
+
+        -- draw moons
+        for k,v in pairs(planet.getMoons()) do
+          local moon = v
+          love.graphics.setColor(moon.getRed(), moon.getGreen(), moon.getBlue(), 255)
+          love.graphics.circle("fill", moon.getX(), moon.getY(), moon.getRadius(), 100)
+        end
       end
     end
   end
 
   self.update = function(dt)
     if is_active then
+      -- update planets
       for key, value in pairs(system.getPlanets()) do
         local planet = value
         planet.setX((love.graphics.getWidth()/2) + math.sin(planet.getAngle()) * planet.getDistance())
@@ -47,6 +55,18 @@ ViewSystem.new = function()
         else
           planet.setAngle(0)
         end
+
+        -- update moons
+        for k,v in pairs(planet.getMoons()) do
+          local moon = v
+          moon.setX(planet.getX() + math.sin(moon.getAngle()) * moon.getDistance())
+          moon.setY(planet.getY() + math.cos(moon.getAngle()) * moon.getDistance())
+          if moon.getAngle() < 360 then
+            moon.setAngle(moon.getAngle()+moon.getSpeed())
+          else
+            moon.setAngle(0)
+          end
+        end
       end
     end
   end