Fixed Models not being affected by lighting

This commit is contained in:
JappaWakka 2022-07-16 14:48:29 +02:00
parent b57ae43a3c
commit f103caa5f2
31 changed files with 32 additions and 4 deletions

View File

@ -69,7 +69,6 @@
End If End If
End If End If
End If End If
MyBase.Update()
End Sub End Sub
Public Overrides Sub UpdateEntity() Public Overrides Sub UpdateEntity()
@ -99,6 +98,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Draw(Me.BaseModel, Me.Textures, True) Draw(Me.BaseModel, Me.Textures, True)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End If End If

View File

@ -51,6 +51,7 @@
[Object].Render() [Object].Render()
Next Next
For Each [Object] As Entity In RenderObjects For Each [Object] As Entity In RenderObjects
[Object].UpdateModel()
[Object].Render() [Object].Render()
Next Next
End Sub End Sub

View File

@ -344,7 +344,6 @@
End Sub End Sub
Public Overridable Sub Update() Public Overridable Sub Update()
UpdateModel()
End Sub End Sub
Public Sub UpdateModel() Public Sub UpdateModel()
@ -564,7 +563,7 @@
End Sub End Sub
Public Overridable Sub Render() Public Overridable Sub Render()
UpdateModel()
End Sub End Sub
Public Overridable Sub ClickFunction() Public Overridable Sub ClickFunction()

View File

@ -6,6 +6,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, True) Me.Draw(Me.BaseModel, Textures, True)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -224,6 +224,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, setRasterizerState) Me.Draw(Me.BaseModel, Textures, setRasterizerState)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -124,6 +124,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Draw(BaseModel, Textures, False) Draw(BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -67,6 +67,7 @@
End Sub End Sub
Public Overrides Sub Update() Public Overrides Sub Update()
If Me.LastUpdateDate.Year = 1 Then If Me.LastUpdateDate.Year = 1 Then
Me.LastUpdateDate = Date.Now Me.LastUpdateDate = Date.Now
End If End If
@ -207,6 +208,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -76,6 +76,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -113,6 +113,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -57,6 +57,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -25,6 +25,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -81,6 +81,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -158,6 +158,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -56,6 +56,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -231,6 +231,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -42,7 +42,6 @@
End If End If
End If End If
End If End If
UpdateModel()
End Sub End Sub
Private Function GetSteps() As Integer Private Function GetSteps() As Integer
@ -89,6 +88,7 @@ theend:
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -122,6 +122,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, True) Me.Draw(Me.BaseModel, Textures, True)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -55,6 +55,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, True) Me.Draw(Me.BaseModel, Textures, True)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -167,6 +167,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -159,6 +159,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Me.Textures, False) Me.Draw(Me.BaseModel, Me.Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -30,6 +30,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -129,6 +129,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -72,6 +72,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, True) Me.Draw(Me.BaseModel, Textures, True)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -40,6 +40,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, True) Me.Draw(Me.BaseModel, Textures, True)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -19,6 +19,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -10,6 +10,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -6,6 +6,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -256,6 +256,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, setRasterizerState) Me.Draw(Me.BaseModel, Textures, setRasterizerState)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -156,6 +156,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -68,6 +68,7 @@
If Me.Model Is Nothing Then If Me.Model Is Nothing Then
Me.Draw(Me.BaseModel, Textures, False) Me.Draw(Me.BaseModel, Textures, False)
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub

View File

@ -492,6 +492,7 @@
Draw(Me.BaseModel, Me.Textures, True) Draw(Me.BaseModel, Me.Textures, True)
GraphicsDevice.DepthStencilState = state GraphicsDevice.DepthStencilState = state
Else Else
UpdateModel()
Draw(Me.BaseModel, Me.Textures, True, Me.Model) Draw(Me.BaseModel, Me.Textures, True, Me.Model)
End If End If
End Sub End Sub