mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
Merge branch 'texture2d-index-out-of-range' into 'master'
Fix index out of range in Texture2D See merge request vtk/vtk-m!2954
This commit is contained in:
commit
0c36adc2b8
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:25d61b72591e1ecd66a70e1005cb31a5d37b0bba90bec42288dd41118801000e
|
||||
size 29986
|
||||
oid sha256:137439af2a14dfaab461b07e643fb45dc8e898690f21ca9514cc794dc4afd50a
|
||||
size 30144
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:558028eae0ddb162a3c437b7d12c30857f7b964b3dc9bda601e9750db0813fe5
|
||||
size 31393
|
||||
oid sha256:c62a7084613dddda80f2fb1c869f5adaef9efe50d6762b92b61aebd9692afcd4
|
||||
size 31812
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a879c39ef99c13722da91b7178e41a70ac0aaa5735e7cd201899639464f2f151
|
||||
size 35281
|
||||
oid sha256:bfca08fc98539bb4241c44b47352e95c5b32e7126545d215291d0e51280709c3
|
||||
size 35099
|
||||
|
@ -145,8 +145,8 @@ public:
|
||||
VTKM_EXEC
|
||||
inline ColorType GetLinearFilteredColor(vtkm::Float32 u, vtkm::Float32 v) const
|
||||
{
|
||||
u = u * static_cast<vtkm::Float32>(Width) - 0.5f;
|
||||
v = v * static_cast<vtkm::Float32>(Height) - 0.5f;
|
||||
u = u * static_cast<vtkm::Float32>(Width - 1);
|
||||
v = v * static_cast<vtkm::Float32>(Height - 1);
|
||||
vtkm::Id x = static_cast<vtkm::Id>(vtkm::Floor(u));
|
||||
vtkm::Id y = static_cast<vtkm::Id>(vtkm::Floor(v));
|
||||
vtkm::Float32 uRatio = u - static_cast<vtkm::Float32>(x);
|
||||
|
Loading…
Reference in New Issue
Block a user