From f103caa5f2ee8d456f26021535c0006143c70e48 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Sat, 16 Jul 2022 14:48:29 +0200 Subject: [PATCH] Fixed Models not being affected by lighting --- P3D/Battle/BattleAnimations/BattleAnimation3D.vb | 2 +- P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb | 1 + P3D/Entites/Entity.vb | 3 +-- P3D/Entites/Enviroment/AllSidesObject.vb | 1 + P3D/Entites/Enviroment/AnimatedBlock.vb | 1 + P3D/Entites/Enviroment/ApricornPlant.vb | 1 + P3D/Entites/Enviroment/BerryPlant.vb | 2 ++ P3D/Entites/Enviroment/CutDownTree.vb | 1 + P3D/Entites/Enviroment/DiveTile.vb | 1 + P3D/Entites/Enviroment/Floor.vb | 1 + P3D/Entites/Enviroment/Grass.vb | 1 + P3D/Entites/Enviroment/HeadbuttTree.vb | 1 + P3D/Entites/Enviroment/ItemObject.vb | 1 + P3D/Entites/Enviroment/LoamySoil.vb | 1 + P3D/Entites/Enviroment/RockClimbEntity.vb | 1 + P3D/Entites/Enviroment/RotationTile.vb | 2 +- P3D/Entites/Enviroment/ScriptBlock.vb | 1 + P3D/Entites/Enviroment/SignBlock.vb | 1 + P3D/Entites/Enviroment/SlideBlock.vb | 1 + P3D/Entites/Enviroment/SmashRock.vb | 1 + P3D/Entites/Enviroment/StepBlock.vb | 1 + P3D/Entites/Enviroment/StrengthRock.vb | 1 + P3D/Entites/Enviroment/StrengthTrigger.vb | 1 + P3D/Entites/Enviroment/TurningSign.vb | 1 + P3D/Entites/Enviroment/WallBill.vb | 1 + P3D/Entites/Enviroment/WallBlock.vb | 1 + P3D/Entites/Enviroment/WarpBlock.vb | 1 + P3D/Entites/Enviroment/Water.vb | 1 + P3D/Entites/Enviroment/Waterfall.vb | 1 + P3D/Entites/Enviroment/Whirlpool.vb | 1 + P3D/Entites/Other/NPC.vb | 1 + 31 files changed, 32 insertions(+), 4 deletions(-) diff --git a/P3D/Battle/BattleAnimations/BattleAnimation3D.vb b/P3D/Battle/BattleAnimations/BattleAnimation3D.vb index 6613cb82d..4e77136dd 100644 --- a/P3D/Battle/BattleAnimations/BattleAnimation3D.vb +++ b/P3D/Battle/BattleAnimations/BattleAnimation3D.vb @@ -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 diff --git a/P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb b/P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb index 8b04c85fa..187e3e7fc 100644 --- a/P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb +++ b/P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb @@ -51,6 +51,7 @@ [Object].Render() Next For Each [Object] As Entity In RenderObjects + [Object].UpdateModel() [Object].Render() Next End Sub diff --git a/P3D/Entites/Entity.vb b/P3D/Entites/Entity.vb index 3ae2d0410..91a0d3a8d 100644 --- a/P3D/Entites/Entity.vb +++ b/P3D/Entites/Entity.vb @@ -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() diff --git a/P3D/Entites/Enviroment/AllSidesObject.vb b/P3D/Entites/Enviroment/AllSidesObject.vb index aff93ad2d..dcefc5909 100644 --- a/P3D/Entites/Enviroment/AllSidesObject.vb +++ b/P3D/Entites/Enviroment/AllSidesObject.vb @@ -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 diff --git a/P3D/Entites/Enviroment/AnimatedBlock.vb b/P3D/Entites/Enviroment/AnimatedBlock.vb index d37af40dc..4d20d79f6 100644 --- a/P3D/Entites/Enviroment/AnimatedBlock.vb +++ b/P3D/Entites/Enviroment/AnimatedBlock.vb @@ -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 diff --git a/P3D/Entites/Enviroment/ApricornPlant.vb b/P3D/Entites/Enviroment/ApricornPlant.vb index d2adb08bc..01e4f9828 100644 --- a/P3D/Entites/Enviroment/ApricornPlant.vb +++ b/P3D/Entites/Enviroment/ApricornPlant.vb @@ -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 diff --git a/P3D/Entites/Enviroment/BerryPlant.vb b/P3D/Entites/Enviroment/BerryPlant.vb index 3b9d5a326..2556723f5 100644 --- a/P3D/Entites/Enviroment/BerryPlant.vb +++ b/P3D/Entites/Enviroment/BerryPlant.vb @@ -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 diff --git a/P3D/Entites/Enviroment/CutDownTree.vb b/P3D/Entites/Enviroment/CutDownTree.vb index cdeb92f0e..57c06a155 100644 --- a/P3D/Entites/Enviroment/CutDownTree.vb +++ b/P3D/Entites/Enviroment/CutDownTree.vb @@ -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 diff --git a/P3D/Entites/Enviroment/DiveTile.vb b/P3D/Entites/Enviroment/DiveTile.vb index 08950d8a8..82c208591 100644 --- a/P3D/Entites/Enviroment/DiveTile.vb +++ b/P3D/Entites/Enviroment/DiveTile.vb @@ -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 diff --git a/P3D/Entites/Enviroment/Floor.vb b/P3D/Entites/Enviroment/Floor.vb index 227433252..22e19462f 100644 --- a/P3D/Entites/Enviroment/Floor.vb +++ b/P3D/Entites/Enviroment/Floor.vb @@ -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 diff --git a/P3D/Entites/Enviroment/Grass.vb b/P3D/Entites/Enviroment/Grass.vb index 2043417f3..2f3efd4b3 100644 --- a/P3D/Entites/Enviroment/Grass.vb +++ b/P3D/Entites/Enviroment/Grass.vb @@ -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 diff --git a/P3D/Entites/Enviroment/HeadbuttTree.vb b/P3D/Entites/Enviroment/HeadbuttTree.vb index d09f97f31..aaac04387 100644 --- a/P3D/Entites/Enviroment/HeadbuttTree.vb +++ b/P3D/Entites/Enviroment/HeadbuttTree.vb @@ -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 diff --git a/P3D/Entites/Enviroment/ItemObject.vb b/P3D/Entites/Enviroment/ItemObject.vb index 7ec86a292..c7c81161d 100644 --- a/P3D/Entites/Enviroment/ItemObject.vb +++ b/P3D/Entites/Enviroment/ItemObject.vb @@ -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 diff --git a/P3D/Entites/Enviroment/LoamySoil.vb b/P3D/Entites/Enviroment/LoamySoil.vb index ab62997bc..f455725e8 100644 --- a/P3D/Entites/Enviroment/LoamySoil.vb +++ b/P3D/Entites/Enviroment/LoamySoil.vb @@ -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 diff --git a/P3D/Entites/Enviroment/RockClimbEntity.vb b/P3D/Entites/Enviroment/RockClimbEntity.vb index a60a760fa..24fac1f0e 100644 --- a/P3D/Entites/Enviroment/RockClimbEntity.vb +++ b/P3D/Entites/Enviroment/RockClimbEntity.vb @@ -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 diff --git a/P3D/Entites/Enviroment/RotationTile.vb b/P3D/Entites/Enviroment/RotationTile.vb index 257a32e53..b001e8eb7 100644 --- a/P3D/Entites/Enviroment/RotationTile.vb +++ b/P3D/Entites/Enviroment/RotationTile.vb @@ -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 diff --git a/P3D/Entites/Enviroment/ScriptBlock.vb b/P3D/Entites/Enviroment/ScriptBlock.vb index ccada86b9..8bd1af8c4 100644 --- a/P3D/Entites/Enviroment/ScriptBlock.vb +++ b/P3D/Entites/Enviroment/ScriptBlock.vb @@ -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 diff --git a/P3D/Entites/Enviroment/SignBlock.vb b/P3D/Entites/Enviroment/SignBlock.vb index ff34fdf78..0c3fef5af 100644 --- a/P3D/Entites/Enviroment/SignBlock.vb +++ b/P3D/Entites/Enviroment/SignBlock.vb @@ -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 diff --git a/P3D/Entites/Enviroment/SlideBlock.vb b/P3D/Entites/Enviroment/SlideBlock.vb index 833cb89e1..37880fad9 100644 --- a/P3D/Entites/Enviroment/SlideBlock.vb +++ b/P3D/Entites/Enviroment/SlideBlock.vb @@ -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 diff --git a/P3D/Entites/Enviroment/SmashRock.vb b/P3D/Entites/Enviroment/SmashRock.vb index 196c081bc..dc9f050cb 100644 --- a/P3D/Entites/Enviroment/SmashRock.vb +++ b/P3D/Entites/Enviroment/SmashRock.vb @@ -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 diff --git a/P3D/Entites/Enviroment/StepBlock.vb b/P3D/Entites/Enviroment/StepBlock.vb index 5a55a0f5b..ee92a4c4b 100644 --- a/P3D/Entites/Enviroment/StepBlock.vb +++ b/P3D/Entites/Enviroment/StepBlock.vb @@ -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 diff --git a/P3D/Entites/Enviroment/StrengthRock.vb b/P3D/Entites/Enviroment/StrengthRock.vb index bb98a31cf..81d142a36 100644 --- a/P3D/Entites/Enviroment/StrengthRock.vb +++ b/P3D/Entites/Enviroment/StrengthRock.vb @@ -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 diff --git a/P3D/Entites/Enviroment/StrengthTrigger.vb b/P3D/Entites/Enviroment/StrengthTrigger.vb index 3a718757f..67e98a7fb 100644 --- a/P3D/Entites/Enviroment/StrengthTrigger.vb +++ b/P3D/Entites/Enviroment/StrengthTrigger.vb @@ -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 diff --git a/P3D/Entites/Enviroment/TurningSign.vb b/P3D/Entites/Enviroment/TurningSign.vb index 1cb4bbd92..82d79a279 100644 --- a/P3D/Entites/Enviroment/TurningSign.vb +++ b/P3D/Entites/Enviroment/TurningSign.vb @@ -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 diff --git a/P3D/Entites/Enviroment/WallBill.vb b/P3D/Entites/Enviroment/WallBill.vb index c256cd787..94e86f091 100644 --- a/P3D/Entites/Enviroment/WallBill.vb +++ b/P3D/Entites/Enviroment/WallBill.vb @@ -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 diff --git a/P3D/Entites/Enviroment/WallBlock.vb b/P3D/Entites/Enviroment/WallBlock.vb index 75b0824e0..5b6c640a4 100644 --- a/P3D/Entites/Enviroment/WallBlock.vb +++ b/P3D/Entites/Enviroment/WallBlock.vb @@ -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 diff --git a/P3D/Entites/Enviroment/WarpBlock.vb b/P3D/Entites/Enviroment/WarpBlock.vb index 21a5b67bb..4a9780af9 100644 --- a/P3D/Entites/Enviroment/WarpBlock.vb +++ b/P3D/Entites/Enviroment/WarpBlock.vb @@ -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 diff --git a/P3D/Entites/Enviroment/Water.vb b/P3D/Entites/Enviroment/Water.vb index 5e8388bd3..f40385fc9 100644 --- a/P3D/Entites/Enviroment/Water.vb +++ b/P3D/Entites/Enviroment/Water.vb @@ -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 diff --git a/P3D/Entites/Enviroment/Waterfall.vb b/P3D/Entites/Enviroment/Waterfall.vb index 7904ba83b..128e67a50 100644 --- a/P3D/Entites/Enviroment/Waterfall.vb +++ b/P3D/Entites/Enviroment/Waterfall.vb @@ -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 diff --git a/P3D/Entites/Enviroment/Whirlpool.vb b/P3D/Entites/Enviroment/Whirlpool.vb index fd8dee75d..e06a3befb 100644 --- a/P3D/Entites/Enviroment/Whirlpool.vb +++ b/P3D/Entites/Enviroment/Whirlpool.vb @@ -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 diff --git a/P3D/Entites/Other/NPC.vb b/P3D/Entites/Other/NPC.vb index 3c3333439..376f3b956 100644 --- a/P3D/Entites/Other/NPC.vb +++ b/P3D/Entites/Other/NPC.vb @@ -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