spacecruft
/
CelestiaContent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove celmath::log2 as it's defined in C++11

pull/3/head
Hleb Valoshka 2019-05-17 00:15:51 +03:00
parent 88fe409d21
commit 440f34350c
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/celengine/render.cpp
View File

@ -5308,18 +5308,18 @@ void Renderer::renderPlanet(Body& body,
float ringFeatureSize = (projectedRingSize / ringTextureWidth) / approxRingDistance;
float relativeFeatureSize = lights.lights[li].apparentSize / ringFeatureSize;
//float areaLightLod = log(max(relativeFeatureSize, 1.0f)) / log(2.0f);
float areaLightLod = celmath::log2(max(relativeFeatureSize, 1.0f));
float areaLightLod = log2(max(relativeFeatureSize, 1.0f));
// Compute the LOD that would be automatically used by the GPU.
float texelToPixelRatio = ringTextureWidth / projectedRingSizeInPixels;
float gpuLod = celmath::log2(texelToPixelRatio);
float gpuLod = log2(texelToPixelRatio);
//float lod = max(areaLightLod, log(texelToPixelRatio) / log(2.0f));
float lod = max(areaLightLod, gpuLod);
// maxLOD is the index of the smallest mipmap (or close to it for non-power-of-two
// textures.) We can't make the lod larger than this.
float maxLod = celmath::log2((float) ringsTex->getWidth());
float maxLod = log2((float) ringsTex->getWidth());
if (maxLod > 1.0f)
{
// Avoid using the 1x1 mipmap, as it appears to cause 'bleeding' when

11
src/celmath/mathlib.h
View File

@ -21,17 +21,6 @@
// moved to the celmath namespace.
namespace celmath
{
/** Return the natural logarithm of 2 */
template<class T> CONSTEXPR T Ln2()
{
return (T) 0.693147180559945;
}
/** Return the log base 2 of the argument. */
template<class T> T log2(T x)
{
return std::log(x) / Ln2<T>();
}
}