Commit: f0a27eed8378aef611fa20877feb634cff0f2a63 - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Révision: f0a27eed8378aef611fa20877feb634cff0f2a63 (tree)
• l'heure: 2019-06-13 10:59:43
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

Modified client event handling use non-polling method
Change variable casing for renderer (consistency)

Change Summary

• modified: ArmourMod/Armour/AmourMeshRenderer.cs
• modified: ArmourMod/Armour/EntityArmourPlayer.cs

Modification

--- a/ArmourMod/Armour/AmourMeshRenderer.cs
+++ b/ArmourMod/Armour/AmourMeshRenderer.cs
@@ -14,7 +14,7 @@ namespace ArmourMod
 {
 	public class ArmourMeshRenderer : IRenderer
 	{ 		
-		protected ICoreClientAPI ClientApi { get; set; }
+		protected ICoreClientAPI ClientAPI { get; set; }
 		private Dictionary<AssetLocation,ArmourModelData> Armoury;
 		private bool enabled = true;
 
@@ -30,7 +30,7 @@ namespace ArmourMod
 
 		public ArmourMeshRenderer(ICoreClientAPI capi,Dictionary<AssetLocation,ArmourModelData> armoury )
 		{
-			this.ClientApi = capi;
+			this.ClientAPI = capi;
 			this.Armoury = armoury;
 			//Pre-cached up ALL the damm armours; Mesh + Texture, Translations, Origins, other important parameters
 		}
@@ -39,8 +39,8 @@ namespace ArmourMod
 		{
 			if (enabled) {
 				try {
-					for (int i = 0; i < ClientApi.World.AllOnlinePlayers.Length; i++) {
-						var aPlayer = ClientApi.World.AllOnlinePlayers[i];
+					for (int i = 0; i < ClientAPI.World.AllOnlinePlayers.Length; i++) {
+						var aPlayer = ClientAPI.World.AllOnlinePlayers[i];
 
 						if (aPlayer?.Entity == null) continue;//Out of range
 
@@ -52,12 +52,12 @@ namespace ArmourMod
 								EntityArmourPlayer armouredPlayer = aPlayer.Entity as EntityArmourPlayer;
 
 								if (armouredPlayer == null) {
-									ClientApi.Logger.Error("Could not cast EntityPlayer to EntityArmourPlayer");
+									ClientAPI.Logger.Error("Could not cast EntityPlayer to EntityArmourPlayer");
 									return;
 								}
 
 								if (armouredPlayer.RenderableWornArmours == null) {
-									ClientApi.Logger.Error("RenderableWornArmours was NULL!");
+									ClientAPI.Logger.Error("RenderableWornArmours was NULL!");
 									return;
 								}
 
@@ -70,7 +70,7 @@ namespace ArmourMod
 
 				} catch (Exception problem)
 				{
-					ClientApi.Logger.Error("ArmourMeshRenderer FAULT: {0} Disabling.", problem.Message);
+					ClientAPI.Logger.Error("ArmourMeshRenderer FAULT: {0} Disabling.", problem.Message);
 					enabled = false;
 				}
 			}
@@ -84,10 +84,10 @@ namespace ArmourMod
 		/// <param name="isShadowPass">If set to <c>true</c> is shadow pass.</param>
 		private void RenderWornArmour(EntityArmourPlayer armouredPlayer, EntityShapeRenderer entityShapeRender, bool isShadowPass)
 		{
-			IRenderAPI rpi = ClientApi.Render;
+			IRenderAPI rpi = ClientAPI.Render;
 			IStandardShaderProgram prog = null;
 
-			if ( ClientApi.World.Player.Entity.EntityId == armouredPlayer.EntityId ) {
+			if ( ClientAPI.World.Player.Entity.EntityId == armouredPlayer.EntityId ) {
 				//Is current player in First-person.... skip rendering
 				if ( rpi.CameraType == EnumCameraMode.FirstPerson ) return;
 			}
@@ -95,7 +95,7 @@ namespace ArmourMod
 			foreach(var wornItemTuple in armouredPlayer.RenderableWornArmours) {
 
 				if ( !Armoury.ContainsKey( wornItemTuple.Value.Code ) ) {
-					ClientApi.Logger.Warning( "Armoury Item Missing KEY: {0} ! ** RENDER ABORTED **", wornItemTuple.Value.Code );
+					ClientAPI.Logger.Warning( "Armoury Item Missing KEY: {0} ! ** RENDER ABORTED **", wornItemTuple.Value.Code );
 					return;
 				}
 
@@ -113,7 +113,7 @@ namespace ArmourMod
 				
 				default:
 					attachPoise = null;
-					ClientApi.Logger.Warning( "Unsupported armour Attachment Type: {0} ! ** RENDER ABORTED **", wornItemTuple.Key.ToString() );
+					ClientAPI.Logger.Warning( "Unsupported armour Attachment Type: {0} ! ** RENDER ABORTED **", wornItemTuple.Key.ToString() );
 					return;				
 				}
 
@@ -129,7 +129,7 @@ namespace ArmourMod
 				armourModelMatrix.Set(entityShapeRender.ModelMat);
 				armourModelMatrix.Mul(attachPoise.AnimModelMatrix);
 
-				viewMatrix.Set( ClientApi.Render.CameraMatrixOriginf );
+				viewMatrix.Set( ClientAPI.Render.CameraMatrixOriginf );
 
 
 				if ( isShadowPass ) {
@@ -151,8 +151,8 @@ namespace ArmourMod
 
 					var headMatrix = Mat4f.Create( );
 					Mat4f.Identity(headMatrix);
-					Mat4f.RotateY(headMatrix, headMatrix, ClientApi.World.Player.Entity.HeadYaw);
-					Mat4f.RotateZ(headMatrix, headMatrix, ClientApi.World.Player.Entity.HeadPitch);
+					Mat4f.RotateY(headMatrix, headMatrix, ClientAPI.World.Player.Entity.HeadYaw);
+					Mat4f.RotateZ(headMatrix, headMatrix, ClientAPI.World.Player.Entity.HeadPitch);
 
 					armourModelMatrix
 						.Scale( armourData.Armour_Transform.ScaleXYZ.X, armourData.Armour_Transform.ScaleXYZ.Y, armourData.Armour_Transform.ScaleXYZ.Z )
@@ -175,16 +175,16 @@ namespace ArmourMod
 
 
 				if ( isShadowPass ) {
-					armourModelMatrix.Mul(ClientApi.Render.CurrentShadowProjectionMatrix);
-					ClientApi.Render.CurrentActiveShader.UniformMatrix( "mvpMatrix", armourModelMatrix.Values );
-					ClientApi.Render.CurrentActiveShader.Uniform( "origin", new Vec3f());//OpenGL version of CONST/GLOBAL <-- what is VALUE???
+					armourModelMatrix.Mul(ClientAPI.Render.CurrentShadowProjectionMatrix);
+					ClientAPI.Render.CurrentActiveShader.UniformMatrix( "mvpMatrix", armourModelMatrix.Values );
+					ClientAPI.Render.CurrentActiveShader.Uniform( "origin", new Vec3f());//OpenGL version of CONST/GLOBAL <-- what is VALUE???
 				} else {
 					prog.ModelMatrix = armourModelMatrix.Values;
 					prog.ViewMatrix = viewMatrix.Values;
-					prog.ProjectionMatrix = ClientApi.Render.CurrentProjectionMatrix;
+					prog.ProjectionMatrix = ClientAPI.Render.CurrentProjectionMatrix;
 				}
 
-				ClientApi.Render.RenderMesh( armourData.ArmourMeshReference );
+				ClientAPI.Render.RenderMesh( armourData.ArmourMeshReference );
 
 
 				if ( !isShadowPass )
@@ -197,7 +197,7 @@ namespace ArmourMod
 			//Manually clean up Meshs'
 			foreach(ArmourModelData armr in Armoury.Values) 
 			{				
-				ClientApi.Render.DeleteMesh( armr.ArmourMeshReference );
+				ClientAPI.Render.DeleteMesh( armr.ArmourMeshReference );
 			}
 
 		}

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -11,8 +11,7 @@ using Vintagestory.API.Server;
 namespace ArmourMod
 {
 	public class EntityArmourPlayer : EntityPlayer
-	{
-		private static string _clientHookIdKey = @"ClientDelayHookId";
+	{		
 		protected ICoreAPI CoreAPI;
 		protected ICoreClientAPI ClientAPI;
 		protected ICoreServerAPI ServerAPI;
@@ -24,9 +23,6 @@ namespace ArmourMod
 		//Pre-compute values;
 		private DamageFilter finalFilter;
 
-		private bool slotEventAttached;
-
-
 		internal ArmourModConfig CachedConfiguration 
 		{
 			get 
@@ -39,32 +35,9 @@ namespace ArmourMod
 			}
 		}
 
-		private long CachedClientCallbackId 
-		{
-			get 
-			{				
-				if (ClientAPI.ObjectCache.ContainsKey(_clientHookIdKey + ClientAPI.World.Player.PlayerUID)) 
-				{
-					return (long)ClientAPI.ObjectCache[_clientHookIdKey + ClientAPI.World.Player.PlayerUID];
-				} else {
-					return -1L;
-				}
-			}
-			set 
-			{
-				if (ClientAPI.ObjectCache.ContainsKey(_clientHookIdKey + ClientAPI.World.Player.PlayerUID)) 
-				{
-					Logger.Error("Trying to register duplicate callback-id [value: {0}]", value); ;
-				}
-				 else 
-				{
-					ClientAPI.ObjectCache[_clientHookIdKey + ClientAPI.World.Player.PlayerUID] = value;
-				}
-			}
-		}
+		public bool OwnEventsAttached { get; internal set;}
 
-
-		public Dictionary<EnumCharacterDressType,Item> RenderableWornArmours { get; private set;}//Needs to be client side
+		public Dictionary<EnumCharacterDressType, Item> RenderableWornArmours { get; private set; }//Needs to be client side
 
 		public override void Initialize(Vintagestory.API.Common.Entities.EntityProperties properties, ICoreAPI api, long chunkindex3d)
 		{
@@ -78,38 +51,17 @@ namespace ArmourMod
 				this.ClientAPI = api as ICoreClientAPI;
 				this.RenderableWornArmours = new Dictionary<EnumCharacterDressType, Item>(); // BEFORE RENDERER GETS THERE!
 				Logger.VerboseDebug("Renderable Worn Armours Dict assigned");
+
+				ClientAPI.Event.PlayerEntitySpawn += HandlePlayerSpawn;
+				ClientAPI.Event.PlayerEntityDespawn += HandlePlayerDespawn;
 			}
 
 			if (CoreAPI.Side.IsServer( )) {
 				this.ServerAPI = api as ICoreServerAPI;			
-				//from Config set values;
-				//ServerAPI.ModLoader.
-				//ArmourModHookin._domain
 			}
 		}
 
-		public override void OnGameTick(float dt) 
-		{
-			base.OnGameTick(dt);
-
 
-			if (CoreAPI.Side.IsClient( )) {
-
-				if (ClientAPI.World.Player != null) {
-
-					if (this.CachedClientCallbackId > 0) {
-						#if DEBUG
-						Logger.VerboseDebug("[OnEntityLoaded] Duplicate event attach prevented");
-						#endif
-					} else {
-						this.CachedClientCallbackId = ClientAPI.Event.RegisterGameTickListener(ClientDelayHook, 250);
-						#if DEBUG
-						Logger.VerboseDebug("[OnEntityLoaded] oneShotDelayId: {0}", this.CachedClientCallbackId);
-						#endif
-					}
-				} 
-			}
-		}
 
 
 		public override void OnEntitySpawn()
@@ -296,32 +248,6 @@ namespace ArmourMod
 			return false;
 		}
 
-
-		protected void ClientDelayHook(float delay)
-		{
-			#if DEBUG
-			Logger.VerboseDebug("[clientDelayHook] oneShotDelayId: {0}", this.CachedClientCallbackId);
-			#endif
-
-			if (this.GearInventory == null) {
-				Logger.Error("ClientDelayHook: base.GearInventory IS NULL! ");
-
-				return;
-			}
-
-			if (slotEventAttached == false) {
-				slotEventAttached = true;
-				#if DEBUG
-				Logger.VerboseDebug("Attached ClientWatchSlotModified (ClientDelayHook)");
-				#endif
-				this.GearInventory.SlotModified += ClientWatchSlotModified;
-			}
-
-			ClientAPI.Event.UnregisterGameTickListener(this.CachedClientCallbackId);
-
-			PopulateWornArmourModels( );
-		}
-
 		private void ServerWatchSlotModified (int slotId)
 		{
 			var watchedSlot = this.GearInventory[slotId];
@@ -356,7 +282,7 @@ namespace ArmourMod
 			}
 		}
 
-		private void ClientWatchSlotModified (int slotId)
+		protected void ClientWatchSlotModified (int slotId)
 		{
 			#if DEBUG
 			Logger.VerboseDebug( "(Client) WatchSlotModified:{0} PlayerID: {1} InventoryID: {2}", slotId, ClientAPI.World.Player.PlayerUID,this.GearInventory.InventoryID );
@@ -378,14 +304,62 @@ namespace ArmourMod
 			}
 		}
 
-		/*
-		private void WatchSlotNotified(int slotId)
+		/// <summary>
+		/// Add Watcher for armour change -- could be _ANY_ player (not just self!)
+		/// </summary>
+		/// <remarks>Client side</remarks>
+		/// <param name="byPlayer">By player.</param>
+		private void HandlePlayerSpawn(IClientPlayer byPlayer)
+		{			
+			Logger.VerboseDebug("Handling Spawn for: {0}", byPlayer.PlayerName);
+
+			if (byPlayer.Entity != null && byPlayer.Entity is EntityArmourPlayer) {
+				EntityArmourPlayer targetPlayer =  byPlayer.Entity as EntityArmourPlayer;//CHECK: Cast from - not actual instance?
+
+				if (targetPlayer.GearInventory == null) {
+					Logger.Error("HandlePlayerSpawn: base.GearInventory IS NULL! ");
+
+					return;
+				}
+
+				if (targetPlayer.PlayerUID == ClientAPI.World.Player.PlayerUID) 
+				{
+					if (targetPlayer.OwnEventsAttached == false) {
+						targetPlayer.OwnEventsAttached = true;
+						#if DEBUG
+						Logger.VerboseDebug("Attached event: (ClientWatchSlotModified) for {0}", byPlayer.PlayerName);
+						#endif
+						targetPlayer.GearInventory.SlotModified += targetPlayer.ClientWatchSlotModified;
+						PopulateWornArmourModels(targetPlayer);
+					} else {
+						#if DEBUG
+						Logger.VerboseDebug("Duplicate event: (ClientWatchSlotModified) for {0}", byPlayer.PlayerName);
+						#endif
+					}
+				} else {
+					if (targetPlayer.OwnEventsAttached == false) {
+						targetPlayer.OwnEventsAttached = true;
+						#if DEBUG
+						Logger.VerboseDebug("Non-local Attached event: (ClientWatchSlotModified) for {0}", byPlayer.PlayerName);
+						#endif
+						targetPlayer.GearInventory.SlotModified += targetPlayer.ClientWatchSlotModified;
+						PopulateWornArmourModels(targetPlayer);
+					} else {
+						#if DEBUG
+						Logger.VerboseDebug("Non-local Duplicate event: (ClientWatchSlotModified) for {0}", byPlayer.PlayerName);
+						#endif
+					}
+				}
+			}
+		}
+
+
+		private void HandlePlayerDespawn(IClientPlayer byPlayer)
 		{
-			var watchedSlot = base.GearInventory[slotId];
+			//Unlink watcher event
+			Logger.VerboseDebug("Handling Despawn for: {0}", byPlayer.PlayerName);
 
-			Logger.VerboseDebug( "WatchSlotNotified:{0}", slotId );
 		}
-		*/
 
 
 
@@ -484,26 +458,26 @@ namespace ArmourMod
 		/// Client Side rendering; What armours are visibly worn
 		/// </summary>
 		/// <returns>The worn armour models.</returns>
-		private void PopulateWornArmourModels()
+		internal void PopulateWornArmourModels(EntityArmourPlayer targetPlayer)
 		{			
-			if ( this.GearInventory != null && this.GearInventory.Count > 0 ) {
-				foreach(var itemSlot in this.GearInventory ) {
+			if ( targetPlayer.GearInventory != null && targetPlayer.GearInventory.Count > 0 ) {
+				foreach(var itemSlot in targetPlayer.GearInventory ) {
 
-					int slotId = this.GearInventory.GetSlotId( itemSlot );
+					int slotId = targetPlayer.GearInventory.GetSlotId( itemSlot );
 					if ( !itemSlot.Empty ) {
 
 						if ( itemSlot.StorageType == EnumItemStorageFlags.Outfit && itemSlot.Itemstack.Class == EnumItemClass.Item ) {
 
 							if ( CheckIfClothesIsArmour(itemSlot) ) 
-							{
+							{ 
 								#if DEBUG
-								Logger.VerboseDebug( "Now wearing armour:{0}", itemSlot.Itemstack.Item.Code.ToString( ) );
+								Logger.VerboseDebug( "{0} is wearing armour: {1}", targetPlayer.Player.PlayerName, itemSlot.Itemstack.Item.Code.ToString( ) );
 								#endif
 
 								if (RenderableWornArmours.ContainsKey(( EnumCharacterDressType )slotId)) {
 									Logger.Warning("DUPLICATE assignment; Armour in slot: {0} named: {1}", slotId, itemSlot.Itemstack.Item.Code.ToString( ));
 								} else {
-									RenderableWornArmours.Add(( EnumCharacterDressType )slotId, itemSlot.Itemstack.Item);
+									targetPlayer.RenderableWornArmours.Add(( EnumCharacterDressType )slotId, itemSlot.Itemstack.Item);
 								}
 							} 
 						}