Merge branch 'main' into release-0.32

doc/en/vca.md

@@ -27,6 +27,7 @@ Two kinds of curve definitions are currently available, each producing a value `
 - `@rotate` - rotates an object/bone
 - `@scale` - scales an object/bone (multiplier)
 - `@zoom` - camera zoom (multiplier)
+- `@texture` - change of a dynamically assigned texture (see [skeleton:set_texture](scripting/ecs.md#skeleton))
 
 ## Metadata
 
@@ -73,6 +74,18 @@ Example for `curve bezier`:
 @key frame 138 value 53.00411 lx 127.067 ly 53.00411 rx 138.001 ry 53.00411
 ```
 
+For the `texture` directive, it is simpler. Example:
+
+```vcd
+@texture name $0 {
+    @key frame 0 value entities/tireman:face_0
+    @key frame 24 value entities/tireman:face_1
+}
+```
+
+> Here, `entities/tireman` is the name of the texture atlas containing `face_*` textures.
+> The texture does not necessarily have to be in an atlas.
+
 ## Expression curves
 
 The attribute describes a function `f(t) = x`, where t is time in seconds.

doc/ru/vca.md

@@ -27,6 +27,7 @@ VCA файл состоит из набора директив, порядок
 - `@rotate` - поворот объекта/кости
 - `@scale` - масштабирование объекта/кости (множитель)
 - `@zoom` - масштаб камеры (множитель)
+- `@texture` - смена динамически-назначаемой текстуры (см. [skeleton:set_texture](scripting/ecs.md#skeleton))
 
 ## Мета-информация
 
@@ -73,6 +74,18 @@ VCA файл состоит из набора директив, порядок
 @key frame 138 value 53.00411 lx 127.067 ly 53.00411 rx 138.001 ry 53.00411
 ```
 
+Для директивы texture всё проще. Пример:
+
+```vcd
+@texture name $0 {
+    @key frame 0 value entities/tireman:face_0
+    @key frame 24 value entities/tireman:face_1
+}
+```
+
+> entities/tireman здесь - имя текстурного атласа, в котором находятся face_\* текстуры.
+> Текстура не обязательно должна находиться в атласе.
+
 ## Кривые через выражения
 
 Через атрибут описывается функция `f(t) = x` где t - время в секундах.

res/modules/animation.lua

@@ -42,6 +42,7 @@ local this = {
     CH_ROTATE = 2,
     CH_SCALE = 3,
     CH_ZOOM = 4,
+    CH_TEXTURE = 5,
 
     INT_CONST = 1,
     INT_LINEAR = 2,

res/modules/internal/animation_codegen.lua

@@ -60,6 +60,11 @@ local env = {
     Y = {0, 1, 0},
     Z = {0, 0, 1},
     DST = mat4.idt(),
+    string_at = function(keys, frame)
+        local left, _ = key_neighbors(keys, frame)
+        left = keys[left]
+        return left.value
+    end,
     value_at = function(keys, frame, interp)
         local left, right = key_neighbors(keys, frame)
         if left == right then
@@ -147,6 +152,10 @@ local function codegen_track(raw_track, lineset, memoised, keysets, use_tsf)
                 code = code .. string.format(
                 "\n   local l%d = value_at_custom(keysets['%s'][%d], t * %s, %s)",
                 i, lineset.target_name, i, raw_track.fps, valueat)
+            elseif line.channel == animation.CH_TEXTURE then
+                code = code .. string.format(
+                    "\n   local l%d = string_at(keysets['%s'][%d], t * %s)",
+                    i, lineset.target_name, i, raw_track.fps)
             else
                 code = code .. string.format(
                     "\n   local l%d = value_at(keysets['%s'][%d], t * %s, %s)",
@@ -164,7 +173,9 @@ local function codegen_track(raw_track, lineset, memoised, keysets, use_tsf)
             scale[line.axis] = i
             has_tsf = true
         elseif line.channel == animation.CH_ZOOM then
-            code = code .. "\n  zoom = l" .. i
+            code = code .. "\n   zoom = l" .. i
+        elseif line.channel == animation.CH_TEXTURE then
+            code = code .. string.format("\n   target:set_texture(%s, %s)", lineset.target_name:escape(), "l"..i)
         end
     end
 
@@ -206,14 +217,17 @@ local function codegen_rig_target(raw_track, context)
     local code = "\n if target.set_matrix and target.index then\n"
     code = code .. "  local dst = DST\n"
     for bone, lineset in pairs(raw_track.linesets) do
-        if lineset.target_type ~= "bone" then
+        if lineset.target_type ~= "bone" and lineset.target_type ~= "texture" then
             goto continue
         end
         local lineset_code = codegen_track(
             raw_track, lineset, context.memoised, context.keysets, true)
 
-        code = code .. "\n  do" .. lineset_code .. "\n  end\n" ..
+        code = code .. "\n  do" .. lineset_code .. "\n  end\n"
-            "  target:set_matrix(target:index(" .. string.escape(bone) .. "), dst)\n"
+        if lineset.target_type == "bone" then
+            code = code ..
+                "  target:set_matrix(target:index(" .. string.escape(bone) .. "), dst)\n"
+        end
         ::continue::
     end
     return code .. " end"

res/modules/internal/formats/vca.lua

@@ -7,6 +7,7 @@ local action_to_channel = {
     rotate = animation.CH_ROTATE,
     scale = animation.CH_SCALE,
     zoom = animation.CH_ZOOM,
+    texture = animation.CH_TEXTURE,
 }
 
 local curve_to_interp = {
@@ -50,6 +51,17 @@ local function parse_curve(line, node)
     end
 end
 
+local function parse_simple_frames(line, node)
+    line.keys = {}
+    for j, key_node in ipairs(node) do
+        local keyframe = {
+            frame = tonumber(key_node.frame),
+            value = key_node.value,
+        }
+        table.insert(line.keys, keyframe)
+    end
+end
+
 local function parse_track(root)
     local raw_track = {
         duration = math.huge,
@@ -74,8 +86,10 @@ local function parse_track(root)
         local target_type = nil
         if node.bone then
             target_type = "bone"
+        elseif tag == "texture" then
+            target_type = "texture"
         end
-        local target_name = node.bone or ""
+        local target_name = node.bone or node.name or ""
         local lineset = linesets[target_name]
         if not lineset then
             lineset = {
@@ -86,16 +100,20 @@ local function parse_track(root)
             linesets[target_name] = lineset
         end
 
+        local channel = action_to_channel[tag]
+        if not channel then
+            error("unknown directive " .. tag:escape())
+        end
         local line = {
             axis = node.by and ("xyz"):find(node.by) or "",
-            channel = action_to_channel[tag]
+            channel = channel
         }
         if node.func then
             line.expression = node.func
         elseif node.curve then
             parse_curve(line, node)
         else
-            error("not implemented")
+            parse_simple_frames(line, node)
         end
 
         table.insert(lineset.lines, line)

src/logic/PlayerController.cpp

@@ -104,6 +104,8 @@ void CameraControl::updateMouse(PlayerInput& input, int windowHeight) {
 glm::vec3 CameraControl::updateCameraShaking(
     const Hitbox& hitbox, float delta
 ) {
+    delta = glm::min(delta, 0.1f);
+
     glm::vec3 offset {};
     const float k = CAM_SHAKE_DELTA_K;
     const float ov = CAM_SHAKE_OFFSET_Y;