Fixed #55 and #87

MBU-Team · May 30, 2021 · 8538a42 · 8538a42
1 parent 4f8fa1a
commit 8538a42
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/engine/source/terrain/sun.cpp b/engine/source/terrain/sun.cpp
@@ -79,6 +79,14 @@ void Sun::onRemove()
      //   gClientSceneGraph->getLightManager()->sgUnregisterGlobalLight(&mLight);
 }
 
+struct SunLight
+{
+    Point3F     mPos;
+    VectorF     mDirection;
+    ColorF      mColor;
+    ColorF      mAmbient;
+};
+
 void Sun::registerLights(LightManager* lightManager, bool relight)
 {
     mRegisteredLight = mLight;
@@ -92,12 +100,17 @@ void Sun::registerLights(LightManager* lightManager, bool relight)
 #ifdef MB_ULTRA_PREVIEWS
     // This code is not here on MBU x360 but it achieves the same result.
     // It likely works on x360 just because it uses the old TSE 0.1 render system.
-    static LightInfo previewSun = mRegisteredLight;
+    static SunLight previewSun = {mRegisteredLight.mPos, mRegisteredLight.mDirection, mRegisteredLight.mColor, mRegisteredLight.mAmbient};
 
     if (gSPMode)
-        previewSun = mRegisteredLight;
+        previewSun = {mRegisteredLight.mPos, mRegisteredLight.mDirection, mRegisteredLight.mColor, mRegisteredLight.mAmbient};
     else
-        mRegisteredLight = previewSun;
+    {
+        mRegisteredLight.mPos = previewSun.mPos;
+        mRegisteredLight.mDirection = previewSun.mDirection;
+        mRegisteredLight.mColor = previewSun.mColor;
+        mRegisteredLight.mAmbient = previewSun.mAmbient;
+    }
 #endif
 
     if (relight)

diff --git a/game/marble/client/scripts/playerList.cs b/game/marble/client/scripts/playerList.cs
@@ -265,6 +265,8 @@ function handleUpdateLobbyStatus(%msgType, %msgString, %inLobby)
    if (!$Client::connectedMultiplayer)
       // don't care
       return;
+
+   registerLights();
 
    %wasInLobby = ServerConnection.inLobby;
    ServerConnection.inLobby = %inLobby;