move customization render methods to lobby service

Author: nrzull

client/csharp/Character/Lobby/Creator/Service.cs

@@ -165,8 +165,6 @@ static void CustomizeFaceFeature(string key, float value)
             }
         }
 
-
-
         static void CustomizeHeadOverlay(string key, int value)
         {
             foreach (var field in HeadOverlays.GetType().GetFields())
@@ -176,73 +174,41 @@ static void CustomizeHeadOverlay(string key, int value)
                 var headOverlay = (Schemes.HeadOverlay)field.GetValue(HeadOverlays);
 
                 headOverlay.Current = value;
-                RenderHeadOverlay(headOverlay);
+
+                Lobby.Service.RenderHeadOverlay(new Shared.Schemes.HeadOverlay
+                {
+                    Index = headOverlay.Index,
+                    Value = headOverlay.Values.ElementAt(headOverlay.Current)
+                });
+
                 break;
             }
         }
 
-        static void RenderHeadOverlay(Schemes.HeadOverlay headOverlay)
-        {
-            RAGE.Elements.Player.LocalPlayer.SetHeadOverlay(headOverlay.Index, headOverlay.Values.ElementAt(headOverlay.Current), 1);
-        }
-
         static void CustomizeSex(string sex)
         {
             Sex.Current = sex;
-            RenderSex();
+            Lobby.Service.RenderSex(Sex.Current);
             Reset(sex: false);
             SendInitialDataToUi(sex: false);
         }
 
-        static void RenderSex()
-        {
-            if (Sex.Current == "male")
-            {
-                RAGE.Elements.Player.LocalPlayer.Model = RAGE.Game.Misc.GetHashKey("mp_m_freemode_01");
-            }
-            else
-            {
-                RAGE.Elements.Player.LocalPlayer.Model = RAGE.Game.Misc.GetHashKey("mp_f_freemode_01");
-            }
-        }
-
         static void CustomizeHair(int value)
         {
             Hair.Current = value;
-            RenderHair();
-        }
-
-        static void RenderHair()
-        {
-            RAGE.Elements.Player.LocalPlayer.SetComponentVariation(Hair.Index, Hair.Values[Hair.Current], 0, 0);
+            Lobby.Service.RenderHair(Hair.Values[Hair.Current]);
         }
 
         static void CustomizeColor(int value)
         {
             Color.Current = value;
-            RenderColor();
-        }
-
-        static void RenderColor()
-        {
-            RAGE.Elements.Player.LocalPlayer.SetHairColor(Color.Values[Color.Current], 0);
-
-            RAGE.Elements.Player.LocalPlayer.SetHeadOverlayColor(HeadOverlays.FacialHair.Index, 1, Color.Values[Color.Current], 0);
-
-            RAGE.Elements.Player.LocalPlayer.SetHeadOverlayColor(HeadOverlays.ChestHair.Index, 1, Color.Values[Color.Current], 0);
-
-            RAGE.Elements.Player.LocalPlayer.SetHeadOverlayColor(HeadOverlays.Eyebrows.Index, 1, Color.Values[Color.Current], 0);
+            Lobby.Service.RenderColor(Color.Values[Color.Current]);
         }
 
         static void CustomizeEyeColor(int value)
         {
             EyeColor.Current = value;
-            RenderEyeColor();
-        }
-
-        static void RenderEyeColor()
-        {
-            RAGE.Elements.Player.LocalPlayer.SetEyeColor(EyeColor.Values[EyeColor.Current]);
+            Lobby.Service.RenderEyeColor(EyeColor.Current);
         }
 
         static void CustomizeBlendData(string key, dynamic value)
@@ -251,12 +217,7 @@ static void CustomizeBlendData(string key, dynamic value)
             if (key == "mother") BlendData.SetMother((int)value);
             if (key == "shape-mix") BlendData.SetShapeMix((float)value);
             if (key == "skin-mix") BlendData.SetSkinMix((float)value);
-            RenderBlendData();
-        }
-
-        static void RenderBlendData()
-        {
-            RAGE.Elements.Player.LocalPlayer.SetHeadBlendData(BlendData.Current.Item1, BlendData.Current.Item2, BlendData.Current.Item3, BlendData.Current.Item4, BlendData.Current.Item5, BlendData.Current.Item6, BlendData.Current.Item7, BlendData.Current.Item8, BlendData.Current.Item9, BlendData.Current.Item10);
+            Lobby.Service.RenderBlendData(BlendData.Current);
         }
 
         static void Reset(bool sex = true)
@@ -270,7 +231,7 @@ static void Reset(bool sex = true)
             if (sex)
             {
                 Sex = new Schemes.Sex { };
-                RenderSex();
+                Lobby.Service.RenderSex(Sex.Current);
             }
 
             Schemes.Hair TargetHair;
@@ -285,7 +246,7 @@ static void Reset(bool sex = true)
                 Values = TargetHair.Values
             };
 
-            RenderBlendData();
+            Lobby.Service.RenderBlendData(BlendData.Current);
 
             foreach (var item in FaceFeatures.GetType().GetFields())
             {
@@ -302,11 +263,17 @@ static void Reset(bool sex = true)
             {
                 var headOverlay = (Schemes.HeadOverlay)item.GetValue(HeadOverlays);
 
-                RenderHeadOverlay(headOverlay);
+
+                Lobby.Service.RenderHeadOverlay(new Shared.Schemes.HeadOverlay
+                {
+                    Index = headOverlay.Index,
+                    Value = headOverlay.Values.ElementAt(headOverlay.Current)
+                });
             }
 
-            RenderHair();
-            RenderColor();
+            Lobby.Service.RenderHair(Hair.Values[Hair.Current]);
+            Lobby.Service.RenderColor(Color.Values[Color.Current]);
+            Lobby.Service.RenderEyeColor(EyeColor.Current);
         }
     }
 }

client/csharp/Character/Lobby/Service.cs

@@ -41,5 +41,47 @@ public static void RenderFaceFeature(Shared.Schemes.FaceFeature faceFeature)
         {
             RAGE.Elements.Player.LocalPlayer.SetFaceFeature(faceFeature.Index, faceFeature.Value);
         }
+
+        public static void RenderHeadOverlay(Shared.Schemes.HeadOverlay headOverlay)
+        {
+            RAGE.Elements.Player.LocalPlayer.SetHeadOverlay(headOverlay.Index, headOverlay.Value, 1);
+        }
+
+        public static void RenderSex(string sex)
+        {
+            if (sex == "male")
+            {
+                RAGE.Elements.Player.LocalPlayer.Model = RAGE.Game.Misc.GetHashKey("mp_m_freemode_01");
+            }
+            else
+            {
+                RAGE.Elements.Player.LocalPlayer.Model = RAGE.Game.Misc.GetHashKey("mp_f_freemode_01");
+            }
+        }
+
+        public static void RenderBlendData((int, int, int, int, int, int, float, float, float, bool) data)
+        {
+            RAGE.Elements.Player.LocalPlayer.SetHeadBlendData(data.Item1, data.Item2, data.Item3, data.Item4, data.Item5, data.Item6, data.Item7, data.Item8, data.Item9, data.Item10);
+        }
+
+        public static void RenderEyeColor(int color)
+        {
+            RAGE.Elements.Player.LocalPlayer.SetEyeColor(color);
+        }
+
+        public static void RenderHair(int value)
+        {
+            RAGE.Elements.Player.LocalPlayer.SetComponentVariation(2, value, 0, 0);
+        }
+
+        public static void RenderColor(int color)
+        {
+            var player = RAGE.Elements.Player.LocalPlayer;
+
+            player.SetHairColor(color, 0);
+            player.SetHeadOverlayColor(1, 1, color, 0);
+            player.SetHeadOverlayColor(2, 1, color, 0);
+            player.SetHeadOverlayColor(10, 1, color, 0);
+        }
     }
 }