Merge of windlight into release (QAR-286). This includes all changes in

windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620

1 files changed, 233 insertions, 0 deletions

diff --git a/indra/newview/llwaterparamset.cpp b/indra/newview/llwaterparamset.cpp
new file mode 100644
index 0000000000..78baae8db6
--- /dev/null
+++ b/indra/newview/llwaterparamset.cpp
@@ -0,0 +1,233 @@
+/**
+ * @file llwaterparamset.cpp
+ * @brief Implementation for the LLWaterParamSet class.
+ *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
+ * Copyright (c) 2005-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llwaterparamset.h"
+#include "llsd.h"
+
+#include "llfloaterwater.h"
+#include "llwaterparammanager.h"
+#include "lluictrlfactory.h"
+#include "llsliderctrl.h"
+#include "llviewerimagelist.h"
+#include "llviewercontrol.h"
+#include "lluuid.h"
+
+#include <llgl.h>
+
+#include <sstream>
+
+LLWaterParamSet::LLWaterParamSet(void) :
+	mName("Unnamed Preset")
+{
+	LLSD vec4;
+	LLSD vec3;
+	LLSD real(0.0f);
+
+	vec4 = LLSD::emptyArray();
+	vec4.append(22.f/255.f);
+	vec4.append(43.f/255.f);
+	vec4.append(54.f/255.f);
+	vec4.append(0.f/255.f);
+
+	vec3 = LLSD::emptyArray();
+	vec3.append(2);
+	vec3.append(2);
+	vec3.append(2);
+
+	LLSD wave1, wave2;
+	wave1 = LLSD::emptyArray();
+	wave2 = LLSD::emptyArray();
+	wave1.append(0.5f);
+	wave1.append(-.17f);
+	wave2.append(0.58f);
+	wave2.append(-.67f);
+
+	LLUUID normalMap = LLUUID(gViewerArt.getString("water_normal.tga"));
+
+	mParamValues.insert("waterFogColor", vec4);
+	mParamValues.insert("waterFogDensity", 16.0f);
+	mParamValues.insert("underWaterFogMod", 0.25f);
+	mParamValues.insert("normScale", vec3);
+	mParamValues.insert("fresnelScale", 0.5f);
+	mParamValues.insert("fresnelOffset", 0.4f);
+	mParamValues.insert("scaleAbove", 0.025f);
+	mParamValues.insert("scaleBelow", 0.2f);
+	mParamValues.insert("blurMultiplier", 0.01f);
+	mParamValues.insert("wave1Dir", wave1);
+	mParamValues.insert("wave2Dir", wave2);
+	mParamValues.insert("normalMap", normalMap);
+
+}
+
+void LLWaterParamSet::set(const char * paramName, float x) 
+{	
+	// handle case where no array
+	if(mParamValues[paramName].isReal()) 
+	{
+		mParamValues[paramName] = x;
+	} 
+	
+	// handle array
+	else if(mParamValues[paramName].isArray() &&
+			mParamValues[paramName][0].isReal())
+	{
+		mParamValues[paramName][0] = x;
+	}
+}
+
+void LLWaterParamSet::set(const char * paramName, float x, float y) {
+	mParamValues[paramName][0] = x;
+	mParamValues[paramName][1] = y;
+}
+
+void LLWaterParamSet::set(const char * paramName, float x, float y, float z)
+{
+	mParamValues[paramName][0] = x;
+	mParamValues[paramName][1] = y;
+	mParamValues[paramName][2] = z;
+}
+
+void LLWaterParamSet::set(const char * paramName, float x, float y, float z, float w) 
+{
+	mParamValues[paramName][0] = x;
+	mParamValues[paramName][1] = y;
+	mParamValues[paramName][2] = z;
+	mParamValues[paramName][3] = w;
+}
+
+void LLWaterParamSet::set(const char * paramName, const float * val) 
+{
+	mParamValues[paramName][0] = val[0];
+	mParamValues[paramName][1] = val[1];
+	mParamValues[paramName][2] = val[2];
+	mParamValues[paramName][3] = val[3];
+}
+
+void LLWaterParamSet::set(const char * paramName, const LLVector4 & val) 
+{
+	mParamValues[paramName][0] = val.mV[0];
+	mParamValues[paramName][1] = val.mV[1];
+	mParamValues[paramName][2] = val.mV[2];
+	mParamValues[paramName][3] = val.mV[3];
+}
+
+void LLWaterParamSet::set(const char * paramName, const LLColor4 & val) 
+{
+	mParamValues[paramName][0] = val.mV[0];
+	mParamValues[paramName][1] = val.mV[1];
+	mParamValues[paramName][2] = val.mV[2];
+	mParamValues[paramName][3] = val.mV[3];
+}
+
+LLVector4 LLWaterParamSet::getVector4(const char * paramName, bool& error) 
+{
+	
+	// test to see if right type
+	LLSD cur_val = mParamValues.get(paramName);
+	if (!cur_val.isArray() || cur_val.size() != 4) 
+	{
+		error = true;
+		return LLVector4(0,0,0,0);
+	}
+	
+	LLVector4 val;
+	val.mV[0] = (F32) cur_val[0].asReal();
+	val.mV[1] = (F32) cur_val[1].asReal();
+	val.mV[2] = (F32) cur_val[2].asReal();
+	val.mV[3] = (F32) cur_val[3].asReal();
+	
+	error = false;
+	return val;
+}
+
+LLVector3 LLWaterParamSet::getVector3(const char * paramName, bool& error) 
+{
+	
+	// test to see if right type
+	LLSD cur_val = mParamValues.get(paramName);
+	if (!cur_val.isArray()|| cur_val.size() != 3) 
+	{
+		error = true;
+		return LLVector3(0,0,0);
+	}
+	
+	LLVector3 val;
+	val.mV[0] = (F32) cur_val[0].asReal();
+	val.mV[1] = (F32) cur_val[1].asReal();
+	val.mV[2] = (F32) cur_val[2].asReal();
+	
+	error = false;
+	return val;
+}
+
+LLVector2 LLWaterParamSet::getVector2(const char * paramName, bool& error) 
+{
+	// test to see if right type
+	int ttest;
+	ttest = mParamValues.size();
+	LLSD cur_val = mParamValues.get(paramName);
+	if (!cur_val.isArray() || cur_val.size() != 2) 
+	{
+		error = true;
+		return LLVector2(0,0);
+	}
+	
+	LLVector2 val;
+	val.mV[0] = (F32) cur_val[0].asReal();
+	val.mV[1] = (F32) cur_val[1].asReal();
+	
+	error = false;
+	return val;
+}
+
+F32 LLWaterParamSet::getFloat(const char * paramName, bool& error) 
+{
+	
+	// test to see if right type
+	LLSD cur_val = mParamValues.get(paramName);
+	if (cur_val.isArray() && cur_val.size() != 0)
+	{
+		error = false;
+		return (F32) cur_val[0].asReal();	
+	}
+	
+	if(cur_val.isReal())
+	{
+		error = false;
+		return (F32) cur_val.asReal();
+	}
+	
+	error = true;
+	return 0;
+}
+