From c6e101bd3f4ecf913482e7f3a0b5ec425006e75e Mon Sep 17 00:00:00 2001
From: Yong Jian Ming <jianming1993@gmail.com>
Date: Fri, 17 Jan 2025 23:17:38 +0800
Subject: [PATCH] Use custom shader for 3d model.

---
 .../Effects/BasicEffectWithAlphaTest.mgfxdx   | Bin 84148 -> 84580 bytes
 P3D/Core/Core.vb                              |  21 ++--
 P3D/Entites/Entity.vb                         |  66 +++++++---
 P3D/Entites/Enviroment/ModelEntity.vb         |  10 ++
 P3D/Overworld/BackdropRenderer.vb             |   2 +-
 P3D/Resources/ModelManager.vb                 |   2 +-
 .../Shader/BasicEffectWithAlphaTest.vb        | 117 +++++++++++++++++-
 .../Effects/BasicEffectWithAlphaTest.fx       |  60 ++++++---
 .../Content/Effects/Common.fxh                |   6 +
 .../Content/Effects/Structures.fxh            |   2 +-
 10 files changed, 237 insertions(+), 49 deletions(-)

diff --git a/P3D/Content/Effects/BasicEffectWithAlphaTest.mgfxdx b/P3D/Content/Effects/BasicEffectWithAlphaTest.mgfxdx
index fee6ce8d19eb33d100cc466e105bf92048dd8016..4f5a9038af7d2faeb46001063cb753ed216fa141 100644
GIT binary patch
delta 3968
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
CrpQ$Q

delta 4428
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

diff --git a/P3D/Core/Core.vb b/P3D/Core/Core.vb
index eabbe68c3..7084e01e2 100644
--- a/P3D/Core/Core.vb
+++ b/P3D/Core/Core.vb
@@ -45,7 +45,9 @@
 
     Public GameOptions As GameOptions
 
-    Public sampler As SamplerState
+    Public Sampler As SamplerState
+
+    Public ModelSampler As SamplerState
 
     Public BackgroundColor As Color = New Color(173, 216, 255)
 
@@ -85,14 +87,19 @@
 
         GameMessage = New GameMessage(Nothing, New Size(0, 0), New Vector2(0, 0))
 
-        sampler = New SamplerState()
-        sampler.Filter = TextureFilter.Point
-        sampler.AddressU = TextureAddressMode.Clamp
-        sampler.AddressV = TextureAddressMode.Clamp
+        Sampler = New SamplerState()
+        Sampler.Filter = TextureFilter.Point
+        Sampler.AddressU = TextureAddressMode.Clamp
+        Sampler.AddressV = TextureAddressMode.Clamp
+
+        ModelSampler = New SamplerState()
+        ModelSampler.Filter = TextureFilter.Point
+        ModelSampler.AddressU = TextureAddressMode.Wrap
+        ModelSampler.AddressV = TextureAddressMode.Wrap
 
         ServersManager = New Servers.ServersManager()
 
-        GraphicsDevice.SamplerStates(0) = sampler
+        GraphicsDevice.SamplerStates(0) = Sampler
         KeyboardInput = New KeyboardInput()
 
         If CommandLineArgHandler.NoSplash = True Then
@@ -193,7 +200,7 @@
             FontRenderer.Begin()
             GraphicsDevice.DepthStencilState = DepthStencilState.Default
 
-            GraphicsDevice.SamplerStates(0) = sampler
+            GraphicsDevice.SamplerStates(0) = Sampler
             GraphicsDevice.SamplerStates(0) = SamplerState.PointClamp
             CurrentScreen.Draw()
 
diff --git a/P3D/Entites/Entity.vb b/P3D/Entites/Entity.vb
index d8db95752..c2a5e6064 100644
--- a/P3D/Entites/Entity.vb
+++ b/P3D/Entites/Entity.vb
@@ -543,7 +543,17 @@
     Public Overridable Sub Draw(ByVal BaseModel As BaseModel, ByVal Textures() As Texture2D, ByVal setRasterizerState As Boolean, Optional Model As Model = Nothing)
         If Visible = True Then
             If Not Model Is Nothing Then
+                For Each modelMesh As ModelMesh In Model.Meshes
+                    For Each modelMeshPart As ModelMeshPart In modelMesh.MeshParts
+                        If modelMeshPart.Effect.GetType() = GetType(BasicEffect)
+                            Dim effect = New BasicEffectWithAlphaTest(CType(modelMeshPart.Effect, BasicEffect))
+                            modelMeshPart.Effect = effect
+                        End If
+                    Next
+                Next
+                Core.GraphicsDevice.SamplerStates(0) = Core.ModelSampler
                 Model.Draw(Me.World, Screen.Camera.View, Screen.Camera.Projection)
+                Core.GraphicsDevice.SamplerStates(0) = Core.Sampler
                 If drawViewBox = True Then
                     BoundingBoxRenderer.Render(ViewBox, Core.GraphicsDevice, Screen.Camera.View, Screen.Camera.Projection, Microsoft.Xna.Framework.Color.Red)
                 End If
@@ -661,25 +671,47 @@
         If Not Me.Model Is Nothing Then
             For Each mesh As ModelMesh In Me.Model.Meshes
                 For Each part As ModelMeshPart In mesh.MeshParts
-                    With CType(part.Effect, BasicEffect)
-                        Lighting.UpdateLighting(CType(part.Effect, BasicEffect))
-                        .Alpha = Me.Opacity
-                        If Core.GameOptions.LightingEnabled = True Then
-                            .DiffuseColor = Screen.Effect.DiffuseColor * Me.Shader * Me.Color
-                        Else
-                            .DiffuseColor = Screen.Effect.DiffuseColor * Me.Color
-                        End If
-                        If Not Screen.Level.World Is Nothing Then
-                            If Screen.Level.World.EnvironmentType = P3D.World.EnvironmentTypes.Outside Then
-                                .DiffuseColor *= SkyDome.GetDaytimeColor(True).ToVector3()
+                    If part.Effect.GetType() = GetType(BasicEffect)
+                        With CType(part.Effect, BasicEffect)
+                            Lighting.UpdateLighting(CType(part.Effect, BasicEffect))
+                            .Alpha = Me.Opacity
+                            If Core.GameOptions.LightingEnabled = True Then
+                                .DiffuseColor = Screen.Effect.DiffuseColor * Me.Shader * Me.Color
+                            Else
+                                .DiffuseColor = Screen.Effect.DiffuseColor * Me.Color
+                            End If
+                            If Not Screen.Level.World Is Nothing Then
+                                If Screen.Level.World.EnvironmentType = P3D.World.EnvironmentTypes.Outside Then
+                                    .DiffuseColor *= SkyDome.GetDaytimeColor(True).ToVector3()
+                                End If
                             End If
-                        End If
 
-                        .FogEnabled = True
-                        .FogColor = Screen.Effect.FogColor
-                        .FogEnd = Screen.Effect.FogEnd
-                        .FogStart = Screen.Effect.FogStart
-                    End With
+                            .FogEnabled = True
+                            .FogColor = Screen.Effect.FogColor
+                            .FogEnd = Screen.Effect.FogEnd
+                            .FogStart = Screen.Effect.FogStart
+                        End With
+                    Else
+                        With CType(part.Effect, BasicEffectWithAlphaTest)
+                            Lighting.UpdateLighting(CType(part.Effect, BasicEffectWithAlphaTest))
+                            .Alpha = Me.Opacity
+                            If Core.GameOptions.LightingEnabled = True Then
+                                .DiffuseColor = Screen.Effect.DiffuseColor * Me.Shader * Me.Color
+                            Else
+                                .DiffuseColor = Screen.Effect.DiffuseColor * Me.Color
+                            End If
+                            If Not Screen.Level.World Is Nothing Then
+                                If Screen.Level.World.EnvironmentType = P3D.World.EnvironmentTypes.Outside Then
+                                    .DiffuseColor *= SkyDome.GetDaytimeColor(True).ToVector3()
+                                End If
+                            End If
+
+                            .FogEnabled = True
+                            .FogColor = Screen.Effect.FogColor
+                            .FogEnd = Screen.Effect.FogEnd
+                            .FogStart = Screen.Effect.FogStart
+                        End With
+                    End If
                 Next
             Next
         End If
diff --git a/P3D/Entites/Enviroment/ModelEntity.vb b/P3D/Entites/Enviroment/ModelEntity.vb
index 6accd4f72..6ba88c66f 100644
--- a/P3D/Entites/Enviroment/ModelEntity.vb
+++ b/P3D/Entites/Enviroment/ModelEntity.vb
@@ -36,7 +36,17 @@
     Public Overrides Sub Render()
         If Visible = True Then
             If Not _model Is Nothing Then
+                For Each modelMesh As ModelMesh In Model.Meshes
+                    For Each modelMeshPart As ModelMeshPart In modelMesh.MeshParts
+                        If modelMeshPart.Effect.GetType() = GetType(BasicEffect)
+                            Dim effect = New BasicEffectWithAlphaTest(CType(modelMeshPart.Effect, BasicEffect))
+                            modelMeshPart.Effect = effect
+                        End If
+                    Next
+                Next
+                Core.GraphicsDevice.SamplerStates(0) = Core.ModelSampler
                 _model.Draw(Me.World, Screen.Camera.View, Screen.Camera.Projection)
+                Core.GraphicsDevice.SamplerStates(0) = Core.Sampler
             End If
 
             If drawViewBox = True Then
diff --git a/P3D/Overworld/BackdropRenderer.vb b/P3D/Overworld/BackdropRenderer.vb
index dd7adbd11..f06864a01 100644
--- a/P3D/Overworld/BackdropRenderer.vb
+++ b/P3D/Overworld/BackdropRenderer.vb
@@ -30,7 +30,7 @@
         Next
 
         GraphicsDevice.RasterizerState = tempRasterizer
-        GraphicsDevice.SamplerStates(0) = Core.sampler
+        GraphicsDevice.SamplerStates(0) = Core.Sampler
     End Sub
 
     Public Class Backdrop
diff --git a/P3D/Resources/ModelManager.vb b/P3D/Resources/ModelManager.vb
index 14623dc7f..7a05c48b2 100644
--- a/P3D/Resources/ModelManager.vb
+++ b/P3D/Resources/ModelManager.vb
@@ -57,7 +57,7 @@ Public Class ModelManager
         Core.GraphicsDevice.Clear(Color.Transparent)
 
         Core.GraphicsDevice.BlendState = BlendState.Opaque
-        Core.GraphicsDevice.SamplerStates(0) = Core.sampler
+        Core.GraphicsDevice.SamplerStates(0) = Core.Sampler
 
         Dim m As Model = ModelManager.GetModel(modelName)
 
diff --git a/P3D/Resources/Shader/BasicEffectWithAlphaTest.vb b/P3D/Resources/Shader/BasicEffectWithAlphaTest.vb
index b51585a03..c4030bee8 100644
--- a/P3D/Resources/Shader/BasicEffectWithAlphaTest.vb
+++ b/P3D/Resources/Shader/BasicEffectWithAlphaTest.vb
@@ -251,14 +251,23 @@ Public NotInheritable Class BasicEffectWithAlphaTest
 
     Public Sub New(ByVal device As GraphicsDevice)
         MyBase.New(device, File.ReadAllBytes(Path.Combine(Path.GetDirectoryName(AppContext.BaseDirectory), "Content", "Effects", "BasicEffectWithAlphaTest.mgfxdx")))
-        CacheEffectParameters(Nothing)
+        CacheEffectParameters()
         DirectionalLight0.Enabled = True
         SpecularColor = Vector3.One
         SpecularPower = 16
         AlphaCutoff = 0
     End Sub
 
-    Private Sub New(ByVal cloneSource As BasicEffectWithAlphaTest)
+    Public Sub New(ByVal device As GraphicsDevice, ByVal data As Byte())
+        MyBase.New(device, data)
+        CacheEffectParameters()
+        DirectionalLight0.Enabled = True
+        SpecularColor = Vector3.One
+        SpecularPower = 16
+        AlphaCutoff = 0
+    End Sub
+
+    Public Sub New(ByVal cloneSource As BasicEffectWithAlphaTest)
         MyBase.New(cloneSource)
         CacheEffectParameters(cloneSource)
         _lightingEnabled = cloneSource.lightingEnabled
@@ -277,6 +286,74 @@ Public NotInheritable Class BasicEffectWithAlphaTest
         _fogEnd = cloneSource.fogEnd
     End Sub
 
+    Public Sub New(ByVal cloneSource As BasicEffect)
+        MyBase.New(cloneSource.GraphicsDevice, File.ReadAllBytes(Path.Combine(Path.GetDirectoryName(AppContext.BaseDirectory), "Content", "Effects", "BasicEffectWithAlphaTest.mgfxdx")))
+        CacheEffectParameters(cloneSource)
+        DirectionalLight0 = cloneSource.DirectionalLight0
+        DirectionalLight1 = cloneSource.DirectionalLight1
+        DirectionalLight2 = cloneSource.DirectionalLight2
+        World = cloneSource.World
+        View = cloneSource.View
+        Projection = cloneSource.Projection
+        DiffuseColor = cloneSource.DiffuseColor
+        EmissiveColor = cloneSource.EmissiveColor
+        SpecularColor = cloneSource.SpecularColor
+        SpecularPower = cloneSource.SpecularPower
+        Alpha = cloneSource.Alpha
+        LightingEnabled = cloneSource.LightingEnabled
+        PreferPerPixelLighting = cloneSource.PreferPerPixelLighting
+        AmbientLightColor = cloneSource.AmbientLightColor
+        FogEnabled = cloneSource.FogEnabled
+        FogStart = cloneSource.FogStart
+        FogEnd = cloneSource.FogEnd
+        FogColor = cloneSource.FogColor
+        TextureEnabled = cloneSource.TextureEnabled
+        Texture = cloneSource.Texture
+        VertexColorEnabled = cloneSource.VertexColorEnabled
+    End Sub
+
+    Public Widening Shared Operator CType(ByVal effect As BasicEffectWithAlphaTest) As BasicEffect
+        Dim newEffect As New BasicEffect(effect.GraphicsDevice)
+        With newEffect
+            With .DirectionalLight0
+                .Enabled = effect.DirectionalLight0.Enabled
+                .Direction = effect.DirectionalLight0.Direction
+                .DiffuseColor = effect.DirectionalLight0.DiffuseColor
+                .SpecularColor = effect.DirectionalLight0.SpecularColor
+            End With
+            With .DirectionalLight1
+                .Enabled = effect.DirectionalLight1.Enabled
+                .Direction = effect.DirectionalLight1.Direction
+                .DiffuseColor = effect.DirectionalLight1.DiffuseColor
+                .SpecularColor = effect.DirectionalLight1.SpecularColor
+            End With
+            With .DirectionalLight2
+                .Enabled = effect.DirectionalLight2.Enabled
+                .Direction = effect.DirectionalLight2.Direction
+                .DiffuseColor = effect.DirectionalLight2.DiffuseColor
+                .SpecularColor = effect.DirectionalLight2.SpecularColor
+            End With
+            .World = effect.World
+            .View = effect.View
+            .Projection = effect.Projection
+            .DiffuseColor = effect.DiffuseColor
+            .EmissiveColor = effect.EmissiveColor
+            .SpecularColor = effect.SpecularColor
+            .SpecularPower = effect.SpecularPower
+            .Alpha = effect.Alpha
+            .LightingEnabled = effect.LightingEnabled
+            .PreferPerPixelLighting = effect.PreferPerPixelLighting
+            .AmbientLightColor = effect.AmbientLightColor
+            .FogStart = effect.FogStart
+            .FogEnd = effect.FogEnd
+            .FogColor = effect.FogColor
+            .TextureEnabled = effect.TextureEnabled
+            .Texture = effect.Texture
+            .VertexColorEnabled = effect.VertexColorEnabled
+        End With
+        Return newEffect
+    End Operator
+
     Public Overrides Function Clone() As Effect
         Return New BasicEffectWithAlphaTest(Me)
     End Function
@@ -338,6 +415,24 @@ Public NotInheritable Class BasicEffectWithAlphaTest
         End If
     End Sub
 
+    Private Sub CacheEffectParameters()
+        _textureParam = Parameters("Texture")
+        _diffuseColorParam = Parameters("DiffuseColor")
+        _emissiveColorParam = Parameters("EmissiveColor")
+        _specularColorParam = Parameters("SpecularColor")
+        _specularPowerParam = Parameters("SpecularPower")
+        _eyePositionParam = Parameters("EyePosition")
+        _fogColorParam = Parameters("FogColor")
+        _fogVectorParam = Parameters("FogVector")
+        _worldParam = Parameters("World")
+        _worldInverseTransposeParam = Parameters("WorldInverseTranspose")
+        _worldViewProjParam = Parameters("WorldViewProj")
+        _alphaTestParam = Parameters("AlphaTest")
+        DirectionalLight0 = New DirectionalLight(Parameters("DirLight0Direction"), Parameters("DirLight0DiffuseColor"), Parameters("DirLight0SpecularColor"), Nothing)
+        DirectionalLight1 = New DirectionalLight(Parameters("DirLight1Direction"), Parameters("DirLight1DiffuseColor"), Parameters("DirLight1SpecularColor"), Nothing)
+        DirectionalLight2 = New DirectionalLight(Parameters("DirLight2Direction"), Parameters("DirLight2DiffuseColor"), Parameters("DirLight2SpecularColor"), Nothing)
+    End Sub
+
     Private Sub CacheEffectParameters(ByVal cloneSource As BasicEffectWithAlphaTest)
         _textureParam = Parameters("Texture")
         _diffuseColorParam = Parameters("DiffuseColor")
@@ -355,4 +450,22 @@ Public NotInheritable Class BasicEffectWithAlphaTest
         DirectionalLight1 = New DirectionalLight(Parameters("DirLight1Direction"), Parameters("DirLight1DiffuseColor"), Parameters("DirLight1SpecularColor"), cloneSource?.DirectionalLight1)
         DirectionalLight2 = New DirectionalLight(Parameters("DirLight2Direction"), Parameters("DirLight2DiffuseColor"), Parameters("DirLight2SpecularColor"), cloneSource?.DirectionalLight2)
     End Sub
+
+    Private Sub CacheEffectParameters(ByVal cloneSource As BasicEffect)
+        _textureParam = Parameters("Texture")
+        _diffuseColorParam = Parameters("DiffuseColor")
+        _emissiveColorParam = Parameters("EmissiveColor")
+        _specularColorParam = Parameters("SpecularColor")
+        _specularPowerParam = Parameters("SpecularPower")
+        _eyePositionParam = Parameters("EyePosition")
+        _fogColorParam = Parameters("FogColor")
+        _fogVectorParam = Parameters("FogVector")
+        _worldParam = Parameters("World")
+        _worldInverseTransposeParam = Parameters("WorldInverseTranspose")
+        _worldViewProjParam = Parameters("WorldViewProj")
+        _alphaTestParam = Parameters("AlphaTest")
+        DirectionalLight0 = New DirectionalLight(Parameters("DirLight0Direction"), Parameters("DirLight0DiffuseColor"), Parameters("DirLight0SpecularColor"), cloneSource?.DirectionalLight0)
+        DirectionalLight1 = New DirectionalLight(Parameters("DirLight1Direction"), Parameters("DirLight1DiffuseColor"), Parameters("DirLight1SpecularColor"), cloneSource?.DirectionalLight1)
+        DirectionalLight2 = New DirectionalLight(Parameters("DirLight2Direction"), Parameters("DirLight2DiffuseColor"), Parameters("DirLight2SpecularColor"), cloneSource?.DirectionalLight2)
+    End Sub
 End Class
diff --git a/lib/P3D.ContentPipeline/Content/Effects/BasicEffectWithAlphaTest.fx b/lib/P3D.ContentPipeline/Content/Effects/BasicEffectWithAlphaTest.fx
index 9fd90d74e..6fd8f520b 100644
--- a/lib/P3D.ContentPipeline/Content/Effects/BasicEffectWithAlphaTest.fx
+++ b/lib/P3D.ContentPipeline/Content/Effects/BasicEffectWithAlphaTest.fx
@@ -69,7 +69,8 @@ VSOutput VSHWBasic(VSInput vin, VSHWInputInstance vhwin)
 {
     VSOutput vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position + vhwin.Position);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position);
     SetCommonVSOutputParams;
     
     return vout;
@@ -93,7 +94,8 @@ VSOutputNoFog VSHWBasicNoFog(VSInput vin, VSHWInputInstance vhwin)
 {
     VSOutputNoFog vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position + vhwin.Position);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position);
     SetCommonVSOutputParamsNoFog;
     
     return vout;
@@ -119,7 +121,8 @@ VSOutput VSHWBasicVc(VSInputVc vin, VSHWInputInstance vhwin)
 {
     VSOutput vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position + vhwin.Position);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position);
     SetCommonVSOutputParams;
     
     vout.Diffuse *= vin.Color;
@@ -147,7 +150,8 @@ VSOutputNoFog VSHWBasicVcNoFog(VSInputVc vin, VSHWInputInstance vhwin)
 {
     VSOutputNoFog vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position + vhwin.Position);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position);
     SetCommonVSOutputParamsNoFog;
     
     vout.Diffuse *= vin.Color;
@@ -175,7 +179,8 @@ VSOutputTx VSHWBasicTx(VSInputTx vin, VSHWInputInstance vhwin)
 {
     VSOutputTx vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position + vhwin.Position);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position);
     SetCommonVSOutputParams;
     
     vout.TexCoord = vin.TexCoord;
@@ -203,7 +208,8 @@ VSOutputTxNoFog VSHWBasicTxNoFog(VSInputTx vin, VSHWInputInstance vhwin)
 {
     VSOutputTxNoFog vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position + vhwin.Position);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position);
     SetCommonVSOutputParamsNoFog;
     
     vout.TexCoord = vin.TexCoord;
@@ -232,7 +238,8 @@ VSOutputTx VSHWBasicTxVc(VSInputTxVc vin, VSHWInputInstance vhwin)
 {
     VSOutputTx vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position + vhwin.Position);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position);
     SetCommonVSOutputParams;
     
     vout.TexCoord = vin.TexCoord;
@@ -262,7 +269,8 @@ VSOutputTxNoFog VSHWBasicTxVcNoFog(VSInputTxVc vin, VSHWInputInstance vhwin)
 {
     VSOutputTxNoFog vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position + vhwin.Position);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutput(vin.Position);
     SetCommonVSOutputParamsNoFog;
     
     vout.TexCoord = vin.TexCoord;
@@ -289,7 +297,8 @@ VSOutput VSHWBasicVertexLighting(VSInputNm vin, VSHWInputInstance vhwin)
 {
     VSOutput vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position + vhwin.Position, vin.Normal, 3);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position, vin.Normal, 3);
     SetCommonVSOutputParams;
     
     return vout;
@@ -315,7 +324,8 @@ VSOutput VSHWBasicVertexLightingVc(VSInputNmVc vin, VSHWInputInstance vhwin)
 {
     VSOutput vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position + vhwin.Position, vin.Normal, 3);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position, vin.Normal, 3);
     SetCommonVSOutputParams;
     
     vout.Diffuse *= vin.Color;
@@ -343,7 +353,8 @@ VSOutputTx VSHWBasicVertexLightingTx(VSInputNmTx vin, VSHWInputInstance vhwin)
 {
     VSOutputTx vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position + vhwin.Position, vin.Normal, 3);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position, vin.Normal, 3);
     SetCommonVSOutputParams;
     
     vout.TexCoord = vin.TexCoord;
@@ -372,7 +383,8 @@ VSOutputTx VSHWBasicVertexLightingTxVc(VSInputNmTxVc vin, VSHWInputInstance vhwi
 {
     VSOutputTx vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position + vhwin.Position, vin.Normal, 3);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position, vin.Normal, 3);
     SetCommonVSOutputParams;
     
     vout.TexCoord = vin.TexCoord;
@@ -399,7 +411,8 @@ VSOutput VSHWBasicOneLight(VSInputNm vin, VSHWInputInstance vhwin)
 {
     VSOutput vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position + vhwin.Position, vin.Normal, 1);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position, vin.Normal, 1);
     SetCommonVSOutputParams;
     
     return vout;
@@ -425,7 +438,8 @@ VSOutput VSHWBasicOneLightVc(VSInputNmVc vin, VSHWInputInstance vhwin)
 {
     VSOutput vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position + vhwin.Position, vin.Normal, 1);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position, vin.Normal, 1);
     SetCommonVSOutputParams;
     
     vout.Diffuse *= vin.Color;
@@ -453,7 +467,8 @@ VSOutputTx VSHWBasicOneLightTx(VSInputNmTx vin, VSHWInputInstance vhwin)
 {
     VSOutputTx vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position + vhwin.Position, vin.Normal, 1);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position, vin.Normal, 1);
     SetCommonVSOutputParams;
     
     vout.TexCoord = vin.TexCoord;
@@ -482,7 +497,8 @@ VSOutputTx VSHWBasicOneLightTxVc(VSInputNmTxVc vin, VSHWInputInstance vhwin)
 {
     VSOutputTx vout;
     
-    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position + vhwin.Position, vin.Normal, 1);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutput cout = ComputeCommonVSOutputWithLighting(vin.Position, vin.Normal, 1);
     SetCommonVSOutputParams;
     
     vout.TexCoord = vin.TexCoord;
@@ -511,7 +527,8 @@ VSOutputPixelLighting VSHWBasicPixelLighting(VSInputNm vin, VSHWInputInstance vh
 {
     VSOutputPixelLighting vout;
     
-    CommonVSOutputPixelLighting cout = ComputeCommonVSOutputPixelLighting(vin.Position + vhwin.Position, vin.Normal);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutputPixelLighting cout = ComputeCommonVSOutputPixelLighting(vin.Position, vin.Normal);
     SetCommonVSOutputParamsPixelLighting;
 
     vout.Diffuse = float4(1, 1, 1, DiffuseColor.a);
@@ -540,7 +557,8 @@ VSOutputPixelLighting VSHWBasicPixelLightingVc(VSInputNmVc vin, VSHWInputInstanc
 {
     VSOutputPixelLighting vout;
     
-    CommonVSOutputPixelLighting cout = ComputeCommonVSOutputPixelLighting(vin.Position + vhwin.Position, vin.Normal);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutputPixelLighting cout = ComputeCommonVSOutputPixelLighting(vin.Position, vin.Normal);
     SetCommonVSOutputParamsPixelLighting;
     
     vout.Diffuse.rgb = vin.Color.rgb;
@@ -570,7 +588,8 @@ VSOutputPixelLightingTx VSHWBasicPixelLightingTx(VSInputNmTx vin, VSHWInputInsta
 {
     VSOutputPixelLightingTx vout;
     
-    CommonVSOutputPixelLighting cout = ComputeCommonVSOutputPixelLighting(vin.Position + vhwin.Position, vin.Normal);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutputPixelLighting cout = ComputeCommonVSOutputPixelLighting(vin.Position, vin.Normal);
     SetCommonVSOutputParamsPixelLighting;
     
     vout.Diffuse = float4(1, 1, 1, DiffuseColor.a);
@@ -601,7 +620,8 @@ VSOutputPixelLightingTx VSHWBasicPixelLightingTxVc(VSInputNmTxVc vin, VSHWInputI
 {
     VSOutputPixelLightingTx vout;
     
-    CommonVSOutputPixelLighting cout = ComputeCommonVSOutputPixelLighting(vin.Position + vhwin.Position, vin.Normal);
+    ApplyPositionOffset(vin.Position, vhwin.Position);
+    CommonVSOutputPixelLighting cout = ComputeCommonVSOutputPixelLighting(vin.Position, vin.Normal);
     SetCommonVSOutputParamsPixelLighting;
     
     vout.Diffuse.rgb = vin.Color.rgb;
diff --git a/lib/P3D.ContentPipeline/Content/Effects/Common.fxh b/lib/P3D.ContentPipeline/Content/Effects/Common.fxh
index 33f121be0..2a6dca4e8 100644
--- a/lib/P3D.ContentPipeline/Content/Effects/Common.fxh
+++ b/lib/P3D.ContentPipeline/Content/Effects/Common.fxh
@@ -33,6 +33,12 @@ struct CommonVSOutput
 };
 
 
+void ApplyPositionOffset(inout float4 position, float3 offset)
+{
+    position.xyz += offset.xyz;
+}
+
+
 CommonVSOutput ComputeCommonVSOutput(float4 position)
 {
     CommonVSOutput vout;
diff --git a/lib/P3D.ContentPipeline/Content/Effects/Structures.fxh b/lib/P3D.ContentPipeline/Content/Effects/Structures.fxh
index 817b557a9..8145a0aac 100644
--- a/lib/P3D.ContentPipeline/Content/Effects/Structures.fxh
+++ b/lib/P3D.ContentPipeline/Content/Effects/Structures.fxh
@@ -10,7 +10,7 @@
 
 struct VSHWInputInstance
 {
-    float4 Position : POSITION1;
+    float3 Position : POSITION1;
 };
 
 struct VSInput