diff --git a/Framework/Geometry/CMakeLists.txt b/Framework/Geometry/CMakeLists.txt
index a7f83f876faffea2b6cc999440835ace1cc08b0f..b9f358543f071f3cfb83e67b6764b1b013bb230f 100644
--- a/Framework/Geometry/CMakeLists.txt
+++ b/Framework/Geometry/CMakeLists.txt
@@ -391,7 +391,7 @@ set ( TEST_FILES
SampleEnvironmentTest.h
ScalarUtilsTest.h
ShapeFactoryTest.h
- ShapeInfoTest.h
+ ShapeInfoTest.h
SpaceGroupFactoryTest.h
SpaceGroupTest.h
SphereTest.h
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryHandler.h b/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryHandler.h
index b609d821e762dea6f0707445015105a42511fce0..6af71067748490bb9a1c65d2311b3090596d8487 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryHandler.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryHandler.h
@@ -2,11 +2,10 @@
#define GEOMETRYHANDLER_H
#include "MantidGeometry/DllConfig.h"
+#include "MantidGeometry/Rendering/Renderer.h"
#include "MantidGeometry/Rendering/ShapeInfo.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/V3D.h"
-#include <boost/shared_ptr.hpp>
-#include "MantidGeometry/Rendering/GeometryRenderer.h"
#include <vector>
namespace Mantid {
@@ -18,7 +17,9 @@ class MeshObject;
namespace detail {
class GeometryTriangulator;
}
-class GeometryRenderer;
+namespace detail {
+class Renderer;
+}
/**
\class GeometryHandler
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryRenderer.h b/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryRenderer.h
deleted file mode 100644
index 459f8fa81a45e5f69344e39374b02b8250c5f823..0000000000000000000000000000000000000000
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryRenderer.h
+++ /dev/null
@@ -1,135 +0,0 @@
-#ifndef MANTID_GEOMETRY_GEOMETRYRENDERER_H_
-#define MANTID_GEOMETRY_GEOMETRYRENDERER_H_
-
-#include "MantidGeometry/DllConfig.h"
-#include "MantidGeometry/Rendering/OpenGL_Headers.h"
-
-class TopoDS_Shape;
-
-namespace Mantid {
-namespace Kernel {
-class V3D;
-}
-namespace Geometry {
-class RectangularDetector;
-class StructuredDetector;
-class IObjComponent;
-
-/** GeometryRenderer : Handles rendering of geometry within mantid.
-
- Copyright © 2017 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
- National Laboratory & European Spallation Source
-
- This file is part of Mantid.
-
- Mantid is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- Mantid is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- File change history is stored at: <https://github.com/mantidproject/mantid>
- Code Documentation is available at: <http://doxygen.mantidproject.org>
-*/
-class MANTID_GEOMETRY_DLL GeometryRenderer {
-public:
- enum class RenderMode { Basic, Volumetric };
- GeometryRenderer() = default;
- ~GeometryRenderer() = default;
-
- /// General method for rendering geometry
- template <typename... Args>
- void render(RenderMode mode, Args &&... args) const &;
-
- /// Render Basic geometry without transparency (non-volumetric)
- template <typename... Args> void render(Args &&... args) const &;
-
- /// Render IObjComponent
- void renderIObjComponent(IObjComponent *objComp,
- RenderMode mode = RenderMode::Basic) const;
- /// Render Traingulated Surface
- void renderTriangulated(int noPts, int noFaces, double *points, int *faces,
- RenderMode mode = RenderMode::Basic) const;
- /// Render OpenCascade Shape
- void renderOpenCascade(TopoDS_Shape *objSurf,
- RenderMode mode = RenderMode::Basic) const;
- /// Renders a sphere
- void renderSphere(const Kernel::V3D ¢er, double radius,
- RenderMode mode = RenderMode::Basic) const;
- /// Renders a cuboid
- void renderCuboid(const Kernel::V3D &Point1, const Kernel::V3D &Point2,
- const Kernel::V3D &Point3, const Kernel::V3D &Point4,
- RenderMode mode = RenderMode::Basic) const;
- /// Renders a Hexahedron from the input values
- void renderHexahedron(const std::vector<Kernel::V3D> &points,
- RenderMode mode = RenderMode::Basic) const;
- /// Renders a Cone from the input values
- void renderCone(const Kernel::V3D ¢er, const Kernel::V3D &axis,
- double radius, double height,
- RenderMode mode = RenderMode::Basic) const;
- /// Renders a Cylinder/Segmented cylinder from the input values
- void renderCylinder(const Kernel::V3D ¢er, const Kernel::V3D &axis,
- double radius, double height, bool segmented = false,
- RenderMode mode = RenderMode::Basic) const;
- /// Renders a Bitmap (used for rendering RectangularDetector)
- void renderBitmap(const RectangularDetector *rectDet,
- RenderMode mode = RenderMode::Basic) const;
- /// Renders structured geometry (used for rendering StructuredDetector)
- void renderStructured(const StructuredDetector *structDet,
- RenderMode mode = RenderMode::Basic) const;
-
-private:
- mutable RenderMode m_renderMode;
- // general geometry
- /// Render IObjComponent
- void doRender(IObjComponent *ObjComp) const;
- /// Render Traingulated Surface
- void doRender(int noPts, int noFaces, double *points, int *faces) const;
- /// Render OpenCascade Shape
- void doRender(TopoDS_Shape *ObjSurf) const;
-
- // shapes
- /// Renders a sphere
- void doRender(const Kernel::V3D ¢er, double radius) const;
- /// Renders a cuboid
- void doRender(const Kernel::V3D &Point1, const Kernel::V3D &Point2,
- const Kernel::V3D &Point3, const Kernel::V3D &Point4) const;
- /// Renders a Hexahedron from the input values
- void doRender(const std::vector<Kernel::V3D> &points) const;
- /// Renders a Cone from the input values
- void doRender(const Kernel::V3D ¢er, const Kernel::V3D &axis,
- double radius, double height) const;
- /// Renders a Cylinder/Segmented cylinder from the input values
- void doRender(const Kernel::V3D ¢er, const Kernel::V3D &axis,
- double radius, double height, bool segmented) const;
- /// Renders a Bitmap (used for rendering RectangularDetector)
- void doRender(const RectangularDetector *rectDet) const;
- /// Renders structured geometry (used for rendering StructuredDetector)
- void doRender(const StructuredDetector *structDet) const;
-};
-
-template <typename... Args>
-void GeometryRenderer::render(RenderMode mode, Args &&... args) const & {
- // Wait for no OopenGL error
- while (glGetError() != GL_NO_ERROR)
- ;
- m_renderMode = mode;
- doRender(std::forward<Args>(args)...);
-}
-
-template <typename... Args>
-void GeometryRenderer::render(Args &&... args) const & {
- render(RenderMode::Basic, std::forward<Args>(args)...);
-}
-
-} // namespace Geometry
-} // namespace Mantid
-
-#endif /* MANTID_GEOMETRY_RENDERER_H_ */
diff --git a/Framework/Geometry/src/Rendering/GeometryHandler.cpp b/Framework/Geometry/src/Rendering/GeometryHandler.cpp
index d33ad8c2fba09771fd4eeced373cfd39043305d8..0d9a143e33ccf97fd72fb1f0300a2f1c70c338a0 100644
--- a/Framework/Geometry/src/Rendering/GeometryHandler.cpp
+++ b/Framework/Geometry/src/Rendering/GeometryHandler.cpp
@@ -119,4 +119,4 @@ void GeometryHandler::setShapeInfo(detail::ShapeInfo &&shapeInfo) {
m_shapeInfo.reset(new detail::ShapeInfo(std::move(shapeInfo)));
}
} // namespace Geometry
-} // namespace Mantid
\ No newline at end of file
+} // namespace Mantid
diff --git a/Framework/Geometry/src/Rendering/GeometryRenderer.cpp b/Framework/Geometry/src/Rendering/GeometryRenderer.cpp
deleted file mode 100644
index 7a7f07edd137d0fac0c324d5d032024a51cfd789..0000000000000000000000000000000000000000
--- a/Framework/Geometry/src/Rendering/GeometryRenderer.cpp
+++ /dev/null
@@ -1,445 +0,0 @@
-#include "MantidGeometry/Rendering/GeometryRenderer.h"
-#include "MantidGeometry/Instrument/ObjComponent.h"
-#include "MantidGeometry/Instrument/RectangularDetector.h"
-#include "MantidGeometry/Instrument/StructuredDetector.h"
-#include "MantidGeometry/Surfaces/Cone.h"
-#include "MantidGeometry/Surfaces/Cylinder.h"
-#include "MantidGeometry/Surfaces/Sphere.h"
-#include "MantidKernel/Quat.h"
-#include "MantidKernel/WarningSuppressions.h"
-
-// Squash a warning coming out of an OpenCascade header
-#ifdef __INTEL_COMPILER
-#pragma warning disable 191
-#endif
-// Opencascade defines _USE_MATH_DEFINES without checking whether it is already
-// used.
-// Undefine it here before we include the headers to avoid a warning
-#ifdef _MSC_VER
-#undef _USE_MATH_DEFINES
-#ifdef M_SQRT1_2
-#undef M_SQRT1_2
-#endif
-#endif
-
-GCC_DIAG_OFF(conversion)
-// clang-format off
-GCC_DIAG_OFF(cast - qual)
-// clang-format on
-#include <gp_Pnt.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Face.hxx>
-#include <BRep_Tool.hxx>
-#include <TopExp_Explorer.hxx>
-#include <Poly_Array1OfTriangle.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <Poly_Triangulation.hxx>
-GCC_DIAG_ON(conversion)
-// clang-format off
-GCC_DIAG_ON(cast - qual)
-// clang-format on
-
-#ifdef __INTEL_COMPILER
-#pragma warning enable 191
-#endif
-
-namespace Mantid {
-namespace Geometry {
-using Kernel::Quat;
-using Kernel::V3D;
-
-void GeometryRenderer::renderIObjComponent(IObjComponent *objComp,
- RenderMode mode) const {
- render(mode, objComp);
-}
-
-void GeometryRenderer::renderTriangulated(int noPts, int noFaces,
- double *points, int *faces,
- RenderMode mode) const {
- render(mode, noPts, noFaces, points, faces);
-}
-
-void GeometryRenderer::renderOpenCascade(TopoDS_Shape *objSurf,
- RenderMode mode) const {
- render(mode, objSurf);
-}
-
-void GeometryRenderer::renderSphere(const Kernel::V3D ¢er, double radius,
- RenderMode mode) const {
- render(mode, center, radius);
-}
-
-void GeometryRenderer::renderCuboid(const Kernel::V3D &Point1,
- const Kernel::V3D &Point2,
- const Kernel::V3D &Point3,
- const Kernel::V3D &Point4,
- RenderMode mode) const {
- render(mode, Point1, Point2, Point3, Point4);
-}
-
-void GeometryRenderer::renderHexahedron(const std::vector<Kernel::V3D> &points,
- RenderMode mode) const {
- render(mode, points);
-}
-
-void GeometryRenderer::renderCone(const Kernel::V3D ¢er,
- const Kernel::V3D &axis, double radius,
- double height, RenderMode mode) const {
- render(mode, center, axis, radius, height);
-}
-
-void GeometryRenderer::renderCylinder(const Kernel::V3D ¢er,
- const Kernel::V3D &axis, double radius,
- double height, bool segmented,
- RenderMode mode) const {
- render(mode, center, axis, radius, height, segmented);
-}
-
-void GeometryRenderer::renderBitmap(const RectangularDetector *rectDet,
- RenderMode mode) const {
- render(mode, rectDet);
-}
-
-void GeometryRenderer::renderStructured(const StructuredDetector *structDet,
- RenderMode mode) const {
- render(mode, structDet);
-}
-
-// Render IObjectComponent
-void GeometryRenderer::doRender(IObjComponent *ObjComp) const {
- glPushMatrix();
- V3D pos = ObjComp->getPos();
- Quat rot = ObjComp->getRotation();
- double rotGL[16];
- rot.GLMatrix(&rotGL[0]);
- glTranslated(pos[0], pos[1], pos[2]);
- glMultMatrixd(rotGL);
- V3D scaleFactor = ObjComp->getScaleFactor();
- glScaled(scaleFactor[0], scaleFactor[1], scaleFactor[2]);
- ObjComp->drawObject();
- glPopMatrix();
-}
-
-// Render triangulated surface
-void GeometryRenderer::doRender(int noPts, int noFaces, double *points,
- int *faces) const {
- (void)noPts; // Avoid compiler warning
- glBegin(GL_TRIANGLES);
- V3D normal;
- for (int i = 0; i < noFaces; i++) {
- int index1 = faces[i * 3] * 3;
- int index2 = faces[i * 3 + 1] * 3;
- int index3 = faces[i * 3 + 2] * 3;
- // Calculate normal and normalize
- V3D v1(points[index1], points[index1 + 1], points[index1 + 2]);
- V3D v2(points[index2], points[index2 + 1], points[index2 + 2]);
- V3D v3(points[index3], points[index3 + 1], points[index3 + 2]);
- normal = (v1 - v2).cross_prod(v2 - v3);
- normal.normalize();
- glNormal3d(normal[0], normal[1], normal[2]);
- glVertex3dv(points + index1);
- glVertex3dv(points + index2);
- glVertex3dv(points + index3);
- }
- glEnd();
-}
-
-// Render OpenCascade Shape
-void GeometryRenderer::doRender(TopoDS_Shape *ObjSurf) const {
- glBegin(GL_TRIANGLES);
- if ((ObjSurf != nullptr) && !ObjSurf->IsNull()) {
- TopExp_Explorer Ex;
- for (Ex.Init(*ObjSurf, TopAbs_FACE); Ex.More(); Ex.Next()) {
- TopoDS_Face F = TopoDS::Face(Ex.Current());
- TopLoc_Location L;
- Handle(Poly_Triangulation) facing = BRep_Tool::Triangulation(F, L);
- TColgp_Array1OfPnt tab(1, (facing->NbNodes()));
- tab = facing->Nodes();
- Poly_Array1OfTriangle tri(1, facing->NbTriangles());
- tri = facing->Triangles();
- for (Standard_Integer i = 1; i <= (facing->NbTriangles()); i++) {
- Poly_Triangle trian = tri.Value(i);
- Standard_Integer index1, index2, index3;
- trian.Get(index1, index2, index3);
- gp_Pnt point1 = tab.Value(index1);
- gp_Pnt point2 = tab.Value(index2);
- gp_Pnt point3 = tab.Value(index3);
- gp_XYZ pt1 = tab.Value(index1).XYZ();
- gp_XYZ pt2 = tab.Value(index2).XYZ();
- gp_XYZ pt3 = tab.Value(index3).XYZ();
-
- gp_XYZ v1 = pt2 - pt1;
- gp_XYZ v2 = pt3 - pt2;
-
- gp_XYZ normal = v1 ^ v2;
- normal.Normalize();
- glNormal3d(normal.X(), normal.Y(), normal.Z());
- glVertex3d(point1.X(), point1.Y(), point1.Z());
- glVertex3d(point2.X(), point2.Y(), point2.Z());
- glVertex3d(point3.X(), point3.Y(), point3.Z());
- }
- }
- }
- glEnd();
-}
-
-// Render Sphere
-void GeometryRenderer::doRender(const Kernel::V3D ¢er,
- double radius) const {
- // create glu sphere
- GLUquadricObj *qobj = gluNewQuadric();
- gluQuadricDrawStyle(qobj, GLU_FILL);
- gluQuadricNormals(qobj, GL_SMOOTH);
- glPushMatrix();
- glTranslated(center[0], center[1], center[2]);
- gluSphere(qobj, radius, Sphere::g_nslices, Sphere::g_nstacks);
- glPopMatrix();
- gluDeleteQuadric(qobj);
-}
-
-// Render Cuboid
-void GeometryRenderer::doRender(const V3D &Point1, const V3D &Point2,
- const V3D &Point3, const V3D &Point4) const {
- V3D vec0 = Point1;
- V3D vec1 = Point2 - Point1;
- V3D vec2 = Point3 - Point1;
- V3D vec3 = Point4 - Point1;
- V3D vertex[8];
- vertex[0] = vec0;
- vertex[1] = vec0 + vec3;
- vertex[2] = vec0 + vec3 + vec1;
- vertex[3] = vec0 + vec1;
- vertex[4] = vec0 + vec2;
- vertex[5] = vec0 + vec2 + vec3;
- vertex[6] = vec0 + vec2 + vec3 + vec1;
- vertex[7] = vec0 + vec1 + vec2;
-
- int faceindex[6][4] = {
- {0, 1, 2, 3}, // top
- {0, 3, 7, 4}, // left
- {3, 2, 6, 7}, // back
- {2, 1, 5, 6}, // right
- {0, 4, 5, 1}, // front
- {4, 7, 6, 5}, // bottom
- };
- V3D normal;
- // first face
- glBegin(GL_QUADS);
- for (auto &row : faceindex) {
- normal = (vertex[row[0]] - vertex[row[1]])
- .cross_prod((vertex[row[0]] - vertex[row[2]]));
- normal.normalize();
- glNormal3d(normal[0], normal[1], normal[2]);
- for (const int ij : row) {
- if (ij == 0)
- glTexCoord2i(0, 0);
- if (ij == 1)
- glTexCoord2i(1, 0);
- if (ij == 2)
- glTexCoord2i(1, 1);
- if (ij == 3)
- glTexCoord2i(0, 1);
- if (ij == 4)
- glTexCoord2i(0, 0);
- if (ij == 5)
- glTexCoord2i(1, 0);
- if (ij == 6)
- glTexCoord2i(1, 1);
- if (ij == 7)
- glTexCoord2i(0, 1);
- glVertex3d(vertex[ij][0], vertex[ij][1], vertex[ij][2]);
- }
- }
- glEnd();
-}
-
-// Render Hexahedron
-void GeometryRenderer::doRender(const std::vector<Kernel::V3D> &points) const {
- glBegin(GL_QUADS);
- // bottom
- glVertex3d(points[0].X(), points[0].Y(), points[0].Z());
- glVertex3d(points[1].X(), points[1].Y(), points[1].Z());
- glVertex3d(points[2].X(), points[2].Y(), points[2].Z());
- glVertex3d(points[3].X(), points[3].Y(), points[3].Z());
- // front
- glVertex3d(points[1].X(), points[1].Y(), points[1].Z());
- glVertex3d(points[5].X(), points[5].Y(), points[5].Z());
- glVertex3d(points[6].X(), points[6].Y(), points[6].Z());
- glVertex3d(points[2].X(), points[2].Y(), points[2].Z());
- // right
- glVertex3d(points[2].X(), points[2].Y(), points[2].Z());
- glVertex3d(points[6].X(), points[6].Y(), points[6].Z());
- glVertex3d(points[7].X(), points[7].Y(), points[7].Z());
- glVertex3d(points[3].X(), points[3].Y(), points[3].Z());
- // back
- glVertex3d(points[3].X(), points[3].Y(), points[3].Z());
- glVertex3d(points[7].X(), points[7].Y(), points[7].Z());
- glVertex3d(points[4].X(), points[4].Y(), points[4].Z());
- glVertex3d(points[0].X(), points[0].Y(), points[0].Z());
- // left
- glVertex3d(points[0].X(), points[0].Y(), points[0].Z());
- glVertex3d(points[4].X(), points[4].Y(), points[4].Z());
- glVertex3d(points[5].X(), points[5].Y(), points[5].Z());
- glVertex3d(points[1].X(), points[1].Y(), points[1].Z());
- // top
- glVertex3d(points[4].X(), points[4].Y(), points[4].Z());
- glVertex3d(points[5].X(), points[5].Y(), points[5].Z());
- glVertex3d(points[6].X(), points[6].Y(), points[6].Z());
- glVertex3d(points[7].X(), points[7].Y(), points[7].Z());
-
- glEnd();
-}
-
-// Render Cone
-void GeometryRenderer::doRender(const Kernel::V3D ¢er,
- const Kernel::V3D &axis, double radius,
- double height) const {
- glPushMatrix();
- GLUquadricObj *qobj = gluNewQuadric();
- gluQuadricDrawStyle(qobj, GLU_FILL);
- gluQuadricNormals(qobj, GL_SMOOTH);
- glTranslated(center[0], center[1], center[2]);
- GLdouble mat[16];
- V3D unit(0, 0, 1);
- Quat rot(unit, axis);
- rot.GLMatrix(&mat[0]);
- glMultMatrixd(mat);
- gluCylinder(qobj, 0, radius, height, Geometry::Cone::g_nslices,
- Geometry::Cone::g_nstacks);
- glTranslated(0.0, 0.0, height);
- gluDisk(qobj, 0, radius, Geometry::Cone::g_nslices, 1);
- glPopMatrix();
-}
-
-// Render Cylinder
-void GeometryRenderer::doRender(const Kernel::V3D ¢er,
- const Kernel::V3D &axis, double radius,
- double height, bool segmented) const {
- GLUquadricObj *qobj = gluNewQuadric();
- gluQuadricDrawStyle(qobj, GLU_FILL);
- gluQuadricNormals(qobj, GL_SMOOTH);
- gluQuadricTexture(qobj, true);
- glPushMatrix();
- glTranslated(center[0], center[1], center[2]);
- GLdouble mat[16];
- V3D unit(0, 0, 1);
- Quat rot(unit, axis);
- rot.GLMatrix(&mat[0]);
- glMultMatrixd(mat);
- gluCylinder(qobj, radius, radius, height, Cylinder::g_nslices,
- segmented ? 1 : Cylinder::g_nstacks);
- gluQuadricTexture(qobj, false);
- gluDisk(qobj, 0, radius, Cylinder::g_nslices, 1);
- glTranslated(0.0, 0.0, height);
- gluDisk(qobj, 0, radius, Cylinder::g_nslices, 1);
- glPopMatrix();
-}
-
-// Render Bitmap for RectangularDetector
-void GeometryRenderer::doRender(const RectangularDetector *rectDet) const {
- // Because texture colours are combined with the geometry colour
- // make sure the current colour is white
- glColor3f(1.0f, 1.0f, 1.0f);
-
- // Nearest-neighbor scaling
- GLint texParam = GL_NEAREST;
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, texParam);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, texParam);
-
- glEnable(GL_TEXTURE_2D); // enable texture mapping
-
- int texx, texy;
- rectDet->getTextureSize(texx, texy);
- double tex_frac_x = (1.0 * rectDet->xpixels()) / (texx);
- double tex_frac_y = (1.0 * rectDet->ypixels()) / (texy);
-
- glBegin(GL_QUADS);
-
- glTexCoord2f(0.0, 0.0);
- V3D pos;
- pos = rectDet->getRelativePosAtXY(0, 0);
- pos += V3D(rectDet->xstep() * (-0.5), rectDet->ystep() * (-0.5),
- 0.0); // Adjust to account for the size of a pixel
- glVertex3f(static_cast<GLfloat>(pos.X()), static_cast<GLfloat>(pos.Y()),
- static_cast<GLfloat>(pos.Z()));
-
- glTexCoord2f(static_cast<GLfloat>(tex_frac_x), 0.0);
- pos = rectDet->getRelativePosAtXY(rectDet->xpixels() - 1, 0);
- pos += V3D(rectDet->xstep() * (+0.5), rectDet->ystep() * (-0.5),
- 0.0); // Adjust to account for the size of a pixel
- glVertex3f(static_cast<GLfloat>(pos.X()), static_cast<GLfloat>(pos.Y()),
- static_cast<GLfloat>(pos.Z()));
-
- glTexCoord2f(static_cast<GLfloat>(tex_frac_x),
- static_cast<GLfloat>(tex_frac_y));
- pos = rectDet->getRelativePosAtXY(rectDet->xpixels() - 1,
- rectDet->ypixels() - 1);
- pos += V3D(rectDet->xstep() * (+0.5), rectDet->ystep() * (+0.5),
- 0.0); // Adjust to account for the size of a pixel
- glVertex3f(static_cast<GLfloat>(pos.X()), static_cast<GLfloat>(pos.Y()),
- static_cast<GLfloat>(pos.Z()));
-
- glTexCoord2f(0.0, static_cast<GLfloat>(tex_frac_y));
- pos = rectDet->getRelativePosAtXY(0, rectDet->ypixels() - 1);
- pos += V3D(rectDet->xstep() * (-0.5), rectDet->ystep() * (+0.5),
- 0.0); // Adjust to account for the size of a pixel
- glVertex3f(static_cast<GLfloat>(pos.X()), static_cast<GLfloat>(pos.Y()),
- static_cast<GLfloat>(pos.Z()));
-
- glEnd();
- if (glGetError() > 0)
- std::cout << "OpenGL error in BitmapGeometryHandler::render \n";
-
- glDisable(
- GL_TEXTURE_2D); // stop texture mapping - not sure if this is necessary.
-}
-
-void GeometryRenderer::doRender(const StructuredDetector *structDet) const {
- auto xVerts = structDet->getXValues();
- auto yVerts = structDet->getYValues();
- auto r = structDet->getR();
- auto g = structDet->getG();
- auto b = structDet->getB();
-
- if (xVerts.size() != yVerts.size())
- return;
-
- auto w = structDet->xPixels() + 1;
- auto h = structDet->yPixels() + 1;
-
- glBegin(GL_QUADS);
-
- for (size_t iy = 0; iy < h - 1; iy++) {
- for (size_t ix = 0; ix < w - 1; ix++) {
-
- glColor3ub((GLubyte)r[(iy * (w - 1)) + ix],
- (GLubyte)g[(iy * (w - 1)) + ix],
- (GLubyte)b[(iy * (w - 1)) + ix]);
- V3D pos;
- pos = V3D(xVerts[(iy * w) + ix + w], yVerts[(iy * w) + ix + w], 0.0);
- glVertex3f(static_cast<GLfloat>(pos.X()), static_cast<GLfloat>(pos.Y()),
- static_cast<GLfloat>(pos.Z()));
- pos = V3D(xVerts[(iy * w) + ix + w + 1], yVerts[(iy * w) + ix + w + 1],
- 0.0);
- glVertex3f(static_cast<GLfloat>(pos.X()), static_cast<GLfloat>(pos.Y()),
- static_cast<GLfloat>(pos.Z()));
- pos = V3D(xVerts[(iy * w) + ix + 1], yVerts[(iy * w) + ix + 1], 0.0);
- glVertex3f(static_cast<GLfloat>(pos.X()), static_cast<GLfloat>(pos.Y()),
- static_cast<GLfloat>(pos.Z()));
- pos = V3D(xVerts[(iy * w) + ix], yVerts[(iy * w) + ix], 0.0);
- glVertex3f(static_cast<GLfloat>(pos.X()), static_cast<GLfloat>(pos.Y()),
- static_cast<GLfloat>(pos.Z()));
- }
- }
-
- glEnd();
-
- if (glGetError() > 0)
- std::cout << "OpenGL error in StructuredGeometryHandler::render \n";
-
- glDisable(
- GL_TEXTURE_2D); // stop texture mapping - not sure if this is necessary.
-}
-} // namespace Geometry
-} // namespace Mantid
diff --git a/Framework/Geometry/src/Rendering/ShapeInfo.cpp b/Framework/Geometry/src/Rendering/ShapeInfo.cpp
index 3d595d3fecc6810ef77e80f8017f6dced6e75ab9..86739b0b0bb8c33c12800f18375563e1173ee1bd 100644
--- a/Framework/Geometry/src/Rendering/ShapeInfo.cpp
+++ b/Framework/Geometry/src/Rendering/ShapeInfo.cpp
@@ -64,6 +64,11 @@ void ShapeInfo::setCone(const V3D &c, const V3D &a, double r, double h) {
m_height = h;
}
+bool ShapeInfo::operator==(const ShapeInfo &other) {
+ return m_shape == other.m_shape && m_height == other.m_height &&
+ m_radius == other.m_radius && m_points == other.m_points;
+}
+
bool ShapeInfo::operator==(const ShapeInfo &other) {
return m_shape == other.m_shape && m_height == other.m_height &&
m_radius == other.m_radius && m_points == other.m_points;
diff --git a/Framework/Geometry/test/ShapeInfoTest.h b/Framework/Geometry/test/ShapeInfoTest.h
index 34f7029c25a447567069d17b3dfe7a3f57ef9d9f..573a8b5f8394143442be882c2cdbe7de7b8795be 100644
--- a/Framework/Geometry/test/ShapeInfoTest.h
+++ b/Framework/Geometry/test/ShapeInfoTest.h
@@ -135,4 +135,4 @@ public:
TS_ASSERT_EQUALS(shapeInfo2, m_shapeInfo);
TS_ASSERT_DIFFERS(shapeInfo3, m_shapeInfo);
}
-};
\ No newline at end of file
+};