Merge branch 'release/0104'

Readme.md

@@ -2,4 +2,4 @@
 
 LoGiVi the "lovely Git-Viewer" is a git-repository visualisation tool inspired by [Gource](https://code.google.com/p/gource/). It was written from scratch using [Lua](http://www.lua.org/) and the [LÖVE](https://love2d.org/) framework.
 
-Check the [wiki](https://bitbucket.org/rmcode/logivi/wiki/Home) for instructions and further information.
+Check the [wiki](https://github.com/rm-code/logivi/wiki) for instructions and further information.

conf.lua

@@ -24,7 +24,7 @@ local GAME_TITLE = "LoGiVi";
 
 local LOVE_VERSION = "0.9.2";
 
-local GAME_VERSION = "0052";
+local GAME_VERSION = "0104";
 
 -- ------------------------------------------------
 -- Local variables
@@ -47,8 +47,8 @@ function love.conf(t)
 
     t.window.title = GAME_TITLE;
     t.window.icon = nil;
-    t.window.width = 0;
-    t.window.height = 0;
+    t.window.width = 800;
+    t.window.height = 600;
     t.window.borderless = false;
     t.window.resizable = true;
     t.window.minwidth = 800;
@@ -95,3 +95,12 @@ function getVersion()
         return GAME_VERSION;
     end
 end
+
+---
+-- Returns the title.
+--
+function getTitle()
+    if GAME_TITLE then
+        return GAME_TITLE;
+    end
+end

lib/camera/Camera.lua

@@ -0,0 +1,117 @@
+--[[
+Copyright (c) 2010-2013 Matthias Richter
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+Except as contained in this notice, the name(s) of the above copyright holders
+shall not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+]]--
+
+local _PATH = (...):match('^(.*[%./])[^%.%/]+$') or ''
+local cos, sin = math.cos, math.sin
+
+local camera = {}
+camera.__index = camera
+
+local function new(x,y, zoom, rot)
+    x,y  = x or love.graphics.getWidth()/2, y or love.graphics.getHeight()/2
+    zoom = zoom or 1
+    rot  = rot or 0
+    return setmetatable({x = x, y = y, scale = zoom, rot = rot}, camera)
+end
+
+function camera:lookAt(x,y)
+    self.x, self.y = x,y
+    return self
+end
+
+function camera:move(x,y)
+    self.x, self.y = self.x + x, self.y + y
+    return self
+end
+
+function camera:pos()
+    return self.x, self.y
+end
+
+function camera:rotate(phi)
+    self.rot = self.rot + phi
+    return self
+end
+
+function camera:rotateTo(phi)
+    self.rot = phi
+    return self
+end
+
+function camera:zoom(mul)
+    self.scale = self.scale * mul
+    return self
+end
+
+function camera:zoomTo(zoom)
+    self.scale = zoom
+    return self
+end
+
+function camera:attach()
+    local cx,cy = love.graphics.getWidth()/(2*self.scale), love.graphics.getHeight()/(2*self.scale)
+    love.graphics.push()
+    love.graphics.scale(self.scale)
+    love.graphics.translate(cx, cy)
+    love.graphics.rotate(self.rot)
+    love.graphics.translate(-self.x, -self.y)
+end
+
+function camera:detach()
+    love.graphics.pop()
+end
+
+function camera:draw(func)
+    self:attach()
+    func()
+    self:detach()
+end
+
+function camera:cameraCoords(x,y)
+    -- x,y = ((x,y) - (self.x, self.y)):rotated(self.rot) * self.scale + center
+    local w,h = love.graphics.getWidth(), love.graphics.getHeight()
+    local c,s = cos(self.rot), sin(self.rot)
+    x,y = x - self.x, y - self.y
+    x,y = c*x - s*y, s*x + c*y
+    return x*self.scale + w/2, y*self.scale + h/2
+end
+
+function camera:worldCoords(x,y)
+    -- x,y = (((x,y) - center) / self.scale):rotated(-self.rot) + (self.x,self.y)
+    local w,h = love.graphics.getWidth(), love.graphics.getHeight()
+    local c,s = cos(-self.rot), sin(-self.rot)
+    x,y = (x - w/2) / self.scale, (y - h/2) / self.scale
+    x,y = c*x - s*y, s*x + c*y
+    return x+self.x, y+self.y
+end
+
+function camera:mousepos()
+    return self:worldCoords(love.mouse.getPosition())
+end
+
+-- the module
+return setmetatable({new = new},
+    {__call = function(_, ...) return new(...) end})

lib/screenmanager/Readme.md

@@ -0,0 +1,73 @@
+#ScreenManager
+
+The ScreenManager library is a state manager at heart which allows some nifty things, like stacking multiple screens on top of each other.
+
+It also offers hooks for most of LÖVE's callback functions. Based on the type of callback the calls are rerouted to either only the active screen (love.keypressed, love.quit, ...) or to all screens (love.resize, love.visible, ...).
+
+## Example
+
+This is a simple example of how the ScreenManager should be used (note: You will have to change the paths in the example to fit your setup). 
+
+```
+#!lua
+-- main.lua
+
+local ScreenManager = require('lib/ScreenManager');
+
+function love.load()
+    local screens = {
+        main = require('src/screens/MainScreen');
+    };
+
+    ScreenManager.init(screens, 'main');
+end
+
+function love.draw()
+    ScreenManager.draw();
+end
+
+function love.update(dt)
+    ScreenManager.update(dt);
+end
+```
+Note how MainScreen inherits from Screen.lua. This isn't mandatory, but recommended since Screen.lua already has templates for most of the callback functions.
+
+```
+#!lua
+-- MainScreen.lua
+
+local Screen = require('lib/Screen');
+
+local MainScreen = {};
+
+function MainScreen.new()
+    local self = Screen.new();
+
+    local x, y, w, h = 20, 20, 40, 20;
+
+    function self:draw()
+        love.graphics.rectangle('fill', x, y, w, h);
+    end
+
+    function self:update(dt)
+        w = w + 2;
+        h = h + 1;
+    end
+
+    return self;
+end
+
+return MainScreen;
+```
+
+## License
+
+Copyright (c) 2014 - 2015 Robert Machmer                                          
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:                             
+
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.                                      
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.                        
+ 3. This notice may not be removed or altered from any source distribution.

lib/Screen.lua → lib/screenmanager/Screen.lua

@@ -1,6 +1,6 @@
 --===============================================================================--
 --                                                                               --
--- Copyright (c) 2014 Robert Machmer                                             --
+-- Copyright (c) 2014 - 2015 Robert Machmer                                      --
 --                                                                               --
 -- This software is provided 'as-is', without any express or implied             --
 -- warranty. In no event will the authors be held liable for any damages         --
@@ -61,6 +61,8 @@ function Screen.new()
 
     function self:mousefocus(focus) end
 
+    function self:quit(dquit) end
+
     function self:isActive()
         return active;
     end