Skip to content
Snippets Groups Projects
Commit 88a2e900 authored by DarkGod's avatar DarkGod
Browse files

gestures V2 !

parent 9259caf2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/engines/default/engine/colors.lua
+ 2
− 2
View file @ 88a2e900
......@@ -35,7 +35,7 @@ function colors.hex1(hex)
end
function colors.hex1unpack(hex)
return tonumber("0x"..hex:sub(1, 2)), tonumber("0x"..hex:sub(3, 4)), tonumber("0x"..hex:sub(5, 6))
return tonumber("0x"..hex:sub(1, 2)) / 255, tonumber("0x"..hex:sub(3, 4)) / 255, tonumber("0x"..hex:sub(5, 6)) / 255
end
function colors.hex1alpha(hex)
......@@ -44,7 +44,7 @@ function colors.hex1alpha(hex)
end
function colors.hex1alphaunpack(hex)
return tonumber("0x"..hex:sub(1, 2)), tonumber("0x"..hex:sub(3, 4)), tonumber("0x"..hex:sub(5, 6)), tonumber("0x"..hex:sub(7, 8))
return tonumber("0x"..hex:sub(1, 2)) / 255, tonumber("0x"..hex:sub(3, 4)) / 255, tonumber("0x"..hex:sub(5, 6)) / 255, tonumber("0x"..hex:sub(7, 8)) / 255
end
defineColor('BLACK', 0, 0, 0)
......
game/engines/default/engine/dialogs/KeyBinder.lua
+ 15
− 17
View file @ 88a2e900
......@@ -133,7 +133,7 @@ function _M:use(item)
local title = "Make gesture (using right mouse button) or type it (or escape) for: "..tostring(t.name)
local font = self.font
local w, h = font:size(title)
local d = GetText.new(title, "Gesture", 0, 5,
local d = GetText.new(title, "Gesture", 0, 10,
function(gesture)
if item.g and item.g ~= "--" then
self.gesture:removeGesture(item.g)
......@@ -162,24 +162,22 @@ function _M:use(item)
end
end
d.mouse:registerZone(0, 0, game.w, game.h, function(button, mx, my, xrel, yrel, bx, by, event)
if button == "right" then
if event == "motion" then
self.gesture:changeMouseButton(true)
self.gesture:mouseMove(mx, my)
local text = table.concat(d.c_box.tmp)
if #text < 5 and self.gesture.lastgesture~="" and self.gesture.lastgesture:byte(1)~=text:byte(d.c_box.cursor-1) and self.gesture.lastgesture:byte(1) ~= text:byte(d.c_box.cursor) then
table.insert(d.c_box.tmp, d.c_box.cursor, self.gesture.lastgesture)
d.c_box.cursor = d.c_box.cursor + 1
d.c_box:updateText()
end
elseif event == "button" then
self.gesture:changeMouseButton(false)
self.gesture:reset()
end
if button == "right" then
if event == "motion" then
self.gesture:changeMouseButton(true)
self.gesture:mouseMove(mx, my)
if self.gesture.gesture then d.c_box:setText(self.gesture.gesture) end
elseif event == "button" then
self.gesture:changeMouseButton(false)
self.gesture:reset()
end
end
d:mouseEvent(button, mx, my, xrel, yrel, bx - d.display_x, by - d.display_y, event)
end)
d:mouseEvent(button, mx, my, xrel, yrel, bx - d.display_x, by - d.display_y, event)
end)
d.innerDisplay = function(_, x, y, nb_keyframes, tx, ty)
self.gesture:display(-tx, -ty, nb_keyframes)
end
game:registerDialog(d)
end
......
game/engines/default/engine/ui/Gestures.lua
+ 107
− 57
View file @ 88a2e900
......@@ -28,20 +28,19 @@ function _M:init(text, key_source, force_all)
self.gesture = ""
self.gestures = {}
self.font = core.display.newFont("/data/font/DroidSans.ttf", 12)
self.votex = nil
-- self.votex = core.display.loadImage("/data/gfx/te4-icon.png"):glTexture()
local gesttext = self.text.."WWWWW"
self.fontmax_w, self.font_h = self.font:size(gesttext)
self.surface = core.display.newSurface(self.fontmax_w, self.font_h)
self.surface:drawColorStringBlended(self.font, self.text, 0, 0, 255, 255, 255, true)
self.texture, self.texture_w, self.texture_h = self.surface:glTexture()
self.timeout = 1.7
self.timeout = 2
self.lastupdate = os.time()
self.gesturing = false
self.mousebuttondown = false
self.distance = 0
self.lastgesture = ""
self.lastgesturename = ""
self.min_distance = core.display.size() * .0208333333
self:loadGestures(key_source, force_all)
end
......@@ -74,46 +73,88 @@ function _M:loadGestures(key_source, force_all)
end
end
function _M:initGesturing()
if self.gesturing then return end
self.vo = core.display.newVO("quads")
self.gesturing = true
self.gesture = ""
self.lastupdate = os.time()
self.distance = 0
self.gx, self.gy = nil, nil
end
function _M:addGesturing(d, mx, my)
if self.lastgesture == d then return end
self.gesture = self.gesture..d
self.lastgesture = d
self.lastupdate = os.time()
self.distance = 0
self.omx = mx
self.omy = my
local x, y = self.gx or mx, self.gy or my
local start, stop = 3, 1
local a = 0.6
if self.shader then start, stop = 8, 3 a = 1 end
if d == "L" then
local r, g, b = colors.hex1unpack("ed1515")
self.vo:addPoint(x, y - start, 0, 0, r, g, b, a)
self.vo:addPoint(x, y + start, 1, 0, r, g, b, a)
self.vo:addPoint(x - 200, y + stop, 1, 0, r, g, b, a)
self.vo:addPoint(x - 200, y - stop, 0, 1, r, g, b, a)
self.gx, self.gy = x - 200, y
elseif d == "R" then
local r, g, b = colors.hex1unpack("d6ed15")
self.vo:addPoint(x, y - start, 0, 0, r, g, b, a)
self.vo:addPoint(x, y + start, 1, 0, r, g, b, a)
self.vo:addPoint(x + 200, y + stop, 1, 0, r, g, b, a)
self.vo:addPoint(x + 200, y - stop, 0, 1, r, g, b, a)
self.gx, self.gy = x + 200, y
elseif d == "U" then
local r, g, b = colors.hex1unpack("15ed2f")
self.vo:addPoint(x - start, y, 0, 0, r, g, b, a)
self.vo:addPoint(x + start, y, 1, 0, r, g, b, a)
self.vo:addPoint(x + stop, y - 200, 1, 0, r, g, b, a)
self.vo:addPoint(x - stop, y - 200, 0, 1, r, g, b, a)
self.gx, self.gy = x, y - 200
elseif d == "D" then
local r, g, b = colors.hex1unpack("1576ed")
self.vo:addPoint(x - start, y, 0, 0, r, g, b, a)
self.vo:addPoint(x + start, y, 1, 0, r, g, b, a)
self.vo:addPoint(x + stop, y + 200, 1, 0, r, g, b, a)
self.vo:addPoint(x - stop, y + 200, 0, 1, r, g, b, a)
self.gx, self.gy = x, y + 200
end
end
function _M:mouseMove(mx, my)
if #self.gesture >= 5 then return end
if #self.gesture >= 10 then return end
if self.omx and self.omy then
self.distance = self.distance + (self.omy - my)^2 + (self.omx - mx)^2
if math.abs(self.omx - mx) > math.abs(self.omy - my) and self.distance > 100 then
if self.omx > mx then
if self.lastgesture~="L" then
self.gesture = self.gesture.."L"
self.lastgesture = "L"
end
else
if self.lastgesture~="R" then
self.gesture = self.gesture.."R"
self.lastgesture = "R"
self.distance = math.sqrt((self.omy - my)^2 + (self.omx - mx)^2)
if self.distance > self.min_distance then
if math.abs(self.omx - mx) > math.abs(self.omy - my) then
self:initGesturing()
if self.omx > mx then
self:addGesturing("L", mx, my)
else
self:addGesturing("R", mx, my)
end
end
self.gesturing = true
self.lastupdate = os.time()
self.distance = 0
end
if math.abs(self.omx - mx) < math.abs(self.omy - my) and self.distance > 100 then
if self.omy > my then
if self.lastgesture~="U" then
self.gesture = self.gesture.."U"
self.lastgesture = "U"
end
else
if self.lastgesture~="D" then
self.gesture = self.gesture.."D"
self.lastgesture = "D"
if math.abs(self.omx - mx) < math.abs(self.omy - my) then
self:initGesturing()
if self.omy > my then
self:addGesturing("U", mx, my)
else
self:addGesturing("D", mx, my)
end
end
self.gesturing = true
self.lastupdate = os.time()
self.distance = 0
end
else
self.omx = mx
self.omy = my
end
self.omx = mx
self.omy = my
end
function _M:isGesturing()
......@@ -135,6 +176,13 @@ function _M:useGesture()
end
function _M:reset()
if self.vo then
self.fading_vo = self.vo
self.fading = 1
if self.gestures[self.gesture] then self.fading_intensity = 1 else self.fading_intensity = 0.6 end
end
self.vo = nil
self.gesturing = false
self.omx = nil
self.omy = nil
......@@ -168,35 +216,37 @@ function _M:getLastGesture()
end
function _M:update()
local gesttxt = ""
if self.gesturing == true then
gesttxt = self.text
if os.difftime(os.time(), self.lastupdate) >= self.timeout then
self:reset()
end
end
end
gesttxt = gesttxt..self.gesture
function _M:display(display_x, display_y, nb_keyframes)
local intensity = 0.6
if self.gestures[self.gesture] then intensity = 1 end
self.surface:erase(0,0,0,1)
self.surface:drawColorStringBlended(self.font, gesttxt, 0, 0, 255, 255, 255, true)
self.surface:updateTexture(self.texture)
end
if self.shader then self.shader:use(true) end
function _M:display(display_x, display_y)
self.texture:toScreenFull(display_x, display_y, self.fontmax_w, self.font_h, self.texture_w, self.texture_h)
if self.vo then
if self.shader then
self.shader:uniIntensity(intensity)
self.shader:uniFade(1)
end
self.vo:toScreen(display_x, display_y, self.votex, 1, 1, 1, self.shader and 1 or 1)
end
if self.gestures[self.gesture] then
if self.gestures[self.gesture].name == self.lastgesturename and self.gesturenametexure then
self.gesturenametexure:toScreenFull(display_x + self.fontmax_w, display_y, self.gesturenamefont_w , self.font_h, self.gesturenametexure_w, self.gesturenametexure_h)
else
self.gesturenamefont_w, _ = self.font:size(self.gestures[self.gesture].name)
local s = core.display.newSurface(self.gesturenamefont_w, self.font_h)
s:drawColorStringBlended(self.font, self.gestures[self.gesture].name, 0, 0, 255, 255, 255, true)
self.gesturenametexure, self.gesturenametexure_w, self.gesturenametexure_h = s:glTexture()
self.gesturenametexure:toScreenFull(display_x, display_y, self.fontmax_w, self.font_h, self.texture_w, self.texture_h)
if self.fading_vo then
if self.shader then
self.shader:uniIntensity(self.fading_intensity)
self.shader:uniFade(self.fading)
end
self.fading_vo:toScreen(display_x - (1 - self.fading) * 20, display_y - (1 - self.fading) * 20, self.votex, 1, 1, 1, self.shader and 1 or self.fading)
self.fading = self.fading - nb_keyframes / 20
if self.fading <= 0 then
self.fading_vo = nil
end
self.lastgesturename = self.gestures[self.gesture].name
end
if self.shader then self.shader:use(false) end
end
game/modules/tome/class/Game.lua
+ 6
− 1
View file @ 88a2e900
......@@ -547,10 +547,13 @@ function _M:createFBOs()
blur = Shader.new("main_fbo/blur"),
timestop = Shader.new("main_fbo/timestop"),
line_grids = Shader.new("main_fbo/line_grids"),
gestures = Shader.new("main_fbo/gestures"),
}
self.posteffects_use = { self.fbo_shader.shad }
if not self.fbo_shader.shad then self.fbo = nil self.fbo_shader = nil end
self.fbo2 = core.display.newFBO(Map.viewport.width, Map.viewport.height)
if self.gestures and self.posteffects and self.posteffects.gestures and self.posteffects.gestures.shad then self.gestures.shader = self.posteffects.gestures.shad end
end
if self.player then self.player:updateMainShader() end
......@@ -1466,7 +1469,8 @@ function _M:displayMap(nb_keyframes)
-- Mouse gestures
self.gestures:update()
self.gestures:display(map.display_x, map.display_y + map.viewport.height - self.gestures.font_h - 5)
-- self.gestures:display(map.display_x, map.display_y + map.viewport.height - self.gestures.font_h - 5)
self.gestures:display(map.display_x, map.display_y, nb_keyframes)
-- Inform the player that map is in scroll mode
if core.key.modState("caps") then
......@@ -1588,6 +1592,7 @@ function _M:setupCommands()
-- Activate mouse gestures
self.gestures = Gestures.new("Gesture: ", self.key, true)
if self.posteffects and self.posteffects.gestures and self.posteffects.gestures.shad then self.gestures.shader = self.posteffects.gestures.shad end
-- Helper function to not allow some actions on the wilderness map
local not_wild = function(f, bypass) return function(...) if self.zone and (not self.zone.wilderness or (bypass and bypass())) then f(...) else self.logPlayer(self.player, "You cannot do that on the world map.") end end end
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment