Second Life viewer sources 1.20.2

1 files changed, 16 insertions, 24 deletions

diff --git a/linden/indra/newview/llsphere.h b/linden/indra/llcommon/llsmoothstep.h
index 3a827c9..c2b3447 100644
--- a/linden/indra/newview/llsphere.h
+++ b/linden/indra/llcommon/llsmoothstep.h
@@ -1,6 +1,6 @@
 /** 
- * @file llsphere.h
- * @brief interface for the LLSphere class.
+ * @file llsmoothstep.h
+ * @brief Smoothstep - transition from 0 to 1 - function, first and second derivatives all continuous (smooth)
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -29,30 +29,22 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLSPHERE_H
-#define LL_LLSPHERE_H
+#ifndef LL_LLSMOOTHSTEP_H
+#define LL_LLSMOOTHSTEP_H
 
-//#include "vmath.h"
-#include "llmath.h"
-#include "v3math.h"
-#include "v4math.h"
-#include "m3math.h"
-#include "m4math.h"
-#include "v4color.h"
-#include "llgl.h"
+template <class LLDATATYPE>
+inline LLDATATYPE llsmoothstep(const LLDATATYPE& edge0, const LLDATATYPE& edge1, const LLDATATYPE& value)
+{
+    if (value < edge0)
+                return (LLDATATYPE)0;
 
-void lat2xyz(LLVector3 * result, F32 lat, F32 lon);                     // utility routine
+        if (value >= edge1)
+                return (LLDATATYPE)1;
 
-class LLSphere  
-{
-public:
-        LLGLuint        mDList[5];
+        // Scale/bias into [0..1] range
+        LLDATATYPE scaled_value = (value - edge0) / (edge1 - edge0);
 
-        void prerender();
-        void cleanupGL();
-        void render(F32 pixel_area);            // of a box of size 1.0 at that position
-        void render();                                          // render at highest LOD
-};
+        return scaled_value * scaled_value * (3 - 2 * scaled_value);
+}
 
-extern LLSphere gSphere;
-#endif
+#endif // LL_LLSMOOTHSTEP_H