diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 1c0bd3050d..9846496c0a 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -633,9 +633,9 @@ namespace OpenRA using (new PerfSample("render_widgets")) { - Renderer.WorldVoxelRenderer.BeginFrame(); + Renderer.WorldModelRenderer.BeginFrame(); Ui.PrepareRenderables(); - Renderer.WorldVoxelRenderer.EndFrame(); + Renderer.WorldModelRenderer.EndFrame(); Ui.Draw(); diff --git a/OpenRA.Game/Graphics/VoxelRenderer.cs b/OpenRA.Game/Graphics/ModelRenderer.cs similarity index 97% rename from OpenRA.Game/Graphics/VoxelRenderer.cs rename to OpenRA.Game/Graphics/ModelRenderer.cs index a6018675c3..98b90c6b2f 100644 --- a/OpenRA.Game/Graphics/VoxelRenderer.cs +++ b/OpenRA.Game/Graphics/ModelRenderer.cs @@ -17,14 +17,14 @@ using OpenRA.Primitives; namespace OpenRA.Graphics { - public class VoxelRenderProxy + public class ModelRenderProxy { public readonly Sprite Sprite; public readonly Sprite ShadowSprite; public readonly float ShadowDirection; public readonly float3[] ProjectedShadowBounds; - public VoxelRenderProxy(Sprite sprite, Sprite shadowSprite, float3[] projectedShadowBounds, float shadowDirection) + public ModelRenderProxy(Sprite sprite, Sprite shadowSprite, float3[] projectedShadowBounds, float shadowDirection) { Sprite = sprite; ShadowSprite = shadowSprite; @@ -33,7 +33,7 @@ namespace OpenRA.Graphics } } - public sealed class VoxelRenderer : IDisposable + public sealed class ModelRenderer : IDisposable { // Static constants static readonly float[] ShadowDiffuse = new float[] { 0, 0, 0 }; @@ -53,7 +53,7 @@ namespace OpenRA.Graphics SheetBuilder sheetBuilder; - public VoxelRenderer(Renderer renderer, IShader shader) + public ModelRenderer(Renderer renderer, IShader shader) { this.renderer = renderer; this.shader = shader; @@ -78,7 +78,7 @@ namespace OpenRA.Graphics shader.SetMatrix("View", view); } - public VoxelRenderProxy RenderAsync( + public ModelRenderProxy RenderAsync( WorldRenderer wr, IEnumerable voxels, WRot camera, float scale, float[] groundNormal, WRot lightSource, float[] lightAmbientColor, float[] lightDiffuseColor, PaletteReference color, PaletteReference normals, PaletteReference shadowPalette) @@ -221,7 +221,7 @@ namespace OpenRA.Graphics var screenLightVector = Util.MatrixVectorMultiply(invShadowTransform, ZVector); screenLightVector = Util.MatrixVectorMultiply(cameraTransform, screenLightVector); - return new VoxelRenderProxy(sprite, shadowSprite, screenCorners, -screenLightVector[2] / screenLightVector[1]); + return new ModelRenderProxy(sprite, shadowSprite, screenCorners, -screenLightVector[2] / screenLightVector[1]); } static void CalculateSpriteGeometry(float2 tl, float2 br, float scale, out Size size, out int2 offset) diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs index 6c6399536b..6fec049267 100644 --- a/OpenRA.Game/Graphics/WorldRenderer.cs +++ b/OpenRA.Game/Graphics/WorldRenderer.cs @@ -113,9 +113,9 @@ namespace OpenRA.Graphics worldRenderables = worldRenderables.Concat(World.Effects.SelectMany(e => e.Render(this))); worldRenderables = worldRenderables.OrderBy(RenderableScreenZPositionComparisonKey); - Game.Renderer.WorldVoxelRenderer.BeginFrame(); + Game.Renderer.WorldModelRenderer.BeginFrame(); var renderables = worldRenderables.Select(r => r.PrepareRender(this)).ToList(); - Game.Renderer.WorldVoxelRenderer.EndFrame(); + Game.Renderer.WorldModelRenderer.EndFrame(); return renderables; } @@ -182,14 +182,14 @@ namespace OpenRA.Graphics if (World.OrderGenerator != null) aboveShroudOrderGenerator = World.OrderGenerator.RenderAboveShroud(this, World); - Game.Renderer.WorldVoxelRenderer.BeginFrame(); + Game.Renderer.WorldModelRenderer.BeginFrame(); var finalOverlayRenderables = aboveShroud .Concat(aboveShroudSelected) .Concat(aboveShroudEffects) .Concat(aboveShroudOrderGenerator) .Select(r => r.PrepareRender(this)) .ToList(); - Game.Renderer.WorldVoxelRenderer.EndFrame(); + Game.Renderer.WorldModelRenderer.EndFrame(); // HACK: Keep old grouping behaviour foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType())) diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 2a1ee4f3f0..02d8781256 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -196,7 +196,7 @@ - + diff --git a/OpenRA.Game/Renderer.cs b/OpenRA.Game/Renderer.cs index 6684734b13..7e6b084b19 100644 --- a/OpenRA.Game/Renderer.cs +++ b/OpenRA.Game/Renderer.cs @@ -23,7 +23,7 @@ namespace OpenRA public SpriteRenderer WorldSpriteRenderer { get; private set; } public SpriteRenderer WorldRgbaSpriteRenderer { get; private set; } public RgbaColorRenderer WorldRgbaColorRenderer { get; private set; } - public VoxelRenderer WorldVoxelRenderer { get; private set; } + public ModelRenderer WorldModelRenderer { get; private set; } public RgbaColorRenderer RgbaColorRenderer { get; private set; } public SpriteRenderer RgbaSpriteRenderer { get; private set; } public SpriteRenderer SpriteRenderer { get; private set; } @@ -59,7 +59,7 @@ namespace OpenRA WorldSpriteRenderer = new SpriteRenderer(this, Device.CreateShader("shp")); WorldRgbaSpriteRenderer = new SpriteRenderer(this, Device.CreateShader("rgba")); WorldRgbaColorRenderer = new RgbaColorRenderer(this, Device.CreateShader("color")); - WorldVoxelRenderer = new VoxelRenderer(this, Device.CreateShader("vxl")); + WorldModelRenderer = new ModelRenderer(this, Device.CreateShader("model")); RgbaColorRenderer = new RgbaColorRenderer(this, Device.CreateShader("color")); RgbaSpriteRenderer = new SpriteRenderer(this, Device.CreateShader("rgba")); SpriteRenderer = new SpriteRenderer(this, Device.CreateShader("shp")); @@ -136,7 +136,7 @@ namespace OpenRA lastZoom = zoom; WorldRgbaSpriteRenderer.SetViewportParams(Resolution, depthScale, depthOffset, zoom, scroll); WorldSpriteRenderer.SetViewportParams(Resolution, depthScale, depthOffset, zoom, scroll); - WorldVoxelRenderer.SetViewportParams(Resolution, zoom, scroll); + WorldModelRenderer.SetViewportParams(Resolution, zoom, scroll); WorldRgbaColorRenderer.SetViewportParams(Resolution, depthScale, depthOffset, zoom, scroll); } } @@ -153,7 +153,7 @@ namespace OpenRA SpriteRenderer.SetPalette(currentPaletteTexture); WorldSpriteRenderer.SetPalette(currentPaletteTexture); WorldRgbaSpriteRenderer.SetPalette(currentPaletteTexture); - WorldVoxelRenderer.SetPalette(currentPaletteTexture); + WorldModelRenderer.SetPalette(currentPaletteTexture); } public void EndFrame(IInputHandler inputHandler) @@ -267,7 +267,7 @@ namespace OpenRA public void Dispose() { Device.Dispose(); - WorldVoxelRenderer.Dispose(); + WorldModelRenderer.Dispose(); tempBuffer.Dispose(); if (fontSheetBuilder != null) fontSheetBuilder.Dispose(); diff --git a/OpenRA.Mods.Common/Graphics/VoxelRenderable.cs b/OpenRA.Mods.Common/Graphics/VoxelRenderable.cs index e7c601526c..f8e2763f5f 100644 --- a/OpenRA.Mods.Common/Graphics/VoxelRenderable.cs +++ b/OpenRA.Mods.Common/Graphics/VoxelRenderable.cs @@ -91,14 +91,14 @@ namespace OpenRA.Mods.Common.Graphics struct FinalizedVoxelRenderable : IFinalizedRenderable { readonly VoxelRenderable voxel; - readonly VoxelRenderProxy renderProxy; + readonly ModelRenderProxy renderProxy; public FinalizedVoxelRenderable(WorldRenderer wr, VoxelRenderable voxel) { this.voxel = voxel; var draw = voxel.voxels.Where(v => v.DisableFunc == null || !v.DisableFunc()); - renderProxy = Game.Renderer.WorldVoxelRenderer.RenderAsync( + renderProxy = Game.Renderer.WorldModelRenderer.RenderAsync( wr, draw, voxel.camera, voxel.scale, GroundNormal, voxel.lightSource, voxel.lightAmbientColor, voxel.lightDiffuseColor, voxel.palette, voxel.normalsPalette, voxel.shadowPalette); diff --git a/glsl/vxl.frag b/glsl/model.frag similarity index 100% rename from glsl/vxl.frag rename to glsl/model.frag diff --git a/glsl/vxl.vert b/glsl/model.vert similarity index 100% rename from glsl/vxl.vert rename to glsl/model.vert