object outlining v0.annoying

4sval · Sep 6, 2022 · a45ad49 · a45ad49
1 parent a7885b1
commit a45ad49
Show file tree

Hide file tree

Showing 19 changed files with 98 additions and 1,254 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -101,8 +101,8 @@
  <None Remove="Resources\skybox.vert" />
  <None Remove="Resources\framebuffer.frag" />
  <None Remove="Resources\framebuffer.vert" />
- <None Remove="Resources\imgui.frag" />
- <None Remove="Resources\imgui.vert" />
+ <None Remove="Resources\outline.frag" />
+ <None Remove="Resources\outline.vert" />
  </ItemGroup>
 
  <ItemGroup>
@@ -120,8 +120,8 @@
  <EmbeddedResource Include="Resources\skybox.vert" />
  <EmbeddedResource Include="Resources\framebuffer.frag" />
  <EmbeddedResource Include="Resources\framebuffer.vert" />
- <EmbeddedResource Include="Resources\imgui.frag" />
- <EmbeddedResource Include="Resources\imgui.vert" />
+ <EmbeddedResource Include="Resources\outline.frag" />
+ <EmbeddedResource Include="Resources\outline.vert" />
  </ItemGroup>
 
  <ItemGroup>
@@ -132,7 +132,6 @@
  <PackageReference Include="CSCore" Version="1.2.1.2" />
  <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
  <PackageReference Include="EpicManifestParser" Version="1.2.70-temp" />
- <PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.21.0" />
  <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.16" />
  <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
  <PackageReference Include="NVorbis" Version="0.10.4" />
@@ -238,4 +237,10 @@
  </EmbeddedResource>
  </ItemGroup>
 
+ <ItemGroup>
+ <None Update="deps\glfw3.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
+
 </Project>
diff --git a/FModel/Resources/imgui.frag b/FModel/Resources/imgui.frag
diff --git a/FModel/Resources/imgui.vert b/FModel/Resources/imgui.vert
diff --git a/FModel/Resources/outline.frag b/FModel/Resources/outline.frag
@@ -0,0 +1,8 @@
+#version 330
+
+out vec4 FragColor;
+
+void main()
+{
+ FragColor = vec4(0.929, 0.588, 0.196, 0.2);
+}
diff --git a/FModel/Resources/outline.vert b/FModel/Resources/outline.vert
@@ -0,0 +1,15 @@
+#version 330 core
+
+layout (location = 0) in vec3 vPos;
+layout (location = 1) in vec3 vNormal;
+layout (location = 6) in mat4 vInstanceMatrix;
+
+uniform mat4 uView;
+uniform mat4 uProjection;
+
+void main()
+{
+ float scaleFactor = 0.005;
+ vec3 scaleVertex = vPos + vNormal * scaleFactor;
+ gl_Position = uProjection * uView * vInstanceMatrix * vec4(scaleVertex, 1.0);
+}
diff --git a/FModel/ViewModels/ApplicationViewModel.cs b/FModel/ViewModels/ApplicationViewModel.cs
@@ -72,7 +72,6 @@ public EStatusKind Status
  public AesManagerViewModel AesManager { get; }
  public AudioPlayerViewModel AudioPlayer { get; }
  public MapViewerViewModel MapViewer { get; }
- public ModelViewerViewModel ModelViewer { get; }
  private OodleCompressor _oodle;
 
  public ApplicationViewModel()
@@ -94,7 +93,6 @@ public ApplicationViewModel()
  AesManager = new AesManagerViewModel(CUE4Parse);
  MapViewer = new MapViewerViewModel(CUE4Parse);
  AudioPlayer = new AudioPlayerViewModel();
- ModelViewer = new ModelViewerViewModel(CUE4Parse.Game);
  Status = EStatusKind.Ready;
  }
 

diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -763,12 +763,7 @@ public void ExtractAndScroll(string fullPath, string objectName)
  }
  case UMaterialInstance m when ModelIsOverwritingMaterial:
  {
- Application.Current.Dispatcher.Invoke(delegate
- {
- var modelViewer = Helper.GetWindow<ModelViewer>("Model Viewer", () => new ModelViewer().Show());
- modelViewer.Overwrite(m);
- });
- return true;
+ throw new NotImplementedException();
  }
  case UStaticMesh when UserSettings.Default.SaveStaticMeshes:
  case USkeletalMesh when UserSettings.Default.SaveSkeletalMeshes: