Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore LightShare compatibility

Browse Source
This commit is contained in:
Siana Gearz
2012-02-05 13:52:50 +01:00
parent 7b6ff27c4b
commit 859e2701f2
4 changed files with 23 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/CMakeLists.txt
View File

@@ -85,10 +85,11 @@ set(viewer_SOURCE_FILES
floaterao.cpp floaterao.cpp
floatervoicelicense.cpp floatervoicelicense.cpp
cofmgr.cpp cofmgr.cpp
lldaycyclemanager.cpp lldaycyclemanager.cpp
llenvmanager.cpp llenvmanager.cpp
llwlhandlers.cpp llwlhandlers.cpp
llregioninfomodel.cpp llregioninfomodel.cpp
m7wlinterface.cpp
ascentfloatercontactgroups.cpp ascentfloatercontactgroups.cpp
ascentkeyword.cpp ascentkeyword.cpp
ascentprefschat.cpp ascentprefschat.cpp
@@ -566,10 +567,11 @@ set(viewer_HEADER_FILES
floaterao.h floaterao.h
floatervoicelicense.h floatervoicelicense.h
cofmgr.h cofmgr.h
lldaycyclemanager.h lldaycyclemanager.h
llenvmanager.h llenvmanager.h
llwlhandlers.h llwlhandlers.h
llregioninfomodel.h llregioninfomodel.h
m7wlinterface.h
ascentfloatercontactgroups.h ascentfloatercontactgroups.h
ascentkeyword.h ascentkeyword.h
ascentprefschat.h ascentprefschat.h

3
indra/newview/llenvmanager.cpp
View File

@@ -42,6 +42,7 @@
#include "llwlhandlers.h" #include "llwlhandlers.h"
#include "llwlparammanager.h" #include "llwlparammanager.h"
//#include "kcwlinterface.h" //#include "kcwlinterface.h"
#include "m7wlinterface.h"
#include "rlvhandler.h" #include "rlvhandler.h"
std::string LLEnvPrefs::getWaterPresetName() const std::string LLEnvPrefs::getWaterPresetName() const
@@ -492,7 +493,7 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content)
LLWLParamManager::getInstance()->refreshRegionPresets(); LLWLParamManager::getInstance()->refreshRegionPresets();
// Use the region settings if parcel settings didnt override it already -KC // Use the region settings if parcel settings didnt override it already -KC
if (true /*KCWindlightInterface::instance().haveParcelOverride(new_settings)*/) if (!M7WindlightInterface::getInstance()->hasOverride())
{ {
// If using server settings, update managers. // If using server settings, update managers.
if (getUseRegionSettings()) if (getUseRegionSettings())

110
indra/newview/llviewergenericmessage.cpp
View File

@@ -34,7 +34,6 @@
#include "llviewerprecompiledheaders.h" #include "llviewerprecompiledheaders.h"
#include "llviewergenericmessage.h" #include "llviewergenericmessage.h"
#include "meta7windlight.h"
#include "lldispatcher.h" #include "lldispatcher.h"
#include "lluuid.h" #include "lluuid.h"
#include "message.h" #include "message.h"
@@ -43,9 +42,12 @@
#include "llwaterparammanager.h" #include "llwaterparammanager.h"
#include "llwlparamset.h" #include "llwlparamset.h"
#include "llwlparammanager.h" #include "llwlparammanager.h"
#include "m7wlinterface.h"
#include "lluuid.h" #include "lluuid.h"
LLDispatcher gGenericDispatcher; LLDispatcher gGenericDispatcher;
bool animatorIsRunning = true;
bool animatorUseLindenTime = true;
void send_generic_message(const std::string& method, void send_generic_message(const std::string& method,
@@ -91,109 +93,15 @@ void process_generic_message(LLMessageSystem* msg, void**)
//This needs to be handled by a dispatcher really, but I'm not sure where is the best place to put it //This needs to be handled by a dispatcher really, but I'm not sure where is the best place to put it
if (method == "Windlight") if (method == "Windlight")
{ {
#if 0
//Meta7 WindLight packet //Meta7 WindLight packet
//We are delivering with an agentID of NULL_KEY so as to be //We are delivering with an agentID of NULL_KEY so as to be
//friendly and not trigger a warning for unsupporting clients. //friendly and not trigger a warning for unsupporting clients.
S32 count = msg->getNumberOfBlocksFast(_PREHASH_ParamList); M7WindlightInterface::getInstance()->receiveMessage(msg);
for (S32 i = 0; i < count; ++i) }
{ else if (method == "WindlightReset")
// our param is binary data) {
S32 size = msg->getSizeFast(_PREHASH_ParamList, i, _PREHASH_Parameter); M7WindlightInterface::getInstance()->receiveReset();
if (size >= 0)
{
char buf[250];
msg->getBinaryDataFast(
_PREHASH_ParamList, _PREHASH_Parameter,
buf, size, i, 249);
Meta7WindlightPacket* wl = (Meta7WindlightPacket*)buf;
LLWaterParamManager * param_mgr = LLWaterParamManager::getInstance();
LLWaterParamSet & param_set = param_mgr->mCurParams;
LLWaterParamSet backup;
if(!param_mgr->getParamSet("LightShare-Backup", backup)) {
param_mgr->addParamSet("LightShare-Backup", param_set);
}
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);
LLUUID normalMapTexture;
std::string out = llformat(
"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
(U8)(wl->normalMapTexture[0]),
(U8)(wl->normalMapTexture[1]),
(U8)(wl->normalMapTexture[2]),
(U8)(wl->normalMapTexture[3]),
(U8)(wl->normalMapTexture[4]),
(U8)(wl->normalMapTexture[5]),
(U8)(wl->normalMapTexture[6]),
(U8)(wl->normalMapTexture[7]),
(U8)(wl->normalMapTexture[8]),
(U8)(wl->normalMapTexture[9]),
(U8)(wl->normalMapTexture[10]),
(U8)(wl->normalMapTexture[11]),
(U8)(wl->normalMapTexture[12]),
(U8)(wl->normalMapTexture[13]),
(U8)(wl->normalMapTexture[14]),
(U8)(wl->normalMapTexture[15]));
normalMapTexture.set(out);
param_mgr->setParamSet( "LightShare-CurrentRegion", param_set);
param_mgr->setNormalMapID(normalMapTexture);
LLWLParamManager * wl_param_mgr = LLWLParamManager::getInstance();
LLWLParamSet & wl_param_set = wl_param_mgr->mCurParams;
LLWLParamSet wl_backup;
if(!wl_param_mgr->getParamSet("LightShare-Backup", wl_backup)) {
wl_param_mgr->addParamSet("LightShare-Backup", wl_param_set);
}
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("LightShare-CurrentRegion",true);
wl_param_mgr->addParamSet( "LightShare-CurrentRegion", wl_param_set);
wl_param_mgr->savePreset( "LightShare-CurrentRegion");
LLWLParamManager::getInstance()->mAnimator.mIsRunning = false;
LLWLParamManager::getInstance()->mAnimator.mUseLindenTime = false;
wl_param_mgr->loadPreset( "LightShare-CurrentRegion",true);
}
}
#endif
} }
else if (agent_id != gAgent.getID()) else if (agent_id != gAgent.getID())
{ {

16
indra/newview/llviewermessage.cpp
View File

@@ -163,6 +163,7 @@
#include "hipporestrequest.h" #include "hipporestrequest.h"
#include "hippofloaterxml.h" #include "hippofloaterxml.h"
#include "llversionviewer.h" #include "llversionviewer.h"
#include "m7wlinterface.h"
#include "llwlparammanager.h" #include "llwlparammanager.h"
#include "llwaterparammanager.h" #include "llwaterparammanager.h"
@@ -3813,20 +3814,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
gCacheName->setUpstream(sim); gCacheName->setUpstream(sim);
*/ */
//Reset the windlight profile to default M7WindlightInterface::getInstance()->receiveReset();
//LLWLParamManager::getInstance()->mAnimator.mIsRunning = false;
//LLWLParamManager::getInstance()->mAnimator.mUseLindenTime = false;
/*
LLWLParamSet wl_backup;
if(LLWLParamManager::getInstance()->getParamSet("LightShare-Backup", wl_backup)) {
LLWLParamManager::getInstance()->propagateParameters();
LLWLParamManager::getInstance()->removeParamSet("LightShare-Backup", true);
}
LLWaterParamSet backup;
if(LLWaterParamManager::getInstance()->getParamSet("LightShare-Backup", backup)) {
LLWaterParamManager::getInstance()->propagateParameters();
LLWaterParamManager::getInstance()->removeParamSet("LightShare-Backup", true);
}*/
// now, use the circuit info to tell simulator about us! // now, use the circuit info to tell simulator about us!
LL_INFOS("Messaging") << "process_teleport_finish() Enabling " LL_INFOS("Messaging") << "process_teleport_finish() Enabling "