[core] Prune more unnecessary use of TraceThreadData.

Author: c-lipka

source/core/lighting/lightsource.cpp

@@ -658,10 +658,10 @@ DBL Attenuate_Light (const LightSource *Light, const Ray &ray, DBL Distance)
 *
 ******************************************************************************/
 
-void LightSource::UVCoord(Vector2d& Result, const Intersection *Inter, TraceThreadData *Thread) const
+void LightSource::UVCoord(Vector2d& Result, const Intersection *Inter) const
 {
     if(!children.empty())
-        children[0]->UVCoord(Result, Inter, Thread);
+        children[0]->UVCoord(Result, Inter);
 }
 
 }

source/core/material/normal.cpp

@@ -803,7 +803,7 @@ void Perturb_Normal(Vector3d& Layer_Normal, const TNORMAL *Tnormal, const Vector
             Vector2d UV_Coords;
 
             /* Don't bother warping, simply get the UV vect of the intersection */
-            Intersection->Object->UVCoord(UV_Coords, Intersection, Thread);
+            Intersection->Object->UVCoord(UV_Coords, Intersection);
             TPoint[X] = UV_Coords[U];
             TPoint[Y] = UV_Coords[V];
             TPoint[Z] = 0;

source/core/material/pigment.cpp

@@ -607,7 +607,7 @@ bool PigmentBlendMap::ComputeUVMapped(TransColour& colour, const Intersection *I
     const BlendMapEntry<PIGMENT*>* Cur = &(Blend_Map_Entries[0]);
 
     /* Don't bother warping, simply get the UV vect of the intersection */
-    Intersect->Object->UVCoord(UV_Coords, Intersect, Thread);
+    Intersect->Object->UVCoord(UV_Coords, Intersect);
     TPoint[X] = UV_Coords[U];
     TPoint[Y] = UV_Coords[V];
     TPoint[Z] = 0;

source/core/render/trace.cpp

@@ -506,7 +506,7 @@ void Trace::ComputeTextureColour(Intersection& isect, MathColour& colour, Colour
         //  This causes slopes do be applied in the wrong directions.
 
         // get the UV vect of the intersection
-        isect.Object->UVCoord(uvcoords, &isect, threadData);
+        isect.Object->UVCoord(uvcoords, &isect);
         // save the normal and UV coords into Intersection
         isect.Iuv = uvcoords;
 
@@ -639,7 +639,7 @@ void Trace::ComputeOneTextureColour(MathColour& resultColour, ColourChannel& res
                 //  This causes slopes do be applied in the wrong directions.
 
                 // Don't bother warping, simply get the UV vect of the intersection
-                isect.Object->UVCoord(uvcoords, &isect, threadData);
+                isect.Object->UVCoord(uvcoords, &isect);
                 tpoint = Vector3d(uvcoords[U], uvcoords[V], 0.0);
                 cur = &(texture->Blend_Map->Blend_Map_Entries[0]);
                 ComputeOneTextureColour(resultColour, resultTransm, cur->Vals, warps, tpoint, rawnormal, ray, weight, isect, shadowflag, photonPass);
@@ -2356,7 +2356,7 @@ void Trace::ComputeShadowColour(const LightSource &lightsource, Intersection& is
         //  This causes slopes do be applied in the wrong directions.
 
         // get the UV vect of the intersection
-        isect.Object->UVCoord(uv_Coords, &isect, threadData);
+        isect.Object->UVCoord(uv_Coords, &isect);
         // save the normal and UV coords into Intersection
         isect.Iuv = uv_Coords;
 

source/core/scene/object.cpp

@@ -879,7 +879,7 @@ double ObjectBase::GetPotential (const Vector3d& p, bool subtractThreshold, Trac
 *
 ******************************************************************************/
 
-void ObjectBase::UVCoord(Vector2d& Result, const Intersection *Inter, TraceThreadData *) const
+void ObjectBase::UVCoord(Vector2d& Result, const Intersection *Inter) const
 {
     Result[U] = Inter->IPoint[X];
     Result[V] = Inter->IPoint[Y];

source/core/scene/object.h

@@ -173,6 +173,7 @@ namespace pov
 class ObjectBase
 {
     public:
+
         int Type; // TODO - make obsolete
         TEXTURE *Texture;
         TEXTURE *Interior_Texture;
@@ -232,13 +233,13 @@ class ObjectBase
         ///
         /// @return True if object parameters are within reasonable limits.
         ///
-        virtual bool Precompute() { return true; };
+        virtual bool Precompute() { return true; }
 
         virtual bool All_Intersections(const Ray&, IStack&, TraceThreadData *) = 0; // could be "const", if it wasn't for isosurface max_gradient estimation stuff
         virtual double GetPotential (const Vector3d&, bool subtractThreshold, TraceThreadData *) const;
         virtual bool Inside(const Vector3d&, TraceThreadData *) const = 0;
         virtual void Normal(Vector3d&, Intersection *, TraceThreadData *) const = 0;
-        virtual void UVCoord(Vector2d&, const Intersection *, TraceThreadData *) const;
+        virtual void UVCoord(Vector2d&, const Intersection *) const;
         virtual void Translate(const Vector3d&, const TRANSFORM *) = 0;
         virtual void Rotate(const Vector3d&, const TRANSFORM *) = 0;
         virtual void Scale(const Vector3d&, const TRANSFORM *) = 0;
@@ -281,6 +282,7 @@ class ObjectBase
         virtual bool IsOpaque() const;
 
     protected:
+
         explicit ObjectBase(const ObjectBase&) { }
 };
 
@@ -340,7 +342,7 @@ class LightSource final : public CompoundObject
         virtual bool All_Intersections(const Ray&, IStack&, TraceThreadData *) override;
         virtual bool Inside(const Vector3d&, TraceThreadData *) const override;
         virtual void Normal(Vector3d&, Intersection *, TraceThreadData *) const override;
-        virtual void UVCoord(Vector2d&, const Intersection *, TraceThreadData *) const override;
+        virtual void UVCoord(Vector2d&, const Intersection *) const override;
         virtual void Translate(const Vector3d&, const TRANSFORM *) override;
         virtual void Rotate(const Vector3d&, const TRANSFORM *) override;
         virtual void Scale(const Vector3d&, const TRANSFORM *) override;

source/core/scene/tracethreaddata.cpp

@@ -50,7 +50,6 @@
 #include "core/scene/scenedata.h"
 #include "core/shape/blob.h"
 #include "core/shape/fractal.h"
-#include "core/shape/isosurface.h"
 #include "core/support/cracklecache.h"
 
 // this must be the last file included
@@ -76,14 +75,6 @@ TraceThreadData::TraceThreadData(std::shared_ptr<SceneData> sd, size_t seed) :
     Blob_Queue = reinterpret_cast<void **>(POV_MALLOC(sizeof(void *), "Blob Queue"));
     Blob_Coefficients = reinterpret_cast<DBL *>(POV_MALLOC(sizeof(DBL) * Blob_Coefficient_Count, "Blob Coefficients"));
     Blob_Intervals = new Blob_Interval_Struct [Blob_Interval_Count];
-    isosurfaceData = reinterpret_cast<ISO_ThreadData *>(POV_MALLOC(sizeof(ISO_ThreadData), "Isosurface Data"));
-    isosurfaceData->pFn = nullptr;
-    isosurfaceData->current = nullptr;
-    isosurfaceData->cache = false;
-    isosurfaceData->Inv3 = 1;
-    isosurfaceData->fmax = 0.0;
-    isosurfaceData->tl = 0.0;
-    isosurfaceData->Vlength = 0.0;
 
     BCyl_Intervals.reserve(4*sceneData->Max_Bounding_Cylinders);
     BCyl_RInt.reserve(2*sceneData->Max_Bounding_Cylinders);
@@ -111,7 +102,6 @@ TraceThreadData::TraceThreadData(std::shared_ptr<SceneData> sd, size_t seed) :
     passThruPrev = false;           // was the previous object pass-through?
     Light_Is_Global = false;       // is the current light global? (not part of a light_group?)
 
-    CrCache_MaxAge = 1;
     progress_index = 0;
 
     surfacePhotonMap = new PhotonMap();
@@ -128,7 +118,6 @@ TraceThreadData::~TraceThreadData()
 
     POV_FREE(Blob_Coefficients);
     POV_FREE(Blob_Queue);
-    POV_FREE(isosurfaceData);
     Fractal::Free_Iteration_Stack(Fractal_IStack);
     delete surfacePhotonMap;
     delete mediaPhotonMap;

source/core/scene/tracethreaddata.h

@@ -71,8 +71,6 @@ namespace pov
 
 using namespace pov_base;
 
-struct ISO_ThreadData;
-
 class PhotonMap;
 struct Blob_Interval_Struct;
 
@@ -101,7 +99,6 @@ class TraceThreadData : public ThreadData
         Blob_Interval_Struct *Blob_Intervals;
         int Blob_Coefficient_Count;
         int Blob_Interval_Count;
-        ISO_ThreadData *isosurfaceData;     ///< @todo We may want to move this data block to the isosurface code as a local variable.
         std::vector<BCYL_INT> BCyl_Intervals;
         std::vector<BCYL_INT> BCyl_RInt;
         std::vector<BCYL_INT> BCyl_HInt;
@@ -182,8 +179,6 @@ class TraceThreadData : public ThreadData
         TraceThreadData(const TraceThreadData&) = delete;
         TraceThreadData& operator=(const TraceThreadData&) = delete;
 
-        /// current number of Tiles to expire crackle cache entries after
-        size_t CrCache_MaxAge;
         /// current tile index (for crackle cache expiry)
         size_t progress_index;
 };

source/core/shape/bezier.cpp

@@ -2137,7 +2137,7 @@ void BicubicPatch::Compute_BBox()
 *
 ******************************************************************************/
 
-void BicubicPatch::UVCoord(Vector2d& Result, const Intersection *Inter, TraceThreadData *Thread) const
+void BicubicPatch::UVCoord(Vector2d& Result, const Intersection *Inter) const
 {
     /* Use preocmputed uv coordinates. */
 

source/core/shape/bezier.h

@@ -121,7 +121,7 @@ class BicubicPatch final : public NonsolidObject
         virtual bool All_Intersections(const Ray&, IStack&, TraceThreadData *) override;
         virtual bool Inside(const Vector3d&, TraceThreadData *) const override;
         virtual void Normal(Vector3d&, Intersection *, TraceThreadData *) const override;
-        virtual void UVCoord(Vector2d&, const Intersection *, TraceThreadData *) const override;
+        virtual void UVCoord(Vector2d&, const Intersection *) const override;
         virtual void Translate(const Vector3d&, const TRANSFORM *) override;
         virtual void Rotate(const Vector3d&, const TRANSFORM *) override;
         virtual void Scale(const Vector3d&, const TRANSFORM *) override;