Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix multiple warnings about unused params and precision loss

Browse Source
This commit is contained in:
Kenneth Moreland 2016-05-19 17:15:06 -06:00
parent ee73ab96a8
commit 68c18b2e38
10 changed files with 223 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/rendering/RenderSurfaceGL.h
View File

@ -162,7 +162,7 @@ public:
for (std::size_t xIndex=0; xIndex < this->Width; xIndex++)
{
const vtkm::Float32 *tuple =
&(this->ColorBuffer[yIndex*this->Width*4 + xIndex*4]);
&(this->ColorBuffer[static_cast<std::size_t>(yIndex)*this->Width*4 + xIndex*4]);
of<<(unsigned char)(tuple[0]*255);
of<<(unsigned char)(tuple[1]*255);
of<<(unsigned char)(tuple[2]*255);

5
vtkm/rendering/RenderSurfaceRayTracer.h
View File

@ -86,7 +86,7 @@ public:
for (std::size_t xIndex=0; xIndex < this->Width; xIndex++)
{
const vtkm::Float32 *tuple =
&(this->ColorBuffer[yIndex*this->Width*4 + xIndex*4]);
&(this->ColorBuffer[static_cast<std::size_t>(yIndex)*this->Width*4 + xIndex*4]);
of<<(unsigned char)(tuple[0]*255);
of<<(unsigned char)(tuple[1]*255);
of<<(unsigned char)(tuple[2]*255);
@ -99,7 +99,8 @@ public:
this->ColorArray = vtkm::cont::make_ArrayHandle(this->ColorBuffer);
this->DepthArray = vtkm::cont::make_ArrayHandle(this->DepthBuffer);
vtkm::worklet::DispatcherMapField< ClearBuffers >(
ClearBuffers( this->BackgroundColor, this->Width*this->Height ) )
ClearBuffers( this->BackgroundColor,
static_cast<vtkm::Int32>(this->Width*this->Height) ) )
.Invoke( this->DepthArray,
vtkm::exec::ExecutionWholeArray<vtkm::Float32>(this->ColorArray) );
}

2
vtkm/rendering/SceneRenderer.h
View File

@ -80,7 +80,7 @@ public:
virtual void EndScene()
{
}
virtual void SetRenderSurface(RenderSurface *surface)
virtual void SetRenderSurface(RenderSurface *vtkmNotUsed(surface))
{
}
protected:

2
vtkm/rendering/SceneRendererRayTracer.h
View File

@ -69,7 +69,7 @@ public:
void RenderCells(const vtkm::cont::DynamicCellSet &cellset,
const vtkm::cont::CoordinateSystem &coords,
vtkm::cont::Field &scalarField,
const vtkm::rendering::ColorTable &colorTable,
const vtkm::rendering::ColorTable &vtkmNotUsed(colorTable),
vtkm::rendering::View &view,
vtkm::Float64 *scalarBounds)
{

2
vtkm/rendering/SceneRendererVolume.h
View File

@ -78,8 +78,6 @@ public:
vtkm::Float64 coordsBounds[6]; // Xmin,Xmax,Ymin..
coords.GetBounds(coordsBounds,DeviceAdapter());
bool isExplicit = false;
bool isUniform = false;
if(!cellset.IsSameType(vtkm::cont::CellSetStructured<3>()))
{
std::cerr<<"ERROR cell set type not currently supported\n";

6
vtkm/rendering/raytracing/BoundingVolumeHierarchy.h
View File

@ -429,9 +429,9 @@ public:
}
vtkm::Vec<vtkm::Float32,4> fourth4Vec;
vtkm::Int32 leftChild = (childVector[0] >= 0) ? childVector[0] * 4 : childVector[0];
vtkm::Int32 leftChild = static_cast<vtkm::Int32>((childVector[0] >= 0) ? childVector[0] * 4 : childVector[0]);
memcpy(&fourth4Vec[0],&leftChild,4);
vtkm::Int32 rightChild = (childVector[1] >= 0) ? childVector[1] * 4 : childVector[1];
vtkm::Int32 rightChild = static_cast<vtkm::Int32>((childVector[1] >= 0) ? childVector[1] * 4 : childVector[1]);
memcpy(&fourth4Vec[1],&rightChild,4);
FlatBVH.Set(currentNodeOffset+3,fourth4Vec);
}
@ -846,7 +846,7 @@ public:
vtkm::worklet::DispatcherMapField<PropagateAABBs>( PropagateAABBs(bvh.parent,
bvh.leftChild,
bvh.rightChild,
bvh.GetNumberOfPrimitives(),
primitiveCount,
linearBVH.FlatBVH,
atomicCounters ))
.Invoke(vtkm::exec::ExecutionWholeArrayConst<vtkm::Float32>(*bvh.xmins),

12
vtkm/rendering/raytracing/Camera.h
View File

@ -88,8 +88,8 @@ public:
if(index >= NumPixels) return;
vtkm::Float32 depth = (Proj22 + Proj23 / (-inDepth)) / Proj32;
depth = 0.5f * depth + 0.5f;
vtkm::Int32 x = index % SubsetWidth;
vtkm::Int32 y = index / SubsetWidth;
vtkm::Int32 x = static_cast<vtkm::Int32>(index % SubsetWidth);
vtkm::Int32 y = static_cast<vtkm::Int32>(index / SubsetWidth);
x += Xmin;
y += Ymin;
vtkm::Id outIdx = vtkm::Id(y * Width + x);
@ -586,10 +586,10 @@ private:
xmax += .001f;
ymin -= .001f;
ymax += .001f;
xmin = floor(vtkm::Min(vtkm::Max(0.f, xmin),vtkm::Float32(this->Width) ));
xmax = ceil(vtkm::Min(vtkm::Max(0.f, xmax),vtkm::Float32(this->Width) ));
ymin = floor(vtkm::Min(vtkm::Max(0.f, ymin),vtkm::Float32(this->Height) ));
ymax = ceil(vtkm::Min(vtkm::Max(0.f, ymax),vtkm::Float32(this->Height) ));
xmin = vtkm::Floor(vtkm::Min(vtkm::Max(0.f, xmin),vtkm::Float32(this->Width) ));
xmax = vtkm::Ceil(vtkm::Min(vtkm::Max(0.f, xmax),vtkm::Float32(this->Width) ));
ymin = vtkm::Floor(vtkm::Min(vtkm::Max(0.f, ymin),vtkm::Float32(this->Height) ));
ymax = vtkm::Ceil(vtkm::Min(vtkm::Max(0.f, ymax),vtkm::Float32(this->Height) ));
//printf("Pixel range = (%f,%f,%f), (%f,%f,%f)\n", xmin, ymin,zmin, xmax,ymax,zmax);
vtkm::Int32 dx = vtkm::Int32(xmax) - vtkm::Int32(xmin);
vtkm::Int32 dy = vtkm::Int32(ymax) - vtkm::Int32(ymin);

2
vtkm/rendering/raytracing/Ray.h
View File

@ -37,7 +37,7 @@ public:
VTKM_CONT_EXPORT
virtual ~RayBase(){}
VTKM_CONT_EXPORT
virtual void resize(const vtkm::Int32 newSize){}
virtual void resize(const vtkm::Int32 vtkmNotUsed(newSize)){}
};
template<typename DeviceAdapter>
class Ray : public RayBase

10
vtkm/rendering/raytracing/VolumeRendererStructured.h
View File

@ -357,9 +357,9 @@ public:
*/
bool newCell = true;
//check to see if we left the cell
vtkm::Float32 deltaTx = SampleDistance * rayDir[0] * InvSpacing[0];
vtkm::Float32 deltaTy = SampleDistance * rayDir[1] * InvSpacing[1];
vtkm::Float32 deltaTz = SampleDistance * rayDir[2] * InvSpacing[2];
// vtkm::Float32 deltaTx = SampleDistance * rayDir[0] * InvSpacing[0];
// vtkm::Float32 deltaTy = SampleDistance * rayDir[1] * InvSpacing[1];
// vtkm::Float32 deltaTz = SampleDistance * rayDir[2] * InvSpacing[2];
vtkm::Float32 tx = 2.f;
vtkm::Float32 ty = 2.f;
vtkm::Float32 tz = 2.f;
@ -478,7 +478,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField
bool notFound = true;
while(notFound)
{
vtkm::Id nextPoint = cell[dim] + searchDir;
vtkm::Id nextPoint = cell[dim] + static_cast<vtkm::Id>(searchDir);
bool validPoint = true;
if(nextPoint < 0 || nextPoint > PointDimensions[dim]) validPoint = false;
if( validPoint && (CoordPortals[dim].Get( nextPoint ) * searchDir < point[dim] * searchDir))
@ -686,7 +686,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField
bool notFound = true;
while(notFound)
{
vtkm::Id nextPoint = cell[dim] + searchDir;
vtkm::Id nextPoint = cell[dim] + static_cast<vtkm::Id>(searchDir);
bool validPoint = true;
if(nextPoint < 0 || nextPoint > PointDimensions[dim]) validPoint = false;
if( validPoint && (CoordPortals[dim].Get( nextPoint ) * searchDir < point[dim] * searchDir))

13
vtkm/rendering/testing/UnitTestSceneRendererOSMesa.cxx
View File

@ -68,12 +68,13 @@ void Set2DView(vtkm::rendering::View &view,
vtkm::Float64 coordsBounds[6]; // Xmin,Xmax,Ymin..
coords.GetBounds(coordsBounds,VTKM_DEFAULT_DEVICE_ADAPTER_TAG());
//set up a default view
vtkm::Vec<vtkm::Float32,3> totalExtent;
totalExtent[0] = vtkm::Float32(coordsBounds[1] - coordsBounds[0]);
totalExtent[1] = vtkm::Float32(coordsBounds[3] - coordsBounds[2]);
totalExtent[2] = vtkm::Float32(coordsBounds[5] - coordsBounds[4]);
vtkm::Float32 mag = vtkm::Magnitude(totalExtent);
vtkm::Normalize(totalExtent);
// totalExtent does not seem to be used
// vtkm::Vec<vtkm::Float32,3> totalExtent;
// totalExtent[0] = vtkm::Float32(coordsBounds[1] - coordsBounds[0]);
// totalExtent[1] = vtkm::Float32(coordsBounds[3] - coordsBounds[2]);
// totalExtent[2] = vtkm::Float32(coordsBounds[5] - coordsBounds[4]);
// vtkm::Float32 mag = vtkm::Magnitude(totalExtent);
// vtkm::Normalize(totalExtent);
view = vtkm::rendering::View(vtkm::rendering::View::VIEW_2D);
view.View2d.Left = static_cast<vtkm::Float32>(coordsBounds[0]);