From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Mon, 29 Apr 2024 07:43:28 +0300
Subject: #824 Process source files in bulk: replace tabs with spaces, convert
CRLF to LF, and trim trailing whitespaces as needed
---
indra/llmath/llcalc.h | 122 +++++++++++++++++++++++++-------------------------
1 file changed, 61 insertions(+), 61 deletions(-)
(limited to 'indra/llmath/llcalc.h')
diff --git a/indra/llmath/llcalc.h b/indra/llmath/llcalc.h
index ceb9dce585..09672eb13b 100644
--- a/indra/llmath/llcalc.h
+++ b/indra/llmath/llcalc.h
@@ -4,21 +4,21 @@
* $LicenseInfo:firstyear=2008&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2008, 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$
*
@@ -33,68 +33,68 @@
class LLCalc
{
public:
- LLCalc();
- ~LLCalc();
+ LLCalc();
+ ~LLCalc();
+
+ // Variable name constants
+ static const char* X_POS;
+ static const char* Y_POS;
+ static const char* Z_POS;
+ static const char* X_SCALE;
+ static const char* Y_SCALE;
+ static const char* Z_SCALE;
+ static const char* X_ROT;
+ static const char* Y_ROT;
+ static const char* Z_ROT;
+ static const char* HOLLOW;
+ static const char* CUT_BEGIN;
+ static const char* CUT_END;
+ static const char* PATH_BEGIN;
+ static const char* PATH_END;
+ static const char* TWIST_BEGIN;
+ static const char* TWIST_END;
+ static const char* X_SHEAR;
+ static const char* Y_SHEAR;
+ static const char* X_TAPER;
+ static const char* Y_TAPER;
+ static const char* RADIUS_OFFSET;
+ static const char* REVOLUTIONS;
+ static const char* SKEW;
+ static const char* X_HOLE;
+ static const char* Y_HOLE;
+ static const char* TEX_U_SCALE;
+ static const char* TEX_V_SCALE;
+ static const char* TEX_U_OFFSET;
+ static const char* TEX_V_OFFSET;
+ static const char* TEX_ROTATION;
+ static const char* TEX_TRANSPARENCY;
+ static const char* TEX_GLOW;
- // Variable name constants
- static const char* X_POS;
- static const char* Y_POS;
- static const char* Z_POS;
- static const char* X_SCALE;
- static const char* Y_SCALE;
- static const char* Z_SCALE;
- static const char* X_ROT;
- static const char* Y_ROT;
- static const char* Z_ROT;
- static const char* HOLLOW;
- static const char* CUT_BEGIN;
- static const char* CUT_END;
- static const char* PATH_BEGIN;
- static const char* PATH_END;
- static const char* TWIST_BEGIN;
- static const char* TWIST_END;
- static const char* X_SHEAR;
- static const char* Y_SHEAR;
- static const char* X_TAPER;
- static const char* Y_TAPER;
- static const char* RADIUS_OFFSET;
- static const char* REVOLUTIONS;
- static const char* SKEW;
- static const char* X_HOLE;
- static const char* Y_HOLE;
- static const char* TEX_U_SCALE;
- static const char* TEX_V_SCALE;
- static const char* TEX_U_OFFSET;
- static const char* TEX_V_OFFSET;
- static const char* TEX_ROTATION;
- static const char* TEX_TRANSPARENCY;
- static const char* TEX_GLOW;
+ void setVar(const std::string& name, const F32& value);
+ void clearVar(const std::string& name);
+ void clearAllVariables();
+// void updateVariables(LLSD& vars);
- void setVar(const std::string& name, const F32& value);
- void clearVar(const std::string& name);
- void clearAllVariables();
-// void updateVariables(LLSD& vars);
+ bool evalString(const std::string& expression, F32& result);
+ std::string::size_type getLastErrorPos() { return mLastErrorPos; }
- bool evalString(const std::string& expression, F32& result);
- std::string::size_type getLastErrorPos() { return mLastErrorPos; }
-
- static LLCalc* getInstance();
- static void cleanUp();
+ static LLCalc* getInstance();
+ static void cleanUp();
+
+ typedef std::map<std::string, F32> calc_map_t;
- typedef std::map<std::string, F32> calc_map_t;
-
private:
- std::string::size_type mLastErrorPos;
-
- calc_map_t mConstants;
- calc_map_t mVariables;
-
- // *TODO: Add support for storing user defined variables, and stored functions.
- // Will need UI work, and a means to save them between sessions.
-// calc_map_t mUserVariables;
-
- // "There shall be only one"
- static LLCalc* sInstance;
+ std::string::size_type mLastErrorPos;
+
+ calc_map_t mConstants;
+ calc_map_t mVariables;
+
+ // *TODO: Add support for storing user defined variables, and stored functions.
+ // Will need UI work, and a means to save them between sessions.
+// calc_map_t mUserVariables;
+
+ // "There shall be only one"
+ static LLCalc* sInstance;
};
#endif // LL_CALC_H
--
cgit v1.2.3