eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 03:29:19 +02:00
Code Issues 123 Wiki Activity

reformat: remove redundant 'else' keyword

Browse Source
This commit is contained in:
jerrrrycho
2026-07-04 05:50:57 +02:00
parent 31f9ca0afc
commit b4b6686320
14 changed files with 482 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
imgui/imgui.cpp
View File

@@ -9819,14 +9819,41 @@ void ImGui::ShowMetricsWindow(bool* p_open)
static ImRect GetWindowRect(ImGuiWindow* window, int rect_type)
{
if (rect_type == WRT_OuterRect) { return window->Rect(); }
else if (rect_type == WRT_OuterRectClipped) { return window->OuterRectClipped; }
else if (rect_type == WRT_InnerRect) { return window->InnerRect; }
else if (rect_type == WRT_InnerClipRect) { return window->InnerClipRect; }
else if (rect_type == WRT_WorkRect) { return window->WorkRect; }
else if (rect_type == WRT_Contents) {
const ImVec2 min = window->InnerRect.Min - window->Scroll + window->WindowPadding; return ImRect(min, min + window->ContentSize); }
else if (rect_type == WRT_ContentsRegionRect) { return window->ContentsRegionRect; }
IM_ASSERT(0);
else
{
if (rect_type == WRT_OuterRectClipped)
{
return window->OuterRectClipped;
}
if (rect_type == WRT_InnerRect)
{
return window->InnerRect;
}
else
{
if (rect_type == WRT_InnerClipRect)
{
return window->InnerClipRect;
}
if (rect_type == WRT_WorkRect)
{
return window->WorkRect;
}
else
{
if (rect_type == WRT_Contents)
{
const ImVec2 min = window->InnerRect.Min - window->Scroll + window->WindowPadding;
return ImRect(min, min + window->ContentSize);
}
if (rect_type == WRT_ContentsRegionRect)
{
return window->ContentsRegionRect;
}
}
}
}
IM_ASSERT(0);
return ImRect();
}

16
imgui/imgui.h
View File

@@ -1280,8 +1280,20 @@ struct ImVector
inline T* erase_unsorted(const T* it) { IM_ASSERT(it >= Data && it < Data+Size); const ptrdiff_t off = it - Data; if (it < Data+Size-1) memcpy(Data + off, Data + Size - 1, sizeof(T)); Size--; return Data + off; }
inline T* insert(const T* it, const T& v) { IM_ASSERT(it >= Data && it <= Data+Size); const ptrdiff_t off = it - Data; if (Size == Capacity) reserve(_grow_capacity(Size + 1)); if (off < (int)Size) memmove(Data + off + 1, Data + off, ((size_t)Size - (size_t)off) * sizeof(T)); memcpy(&Data[off], &v, sizeof(v)); Size++; return Data + off; }
inline bool contains(const T& v) const { const T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data++ == v) return true; return false; }
inline T* find(const T& v) { T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data == v) break; else ++data; return data; }
inline const T* find(const T& v) const { const T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data == v) break; else ++data; return data; }
inline T* find(const T& v) { T* data = Data; const T* data_end = Data + Size; while (data < data_end)
{
if (*data == v)
break;
++data;
}
return data; }
inline const T* find(const T& v) const { const T* data = Data; const T* data_end = Data + Size; while (data < data_end)
{
if (*data == v)
break;
++data;
}
return data; }
inline bool find_erase(const T& v) { const T* it = find(v); if (it < Data + Size) { erase(it); return true; } return false; }
inline bool find_erase_unsorted(const T& v) { const T* it = find(v); if (it < Data + Size) { erase_unsorted(it); return true; } return false; }
inline int index_from_ptr(const T* it) const { IM_ASSERT(it >= Data && it <= Data+Size); const ptrdiff_t off = it - Data; return (int)off; }

171
imgui/imstb_truetype.h
View File

@@ -1188,10 +1188,20 @@ static stbtt_uint32 stbtt__cff_int(stbtt__buf *b)
{
const int b0 = stbtt__buf_get8(b);
if (b0 >= 32 && b0 <= 246) return b0 - 139;
else if (b0 >= 247 && b0 <= 250) return (b0 - 247)*256 + stbtt__buf_get8(b) + 108;
else if (b0 >= 251 && b0 <= 254) return -(b0 - 251)*256 - stbtt__buf_get8(b) - 108;
else if (b0 == 28) return stbtt__buf_get16(b);
else if (b0 == 29) return stbtt__buf_get32(b);
else
{
if (b0 >= 247 && b0 <= 250)
return (b0 - 247) * 256 + stbtt__buf_get8(b) + 108;
if (b0 >= 251 && b0 <= 254)
return -(b0 - 251) * 256 - stbtt__buf_get8(b) - 108;
else
{
if (b0 == 28)
return stbtt__buf_get16(b);
if (b0 == 29)
return stbtt__buf_get32(b);
}
}
STBTT_assert(0);
return 0;
}
@@ -1469,82 +1479,99 @@ STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codep
if (unicode_codepoint < bytes-6)
return ttBYTE(data + index_map + 6 + unicode_codepoint);
return 0;
} else if (format == 6) {
const stbtt_uint32 first = ttUSHORT(data + index_map + 6);
const stbtt_uint32 count = ttUSHORT(data + index_map + 8);
if ((stbtt_uint32) unicode_codepoint >= first && (stbtt_uint32) unicode_codepoint < first+count)
return ttUSHORT(data + index_map + 10 + (unicode_codepoint - first)*2);
return 0;
} else if (format == 2) {
STBTT_assert(0); // @TODO: high-byte mapping for japanese/chinese/korean
return 0;
} else if (format == 4) { // standard mapping for windows fonts: binary search collection of ranges
const stbtt_uint16 segcount = ttUSHORT(data+index_map+6) >> 1;
stbtt_uint16 searchRange = ttUSHORT(data+index_map+8) >> 1;
stbtt_uint16 entrySelector = ttUSHORT(data+index_map+10);
const stbtt_uint16 rangeShift = ttUSHORT(data+index_map+12) >> 1;
} else
{
if (format == 6)
{
const stbtt_uint32 first = ttUSHORT(data + index_map + 6);
const stbtt_uint32 count = ttUSHORT(data + index_map + 8);
if ((stbtt_uint32)unicode_codepoint >= first && (stbtt_uint32)unicode_codepoint < first + count)
return ttUSHORT(data + index_map + 10 + (unicode_codepoint - first) * 2);
return 0;
}
if (format == 2)
{
STBTT_assert(0); // @TODO: high-byte mapping for japanese/chinese/korean
return 0;
}
else
{
if (format == 4)
{ // standard mapping for windows fonts: binary search collection of ranges
const stbtt_uint16 segcount = ttUSHORT(data + index_map + 6) >> 1;
stbtt_uint16 searchRange = ttUSHORT(data + index_map + 8) >> 1;
stbtt_uint16 entrySelector = ttUSHORT(data + index_map + 10);
const stbtt_uint16 rangeShift = ttUSHORT(data + index_map + 12) >> 1;
// do a binary search of the segments
const stbtt_uint32 endCount = index_map + 14;
stbtt_uint32 search = endCount;
// do a binary search of the segments
const stbtt_uint32 endCount = index_map + 14;
stbtt_uint32 search = endCount;
if (unicode_codepoint > 0xffff)
return 0;
if (unicode_codepoint > 0xffff)
return 0;
// they lie from endCount .. endCount + segCount
// but searchRange is the nearest power of two, so...
if (unicode_codepoint >= ttUSHORT(data + search + rangeShift*2))
search += rangeShift*2;
// they lie from endCount .. endCount + segCount
// but searchRange is the nearest power of two, so...
if (unicode_codepoint >= ttUSHORT(data + search + rangeShift * 2))
search += rangeShift * 2;
// now decrement to bias correctly to find smallest
search -= 2;
while (entrySelector) {
stbtt_uint16 end;
searchRange >>= 1;
end = ttUSHORT(data + search + searchRange*2);
if (unicode_codepoint > end)
search += searchRange*2;
--entrySelector;
}
search += 2;
// now decrement to bias correctly to find smallest
search -= 2;
while (entrySelector)
{
stbtt_uint16 end;
searchRange >>= 1;
end = ttUSHORT(data + search + searchRange * 2);
if (unicode_codepoint > end)
search += searchRange * 2;
--entrySelector;
}
search += 2;
{
stbtt_uint16 offset, start;
const stbtt_uint16 item = (stbtt_uint16) ((search - endCount) >> 1);
{
stbtt_uint16 offset, start;
const stbtt_uint16 item = (stbtt_uint16)((search - endCount) >> 1);
STBTT_assert(unicode_codepoint <= ttUSHORT(data + endCount + 2*item));
start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item);
if (unicode_codepoint < start)
return 0;
STBTT_assert(unicode_codepoint <= ttUSHORT(data + endCount + 2 * item));
start = ttUSHORT(data + index_map + 14 + segcount * 2 + 2 + 2 * item);
if (unicode_codepoint < start)
return 0;
offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item);
if (offset == 0)
return (stbtt_uint16) (unicode_codepoint + ttSHORT(data + index_map + 14 + segcount*4 + 2 + 2*item));
offset = ttUSHORT(data + index_map + 14 + segcount * 6 + 2 + 2 * item);
if (offset == 0)
return (stbtt_uint16)(unicode_codepoint + ttSHORT(data + index_map + 14 + segcount * 4 + 2 + 2 * item));
return ttUSHORT(data + offset + (unicode_codepoint-start)*2 + index_map + 14 + segcount*6 + 2 + 2*item);
}
} else if (format == 12 || format == 13) {
const stbtt_uint32 ngroups = ttULONG(data+index_map+12);
stbtt_int32 low,high;
low = 0; high = (stbtt_int32)ngroups;
// Binary search the right group.
while (low < high) {
const stbtt_int32 mid = low + ((high-low) >> 1); // rounds down, so low <= mid < high
const stbtt_uint32 start_char = ttULONG(data+index_map+16+mid*12);
const stbtt_uint32 end_char = ttULONG(data+index_map+16+mid*12+4);
if ((stbtt_uint32) unicode_codepoint < start_char)
high = mid;
else if ((stbtt_uint32) unicode_codepoint > end_char)
low = mid+1;
else {
const stbtt_uint32 start_glyph = ttULONG(data+index_map+16+mid*12+8);
if (format == 12)
return start_glyph + unicode_codepoint-start_char;
else // format == 13
return start_glyph;
}
}
return 0; // not found
return ttUSHORT(data + offset + (unicode_codepoint - start) * 2 + index_map + 14 + segcount * 6 + 2 + 2 * item);
}
}
if (format == 12 || format == 13)
{
const stbtt_uint32 ngroups = ttULONG(data + index_map + 12);
stbtt_int32 low, high;
low = 0;
high = (stbtt_int32)ngroups;
// Binary search the right group.
while (low < high)
{
const stbtt_int32 mid = low + ((high - low) >> 1); // rounds down, so low <= mid < high
const stbtt_uint32 start_char = ttULONG(data + index_map + 16 + mid * 12);
const stbtt_uint32 end_char = ttULONG(data + index_map + 16 + mid * 12 + 4);
if ((stbtt_uint32)unicode_codepoint < start_char)
high = mid;
else if ((stbtt_uint32)unicode_codepoint > end_char)
low = mid + 1;
else
{
const stbtt_uint32 start_glyph = ttULONG(data + index_map + 16 + mid * 12 + 8);
if (format == 12)
return start_glyph + unicode_codepoint - start_char;
else // format == 13
return start_glyph;
}
}
return 0; // not found
}
}
}
// @TODO
STBTT_assert(0);