DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 21:24:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anim Editor: bug fixes

Browse Source
This commit is contained in:
Maruno17
2024-04-21 23:08:48 +01:00
parent 032ad25adc
commit 23a8c552d6
5 changed files with 224 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/Scripts/904_Anim Editor/001_AnimationEditor.rb
View File

@@ -265,6 +265,7 @@ class AnimationEditor
end
def save
AnimationEditor::ParticleDataHelper.optimize_all_particles(@anim[:particles])
GameData::Animation.register(@anim, @anim_id)
Compiler.write_battle_animation_file(@anim[:pbs_path])
if @anim[:pbs_path] != @pbs_path
@@ -967,7 +968,7 @@ class AnimationEditor
break
end
end
update_input
update_input if !@captured
end
#-----------------------------------------------------------------------------

28
Data/Scripts/904_Anim Editor/901_ParticleDataHelper.rb
View File

@@ -229,6 +229,7 @@ module AnimationEditor::ParticleDataHelper
set_now = nil
move_ending_now = nil
move_starting_now = nil
set_at_end_of_move_starting_now = nil
particle[property].each do |cmd|
if cmd[1] == 0
set_now = cmd if cmd[0] == frame
@@ -237,6 +238,11 @@ module AnimationEditor::ParticleDataHelper
move_ending_now = cmd if cmd[0] + cmd[1] == frame
end
end
if move_starting_now
particle[property].each do |cmd|
set_at_end_of_move_starting_now = cmd if cmd[1] == 0 && cmd[0] == move_starting_now[0] + move_starting_now[1]
end
end
# Delete SetXYZ if it is at frame
particle[property].delete(set_now) if set_now
# Edit/delete MoveXYZ commands starting/ending at frame
@@ -247,14 +253,27 @@ module AnimationEditor::ParticleDataHelper
elsif move_ending_now # Delete MoveXYZ ending now
particle[property].delete(move_ending_now)
elsif move_starting_now && (full_delete || !set_now) # Turn into SetXYZ at its end point
move_starting_now[0] += move_starting_now[1]
move_starting_now[1] = 0
move_starting_now[3] = nil
move_starting_now.compact!
if set_at_end_of_move_starting_now
particle[property].delete(move_starting_now)
else
move_starting_now[0] += move_starting_now[1]
move_starting_now[1] = 0
move_starting_now[3] = nil
move_starting_now.compact!
end
end
return (particle[property].empty?) ? nil : particle[property]
end
def optimize_all_particles(particles)
particles.each do |particle|
particle.each_pair do |key, cmds|
next if !cmds.is_a?(Array) || cmds.empty?
particle[key] = optimize_commands(particle, key)
end
end
end
# Removes commands for the particle's given property if they don't make a
# difference. Returns the resulting set of commands.
def optimize_commands(particle, property)
@@ -281,7 +300,6 @@ module AnimationEditor::ParticleDataHelper
first_non_visible_cmd = -1
particle.each_pair do |prop, value|
next if !value.is_a?(Array) || value.empty?
next if prop == property && value[0][0] == frame
first_cmd = value[0][0] if first_cmd < 0 || first_cmd > value[0][0]
next if prop == :visible
first_non_visible_cmd = value[0][0] if first_non_visible_cmd < 0 || first_non_visible_cmd > value[0][0]