More Fn changes
This commit is contained in:
parent
efe517abea
commit
a6212a1484
51
math/fn.cs
51
math/fn.cs
@ -1,31 +1,12 @@
|
|||||||
// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
|
using Microsoft.CodeAnalysis.CSharp.Syntax;
|
||||||
// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
|
|
||||||
//
|
|
||||||
// Copyright (c) 2010-2011 SharpDX - Alexandre Mutel
|
|
||||||
//
|
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
// of this software and associated documentation files (the "Software"), to deal
|
|
||||||
// in the Software without restriction, including without limitation the rights
|
|
||||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
// copies of the Software, and to permit persons to whom the Software is
|
|
||||||
// furnished to do so, subject to the following conditions:
|
|
||||||
//
|
|
||||||
// The above copyright notice and this permission notice shall be included in
|
|
||||||
// all copies or substantial portions of the Software.
|
|
||||||
//
|
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
// THE SOFTWARE.
|
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Runtime.Serialization;
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
namespace math
|
namespace math
|
||||||
{
|
{
|
||||||
@ -38,6 +19,30 @@ namespace math
|
|||||||
return v < min ? min : v > max ? max : v;
|
return v < min ? min : v > max ? max : v;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static public float LogisticsUnit( float v, float spread = 4.0f, float height = 1.0f )
|
||||||
|
{
|
||||||
|
return LogisticsFull( v, height, spread, 0, 0.1f, -0.5f );
|
||||||
|
}
|
||||||
|
|
||||||
|
static public float LogisticsFull( float v, float height, float spread, float f, float g, float h )
|
||||||
|
{
|
||||||
|
float res = height / (1.0f + (float)Math.Pow( g, (spread * (v+h))) ) + f;
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
static public float LogisticsSymmetric( float v, float height = 1.0f, float spread = 3.65f )
|
||||||
|
{
|
||||||
|
|
||||||
|
float fullHeight = height * 2.0f;
|
||||||
|
|
||||||
|
float negF = -height;
|
||||||
|
|
||||||
|
float res = LogisticsFull( v, fullHeight, spread, negF, 0.1f, 0.0f );
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
//Tracked these down in Desmos
|
//Tracked these down in Desmos
|
||||||
static public float s_a = 0.0f;
|
static public float s_a = 0.0f;
|
||||||
static public float s_b = 0.155f;
|
static public float s_b = 0.155f;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user