Applied patch for LightShare viewer-side implementation.

Ported from Meta7 viewer by Armin.

1 files changed, 91 insertions, 12 deletions

diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index e06766b..84f464f 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -34,13 +34,16 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llviewergenericmessage.h"
-
+#include "meta7windlight.h"
 #include "lldispatcher.h"
 #include "lluuid.h"
 #include "message.h"
-
 #include "llagent.h"
-
+#include "llwaterparamset.h"
+#include "llwaterparammanager.h"
+#include "llwlparamset.h"
+#include "llwlparammanager.h"
+#include "lluuid.h"
 
 LLDispatcher gGenericDispatcher;
 
@@ -82,20 +85,96 @@ void process_generic_message(LLMessageSystem* msg, void**)
 {
         LLUUID agent_id;
         msg->getUUID("AgentData", "AgentID", agent_id);
-        if (agent_id != gAgent.getID())
+        std::string method;
+        msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method);
+        
+        if (method == "Windlight" && gSavedSettings.getBOOL("UseServersideWindlightSettings"))
+        {       
+                //Meta7 WindLight packet
+                //We are delivering with an agentID of NULL_KEY so as to be
+                //friendly and not trigger a warning for unsupporting clients.
+                S32 count = msg->getNumberOfBlocksFast(_PREHASH_ParamList);
+                for (S32 i = 0; i < count; ++i)
+                {
+                        // our param is binary data)
+                        S32 size = msg->getSizeFast(_PREHASH_ParamList, i, _PREHASH_Parameter);
+                        if (size >= 0)
+                        {
+                                char buf[250];
+                                msg->getBinaryDataFast(
+                                        _PREHASH_ParamList, _PREHASH_Parameter,
+                                        buf, size, i, 249);
+                                
+                                Meta7WindlightPacket* wl = (Meta7WindlightPacket*)buf;
+                        
+                                LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
+                                LLWaterParamSet & param_set = param_mgr->mCurParams;
+
+                                param_set.set("waterFogColor", wl->waterColor.red / 256.f, wl->waterColor.green / 256.f, wl->waterColor.blue / 256.f);
+                                param_set.set("waterFogDensity", pow(2.0f, wl->waterFogDensityExponent));
+                                param_set.set("underWaterFogMod", wl->underwaterFogModifier);
+                                param_set.set("normScale", wl->reflectionWaveletScale.X,wl->reflectionWaveletScale.Y,wl->reflectionWaveletScale.Z);
+                                param_set.set("fresnelScale", wl->fresnelScale);
+                                param_set.set("fresnelOffset", wl->fresnelOffset);
+                                param_set.set("scaleAbove", wl->refractScaleAbove);
+                                param_set.set("scaleBelow", wl->refractScaleBelow);
+                                param_set.set("blurMultiplier", wl->blurMultiplier);
+                                param_set.set("wave1Dir", wl->littleWaveDirection.X, wl->littleWaveDirection.Y);
+                                param_set.set("wave2Dir", wl->bigWaveDirection.X, wl->bigWaveDirection.Y);
+                                
+                                param_mgr->setParamSet( "Meta7CurrentRegion", param_set);
+
+                                LLWLParamManager * wl_param_mgr = LLWLParamManager::instance();
+                                LLWLParamSet & wl_param_set = wl_param_mgr->mCurParams;
+                                wl_param_set.setSunAngle(F_TWO_PI * wl->sunMoonPosiiton);
+                                wl_param_set.setEastAngle(F_TWO_PI * wl->eastAngle);
+                                wl_param_set.set("sunlight_color", wl->sunMoonColor.red * 3.0f, wl->sunMoonColor.green * 3.0f, wl->sunMoonColor.blue * 3.0f, wl->sunMoonColor.alpha * 3.0f);
+                                wl_param_set.set("ambient", wl->ambient.red * 3.0f, wl->ambient.green * 3.0f, wl->ambient.blue * 3.0f, wl->ambient.alpha * 3.0f);
+                                wl_param_set.set("blue_horizon", wl->horizon.red * 2.0f, wl->horizon.green *2.0f, wl->horizon.blue * 2.0f, wl->horizon.alpha * 2.0f);
+                                wl_param_set.set("blue_density", wl->blueDensity.red * 2.0f, wl->blueDensity.green * 2.0f, wl->blueDensity.blue * 2.0f, wl->blueDensity.alpha * 2.0f);
+                                wl_param_set.set("haze_horizon", wl->hazeHorizon, wl->hazeHorizon, wl->hazeHorizon, 1.f);
+                                wl_param_set.set("haze_density", wl->hazeDensity, wl->hazeDensity, wl->hazeDensity, 1.f);
+                                wl_param_set.set("cloud_shadow", wl->cloudCoverage, wl->cloudCoverage, wl->cloudCoverage, wl->cloudCoverage);
+                                wl_param_set.set("density_multiplier", wl->densityMultiplier / 1000.0f);
+                                wl_param_set.set("distance_multiplier", wl->distanceMultiplier, wl->distanceMultiplier, wl->distanceMultiplier, wl->distanceMultiplier);
+                                wl_param_set.set("max_y",(F32)wl->maxAltitude);
+                                wl_param_set.set("cloud_color", wl->cloudColor.red, wl->cloudColor.green, wl->cloudColor.blue, wl->cloudColor.alpha);
+                                wl_param_set.set("cloud_pos_density1", wl->cloudXYDensity.X, wl->cloudXYDensity.Y, wl->cloudXYDensity.Z);
+                                wl_param_set.set("cloud_pos_density2", wl->cloudDetailXYDensity.X, wl->cloudDetailXYDensity.Y, wl->cloudDetailXYDensity.Z);
+                                wl_param_set.set("cloud_scale", wl->cloudScale, 0.f, 0.f, 1.f);
+                                wl_param_set.set("gamma", wl->sceneGamma, wl->sceneGamma, wl->sceneGamma, 0.0f);
+                                wl_param_set.set("glow",(2 - wl->sunGlowSize) * 20 , 0.f, -wl->sunGlowFocus * 5);
+                                wl_param_set.setCloudScrollX(wl->cloudScrollX + 10.0f);
+                                wl_param_set.setCloudScrollY(wl->cloudScrollY + 10.0f);
+                                wl_param_set.setEnableCloudScrollX(!wl->cloudScrollXLock);
+                                wl_param_set.setEnableCloudScrollY(!wl->cloudScrollYLock);
+                                wl_param_set.setStarBrightness(wl->starBrightness);
+                                wl_param_mgr->removeParamSet("Meta7-CurrentRegion",true);
+                                wl_param_mgr->addParamSet(      "Meta7-CurrentRegion", wl_param_set);
+                                wl_param_mgr->savePreset( "Meta7-CurrentRegion");
+                                LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                                LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+                                wl_param_mgr->loadPreset( "Meta7-CurrentRegion",true);  
+                        }
+                }
+        }
+        else if (agent_id != gAgent.getID())
         {
                 llwarns << "GenericMessage for wrong agent" << llendl;
                 return;
         }
+        else
+        {
 
-        std::string request;
-        LLUUID invoice;
-        LLDispatcher::sparam_t strings;
-        LLDispatcher::unpackMessage(msg, request, invoice, strings);
+                std::string request;
+                LLUUID invoice;
+                LLDispatcher::sparam_t strings;
+                LLDispatcher::unpackMessage(msg, request, invoice, strings);
 
-        if(!gGenericDispatcher.dispatch(request, invoice, strings))
-        {
-                llwarns << "GenericMessage " << request << " failed to dispatch" 
-                        << llendl;
+                if(!gGenericDispatcher.dispatch(request, invoice, strings))
+                {
+                        llwarns << "GenericMessage " << request << " failed to dispatch" 
+                                << llendl;
+                }
         }
 }