Merge branch 'master' into DRTVWR-507-maint

1 files changed, 0 insertions, 246 deletions

diff --git a/indra/newview/llwlparamset.h b/indra/newview/llwlparamset.h
deleted file mode 100644
index 6e5f1d3a4b..0000000000
--- a/indra/newview/llwlparamset.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- * @file llwlparamset.h
- * @brief Interface for the LLWLParamSet class.
- *
- * $LicenseInfo:firstyear=2005&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_WLPARAM_SET_H
-#define LL_WLPARAM_SET_H
-
-#include <string>
-#include <map>
-#include <vector>
-
-#include "v4math.h"
-#include "v4color.h"
-#include "llstaticstringtable.h"
-
-class LLWLParamSet;
-class LLGLSLShader;
-
-/// A class representing a set of parameter values for the WindLight shaders.
-class LLWLParamSet {
-
-	friend class LLWLParamManager;
-
-public:
-	std::string mName;	
-	
-private:
-
-	LLSD mParamValues;
-	std::vector<LLStaticHashedString> mParamHashedNames;
-
-	float mCloudScrollXOffset, mCloudScrollYOffset;
-
-	void updateHashedNames();
-
-public:
-
-	LLWLParamSet();
-
-	/// Update this set of shader uniforms from the parameter values.
-	void update(LLGLSLShader * shader) const;
-
-	/// set the total llsd
-	void setAll(const LLSD& val);
-	
-	/// get the total llsd
-	const LLSD& getAll();		
-	
-
-	/// Set a float parameter.
-	/// \param paramName	The name of the parameter to set.
-	/// \param x			The float value to set.
-	void set(const std::string& paramName, float x);
-
-	/// Set a float2 parameter.
-	/// \param paramName	The name of the parameter to set.
-	/// \param x			The x component's value to set.
-	/// \param y			The y component's value to set.
-	void set(const std::string& paramName, float x, float y);
-
-	/// Set a float3 parameter.
-	/// \param paramName	The name of the parameter to set.
-	/// \param x			The x component's value to set.
-	/// \param y			The y component's value to set.
-	/// \param z			The z component's value to set.
-	void set(const std::string& paramName, float x, float y, float z);
-
-	/// Set a float4 parameter.
-	/// \param paramName	The name of the parameter to set.
-	/// \param x			The x component's value to set.
-	/// \param y			The y component's value to set.
-	/// \param z			The z component's value to set.
-	/// \param w			The w component's value to set.
-	void set(const std::string& paramName, float x, float y, float z, float w);
-
-	/// Set a float4 parameter.
-	/// \param paramName	The name of the parameter to set.
-	/// \param val			An array of the 4 float values to set the parameter to.
-	void set(const std::string& paramName, const float * val);
-
-	/// Set a float4 parameter.
-	/// \param paramName	The name of the parameter to set.
-	/// \param val			A struct of the 4 float values to set the parameter to.
-	void set(const std::string& paramName, const LLVector4 & val);
-
-	/// Set a float4 parameter.
-	/// \param paramName	The name of the parameter to set.
-	/// \param val			A struct of the 4 float values to set the parameter to.
-	void set(const std::string& paramName, const LLColor4 & val);
-
-	/// Get a float4 parameter.
-	/// \param paramName	The name of the parameter to set.
-	/// \param error		A flag to set if it's not the proper return type
-	LLVector4 getVector(const std::string& paramName, bool& error);
-
-	/// Get a float parameter
-	/// \param paramName	The name of the parameter to set.
-	/// \param error		A flag to set if it's not the proper return type	
-	F32 getFloat(const std::string& paramName, bool& error);
-	
-	
-	// specific getters and setters
-	
-	
-	/// set the star's brightness
-	/// \param val brightness value
-	void setStarBrightness(F32 val);
-	
-	/// get the star brightness value;
-	F32 getStarBrightness();	
-	
-	void setSunAngle(F32 val);
-	F32 getSunAngle();	
-	
-	void setEastAngle(F32 val);
-	F32 getEastAngle();	
-	
-							
-	
-	/// set the cloud scroll x enable value
-	/// \param val scroll x value	
-	void setEnableCloudScrollX(bool val);
-
-	/// get the scroll x enable value;	
-	bool getEnableCloudScrollX();
-	
-	/// set the star's brightness
-	/// \param val scroll y bool value		
-	void setEnableCloudScrollY(bool val);	
-
-	/// get the scroll enable y value;
-	bool getEnableCloudScrollY();
-	
-	/// set the cloud scroll x enable value
-	/// \param val scroll x value	
-	void setCloudScrollX(F32 val);
-
-	/// get the scroll x enable value;	
-	F32 getCloudScrollX();
-	
-	/// set the star's brightness
-	/// \param val scroll y bool value		
-	void setCloudScrollY(F32 val);	
-
-	/// get the scroll enable y value;
-	F32 getCloudScrollY();	
-
-	/// interpolate two parameter sets
-	/// \param src			The parameter set to start with
-	/// \param dest			The parameter set to end with
-	/// \param weight		The amount to interpolate
-	void mix(LLWLParamSet& src, LLWLParamSet& dest, 
-		F32 weight);
-
-	void updateCloudScrolling(void);
-};
-
-inline void LLWLParamSet::setAll(const LLSD& val)
-{
-	if(val.isMap()) {
-		mParamValues = val;
-	}
-
-	updateHashedNames();
-}
-
-inline const LLSD& LLWLParamSet::getAll()
-{
-	return mParamValues;
-}
-
-inline void LLWLParamSet::setStarBrightness(float val) {
-	mParamValues["star_brightness"] = val;
-}
-
-inline F32 LLWLParamSet::getStarBrightness() {
-	return (F32) mParamValues["star_brightness"].asReal();
-}
-
-inline F32 LLWLParamSet::getSunAngle() {
-	return (F32) mParamValues["sun_angle"].asReal();
-}
-
-inline F32 LLWLParamSet::getEastAngle() {
-	return (F32) mParamValues["east_angle"].asReal();
-}
-
-
-inline void LLWLParamSet::setEnableCloudScrollX(bool val) {
-	mParamValues["enable_cloud_scroll"][0] = val;
-}
-
-inline bool LLWLParamSet::getEnableCloudScrollX() {
-	return mParamValues["enable_cloud_scroll"][0].asBoolean();
-}
-
-inline void LLWLParamSet::setEnableCloudScrollY(bool val) {
-	mParamValues["enable_cloud_scroll"][1] = val;
-}
-
-inline bool LLWLParamSet::getEnableCloudScrollY() {
-	return mParamValues["enable_cloud_scroll"][1].asBoolean();
-}
-
-
-inline void LLWLParamSet::setCloudScrollX(F32 val) {
-	mParamValues["cloud_scroll_rate"][0] = val;
-}
-
-inline F32 LLWLParamSet::getCloudScrollX() {
-	return (F32) mParamValues["cloud_scroll_rate"][0].asReal();
-}
-
-inline void LLWLParamSet::setCloudScrollY(F32 val) {
-	mParamValues["cloud_scroll_rate"][1] = val;
-}
-
-inline F32 LLWLParamSet::getCloudScrollY() {
-	return (F32) mParamValues["cloud_scroll_rate"][1].asReal();
-}
-
-
-#endif // LL_WLPARAM_SET_H
-