diff --git a/source/backend/math/hcmplx.cpp b/source/backend/math/hcmplx.cpp index 9021bf2..d3c00d3 100644 --- a/source/backend/math/hcmplx.cpp +++ b/source/backend/math/hcmplx.cpp @@ -40,8 +40,6 @@ #include "backend/shape/spheres.h" // TODO - Move sphere intersection function to math code! [trf] #include "backend/math/hcmplx.h" -#include "hcmplx.h" // own include - // this must be the last file included #include "base/povdebug.h" @@ -208,9 +206,9 @@ int Iteration_HCompl(const VECTOR IPoint, const Fractal *HCompl, DBL **IterStack y = IterStack[Y][0] = IPoint[Y]; z = IterStack[Z][0] = IPoint[Z]; w = IterStack[W][0] = (HCompl->SliceDist - - HCompl->Slice[X]*x - - HCompl->Slice[Y]*y - - HCompl->Slice[Z]*z)/HCompl->Slice[T]; + - HCompl->Slice[X]*x + - HCompl->Slice[Y]*y + - HCompl->Slice[Z]*z)/HCompl->Slice[T]; Exit_Value = HCompl->Exit_Value; @@ -273,9 +271,9 @@ int D_Iteration_HCompl(const VECTOR IPoint, const Fractal *HCompl, const VECTOR& y = IterStack[Y][0] = IPoint[Y]; z = IterStack[Z][0] = IPoint[Z]; w = IterStack[W][0] = (HCompl->SliceDist - - HCompl->Slice[X]*x - - HCompl->Slice[Y]*y - - HCompl->Slice[Z]*z)/HCompl->Slice[T]; + - HCompl->Slice[X]*x + - HCompl->Slice[Y]*y + - HCompl->Slice[Z]*z)/HCompl->Slice[T]; Exit_Value = HCompl->Exit_Value; @@ -465,9 +463,9 @@ int Iteration_HCompl_z3(const VECTOR IPoint, const Fractal *HCompl, DBL **IterSt y = IterStack[Y][0] = IPoint[Y]; z = IterStack[Z][0] = IPoint[Z]; w = IterStack[W][0] = (HCompl->SliceDist - - HCompl->Slice[X]*x - - HCompl->Slice[Y]*y - - HCompl->Slice[Z]*z)/HCompl->Slice[T]; + - HCompl->Slice[X]*x + - HCompl->Slice[Y]*y + - HCompl->Slice[Z]*z)/HCompl->Slice[T]; Exit_Value = HCompl->Exit_Value; @@ -528,9 +526,9 @@ int D_Iteration_HCompl_z3(const VECTOR IPoint, const Fractal *HCompl, const VECT y = IterStack[Y][0] = IPoint[Y]; z = IterStack[Z][0] = IPoint[Z]; w = IterStack[W][0] = (HCompl->SliceDist - - HCompl->Slice[X]*x - - HCompl->Slice[Y]*y - - HCompl->Slice[Z]*z)/HCompl->Slice[T]; + - HCompl->Slice[X]*x + - HCompl->Slice[Y]*y + - HCompl->Slice[Z]*z)/HCompl->Slice[T]; Exit_Value = HCompl->Exit_Value; @@ -708,9 +706,9 @@ int Iteration_HCompl_Reciprocal(const VECTOR IPoint, const Fractal *HCompl, DBL y = IterStack[Y][0] = IPoint[Y]; z = IterStack[Z][0] = IPoint[Z]; w = IterStack[W][0] = (HCompl->SliceDist - - HCompl->Slice[X]*x - - HCompl->Slice[Y]*y - - HCompl->Slice[Z]*z)/HCompl->Slice[T]; + - HCompl->Slice[X]*x + - HCompl->Slice[Y]*y + - HCompl->Slice[Z]*z)/HCompl->Slice[T]; Exit_Value = HCompl->Exit_Value; @@ -769,9 +767,9 @@ int D_Iteration_HCompl_Reciprocal(const VECTOR IPoint, const Fractal *HCompl, co y = IterStack[Y][0] = IPoint[Y]; z = IterStack[Z][0] = IPoint[Z]; w = IterStack[W][0] = (HCompl->SliceDist - - HCompl->Slice[X]*x - - HCompl->Slice[Y]*y - - HCompl->Slice[Z]*z)/HCompl->Slice[T]; + - HCompl->Slice[X]*x + - HCompl->Slice[Y]*y + - HCompl->Slice[Z]*z)/HCompl->Slice[T]; Exit_Value = HCompl->Exit_Value; @@ -943,9 +941,9 @@ int Iteration_HCompl_Func(const VECTOR IPoint, const Fractal *HCompl, DBL **Iter y = IterStack[Y][0] = IPoint[Y]; z = IterStack[Z][0] = IPoint[Y]; w = IterStack[W][0] = (HCompl->SliceDist - - HCompl->Slice[X]*x - - HCompl->Slice[Y]*y - - HCompl->Slice[Z]*z)/HCompl->Slice[T]; + - HCompl->Slice[X]*x + - HCompl->Slice[Y]*y + - HCompl->Slice[Z]*z)/HCompl->Slice[T]; Exit_Value = HCompl->Exit_Value; @@ -1004,9 +1002,9 @@ int D_Iteration_HCompl_Func(const VECTOR IPoint, const Fractal *HCompl, const VE y = IterStack[Y][0] = IPoint[Y]; z = IterStack[Z][0] = IPoint[Z]; w = IterStack[W][0] = (HCompl->SliceDist - - HCompl->Slice[X]*x - - HCompl->Slice[Y]*y - - HCompl->Slice[Z]*z)/HCompl->Slice[T]; + - HCompl->Slice[X]*x + - HCompl->Slice[Y]*y + - HCompl->Slice[Z]*z)/HCompl->Slice[T]; Exit_Value = HCompl->Exit_Value;