Merge branch 'master' into feature/input_event_system

samples/bin/library/prefabs/coin_prefab.json

@@ -4,7 +4,7 @@
         "spine_player" : {
             "spine" : "../spines/coin_spine.json"
         },
-        "spine_player_commands" : {
+        "spine_player.commands" : {
             "commands" : [{
                 "type" : "set_anim_cmd",
                 "desc" : {

samples/bin/library/prefabs/dragon_prefab.json

@@ -4,7 +4,7 @@
         "spine_player" : {
             "spine" : "../spines/dragon_spine.json"
         },
-        "spine_player_commands" : {
+        "spine_player.commands" : {
             "commands" : [{
                 "type" : "set_anim_cmd",
                 "desc" : {

samples/bin/library/prefabs/raptor_prefab.json

@@ -4,7 +4,7 @@
         "spine_player" : {
             "spine" : "../spines/raptor_spine.json"
         },
-        "spine_player_commands" : {
+        "spine_player.commands" : {
             "commands" : [{
                 "type" : "add_anim_cmd",
                 "desc" : {

samples/bin/library/prefabs/spine_prefab.json

@@ -9,7 +9,7 @@
                 "screen" : "../materials/spine_material_screen.json"
             }
         },
-        "spine_player_events" : {},
-        "spine_player_commands" : {}
+        "spine_player.events" : {},
+        "spine_player.commands" : {}
     }
 }

samples/bin/library/scripts/emmy/components/renderer.lua

@@ -12,8 +12,8 @@ local renderer = {
     ---@type v3f
     translation = v3f.zero(),
 
-    ---@type q4f
-    rotation = q4f.identity(),
+    ---@type v3f
+    rotation = v3f.zero(),
 
     ---@type v3f
     scale = v3f.unit()

samples/bin/library/scripts/emmy/high/editor.lua

@@ -0,0 +1,15 @@
+---@class editor
+local editor = {
+    ---@type gobject
+    selection = nil
+}
+
+---@param self editor
+---@param go gobject
+function editor.select(self, go) end
+
+---@param self editor
+function editor.clear_selection(self) end
+
+---@type editor
+_G.the_editor = _G.the_editor or editor

samples/bin/library/scripts/emmy/math/aabb.lua

@@ -75,9 +75,5 @@ function aabb.normalized_to_point(r, p) end
 ---@return v3f
 function aabb.point_to_normalized(r, p) end
 
----@param r aabb
----@return boolean
-function aabb.contains_nan(r) end
-
 ---@type aabb
 _G.aabb = _G.aabb or aabb

samples/bin/library/scripts/emmy/math/m2f.lua

@@ -16,8 +16,6 @@ function m2f.zero() end
 function m2f.identity() end
 
 ---@overload fun(x: number, y: number): m2f
----@overload fun(xy: v4f): m2f
----@overload fun(xy: v3f): m2f
 ---@overload fun(xy: v2f): m2f
 ---@return m2f
 function m2f.make_scale(...) end
@@ -39,9 +37,5 @@ function m2f.inversed(m) end
 ---@return m2f
 function m2f.transposed(m) end
 
----@param m m2f
----@return boolean
-function m2f.contains_nan(m) end
-
 ---@type m2f
 _G.m2f = _G.m2f or m2f

samples/bin/library/scripts/emmy/math/m3f.lua

@@ -23,10 +23,9 @@ function m3f.identity() end
 function m3f.make_scale(...) end
 
 ---@overload fun(a: number, x: number, y: number, z: number): m3f
----@overload fun(a: number, xyz: v4f): m3f
 ---@overload fun(a: number, xyz: v3f): m3f
----@overload fun(a: number, xy: v2f, z: number): m3f
----@overload fun(q: q4f): m3f
+---@overload fun(r: number, p: number, y: number): m3f
+---@overload fun(rpy: v3f): m3f
 ---@return m3f
 function m3f.make_rotation(...) end
 
@@ -43,9 +42,5 @@ function m3f.inversed(m) end
 ---@return m3f
 function m3f.transposed(m) end
 
----@param m m3f
----@return boolean
-function m3f.contains_nan(m) end
-
 ---@type m3f
 _G.m3f = _G.m3f or m3f

samples/bin/library/scripts/emmy/math/m4f.lua

@@ -16,24 +16,21 @@ function m4f.zero() end
 function m4f.identity() end
 
 ---@overload fun(x: number, y: number, z: number): m4f
----@overload fun(xyz: v4f): m4f
 ---@overload fun(xyz: v3f): m4f
 ---@overload fun(xy: v2f, z: number): m4f
 ---@return m4f
 function m4f.make_scale(...) end
 
 ---@overload fun(x: number, y: number, z: number): m4f
----@overload fun(xyz: v4f): m4f
 ---@overload fun(xyz: v3f): m4f
 ---@overload fun(xy: v2f, z: number): m4f
 ---@return m4f
 function m4f.make_translation(...) end
 
 ---@overload fun(a: number, x: number, y: number, z: number): m4f
----@overload fun(a: number, xyz: v4f): m4f
 ---@overload fun(a: number, xyz: v3f): m4f
----@overload fun(a: number, xy: v2f, z: number): m4f
----@overload fun(q: q4f): m4f
+---@overload fun(r: number, p: number, y: number): m3f
+---@overload fun(rpy: v3f): m3f
 ---@return m4f
 function m4f.make_rotation(...) end
 
@@ -90,9 +87,5 @@ function m4f.inversed(m) end
 ---@return m4f
 function m4f.transposed(m) end
 
----@param m m4f
----@return boolean
-function m4f.contains_nan(m) end
-
 ---@type m4f
 _G.m4f = _G.m4f or m4f

samples/bin/library/scripts/emmy/math/q4f.lua

@@ -1,86 +0,0 @@
----@class q4f
-local q4f = {
-    ---@type number
-    x = 0,
-
-    ---@type number
-    y = 0,
-
-    ---@type number
-    z = 0,
-
-    ---@type number
-    w = 0
-}
-
----@overload fun(): q4f
----@overload fun(q: q4f): q4f
----@overload fun(x: number, y: number, z: number, w: number): q4f
----@overload fun(v: v4f): q4f
----@return q4f
-function q4f.new(...) end
-
----@return q4f
-function q4f.zero() end
-
----@return q4f
-function q4f.identity() end
-
----@param angle number
----@param axis v3f
----@return q4f
-function q4f.make_from_axis_angle(angle, axis) end
-
----@param roll number
----@param pitch number
----@param yaw number
----@return q4f
-function q4f.make_from_euler_angles(roll, pitch, yaw) end
-
----@param l q4f
----@param r q4f
----@return boolean
-function q4f.approximately(l, r) end
-
----@param l q4f
----@param r q4f
----@return number
-function q4f.dot(l, r) end
-
----@param l q4f
----@param r q4f
----@return number
-function q4f.abs_dot(l, r) end
-
----@param q q4f
----@return number
-function q4f.length_squared(q) end
-
----@param q q4f
----@return number
-function q4f.length(q) end
-
----@param q q4f
----@return q4f
-function q4f.normalized(q) end
-
----@param l q4f
----@param r q4f
----@param v number
----@return q4f
-function q4f.lerp(l, r, v) end
-
----@param q q4f
----@return q4f
-function q4f.inversed(q) end
-
----@param q q4f
----@return q4f
-function q4f.conjugated(q) end
-
----@param q q4f
----@return q4f
-function q4f.contains_nan(q) end
-
----@type q4f
-_G.q4f = _G.q4f or q4f

samples/bin/library/scripts/emmy/math/rect.lua

@@ -75,9 +75,5 @@ function rect.normalized_to_point(r, p) end
 ---@return v2f
 function rect.point_to_normalized(r, p) end
 
----@param r rect
----@return boolean
-function rect.contains_nan(r) end
-
 ---@type rect
 _G.rect = _G.rect or rect

samples/bin/library/scripts/emmy/math/t2f.lua

@@ -37,9 +37,5 @@ function t2f.make_scale(s) end
 ---@return boolean
 function t2f.approximately(l, r) end
 
----@param t t2f
----@return boolean
-function t2f.contains_nan(t) end
-
 ---@type t2f
 _G.t2f = _G.t2f or t2f

samples/bin/library/scripts/emmy/math/t3f.lua

@@ -3,8 +3,8 @@ local t3f = {
     ---@type v3f
     translation = v3f.zero(),
 
-    ---@type q4f
-    rotation = q4f.identity(),
+    ---@type v3f
+    rotation = v3f.zero(),
 
     ---@type v3f
     scale = v3f.unit()
@@ -24,7 +24,7 @@ function t3f.identity() end
 ---@return t3f
 function t3f.make_translation(t) end
 
----@param r q4f
+---@param r v3f
 ---@return t3f
 function t3f.make_rotation(r) end
 
@@ -37,9 +37,5 @@ function t3f.make_scale(s) end
 ---@return boolean
 function t3f.approximately(l, r) end
 
----@param t t3f
----@return boolean
-function t3f.contains_nan(t) end
-
 ---@type t3f
 _G.t3f = _G.t3f or t3f

samples/bin/library/scripts/emmy/math/v2f.lua

@@ -105,9 +105,5 @@ function v2f.lerp(l,r,v) end
 ---@return v2f
 function v2f.inverse_lerp(l,r,v) end
 
----@param v v2f
----@return boolean
-function v2f.contains_nan(v) end
-
 ---@type v2f
 _G.v2f = _G.v2f or v2f

samples/bin/library/scripts/emmy/math/v3f.lua

@@ -116,9 +116,5 @@ function v3f.lerp(l,r,v) end
 ---@return v3f
 function v3f.inverse_lerp(l,r,v) end
 
----@param v v3f
----@return boolean
-function v3f.contains_nan(v) end
-
 ---@type v3f
 _G.v3f = _G.v3f or v3f

samples/bin/library/scripts/emmy/math/v4f.lua

@@ -117,9 +117,5 @@ function v4f.lerp(l,r,v) end
 ---@return v4f
 function v4f.inverse_lerp(l,r,v) end
 
----@param v v4f
----@return boolean
-function v4f.contains_nan(v) end
-
 ---@type v4f
 _G.v4f = _G.v4f or v4f

samples/bin/library/scripts/emmy/utils/color.lua

@@ -78,9 +78,5 @@ function color.maximized(c,cmax) end
 ---@return color
 function color.clamped(c,cmin,cmax) end
 
----@param c color
----@return boolean
-function color.contains_nan(c) end
-
 ---@type color
 _G.color = _G.color or color

samples/bin/library/scripts/emmy/utils/color32.lua

@@ -78,9 +78,5 @@ function color32.maximized(c,cmax) end
 ---@return color32
 function color32.clamped(c,cmin,cmax) end
 
----@param c color32
----@return boolean
-function color32.contains_nan(c) end
-
 ---@type color32
 _G.color32 = _G.color32 or color32

samples/bin/library/scripts/sample_07/gnome.lua

@@ -21,7 +21,7 @@ end
 ---@param go gobject
 local function update_gnome_rotation(meta, go)
     local time = the_engine.time
-    go.renderer.rotation = q4f.make_from_euler_angles(0, time, 0)
+    go.renderer.rotation = v3f.new(0, time, 0)
 end
 
 -- -----------------------------------------------------------------------------