diff --git a/druid/base/button.lua b/druid/base/button.lua index 738e268..5ca069b 100644 --- a/druid/base/button.lua +++ b/druid/base/button.lua @@ -1,5 +1,5 @@ local data = require("druid.data") -local ui_animate = require "druid.help_modules.druid_animate" +local ui_animate = require "druid.helper.druid_animate" local M = {} diff --git a/druid/base/text.lua b/druid/base/text.lua index fbc6eb1..9d800f6 100644 --- a/druid/base/text.lua +++ b/druid/base/text.lua @@ -1,6 +1,6 @@ local M = {} -local ui_animate = require "druid.help_modules.druid_animate" +local ui_animate = require "druid.helper.druid_animate" --- Bounce text field function M.bounce(instance, callback) diff --git a/druid/base/timer.lua b/druid/base/timer.lua index 3f7329d..7802a49 100644 --- a/druid/base/timer.lua +++ b/druid/base/timer.lua @@ -1,6 +1,6 @@ local M = {} -local formats = require "druid.help_modules.formats" +local formats = require "druid.helper.formats" --- Set text to text field -- @param set_to - set value in seconds diff --git a/druid/components/button.lua b/druid/components/button.lua index d57f388..9160de6 100644 --- a/druid/components/button.lua +++ b/druid/components/button.lua @@ -1,6 +1,6 @@ local M = {} -local ui_animate = require "druid.help_modules.druid_animate" +local ui_animate = require "druid.helper.druid_animate" M.DEFAULT_SCALE_CHANGE = vmath.vector3(-0.05, - 0.1, 1) M.DEFAULT_POS_CHANGE = vmath.vector3(0, - 10, 0) diff --git a/druid/components/flying_particles.lua b/druid/components/flying_particles.lua index 0c0edcd..5a63cb3 100644 --- a/druid/components/flying_particles.lua +++ b/druid/components/flying_particles.lua @@ -1,6 +1,6 @@ local M = {} -local ui_animate = require "druid.help_modules.druid_animate" +local ui_animate = require "druid.helper.druid_animate" local function fly_to(instance, pos_from, speed, callback) local pos_to = instance.get_pos_func() diff --git a/druid/components/image.lua b/druid/components/image.lua index 97af383..cfdf6db 100644 --- a/druid/components/image.lua +++ b/druid/components/image.lua @@ -1,6 +1,6 @@ local M = {} -local ui_animate = require "druid.help_modules.druid_animate" +local ui_animate = require "druid.helper.druid_animate" --- Bounce image function M.bounce(instance) diff --git a/druid/components/scrolling_box.lua b/druid/components/scrolling_box.lua index 8618335..4982194 100644 --- a/druid/components/scrolling_box.lua +++ b/druid/components/scrolling_box.lua @@ -1,7 +1,7 @@ local M = {} -local druid_input = require "druid.help_modules.druid_input" -local ui_animate = require "druid.help_modules.druid_animate" +local druid_input = require "druid.helper.druid_input" +local ui_animate = require "druid.helper.druid_animate" M.START = hash("START") M.FINISH = hash("FINISH") diff --git a/druid/components/text_field.lua b/druid/components/text_field.lua index fbc6eb1..9d800f6 100644 --- a/druid/components/text_field.lua +++ b/druid/components/text_field.lua @@ -1,6 +1,6 @@ local M = {} -local ui_animate = require "druid.help_modules.druid_animate" +local ui_animate = require "druid.helper.druid_animate" --- Bounce text field function M.bounce(instance, callback) diff --git a/druid/components/timer.lua b/druid/components/timer.lua index 3f7329d..7802a49 100644 --- a/druid/components/timer.lua +++ b/druid/components/timer.lua @@ -1,6 +1,6 @@ local M = {} -local formats = require "druid.help_modules.formats" +local formats = require "druid.helper.formats" --- Set text to text field -- @param set_to - set value in seconds diff --git a/druid/druid.lua b/druid/druid.lua index 255039c..2f3a106 100644 --- a/druid/druid.lua +++ b/druid/druid.lua @@ -1,5 +1,5 @@ local data = require("druid.data") -local druid_input = require("druid.help_modules.druid_input") +local druid_input = require("druid.helper.druid_input") local M = {} diff --git a/druid/help_modules/druid_animate.lua b/druid/helper/druid_animate.lua similarity index 97% rename from druid/help_modules/druid_animate.lua rename to druid/helper/druid_animate.lua index 394c153..0e76f68 100644 --- a/druid/help_modules/druid_animate.lua +++ b/druid/helper/druid_animate.lua @@ -130,6 +130,10 @@ function M.scale_to(self, node, to, callback, time, delay, easing) ) end +function M.scale(self, node, to, time) + gui.animate(node, "scale", to, gui.EASING_OUTSINE, time) +end + function M.scale_x_from_to(self, node, from, to, callback, time, easing, delay, playback) easing = easing or gui.EASING_INSINE time = time or M.SCALE_ANIMATION_TIME diff --git a/druid/help_modules/druid_input.lua b/druid/helper/druid_input.lua similarity index 100% rename from druid/help_modules/druid_input.lua rename to druid/helper/druid_input.lua diff --git a/druid/help_modules/formats.lua b/druid/helper/formats.lua similarity index 100% rename from druid/help_modules/formats.lua rename to druid/helper/formats.lua diff --git a/druid/help_modules/ui_helper.lua b/druid/helper/ui_helper.lua similarity index 100% rename from druid/help_modules/ui_helper.lua rename to druid/helper/ui_helper.lua