summaryrefslogtreecommitdiffhomepage
path: root/not
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-09-11 06:17:29 +0200
committerAki <nthirtyone@gmail.com>2017-09-11 06:17:29 +0200
commit9ddacd0f6481661cdaeab8abf2000b45a296faee (patch)
treea3e072e2861d911c59c96267b2a0f0272efc6c79 /not
parent9e2ec1aa5abb84d3e46c34ed407934ac54fce331 (diff)
downloadroflnauts-9ddacd0f6481661cdaeab8abf2000b45a296faee.zip
roflnauts-9ddacd0f6481661cdaeab8abf2000b45a296faee.tar.gz
roflnauts-9ddacd0f6481661cdaeab8abf2000b45a296faee.tar.bz2
Camera methods have some funky names. New following implementation
Diffstat (limited to 'not')
-rw-r--r--not/Camera.lua80
-rw-r--r--not/World.lua8
2 files changed, 46 insertions, 42 deletions
diff --git a/not/Camera.lua b/not/Camera.lua
index 8e74a76..76f36ed 100644
--- a/not/Camera.lua
+++ b/not/Camera.lua
@@ -5,19 +5,14 @@ Camera.SHAKE_LENGTH = 0.6
Camera.SHAKE_INTERVAL = 0.03
-- TODO: Camera would really make use of vec2s (other classes would use them too).
-function Camera:new (world)
+function Camera:new (x, y, world)
self.world = world
+ self:setPosition(x, y)
+ self:resetSum()
+ self:initShake()
+end
- self.x = 0
- self.y = 0
- self.dest_y = 0
- self.dest_x = 0
- self.origin_x = 0
- self.origin_y = 0
-
- self:setPosition(self:follow())
- self:setDestination(self:follow())
-
+function Camera:initShake ()
self.shakeTime = 0
self.shakeInterval = 0
self.shakeShift = {
@@ -30,7 +25,7 @@ function Camera:translate ()
local x, y = self:getPositionScaled()
local dx, dy = self:getShakeScaled()
love.graphics.push()
- love.graphics.translate(-x - dx, -y - dy)
+ love.graphics.translate(160*getScale() - x - dx, 100*getScale() - y - dy)
end
function Camera:pop ()
@@ -52,16 +47,6 @@ function Camera:getPositionScaled ()
return self.x * scale, self.y * scale
end
-function Camera:setDestination (x, y)
- local x = x or 0
- local y = y or 0
- self.dest_x, self.dest_y = x, y
-end
-
-function Camera:getDestination ()
- return self.dest_x, self.dest_y
-end
-
function Camera:translatePosition (x, y)
local x = x or 0
local y = y or 0
@@ -103,7 +88,7 @@ function Camera:shake (dt)
self.shakeTime = self.shakeTime - dt
if self.shakeInterval < 0 then
self.shakeShift.theta = self.shakeShift.theta - 1.3 + love.math.random() * 0.6
- self.shakeShift.radius = 70 * self.shakeTime
+ self.shakeShift.radius = 50 * self.shakeTime
self.shakeInterval = Camera.SHAKE_INTERVAL
else
self.shakeShift.radius = self.shakeShift.radius * 0.66
@@ -127,28 +112,41 @@ function Camera:getShakeScaled ()
return x * scale, y * scale
end
-function Camera:follow ()
+function Camera:resetSum ()
+ self.sumX = 0
+ self.sumY = 0
+ self.sumI = 0
+end
+
+function Camera:sum (x, y)
local map = self.world.map
- local sum_x,sum_y,i = map.center.x, map.center.y, 1
- for k,naut in pairs(self.world:getNautsAll()) do
- local naut_x,naut_y = naut:getPosition()
- if math.abs(naut_x - map.center.x) < map.width/2 and
- math.abs(naut_y - map.center.y) < map.height/2 then
- i = i + 1
- sum_x = naut_x + sum_x
- sum_y = naut_y + sum_y
- end
+ if math.abs(x - map.center.x) < map.width/2 and
+ math.abs(y - map.center.y) < map.height/2 then
+ self.sumX = self.sumX + x
+ self.sumY = self.sumY + y
+ self.sumI = self.sumI + 1
+ end
+end
+
+function Camera:getSumPostion ()
+ if self.sumI > 0 then
+ return self.sumX / self.sumI, self.sumY / self.sumI
+ end
+ return 0, 0
+end
+
+function Camera:step (dt)
+ local x, y = self:getSumPostion()
+ local dx, dy = (x - self.x), (y - self.y)
+ if math.abs(dx) > 0.4 or math.abs(dy) > 0.4 then
+ x = self.x + (x - self.x) * dt * 6
+ y = self.y + (y - self.y) * dt * 6
end
- local x = sum_x / i - love.graphics.getWidth()/getScale()/2
- local y = sum_y / i - love.graphics.getHeight()/getScale()/2 + 4*getScale() -- hotfix
- return x,y
+ self:setPosition(x, y)
end
function Camera:update (dt)
+ self:step(dt)
self:shake(dt)
- self:setDestination(self:follow())
- local dx, dy = self:getDestination()
- dx = (dx - self.x) * 6 * dt
- dy = (dy - self.y) * 6 * dt
- self:setPosition(self.x + dx, self.y + dy)
+ self:resetSum()
end
diff --git a/not/World.lua b/not/World.lua
index 6aee966..aeed245 100644
--- a/not/World.lua
+++ b/not/World.lua
@@ -37,7 +37,7 @@ function World:new (map, nauts)
self:initClouds()
self:spawnNauts(nauts)
- self.camera = Camera(self)
+ self.camera = Camera(self.map.center.x, self.map.center.y, self)
musicPlayer:play(self.map.theme)
end
@@ -203,6 +203,7 @@ end
function World:update (dt)
self.world:update(dt)
self.camera:update(dt)
+ self.camera:sum(self.map.center.x, self.map.center.y)
if self.cloudGenerator then
self.cloudGenerator:update(dt)
@@ -214,6 +215,11 @@ function World:update (dt)
end
end
+ -- TODO: Weird Camera following Heroes.
+ for _,hero in pairs(self:getNautsAll()) do
+ self.camera:sum(hero:getPosition())
+ end
+
-- Some additional debug info.
local stats = love.graphics.getStats()
dbg_msg = string.format("%sMap: %s\nClouds: %d\nLoaded: %d\nMB: %.2f", dbg_msg, self.map.filename, self:getCloudsCount(), stats.images, stats.texturememory / 1024 / 1024)