GetBoneTransform at runtime but it's flickering now, for later me

4sval · Aug 12, 2023 · d97f570 · d97f570
1 parent 250b199
commit d97f570
Show file tree

Hide file tree

Showing 11 changed files with 149 additions and 202 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs
@@ -85,10 +85,10 @@ await Task.WhenAll(
 #if DEBUG
  await _threadWorkerView.Begin(cancellationToken =>
  _applicationView.CUE4Parse.Extract(cancellationToken,
- "ShooterGame/Content/Characters/Guide/S0/3P/Models/TP_Guide_S0_Skelmesh.uasset"));
+ "fortnitegame/Content/Characters/Player/Female/Medium/Bodies/F_Med_Soldier_01/Meshes/F_Med_Soldier_01.uasset"));
  await _threadWorkerView.Begin(cancellationToken =>
  _applicationView.CUE4Parse.Extract(cancellationToken,
- "ShooterGame/Content/Characters/Guide/S0/Ability_Q/3P/Anims/TP_Guide_S0_Q_WolfTotem_Cast_Outro_Montage.uasset"));
+ "fortnitegame/Content/Animation/Game/MainPlayer/Emotes/Cowbell/Cowbell_CMM_Loop_M.uasset"));
 #endif
  }
 

diff --git a/FModel/Resources/default.vert b/FModel/Resources/default.vert
@@ -16,10 +16,15 @@ layout(std430, binding = 1) buffer BoneMatrices
 {
  mat4 uFinalBonesMatrix[];
 };
+layout(std430, binding = 2) buffer RestBoneMatrices
+{
+ mat4 uRestBonesMatrix[];
+};
 
 uniform mat4 uView;
 uniform mat4 uProjection;
 uniform float uMorphTime;
+uniform bool uIsAnimated;
 
 out vec3 fPos;
 out vec3 fNormal;
@@ -37,14 +42,14 @@ void main()
  vec4 finalPos = vec4(0.0);
  vec4 finalNormal = vec4(0.0);
  vec4 finalTangent = vec4(0.0);
- if (vBoneIds != vBoneWeights)
+ if (uIsAnimated)
  {
  for(int i = 0 ; i < 4; i++)
  {
  int boneIndex = int(vBoneIds[i]);
  if(boneIndex < 0) break;
 
- mat4 boneMatrix = uFinalBonesMatrix[boneIndex];
+ mat4 boneMatrix = uFinalBonesMatrix[boneIndex] * inverse(uRestBonesMatrix[boneIndex]);
  mat4 inverseBoneMatrix = transpose(inverse(boneMatrix));
  float weight = vBoneWeights[i];
 

diff --git a/FModel/Resources/outline.vert b/FModel/Resources/outline.vert
@@ -11,11 +11,16 @@ layout(std430, binding = 1) buffer BoneMatrices
 {
  mat4 uFinalBonesMatrix[];
 };
+layout(std430, binding = 2) buffer RestBoneMatrices
+{
+ mat4 uRestBonesMatrix[];
+};
 
 uniform mat4 uView;
 uniform vec3 uViewPos;
 uniform mat4 uProjection;
 uniform float uMorphTime;
+uniform bool uIsAnimated;
 
 void main()
 {
@@ -24,14 +29,14 @@ void main()
 
  vec4 finalPos = vec4(0.0);
  vec4 finalNormal = vec4(0.0);
- if (vBoneIds != vBoneWeights)
+ if (uIsAnimated)
  {
  for(int i = 0 ; i < 4; i++)
  {
  int boneIndex = int(vBoneIds[i]);
  if(boneIndex < 0) break;
 
- mat4 boneMatrix = uFinalBonesMatrix[boneIndex];
+ mat4 boneMatrix = uFinalBonesMatrix[boneIndex] * inverse(uRestBonesMatrix[boneIndex]);
  float weight = vBoneWeights[i];
 
  finalPos += boneMatrix * bindPos * weight;

diff --git a/FModel/Resources/picking.vert b/FModel/Resources/picking.vert
@@ -10,24 +10,29 @@ layout(std430, binding = 1) buffer BoneMatrices
 {
  mat4 uFinalBonesMatrix[];
 };
+layout(std430, binding = 2) buffer RestBoneMatrices
+{
+ mat4 uRestBonesMatrix[];
+};
 
 uniform mat4 uView;
 uniform mat4 uProjection;
 uniform float uMorphTime;
+uniform bool uIsAnimated;
 
 void main()
 {
  vec4 bindPos = vec4(mix(vPos, vMorphTargetPos, uMorphTime), 1.0);
 
  vec4 finalPos = vec4(0.0);
- if (vBoneIds != vBoneWeights)
+ if (uIsAnimated)
  {
  for(int i = 0 ; i < 4; i++)
  {
  int boneIndex = int(vBoneIds[i]);
  if(boneIndex < 0) break;
 
- finalPos += uFinalBonesMatrix[boneIndex] * bindPos * vBoneWeights[i];
+ finalPos += uFinalBonesMatrix[boneIndex] * inverse(uRestBonesMatrix[boneIndex]) * bindPos * vBoneWeights[i];
  }
  }
  else finalPos = bindPos;

diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml
@@ -655,47 +655,50 @@
  <GridSplitter Grid.Column="1" Width="4" VerticalAlignment="Stretch" ResizeDirection="Columns" KeyboardIncrement="0"
  Visibility="{Binding SelectedItem.HasImage, ElementName=TabControlName, Converter={StaticResource BoolToVisibilityConverter}}"
  Background="{DynamicResource {x:Static adonisUi:Brushes.Layer3BackgroundBrush}}" />
- <Image Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Uniform"
- Visibility="{Binding SelectedItem.HasImage, ElementName=TabControlName, Converter={StaticResource BoolToVisibilityConverter}}"
- Source="{Binding SelectedItem.SelectedImage.Image, ElementName=TabControlName}" RenderOptions.BitmapScalingMode="{Binding SelectedItem.SelectedImage.RenderNearestNeighbor, ElementName=TabControlName, Converter={x:Static converters:BoolToRenderModeConverter.Instance}}">
- <Image.InputBindings>
- <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding SelectedItem.ImageCommand, ElementName=TabControlName}" CommandParameter="Open"/>
- </Image.InputBindings>
- <Image.ContextMenu>
- <ContextMenu DataContext="{Binding PlacementTarget, RelativeSource={RelativeSource Self}}">
- <MenuItem Header="Disable Alpha Channel" IsCheckable="True" IsChecked="{Binding DataContext.SelectedImage.NoAlpha}" />
- <MenuItem Header="Open Image" Command="{Binding DataContext.ImageCommand}" CommandParameter="Open">
- <MenuItem.Icon>
- <Viewbox Width="16" Height="16">
- <Canvas Width="24" Height="24">
- <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M20,4H4C2.9,4,2,4.9,2,6v12c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V6C22,4.9,21.1,4,20,4z M20,18H4V6h16V18z" />
- <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M6,12c0.55,0,1-0.45,1-1V9h2c0.55,0,1-0.45,1-1S9.55,7,9,7H6C5.45,7,5,7.45,5,8v3C5,11.55,5.45,12,6,12z" />
- <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M15,17h3c0.55,0,1-0.45,1-1v-3c0-0.55-0.45-1-1-1s-1,0.45-1,1v2h-2c-0.55,0-1,0.45-1,1S14.45,17,15,17z" />
- </Canvas>
- </Viewbox>
- </MenuItem.Icon>
- </MenuItem>
- <MenuItem Header="Copy Image" Command="{Binding DataContext.ImageCommand}" CommandParameter="Copy">
- <MenuItem.Icon>
- <Viewbox Width="16" Height="16">
- <Canvas Width="24" Height="24">
- <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource CopyIcon}" />
- </Canvas>
- </Viewbox>
- </MenuItem.Icon>
- </MenuItem>
- <MenuItem Header="Save Image" Command="{Binding DataContext.ImageCommand}" CommandParameter="Save">
- <MenuItem.Icon>
- <Viewbox Width="16" Height="16">
- <Canvas Width="24" Height="24">
- <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource SaveIcon}" />
- </Canvas>
- </Viewbox>
- </MenuItem.Icon>
- </MenuItem>
- </ContextMenu>
- </Image.ContextMenu>
- </Image>
+ <Border Grid.Column="2" BorderBrush="#3b3d4a" BorderThickness="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+ Visibility="{Binding SelectedItem.HasImage, ElementName=TabControlName, Converter={StaticResource BoolToVisibilityConverter}}">
+ <Image VerticalAlignment="Center" HorizontalAlignment="Center" Stretch="Uniform"
+ Visibility="{Binding SelectedItem.HasImage, ElementName=TabControlName, Converter={StaticResource BoolToVisibilityConverter}}"
+ Source="{Binding SelectedItem.SelectedImage.Image, ElementName=TabControlName}" RenderOptions.BitmapScalingMode="{Binding SelectedItem.SelectedImage.RenderNearestNeighbor, ElementName=TabControlName, Converter={x:Static converters:BoolToRenderModeConverter.Instance}}">
+ <Image.InputBindings>
+ <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding SelectedItem.ImageCommand, ElementName=TabControlName}" CommandParameter="Open"/>
+ </Image.InputBindings>
+ <Image.ContextMenu>
+ <ContextMenu DataContext="{Binding PlacementTarget, RelativeSource={RelativeSource Self}}">
+ <MenuItem Header="Disable Alpha Channel" IsCheckable="True" IsChecked="{Binding DataContext.SelectedImage.NoAlpha}" />
+ <MenuItem Header="Open Image" Command="{Binding DataContext.ImageCommand}" CommandParameter="Open">
+ <MenuItem.Icon>
+ <Viewbox Width="16" Height="16">
+ <Canvas Width="24" Height="24">
+ <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M20,4H4C2.9,4,2,4.9,2,6v12c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V6C22,4.9,21.1,4,20,4z M20,18H4V6h16V18z" />
+ <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M6,12c0.55,0,1-0.45,1-1V9h2c0.55,0,1-0.45,1-1S9.55,7,9,7H6C5.45,7,5,7.45,5,8v3C5,11.55,5.45,12,6,12z" />
+ <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="M15,17h3c0.55,0,1-0.45,1-1v-3c0-0.55-0.45-1-1-1s-1,0.45-1,1v2h-2c-0.55,0-1,0.45-1,1S14.45,17,15,17z" />
+ </Canvas>
+ </Viewbox>
+ </MenuItem.Icon>
+ </MenuItem>
+ <MenuItem Header="Copy Image" Command="{Binding DataContext.ImageCommand}" CommandParameter="Copy">
+ <MenuItem.Icon>
+ <Viewbox Width="16" Height="16">
+ <Canvas Width="24" Height="24">
+ <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource CopyIcon}" />
+ </Canvas>
+ </Viewbox>
+ </MenuItem.Icon>
+ </MenuItem>
+ <MenuItem Header="Save Image" Command="{Binding DataContext.ImageCommand}" CommandParameter="Save">
+ <MenuItem.Icon>
+ <Viewbox Width="16" Height="16">
+ <Canvas Width="24" Height="24">
+ <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource SaveIcon}" />
+ </Canvas>
+ </Viewbox>
+ </MenuItem.Icon>
+ </MenuItem>
+ </ContextMenu>
+ </Image.ContextMenu>
+ </Image>
+ </Border>
  <TextBlock Grid.Column="2" VerticalAlignment="Bottom" HorizontalAlignment="Center"
  Visibility="{Binding SelectedItem.HasMultipleImages, ElementName=TabControlName, Converter={StaticResource BoolToVisibilityConverter}}"
  Text="{Binding SelectedItem.Page, ElementName=TabControlName}" />

diff --git a/FModel/Views/Snooper/Animations/Animation.cs b/FModel/Views/Snooper/Animations/Animation.cs
@@ -11,8 +11,8 @@ namespace FModel.Views.Snooper.Animations;
 public class Animation : IDisposable
 {
  private readonly UObject _export;
- private readonly CAnimSet _animSet;
 
+ public readonly CAnimSet UnrealAnim;
  public readonly string Path;
  public readonly string Name;
  public readonly Sequence[] Sequences;
@@ -38,12 +38,12 @@ public Animation(UObject export)
 
  public Animation(UObject export, CAnimSet animSet) : this(export)
  {
- _animSet = animSet;
+ UnrealAnim = animSet;
 
- Sequences = new Sequence[_animSet.Sequences.Count];
+ Sequences = new Sequence[UnrealAnim.Sequences.Count];
  for (int i = 0; i < Sequences.Length; i++)
  {
- Sequences[i] = new Sequence(_animSet.Sequences[i]);
+ Sequences[i] = new Sequence(UnrealAnim.Sequences[i]);
  EndTime = Sequences[i].EndTime;
  }
 
@@ -62,7 +62,7 @@ public void TimeCalculation(float elapsedTime)
  for (int i = 0; i < Sequences.Length; i++)
  {
  var sequence = Sequences[i];
- if (elapsedTime < sequence.EndTime && elapsedTime >= sequence.StartTime)
+ if (elapsedTime <= sequence.EndTime && elapsedTime >= sequence.StartTime)
  {
  Framing[i] = (elapsedTime - sequence.StartTime) / sequence.TimePerFrame;
  }
@@ -122,7 +122,7 @@ private void Popup(Snooper s, Save saver, int i)
  {
  if (selected) AttachedModels.Remove(guid); else AttachedModels.Add(guid);
  model.Skeleton.ResetAnimatedData(true);
- if (!selected) model.Skeleton.Animate(_animSet, s.Renderer.AnimateWithRotationOnly);
+ if (!selected) model.Skeleton.Animate(UnrealAnim);
  }
  }
  ImGui.EndMenu();