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

Rename VoxelPreview to ModelPreview.

Browse Source
This commit is contained in:
Paul Chote
2017-06-09 08:25:21 +00:00
committed by reaperrr
parent 736e70df78
commit 6ca0208694
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Graphics/VoxelActorPreview.cs → OpenRA.Mods.Common/Graphics/ModelActorPreview.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Graphics;
namespace OpenRA.Mods.Common.Graphics namespace OpenRA.Mods.Common.Graphics
{ {
public class VoxelPreview : IActorPreview public class ModelPreview : IActorPreview
{ {
readonly ModelAnimation[] components; readonly ModelAnimation[] components;
readonly float scale; readonly float scale;
@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Graphics
readonly WVec offset; readonly WVec offset;
readonly int zOffset; readonly int zOffset;
public VoxelPreview(ModelAnimation[] components, WVec offset, int zOffset, float scale, WAngle lightPitch, WAngle lightYaw, public ModelPreview(ModelAnimation[] components, WVec offset, int zOffset, float scale, WAngle lightPitch, WAngle lightYaw,
float[] lightAmbientColor, float[] lightDiffuseColor, WAngle cameraPitch, float[] lightAmbientColor, float[] lightDiffuseColor, WAngle cameraPitch,
PaletteReference colorPalette, PaletteReference normalsPalette, PaletteReference shadowPalette) PaletteReference colorPalette, PaletteReference normalsPalette, PaletteReference shadowPalette)
{ {

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -164,7 +164,7 @@
<Compile Include="Graphics\SelectionBoxRenderable.cs" /> <Compile Include="Graphics\SelectionBoxRenderable.cs" />
<Compile Include="Graphics\SpriteActorPreview.cs" /> <Compile Include="Graphics\SpriteActorPreview.cs" />
<Compile Include="Graphics\TextRenderable.cs" /> <Compile Include="Graphics\TextRenderable.cs" />
<Compile Include="Graphics\VoxelActorPreview.cs" /> <Compile Include="Graphics\ModelActorPreview.cs" />
<Compile Include="Graphics\ModelRenderable.cs" /> <Compile Include="Graphics\ModelRenderable.cs" />
<Compile Include="HitShapes\IHitShape.cs" /> <Compile Include="HitShapes\IHitShape.cs" />
<Compile Include="HitShapes\Rectangle.cs" /> <Compile Include="HitShapes\Rectangle.cs" />

2
OpenRA.Mods.Common/Traits/Render/RenderVoxels.cs
View File

@@ -63,7 +63,7 @@ namespace OpenRA.Mods.Common.Traits.Render
.SelectMany(rvpi => rvpi.RenderPreviewVoxels(init, this, image, init.GetOrientation(), facings, palette)) .SelectMany(rvpi => rvpi.RenderPreviewVoxels(init, this, image, init.GetOrientation(), facings, palette))
.ToArray(); .ToArray();
yield return new VoxelPreview(components, WVec.Zero, 0, Scale, LightPitch, yield return new ModelPreview(components, WVec.Zero, 0, Scale, LightPitch,
LightYaw, LightAmbientColor, LightDiffuseColor, body.CameraPitch, LightYaw, LightAmbientColor, LightDiffuseColor, body.CameraPitch,
palette, init.WorldRenderer.Palette(NormalsPalette), init.WorldRenderer.Palette(ShadowPalette)); palette, init.WorldRenderer.Palette(NormalsPalette), init.WorldRenderer.Palette(ShadowPalette));
} }