Some pattern-related refactoring.

Author: c-lipka

source/core/configcore.h

@@ -165,22 +165,22 @@ namespace pov
     #define POV_BLEND_MAP_DEBUG POV_DEBUG
 #endif
 
-/// @def POV_SHAPE_DEBUG
-/// Enable run-time sanity checks for geometric shapes.
+/// @def POV_PATTERN_DEBUG
+/// Enable run-time sanity checks for pattern handling.
 ///
 /// Define as non-zero integer to enable, or zero to disable.
 ///
-#ifndef POV_SHAPE_DEBUG
-    #define POV_SHAPE_DEBUG POV_DEBUG
+#ifndef POV_PATTERN_DEBUG
+    #define POV_PATTERN_DEBUG POV_DEBUG
 #endif
 
-/// @def POV_PATTERN_DEBUG
-/// Enable run-time sanity checks for pattern handling.
+/// @def POV_PIGMENT_DEBUG
+/// Enable run-time sanity checks for pigment handling.
 ///
 /// Define as non-zero integer to enable, or zero to disable.
 ///
-#ifndef POV_PATTERN_DEBUG
-    #define POV_PATTERN_DEBUG POV_DEBUG
+#ifndef POV_PIGMENT_DEBUG
+    #define POV_PIGMENT_DEBUG POV_DEBUG
 #endif
 
 /// @def POV_RADIOSITY_DEBUG
@@ -210,6 +210,15 @@ namespace pov
     #define POV_REFPOOL_DEBUG POV_DEBUG
 #endif
 
+/// @def POV_SHAPE_DEBUG
+/// Enable run-time sanity checks for geometric shapes.
+///
+/// Define as non-zero integer to enable, or zero to disable.
+///
+#ifndef POV_SHAPE_DEBUG
+    #define POV_SHAPE_DEBUG POV_DEBUG
+#endif
+
 /// @def POV_SUBSURFACE_DEBUG
 /// Enable run-time sanity checks for subsurface light transport.
 ///
@@ -236,18 +245,18 @@ namespace pov
     #define POV_BLEND_MAP_ASSERT(expr) POV_ASSERT_DISABLE(expr)
 #endif
 
-#if POV_SHAPE_DEBUG
-    #define POV_SHAPE_ASSERT(expr) POV_ASSERT_HARD(expr)
-#else
-    #define POV_SHAPE_ASSERT(expr) POV_ASSERT_DISABLE(expr)
-#endif
-
 #if POV_PATTERN_DEBUG
     #define POV_PATTERN_ASSERT(expr) POV_ASSERT_HARD(expr)
 #else
     #define POV_PATTERN_ASSERT(expr) POV_ASSERT_DISABLE(expr)
 #endif
 
+#if POV_PIGMENT_DEBUG
+    #define POV_PIGMENT_ASSERT(expr) POV_ASSERT_HARD(expr)
+#else
+    #define POV_PIGMENT_ASSERT(expr) POV_ASSERT_DISABLE(expr)
+#endif
+
 #if POV_RADIOSITY_DEBUG
     #define POV_RADIOSITY_ASSERT(expr) POV_ASSERT_HARD(expr)
 #else
@@ -266,6 +275,12 @@ namespace pov
     #define POV_REFPOOL_ASSERT(expr) POV_ASSERT_DISABLE(expr)
 #endif
 
+#if POV_SHAPE_DEBUG
+    #define POV_SHAPE_ASSERT(expr) POV_ASSERT_HARD(expr)
+#else
+    #define POV_SHAPE_ASSERT(expr) POV_ASSERT_DISABLE(expr)
+#endif
+
 #if POV_SUBSURFACE_DEBUG
     #define POV_SUBSURFACE_ASSERT(expr) POV_ASSERT_HARD(expr)
 #else

source/core/material/normal.cpp

@@ -838,7 +838,7 @@ void Perturb_Normal(Vector3d& Layer_Normal, const TNORMAL *Tnormal, const Vector
 
     /* No normal_map. */
 
-    if (Tnormal->Type <= LAST_NORM_ONLY_PATTERN)
+    if (Tnormal->Type <= LAST_SPECIAL_NORM_PATTERN)
     {
         Warp_Normal(Layer_Normal,Layer_Normal, Tnormal,
                     Test_Flag(Tnormal,DONT_SCALE_BUMPS_FLAG));
@@ -886,7 +886,6 @@ void Perturb_Normal(Vector3d& Layer_Normal, const TNORMAL *Tnormal, const Vector
 
         UnWarp_Normal(Layer_Normal,Layer_Normal,Tnormal,
                       Test_Flag(Tnormal,DONT_SCALE_BUMPS_FLAG));
-
     }
 
     if ( Intersection )
@@ -983,7 +982,7 @@ static DBL Hermite_Cubic(DBL T1, const Vector2d& UV1, const Vector2d& UV2)
 * DESCRIPTION
 *
 * CHANGES
-*    Added intersectin parameter for UV mapping - NK 1998
+*    Added intersection parameter for UV mapping - NK 1998
 *
 ******************************************************************************/
 

source/core/material/pattern.cpp

@@ -281,6 +281,42 @@ ColourBlendMapConstPtr BasicPattern::GetDefaultBlendMap() const { return gpDefau
 bool BasicPattern::HasSpecialTurbulenceHandling() const { return false; }
 
 
+ImagePatternImpl::ImagePatternImpl() :
+    pImage(NULL)
+{}
+
+ImagePatternImpl::ImagePatternImpl(const ImagePatternImpl& obj) :
+    pImage(obj.pImage ? Copy_Image(obj.pImage) : NULL)
+{}
+
+ImagePatternImpl::~ImagePatternImpl()
+{
+    if (pImage)
+        Destroy_Image(pImage);
+}
+
+
+ColourPattern::ColourPattern() :
+    BasicPattern()
+{}
+
+ColourPattern::ColourPattern(const ColourPattern& obj) :
+    BasicPattern(obj)
+{}
+
+DBL ColourPattern::Evaluate(const Vector3d& EPoint, const Intersection *pIsection, const Ray *pRay, TraceThreadData *pThread) const
+{
+    TransColour colour;
+    if (Evaluate(colour, EPoint, pIsection, pRay, pThread))
+        return colour.Greyscale();
+    else
+        return 0.0;
+}
+
+unsigned int ColourPattern::NumDiscreteBlendMapEntries() const { return 0; }
+bool ColourPattern::CanMap() const { return false; }
+
+
 ContinuousPattern::ContinuousPattern() :
     BasicPattern(),
     waveType(kWaveType_Ramp),
@@ -338,10 +374,17 @@ DBL ContinuousPattern::Evaluate(const Vector3d& EPoint, const Intersection *pIse
 }
 
 unsigned int ContinuousPattern::NumDiscreteBlendMapEntries() const { return 0; }
+bool ContinuousPattern::CanMap() const { return true; }
 
+bool DiscretePattern::CanMap() const { return false; }
 
 unsigned int PlainPattern::NumDiscreteBlendMapEntries() const { return 1; }
 
+unsigned int AveragePattern::NumDiscreteBlendMapEntries() const { return 0; }
+bool AveragePattern::CanMap() const { return true; }
+DBL AveragePattern::Evaluate(const Vector3d& EPoint, const Intersection *pIsection, const Ray *pRay, TraceThreadData *pThread) const { return 0.0; }
+bool AveragePattern::HasSpecialTurbulenceHandling() const { return false; }
+
 
 ColourBlendMapConstPtr AgatePattern::GetDefaultBlendMap() const { return gpDefaultBlendMap_Agate; }
 
@@ -357,6 +400,35 @@ ColourBlendMapConstPtr CubicPattern::GetDefaultBlendMap() const { return gpDefau
 unsigned int CubicPattern::NumDiscreteBlendMapEntries() const { return 6; }
 
 
+bool ColourImagePattern::Evaluate(TransColour& result, const Vector3d& EPoint, const Intersection *pIsection, const Ray *pRay, TraceThreadData *pThread) const
+{
+    // TODO ALPHA - the caller does expect non-premultiplied data, but maybe he could profit from premultiplied data?
+
+    int reg_number;
+    DBL xcoor = 0.0, ycoor = 0.0;
+
+    // If outside map coverage area, return clear
+
+    if (map_pos(EPoint, this, &xcoor, &ycoor))
+    {
+        result = ToTransColour(RGBFTColour(1.0, 1.0, 1.0, 0.0, 1.0));
+        return false;
+    }
+    else
+    {
+        RGBFTColour rgbft;
+        image_colour_at(pImage, xcoor, ycoor, rgbft, &reg_number, false);
+        result = ToTransColour(rgbft);
+        return true;
+    }
+}
+
+bool ColourImagePattern::HasTransparency() const
+{
+    return (!pImage || pImage->Once_Flag || !is_image_opaque(pImage));
+}
+
+
 DensityFilePattern::DensityFilePattern() :
     densityFile(NULL)
 {}
@@ -402,24 +474,6 @@ ColourBlendMapConstPtr HexagonPattern::GetDefaultBlendMap() const { return gpDef
 unsigned int HexagonPattern::NumDiscreteBlendMapEntries() const { return 3; }
 
 
-ImagePattern::ImagePattern() :
-    pImage(NULL)
-{}
-
-ImagePattern::ImagePattern(const ImagePattern& obj) :
-    ContinuousPattern(obj),
-    pImage(NULL)
-{
-    if (obj.pImage)
-        pImage = Copy_Image(obj.pImage);
-}
-
-ImagePattern::~ImagePattern()
-{
-    if (pImage)
-        Destroy_Image(pImage);
-}
-
 DBL ImagePattern::EvaluateRaw(const Vector3d& EPoint, const Intersection *pIsection, const Ray *pRay, TraceThreadData *pThread) const
 {
     return image_pattern(EPoint, this);