Skip to content

Commit

Permalink
The Big Merge™ (#138)
Browse files Browse the repository at this point in the history 
- New Map Resources tab in Activity View (map and activity resources (entities, lights, skybox elements) )
- Moved Terrain to Map Resources tab
- Map background entities (Skybox stuff) (WQ+)
- Map decals (textures)
- Basic map lights (point lights)
- Fix terrain UVs
- Fix Shadowkeep terrain
- Fix Shadowkeep entity external materials
- Source 2 shader updates
- Fixed Vertex Color for Statics (WQ+)
- Names for Activity Entities
- Fixed vertex weights
- Various fixes and smaller changes

Huge thanks to @nblockbuster @cohaereo and @MontagueM for help and discoveries
  • Loading branch information
@DeltaDesigns
DeltaDesigns authored Dec 2, 2023
1 parent a86daaf commit 1d127f3
Show file tree
Hide file tree
Showing 39 changed files with 6,687 additions and 8,813 deletions.
3 changes: 3 additions & 0 deletions AtlasSharp/AtlasView.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public partial class AtlasView : UserControl

public AtlasView()
{
if (!ConfigSubsystem.Get().GetUseCustomRenderer())
return;

InitializeComponent();

ImageHost.Loaded += ImageHost_Loaded;
Expand Down
204 changes: 204 additions & 0 deletions Charm/ActivityMapEntityView.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
<UserControl
x:Class="Charm.ActivityMapEntityView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Charm"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="1000"
d:DesignWidth="1900"
mc:Ignorable="d">

<UserControl.Resources>
<ControlTemplate x:Key="bubbleTemplate">
<Grid Height="50">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100*" />
<ColumnDefinition Width="100*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="50*" />
<RowDefinition Height="50*" />
</Grid.RowDefinitions>
<Border
Grid.RowSpan="2"
Grid.ColumnSpan="2"
Panel.ZIndex="1"
BorderBrush="{StaticResource BackgroundColour30}"
BorderThickness="1" />
<TextBlock
Grid.Row="0"
Grid.Column="0"
Margin="5,2,0,0"
HorizontalAlignment="Left"
Text="{Binding Name}" />
<TextBlock
Grid.Row="1"
Margin="5,2,0,0"
HorizontalAlignment="Left"
FontSize="12px"
Text="{Binding LoadType}" />
<Button
Grid.RowSpan="2"
Grid.Column="1"
HorizontalAlignment="Right"
Click="GetBubbleContentsButton_OnClick"
Content="View contents"
Style="{StaticResource MaterialDesignPaperDarkButton}"
Tag="{Binding Data}" />
</Grid>
</ControlTemplate>

<ControlTemplate x:Key="staticTemplate">
<Grid Height="25" Margin="0,1,0,1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80*" />
<ColumnDefinition Width="20*" />
</Grid.ColumnDefinitions>
<Border
Grid.ColumnSpan="2"
Panel.ZIndex="1"
BorderBrush="{StaticResource BackgroundColour30}"
BorderThickness="1" />
<CheckBox
Grid.Column="0"
HorizontalAlignment="Left"
HorizontalContentAlignment="Left"
Click="EntityMapPart_OnCheck"
IsChecked="{Binding Selected}"
Style="{StaticResource MaterialDesignCheckBox}"
Tag="{Binding Data}">
<TextBlock Text="{Binding Name}" TextAlignment="Center" />
</CheckBox>
<Button
Grid.Column="1"
HorizontalAlignment="Right"
Click="EntityMapView_OnClick"
Style="{StaticResource MaterialDesignPaperDarkButton}">
<TextBlock Text="View" TextAlignment="Center" />
</Button>
</Grid>
</ControlTemplate>

<ControlTemplate x:Key="dynamicTemplate">
<Grid Height="50" Margin="0,2,0,2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="20*" />
<ColumnDefinition Width="10*" />
</Grid.ColumnDefinitions>
<Border
Grid.ColumnSpan="3"
Panel.ZIndex="1"
BorderBrush="{StaticResource BackgroundColour30}"
BorderThickness="1" />

<Grid Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="50*" />
<RowDefinition Height="50*" />
</Grid.RowDefinitions>

<TextBlock
Grid.Row="0"
Margin="5,5,0,0"
Text="{Binding DisplayName}"
TextAlignment="Left" />
<TextBlock
Grid.Row="1"
Margin="5,5,0,0"
FontSize="14"
Text="{Binding SubName}"
TextAlignment="Left" />
</Grid>

<Grid Grid.Column="1">
<Button
HorizontalAlignment="Left"
Click="EntityView_OnClick"
Style="{StaticResource MaterialDesignPaperDarkButton}">
<TextBlock Text="View" TextAlignment="Center" />
</Button>
<Button
HorizontalAlignment="Right"
Click="EntityExport_OnClick"
Style="{StaticResource MaterialDesignPaperDarkButton}">
<TextBlock Text="Export" TextAlignment="Center" />
</Button>
</Grid>

</Grid>
</ControlTemplate>
</UserControl.Resources>

<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100*" />
<ColumnDefinition Width="100*" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="45*" />
<RowDefinition Height="50*" />
<RowDefinition Height="5*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100*" />
<ColumnDefinition Width="100*" />
</Grid.ColumnDefinitions>
<ListView
x:Name="MapList"
Grid.Row="0"
Grid.ColumnSpan="2">
<ListView.ItemContainerStyle>
<Style TargetType="ListViewItem">
<Setter Property="OverridesDefaultStyle" Value="True" />
<Setter Property="Template" Value="{StaticResource bubbleTemplate}" />
</Style>
</ListView.ItemContainerStyle>
<ListView.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical" />
</ItemsPanelTemplate>
</ListView.ItemsPanel>
</ListView>
<ListView
x:Name="EntityContainerList"
Grid.Row="1"
Grid.Column="0">
<ListView.ItemContainerStyle>
<Style TargetType="ListViewItem">
<Setter Property="OverridesDefaultStyle" Value="True" />
<Setter Property="Template" Value="{StaticResource staticTemplate}" />
</Style>
</ListView.ItemContainerStyle>
<ListView.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical" />
</ItemsPanelTemplate>
</ListView.ItemsPanel>
</ListView>
<local:ExportControl
x:Name="ExportControl"
Grid.Row="2"
Grid.ColumnSpan="2" />
<ListView
x:Name="EntitiesList"
Grid.Row="1"
Grid.Column="1">
<ListView.ItemContainerStyle>
<Style TargetType="{x:Type ListViewItem}">
<Setter Property="OverridesDefaultStyle" Value="True" />
<Setter Property="Template" Value="{StaticResource dynamicTemplate}" />
</Style>
</ListView.ItemContainerStyle>
<ListView.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical" />
</ItemsPanelTemplate>
</ListView.ItemsPanel>
</ListView>
</Grid>
<local:MapView x:Name="MapControl" Grid.Column="1" />
</Grid>

</UserControl>
Loading

0 comments on commit 1d127f3

Please sign in to comment.