Eliminate or clean up a few more instances of dynamic_cast.

Author: c-lipka

source/core/material/pattern.cpp

@@ -486,7 +486,7 @@ bool ColourImagePattern::Evaluate(TransColour& result, const Vector3d& EPoint, c
 
     // If outside map coverage area, return clear
 
-    if (map_pos(EPoint, this, &xcoor, &ycoor))
+    if (map_pos(EPoint, pImage, &xcoor, &ycoor))
     {
         result = ToTransColour(RGBFTColour(1.0, 1.0, 1.0, 0.0, 1.0));
         return false;

source/core/material/pigment.cpp

@@ -14,7 +14,7 @@
 /// ----------------------------------------------------------------------------
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -438,10 +438,8 @@ bool Compute_Pigment (TransColour& colour, const PIGMENT *Pigment, const Vector3
 
                 colour.Clear();
 
-                if (const ColourPattern* pattern = dynamic_cast<ColourPattern*>(Pigment->pattern.get()))
-                    Colour_Found = pattern->Evaluate(colour, TPoint, Intersect, ray, Thread);
-                else
-                    POV_PATTERN_ASSERT(false);
+                POV_PATTERN_ASSERT(dynamic_pointer_cast<ColourPattern>(Pigment->pattern));
+                Colour_Found = static_pointer_cast<ColourPattern>(Pigment->pattern)->Evaluate(colour, TPoint, Intersect, ray, Thread);
 
                 break;
 

source/core/support/imageutil.cpp

@@ -8,7 +8,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -107,64 +107,6 @@ static void InterpolateBicubic(const ImageData *image, DBL xcoor, DBL ycoor, RGB
  * 1. Cylindrical mapping 2. Spherical mapping 3. Torus mapping
  */
 
-/*****************************************************************************
-*
-* FUNCTION
-*
-*   image_map
-*
-* INPUT
-*
-*   EPoint   -- 3-D point at which function is evaluated
-*   Pigment  -- Pattern containing various parameters
-*
-* OUTPUT
-*
-*   Colour   -- color at EPoint
-*
-* RETURNS
-*
-*   int - true,  if current point on the image map
-*         false, if current point is not on the image map
-*
-* AUTHOR
-*
-*   POV-Ray Team
-*
-* DESCRIPTION   : Determines color of a 3-D point from a 2-D bitmap
-*
-* CHANGES
-*
-******************************************************************************/
-
-bool image_map(const Vector3d& EPoint, const PIGMENT *Pigment, TransColour& colour)
-{
-    // 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, Pigment->pattern.get(), &xcoor, &ycoor))
-    {
-        colour = ToTransColour(RGBFTColour(1.0, 1.0, 1.0, 0.0, 1.0));
-        return false;
-    }
-    else
-    {
-        RGBFTColour rgbft;
-        if (const ImagePatternImpl *pattern = dynamic_cast<ImagePatternImpl*>(Pigment->pattern.get()))
-            image_colour_at(pattern->pImage, xcoor, ycoor, rgbft, &reg_number, false);
-        else
-            POV_PATTERN_ASSERT(false);
-        colour = ToTransColour(rgbft);
-        return true;
-    }
-}
-
-
-
 /*****************************************************************************
 *
 * FUNCTION
@@ -199,14 +141,15 @@ TEXTURE *material_map(const Vector3d& EPoint, const TEXTURE *Texture)
      * texture index.
      */
 
-    if(map_pos(EPoint, Texture->pattern.get(), &xcoor, &ycoor))
+    // NB: Can't use `static_cast` here due to multi-inheritance in the pattern class hierarchy.
+    const ImagePatternImpl *pattern = dynamic_cast<ImagePatternImpl*>(Texture->pattern.get());
+    POV_PATTERN_ASSERT(pattern);
+
+    if(map_pos(EPoint, pattern->pImage, &xcoor, &ycoor))
         Material_Number = 0;
     else
     {
-        if (const ImagePatternImpl *pattern = dynamic_cast<ImagePatternImpl*>(Texture->pattern.get()))
-            image_colour_at(pattern->pImage, xcoor, ycoor, colour, &reg_number); // TODO ALPHA - we should decide whether we prefer premultiplied or non-premultiplied alpha
-        else
-            POV_PATTERN_ASSERT(false);
+        image_colour_at(pattern->pImage, xcoor, ycoor, colour, &reg_number); // TODO ALPHA - we should decide whether we prefer premultiplied or non-premultiplied alpha
 
         if(reg_number == -1)
             Material_Number = (int)(colour.red() * 255.0);
@@ -252,15 +195,16 @@ void bump_map(const Vector3d& EPoint, const TNORMAL *Tnormal, Vector3d& normal)
     DBL Amount = Tnormal->Amount;
     const ImageData *image;
 
-    if (const ImagePatternImpl *pattern = dynamic_cast<ImagePatternImpl*>(Tnormal->pattern.get()))
-        image = pattern->pImage;
-    else
-        POV_PATTERN_ASSERT(false);
+    // NB: Can't use `static_cast` here due to multi-inheritance in the pattern class hierarchy.
+    const ImagePatternImpl *pattern = dynamic_cast<ImagePatternImpl*>(Tnormal->pattern.get());
+    POV_PATTERN_ASSERT(pattern);
+
+    image = pattern->pImage;
 
     // going to have to change this
     // need to know if bump point is off of image for all 3 points
 
-    if(map_pos(EPoint, Tnormal->pattern.get(), &xcoor, &ycoor))
+    if(map_pos(EPoint, image, &xcoor, &ycoor))
         return;
     else
         image_colour_at(image, xcoor, ycoor, colour1, &index); // TODO ALPHA - we should decide whether we prefer premultiplied or non-premultiplied alpha
@@ -371,20 +315,20 @@ void bump_map(const Vector3d& EPoint, const TNORMAL *Tnormal, Vector3d& normal)
 *
 ******************************************************************************/
 
-DBL image_pattern(const Vector3d& EPoint, const BasicPattern* pPattern)
+DBL image_pattern(const Vector3d& EPoint, const ImagePattern* pPattern)
 {
     DBL xcoor = 0.0, ycoor = 0.0;
     int index = -1;
     RGBFTColour colour;
-    const ImageData *image = dynamic_cast<const ImagePatternImpl*>(pPattern)->pImage;
+    const ImageData *image = pPattern->pImage;
     DBL Value;
 
     colour.Clear();
 
     // going to have to change this
     // need to know if bump point is off of image for all 3 points
 
-    if(map_pos(EPoint, pPattern, &xcoor, &ycoor))
+    if(map_pos(EPoint, pPattern->pImage, &xcoor, &ycoor))
         return 0.0;
     else
         image_colour_at(image, xcoor, ycoor, colour, &index); // TODO ALPHA - we should decide whether we prefer premultiplied or non-premultiplied alpha
@@ -978,11 +922,9 @@ static int planar_image_map(const Vector3d& EPoint, const ImageData *image, DBL
 *
 ******************************************************************************/
 
-int map_pos(const Vector3d& EPoint, const BasicPattern* pPattern, DBL *xcoor, DBL *ycoor)
+int map_pos(const Vector3d& EPoint, const ImageData* image, DBL *xcoor, DBL *ycoor)
 {
-    const ImageData *image = dynamic_cast<const ImagePatternImpl*>(pPattern)->pImage;
-
-    // Now determine which mapper to use.
+    // Determine which mapper to use.
 
     switch(image->Map_Type)
     {
@@ -1024,7 +966,7 @@ int map_pos(const Vector3d& EPoint, const BasicPattern* pPattern, DBL *xcoor, DB
     }
 
     *xcoor = wrap( *xcoor, (DBL)(image->iwidth));
-    *ycoor = wrap(-*ycoor, (DBL)(image->iheight)); // (Compensate for y coordinates on the images being upsidedown)
+    *ycoor = wrap(-*ycoor, (DBL)(image->iheight)); // (Compensate for y coordinates on the images being upside down)
 
     return (0);
 }

source/core/support/imageutil.h

@@ -9,7 +9,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -48,6 +48,9 @@
 namespace pov
 {
 
+struct ImageData;
+struct ImagePattern;
+
 //##############################################################################
 ///
 /// @defgroup PovCoreSupportImageUtil Image Handling Utilities
@@ -125,15 +128,14 @@ class ImageData
 
 typedef ImageData *ImageDataPtr;
 
-DBL image_pattern(const Vector3d& EPoint, const BasicPattern* pPattern);
-bool image_map(const Vector3d& EPoint, const PIGMENT *Pigment, TransColour& colour);
+DBL image_pattern(const Vector3d& EPoint, const ImagePattern* pPattern); // TODO - move to pattern.cpp
 TEXTURE *material_map(const Vector3d& IPoint, const TEXTURE *Texture);
 void bump_map(const Vector3d& EPoint, const TNORMAL *Tnormal, Vector3d& normal);
 void image_colour_at(const ImageData *image, DBL xcoor, DBL ycoor, RGBFTColour& colour, int *index); // TODO ALPHA - caller should decide whether to prefer premultiplied or non-premultiplied alpha
 void image_colour_at(const ImageData *image, DBL xcoor, DBL ycoor, RGBFTColour& colour, int *index, bool premul);
 HF_VAL image_height_at(const ImageData *image, int x, int y);
 bool is_image_opaque(const ImageData *image);
-int map_pos(const Vector3d& EPoint, const BasicPattern* pPattern, DBL *xcoor, DBL *ycoor);
+int map_pos(const Vector3d& EPoint, const ImageData* pImage, DBL *xcoor, DBL *ycoor);
 ImageData *Copy_Image(ImageData *old);
 ImageData *Create_Image(void);
 void Destroy_Image(ImageData *image);