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

Catching up with Lindies part 1

Browse Source
This commit is contained in:
Siana Gearz
2012-03-25 04:36:17 +02:00
parent 2e5ea4f5a7
commit 459751f206
9 changed files with 17 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/llwlparamset.cpp
View File

@@ -47,33 +47,7 @@
LLWLParamSet::LLWLParamSet(void) :
mName("Unnamed Preset"),
mCloudScrollXOffset(0.f), mCloudScrollYOffset(0.f)
{
/* REMOVE or init the LLSD
const std::map<std::string, LLVector4>::value_type hardcodedPreset[] = {
std::make_pair("lightnorm", LLVector4(0.f, 0.707f, -0.707f, 0.f)),
std::make_pair("sunlight_color", LLVector4(0.6f, 0.6f, 2.83f, 2.27f)),
std::make_pair("ambient", LLVector4(0.27f, 0.33f, 0.44f, 1.19f)),
std::make_pair("blue_horizon", LLVector4(0.3f, 0.4f, 0.9f, 1.f)),
std::make_pair("blue_density", LLVector4(0.3f, 0.4f, 0.8f, 1.f)),
std::make_pair("haze_horizon", LLVector4(0.6f, 0.6f, 0.6f, 1.f)),
std::make_pair("haze_density", LLVector4(0.3f, 0.3f, 0.3f, 1.f)),
std::make_pair("cloud_shadow", LLVector4(0.f, 0.f, 0.f, 0.f)),
std::make_pair("density_multiplier", LLVector4(0.001f, 0.001f, 0.001f, 0.001f)),
std::make_pair("distance_multiplier", LLVector4(1.f, 1.f, 1.f, 1.f)),
std::make_pair("max_y", LLVector4(600.f, 600.f, 600.f, 0.f)),
std::make_pair("glow", LLVector4(15.f, 0.001f, -0.03125f, 0.f)),
std::make_pair("cloud_color", LLVector4(0.0f, 0.0f, 0.0f, 0.0f)),
std::make_pair("cloud_pos_density1", LLVector4(0.f, 0.f, 0.f, 1.f)),
std::make_pair("cloud_pos_density2", LLVector4(0.f, 0.f, 0.f, 1.f)),
std::make_pair("cloud_scale", LLVector4(0.42f, 0.f, 0.f, 1.f)),
std::make_pair("gamma", LLVector4(2.0f, 2.0f, 2.0f, 0.0f)),
};
std::map<std::string, LLVector4>::value_type const * endHardcodedPreset =
hardcodedPreset + LL_ARRAY_SIZE(hardcodedPreset);
mParamValues.insert(hardcodedPreset, endHardcodedPreset);
*/
}
{}
static LLFastTimer::DeclareTimer FTM_WL_PARAM_UPDATE("WL Param Update");
@@ -224,7 +198,6 @@ void LLWLParamSet::set(const std::string& paramName, const LLColor4 & val)
LLVector4 LLWLParamSet::getVector(const std::string& paramName, bool& error)
{
// test to see if right type
LLSD cur_val = mParamValues.get(paramName);
if (!cur_val.isArray())
@@ -245,7 +218,6 @@ LLVector4 LLWLParamSet::getVector(const std::string& paramName, bool& error)
F32 LLWLParamSet::getFloat(const std::string& paramName, bool& error)
{
// test to see if right type
LLSD cur_val = mParamValues.get(paramName);
if (cur_val.isArray() && cur_val.size() != 0)
@@ -264,8 +236,6 @@ F32 LLWLParamSet::getFloat(const std::string& paramName, bool& error)
return 0;
}
void LLWLParamSet::setSunAngle(float val)
{
// keep range 0 - 2pi
@@ -293,7 +263,6 @@ void LLWLParamSet::setEastAngle(float val)
mParamValues["east_angle"] = val;
}
void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
{
// set up the iterators
@@ -312,7 +281,6 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
// Iterate through values
for(LLSD::map_iterator iter = mParamValues.beginMap(); iter != mParamValues.endMap(); ++iter)
{
// If param exists in both src and dest, set the holder variables, otherwise skip
if(src.mParamValues.has(iter->first) && dest.mParamValues.has(iter->first))
{