Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mandelbrot: Get rid of RenderPixelSmooth.

Browse Source
This commit is contained in:
Augustin Cavalier 2016-06-17 22:36:09 -04:00
parent 29781d2641
commit 54e2ef8417
2 changed files with 7 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/apps/mandelbrot/FractalEngine.cpp
View File

@ -27,7 +27,6 @@ FractalEngine::FractalEngine(BHandler* parent, BLooper* looper)
fRenderBufferLen(0),
fColorset(Colorset_Royal)
{
fRenderPixel = &FractalEngine::RenderPixelDefault;
fDoSet = &FractalEngine::DoSet_Mandelbrot;
}
@ -108,12 +107,7 @@ int32 gIterations = 1024;
double gPower = 0;
#define RenderBuffer_SetPixel(x, y, r, g, b) \
uint32 _BUF_BASE = fWidth * y * 3 + x * 3; \
fRenderBuffer[_BUF_BASE + 0] = r; \
fRenderBuffer[_BUF_BASE + 1] = g; \
fRenderBuffer[_BUF_BASE + 2] = b
void FractalEngine::RenderPixelDefault(uint32 x, uint32 y, double real,
void FractalEngine::RenderPixel(uint32 x, uint32 y, double real,
double imaginary)
{
int32 iterToEscape = (this->*fDoSet)(real, imaginary);
@ -125,50 +119,13 @@ void FractalEngine::RenderPixelDefault(uint32 x, uint32 y, double real,
loc = 998 - (iterToEscape % 999);
}
RenderBuffer_SetPixel(x, y, fColorset[loc * 3 + 0], fColorset[loc * 3 + 1],
fColorset[loc * 3 + 2]);
uint32 offsetBase = fWidth * y * 3 + x * 3;
fRenderBuffer[offsetBase + 0] = fColorset[loc * 3 + 0];
fRenderBuffer[offsetBase + 1] = fColorset[loc * 3 + 1];
fRenderBuffer[offsetBase + 2] = fColorset[loc * 3 + 2];
}
void FractalEngine::RenderPixelSmooth(uint32 x, uint32 y, double real,
double imaginary)
{
int32 outColor = (this->*fDoSet)(real, imaginary);
int8 mapperDiff_r = 0;
int8 mapperDiff_g = 0;
int8 mapperDiff_b = 0;
int16 mapperLoc = 0;
double dist = sqrt(zReal_end * zReal_end + zImaginary_end * zImaginary_end);
double ratio = (1 - (log(log(dist))) / log(2));
if (sqrt(real * real + imaginary * imaginary) > 8) {
// Make the colors >8 be flat.
ratio = -1.0821509904820257;
outColor = 1;
}
if (outColor == -1) {
RenderBuffer_SetPixel(x, y, fColorset[999 * 3], fColorset[999 * 3 + 1],
fColorset[999 * 3 + 2]);
return;
}
outColor = 998 - (outColor % 999);
mapperLoc = outColor * 3;
mapperDiff_r = fColorset[mapperLoc + 0] - fColorset[mapperLoc + 0 + 3];
mapperDiff_g = fColorset[mapperLoc + 1] - fColorset[mapperLoc + 1 + 3];
mapperDiff_b = fColorset[mapperLoc + 2] - fColorset[mapperLoc + 2 + 3];
RenderBuffer_SetPixel(x, y, mapperDiff_r * ratio + fColorset[mapperLoc + 0],
mapperDiff_g * ratio + fColorset[mapperLoc + 1],
mapperDiff_b * ratio + fColorset[mapperLoc + 2]);
}
#undef RenderBuffer_SetPixel
int32 FractalEngine::DoSet_Mandelbrot(double real, double imaginary)
{
double zReal = 0;
@ -390,8 +347,7 @@ void FractalEngine::Render(double locationX, double locationY, double size)
for (uint32 x = 0; x < fWidth; x++) {
for (uint32 y = 0; y < fHeight; y++) {
(this->*fRenderPixel)(x, y,
(x * size + locationX) - (halfWidth * size),
RenderPixel(x, y, (x * size + locationX) - (halfWidth * size),
(y * -size + locationY) - (halfHeight * -size));
}
}

4
src/apps/mandelbrot/FractalEngine.h
View File

@ -43,11 +43,9 @@ private:
const uint8* fColorset;
int32 (FractalEngine::*fDoSet)(double real, double imaginary);
void (FractalEngine::*fRenderPixel)(uint32 x, uint32 y, double real, double imaginary);
void Render(double locationX, double locationY, double size);
void RenderPixelDefault(uint32 x, uint32 y, double real, double imaginary);
void RenderPixelSmooth(uint32 x, uint32 y, double real, double imaginary);
void RenderPixel(uint32 x, uint32 y, double real, double imaginary);
int32 DoSet_Mandelbrot(double real, double imaginary);
int32 DoSet_BurningShip(double real, double imaginary);
int32 DoSet_Tricorn(double real, double imaginary);