Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 00:04:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions

Browse source
This commit is contained in:
Ryan Jones 2016-11-30 16:37:04 -08:00
parent fe774a8530
commit 7b0756c745
3 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libraries/procedural/src/procedural/ProceduralCommon.slf
View file

@ -265,33 +265,31 @@ float snoise(vec2 v) {
}
// https://www.shadertoy.com/view/lsfGRr
float hash( float n )
{
return fract(sin(n)*43758.5453);
float hifi_hash(float n) {
return fract(sin(n) * 43758.5453);
}
float noise( in vec2 x )
{
float hifi_noise(in vec2 x) {
vec2 p = floor(x);
vec2 f = fract(x);
f = f*f*(3.0-2.0*f);
f = f * f * (3.0 - 2.0 * f);
float n = p.x + p.y*57.0;
float n = p.x + p.y * 57.0;
return mix(mix( hash(n+ 0.0), hash(n+ 1.0),f.x),
mix( hash(n+ 57.0), hash(n+ 58.0),f.x),f.y);
return mix(mix(hifi_hash(n + 0.0), hifi_hash(n + 1.0), f.x),
mix(hifi_hash(n + 57.0), hifi_hash(n + 58.0), f.x), f.y);
}
// https://www.shadertoy.com/view/MdX3Rr
// https://en.wikipedia.org/wiki/Fractional_Brownian_motion
float fbm(in vec2 p) {
float hifi_fbm(in vec2 p) {
const mat2 m2 = mat2(0.8, -0.6, 0.6, 0.8);
float f = 0.0;
f += 0.5000 * noise(p); p = m2 * p * 2.02;
f += 0.2500 * noise(p); p = m2 * p * 2.03;
f += 0.1250 * noise(p); p = m2 * p * 2.01;
f += 0.0625 * noise(p);
f += 0.5000 * hifi_noise(p); p = m2 * p * 2.02;
f += 0.2500 * hifi_noise(p); p = m2 * p * 2.03;
f += 0.1250 * hifi_noise(p); p = m2 * p * 2.01;
f += 0.0625 * hifi_noise(p);
return f / 0.9375;
}

12
libraries/script-engine/src/Vec3.cpp
View file

@ -83,15 +83,7 @@ glm::vec3 Vec3::fromPolar(float elevation, float azimuth) {
return fromPolar(v);
}
float Vec3::angle(const glm::vec3& fromV, const glm::vec3& toV) {
glm::vec3 fromVNormalized = glm::normalize(fromV);
glm::vec3 toVNormalized = glm::normalize(toV);
float radians = glm::acos(glm::dot(fromVNormalized, toVNormalized));
return radians * 180.0f / PI;
float Vec3::getAngle(const glm::vec3& v1, const glm::vec3& v2) {
return glm::acos(glm::dot(glm::normalize(v1), glm::normalize(v2)));
}
glm::vec3 Vec3::lerp(const glm::vec3& v1, const glm::vec3& v2, float t) {
return v1 * (1.0f - t) + v2 * t;
}

3
libraries/script-engine/src/Vec3.h
View file

@ -83,8 +83,7 @@ public slots:
glm::vec3 toPolar(const glm::vec3& v);
glm::vec3 fromPolar(const glm::vec3& polar);
glm::vec3 fromPolar(float elevation, float azimuth);
float angle(const glm::vec3& fromV, const glm::vec3& toV);
glm::vec3 lerp(const glm::vec3& v1, const glm::vec3& v2, float t);
float getAngle(const glm::vec3& v1, const glm::vec3& v2);
private:
const glm::vec3& UNIT_X() { return Vectors::UNIT_X; }