Fixed Models not being affected by lighting
This commit is contained in:
parent
b57ae43a3c
commit
f103caa5f2
|
@ -69,7 +69,6 @@
|
|||
End If
|
||||
End If
|
||||
End If
|
||||
MyBase.Update()
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub UpdateEntity()
|
||||
|
@ -99,6 +98,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Draw(Me.BaseModel, Me.Textures, True)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End If
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
[Object].Render()
|
||||
Next
|
||||
For Each [Object] As Entity In RenderObjects
|
||||
[Object].UpdateModel()
|
||||
[Object].Render()
|
||||
Next
|
||||
End Sub
|
||||
|
|
|
@ -344,7 +344,6 @@
|
|||
End Sub
|
||||
|
||||
Public Overridable Sub Update()
|
||||
UpdateModel()
|
||||
End Sub
|
||||
|
||||
Public Sub UpdateModel()
|
||||
|
@ -564,7 +563,7 @@
|
|||
End Sub
|
||||
|
||||
Public Overridable Sub Render()
|
||||
|
||||
UpdateModel()
|
||||
End Sub
|
||||
|
||||
Public Overridable Sub ClickFunction()
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, True)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -224,6 +224,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, setRasterizerState)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -124,6 +124,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Draw(BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -67,6 +67,7 @@
|
|||
End Sub
|
||||
|
||||
Public Overrides Sub Update()
|
||||
|
||||
If Me.LastUpdateDate.Year = 1 Then
|
||||
Me.LastUpdateDate = Date.Now
|
||||
End If
|
||||
|
@ -207,6 +208,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -76,6 +76,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -113,6 +113,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -57,6 +57,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -81,6 +81,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -158,6 +158,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -56,6 +56,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -231,6 +231,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -42,7 +42,6 @@
|
|||
End If
|
||||
End If
|
||||
End If
|
||||
UpdateModel()
|
||||
End Sub
|
||||
|
||||
Private Function GetSteps() As Integer
|
||||
|
@ -89,6 +88,7 @@ theend:
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -122,6 +122,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, True)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -55,6 +55,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, True)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -167,6 +167,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -159,6 +159,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Me.Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -129,6 +129,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -72,6 +72,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, True)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, True)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -256,6 +256,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, setRasterizerState)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -156,6 +156,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -68,6 +68,7 @@
|
|||
If Me.Model Is Nothing Then
|
||||
Me.Draw(Me.BaseModel, Textures, False)
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
|
@ -492,6 +492,7 @@
|
|||
Draw(Me.BaseModel, Me.Textures, True)
|
||||
GraphicsDevice.DepthStencilState = state
|
||||
Else
|
||||
UpdateModel()
|
||||
Draw(Me.BaseModel, Me.Textures, True, Me.Model)
|
||||
End If
|
||||
End Sub
|
||||
|
|
Loading…
Reference in New Issue