Commit 2c27acae authored by Ben Boeckel's avatar Ben Boeckel

Rendering/Core: use VTK_SIZEHINT

parent 66c28079
......@@ -50,7 +50,7 @@ public:
* (xmin,xmax, ymin,ymax, zmin,zmax).
* Update this->Bounds as a side effect.
*/
virtual double *GetBounds() = 0;
virtual double *GetBounds() VTK_SIZEHINT(6) = 0;
/**
* Get the bounds for this mapper as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
......@@ -61,7 +61,7 @@ public:
/**
* Return the Center of this mapper's data.
*/
double *GetCenter();
double *GetCenter() VTK_SIZEHINT(3);
void GetCenter(double center[3])
{
double *rc = this->GetCenter();
......
......@@ -54,7 +54,7 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetBounds(double bounds[6]) override
{ this->vtkAbstractMapper3D::GetBounds(bounds); };
//@}
......
......@@ -155,7 +155,7 @@ public:
* method GetBounds(double bounds[6]) is available from the superclass.)
*/
using Superclass::GetBounds;
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
/**
* Apply the current properties to all parts that compose this actor.
......
......@@ -149,7 +149,7 @@ public:
*/
void GetBounds(double bounds[6])
{ this->vtkProp3D::GetBounds( bounds ); }
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
/**
* Override default GetMTime method to also consider all of the
......
......@@ -609,8 +609,8 @@ public:
/**
* Get the orientation of the camera.
*/
double *GetOrientation();
double *GetOrientationWXYZ();
double *GetOrientation() VTK_SIZEHINT(3);
double *GetOrientationWXYZ() VTK_SIZEHINT(4);
//@}
/**
......
......@@ -103,7 +103,7 @@ public:
/**
* Returns an RGB color for the specified scalar value
*/
double *GetColor(double x) {
double *GetColor(double x) VTK_SIZEHINT(3) {
return vtkScalarsToColors::GetColor(x); }
void GetColor(double x, double rgb[3]) override;
......@@ -135,7 +135,7 @@ public:
/**
* Returns min and max position of all function points.
*/
double* GetRange() override { return this->Range; }
double* GetRange() VTK_SIZEHINT(2) override { return this->Range; }
virtual void GetRange(double& arg1, double& arg2)
{
arg1 = this->Range[0];
......
......@@ -55,7 +55,7 @@ public:
/**
* Standard vtkProp method to get 3D bounds of a 3D prop
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetBounds(double bounds[6]) override { this->Superclass::GetBounds( bounds ); };
//@}
......
......@@ -142,22 +142,22 @@ public:
/**
* Return the computed value in a specified coordinate system.
*/
double *GetComputedWorldValue(vtkViewport *);
int *GetComputedViewportValue(vtkViewport *);
int *GetComputedDisplayValue(vtkViewport *);
int *GetComputedLocalDisplayValue(vtkViewport *);
double *GetComputedWorldValue(vtkViewport *) VTK_SIZEHINT(3);
int *GetComputedViewportValue(vtkViewport *) VTK_SIZEHINT(2);
int *GetComputedDisplayValue(vtkViewport *) VTK_SIZEHINT(2);
int *GetComputedLocalDisplayValue(vtkViewport *) VTK_SIZEHINT(2);
//@}
double *GetComputedDoubleViewportValue(vtkViewport *);
double *GetComputedDoubleDisplayValue(vtkViewport *);
double *GetComputedDoubleViewportValue(vtkViewport *) VTK_SIZEHINT(2);
double *GetComputedDoubleDisplayValue(vtkViewport *) VTK_SIZEHINT(2);
/**
* GetComputedValue() will return either World, Viewport or
* Display based on what has been set as the coordinate system.
* This is good for objects like vtkLineSource, where the
* user might want to use them as World or Viewport coordinates
* user might want to use them as World or Viewport coordinates.
*/
double *GetComputedValue(vtkViewport *);
double *GetComputedValue(vtkViewport *) VTK_SIZEHINT(3);
/**
* GetComputedUserDefinedValue() is to be used only when
......@@ -166,7 +166,7 @@ public:
* when set as the TransformCoordinate in 2D-Mappers, the user
* can customize display of 2D polygons
*/
virtual double *GetComputedUserDefinedValue(vtkViewport *)
virtual double *GetComputedUserDefinedValue(vtkViewport *) VTK_SIZEHINT(3)
{ return this->Value; }
protected:
......
......@@ -251,7 +251,7 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetBounds(double* bounds) override
{ Superclass::GetBounds(bounds); }
......
......@@ -91,7 +91,7 @@ public:
void SetDisplayExtent(int minX, int maxX, int minY, int maxY,
int minZ, int maxZ);
void GetDisplayExtent(int extent[6]);
int *GetDisplayExtent() {return this->DisplayExtent;}
int *GetDisplayExtent() VTK_SIZEHINT(6) {return this->DisplayExtent;}
//@}
//@{
......@@ -101,7 +101,7 @@ public:
* In either case the bounds is expressed as a 6-vector
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetBounds(double bounds[6]) { this->Superclass::GetBounds(bounds); };
//@}
......
......@@ -68,7 +68,7 @@ public:
/**
* Standard vtkProp method to get 3D bounds of a 3D prop
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetBounds(double bounds[6])
{ this->vtkProp3D::GetBounds( bounds ); }
......
......@@ -200,7 +200,7 @@ public:
*/
void GetTransformedPosition(double &a0, double &a1, double &a2);
void GetTransformedPosition(double a[3]);
double *GetTransformedPosition();
double *GetTransformedPosition() VTK_SIZEHINT(3);
//@}
//@{
......@@ -210,7 +210,7 @@ public:
*/
void GetTransformedFocalPoint(double &a0, double &a1, double &a2);
void GetTransformedFocalPoint(double a[3]);
double *GetTransformedFocalPoint();
double *GetTransformedFocalPoint() VTK_SIZEHINT(3);
//@}
//@{
......
......@@ -418,7 +418,7 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetBounds(double bounds[6]) override
{ this->vtkAbstractMapper3D::GetBounds(bounds); }
......
......@@ -92,7 +92,7 @@ public:
* Return bounding box (array of six doubles) of data expressed as
* (xmin,xmax, ymin,ymax, zmin,zmax).
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetBounds(double bounds[6]) override
{ this->Superclass::GetBounds(bounds); }
......
......@@ -121,7 +121,7 @@ public:
* Get the bounds for this Prop as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
* in world coordinates. NULL means that the bounds are not defined.
*/
virtual double *GetBounds()
virtual double *GetBounds() VTK_SIZEHINT(6)
{ return nullptr; }
/**
......
......@@ -181,28 +181,28 @@ public:
* Get the bounds for this Prop3D as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
*/
void GetBounds(double bounds[6]);
double *GetBounds() override = 0;
double *GetBounds() VTK_SIZEHINT(6) override = 0;
//@}
/**
* Get the center of the bounding box in world coordinates.
*/
double *GetCenter();
double *GetCenter() VTK_SIZEHINT(3);
/**
* Get the Prop3D's x range in world coordinates.
*/
double *GetXRange();
double *GetXRange() VTK_SIZEHINT(2);
/**
* Get the Prop3D's y range in world coordinates.
*/
double *GetYRange();
double *GetYRange() VTK_SIZEHINT(2);
/**
* Get the Prop3D's z range in world coordinates.
*/
double *GetZRange();
double *GetZRange() VTK_SIZEHINT(2);
/**
* Get the length of the diagonal of the bounding box.
......@@ -265,14 +265,14 @@ public:
* same matrix is RotateZ, RotateX, and finally RotateY. See also
* SetOrientation.
*/
double *GetOrientation();
double *GetOrientation() VTK_SIZEHINT(3);
void GetOrientation(double orentation[3]);
//@}
/**
* Returns the WXYZ orientation of the Prop3D.
*/
double *GetOrientationWXYZ();
double *GetOrientationWXYZ() VTK_SIZEHINT(4);
/**
* Add to the current orientation. See SetOrientation and
......
......@@ -101,7 +101,7 @@ public:
* Get the bounds for this prop assembly as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
* May return NULL in some cases (meaning the bounds is undefined).
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
/**
* Shallow copy of this vtkPropAssembly.
......
......@@ -171,7 +171,7 @@ public:
*/
virtual void SetColor(double r, double g, double b);
virtual void SetColor(double a[3]);
double *GetColor();
double *GetColor() VTK_SIZEHINT(3);
void GetColor(double rgb[3]);
void GetColor(double &r, double &g, double &b);
//@}
......
......@@ -338,7 +338,7 @@ public:
/**
* Wrapper-friendly version of ComputeVisiblePropBounds
*/
double *ComputeVisiblePropBounds();
double *ComputeVisiblePropBounds() VTK_SIZEHINT(6);
/**
* Reset the camera clipping range based on the bounds of the
......
......@@ -81,7 +81,7 @@ public:
/**
* Get the bounds for this Prop3D as (Xmin,Xmax,Ymin,Ymax,Zmin,Zmax).
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetBounds(double bounds[6]) {this->vtkProp3D::GetBounds( bounds );}
/**
......
......@@ -187,7 +187,7 @@ public:
/**
* Return the center of this viewport in display coordinates.
*/
virtual double *GetCenter();
virtual double *GetCenter() VTK_SIZEHINT(2);
/**
* Is a given display point in this Viewport's viewport.
......@@ -257,8 +257,8 @@ public:
* if the window has not yet been realized, GetSize() and GetOrigin()
* return (0,0).
*/
virtual int *GetSize();
virtual int *GetOrigin();
virtual int *GetSize() VTK_SIZEHINT(2);
virtual int *GetOrigin() VTK_SIZEHINT(2);
void GetTiledSize(int *width, int *height);
virtual void GetTiledSizeAndOrigin(int *width, int *height,
int *lowerLeftX, int *lowerLeftY);
......
......@@ -87,7 +87,7 @@ public:
* Get the bounds - either all six at once
* (xmin, xmax, ymin, ymax, zmin, zmax) or one at a time.
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetBounds(double bounds[6])
{ this->vtkProp3D::GetBounds(bounds); }
double GetMinXBound();
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment