gwm17/implot
1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-10-09 15:47:26 -04:00
Code Issues Projects Releases Wiki Activity

fix casts in Getters

Browse Source
This commit is contained in:
epezent 2020-08-31 11:38:37 -05:00
parent 02e3226e51
commit 92f787944c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
implot_items.cpp
View File

@ -65,7 +65,7 @@ struct GetterYs {
int Offset; int Offset;
int Stride; int Stride;
inline ImPlotPoint operator()(int idx) { inline ImPlotPoint operator()(int idx) {
return ImPlotPoint((T)idx, OffsetAndStride(Ys, idx, Count, Offset, Stride)); return ImPlotPoint((double)idx, (double)OffsetAndStride(Ys, idx, Count, Offset, Stride));
} }
}; };
@ -84,7 +84,7 @@ struct GetterXsYs {
int Offset; int Offset;
int Stride; int Stride;
inline ImPlotPoint operator()(int idx) { inline ImPlotPoint operator()(int idx) {
return ImPlotPoint(OffsetAndStride(Xs, idx, Count, Offset, Stride), OffsetAndStride(Ys, idx, Count, Offset, Stride)); return ImPlotPoint((double)OffsetAndStride(Xs, idx, Count, Offset, Stride), (double)OffsetAndStride(Ys, idx, Count, Offset, Stride));
} }
}; };
@ -93,7 +93,7 @@ template <typename T>
struct GetterYRef { struct GetterYRef {
GetterYRef(T y_ref, int count) { YRef = y_ref; Count = count; } GetterYRef(T y_ref, int count) { YRef = y_ref; Count = count; }
inline ImPlotPoint operator()(int idx) { inline ImPlotPoint operator()(int idx) {
return ImPlotPoint((T)idx, YRef); return ImPlotPoint((double)idx, (double)YRef);
} }
T YRef; T YRef;
int Count; int Count;
@ -115,7 +115,7 @@ struct GetterXsYRef {
int Offset; int Offset;
int Stride; int Stride;
inline ImPlotPoint operator()(int idx) { inline ImPlotPoint operator()(int idx) {
return ImPlotPoint(OffsetAndStride(Xs, idx, Count, Offset, Stride), YRef); return ImPlotPoint((double)OffsetAndStride(Xs, idx, Count, Offset, Stride), (double)YRef);
} }
}; };
@ -128,7 +128,7 @@ struct GetterImVec2 {
} }
inline ImPlotPoint operator()(int idx) { inline ImPlotPoint operator()(int idx) {
idx = ImPosMod(Offset + idx, Count); idx = ImPosMod(Offset + idx, Count);
return ImPlotPoint(Data[idx].x, Data[idx].y); return ImPlotPoint((double)Data[idx].x, (double)Data[idx].y);
} }
const ImVec2* Data; const ImVec2* Data;
int Count; int Count;
@ -173,14 +173,14 @@ template <typename T>
struct GetterBarV { struct GetterBarV {
const T* Ys; T XShift; int Count; int Offset; int Stride; const T* Ys; T XShift; int Count; int Offset; int Stride;
GetterBarV(const T* ys, T xshift, int count, int offset, int stride) { Ys = ys; XShift = xshift; Count = count; Offset = offset; Stride = stride; } GetterBarV(const T* ys, T xshift, int count, int offset, int stride) { Ys = ys; XShift = xshift; Count = count; Offset = offset; Stride = stride; }
inline ImPlotPoint operator()(int idx) { return ImPlotPoint((T)idx + XShift, OffsetAndStride(Ys, idx, Count, Offset, Stride)); } inline ImPlotPoint operator()(int idx) { return ImPlotPoint((double)idx + (double)XShift, (double)OffsetAndStride(Ys, idx, Count, Offset, Stride)); }
}; };
template <typename T> template <typename T>
struct GetterBarH { struct GetterBarH {
const T* Xs; T YShift; int Count; int Offset; int Stride; const T* Xs; T YShift; int Count; int Offset; int Stride;
GetterBarH(const T* xs, T yshift, int count, int offset, int stride) { Xs = xs; YShift = yshift; Count = count; Offset = offset; Stride = stride; } GetterBarH(const T* xs, T yshift, int count, int offset, int stride) { Xs = xs; YShift = yshift; Count = count; Offset = offset; Stride = stride; }
inline ImPlotPoint operator()(int idx) { return ImPlotPoint(OffsetAndStride(Xs, idx, Count, Offset, Stride), (T)idx + YShift); } inline ImPlotPoint operator()(int idx) { return ImPlotPoint((double)OffsetAndStride(Xs, idx, Count, Offset, Stride), (double)idx + (double)YShift); }
}; };
template <typename T> template <typename T>
@ -190,10 +190,10 @@ struct GetterError {
Xs = xs; Ys = ys; Neg = neg; Pos = pos; Count = count; Offset = offset; Stride = stride; Xs = xs; Ys = ys; Neg = neg; Pos = pos; Count = count; Offset = offset; Stride = stride;
} }
ImPlotPointError operator()(int idx) { ImPlotPointError operator()(int idx) {
return ImPlotPointError(OffsetAndStride(Xs, idx, Count, Offset, Stride), return ImPlotPointError((double)OffsetAndStride(Xs, idx, Count, Offset, Stride),
OffsetAndStride(Ys, idx, Count, Offset, Stride), (double)OffsetAndStride(Ys, idx, Count, Offset, Stride),
OffsetAndStride(Neg, idx, Count, Offset, Stride), (double)OffsetAndStride(Neg, idx, Count, Offset, Stride),
OffsetAndStride(Pos, idx, Count, Offset, Stride)); (double)OffsetAndStride(Pos, idx, Count, Offset, Stride));
} }
}; };