|
@@ -30,13 +30,40 @@
|
|
|
|
|
|
#include "animation.h"
|
|
#include "animation.h"
|
|
|
|
|
|
|
|
+#include "core/io/marshalls.h"
|
|
#include "core/math/geometry_3d.h"
|
|
#include "core/math/geometry_3d.h"
|
|
#include "scene/scene_string_names.h"
|
|
#include "scene/scene_string_names.h"
|
|
|
|
|
|
bool Animation::_set(const StringName &p_name, const Variant &p_value) {
|
|
bool Animation::_set(const StringName &p_name, const Variant &p_value) {
|
|
String name = p_name;
|
|
String name = p_name;
|
|
|
|
|
|
- if (name.begins_with("tracks/")) {
|
|
|
|
|
|
+ if (p_name == SNAME("_compression")) {
|
|
|
|
+ ERR_FAIL_COND_V(tracks.size() > 0, false); //can only set compression if no tracks exist
|
|
|
|
+ Dictionary comp = p_value;
|
|
|
|
+ ERR_FAIL_COND_V(!comp.has("fps"), false);
|
|
|
|
+ ERR_FAIL_COND_V(!comp.has("bounds"), false);
|
|
|
|
+ ERR_FAIL_COND_V(!comp.has("pages"), false);
|
|
|
|
+ ERR_FAIL_COND_V(!comp.has("format_version"), false);
|
|
|
|
+ uint32_t format_version = comp["format_version"];
|
|
|
|
+ ERR_FAIL_COND_V(format_version > Compression::FORMAT_VERSION, false); // version does not match this supported version
|
|
|
|
+ compression.fps = comp["fps"];
|
|
|
|
+ Array bounds = comp["bounds"];
|
|
|
|
+ compression.bounds.resize(bounds.size());
|
|
|
|
+ for (int i = 0; i < bounds.size(); i++) {
|
|
|
|
+ compression.bounds[i] = bounds[i];
|
|
|
|
+ }
|
|
|
|
+ Array pages = comp["pages"];
|
|
|
|
+ compression.pages.resize(pages.size());
|
|
|
|
+ for (int i = 0; i < pages.size(); i++) {
|
|
|
|
+ Dictionary page = pages[i];
|
|
|
|
+ ERR_FAIL_COND_V(!page.has("data"), false);
|
|
|
|
+ ERR_FAIL_COND_V(!page.has("time_offset"), false);
|
|
|
|
+ compression.pages[i].data = page["data"];
|
|
|
|
+ compression.pages[i].time_offset = page["time_offset"];
|
|
|
|
+ }
|
|
|
|
+ compression.enabled = true;
|
|
|
|
+ return true;
|
|
|
|
+ } else if (name.begins_with("tracks/")) {
|
|
int track = name.get_slicec('/', 1).to_int();
|
|
int track = name.get_slicec('/', 1).to_int();
|
|
String what = name.get_slicec('/', 2);
|
|
String what = name.get_slicec('/', 2);
|
|
|
|
|
|
@@ -72,6 +99,34 @@ bool Animation::_set(const StringName &p_name, const Variant &p_value) {
|
|
|
|
|
|
if (what == "path") {
|
|
if (what == "path") {
|
|
track_set_path(track, p_value);
|
|
track_set_path(track, p_value);
|
|
|
|
+ } else if (what == "compressed_track") {
|
|
|
|
+ int index = p_value;
|
|
|
|
+ ERR_FAIL_COND_V(!compression.enabled, false);
|
|
|
|
+ ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)index, compression.bounds.size(), false);
|
|
|
|
+ Track *t = tracks[track];
|
|
|
|
+ t->interpolation = INTERPOLATION_LINEAR; //only linear supported
|
|
|
|
+ switch (t->type) {
|
|
|
|
+ case TYPE_POSITION_3D: {
|
|
|
|
+ PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ tt->compressed_track = index;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_ROTATION_3D: {
|
|
|
|
+ RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ rt->compressed_track = index;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_SCALE_3D: {
|
|
|
|
+ ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ st->compressed_track = index;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_BLEND_SHAPE: {
|
|
|
|
+ BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ bst->compressed_track = index;
|
|
|
|
+ } break;
|
|
|
|
+ default: {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return true;
|
|
} else if (what == "interp") {
|
|
} else if (what == "interp") {
|
|
track_set_interpolation_type(track, InterpolationType(p_value.operator int()));
|
|
track_set_interpolation_type(track, InterpolationType(p_value.operator int()));
|
|
} else if (what == "loop_wrap") {
|
|
} else if (what == "loop_wrap") {
|
|
@@ -369,7 +424,30 @@ bool Animation::_set(const StringName &p_name, const Variant &p_value) {
|
|
bool Animation::_get(const StringName &p_name, Variant &r_ret) const {
|
|
bool Animation::_get(const StringName &p_name, Variant &r_ret) const {
|
|
String name = p_name;
|
|
String name = p_name;
|
|
|
|
|
|
- if (name == "length") {
|
|
|
|
|
|
+ if (p_name == SNAME("_compression")) {
|
|
|
|
+ ERR_FAIL_COND_V(!compression.enabled, false);
|
|
|
|
+ Dictionary comp;
|
|
|
|
+ comp["fps"] = compression.fps;
|
|
|
|
+ Array bounds;
|
|
|
|
+ bounds.resize(compression.bounds.size());
|
|
|
|
+ for (uint32_t i = 0; i < compression.bounds.size(); i++) {
|
|
|
|
+ bounds[i] = compression.bounds[i];
|
|
|
|
+ }
|
|
|
|
+ comp["bounds"] = bounds;
|
|
|
|
+ Array pages;
|
|
|
|
+ pages.resize(compression.pages.size());
|
|
|
|
+ for (uint32_t i = 0; i < compression.pages.size(); i++) {
|
|
|
|
+ Dictionary page;
|
|
|
|
+ page["data"] = compression.pages[i].data;
|
|
|
|
+ page["time_offset"] = compression.pages[i].time_offset;
|
|
|
|
+ pages[i] = page;
|
|
|
|
+ }
|
|
|
|
+ comp["pages"] = pages;
|
|
|
|
+ comp["format_version"] = Compression::FORMAT_VERSION;
|
|
|
|
+
|
|
|
|
+ r_ret = comp;
|
|
|
|
+ return true;
|
|
|
|
+ } else if (name == "length") {
|
|
r_ret = length;
|
|
r_ret = length;
|
|
} else if (name == "loop") {
|
|
} else if (name == "loop") {
|
|
r_ret = loop;
|
|
r_ret = loop;
|
|
@@ -414,6 +492,34 @@ bool Animation::_get(const StringName &p_name, Variant &r_ret) const {
|
|
|
|
|
|
} else if (what == "path") {
|
|
} else if (what == "path") {
|
|
r_ret = track_get_path(track);
|
|
r_ret = track_get_path(track);
|
|
|
|
+ } else if (what == "compressed_track") {
|
|
|
|
+ ERR_FAIL_COND_V(!compression.enabled, false);
|
|
|
|
+ Track *t = tracks[track];
|
|
|
|
+ switch (t->type) {
|
|
|
|
+ case TYPE_POSITION_3D: {
|
|
|
|
+ PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ r_ret = tt->compressed_track;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_ROTATION_3D: {
|
|
|
|
+ RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ r_ret = rt->compressed_track;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_SCALE_3D: {
|
|
|
|
+ ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ r_ret = st->compressed_track;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_BLEND_SHAPE: {
|
|
|
|
+ BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ r_ret = bst->compressed_track;
|
|
|
|
+ } break;
|
|
|
|
+ default: {
|
|
|
|
+ r_ret = Variant();
|
|
|
|
+ ERR_FAIL_V(false);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return true;
|
|
|
|
+
|
|
} else if (what == "interp") {
|
|
} else if (what == "interp") {
|
|
r_ret = track_get_interpolation_type(track);
|
|
r_ret = track_get_interpolation_type(track);
|
|
} else if (what == "loop_wrap") {
|
|
} else if (what == "loop_wrap") {
|
|
@@ -692,14 +798,21 @@ bool Animation::_get(const StringName &p_name, Variant &r_ret) const {
|
|
}
|
|
}
|
|
|
|
|
|
void Animation::_get_property_list(List<PropertyInfo> *p_list) const {
|
|
void Animation::_get_property_list(List<PropertyInfo> *p_list) const {
|
|
|
|
+ if (compression.enabled) {
|
|
|
|
+ p_list->push_back(PropertyInfo(Variant::DICTIONARY, "_compression", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
+ }
|
|
for (int i = 0; i < tracks.size(); i++) {
|
|
for (int i = 0; i < tracks.size(); i++) {
|
|
p_list->push_back(PropertyInfo(Variant::STRING, "tracks/" + itos(i) + "/type", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
p_list->push_back(PropertyInfo(Variant::STRING, "tracks/" + itos(i) + "/type", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
- p_list->push_back(PropertyInfo(Variant::NODE_PATH, "tracks/" + itos(i) + "/path", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
- p_list->push_back(PropertyInfo(Variant::INT, "tracks/" + itos(i) + "/interp", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
- p_list->push_back(PropertyInfo(Variant::BOOL, "tracks/" + itos(i) + "/loop_wrap", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
p_list->push_back(PropertyInfo(Variant::BOOL, "tracks/" + itos(i) + "/imported", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
p_list->push_back(PropertyInfo(Variant::BOOL, "tracks/" + itos(i) + "/imported", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
p_list->push_back(PropertyInfo(Variant::BOOL, "tracks/" + itos(i) + "/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
p_list->push_back(PropertyInfo(Variant::BOOL, "tracks/" + itos(i) + "/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
- p_list->push_back(PropertyInfo(Variant::ARRAY, "tracks/" + itos(i) + "/keys", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
|
|
+ p_list->push_back(PropertyInfo(Variant::NODE_PATH, "tracks/" + itos(i) + "/path", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
+ if (track_is_compressed(i)) {
|
|
|
|
+ p_list->push_back(PropertyInfo(Variant::INT, "tracks/" + itos(i) + "/compressed_track", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
+ } else {
|
|
|
|
+ p_list->push_back(PropertyInfo(Variant::INT, "tracks/" + itos(i) + "/interp", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
+ p_list->push_back(PropertyInfo(Variant::BOOL, "tracks/" + itos(i) + "/loop_wrap", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
+ p_list->push_back(PropertyInfo(Variant::ARRAY, "tracks/" + itos(i) + "/keys", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -765,21 +878,25 @@ void Animation::remove_track(int p_track) {
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND_MSG(tt->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
|
|
_clear(tt->positions);
|
|
_clear(tt->positions);
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND_MSG(rt->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
|
|
_clear(rt->rotations);
|
|
_clear(rt->rotations);
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND_MSG(st->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
|
|
_clear(st->scales);
|
|
_clear(st->scales);
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND_MSG(bst->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
|
|
_clear(bst->blend_shapes);
|
|
_clear(bst->blend_shapes);
|
|
|
|
|
|
} break;
|
|
} break;
|
|
@@ -907,6 +1024,8 @@ int Animation::position_track_insert_key(int p_track, double p_time, const Vecto
|
|
|
|
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
|
|
|
|
+ ERR_FAIL_COND_V(tt->compressed_track >= 0, -1);
|
|
|
|
+
|
|
TKey<Vector3> tkey;
|
|
TKey<Vector3> tkey;
|
|
tkey.time = p_time;
|
|
tkey.time = p_time;
|
|
tkey.value = p_position;
|
|
tkey.value = p_position;
|
|
@@ -922,6 +1041,19 @@ Error Animation::position_track_get_key(int p_track, int p_key, Vector3 *r_posit
|
|
|
|
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
ERR_FAIL_COND_V(t->type != TYPE_POSITION_3D, ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_COND_V(t->type != TYPE_POSITION_3D, ERR_INVALID_PARAMETER);
|
|
|
|
+
|
|
|
|
+ if (tt->compressed_track >= 0) {
|
|
|
|
+ Vector3i key;
|
|
|
|
+ double time;
|
|
|
|
+ bool fetch_success = _fetch_compressed_by_index<3>(tt->compressed_track, p_key, key, time);
|
|
|
|
+ if (!fetch_success) {
|
|
|
|
+ return ERR_INVALID_PARAMETER;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ *r_position = _uncompress_pos_scale(tt->compressed_track, key);
|
|
|
|
+ return OK;
|
|
|
|
+ }
|
|
|
|
+
|
|
ERR_FAIL_INDEX_V(p_key, tt->positions.size(), ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_INDEX_V(p_key, tt->positions.size(), ERR_INVALID_PARAMETER);
|
|
|
|
|
|
*r_position = tt->positions[p_key].value;
|
|
*r_position = tt->positions[p_key].value;
|
|
@@ -936,6 +1068,14 @@ Error Animation::position_track_interpolate(int p_track, double p_time, Vector3
|
|
|
|
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
|
|
|
|
+ if (tt->compressed_track >= 0) {
|
|
|
|
+ if (_pos_scale_interpolate_compressed(tt->compressed_track, p_time, *r_interpolation)) {
|
|
|
|
+ return OK;
|
|
|
|
+ } else {
|
|
|
|
+ return ERR_UNAVAILABLE;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
bool ok = false;
|
|
bool ok = false;
|
|
|
|
|
|
Vector3 tk = _interpolate(tt->positions, p_time, tt->interpolation, tt->loop_wrap, &ok);
|
|
Vector3 tk = _interpolate(tt->positions, p_time, tt->interpolation, tt->loop_wrap, &ok);
|
|
@@ -956,6 +1096,8 @@ int Animation::rotation_track_insert_key(int p_track, double p_time, const Quate
|
|
|
|
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
|
|
|
|
+ ERR_FAIL_COND_V(rt->compressed_track >= 0, -1);
|
|
|
|
+
|
|
TKey<Quaternion> tkey;
|
|
TKey<Quaternion> tkey;
|
|
tkey.time = p_time;
|
|
tkey.time = p_time;
|
|
tkey.value = p_rotation;
|
|
tkey.value = p_rotation;
|
|
@@ -971,6 +1113,19 @@ Error Animation::rotation_track_get_key(int p_track, int p_key, Quaternion *r_ro
|
|
|
|
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
ERR_FAIL_COND_V(t->type != TYPE_ROTATION_3D, ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_COND_V(t->type != TYPE_ROTATION_3D, ERR_INVALID_PARAMETER);
|
|
|
|
+
|
|
|
|
+ if (rt->compressed_track >= 0) {
|
|
|
|
+ Vector3i key;
|
|
|
|
+ double time;
|
|
|
|
+ bool fetch_success = _fetch_compressed_by_index<3>(rt->compressed_track, p_key, key, time);
|
|
|
|
+ if (!fetch_success) {
|
|
|
|
+ return ERR_INVALID_PARAMETER;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ *r_rotation = _uncompress_quaternion(key);
|
|
|
|
+ return OK;
|
|
|
|
+ }
|
|
|
|
+
|
|
ERR_FAIL_INDEX_V(p_key, rt->rotations.size(), ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_INDEX_V(p_key, rt->rotations.size(), ERR_INVALID_PARAMETER);
|
|
|
|
|
|
*r_rotation = rt->rotations[p_key].value;
|
|
*r_rotation = rt->rotations[p_key].value;
|
|
@@ -985,6 +1140,14 @@ Error Animation::rotation_track_interpolate(int p_track, double p_time, Quaterni
|
|
|
|
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
|
|
|
|
+ if (rt->compressed_track >= 0) {
|
|
|
|
+ if (_rotation_interpolate_compressed(rt->compressed_track, p_time, *r_interpolation)) {
|
|
|
|
+ return OK;
|
|
|
|
+ } else {
|
|
|
|
+ return ERR_UNAVAILABLE;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
bool ok = false;
|
|
bool ok = false;
|
|
|
|
|
|
Quaternion tk = _interpolate(rt->rotations, p_time, rt->interpolation, rt->loop_wrap, &ok);
|
|
Quaternion tk = _interpolate(rt->rotations, p_time, rt->interpolation, rt->loop_wrap, &ok);
|
|
@@ -1005,6 +1168,8 @@ int Animation::scale_track_insert_key(int p_track, double p_time, const Vector3
|
|
|
|
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
|
|
|
|
+ ERR_FAIL_COND_V(st->compressed_track >= 0, -1);
|
|
|
|
+
|
|
TKey<Vector3> tkey;
|
|
TKey<Vector3> tkey;
|
|
tkey.time = p_time;
|
|
tkey.time = p_time;
|
|
tkey.value = p_scale;
|
|
tkey.value = p_scale;
|
|
@@ -1020,6 +1185,19 @@ Error Animation::scale_track_get_key(int p_track, int p_key, Vector3 *r_scale) c
|
|
|
|
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ERR_FAIL_COND_V(t->type != TYPE_SCALE_3D, ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_COND_V(t->type != TYPE_SCALE_3D, ERR_INVALID_PARAMETER);
|
|
|
|
+
|
|
|
|
+ if (st->compressed_track >= 0) {
|
|
|
|
+ Vector3i key;
|
|
|
|
+ double time;
|
|
|
|
+ bool fetch_success = _fetch_compressed_by_index<3>(st->compressed_track, p_key, key, time);
|
|
|
|
+ if (!fetch_success) {
|
|
|
|
+ return ERR_INVALID_PARAMETER;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ *r_scale = _uncompress_pos_scale(st->compressed_track, key);
|
|
|
|
+ return OK;
|
|
|
|
+ }
|
|
|
|
+
|
|
ERR_FAIL_INDEX_V(p_key, st->scales.size(), ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_INDEX_V(p_key, st->scales.size(), ERR_INVALID_PARAMETER);
|
|
|
|
|
|
*r_scale = st->scales[p_key].value;
|
|
*r_scale = st->scales[p_key].value;
|
|
@@ -1034,6 +1212,14 @@ Error Animation::scale_track_interpolate(int p_track, double p_time, Vector3 *r_
|
|
|
|
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
|
|
|
|
+ if (st->compressed_track >= 0) {
|
|
|
|
+ if (_pos_scale_interpolate_compressed(st->compressed_track, p_time, *r_interpolation)) {
|
|
|
|
+ return OK;
|
|
|
|
+ } else {
|
|
|
|
+ return ERR_UNAVAILABLE;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
bool ok = false;
|
|
bool ok = false;
|
|
|
|
|
|
Vector3 tk = _interpolate(st->scales, p_time, st->interpolation, st->loop_wrap, &ok);
|
|
Vector3 tk = _interpolate(st->scales, p_time, st->interpolation, st->loop_wrap, &ok);
|
|
@@ -1052,6 +1238,8 @@ int Animation::blend_shape_track_insert_key(int p_track, double p_time, float p_
|
|
|
|
|
|
BlendShapeTrack *st = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *st = static_cast<BlendShapeTrack *>(t);
|
|
|
|
|
|
|
|
+ ERR_FAIL_COND_V(st->compressed_track >= 0, -1);
|
|
|
|
+
|
|
TKey<float> tkey;
|
|
TKey<float> tkey;
|
|
tkey.time = p_time;
|
|
tkey.time = p_time;
|
|
tkey.value = p_blend_shape;
|
|
tkey.value = p_blend_shape;
|
|
@@ -1065,11 +1253,24 @@ Error Animation::blend_shape_track_get_key(int p_track, int p_key, float *r_blen
|
|
ERR_FAIL_INDEX_V(p_track, tracks.size(), ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_INDEX_V(p_track, tracks.size(), ERR_INVALID_PARAMETER);
|
|
Track *t = tracks[p_track];
|
|
Track *t = tracks[p_track];
|
|
|
|
|
|
- BlendShapeTrack *st = static_cast<BlendShapeTrack *>(t);
|
|
|
|
|
|
+ BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
ERR_FAIL_COND_V(t->type != TYPE_BLEND_SHAPE, ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_COND_V(t->type != TYPE_BLEND_SHAPE, ERR_INVALID_PARAMETER);
|
|
- ERR_FAIL_INDEX_V(p_key, st->blend_shapes.size(), ERR_INVALID_PARAMETER);
|
|
|
|
|
|
|
|
- *r_blend_shape = st->blend_shapes[p_key].value;
|
|
|
|
|
|
+ if (bst->compressed_track >= 0) {
|
|
|
|
+ Vector3i key;
|
|
|
|
+ double time;
|
|
|
|
+ bool fetch_success = _fetch_compressed_by_index<1>(bst->compressed_track, p_key, key, time);
|
|
|
|
+ if (!fetch_success) {
|
|
|
|
+ return ERR_INVALID_PARAMETER;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ *r_blend_shape = _uncompress_blend_shape(key);
|
|
|
|
+ return OK;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ERR_FAIL_INDEX_V(p_key, bst->blend_shapes.size(), ERR_INVALID_PARAMETER);
|
|
|
|
+
|
|
|
|
+ *r_blend_shape = bst->blend_shapes[p_key].value;
|
|
|
|
|
|
return OK;
|
|
return OK;
|
|
}
|
|
}
|
|
@@ -1079,11 +1280,19 @@ Error Animation::blend_shape_track_interpolate(int p_track, double p_time, float
|
|
Track *t = tracks[p_track];
|
|
Track *t = tracks[p_track];
|
|
ERR_FAIL_COND_V(t->type != TYPE_BLEND_SHAPE, ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_COND_V(t->type != TYPE_BLEND_SHAPE, ERR_INVALID_PARAMETER);
|
|
|
|
|
|
- BlendShapeTrack *st = static_cast<BlendShapeTrack *>(t);
|
|
|
|
|
|
+ BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+
|
|
|
|
+ if (bst->compressed_track >= 0) {
|
|
|
|
+ if (_blend_shape_interpolate_compressed(bst->compressed_track, p_time, *r_interpolation)) {
|
|
|
|
+ return OK;
|
|
|
|
+ } else {
|
|
|
|
+ return ERR_UNAVAILABLE;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
bool ok = false;
|
|
bool ok = false;
|
|
|
|
|
|
- float tk = _interpolate(st->blend_shapes, p_time, st->interpolation, st->loop_wrap, &ok);
|
|
|
|
|
|
+ float tk = _interpolate(bst->blend_shapes, p_time, bst->interpolation, bst->loop_wrap, &ok);
|
|
|
|
|
|
if (!ok) {
|
|
if (!ok) {
|
|
return ERR_UNAVAILABLE;
|
|
return ERR_UNAVAILABLE;
|
|
@@ -1105,24 +1314,36 @@ void Animation::track_remove_key(int p_track, int p_idx) {
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+
|
|
|
|
+ ERR_FAIL_COND(tt->compressed_track >= 0);
|
|
|
|
+
|
|
ERR_FAIL_INDEX(p_idx, tt->positions.size());
|
|
ERR_FAIL_INDEX(p_idx, tt->positions.size());
|
|
tt->positions.remove(p_idx);
|
|
tt->positions.remove(p_idx);
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+
|
|
|
|
+ ERR_FAIL_COND(rt->compressed_track >= 0);
|
|
|
|
+
|
|
ERR_FAIL_INDEX(p_idx, rt->rotations.size());
|
|
ERR_FAIL_INDEX(p_idx, rt->rotations.size());
|
|
rt->rotations.remove(p_idx);
|
|
rt->rotations.remove(p_idx);
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+
|
|
|
|
+ ERR_FAIL_COND(st->compressed_track >= 0);
|
|
|
|
+
|
|
ERR_FAIL_INDEX(p_idx, st->scales.size());
|
|
ERR_FAIL_INDEX(p_idx, st->scales.size());
|
|
st->scales.remove(p_idx);
|
|
st->scales.remove(p_idx);
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+
|
|
|
|
+ ERR_FAIL_COND(bst->compressed_track >= 0);
|
|
|
|
+
|
|
ERR_FAIL_INDEX(p_idx, bst->blend_shapes.size());
|
|
ERR_FAIL_INDEX(p_idx, bst->blend_shapes.size());
|
|
bst->blend_shapes.remove(p_idx);
|
|
bst->blend_shapes.remove(p_idx);
|
|
|
|
|
|
@@ -1169,6 +1390,21 @@ int Animation::track_find_key(int p_track, double p_time, bool p_exact) const {
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+
|
|
|
|
+ if (tt->compressed_track >= 0) {
|
|
|
|
+ double time;
|
|
|
|
+ double time_next;
|
|
|
|
+ Vector3i key;
|
|
|
|
+ Vector3i key_next;
|
|
|
|
+ uint32_t key_index;
|
|
|
|
+ bool fetch_compressed_success = _fetch_compressed<3>(tt->compressed_track, p_time, key, time, key_next, time_next, &key_index);
|
|
|
|
+ ERR_FAIL_COND_V(!fetch_compressed_success, -1);
|
|
|
|
+ if (p_exact && time != p_time) {
|
|
|
|
+ return -1;
|
|
|
|
+ }
|
|
|
|
+ return key_index;
|
|
|
|
+ }
|
|
|
|
+
|
|
int k = _find(tt->positions, p_time);
|
|
int k = _find(tt->positions, p_time);
|
|
if (k < 0 || k >= tt->positions.size()) {
|
|
if (k < 0 || k >= tt->positions.size()) {
|
|
return -1;
|
|
return -1;
|
|
@@ -1181,6 +1417,21 @@ int Animation::track_find_key(int p_track, double p_time, bool p_exact) const {
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+
|
|
|
|
+ if (rt->compressed_track >= 0) {
|
|
|
|
+ double time;
|
|
|
|
+ double time_next;
|
|
|
|
+ Vector3i key;
|
|
|
|
+ Vector3i key_next;
|
|
|
|
+ uint32_t key_index;
|
|
|
|
+ bool fetch_compressed_success = _fetch_compressed<3>(rt->compressed_track, p_time, key, time, key_next, time_next, &key_index);
|
|
|
|
+ ERR_FAIL_COND_V(!fetch_compressed_success, -1);
|
|
|
|
+ if (p_exact && time != p_time) {
|
|
|
|
+ return -1;
|
|
|
|
+ }
|
|
|
|
+ return key_index;
|
|
|
|
+ }
|
|
|
|
+
|
|
int k = _find(rt->rotations, p_time);
|
|
int k = _find(rt->rotations, p_time);
|
|
if (k < 0 || k >= rt->rotations.size()) {
|
|
if (k < 0 || k >= rt->rotations.size()) {
|
|
return -1;
|
|
return -1;
|
|
@@ -1193,6 +1444,21 @@ int Animation::track_find_key(int p_track, double p_time, bool p_exact) const {
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+
|
|
|
|
+ if (st->compressed_track >= 0) {
|
|
|
|
+ double time;
|
|
|
|
+ double time_next;
|
|
|
|
+ Vector3i key;
|
|
|
|
+ Vector3i key_next;
|
|
|
|
+ uint32_t key_index;
|
|
|
|
+ bool fetch_compressed_success = _fetch_compressed<3>(st->compressed_track, p_time, key, time, key_next, time_next, &key_index);
|
|
|
|
+ ERR_FAIL_COND_V(!fetch_compressed_success, -1);
|
|
|
|
+ if (p_exact && time != p_time) {
|
|
|
|
+ return -1;
|
|
|
|
+ }
|
|
|
|
+ return key_index;
|
|
|
|
+ }
|
|
|
|
+
|
|
int k = _find(st->scales, p_time);
|
|
int k = _find(st->scales, p_time);
|
|
if (k < 0 || k >= st->scales.size()) {
|
|
if (k < 0 || k >= st->scales.size()) {
|
|
return -1;
|
|
return -1;
|
|
@@ -1205,6 +1471,21 @@ int Animation::track_find_key(int p_track, double p_time, bool p_exact) const {
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+
|
|
|
|
+ if (bst->compressed_track >= 0) {
|
|
|
|
+ double time;
|
|
|
|
+ double time_next;
|
|
|
|
+ Vector3i key;
|
|
|
|
+ Vector3i key_next;
|
|
|
|
+ uint32_t key_index;
|
|
|
|
+ bool fetch_compressed_success = _fetch_compressed<1>(bst->compressed_track, p_time, key, time, key_next, time_next, &key_index);
|
|
|
|
+ ERR_FAIL_COND_V(!fetch_compressed_success, -1);
|
|
|
|
+ if (p_exact && time != p_time) {
|
|
|
|
+ return -1;
|
|
|
|
+ }
|
|
|
|
+ return key_index;
|
|
|
|
+ }
|
|
|
|
+
|
|
int k = _find(bst->blend_shapes, p_time);
|
|
int k = _find(bst->blend_shapes, p_time);
|
|
if (k < 0 || k >= bst->blend_shapes.size()) {
|
|
if (k < 0 || k >= bst->blend_shapes.size()) {
|
|
return -1;
|
|
return -1;
|
|
@@ -1392,18 +1673,30 @@ int Animation::track_get_key_count(int p_track) const {
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ if (tt->compressed_track >= 0) {
|
|
|
|
+ return _get_compressed_key_count(tt->compressed_track);
|
|
|
|
+ }
|
|
return tt->positions.size();
|
|
return tt->positions.size();
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ if (rt->compressed_track >= 0) {
|
|
|
|
+ return _get_compressed_key_count(rt->compressed_track);
|
|
|
|
+ }
|
|
return rt->rotations.size();
|
|
return rt->rotations.size();
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ if (st->compressed_track >= 0) {
|
|
|
|
+ return _get_compressed_key_count(st->compressed_track);
|
|
|
|
+ }
|
|
return st->scales.size();
|
|
return st->scales.size();
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ if (bst->compressed_track >= 0) {
|
|
|
|
+ return _get_compressed_key_count(bst->compressed_track);
|
|
|
|
+ }
|
|
return bst->blend_shapes.size();
|
|
return bst->blend_shapes.size();
|
|
} break;
|
|
} break;
|
|
case TYPE_VALUE: {
|
|
case TYPE_VALUE: {
|
|
@@ -1438,28 +1731,24 @@ Variant Animation::track_get_key_value(int p_track, int p_key_idx) const {
|
|
|
|
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
- PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
- ERR_FAIL_INDEX_V(p_key_idx, tt->positions.size(), Variant());
|
|
|
|
-
|
|
|
|
- return tt->positions[p_key_idx].value;
|
|
|
|
|
|
+ Vector3 value;
|
|
|
|
+ position_track_get_key(p_track, p_key_idx, &value);
|
|
|
|
+ return value;
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
- RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
- ERR_FAIL_INDEX_V(p_key_idx, rt->rotations.size(), Variant());
|
|
|
|
-
|
|
|
|
- return rt->rotations[p_key_idx].value;
|
|
|
|
|
|
+ Quaternion value;
|
|
|
|
+ rotation_track_get_key(p_track, p_key_idx, &value);
|
|
|
|
+ return value;
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
- ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
- ERR_FAIL_INDEX_V(p_key_idx, st->scales.size(), Variant());
|
|
|
|
-
|
|
|
|
- return st->scales[p_key_idx].value;
|
|
|
|
|
|
+ Vector3 value;
|
|
|
|
+ scale_track_get_key(p_track, p_key_idx, &value);
|
|
|
|
+ return value;
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
- BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
- ERR_FAIL_INDEX_V(p_key_idx, bst->blend_shapes.size(), Variant());
|
|
|
|
-
|
|
|
|
- return bst->blend_shapes[p_key_idx].value;
|
|
|
|
|
|
+ float value;
|
|
|
|
+ blend_shape_track_get_key(p_track, p_key_idx, &value);
|
|
|
|
+ return value;
|
|
} break;
|
|
} break;
|
|
case TYPE_VALUE: {
|
|
case TYPE_VALUE: {
|
|
ValueTrack *vt = static_cast<ValueTrack *>(t);
|
|
ValueTrack *vt = static_cast<ValueTrack *>(t);
|
|
@@ -1520,21 +1809,49 @@ double Animation::track_get_key_time(int p_track, int p_key_idx) const {
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ if (tt->compressed_track >= 0) {
|
|
|
|
+ Vector3i value;
|
|
|
|
+ double time;
|
|
|
|
+ bool fetch_compressed_success = _fetch_compressed_by_index<3>(tt->compressed_track, p_key_idx, value, time);
|
|
|
|
+ ERR_FAIL_COND_V(!fetch_compressed_success, false);
|
|
|
|
+ return time;
|
|
|
|
+ }
|
|
ERR_FAIL_INDEX_V(p_key_idx, tt->positions.size(), -1);
|
|
ERR_FAIL_INDEX_V(p_key_idx, tt->positions.size(), -1);
|
|
return tt->positions[p_key_idx].time;
|
|
return tt->positions[p_key_idx].time;
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ if (rt->compressed_track >= 0) {
|
|
|
|
+ Vector3i value;
|
|
|
|
+ double time;
|
|
|
|
+ bool fetch_compressed_success = _fetch_compressed_by_index<3>(rt->compressed_track, p_key_idx, value, time);
|
|
|
|
+ ERR_FAIL_COND_V(!fetch_compressed_success, false);
|
|
|
|
+ return time;
|
|
|
|
+ }
|
|
ERR_FAIL_INDEX_V(p_key_idx, rt->rotations.size(), -1);
|
|
ERR_FAIL_INDEX_V(p_key_idx, rt->rotations.size(), -1);
|
|
return rt->rotations[p_key_idx].time;
|
|
return rt->rotations[p_key_idx].time;
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ if (st->compressed_track >= 0) {
|
|
|
|
+ Vector3i value;
|
|
|
|
+ double time;
|
|
|
|
+ bool fetch_compressed_success = _fetch_compressed_by_index<3>(st->compressed_track, p_key_idx, value, time);
|
|
|
|
+ ERR_FAIL_COND_V(!fetch_compressed_success, false);
|
|
|
|
+ return time;
|
|
|
|
+ }
|
|
ERR_FAIL_INDEX_V(p_key_idx, st->scales.size(), -1);
|
|
ERR_FAIL_INDEX_V(p_key_idx, st->scales.size(), -1);
|
|
return st->scales[p_key_idx].time;
|
|
return st->scales[p_key_idx].time;
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ if (bst->compressed_track >= 0) {
|
|
|
|
+ Vector3i value;
|
|
|
|
+ double time;
|
|
|
|
+ bool fetch_compressed_success = _fetch_compressed_by_index<1>(bst->compressed_track, p_key_idx, value, time);
|
|
|
|
+ ERR_FAIL_COND_V(!fetch_compressed_success, false);
|
|
|
|
+ return time;
|
|
|
|
+ }
|
|
ERR_FAIL_INDEX_V(p_key_idx, bst->blend_shapes.size(), -1);
|
|
ERR_FAIL_INDEX_V(p_key_idx, bst->blend_shapes.size(), -1);
|
|
return bst->blend_shapes[p_key_idx].time;
|
|
return bst->blend_shapes[p_key_idx].time;
|
|
} break;
|
|
} break;
|
|
@@ -1580,6 +1897,7 @@ void Animation::track_set_key_time(int p_track, int p_key_idx, double p_time) {
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(tt->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, tt->positions.size());
|
|
ERR_FAIL_INDEX(p_key_idx, tt->positions.size());
|
|
TKey<Vector3> key = tt->positions[p_key_idx];
|
|
TKey<Vector3> key = tt->positions[p_key_idx];
|
|
key.time = p_time;
|
|
key.time = p_time;
|
|
@@ -1589,6 +1907,7 @@ void Animation::track_set_key_time(int p_track, int p_key_idx, double p_time) {
|
|
}
|
|
}
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
RotationTrack *tt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *tt = static_cast<RotationTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(tt->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, tt->rotations.size());
|
|
ERR_FAIL_INDEX(p_key_idx, tt->rotations.size());
|
|
TKey<Quaternion> key = tt->rotations[p_key_idx];
|
|
TKey<Quaternion> key = tt->rotations[p_key_idx];
|
|
key.time = p_time;
|
|
key.time = p_time;
|
|
@@ -1598,6 +1917,7 @@ void Animation::track_set_key_time(int p_track, int p_key_idx, double p_time) {
|
|
}
|
|
}
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
ScaleTrack *tt = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *tt = static_cast<ScaleTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(tt->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, tt->scales.size());
|
|
ERR_FAIL_INDEX(p_key_idx, tt->scales.size());
|
|
TKey<Vector3> key = tt->scales[p_key_idx];
|
|
TKey<Vector3> key = tt->scales[p_key_idx];
|
|
key.time = p_time;
|
|
key.time = p_time;
|
|
@@ -1607,6 +1927,7 @@ void Animation::track_set_key_time(int p_track, int p_key_idx, double p_time) {
|
|
}
|
|
}
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
BlendShapeTrack *tt = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *tt = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(tt->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, tt->blend_shapes.size());
|
|
ERR_FAIL_INDEX(p_key_idx, tt->blend_shapes.size());
|
|
TKey<float> key = tt->blend_shapes[p_key_idx];
|
|
TKey<float> key = tt->blend_shapes[p_key_idx];
|
|
key.time = p_time;
|
|
key.time = p_time;
|
|
@@ -1671,21 +1992,33 @@ real_t Animation::track_get_key_transition(int p_track, int p_key_idx) const {
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ if (tt->compressed_track >= 0) {
|
|
|
|
+ return 1.0;
|
|
|
|
+ }
|
|
ERR_FAIL_INDEX_V(p_key_idx, tt->positions.size(), -1);
|
|
ERR_FAIL_INDEX_V(p_key_idx, tt->positions.size(), -1);
|
|
return tt->positions[p_key_idx].transition;
|
|
return tt->positions[p_key_idx].transition;
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ if (rt->compressed_track >= 0) {
|
|
|
|
+ return 1.0;
|
|
|
|
+ }
|
|
ERR_FAIL_INDEX_V(p_key_idx, rt->rotations.size(), -1);
|
|
ERR_FAIL_INDEX_V(p_key_idx, rt->rotations.size(), -1);
|
|
return rt->rotations[p_key_idx].transition;
|
|
return rt->rotations[p_key_idx].transition;
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ if (st->compressed_track >= 0) {
|
|
|
|
+ return 1.0;
|
|
|
|
+ }
|
|
ERR_FAIL_INDEX_V(p_key_idx, st->scales.size(), -1);
|
|
ERR_FAIL_INDEX_V(p_key_idx, st->scales.size(), -1);
|
|
return st->scales[p_key_idx].transition;
|
|
return st->scales[p_key_idx].transition;
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ if (bst->compressed_track >= 0) {
|
|
|
|
+ return 1.0;
|
|
|
|
+ }
|
|
ERR_FAIL_INDEX_V(p_key_idx, bst->blend_shapes.size(), -1);
|
|
ERR_FAIL_INDEX_V(p_key_idx, bst->blend_shapes.size(), -1);
|
|
return bst->blend_shapes[p_key_idx].transition;
|
|
return bst->blend_shapes[p_key_idx].transition;
|
|
} break;
|
|
} break;
|
|
@@ -1715,6 +2048,35 @@ real_t Animation::track_get_key_transition(int p_track, int p_key_idx) const {
|
|
ERR_FAIL_V(0);
|
|
ERR_FAIL_V(0);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+bool Animation::track_is_compressed(int p_track) const {
|
|
|
|
+ ERR_FAIL_INDEX_V(p_track, tracks.size(), false);
|
|
|
|
+ Track *t = tracks[p_track];
|
|
|
|
+
|
|
|
|
+ switch (t->type) {
|
|
|
|
+ case TYPE_POSITION_3D: {
|
|
|
|
+ PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ return tt->compressed_track >= 0;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_ROTATION_3D: {
|
|
|
|
+ RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ return rt->compressed_track >= 0;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_SCALE_3D: {
|
|
|
|
+ ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ return st->compressed_track >= 0;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_BLEND_SHAPE: {
|
|
|
|
+ BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ return bst->compressed_track >= 0;
|
|
|
|
+ } break;
|
|
|
|
+ default: {
|
|
|
|
+ return false; //animation does not really use transitions
|
|
|
|
+ } break;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ERR_FAIL_V(false);
|
|
|
|
+}
|
|
|
|
+
|
|
void Animation::track_set_key_value(int p_track, int p_key_idx, const Variant &p_value) {
|
|
void Animation::track_set_key_value(int p_track, int p_key_idx, const Variant &p_value) {
|
|
ERR_FAIL_INDEX(p_track, tracks.size());
|
|
ERR_FAIL_INDEX(p_track, tracks.size());
|
|
Track *t = tracks[p_track];
|
|
Track *t = tracks[p_track];
|
|
@@ -1723,6 +2085,7 @@ void Animation::track_set_key_value(int p_track, int p_key_idx, const Variant &p
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
ERR_FAIL_COND((p_value.get_type() != Variant::VECTOR3) && (p_value.get_type() != Variant::VECTOR3I));
|
|
ERR_FAIL_COND((p_value.get_type() != Variant::VECTOR3) && (p_value.get_type() != Variant::VECTOR3I));
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(tt->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, tt->positions.size());
|
|
ERR_FAIL_INDEX(p_key_idx, tt->positions.size());
|
|
|
|
|
|
tt->positions.write[p_key_idx].value = p_value;
|
|
tt->positions.write[p_key_idx].value = p_value;
|
|
@@ -1731,6 +2094,7 @@ void Animation::track_set_key_value(int p_track, int p_key_idx, const Variant &p
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
ERR_FAIL_COND((p_value.get_type() != Variant::QUATERNION) && (p_value.get_type() != Variant::BASIS));
|
|
ERR_FAIL_COND((p_value.get_type() != Variant::QUATERNION) && (p_value.get_type() != Variant::BASIS));
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(rt->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, rt->rotations.size());
|
|
ERR_FAIL_INDEX(p_key_idx, rt->rotations.size());
|
|
|
|
|
|
rt->rotations.write[p_key_idx].value = p_value;
|
|
rt->rotations.write[p_key_idx].value = p_value;
|
|
@@ -1739,6 +2103,7 @@ void Animation::track_set_key_value(int p_track, int p_key_idx, const Variant &p
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
ERR_FAIL_COND((p_value.get_type() != Variant::VECTOR3) && (p_value.get_type() != Variant::VECTOR3I));
|
|
ERR_FAIL_COND((p_value.get_type() != Variant::VECTOR3) && (p_value.get_type() != Variant::VECTOR3I));
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(st->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, st->scales.size());
|
|
ERR_FAIL_INDEX(p_key_idx, st->scales.size());
|
|
|
|
|
|
st->scales.write[p_key_idx].value = p_value;
|
|
st->scales.write[p_key_idx].value = p_value;
|
|
@@ -1747,6 +2112,7 @@ void Animation::track_set_key_value(int p_track, int p_key_idx, const Variant &p
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
ERR_FAIL_COND((p_value.get_type() != Variant::FLOAT) && (p_value.get_type() != Variant::INT));
|
|
ERR_FAIL_COND((p_value.get_type() != Variant::FLOAT) && (p_value.get_type() != Variant::INT));
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(bst->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, bst->blend_shapes.size());
|
|
ERR_FAIL_INDEX(p_key_idx, bst->blend_shapes.size());
|
|
|
|
|
|
bst->blend_shapes.write[p_key_idx].value = p_value;
|
|
bst->blend_shapes.write[p_key_idx].value = p_value;
|
|
@@ -1820,21 +2186,25 @@ void Animation::track_set_key_transition(int p_track, int p_key_idx, real_t p_tr
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(tt->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, tt->positions.size());
|
|
ERR_FAIL_INDEX(p_key_idx, tt->positions.size());
|
|
tt->positions.write[p_key_idx].transition = p_transition;
|
|
tt->positions.write[p_key_idx].transition = p_transition;
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(rt->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, rt->rotations.size());
|
|
ERR_FAIL_INDEX(p_key_idx, rt->rotations.size());
|
|
rt->rotations.write[p_key_idx].transition = p_transition;
|
|
rt->rotations.write[p_key_idx].transition = p_transition;
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(st->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, st->scales.size());
|
|
ERR_FAIL_INDEX(p_key_idx, st->scales.size());
|
|
st->scales.write[p_key_idx].transition = p_transition;
|
|
st->scales.write[p_key_idx].transition = p_transition;
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ ERR_FAIL_COND(bst->compressed_track >= 0);
|
|
ERR_FAIL_INDEX(p_key_idx, bst->blend_shapes.size());
|
|
ERR_FAIL_INDEX(p_key_idx, bst->blend_shapes.size());
|
|
bst->blend_shapes.write[p_key_idx].transition = p_transition;
|
|
bst->blend_shapes.write[p_key_idx].transition = p_transition;
|
|
} break;
|
|
} break;
|
|
@@ -2334,26 +2704,50 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
const PositionTrack *tt = static_cast<const PositionTrack *>(t);
|
|
const PositionTrack *tt = static_cast<const PositionTrack *>(t);
|
|
- _track_get_key_indices_in_range(tt->positions, from_time, length, p_indices);
|
|
|
|
- _track_get_key_indices_in_range(tt->positions, 0, to_time, p_indices);
|
|
|
|
|
|
+ if (tt->compressed_track >= 0) {
|
|
|
|
+ _get_compressed_key_indices_in_range<3>(tt->compressed_track, from_time, length, p_indices);
|
|
|
|
+ _get_compressed_key_indices_in_range<3>(tt->compressed_track, 0, to_time, p_indices);
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ _track_get_key_indices_in_range(tt->positions, from_time, length, p_indices);
|
|
|
|
+ _track_get_key_indices_in_range(tt->positions, 0, to_time, p_indices);
|
|
|
|
+ }
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
const RotationTrack *rt = static_cast<const RotationTrack *>(t);
|
|
const RotationTrack *rt = static_cast<const RotationTrack *>(t);
|
|
- _track_get_key_indices_in_range(rt->rotations, from_time, length, p_indices);
|
|
|
|
- _track_get_key_indices_in_range(rt->rotations, 0, to_time, p_indices);
|
|
|
|
|
|
+ if (rt->compressed_track >= 0) {
|
|
|
|
+ _get_compressed_key_indices_in_range<3>(rt->compressed_track, from_time, length, p_indices);
|
|
|
|
+ _get_compressed_key_indices_in_range<3>(rt->compressed_track, 0, to_time, p_indices);
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ _track_get_key_indices_in_range(rt->rotations, from_time, length, p_indices);
|
|
|
|
+ _track_get_key_indices_in_range(rt->rotations, 0, to_time, p_indices);
|
|
|
|
+ }
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
const ScaleTrack *st = static_cast<const ScaleTrack *>(t);
|
|
const ScaleTrack *st = static_cast<const ScaleTrack *>(t);
|
|
- _track_get_key_indices_in_range(st->scales, from_time, length, p_indices);
|
|
|
|
- _track_get_key_indices_in_range(st->scales, 0, to_time, p_indices);
|
|
|
|
|
|
+ if (st->compressed_track >= 0) {
|
|
|
|
+ _get_compressed_key_indices_in_range<3>(st->compressed_track, from_time, length, p_indices);
|
|
|
|
+ _get_compressed_key_indices_in_range<3>(st->compressed_track, 0, to_time, p_indices);
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ _track_get_key_indices_in_range(st->scales, from_time, length, p_indices);
|
|
|
|
+ _track_get_key_indices_in_range(st->scales, 0, to_time, p_indices);
|
|
|
|
+ }
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
|
|
const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
|
|
- _track_get_key_indices_in_range(bst->blend_shapes, from_time, length, p_indices);
|
|
|
|
- _track_get_key_indices_in_range(bst->blend_shapes, 0, to_time, p_indices);
|
|
|
|
|
|
+ if (bst->compressed_track >= 0) {
|
|
|
|
+ _get_compressed_key_indices_in_range<1>(bst->compressed_track, from_time, length, p_indices);
|
|
|
|
+ _get_compressed_key_indices_in_range<1>(bst->compressed_track, 0, to_time, p_indices);
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ _track_get_key_indices_in_range(bst->blend_shapes, from_time, length, p_indices);
|
|
|
|
+ _track_get_key_indices_in_range(bst->blend_shapes, 0, to_time, p_indices);
|
|
|
|
+ }
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_VALUE: {
|
|
case TYPE_VALUE: {
|
|
@@ -2408,22 +2802,38 @@ void Animation::track_get_key_indices_in_range(int p_track, double p_time, doubl
|
|
switch (t->type) {
|
|
switch (t->type) {
|
|
case TYPE_POSITION_3D: {
|
|
case TYPE_POSITION_3D: {
|
|
const PositionTrack *tt = static_cast<const PositionTrack *>(t);
|
|
const PositionTrack *tt = static_cast<const PositionTrack *>(t);
|
|
- _track_get_key_indices_in_range(tt->positions, from_time, to_time, p_indices);
|
|
|
|
|
|
+ if (tt->compressed_track >= 0) {
|
|
|
|
+ _get_compressed_key_indices_in_range<3>(tt->compressed_track, from_time, to_time - from_time, p_indices);
|
|
|
|
+ } else {
|
|
|
|
+ _track_get_key_indices_in_range(tt->positions, from_time, to_time, p_indices);
|
|
|
|
+ }
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_ROTATION_3D: {
|
|
case TYPE_ROTATION_3D: {
|
|
const RotationTrack *rt = static_cast<const RotationTrack *>(t);
|
|
const RotationTrack *rt = static_cast<const RotationTrack *>(t);
|
|
- _track_get_key_indices_in_range(rt->rotations, from_time, to_time, p_indices);
|
|
|
|
|
|
+ if (rt->compressed_track >= 0) {
|
|
|
|
+ _get_compressed_key_indices_in_range<3>(rt->compressed_track, from_time, to_time - from_time, p_indices);
|
|
|
|
+ } else {
|
|
|
|
+ _track_get_key_indices_in_range(rt->rotations, from_time, to_time, p_indices);
|
|
|
|
+ }
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_SCALE_3D: {
|
|
case TYPE_SCALE_3D: {
|
|
const ScaleTrack *st = static_cast<const ScaleTrack *>(t);
|
|
const ScaleTrack *st = static_cast<const ScaleTrack *>(t);
|
|
- _track_get_key_indices_in_range(st->scales, from_time, to_time, p_indices);
|
|
|
|
|
|
+ if (st->compressed_track >= 0) {
|
|
|
|
+ _get_compressed_key_indices_in_range<3>(st->compressed_track, from_time, to_time - from_time, p_indices);
|
|
|
|
+ } else {
|
|
|
|
+ _track_get_key_indices_in_range(st->scales, from_time, to_time, p_indices);
|
|
|
|
+ }
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_BLEND_SHAPE: {
|
|
case TYPE_BLEND_SHAPE: {
|
|
const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
|
|
const BlendShapeTrack *bst = static_cast<const BlendShapeTrack *>(t);
|
|
- _track_get_key_indices_in_range(bst->blend_shapes, from_time, to_time, p_indices);
|
|
|
|
|
|
+ if (bst->compressed_track >= 0) {
|
|
|
|
+ _get_compressed_key_indices_in_range<1>(bst->compressed_track, from_time, to_time - from_time, p_indices);
|
|
|
|
+ } else {
|
|
|
|
+ _track_get_key_indices_in_range(bst->blend_shapes, from_time, to_time, p_indices);
|
|
|
|
+ }
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case TYPE_VALUE: {
|
|
case TYPE_VALUE: {
|
|
@@ -3064,6 +3474,8 @@ void Animation::_bind_methods() {
|
|
ClassDB::bind_method(D_METHOD("track_set_interpolation_loop_wrap", "track_idx", "interpolation"), &Animation::track_set_interpolation_loop_wrap);
|
|
ClassDB::bind_method(D_METHOD("track_set_interpolation_loop_wrap", "track_idx", "interpolation"), &Animation::track_set_interpolation_loop_wrap);
|
|
ClassDB::bind_method(D_METHOD("track_get_interpolation_loop_wrap", "track_idx"), &Animation::track_get_interpolation_loop_wrap);
|
|
ClassDB::bind_method(D_METHOD("track_get_interpolation_loop_wrap", "track_idx"), &Animation::track_get_interpolation_loop_wrap);
|
|
|
|
|
|
|
|
+ ClassDB::bind_method(D_METHOD("track_is_compressed", "track_idx"), &Animation::track_is_compressed);
|
|
|
|
+
|
|
ClassDB::bind_method(D_METHOD("value_track_set_update_mode", "track_idx", "mode"), &Animation::value_track_set_update_mode);
|
|
ClassDB::bind_method(D_METHOD("value_track_set_update_mode", "track_idx", "mode"), &Animation::value_track_set_update_mode);
|
|
ClassDB::bind_method(D_METHOD("value_track_get_update_mode", "track_idx"), &Animation::value_track_get_update_mode);
|
|
ClassDB::bind_method(D_METHOD("value_track_get_update_mode", "track_idx"), &Animation::value_track_get_update_mode);
|
|
|
|
|
|
@@ -3110,6 +3522,8 @@ void Animation::_bind_methods() {
|
|
ClassDB::bind_method(D_METHOD("clear"), &Animation::clear);
|
|
ClassDB::bind_method(D_METHOD("clear"), &Animation::clear);
|
|
ClassDB::bind_method(D_METHOD("copy_track", "track_idx", "to_animation"), &Animation::copy_track);
|
|
ClassDB::bind_method(D_METHOD("copy_track", "track_idx", "to_animation"), &Animation::copy_track);
|
|
|
|
|
|
|
|
+ ClassDB::bind_method(D_METHOD("compress", "page_size", "fps", "split_tolerance"), &Animation::compress, DEFVAL(8192), DEFVAL(120), DEFVAL(4.0));
|
|
|
|
+
|
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "length", PROPERTY_HINT_RANGE, "0.001,99999,0.001"), "set_length", "get_length");
|
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "length", PROPERTY_HINT_RANGE, "0.001,99999,0.001"), "set_length", "get_length");
|
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "loop"), "set_loop", "has_loop");
|
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "loop"), "set_loop", "has_loop");
|
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "step", PROPERTY_HINT_RANGE, "0,4096,0.001"), "set_step", "get_step");
|
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "step", PROPERTY_HINT_RANGE, "0,4096,0.001"), "set_step", "get_step");
|
|
@@ -3143,6 +3557,10 @@ void Animation::clear() {
|
|
tracks.clear();
|
|
tracks.clear();
|
|
loop = false;
|
|
loop = false;
|
|
length = 1;
|
|
length = 1;
|
|
|
|
+ compression.enabled = false;
|
|
|
|
+ compression.bounds.clear();
|
|
|
|
+ compression.pages.clear();
|
|
|
|
+ compression.fps = 120;
|
|
emit_changed();
|
|
emit_changed();
|
|
emit_signal(SceneStringNames::get_singleton()->tracks_changed);
|
|
emit_signal(SceneStringNames::get_singleton()->tracks_changed);
|
|
}
|
|
}
|
|
@@ -3447,6 +3865,9 @@ void Animation::_blend_shape_track_optimize(int p_idx, real_t p_allowed_linear_e
|
|
|
|
|
|
void Animation::optimize(real_t p_allowed_linear_err, real_t p_allowed_angular_err, real_t p_max_optimizable_angle) {
|
|
void Animation::optimize(real_t p_allowed_linear_err, real_t p_allowed_angular_err, real_t p_max_optimizable_angle) {
|
|
for (int i = 0; i < tracks.size(); i++) {
|
|
for (int i = 0; i < tracks.size(); i++) {
|
|
|
|
+ if (track_is_compressed(i)) {
|
|
|
|
+ continue; //not possible to optimize compressed track
|
|
|
|
+ }
|
|
if (tracks[i]->type == TYPE_POSITION_3D) {
|
|
if (tracks[i]->type == TYPE_POSITION_3D) {
|
|
_position_track_optimize(i, p_allowed_linear_err, p_allowed_angular_err);
|
|
_position_track_optimize(i, p_allowed_linear_err, p_allowed_angular_err);
|
|
} else if (tracks[i]->type == TYPE_ROTATION_3D) {
|
|
} else if (tracks[i]->type == TYPE_ROTATION_3D) {
|
|
@@ -3459,6 +3880,1154 @@ void Animation::optimize(real_t p_allowed_linear_err, real_t p_allowed_angular_e
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+#define print_animc(m_str)
|
|
|
|
+//#define print_animc(m_str) print_line(m_str);
|
|
|
|
+
|
|
|
|
+struct AnimationCompressionDataState {
|
|
|
|
+ enum {
|
|
|
|
+ MIN_OPTIMIZE_PACKETS = 5,
|
|
|
|
+ MAX_PACKETS = 16
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ uint32_t components = 3;
|
|
|
|
+ LocalVector<uint8_t> data; //commited packets
|
|
|
|
+ struct PacketData {
|
|
|
|
+ int32_t data[3] = { 0, 0, 0 };
|
|
|
|
+ uint32_t frame = 0;
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ float split_tolerance = 1.5;
|
|
|
|
+
|
|
|
|
+ LocalVector<PacketData> temp_packets;
|
|
|
|
+
|
|
|
|
+ //used for rollback if the new frame does not fit
|
|
|
|
+ int32_t validated_packet_count = -1;
|
|
|
|
+
|
|
|
|
+ static int32_t _compute_delta16_signed(int32_t p_from, int32_t p_to) {
|
|
|
|
+ int32_t delta = p_to - p_from;
|
|
|
|
+ if (delta > 32767) {
|
|
|
|
+ return delta - 65536; // use wrap around
|
|
|
|
+ } else if (delta < -32768) {
|
|
|
|
+ return 65536 + delta; // use wrap around
|
|
|
|
+ }
|
|
|
|
+ return delta;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ static uint32_t _compute_shift_bits_signed(int32_t p_delta) {
|
|
|
|
+ if (p_delta == 0) {
|
|
|
|
+ return 0;
|
|
|
|
+ } else if (p_delta < 0) {
|
|
|
|
+ p_delta = ABS(p_delta) - 1;
|
|
|
|
+ if (p_delta == 0) {
|
|
|
|
+ return 1;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return nearest_shift(p_delta);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ void _compute_max_shifts(uint32_t p_from, uint32_t p_to, uint32_t *max_shifts, uint32_t &max_frame_delta_shift) const {
|
|
|
|
+ for (uint32_t j = 0; j < components; j++) {
|
|
|
|
+ max_shifts[j] = 0;
|
|
|
|
+ }
|
|
|
|
+ max_frame_delta_shift = 0;
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = p_from + 1; i <= p_to; i++) {
|
|
|
|
+ int32_t frame_delta = temp_packets[i].frame - temp_packets[i - 1].frame;
|
|
|
|
+ max_frame_delta_shift = MAX(max_frame_delta_shift, nearest_shift(frame_delta));
|
|
|
|
+ for (uint32_t j = 0; j < components; j++) {
|
|
|
|
+ int32_t diff = _compute_delta16_signed(temp_packets[i - 1].data[j], temp_packets[i].data[j]);
|
|
|
|
+ uint32_t shift = _compute_shift_bits_signed(diff);
|
|
|
|
+ max_shifts[j] = MAX(shift, max_shifts[j]);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ bool insert_key(uint32_t p_frame, const Vector3i &p_key) {
|
|
|
|
+ if (temp_packets.size() == MAX_PACKETS) {
|
|
|
|
+ commit_temp_packets();
|
|
|
|
+ }
|
|
|
|
+ PacketData packet;
|
|
|
|
+ packet.frame = p_frame;
|
|
|
|
+ for (int i = 0; i < 3; i++) {
|
|
|
|
+ ERR_FAIL_COND_V(p_key[i] > 65535, false); // Sanity check
|
|
|
|
+ packet.data[i] = p_key[i];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ temp_packets.push_back(packet);
|
|
|
|
+
|
|
|
|
+ if (temp_packets.size() >= MIN_OPTIMIZE_PACKETS) {
|
|
|
|
+ uint32_t max_shifts[3] = { 0, 0, 0 }; // Base sizes, 16 bit
|
|
|
|
+ uint32_t max_frame_delta_shift = 0;
|
|
|
|
+ // Compute the average shift before the packet was added
|
|
|
|
+ _compute_max_shifts(0, temp_packets.size() - 2, max_shifts, max_frame_delta_shift);
|
|
|
|
+
|
|
|
|
+ float prev_packet_size_avg = 0;
|
|
|
|
+ prev_packet_size_avg = float(1 << max_frame_delta_shift);
|
|
|
|
+ for (uint32_t i = 0; i < components; i++) {
|
|
|
|
+ prev_packet_size_avg += float(1 << max_shifts[i]);
|
|
|
|
+ }
|
|
|
|
+ prev_packet_size_avg /= float(1 + components);
|
|
|
|
+
|
|
|
|
+ _compute_max_shifts(temp_packets.size() - 2, temp_packets.size() - 1, max_shifts, max_frame_delta_shift);
|
|
|
|
+
|
|
|
|
+ float new_packet_size_avg = 0;
|
|
|
|
+ new_packet_size_avg = float(1 << max_frame_delta_shift);
|
|
|
|
+ for (uint32_t i = 0; i < components; i++) {
|
|
|
|
+ new_packet_size_avg += float(1 << max_shifts[i]);
|
|
|
|
+ }
|
|
|
|
+ new_packet_size_avg /= float(1 + components);
|
|
|
|
+
|
|
|
|
+ print_animc("packet count: " + rtos(temp_packets.size() - 1) + " size avg " + rtos(prev_packet_size_avg) + " new avg " + rtos(new_packet_size_avg));
|
|
|
|
+ float ratio = (prev_packet_size_avg < new_packet_size_avg) ? (new_packet_size_avg / prev_packet_size_avg) : (prev_packet_size_avg / new_packet_size_avg);
|
|
|
|
+
|
|
|
|
+ if (ratio > split_tolerance) {
|
|
|
|
+ print_animc("split!");
|
|
|
|
+ temp_packets.resize(temp_packets.size() - 1);
|
|
|
|
+ commit_temp_packets();
|
|
|
|
+ temp_packets.push_back(packet);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return temp_packets.size() == 1; // First key
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ uint32_t get_temp_packet_size() const {
|
|
|
|
+ if (temp_packets.size() == 0) {
|
|
|
|
+ return 0;
|
|
|
|
+ } else if (temp_packets.size() == 1) {
|
|
|
|
+ return components == 1 ? 4 : 8; // 1 component packet is 16 bits and 16 bits unused. 3 component packets is 48 bits and 16 bits unused
|
|
|
|
+ }
|
|
|
|
+ uint32_t max_shifts[3] = { 0, 0, 0 }; //base sizes, 16 bit
|
|
|
|
+ uint32_t max_frame_delta_shift = 0;
|
|
|
|
+
|
|
|
|
+ _compute_max_shifts(0, temp_packets.size() - 1, max_shifts, max_frame_delta_shift);
|
|
|
|
+
|
|
|
|
+ uint32_t size_bits = 16; //base value (all 4 bits of shift sizes for x,y,z,time)
|
|
|
|
+ size_bits += max_frame_delta_shift * (temp_packets.size() - 1); //times
|
|
|
|
+ for (uint32_t j = 0; j < components; j++) {
|
|
|
|
+ size_bits += 16; //base value
|
|
|
|
+ uint32_t shift = max_shifts[j];
|
|
|
|
+ if (shift > 0) {
|
|
|
|
+ shift += 1; //if not zero, add sign bit
|
|
|
|
+ }
|
|
|
|
+ size_bits += shift * (temp_packets.size() - 1);
|
|
|
|
+ }
|
|
|
|
+ if (size_bits % 8 != 0) { //wrap to 8 bits
|
|
|
|
+ size_bits += 8 - (size_bits % 8);
|
|
|
|
+ }
|
|
|
|
+ uint32_t size_bytes = size_bits / 8; //wrap to words
|
|
|
|
+ if (size_bytes % 4 != 0) {
|
|
|
|
+ size_bytes += 4 - (size_bytes % 4);
|
|
|
|
+ }
|
|
|
|
+ return size_bytes;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ static void _push_bits(LocalVector<uint8_t> &data, uint32_t &r_buffer, uint32_t &r_bits_used, uint32_t p_value, uint32_t p_bits) {
|
|
|
|
+ r_buffer |= p_value << r_bits_used;
|
|
|
|
+ r_bits_used += p_bits;
|
|
|
|
+ while (r_bits_used >= 8) {
|
|
|
|
+ uint8_t byte = r_buffer & 0xFF;
|
|
|
|
+ data.push_back(byte);
|
|
|
|
+ r_buffer >>= 8;
|
|
|
|
+ r_bits_used -= 8;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ void commit_temp_packets() {
|
|
|
|
+ if (temp_packets.size() == 0) {
|
|
|
|
+ return; //nohing to do
|
|
|
|
+ }
|
|
|
|
+#define DEBUG_PACKET_PUSH
|
|
|
|
+#ifdef DEBUG_PACKET_PUSH
|
|
|
|
+#ifndef _MSC_VER
|
|
|
|
+#warning Debugging packet push, disable this code in production to gain a bit more import performance.
|
|
|
|
+#endif
|
|
|
|
+ uint32_t debug_packet_push = get_temp_packet_size();
|
|
|
|
+ uint32_t debug_data_size = data.size();
|
|
|
|
+#endif
|
|
|
|
+ // Store header
|
|
|
|
+
|
|
|
|
+ uint8_t header[8];
|
|
|
|
+ uint32_t header_bytes = 0;
|
|
|
|
+ for (uint32_t i = 0; i < components; i++) {
|
|
|
|
+ encode_uint16(temp_packets[0].data[i], &header[header_bytes]);
|
|
|
|
+ header_bytes += 2;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ uint32_t max_shifts[3] = { 0, 0, 0 }; //base sizes, 16 bit
|
|
|
|
+ uint32_t max_frame_delta_shift = 0;
|
|
|
|
+
|
|
|
|
+ if (temp_packets.size() > 1) {
|
|
|
|
+ _compute_max_shifts(0, temp_packets.size() - 1, max_shifts, max_frame_delta_shift);
|
|
|
|
+ uint16_t shift_header = (max_frame_delta_shift - 1) << 12;
|
|
|
|
+ for (uint32_t i = 0; i < components; i++) {
|
|
|
|
+ shift_header |= max_shifts[i] << (4 * i);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ encode_uint16(shift_header, &header[header_bytes]);
|
|
|
|
+ header_bytes += 2;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ while (header_bytes % 4 != 0) {
|
|
|
|
+ header[header_bytes++] = 0;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < header_bytes; i++) {
|
|
|
|
+ data.push_back(header[i]);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (temp_packets.size() == 1) {
|
|
|
|
+ temp_packets.clear();
|
|
|
|
+ validated_packet_count = 0;
|
|
|
|
+ return; //only header stored, nothing else to do
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ uint32_t bit_buffer = 0;
|
|
|
|
+ uint32_t bits_used = 0;
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 1; i < temp_packets.size(); i++) {
|
|
|
|
+ uint32_t frame_delta = temp_packets[i].frame - temp_packets[i - 1].frame;
|
|
|
|
+ _push_bits(data, bit_buffer, bits_used, frame_delta, max_frame_delta_shift);
|
|
|
|
+
|
|
|
|
+ for (uint32_t j = 0; j < components; j++) {
|
|
|
|
+ if (max_shifts[j] == 0) {
|
|
|
|
+ continue; // Zero delta, do not store
|
|
|
|
+ }
|
|
|
|
+ int32_t delta = _compute_delta16_signed(temp_packets[i - 1].data[j], temp_packets[i].data[j]);
|
|
|
|
+
|
|
|
|
+ ERR_FAIL_COND(delta < -32768 || delta > 32767); //sanity check
|
|
|
|
+
|
|
|
|
+ uint16_t deltau;
|
|
|
|
+ if (delta < 0) {
|
|
|
|
+ deltau = (ABS(delta) - 1) | (1 << max_shifts[j]);
|
|
|
|
+ } else {
|
|
|
|
+ deltau = delta;
|
|
|
|
+ }
|
|
|
|
+ _push_bits(data, bit_buffer, bits_used, deltau, max_shifts[j] + 1); // Include sign bit
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (bits_used != 0) {
|
|
|
|
+ ERR_FAIL_COND(bit_buffer > 0xFF); // Sanity check
|
|
|
|
+ data.push_back(bit_buffer);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ while (data.size() % 4 != 0) {
|
|
|
|
+ data.push_back(0); //pad to align with 4
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ temp_packets.clear();
|
|
|
|
+ validated_packet_count = 0;
|
|
|
|
+
|
|
|
|
+#ifdef DEBUG_PACKET_PUSH
|
|
|
|
+ ERR_FAIL_COND((data.size() - debug_data_size) != debug_packet_push);
|
|
|
|
+#endif
|
|
|
|
+ }
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+struct AnimationCompressionTimeState {
|
|
|
|
+ struct Packet {
|
|
|
|
+ uint32_t frame;
|
|
|
|
+ uint32_t offset;
|
|
|
|
+ uint32_t count;
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ LocalVector<Packet> packets;
|
|
|
|
+ //used for rollback
|
|
|
|
+ int32_t key_index = 0;
|
|
|
|
+ int32_t validated_packet_count = 0;
|
|
|
|
+ int32_t validated_key_index = -1;
|
|
|
|
+ bool needs_start_frame = false;
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+Vector3i Animation::_compress_key(uint32_t p_track, const AABB &p_bounds, int32_t p_key, float p_time) {
|
|
|
|
+ Vector3i values;
|
|
|
|
+ TrackType tt = track_get_type(p_track);
|
|
|
|
+ switch (tt) {
|
|
|
|
+ case TYPE_POSITION_3D: {
|
|
|
|
+ Vector3 pos;
|
|
|
|
+ if (p_key >= 0) {
|
|
|
|
+ position_track_get_key(p_track, p_key, &pos);
|
|
|
|
+ } else {
|
|
|
|
+ position_track_interpolate(p_track, p_time, &pos);
|
|
|
|
+ }
|
|
|
|
+ pos = (pos - p_bounds.position) / p_bounds.size;
|
|
|
|
+ for (int j = 0; j < 3; j++) {
|
|
|
|
+ values[j] = CLAMP(int32_t(pos[j] * 65535.0), 0, 65535);
|
|
|
|
+ }
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_ROTATION_3D: {
|
|
|
|
+ Quaternion rot;
|
|
|
|
+ if (p_key >= 0) {
|
|
|
|
+ rotation_track_get_key(p_track, p_key, &rot);
|
|
|
|
+ } else {
|
|
|
|
+ rotation_track_interpolate(p_track, p_time, &rot);
|
|
|
|
+ }
|
|
|
|
+ Vector3 axis = rot.get_axis();
|
|
|
|
+ float angle = rot.get_angle();
|
|
|
|
+ angle = Math::fposmod(double(angle), double(Math_PI * 2.0));
|
|
|
|
+ Vector2 oct = axis.octahedron_encode();
|
|
|
|
+ Vector3 rot_norm(oct.x, oct.y, angle / (Math_PI * 2.0)); // high resolution rotation in 0-1 angle.
|
|
|
|
+
|
|
|
|
+ for (int j = 0; j < 3; j++) {
|
|
|
|
+ values[j] = CLAMP(int32_t(rot_norm[j] * 65535.0), 0, 65535);
|
|
|
|
+ }
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_SCALE_3D: {
|
|
|
|
+ Vector3 scale;
|
|
|
|
+ if (p_key >= 0) {
|
|
|
|
+ scale_track_get_key(p_track, p_key, &scale);
|
|
|
|
+ } else {
|
|
|
|
+ scale_track_interpolate(p_track, p_time, &scale);
|
|
|
|
+ }
|
|
|
|
+ scale = (scale - p_bounds.position) / p_bounds.size;
|
|
|
|
+ for (int j = 0; j < 3; j++) {
|
|
|
|
+ values[j] = CLAMP(int32_t(scale[j] * 65535.0), 0, 65535);
|
|
|
|
+ }
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_BLEND_SHAPE: {
|
|
|
|
+ float blend;
|
|
|
|
+ if (p_key >= 0) {
|
|
|
|
+ blend_shape_track_get_key(p_track, p_key, &blend);
|
|
|
|
+ } else {
|
|
|
|
+ blend_shape_track_interpolate(p_track, p_time, &blend);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ blend = (blend / float(Compression::BLEND_SHAPE_RANGE)) * 0.5 + 0.5;
|
|
|
|
+ values[0] = CLAMP(int32_t(blend * 65535.0), 0, 65535);
|
|
|
|
+ } break;
|
|
|
|
+ default: {
|
|
|
|
+ ERR_FAIL_V(Vector3i()); //sanity check
|
|
|
|
+ } break;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return values;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+struct AnimationCompressionBufferBitsRead {
|
|
|
|
+ uint32_t buffer = 0;
|
|
|
|
+ uint32_t used = 0;
|
|
|
|
+ const uint8_t *src_data = nullptr;
|
|
|
|
+
|
|
|
|
+ _FORCE_INLINE_ uint32_t read(uint32_t p_bits) {
|
|
|
|
+ uint32_t output = 0;
|
|
|
|
+ uint32_t written = 0;
|
|
|
|
+ while (p_bits > 0) {
|
|
|
|
+ if (used == 0) {
|
|
|
|
+ used = 8;
|
|
|
|
+ buffer = *src_data;
|
|
|
|
+ src_data++;
|
|
|
|
+ }
|
|
|
|
+ uint32_t to_write = MIN(used, p_bits);
|
|
|
|
+ output |= (buffer & ((1 << to_write) - 1)) << written;
|
|
|
|
+ buffer >>= to_write;
|
|
|
|
+ used -= to_write;
|
|
|
|
+ p_bits -= to_write;
|
|
|
|
+ written += to_write;
|
|
|
|
+ }
|
|
|
|
+ return output;
|
|
|
|
+ }
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+void Animation::compress(uint32_t p_page_size, uint32_t p_fps, float p_split_tolerance) {
|
|
|
|
+ ERR_FAIL_COND_MSG(compression.enabled, "This animation is already compressed");
|
|
|
|
+
|
|
|
|
+ p_split_tolerance = CLAMP(p_split_tolerance, 1.1, 8.0);
|
|
|
|
+ compression.pages.clear();
|
|
|
|
+
|
|
|
|
+ uint32_t base_page_size = 0; // Before compressing pages, compute how large the "end page" datablock is.
|
|
|
|
+ LocalVector<uint32_t> tracks_to_compress;
|
|
|
|
+ LocalVector<AABB> track_bounds;
|
|
|
|
+ const uint32_t time_packet_size = 4;
|
|
|
|
+
|
|
|
|
+ const uint32_t track_header_size = 4 + 4 + 4; // pointer to time (4 bytes), amount of time keys (4 bytes) pointer to track data (4 bytes)
|
|
|
|
+
|
|
|
|
+ for (int i = 0; i < get_track_count(); i++) {
|
|
|
|
+ TrackType type = track_get_type(i);
|
|
|
|
+ if (type != TYPE_POSITION_3D && type != TYPE_ROTATION_3D && type != TYPE_SCALE_3D && type != TYPE_BLEND_SHAPE) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ if (track_get_key_count(i) == 0) {
|
|
|
|
+ continue; //do not compress, no keys
|
|
|
|
+ }
|
|
|
|
+ base_page_size += track_header_size; //pointer to beginning of each track timeline and amount of time keys
|
|
|
|
+ base_page_size += time_packet_size; //for end of track time marker
|
|
|
|
+ base_page_size += (type == TYPE_BLEND_SHAPE) ? 4 : 8; // at least the end of track packet (at much 8 bytes). This could be less, but have to be pessimistic.
|
|
|
|
+ tracks_to_compress.push_back(i);
|
|
|
|
+
|
|
|
|
+ AABB bounds;
|
|
|
|
+
|
|
|
|
+ if (type == TYPE_POSITION_3D) {
|
|
|
|
+ AABB aabb;
|
|
|
|
+ int kcount = track_get_key_count(i);
|
|
|
|
+ for (int j = 0; j < kcount; j++) {
|
|
|
|
+ Vector3 pos;
|
|
|
|
+ position_track_get_key(i, j, &pos);
|
|
|
|
+ if (j == 0) {
|
|
|
|
+ aabb.position = pos;
|
|
|
|
+ } else {
|
|
|
|
+ aabb.expand_to(pos);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ for (int j = 0; j < 3; j++) {
|
|
|
|
+ //cant have zero
|
|
|
|
+ if (aabb.size[j] < CMP_EPSILON) {
|
|
|
|
+ aabb.size[j] = CMP_EPSILON;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ bounds = aabb;
|
|
|
|
+ }
|
|
|
|
+ if (type == TYPE_SCALE_3D) {
|
|
|
|
+ AABB aabb;
|
|
|
|
+ int kcount = track_get_key_count(i);
|
|
|
|
+ for (int j = 0; j < kcount; j++) {
|
|
|
|
+ Vector3 scale;
|
|
|
|
+ scale_track_get_key(i, j, &scale);
|
|
|
|
+ if (j == 0) {
|
|
|
|
+ aabb.position = scale;
|
|
|
|
+ } else {
|
|
|
|
+ aabb.expand_to(scale);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ for (int j = 0; j < 3; j++) {
|
|
|
|
+ //cant have zero
|
|
|
|
+ if (aabb.size[j] < CMP_EPSILON) {
|
|
|
|
+ aabb.size[j] = CMP_EPSILON;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ bounds = aabb;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ track_bounds.push_back(bounds);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (tracks_to_compress.size() == 0) {
|
|
|
|
+ return; //nothing to compress
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ print_animc("Anim Compression:");
|
|
|
|
+ print_animc("-----------------");
|
|
|
|
+ print_animc("Tracks to compress: " + itos(tracks_to_compress.size()));
|
|
|
|
+
|
|
|
|
+ uint32_t current_frame = 0;
|
|
|
|
+ uint32_t base_page_frame = 0;
|
|
|
|
+ double frame_len = 1.0 / double(p_fps);
|
|
|
|
+ const uint32_t max_frames_per_page = 65536;
|
|
|
|
+
|
|
|
|
+ print_animc("Frame Len: " + rtos(frame_len));
|
|
|
|
+
|
|
|
|
+ LocalVector<AnimationCompressionDataState> data_tracks;
|
|
|
|
+ LocalVector<AnimationCompressionTimeState> time_tracks;
|
|
|
|
+
|
|
|
|
+ data_tracks.resize(tracks_to_compress.size());
|
|
|
|
+ time_tracks.resize(tracks_to_compress.size());
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < data_tracks.size(); i++) {
|
|
|
|
+ data_tracks[i].split_tolerance = p_split_tolerance;
|
|
|
|
+ if (track_get_type(tracks_to_compress[i]) == TYPE_BLEND_SHAPE) {
|
|
|
|
+ data_tracks[i].components = 1;
|
|
|
|
+ } else {
|
|
|
|
+ data_tracks[i].components = 3;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ while (true) {
|
|
|
|
+ // Begin by finding the keyframe in all tracks with the time closest to the current time
|
|
|
|
+ const uint32_t FRAME_MAX = 0xFFFFFFFF;
|
|
|
|
+ const int32_t NO_TRACK_FOUND = -1;
|
|
|
|
+ uint32_t best_frame = FRAME_MAX;
|
|
|
|
+ uint32_t best_invalid_frame = FRAME_MAX;
|
|
|
|
+ int32_t best_frame_track = NO_TRACK_FOUND; // Default is -1, which means all keyframes for this page are exhausted.
|
|
|
|
+ bool start_frame = false;
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < tracks_to_compress.size(); i++) {
|
|
|
|
+ uint32_t uncomp_track = tracks_to_compress[i];
|
|
|
|
+
|
|
|
|
+ if (time_tracks[i].key_index == track_get_key_count(uncomp_track)) {
|
|
|
|
+ if (time_tracks[i].needs_start_frame) {
|
|
|
|
+ start_frame = true;
|
|
|
|
+ best_frame = base_page_frame;
|
|
|
|
+ best_frame_track = i;
|
|
|
|
+ time_tracks[i].needs_start_frame = false;
|
|
|
|
+ break;
|
|
|
|
+ } else {
|
|
|
|
+ continue; // This track is exhausted (all keys were added already), don't consider.
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ uint32_t key_frame = double(track_get_key_time(uncomp_track, time_tracks[i].key_index)) / frame_len;
|
|
|
|
+
|
|
|
|
+ if (time_tracks[i].needs_start_frame && key_frame > base_page_frame) {
|
|
|
|
+ start_frame = true;
|
|
|
|
+ best_frame = base_page_frame;
|
|
|
|
+ best_frame_track = i;
|
|
|
|
+ time_tracks[i].needs_start_frame = false;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ERR_FAIL_COND(key_frame < base_page_frame); // Sanity check, should never happen
|
|
|
|
+
|
|
|
|
+ if (key_frame - base_page_frame >= max_frames_per_page) {
|
|
|
|
+ // Invalid because beyond the max frames allowed per page
|
|
|
|
+ best_invalid_frame = MIN(best_invalid_frame, key_frame);
|
|
|
|
+ } else if (key_frame < best_frame) {
|
|
|
|
+ best_frame = key_frame;
|
|
|
|
+ best_frame_track = i;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ print_animc("*KEY*: Current Frame: " + itos(current_frame) + " Best Frame: " + rtos(best_frame) + " Best Track: " + itos(best_frame_track) + " Start: " + String(start_frame ? "true" : "false"));
|
|
|
|
+
|
|
|
|
+ if (!start_frame && best_frame > current_frame) {
|
|
|
|
+ // Any case where the current frame advanced, either because nothing was found or because something was found greater than the current one.
|
|
|
|
+ print_animc("\tAdvance Condition.");
|
|
|
|
+ bool rollback = false;
|
|
|
|
+
|
|
|
|
+ // The frame has advanced, time to validate the previous frame
|
|
|
|
+ uint32_t current_page_size = base_page_size;
|
|
|
|
+ for (uint32_t i = 0; i < data_tracks.size(); i++) {
|
|
|
|
+ uint32_t track_size = data_tracks[i].data.size(); // track size
|
|
|
|
+ track_size += data_tracks[i].get_temp_packet_size(); // Add the temporary data
|
|
|
|
+ if (track_size > Compression::MAX_DATA_TRACK_SIZE) {
|
|
|
|
+ rollback = true; //track to large, time track can't point to keys any longer, because key offset is 12 bits
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ current_page_size += track_size;
|
|
|
|
+ }
|
|
|
|
+ for (uint32_t i = 0; i < time_tracks.size(); i++) {
|
|
|
|
+ current_page_size += time_tracks[i].packets.size() * 4; // time packet is 32 bits
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!rollback && current_page_size > p_page_size) {
|
|
|
|
+ rollback = true;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ print_animc("\tCurrent Page Size: " + itos(current_page_size) + "/" + itos(p_page_size) + " Rollback? " + String(rollback ? "YES!" : "no"));
|
|
|
|
+
|
|
|
|
+ if (rollback) {
|
|
|
|
+ // Not valid any longer, so rollback and commit page
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < data_tracks.size(); i++) {
|
|
|
|
+ data_tracks[i].temp_packets.resize(data_tracks[i].validated_packet_count);
|
|
|
|
+ }
|
|
|
|
+ for (uint32_t i = 0; i < time_tracks.size(); i++) {
|
|
|
|
+ time_tracks[i].key_index = time_tracks[i].validated_key_index; //rollback key
|
|
|
|
+ time_tracks[i].packets.resize(time_tracks[i].validated_packet_count);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ // All valid, so save rollback information
|
|
|
|
+ for (uint32_t i = 0; i < data_tracks.size(); i++) {
|
|
|
|
+ data_tracks[i].validated_packet_count = data_tracks[i].temp_packets.size();
|
|
|
|
+ }
|
|
|
|
+ for (uint32_t i = 0; i < time_tracks.size(); i++) {
|
|
|
|
+ time_tracks[i].validated_key_index = time_tracks[i].key_index;
|
|
|
|
+ time_tracks[i].validated_packet_count = time_tracks[i].packets.size();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Accept this frame as the frame being processed (as long as it exists)
|
|
|
|
+ if (best_frame != FRAME_MAX) {
|
|
|
|
+ current_frame = best_frame;
|
|
|
|
+ print_animc("\tValidated, New Current Frame: " + itos(current_frame));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (rollback || best_frame == FRAME_MAX) {
|
|
|
|
+ // Commit the page if had to rollback or if no track was found
|
|
|
|
+ print_animc("\tCommiting page..");
|
|
|
|
+
|
|
|
|
+ // The end frame for the page depends entirely on whether its valid or
|
|
|
|
+ // no more keys were found.
|
|
|
|
+ // If not valid, then the end frame is the current frame (as this means the current frame is being rolled back
|
|
|
|
+ // If valid, then the end frame is the next invalid one (in case more frames exist), or the current frame in case no more frames exist.
|
|
|
|
+ uint32_t page_end_frame = (rollback || best_frame == FRAME_MAX) ? current_frame : best_invalid_frame;
|
|
|
|
+
|
|
|
|
+ print_animc("\tEnd Frame: " + itos(page_end_frame) + ", " + rtos(page_end_frame * frame_len) + "s");
|
|
|
|
+
|
|
|
|
+ // Add finalizer frames and commit pending tracks
|
|
|
|
+ uint32_t finalizer_local_frame = page_end_frame - base_page_frame;
|
|
|
|
+
|
|
|
|
+ uint32_t total_page_size = 0;
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < data_tracks.size(); i++) {
|
|
|
|
+ if (data_tracks[i].temp_packets.size() == 0 || (data_tracks[i].temp_packets[data_tracks[i].temp_packets.size() - 1].frame) < finalizer_local_frame) {
|
|
|
|
+ // Add finalizer frame if it makes sense
|
|
|
|
+ Vector3i values = _compress_key(tracks_to_compress[i], track_bounds[i], -1, page_end_frame * frame_len);
|
|
|
|
+
|
|
|
|
+ bool first_key = data_tracks[i].insert_key(finalizer_local_frame, values);
|
|
|
|
+ if (first_key) {
|
|
|
|
+ AnimationCompressionTimeState::Packet p;
|
|
|
|
+ p.count = 1;
|
|
|
|
+ p.frame = finalizer_local_frame;
|
|
|
|
+ p.offset = data_tracks[i].data.size();
|
|
|
|
+ time_tracks[i].packets.push_back(p);
|
|
|
|
+ } else {
|
|
|
|
+ ERR_FAIL_COND(time_tracks[i].packets.size() == 0);
|
|
|
|
+ time_tracks[i].packets[time_tracks[i].packets.size() - 1].count++;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ data_tracks[i].commit_temp_packets();
|
|
|
|
+ total_page_size += data_tracks[i].data.size();
|
|
|
|
+ total_page_size += time_tracks[i].packets.size() * 4;
|
|
|
|
+ total_page_size += track_header_size;
|
|
|
|
+
|
|
|
|
+ print_animc("\tTrack " + itos(i) + " time packets: " + itos(time_tracks[i].packets.size()) + " Packet data: " + itos(data_tracks[i].data.size()));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ print_animc("\tTotal page Size: " + itos(total_page_size) + "/" + itos(p_page_size));
|
|
|
|
+
|
|
|
|
+ // Create Page
|
|
|
|
+ Vector<uint8_t> page_data;
|
|
|
|
+ page_data.resize(total_page_size);
|
|
|
|
+ {
|
|
|
|
+ uint8_t *page_ptr = page_data.ptrw();
|
|
|
|
+ uint32_t base_offset = data_tracks.size() * track_header_size;
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < data_tracks.size(); i++) {
|
|
|
|
+ encode_uint32(base_offset, page_ptr + (track_header_size * i + 0));
|
|
|
|
+ uint16_t *key_time_ptr = (uint16_t *)(page_ptr + base_offset);
|
|
|
|
+ for (uint32_t j = 0; j < time_tracks[i].packets.size(); j++) {
|
|
|
|
+ key_time_ptr[j * 2 + 0] = uint16_t(time_tracks[i].packets[j].frame);
|
|
|
|
+ uint16_t ptr = time_tracks[i].packets[j].offset / 4;
|
|
|
|
+ ptr |= (time_tracks[i].packets[j].count - 1) << 12;
|
|
|
|
+ key_time_ptr[j * 2 + 1] = ptr;
|
|
|
|
+ base_offset += 4;
|
|
|
|
+ }
|
|
|
|
+ encode_uint32(time_tracks[i].packets.size(), page_ptr + (track_header_size * i + 4));
|
|
|
|
+ encode_uint32(base_offset, page_ptr + (track_header_size * i + 8));
|
|
|
|
+ memcpy(page_ptr + base_offset, data_tracks[i].data.ptr(), data_tracks[i].data.size());
|
|
|
|
+ base_offset += data_tracks[i].data.size();
|
|
|
|
+
|
|
|
|
+ //reset track
|
|
|
|
+ data_tracks[i].data.clear();
|
|
|
|
+ data_tracks[i].temp_packets.clear();
|
|
|
|
+ data_tracks[i].validated_packet_count = -1;
|
|
|
|
+
|
|
|
|
+ time_tracks[i].needs_start_frame = true; //Not required the first time, but from now on it is.
|
|
|
|
+ time_tracks[i].packets.clear();
|
|
|
|
+ time_tracks[i].validated_key_index = -1;
|
|
|
|
+ time_tracks[i].validated_packet_count = 0;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Compression::Page page;
|
|
|
|
+ page.data = page_data;
|
|
|
|
+ page.time_offset = base_page_frame * frame_len;
|
|
|
|
+ compression.pages.push_back(page);
|
|
|
|
+
|
|
|
|
+ if (!rollback && best_invalid_frame == FRAME_MAX) {
|
|
|
|
+ break; // No more pages to add.
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ current_frame = page_end_frame;
|
|
|
|
+ base_page_frame = page_end_frame;
|
|
|
|
+
|
|
|
|
+ continue; // Start over
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // A key was found for the current frame and all is ok
|
|
|
|
+
|
|
|
|
+ uint32_t comp_track = best_frame_track;
|
|
|
|
+ Vector3i values;
|
|
|
|
+
|
|
|
|
+ if (start_frame) {
|
|
|
|
+ // Interpolate
|
|
|
|
+ values = _compress_key(tracks_to_compress[comp_track], track_bounds[comp_track], -1, base_page_frame * frame_len);
|
|
|
|
+ } else {
|
|
|
|
+ uint32_t key = time_tracks[comp_track].key_index;
|
|
|
|
+ values = _compress_key(tracks_to_compress[comp_track], track_bounds[comp_track], key);
|
|
|
|
+ time_tracks[comp_track].key_index++; //goto next key (but could be rolled back if beyond page size).
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ bool first_key = data_tracks[comp_track].insert_key(best_frame - base_page_frame, values);
|
|
|
|
+ if (first_key) {
|
|
|
|
+ AnimationCompressionTimeState::Packet p;
|
|
|
|
+ p.count = 1;
|
|
|
|
+ p.frame = best_frame - base_page_frame;
|
|
|
|
+ p.offset = data_tracks[comp_track].data.size();
|
|
|
|
+ time_tracks[comp_track].packets.push_back(p);
|
|
|
|
+ } else {
|
|
|
|
+ ERR_CONTINUE(time_tracks[comp_track].packets.size() == 0);
|
|
|
|
+ time_tracks[comp_track].packets[time_tracks[comp_track].packets.size() - 1].count++;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ compression.bounds = track_bounds;
|
|
|
|
+ compression.fps = p_fps;
|
|
|
|
+ compression.enabled = true;
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < tracks_to_compress.size(); i++) {
|
|
|
|
+ Track *t = tracks[tracks_to_compress[i]];
|
|
|
|
+ t->interpolation = INTERPOLATION_LINEAR; //only linear supported
|
|
|
|
+ switch (t->type) {
|
|
|
|
+ case TYPE_POSITION_3D: {
|
|
|
|
+ PositionTrack *tt = static_cast<PositionTrack *>(t);
|
|
|
|
+ tt->positions.clear();
|
|
|
|
+ tt->compressed_track = i;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_ROTATION_3D: {
|
|
|
|
+ RotationTrack *rt = static_cast<RotationTrack *>(t);
|
|
|
|
+ rt->rotations.clear();
|
|
|
|
+ rt->compressed_track = i;
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_SCALE_3D: {
|
|
|
|
+ ScaleTrack *st = static_cast<ScaleTrack *>(t);
|
|
|
|
+ st->scales.clear();
|
|
|
|
+ st->compressed_track = i;
|
|
|
|
+ print_line("Scale Bounds " + itos(i) + ": " + track_bounds[i]);
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_BLEND_SHAPE: {
|
|
|
|
+ BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
|
|
|
|
+ bst->blend_shapes.clear();
|
|
|
|
+ bst->compressed_track = i;
|
|
|
|
+ } break;
|
|
|
|
+ default: {
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+#if 1
|
|
|
|
+ uint32_t orig_size = 0;
|
|
|
|
+ for (int i = 0; i < get_track_count(); i++) {
|
|
|
|
+ switch (track_get_type(i)) {
|
|
|
|
+ case TYPE_SCALE_3D:
|
|
|
|
+ case TYPE_POSITION_3D: {
|
|
|
|
+ orig_size += sizeof(TKey<Vector3>) * track_get_key_count(i);
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_ROTATION_3D: {
|
|
|
|
+ orig_size += sizeof(TKey<Quaternion>) * track_get_key_count(i);
|
|
|
|
+ } break;
|
|
|
|
+ case TYPE_BLEND_SHAPE: {
|
|
|
|
+ orig_size += sizeof(TKey<float>) * track_get_key_count(i);
|
|
|
|
+ } break;
|
|
|
|
+ default: {
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ uint32_t new_size = 0;
|
|
|
|
+ for (uint32_t i = 0; i < compression.pages.size(); i++) {
|
|
|
|
+ new_size += compression.pages[i].data.size();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ print_line("Original size: " + itos(orig_size) + " - Compressed size: " + itos(new_size) + " " + String::num(float(new_size) / float(orig_size) * 100, 2) + "% pages: " + itos(compression.pages.size()));
|
|
|
|
+#endif
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+bool Animation::_rotation_interpolate_compressed(uint32_t p_compressed_track, double p_time, Quaternion &r_ret) const {
|
|
|
|
+ Vector3i current;
|
|
|
|
+ Vector3i next;
|
|
|
|
+ double time_current;
|
|
|
|
+ double time_next;
|
|
|
|
+
|
|
|
|
+ if (!_fetch_compressed<3>(p_compressed_track, p_time, current, time_current, next, time_next)) {
|
|
|
|
+ return false; //some sort of problem
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (time_current >= p_time || time_current == time_next) {
|
|
|
|
+ r_ret = _uncompress_quaternion(current);
|
|
|
|
+ } else if (p_time >= time_next) {
|
|
|
|
+ r_ret = _uncompress_quaternion(next);
|
|
|
|
+ } else {
|
|
|
|
+ double c = (p_time - time_current) / (time_next - time_current);
|
|
|
|
+ Quaternion from = _uncompress_quaternion(current);
|
|
|
|
+ Quaternion to = _uncompress_quaternion(next);
|
|
|
|
+ r_ret = from.slerp(to, c);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return true;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+bool Animation::_pos_scale_interpolate_compressed(uint32_t p_compressed_track, double p_time, Vector3 &r_ret) const {
|
|
|
|
+ Vector3i current;
|
|
|
|
+ Vector3i next;
|
|
|
|
+ double time_current;
|
|
|
|
+ double time_next;
|
|
|
|
+
|
|
|
|
+ if (!_fetch_compressed<3>(p_compressed_track, p_time, current, time_current, next, time_next)) {
|
|
|
|
+ return false; //some sort of problem
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (time_current >= p_time || time_current == time_next) {
|
|
|
|
+ r_ret = _uncompress_pos_scale(p_compressed_track, current);
|
|
|
|
+ } else if (p_time >= time_next) {
|
|
|
|
+ r_ret = _uncompress_pos_scale(p_compressed_track, next);
|
|
|
|
+ } else {
|
|
|
|
+ double c = (p_time - time_current) / (time_next - time_current);
|
|
|
|
+ Vector3 from = _uncompress_pos_scale(p_compressed_track, current);
|
|
|
|
+ Vector3 to = _uncompress_pos_scale(p_compressed_track, next);
|
|
|
|
+ r_ret = from.lerp(to, c);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return true;
|
|
|
|
+}
|
|
|
|
+bool Animation::_blend_shape_interpolate_compressed(uint32_t p_compressed_track, double p_time, float &r_ret) const {
|
|
|
|
+ Vector3i current;
|
|
|
|
+ Vector3i next;
|
|
|
|
+ double time_current;
|
|
|
|
+ double time_next;
|
|
|
|
+
|
|
|
|
+ if (!_fetch_compressed<1>(p_compressed_track, p_time, current, time_current, next, time_next)) {
|
|
|
|
+ return false; //some sort of problem
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (time_current >= p_time || time_current == time_next) {
|
|
|
|
+ r_ret = _uncompress_blend_shape(current);
|
|
|
|
+ } else if (p_time >= time_next) {
|
|
|
|
+ r_ret = _uncompress_blend_shape(next);
|
|
|
|
+ } else {
|
|
|
|
+ float c = (p_time - time_current) / (time_next - time_current);
|
|
|
|
+ float from = _uncompress_blend_shape(current);
|
|
|
|
+ float to = _uncompress_blend_shape(next);
|
|
|
|
+ r_ret = Math::lerp(from, to, c);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return true;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+template <uint32_t COMPONENTS>
|
|
|
|
+bool Animation::_fetch_compressed(uint32_t p_compressed_track, double p_time, Vector3i &r_current_value, double &r_current_time, Vector3i &r_next_value, double &r_next_time, uint32_t *key_index) const {
|
|
|
|
+ ERR_FAIL_COND_V(!compression.enabled, false);
|
|
|
|
+ ERR_FAIL_INDEX_V(p_compressed_track, compression.bounds.size(), false);
|
|
|
|
+ p_time = CLAMP(p_time, 0, length);
|
|
|
|
+ if (key_index) {
|
|
|
|
+ *key_index = 0;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ double frame_to_sec = 1.0 / double(compression.fps);
|
|
|
|
+
|
|
|
|
+ int32_t page_index = -1;
|
|
|
|
+ for (uint32_t i = 0; i < compression.pages.size(); i++) {
|
|
|
|
+ if (compression.pages[i].time_offset > p_time) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ page_index = i;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ERR_FAIL_COND_V(page_index == -1, false); //should not happen
|
|
|
|
+
|
|
|
|
+ double page_base_time = compression.pages[page_index].time_offset;
|
|
|
|
+ const uint8_t *page_data = compression.pages[page_index].data.ptr();
|
|
|
|
+#ifndef _MSC_VER
|
|
|
|
+#warning Little endian assumed. No major big endian hardware exists any longer, but in case it does it will need to be supported
|
|
|
|
+#endif
|
|
|
|
+ const uint32_t *indices = (const uint32_t *)page_data;
|
|
|
|
+ const uint16_t *time_keys = (const uint16_t *)&page_data[indices[p_compressed_track * 3 + 0]];
|
|
|
|
+ uint32_t time_key_count = indices[p_compressed_track * 3 + 1];
|
|
|
|
+
|
|
|
|
+ int32_t packet_idx = 0;
|
|
|
|
+ double packet_time = double(time_keys[0]) * frame_to_sec + page_base_time;
|
|
|
|
+ uint32_t base_frame = time_keys[0];
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 1; i < time_key_count; i++) {
|
|
|
|
+ uint32_t f = time_keys[i * 2 + 0];
|
|
|
|
+ double frame_time = double(f) * frame_to_sec + page_base_time;
|
|
|
|
+
|
|
|
|
+ if (frame_time > p_time) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (key_index) {
|
|
|
|
+ (*key_index) += (time_keys[(i - 1) * 2 + 1] >> 12) + 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ packet_idx = i;
|
|
|
|
+ packet_time = frame_time;
|
|
|
|
+ base_frame = f;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ const uint8_t *data_keys_base = (const uint8_t *)&page_data[indices[p_compressed_track * 3 + 2]];
|
|
|
|
+
|
|
|
|
+ uint16_t time_key_data = time_keys[packet_idx * 2 + 1];
|
|
|
|
+ uint32_t data_offset = (time_key_data & 0xFFF) * 4; // lower 12 bits
|
|
|
|
+ uint32_t data_count = (time_key_data >> 12) + 1;
|
|
|
|
+
|
|
|
|
+ const uint16_t *data_key = (const uint16_t *)(data_keys_base + data_offset);
|
|
|
|
+
|
|
|
|
+ uint16_t decode[COMPONENTS];
|
|
|
|
+ uint16_t decode_next[COMPONENTS];
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < COMPONENTS; i++) {
|
|
|
|
+ decode[i] = data_key[i];
|
|
|
|
+ decode_next[i] = data_key[i];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ double next_time = packet_time;
|
|
|
|
+
|
|
|
|
+ if (p_time > packet_time) { // If its equal or less, then don't bother
|
|
|
|
+ if (data_count > 1) {
|
|
|
|
+ //decode forward
|
|
|
|
+ uint32_t bit_width[COMPONENTS];
|
|
|
|
+ for (uint32_t i = 0; i < COMPONENTS; i++) {
|
|
|
|
+ bit_width[i] = (data_key[COMPONENTS] >> (i * 4)) & 0xF;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ uint32_t frame_bit_width = (data_key[COMPONENTS] >> 12) + 1;
|
|
|
|
+
|
|
|
|
+ AnimationCompressionBufferBitsRead buffer;
|
|
|
|
+
|
|
|
|
+ buffer.src_data = (const uint8_t *)&data_key[COMPONENTS + 1];
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 1; i < data_count; i++) {
|
|
|
|
+ uint32_t frame_delta = buffer.read(frame_bit_width);
|
|
|
|
+ base_frame += frame_delta;
|
|
|
|
+
|
|
|
|
+ for (uint32_t j = 0; j < COMPONENTS; j++) {
|
|
|
|
+ if (bit_width[j] == 0) {
|
|
|
|
+ continue; // do none
|
|
|
|
+ }
|
|
|
|
+ uint32_t valueu = buffer.read(bit_width[j] + 1);
|
|
|
|
+ bool sign = valueu & (1 << bit_width[j]);
|
|
|
|
+ int16_t value = valueu & ((1 << bit_width[j]) - 1);
|
|
|
|
+ if (sign) {
|
|
|
|
+ value = -value - 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ decode_next[j] += value;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ next_time = double(base_frame) * frame_to_sec + page_base_time;
|
|
|
|
+ if (p_time < next_time) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ packet_time = next_time;
|
|
|
|
+
|
|
|
|
+ for (uint32_t j = 0; j < COMPONENTS; j++) {
|
|
|
|
+ decode[j] = decode_next[j];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (key_index) {
|
|
|
|
+ (*key_index)++;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (p_time > next_time) { // > instead of >= because if its equal, then it will be properly interpolated anyway
|
|
|
|
+ // So, the last frame found still has a time that is less than the required frame,
|
|
|
|
+ // will have to interpolate with the first frame of the next timekey.
|
|
|
|
+
|
|
|
|
+ if ((uint32_t)packet_idx < time_key_count - 1) { // Sanity check but should not matter much, otherwise current next packet is last packet
|
|
|
|
+
|
|
|
|
+ uint16_t time_key_data_next = time_keys[(packet_idx + 1) * 2 + 1];
|
|
|
|
+ uint32_t data_offset_next = (time_key_data_next & 0xFFF) * 4; // Lower 12 bits
|
|
|
|
+
|
|
|
|
+ const uint16_t *data_key_next = (const uint16_t *)(data_keys_base + data_offset_next);
|
|
|
|
+ base_frame = time_keys[(packet_idx + 1) * 2 + 0];
|
|
|
|
+ next_time = double(base_frame) * frame_to_sec + page_base_time;
|
|
|
|
+ for (uint32_t i = 0; i < COMPONENTS; i++) {
|
|
|
|
+ decode_next[i] = data_key_next[i];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ r_current_time = packet_time;
|
|
|
|
+ r_next_time = next_time;
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < COMPONENTS; i++) {
|
|
|
|
+ r_current_value[i] = decode[i];
|
|
|
|
+ r_next_value[i] = decode_next[i];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return true;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+template <uint32_t COMPONENTS>
|
|
|
|
+void Animation::_get_compressed_key_indices_in_range(uint32_t p_compressed_track, double p_time, double p_delta, List<int> *r_indices) const {
|
|
|
|
+ ERR_FAIL_COND(!compression.enabled);
|
|
|
|
+ ERR_FAIL_INDEX(p_compressed_track, compression.bounds.size());
|
|
|
|
+
|
|
|
|
+ double frame_to_sec = 1.0 / double(compression.fps);
|
|
|
|
+ uint32_t key_index = 0;
|
|
|
|
+
|
|
|
|
+ for (uint32_t p = 0; p < compression.pages.size(); p++) {
|
|
|
|
+ if (compression.pages[p].time_offset >= p_time + p_delta) {
|
|
|
|
+ // Page beyond range
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Page within range
|
|
|
|
+
|
|
|
|
+ uint32_t page_index = p;
|
|
|
|
+
|
|
|
|
+ double page_base_time = compression.pages[page_index].time_offset;
|
|
|
|
+ const uint8_t *page_data = compression.pages[page_index].data.ptr();
|
|
|
|
+#ifndef _MSC_VER
|
|
|
|
+#warning Little endian assumed. No major big endian hardware exists any longer, but in case it does it will need to be supported
|
|
|
|
+#endif
|
|
|
|
+ const uint32_t *indices = (const uint32_t *)page_data;
|
|
|
|
+ const uint16_t *time_keys = (const uint16_t *)&page_data[indices[p_compressed_track * 3 + 0]];
|
|
|
|
+ uint32_t time_key_count = indices[p_compressed_track * 3 + 1];
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < time_key_count; i++) {
|
|
|
|
+ uint32_t f = time_keys[i * 2 + 0];
|
|
|
|
+ double frame_time = f * frame_to_sec + page_base_time;
|
|
|
|
+ if (frame_time >= p_time + p_delta) {
|
|
|
|
+ return;
|
|
|
|
+ } else if (frame_time >= p_time) {
|
|
|
|
+ r_indices->push_back(key_index);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ key_index++;
|
|
|
|
+
|
|
|
|
+ const uint8_t *data_keys_base = (const uint8_t *)&page_data[indices[p_compressed_track * 3 + 2]];
|
|
|
|
+
|
|
|
|
+ uint16_t time_key_data = time_keys[i * 2 + 1];
|
|
|
|
+ uint32_t data_offset = (time_key_data & 0xFFF) * 4; // lower 12 bits
|
|
|
|
+ uint32_t data_count = (time_key_data >> 12) + 1;
|
|
|
|
+
|
|
|
|
+ const uint16_t *data_key = (const uint16_t *)(data_keys_base + data_offset);
|
|
|
|
+
|
|
|
|
+ if (data_count > 1) {
|
|
|
|
+ //decode forward
|
|
|
|
+ uint32_t bit_width[COMPONENTS];
|
|
|
|
+ for (uint32_t j = 0; j < COMPONENTS; j++) {
|
|
|
|
+ bit_width[j] = (data_key[COMPONENTS] >> (j * 4)) & 0xF;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ uint32_t frame_bit_width = (data_key[COMPONENTS] >> 12) + 1;
|
|
|
|
+
|
|
|
|
+ AnimationCompressionBufferBitsRead buffer;
|
|
|
|
+
|
|
|
|
+ buffer.src_data = (const uint8_t *)&data_key[COMPONENTS + 1];
|
|
|
|
+
|
|
|
|
+ for (uint32_t j = 1; j < data_count; j++) {
|
|
|
|
+ uint32_t frame_delta = buffer.read(frame_bit_width);
|
|
|
|
+ f += frame_delta;
|
|
|
|
+
|
|
|
|
+ frame_time = f * frame_to_sec + page_base_time;
|
|
|
|
+ if (frame_time >= p_time + p_delta) {
|
|
|
|
+ return;
|
|
|
|
+ } else if (frame_time >= p_time) {
|
|
|
|
+ r_indices->push_back(key_index);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ for (uint32_t k = 0; k < COMPONENTS; k++) {
|
|
|
|
+ if (bit_width[k] == 0) {
|
|
|
|
+ continue; // do none
|
|
|
|
+ }
|
|
|
|
+ buffer.read(bit_width[k] + 1); // skip
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ key_index++;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+int Animation::_get_compressed_key_count(uint32_t p_compressed_track) const {
|
|
|
|
+ ERR_FAIL_COND_V(!compression.enabled, -1);
|
|
|
|
+ ERR_FAIL_UNSIGNED_INDEX_V(p_compressed_track, compression.bounds.size(), -1);
|
|
|
|
+
|
|
|
|
+ int key_count = 0;
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < compression.pages.size(); i++) {
|
|
|
|
+ const uint8_t *page_data = compression.pages[i].data.ptr();
|
|
|
|
+#ifndef _MSC_VER
|
|
|
|
+#warning Little endian assumed. No major big endian hardware exists any longer, but in case it does it will need to be supported
|
|
|
|
+#endif
|
|
|
|
+ const uint32_t *indices = (const uint32_t *)page_data;
|
|
|
|
+ const uint16_t *time_keys = (const uint16_t *)&page_data[indices[p_compressed_track * 3 + 0]];
|
|
|
|
+ uint32_t time_key_count = indices[p_compressed_track * 3 + 1];
|
|
|
|
+
|
|
|
|
+ for (uint32_t j = 0; j < time_key_count; j++) {
|
|
|
|
+ key_count += (time_keys[j * 2 + 1] >> 12) + 1;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return key_count;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+Quaternion Animation::_uncompress_quaternion(const Vector3i &p_value) const {
|
|
|
|
+ Vector3 axis = Vector3::octahedron_decode(Vector2(float(p_value.x) / 65535.0, float(p_value.y) / 65535.0));
|
|
|
|
+ float angle = (float(p_value.z) / 65535.0) * 2.0 * Math_PI;
|
|
|
|
+ return Quaternion(axis, angle);
|
|
|
|
+}
|
|
|
|
+Vector3 Animation::_uncompress_pos_scale(uint32_t p_compressed_track, const Vector3i &p_value) const {
|
|
|
|
+ Vector3 pos_norm(float(p_value.x) / 65535.0, float(p_value.y) / 65535.0, float(p_value.z) / 65535.0);
|
|
|
|
+ return compression.bounds[p_compressed_track].position + pos_norm * compression.bounds[p_compressed_track].size;
|
|
|
|
+}
|
|
|
|
+float Animation::_uncompress_blend_shape(const Vector3i &p_value) const {
|
|
|
|
+ float bsn = float(p_value.x) / 65535.0;
|
|
|
|
+ return (bsn * 2.0 - 1.0) * float(Compression::BLEND_SHAPE_RANGE);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+template <uint32_t COMPONENTS>
|
|
|
|
+bool Animation::_fetch_compressed_by_index(uint32_t p_compressed_track, int p_index, Vector3i &r_value, double &r_time) const {
|
|
|
|
+ ERR_FAIL_COND_V(!compression.enabled, false);
|
|
|
|
+ ERR_FAIL_INDEX_V(p_compressed_track, compression.bounds.size(), false);
|
|
|
|
+
|
|
|
|
+ for (uint32_t i = 0; i < compression.pages.size(); i++) {
|
|
|
|
+ const uint8_t *page_data = compression.pages[i].data.ptr();
|
|
|
|
+#ifndef _MSC_VER
|
|
|
|
+#warning Little endian assumed. No major big endian hardware exists any longer, but in case it does it will need to be supported
|
|
|
|
+#endif
|
|
|
|
+ const uint32_t *indices = (const uint32_t *)page_data;
|
|
|
|
+ const uint16_t *time_keys = (const uint16_t *)&page_data[indices[p_compressed_track * 3 + 0]];
|
|
|
|
+ uint32_t time_key_count = indices[p_compressed_track * 3 + 1];
|
|
|
|
+ const uint8_t *data_keys_base = (const uint8_t *)&page_data[indices[p_compressed_track * 3 + 2]];
|
|
|
|
+
|
|
|
|
+ for (uint32_t j = 0; j < time_key_count; j++) {
|
|
|
|
+ uint32_t subkeys = (time_keys[j * 2 + 1] >> 12) + 1;
|
|
|
|
+ if ((uint32_t)p_index < subkeys) {
|
|
|
|
+ uint16_t data_offset = (time_keys[j * 2 + 1] & 0xFFF) * 4;
|
|
|
|
+
|
|
|
|
+ const uint16_t *data_key = (const uint16_t *)(data_keys_base + data_offset);
|
|
|
|
+
|
|
|
|
+ uint16_t frame = time_keys[j * 2 + 0];
|
|
|
|
+ uint16_t decode[COMPONENTS];
|
|
|
|
+
|
|
|
|
+ for (uint32_t k = 0; k < COMPONENTS; k++) {
|
|
|
|
+ decode[k] = data_key[k];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (p_index > 0) {
|
|
|
|
+ uint32_t bit_width[COMPONENTS];
|
|
|
|
+ for (uint32_t k = 0; k < COMPONENTS; k++) {
|
|
|
|
+ bit_width[k] = (data_key[COMPONENTS] >> (k * 4)) & 0xF;
|
|
|
|
+ }
|
|
|
|
+ uint32_t frame_bit_width = (data_key[COMPONENTS] >> 12) + 1;
|
|
|
|
+
|
|
|
|
+ AnimationCompressionBufferBitsRead buffer;
|
|
|
|
+ buffer.src_data = (const uint8_t *)&data_key[COMPONENTS + 1];
|
|
|
|
+
|
|
|
|
+ for (int k = 0; k < p_index; k++) {
|
|
|
|
+ uint32_t frame_delta = buffer.read(frame_bit_width);
|
|
|
|
+ frame += frame_delta;
|
|
|
|
+ for (uint32_t l = 0; l < COMPONENTS; l++) {
|
|
|
|
+ if (bit_width[l] == 0) {
|
|
|
|
+ continue; // do none
|
|
|
|
+ }
|
|
|
|
+ uint32_t valueu = buffer.read(bit_width[l] + 1);
|
|
|
|
+ bool sign = valueu & (1 << bit_width[l]);
|
|
|
|
+ int16_t value = valueu & ((1 << bit_width[l]) - 1);
|
|
|
|
+ if (sign) {
|
|
|
|
+ value = -value - 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ decode[l] += value;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ r_time = compression.pages[i].time_offset + double(frame) / double(compression.fps);
|
|
|
|
+ for (uint32_t l = 0; l < COMPONENTS; l++) {
|
|
|
|
+ r_value[l] = decode[l];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return true;
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ p_index -= subkeys;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return false;
|
|
|
|
+}
|
|
|
|
+
|
|
Animation::Animation() {}
|
|
Animation::Animation() {}
|
|
|
|
|
|
Animation::~Animation() {
|
|
Animation::~Animation() {
|