fix: 3D模型调整

master
Tongg 5 months ago
parent a0a5a249d4
commit 007f91bb41
  1. BIN
      Resource/Images/UserControl/03-8-3.png
  2. 2
      SparkClient.csproj
  3. 4
      Views/UserControl/Viewport3D.xaml
  4. 12
      Views/UserControl/Viewport3D.xaml.cs
  5. 18
      Views/UserControl/ViewportData/Helper/UnityHelper.cs
  6. 1
      Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs
  7. 23
      Views/UserControl/ViewportData/Helper/ViewportManager.cs

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

@ -189,6 +189,8 @@
<Resource Include="Resource\Images\UIResource\08-5.jpg" />
<None Remove="Resource\Images\UIResource\03-0.jpg" />
<Resource Include="Resource\Images\UIResource\03-0.jpg" />
<None Remove="Resource\Images\UserControl\03-8-3.png" />
<Resource Include="Resource\Images\UserControl\03-8-3.png" />
</ItemGroup>
<ItemGroup>

@ -45,6 +45,10 @@
x:Name="BtnFcuntion3View" Click="BtnFunction_OnClick">
<Image Source="pack://Application:,,,/Resource/Images/UserControl/03-8-2.png" Width="40" Height="40"></Image>
</Button>
<Button Grid.Column="5" Background="Transparent" BorderBrush="Transparent" Height="50" Padding="2"
x:Name="BtnShow3DView" Click="BtnFunction_OnClick">
<Image Source="pack://Application:,,,/Resource/Images/UserControl/03-8-3.png" Width="40" Height="40"></Image>
</Button>
</Grid>
<Border Grid.Row="1" x:Name="MainBorder">
<Border.ContextMenu >

@ -42,7 +42,12 @@ public partial class Viewport3D
private void Viewport3D_OnLoaded(object sender, RoutedEventArgs e)
{
ViewportManager.SetViewport3D(Viewport3Dx);
ViewportManager.SetViewport(this);
ViewportManager.LoadModelByEntities(new List<Viewport3DTriangleEntity>());
#if DEBUG
#else
BtnShow3DView.Visibility = Visibility.Hidden;
#endif
//选项初始化 显示-后端-管理类 一致
ViewportRightMenuSelectFaceFrame.IsEnabled = ViewportRightMenuSelectFace.IsChecked ;
@ -174,7 +179,9 @@ public partial class Viewport3D
{
var directionName = ((Button)sender).Name.ToString();
var directionValue = (int) TbCustomizeRevolve.Value;
switch (directionName)
{
case "BtnFcuntion1View":
@ -210,6 +217,9 @@ public partial class Viewport3D
await Task.Delay(7000);
ViewportManager.DoubleClickSelect = !false;
break;
case "BtnShow3DView":
break;
}

@ -0,0 +1,18 @@
namespace SparkClient.Views.UserControl.ViewportData.Helper;
public class UnityHelper
{
private static string _image_path = AppDomain.CurrentDomain.BaseDirectory + "/temp/image/";
/***
* 1stl文件名ViewportHelperPro.ExportModelsToStl(null, path+filename)
* 2STL文件是否存在 7
* 3 temp下imagestl两个目录
* 4stl文件paramA
* 5 xx.exe --model=_stl_path+paramA --output=_image_path --type=0/1 00.png 11.png
* 6
* 7 --->> --->>21
* 8
* 9
*/
}

@ -899,6 +899,7 @@ public class ViewportHelperPro
/// <param name="speed">旋转时间 秒</param>
public static void RotateModel(Vector3D axis, bool hasLine = true, int speed = 7, int to = 360)
{
ViewportManager.GetViewport().ViewportRightMenuShowModelFaceByType.IsChecked = false;
ViewportManager.ClearDicModels();
ViewportManager.DoubleClickSelect = false;

@ -63,6 +63,8 @@ public class ViewportManager
/// 网格线(圈)
/// </summary>
public static LineGeometryModel3D MainModelCircleLine_P = new LineGeometryModel3D();
/// <summary>
/// 腰垂直线
/// </summary>
@ -88,6 +90,9 @@ public class ViewportManager
/// 模型控件对象映射
/// </summary>
private static Viewport3DX _viewport;
//模型
private static Viewport3D _viewport3D = null;
public static void SetViewport3D(Viewport3DX viewport3D)
{
if (_viewport != null)
@ -105,6 +110,24 @@ public class ViewportManager
throw new Exception("Viewport is not set");
return _viewport;
}
public static void SetViewport(Viewport3D viewport3D)
{
if (_viewport != null)
{
ClearDicModels();
_viewport.Items.Clear();
}
_viewport3D = viewport3D;
}
public static Viewport3D GetViewport()
{
if (_viewport3D == null)
throw new Exception("Viewport is not set");
return _viewport3D;
}
#region 模型选中交互管理
//是否双击选中

Loading…
Cancel
Save