From 69592ad46d52cf9ce5bc1d373e7cb11df9486408 Mon Sep 17 00:00:00 2001 From: 4sval Date: Sun, 4 Dec 2022 23:35:16 +0100 Subject: [PATCH] FModel v4.4 --- .github/workflows/main.yml | 4 ++-- CUE4Parse | 2 +- FModel/FModel.csproj | 6 +++--- FModel/Settings/UserSettings.cs | 2 +- FModel/ViewModels/MapViewerViewModel.cs | 7 ++++--- FModel/Views/MapViewer.xaml | 20 +++++++++---------- FModel/Views/Snooper/SnimGui.cs | 26 ++++++++++++++++--------- FModel/Views/Snooper/Transform.cs | 2 +- 8 files changed, 39 insertions(+), 30 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b9af98c8..8e6f8404 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: - name: ZIP File uses: papeloto/action-zip@v1 with: - files: ./FModel/bin/Publish/ + files: ./FModel/bin/Publish/FModel.exe dest: FModel.zip # will end up in working directory not the Publish folder - name: GIT Release @@ -45,4 +45,4 @@ jobs: automatic_release_tag: ${{ github.event.inputs.appVersion }} repo_token: ${{ secrets.GITHUB_TOKEN }} prerelease: false - files: FModel.zip + files: FModel.zip \ No newline at end of file diff --git a/CUE4Parse b/CUE4Parse index 2ce15122..d9c3db37 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 2ce1512277e2f3f7b64975c46ce978efe824df2f +Subproject commit d9c3db37652e615cf7160c168ccdb995171d1947 diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 557f6aec..6f8d2a90 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -5,9 +5,9 @@ net6.0-windows true FModel.ico - 4.3.2 - 4.3.2.1 - 4.3.2.1 + 4.4.0 + 4.4.0.0 + 4.4.0.0 false true win-x64 diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs index 3123c30e..a9cd9d65 100644 --- a/FModel/Settings/UserSettings.cs +++ b/FModel/Settings/UserSettings.cs @@ -296,7 +296,7 @@ namespace FModel.Settings private IDictionary _overridedGame = new Dictionary { {FGame.Unknown, EGame.GAME_UE4_LATEST}, - {FGame.FortniteGame, EGame.GAME_UE5_1}, + {FGame.FortniteGame, EGame.GAME_UE5_2}, {FGame.ShooterGame, EGame.GAME_Valorant}, {FGame.DeadByDaylight, EGame.GAME_UE4_LATEST}, {FGame.OakGame, EGame.GAME_Borderlands3}, diff --git a/FModel/ViewModels/MapViewerViewModel.cs b/FModel/ViewModels/MapViewerViewModel.cs index 6e8fa65d..f5bf9c5c 100644 --- a/FModel/ViewModels/MapViewerViewModel.cs +++ b/FModel/ViewModels/MapViewerViewModel.cs @@ -175,7 +175,7 @@ public class MapViewerViewModel : ViewModel } private const int _widthHeight = 2048; - private const int _brRadius = 131000; + private const int _brRadius = 141000; private const int _prRadius = 51000; private int _mapIndex; public int MapIndex // 0 is BR, 1 is PR @@ -368,8 +368,9 @@ public class MapViewerViewModel : ViewModel private FVector2D GetMapPosition(FVector vector, int mapRadius) { - var nx = (vector.Y + mapRadius) / (mapRadius * 2) * _widthHeight; - var ny = (1 - (vector.X + mapRadius) / (mapRadius * 2)) * _widthHeight; + const int wh = 2048 + 128 + 32; + var nx = (vector.Y + mapRadius) / (mapRadius * 2) * wh; + var ny = (1 - (vector.X + mapRadius) / (mapRadius * 2)) * wh; return new FVector2D(nx, ny); } diff --git a/FModel/Views/MapViewer.xaml b/FModel/Views/MapViewer.xaml index 54de3a50..e4d4b0a3 100644 --- a/FModel/Views/MapViewer.xaml +++ b/FModel/Views/MapViewer.xaml @@ -29,16 +29,16 @@ DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.MapViewer}}}" IsEnabled="{Binding Status.IsReady}" /> - - + + + + - - + + + + @@ -57,8 +57,8 @@ DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.MapViewer}}}" IsEnabled="{Binding Status.IsReady}" /> - + + diff --git a/FModel/Views/Snooper/SnimGui.cs b/FModel/Views/Snooper/SnimGui.cs index 711dfff1..ade5925b 100644 --- a/FModel/Views/Snooper/SnimGui.cs +++ b/FModel/Views/Snooper/SnimGui.cs @@ -186,15 +186,23 @@ public class SnimGui Modal("Commands", ImGui.MenuItem("Commands"), () => { ImGui.TextWrapped( - @"Most commands should be pretty straightforward but just in case here is a non-exhaustive list of things you can do on this 3D viewer: + @"Most commands should be pretty straightforward but just in case here is a non-exhaustive list of things you can do in this 3D viewer: -1. 3D Viewport +1. UI / UX + - Press Shift while moving a window to dock it + - Ctrl Click in a box to input a new value + - Mouse Click + Drag in a box to modify the value without having to type + - Press H to hide the window and append the next mesh you extract + +2. Viewport - WASD to move around + - Shift to move faster + - XC to zoom - Left Mouse Button pressed to look around - Right Click to select a model in the world -2. Outliner - 2.1. Right Click Model +3. Outliner + 3.1. Right Click Model - Show / Hide the model - Show a skeletal representation of the model - Save to save the model as .psk / .pskx @@ -204,18 +212,18 @@ public class SnimGui - Deselect - Copy Name to Clipboard -3. World +4. World - Save All to save all loaded models at once (no it's not dying it's just freezing while saving them all) -4. Details - 4.1. Right Click Section +5. Details + 5.1. Right Click Section - Show / Hide the section - Swap to change the material used by this section - Copy Name to Clipboard - 4.2. Transform + 5.2. Transform - Move / Rotate / Scale the model in the world - 4.3. Morph Targets + 5.3. Morph Targets - Modify the vertices position by a given amount to change the shape of the model "); ImGui.Separator(); diff --git a/FModel/Views/Snooper/Transform.cs b/FModel/Views/Snooper/Transform.cs index d5a0bdc9..69658869 100644 --- a/FModel/Views/Snooper/Transform.cs +++ b/FModel/Views/Snooper/Transform.cs @@ -13,7 +13,7 @@ public class Transform public Matrix4x4 Relation = Matrix4x4.Identity; public FVector Position = FVector.ZeroVector.ToMapVector(); - public FRotator Rotation = FRotator.ZeroRotator; + public FRotator Rotation = new (0f); public FVector Scale = FVector.OneVector.ToMapVector(); public Matrix4x4 Matrix =>