godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #85266 from KoBeWi/copy_more_RAM 

Fix TrackCache memory crash
This commit is contained in:
Rémi Verschelde 2023-11-24 00:00:23 +01:00
parent ce3bac5f55 1c0a0f5fdd
commit e6c8d40d10
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 76 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
scene/animation/animation_mixer.cpp
View File

@ -2138,3 +2138,73 @@ AnimationMixer::AnimationMixer() {
AnimationMixer::~AnimationMixer() { AnimationMixer::~AnimationMixer() {
} }
void AnimatedValuesBackup::set_data(const HashMap<NodePath, AnimationMixer::TrackCache *> p_data) {
clear_data();
for (const KeyValue<NodePath, AnimationMixer::TrackCache *> &E : p_data) {
data.insert(E.key, get_cache_copy(E.value));
}
}
HashMap<NodePath, AnimationMixer::TrackCache *> AnimatedValuesBackup::get_data() const {
HashMap<NodePath, AnimationMixer::TrackCache *> ret;
for (const KeyValue<NodePath, AnimationMixer::TrackCache *> &E : data) {
ret.insert(E.key, get_cache_copy(E.value));
}
return ret;
}
void AnimatedValuesBackup::clear_data() {
for (KeyValue<NodePath, AnimationMixer::TrackCache *> &K : data) {
memdelete(K.value);
}
data.clear();
}
AnimationMixer::TrackCache *AnimatedValuesBackup::get_cache_copy(AnimationMixer::TrackCache *p_cache) const {
switch (p_cache->type) {
case Animation::TYPE_VALUE: {
AnimationMixer::TrackCacheValue *src = static_cast<AnimationMixer::TrackCacheValue *>(p_cache);
AnimationMixer::TrackCacheValue *tc = memnew(AnimationMixer::TrackCacheValue);
memcpy((void *)tc, (void *)src, sizeof(AnimationMixer::TrackCacheValue));
return tc;
}
case Animation::TYPE_POSITION_3D:
case Animation::TYPE_ROTATION_3D:
case Animation::TYPE_SCALE_3D: {
AnimationMixer::TrackCacheTransform *src = static_cast<AnimationMixer::TrackCacheTransform *>(p_cache);
AnimationMixer::TrackCacheTransform *tc = memnew(AnimationMixer::TrackCacheTransform);
memcpy((void *)tc, (void *)src, sizeof(AnimationMixer::TrackCacheTransform));
return tc;
}
case Animation::TYPE_BLEND_SHAPE: {
AnimationMixer::TrackCacheBlendShape *src = static_cast<AnimationMixer::TrackCacheBlendShape *>(p_cache);
AnimationMixer::TrackCacheBlendShape *tc = memnew(AnimationMixer::TrackCacheBlendShape);
memcpy((void *)tc, (void *)src, sizeof(AnimationMixer::TrackCacheBlendShape));
return tc;
}
case Animation::TYPE_BEZIER: {
AnimationMixer::TrackCacheBezier *src = static_cast<AnimationMixer::TrackCacheBezier *>(p_cache);
AnimationMixer::TrackCacheBezier *tc = memnew(AnimationMixer::TrackCacheBezier);
memcpy((void *)tc, (void *)src, sizeof(AnimationMixer::TrackCacheBezier));
return tc;
}
case Animation::TYPE_AUDIO: {
AnimationMixer::TrackCacheAudio *src = static_cast<AnimationMixer::TrackCacheAudio *>(p_cache);
AnimationMixer::TrackCacheAudio *tc = memnew(AnimationMixer::TrackCacheAudio);
memcpy((void *)tc, (void *)src, sizeof(AnimationMixer::TrackCacheAudio));
return tc;
}
case Animation::TYPE_METHOD:
case Animation::TYPE_ANIMATION: {
// Nothing to do here.
} break;
}
return nullptr;
}

13
scene/animation/animation_mixer.h
View File

@ -388,14 +388,13 @@ class AnimatedValuesBackup : public RefCounted {
HashMap<NodePath, AnimationMixer::TrackCache *> data; HashMap<NodePath, AnimationMixer::TrackCache *> data;
public: public:
void set_data(const HashMap<NodePath, AnimationMixer::TrackCache *> p_data) { data = p_data; }; void set_data(const HashMap<NodePath, AnimationMixer::TrackCache *> p_data);
HashMap<NodePath, AnimationMixer::TrackCache *> get_data() const { return data; }; HashMap<NodePath, AnimationMixer::TrackCache *> get_data() const;
void clear_data();
~AnimatedValuesBackup() { AnimationMixer::TrackCache *get_cache_copy(AnimationMixer::TrackCache *p_cache) const;
for (KeyValue<NodePath, AnimationMixer::TrackCache *> &K : data) {
memdelete(K.value); ~AnimatedValuesBackup() { clear_data(); }
}
}
}; };
VARIANT_ENUM_CAST(AnimationMixer::AnimationCallbackModeProcess); VARIANT_ENUM_CAST(AnimationMixer::AnimationCallbackModeProcess);