epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish removing GraphicSettings.SheetSize/BatchSize.

Browse Source
This commit is contained in:
Paul Chote
2025-12-06 22:17:16 +00:00
committed by Gustas Kažukauskas
parent 7175e9062d
commit 13313b4270
14 changed files with 72 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
OpenRA.Game/Game.cs
View File

@@ -386,32 +386,6 @@ namespace OpenRA
Log.AddChannel("nat", "nat.log");
Log.AddChannel("client", "client.log");
var platforms = new[] { Settings.Game.Platform, "Default", null };
foreach (var p in platforms)
{
if (p == null)
throw new InvalidOperationException("Failed to initialize platform-integration library. Check graphics.log for details.");
Settings.Game.Platform = p;
try
{
var platform = CreatePlatform(p);
Renderer = new Renderer(platform, Settings.Graphics);
Sound = new Sound(platform, Settings.Sound);
break;
}
catch (Exception e)
{
Log.Write("graphics", $"{e}");
Console.WriteLine("Renderer initialization failed. Check graphics.log for details.");
Renderer?.Dispose();
Sound?.Dispose();
}
}
Nat.Initialize();
var modSearchArg = args.GetValue("Engine.ModSearchPaths", null);
@@ -454,6 +428,32 @@ namespace OpenRA
foreach (var mod in ExternalMods)
Console.WriteLine($"\t{mod.Key} ({mod.Value.Version})");
var platforms = new[] { Settings.Game.Platform, "Default", null };
foreach (var p in platforms)
{
if (p == null)
throw new InvalidOperationException("Failed to initialize platform-integration library. Check graphics.log for details.");
Settings.Game.Platform = p;
try
{
var platform = CreatePlatform(p);
Renderer = new Renderer(platform, Settings.Graphics, manifest.RendererConstants.VertexBatchSize);
Sound = new Sound(platform, Settings.Sound);
break;
}
catch (Exception e)
{
Log.Write("graphics", $"{e}");
Console.WriteLine("Renderer initialization failed. Check graphics.log for details.");
Renderer?.Dispose();
Sound?.Dispose();
}
}
InitializeMod(manifest, args);
}

5
OpenRA.Game/Graphics/CursorManager.cs
View File

@@ -42,10 +42,9 @@ namespace OpenRA.Graphics
public CursorManager(ModData modData)
{
hardwareCursorsDisabled = Game.Settings.Graphics.DisableHardwareCursors;
graphicSettings = Game.Settings.Graphics;
SheetBuilder = new SheetBuilder(SheetType.BGRA, modData.Manifest.CursorSheetSize);
hardwareCursorsDisabled = graphicSettings.DisableHardwareCursors;
SheetBuilder = new SheetBuilder(SheetType.BGRA, modData.Manifest.RendererConstants.CursorSheetSize);
// Overwrite previous definitions if there are duplicates
var pals = new Dictionary<string, IProvidesCursorPaletteInfo>();

6
OpenRA.Game/Graphics/SequenceSet.cs
View File

@@ -37,8 +37,6 @@ namespace OpenRA.Graphics
public interface ISpriteSequenceLoader
{
int BgraSheetSize { get; }
int IndexedSheetSize { get; }
IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, string tileSet, SpriteCache cache, MiniYamlNode node);
}
@@ -53,7 +51,9 @@ namespace OpenRA.Graphics
{
this.modData = modData;
TileSet = tileSet;
SpriteCache = new SpriteCache(fileSystem, modData.SpriteLoaders, modData.SpriteSequenceLoader.BgraSheetSize, modData.SpriteSequenceLoader.IndexedSheetSize);
var rc = modData.Manifest.RendererConstants;
SpriteCache = new SpriteCache(fileSystem, modData.SpriteLoaders, rc.SequenceBgraSheetSize, rc.SequenceIndexedSheetSize);
using (new Support.PerfTimer("LoadSequences"))
images = Load(fileSystem, additionalSequences);
}

3
OpenRA.Game/Graphics/SheetBuilder.cs
View File

@@ -65,9 +65,6 @@ namespace OpenRA.Graphics
}
}
public SheetBuilder(SheetType t)
: this(t, Game.Settings.Graphics.SheetSize) { }
public SheetBuilder(SheetType t, int sheetSize, int margin = 1)
: this(t, () => AllocateSheet(t, sheetSize), margin) { }

24
OpenRA.Game/Manifest.cs
View File

@@ -64,6 +64,16 @@ namespace OpenRA
public string WindowTitleTranslated => WindowTitle != null ? FluentProvider.GetMessage(WindowTitle) : null;
}
public class RendererConstants
{
public readonly int FontSheetSize = 512;
public readonly int CursorSheetSize = 512;
public readonly int MapPreviewSheetSize = 2048;
public readonly int SequenceBgraSheetSize = 2048;
public readonly int SequenceIndexedSheetSize = 2048;
public readonly int VertexBatchSize = 8192;
}
/// <summary>Describes what is to be loaded in order to run a mod.</summary>
public sealed class Manifest : IDisposable
{
@@ -80,14 +90,13 @@ namespace OpenRA
public readonly MiniYaml FileSystem;
public readonly MiniYaml LoadScreen;
public readonly string DefaultOrderGenerator;
public readonly RendererConstants RendererConstants;
public readonly ImmutableArray<string> Assemblies = [];
public readonly ImmutableArray<string> SoundFormats = [];
public readonly ImmutableArray<string> SpriteFormats = [];
public readonly ImmutableArray<string> PackageFormats = [];
public readonly ImmutableArray<string> VideoFormats = [];
public readonly int FontSheetSize = 512;
public readonly int CursorSheetSize = 512;
// TODO: This should be controlled by a user-selected translation bundle!
public readonly string FluentCulture = "en";
@@ -99,7 +108,7 @@ namespace OpenRA
"Sequences", "ModelSequences", "Cursors", "Chrome", "Assemblies", "ChromeLayout", "Weapons",
"Voices", "Notifications", "Music", "FluentMessages", "TileSets", "ChromeMetrics", "Missions", "Hotkeys",
"ServerTraits", "LoadScreen", "DefaultOrderGenerator", "SupportsMapsFrom", "SoundFormats", "SpriteFormats", "VideoFormats",
"RequiresMods", "PackageFormats", "AllowUnusedFluentMessagesInExternalPackages", "FontSheetSize", "CursorSheetSize"
"RequiresMods", "PackageFormats", "AllowUnusedFluentMessagesInExternalPackages", "RendererConstants"
}.ToFrozenSet();
readonly TypeDictionary modules = [];
@@ -191,11 +200,10 @@ namespace OpenRA
AllowUnusedFluentMessagesInExternalPackages =
FieldLoader.GetValue<bool>("AllowUnusedFluentMessagesInExternalPackages", entry.Value);
if (yaml.TryGetValue("FontSheetSize", out entry))
FontSheetSize = FieldLoader.GetValue<int>("FontSheetSize", entry.Value);
if (yaml.TryGetValue("CursorSheetSize", out entry))
CursorSheetSize = FieldLoader.GetValue<int>("CursorSheetSize", entry.Value);
if (yaml.TryGetValue("RendererConstants", out entry))
RendererConstants = FieldLoader.Load<RendererConstants>(entry);
else
RendererConstants = new RendererConstants();
}
public void LoadCustomData(ObjectCreator oc)

2
OpenRA.Game/Map/MapCache.cs
View File

@@ -73,7 +73,7 @@ namespace OpenRA
var gridType = Exts.Lazy(() => modData.Manifest.Get<MapGrid>().Type);
previews = new Cache<string, MapPreview>(uid => new MapPreview(modData, uid, gridType.Value, this));
sheetBuilder = new SheetBuilder(SheetType.BGRA);
sheetBuilder = new SheetBuilder(SheetType.BGRA, modData.Manifest.RendererConstants.MapPreviewSheetSize);
}
public void UpdateMaps()

9
OpenRA.Game/Renderer.cs
View File

@@ -40,7 +40,6 @@ namespace OpenRA
internal IPlatformWindow Window { get; }
internal IGraphicsContext Context { get; }
internal int SheetSize { get; }
internal int TempVertexBufferSize { get; }
internal int TempIndexBufferSize { get; }
@@ -84,12 +83,12 @@ namespace OpenRA
IBatchRenderer currentBatchRenderer;
RenderType renderType = RenderType.None;
public Renderer(IPlatform platform, GraphicSettings graphicSettings)
public Renderer(IPlatform platform, GraphicSettings graphicSettings, int vertexBatchSize)
{
this.platform = platform;
var resolution = GetResolution(graphicSettings);
TempVertexBufferSize = graphicSettings.BatchSize - graphicSettings.BatchSize % 4;
TempVertexBufferSize = vertexBatchSize - vertexBatchSize % 4;
TempIndexBufferSize = TempVertexBufferSize / 4 * 6;
Window = platform.CreateWindow(new Size(resolution.Width, resolution.Height),
@@ -98,8 +97,6 @@ namespace OpenRA
Context = Window.Context;
SheetSize = graphicSettings.SheetSize;
var combinedBindings = new CombinedShaderBindings();
WorldSpriteRenderer = new SpriteRenderer(this, Context.CreateShader(combinedBindings));
WorldRgbaSpriteRenderer = new RgbaSpriteRenderer(WorldSpriteRenderer);
@@ -134,7 +131,7 @@ namespace OpenRA
using (new PerfTimer("SpriteFonts"))
{
fontSheetBuilder?.Dispose();
fontSheetBuilder = new SheetBuilder(SheetType.BGRA, modData.Manifest.FontSheetSize);
fontSheetBuilder = new SheetBuilder(SheetType.BGRA, modData.Manifest.RendererConstants.FontSheetSize);
Fonts = modData.Manifest.Get<Fonts>().FontList.ToDictionary(x => x.Key,
x => new SpriteFont(
platform, x.Value.Font, modData.DefaultFileSystem.Open(x.Value.Font).ReadAllBytes(),

3
OpenRA.Game/Settings.cs
View File

@@ -226,9 +226,6 @@ namespace OpenRA
"Legacy: OpenGL 2.1 with framebuffer_object extension (requires DisableLegacyGL: False)",
"Automatic: Use the first supported profile.")]
public GLProfile GLProfile = GLProfile.Automatic;
public int BatchSize = 8192;
public int SheetSize = 2048;
}
public class SoundSettings

8
OpenRA.Mods.Cnc/Graphics/VoxelLoader.cs
View File

@@ -26,13 +26,14 @@ namespace OpenRA.Mods.Cnc.Graphics
readonly List<ModelVertex[]> vertices = [];
readonly Cache<(string, string), Voxel> voxels;
readonly IReadOnlyFileSystem fileSystem;
readonly int sheetSize;
IVertexBuffer<ModelVertex> vertexBuffer;
int totalVertexCount;
int cachedVertexCount;
SheetBuilder sheetBuilder;
static SheetBuilder CreateSheetBuilder()
SheetBuilder CreateSheetBuilder()
{
var allocated = false;
Sheet Allocate()
@@ -40,15 +41,16 @@ namespace OpenRA.Mods.Cnc.Graphics
if (allocated)
throw new SheetOverflowException("");
allocated = true;
return SheetBuilder.AllocateSheet(SheetType.Indexed, Game.Settings.Graphics.SheetSize);
return SheetBuilder.AllocateSheet(SheetType.Indexed, sheetSize);
}
return new SheetBuilder(SheetType.Indexed, Allocate);
}
public VoxelLoader(IReadOnlyFileSystem fileSystem)
public VoxelLoader(IReadOnlyFileSystem fileSystem, int sheetSize)
{
this.fileSystem = fileSystem;
this.sheetSize = sheetSize;
voxels = new Cache<(string, string), Voxel>(LoadFile);
vertices = [];
totalVertexCount = 0;

3
OpenRA.Mods.Cnc/Traits/World/ModelRenderer.cs
View File

@@ -39,6 +39,7 @@ namespace OpenRA.Mods.Cnc.Traits
[Desc("Render voxels")]
public class ModelRendererInfo : TraitInfo, Requires<IModelCacheInfo>
{
public readonly int RenderBufferSize = 2048;
public override object Create(ActorInitializer init) { return new ModelRenderer(this, init.Self); }
}
@@ -80,7 +81,7 @@ namespace OpenRA.Mods.Cnc.Traits
ModelCache = self.Trait<IModelCache>();
sheetSize = Game.Settings.Graphics.SheetSize;
sheetSize = info.RenderBufferSize;
var a = 2f / sheetSize;
var view = new[]
{

3
OpenRA.Mods.Cnc/Traits/World/VoxelCache.cs
View File

@@ -22,6 +22,7 @@ namespace OpenRA.Mods.Cnc.Traits
[Desc("Loads voxel models.")]
public sealed class VoxelCacheInfo : TraitInfo, IModelCacheInfo
{
public readonly int SheetSize = 2048;
public override object Create(ActorInitializer init) { return new VoxelCache(this, init.Self); }
}
@@ -33,7 +34,7 @@ namespace OpenRA.Mods.Cnc.Traits
public VoxelCache(VoxelCacheInfo info, Actor self)
{
var map = self.World.Map;
loader = new VoxelLoader(map);
loader = new VoxelLoader(map, info.SheetSize);
foreach (var kv in map.Rules.ModelSequences)
{
Game.ModData.LoadScreen.Display();

16
OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
View File

@@ -22,20 +22,9 @@ namespace OpenRA.Mods.Common.Graphics
{
public class DefaultSpriteSequenceLoader : ISpriteSequenceLoader
{
public readonly int BgraSheetSize = 2048;
public readonly int IndexedSheetSize = 2048;
static readonly MiniYaml NoData = new(null);
public DefaultSpriteSequenceLoader(ModData modData)
{
var metadata = modData.Manifest.Get<SpriteSequenceFormat>().Metadata;
if (metadata.TryGetValue("BgraSheetSize", out var yaml))
BgraSheetSize = FieldLoader.GetValue<int>("BgraSheetSize", yaml.Value);
if (metadata.TryGetValue("IndexedSheetSize", out yaml))
IndexedSheetSize = FieldLoader.GetValue<int>("IndexedSheetSize", yaml.Value);
}
public DefaultSpriteSequenceLoader(ModData modData) { }
public virtual ISpriteSequence CreateSequence(
ModData modData, string tileset, SpriteCache cache, string image, string sequence, MiniYaml data, MiniYaml defaults)
@@ -43,9 +32,6 @@ namespace OpenRA.Mods.Common.Graphics
return new DefaultSpriteSequence(cache, this, image, sequence, data, defaults);
}
int ISpriteSequenceLoader.BgraSheetSize => BgraSheetSize;
int ISpriteSequenceLoader.IndexedSheetSize => IndexedSheetSize;
IReadOnlyDictionary<string, ISpriteSequence> ISpriteSequenceLoader.ParseSequences(
ModData modData, string tileset, SpriteCache cache, MiniYamlNode imageNode)
{

10
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -58,7 +58,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly ScrollPanelWidget assetList;
readonly ScrollItemWidget template;
readonly Cache<SheetType, SheetBuilder> sheetBuilders;
readonly Dictionary<SheetType, SheetBuilder> sheetBuilders;
readonly Cache<string, Sprite[]> spriteCache;
IReadOnlyPackage assetSource = null;
@@ -86,7 +86,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
[ObjectCreator.UseCtor]
public AssetBrowserLogic(Widget widget, Action onExit, ModData modData, WorldRenderer worldRenderer)
{
sheetBuilders = new Cache<SheetType, SheetBuilder>(t => new SheetBuilder(t));
var rc = modData.Manifest.RendererConstants;
sheetBuilders = new Dictionary<SheetType, SheetBuilder>
{
{ SheetType.Indexed, new SheetBuilder(SheetType.Indexed, rc.SequenceIndexedSheetSize) },
{ SheetType.BGRA, new SheetBuilder(SheetType.BGRA, rc.SequenceBgraSheetSize) }
};
spriteCache = new Cache<string, Sprite[]>(
filename => FrameLoader.GetFrames(modData.DefaultFileSystem, filename, modData.SpriteLoaders, out _)
.Select(f => sheetBuilders[SheetBuilder.FrameTypeToSheetType(f.Type)].Add(f))

4
mods/d2k/mod.yaml
View File

@@ -239,7 +239,9 @@ VideoFormats: Vqa
TerrainFormat: DefaultTerrain
SpriteSequenceFormat: D2kSpriteSequence
IndexedSheetSize: 512
RendererConstants:
SequenceIndexedSheetSize: 512
AssetBrowser:
SpriteExtensions: .shp, .r8, .r16, .tmp, .png