Browse Source

Merge pull request #2 from NiroUwU/master

Added rotatable engine controls
tags/v0.0.6_dev
Madiwka 2 years ago
committed by GitHub
parent
commit
14e7941920
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 3 deletions
  1. +4
    -1
      data/controls.lua
  2. +1
    -1
      src/calc.lua
  3. +27
    -1
      src/class/Player.lua

+ 4
- 1
data/controls.lua View File

@@ -18,7 +18,10 @@ controls = {
up = "w",
down = "s",
left = "a",
right = "d"
right = "d",
engine = "space",
rotleft = "q",
rotright = "e"
},

-- Time Warp Controls:


+ 1
- 1
src/calc.lua View File

@@ -3,7 +3,7 @@ calc = {}

-- G-Constant
calc.G = 6.67e-11 -- TWEAKABLE FOR LATER DEPENDING ON SCALE!!!!!!!!!!!
calc.pi = 3.14
-- Development debugging/logging thing
function calc.debug(text)
if calc.isDebug then


+ 27
- 1
src/class/Player.lua View File

@@ -23,6 +23,9 @@ function Player:init(tempX, tempY)

-- Mass:
self.m = 10

-- Rotation:
self.angle = calc.pi/2
end


@@ -91,6 +94,21 @@ function Player:flightControls()
debug("Player control: right")
end


-- Main Engine controls:
if love.keyboard.isDown(controls.flight.thrust.engine) then
self.xSpeed = self.xSpeed + math.cos(self.angle) * speedChange
debug("Ship thrusters X: " .. math.cos(self.angle) .. " " .. math.sin(self.angle) .. " " .. self.angle)
self.ySpeed = self.ySpeed - math.sin(self.angle) * speedChange
end
if love.keyboard.isDown(controls.flight.thrust.rotleft) then
self.angle = self.angle + 1/love.timer.getFPS()
end
if love.keyboard.isDown(controls.flight.thrust.rotright) then
self.angle = self.angle - 1/love.timer.getFPS()
end


-- Reset:
if love.keyboard.isDown(controls.flight.reset) then
self:reset()
@@ -144,6 +162,12 @@ end

function Player:update(dt)
--debug(self.warpspeed)
if self.angle > calc.pi*2 then
self.angle = 0
elseif self.angle < 0 then
self.angle = calc.pi*2
end
self:gravity()
self:flightControls()
self:updatePosition()
@@ -163,10 +187,12 @@ function Player:draw()
-- Right Bottom
x+dist, y+dist
}

love.graphics.setColor(0.5, 0.5, 0.7)
love.graphics.polygon("fill", vertices)

love.graphics.setColor(1, 0, 0)
love.graphics.circle("fill", x, y, 5, 20)

-- Directional Circle (temporary until actual rotatable ship texture is made)
love.graphics.circle("fill", x+dist*math.cos(self.angle), y-dist*math.sin(self.angle), 3, 20)
end

Loading…
Cancel
Save