diff --git a/examples/20-nanovg/blendish.h b/examples/20-nanovg/blendish.h index 15c2f3f02..8322c459f 100644 --- a/examples/20-nanovg/blendish.h +++ b/examples/20-nanovg/blendish.h @@ -1739,13 +1739,13 @@ void bndNodeBackground(NVGcontext *ctx, float x, float y, float w, float h, BND_NODE_RADIUS,BND_NODE_RADIUS,0,0, bndTransparent(bndOffsetColor(titleColor, BND_BEVEL_SHADE)), bndTransparent(titleColor)); - bndInnerBox(ctx,x,y+BND_NODE_TITLE_HEIGHT-1,w,h+2-BND_NODE_TITLE_HEIGHT, + bndInnerBox(ctx,x,y+float(BND_NODE_TITLE_HEIGHT-1),w,h+2-float(BND_NODE_TITLE_HEIGHT), 0,0,BND_NODE_RADIUS,BND_NODE_RADIUS, bndTransparent(bnd_theme.nodeTheme.nodeBackdropColor), bndTransparent(bnd_theme.nodeTheme.nodeBackdropColor)); bndNodeIconLabel(ctx, - x+BND_NODE_ARROW_AREA_WIDTH,y, - w-BND_NODE_ARROW_AREA_WIDTH-BND_NODE_MARGIN_SIDE,BND_NODE_TITLE_HEIGHT, + x+float(BND_NODE_ARROW_AREA_WIDTH),y, + w-float(BND_NODE_ARROW_AREA_WIDTH)-float(BND_NODE_MARGIN_SIDE),BND_NODE_TITLE_HEIGHT, iconid, bnd_theme.regularTheme.textColor, bndOffsetColor(titleColor, BND_BEVEL_SHADE), BND_LEFT, BND_LABEL_FONT_SIZE, label); @@ -2164,7 +2164,7 @@ void bndIconLabelValue(NVGcontext *ctx, float x, float y, float w, float h, nvgTextAlign(ctx, (align==BND_LEFT)?(NVG_ALIGN_LEFT|NVG_ALIGN_BASELINE): (NVG_ALIGN_CENTER|NVG_ALIGN_BASELINE)); - nvgTextBox(ctx,x+pleft,y+BND_WIDGET_HEIGHT-BND_TEXT_PAD_DOWN, + nvgTextBox(ctx,x+pleft,y+float(BND_WIDGET_HEIGHT)-BND_TEXT_PAD_DOWN, w-BND_PAD_RIGHT-pleft,label, NULL); } } else if (iconid >= 0) { diff --git a/examples/20-nanovg/nanovg.cpp b/examples/20-nanovg/nanovg.cpp index e71dcca30..246c13021 100644 --- a/examples/20-nanovg/nanovg.cpp +++ b/examples/20-nanovg/nanovg.cpp @@ -848,7 +848,7 @@ void drawBlendish(struct NVGcontext* _vg, float _x, float _y, float _w, float _h y += 25.0f; bndLabel(_vg, x, y, 120.0f, BND_WIDGET_HEIGHT, -1, "Label:"); - y += BND_WIDGET_HEIGHT; + y += float(BND_WIDGET_HEIGHT); bndChoiceButton(_vg, x, y, 80.0f, BND_WIDGET_HEIGHT, BND_CORNER_NONE, BND_DEFAULT, -1, "Default"); y += 25.0f; bndChoiceButton(_vg, x, y, 80.0f, BND_WIDGET_HEIGHT, BND_CORNER_NONE, BND_HOVER, -1, "Hovered"); @@ -869,9 +869,9 @@ void drawBlendish(struct NVGcontext* _vg, float _x, float _y, float _w, float _h y += 40.0f; bndNumberField(_vg, x, y, 120.0f, BND_WIDGET_HEIGHT, BND_CORNER_DOWN, BND_DEFAULT, "Top", "100"); - y += BND_WIDGET_HEIGHT - 2.0f; + y += float(BND_WIDGET_HEIGHT) - 2.0f; bndNumberField(_vg, x, y, 120.0f, BND_WIDGET_HEIGHT, BND_CORNER_ALL, BND_DEFAULT, "Center", "100"); - y += BND_WIDGET_HEIGHT - 2.0f; + y += float(BND_WIDGET_HEIGHT) - 2.0f; bndNumberField(_vg, x, y, 120.0f, BND_WIDGET_HEIGHT, BND_CORNER_TOP, BND_DEFAULT, "Bottom", "100"); float mx = x - 30.0f; @@ -879,11 +879,11 @@ void drawBlendish(struct NVGcontext* _vg, float _x, float _y, float _w, float _h float mw = 120.0f; bndMenuBackground(_vg, mx, my, mw, 120.0f, BND_CORNER_TOP); bndMenuLabel(_vg, mx, my, mw, BND_WIDGET_HEIGHT, -1, "Menu Title"); - my += BND_WIDGET_HEIGHT - 2.0f; + my += float(BND_WIDGET_HEIGHT) - 2.0f; bndMenuItem(_vg, mx, my, mw, BND_WIDGET_HEIGHT, BND_DEFAULT, BND_ICONID(17, 3), "Default"); - my += BND_WIDGET_HEIGHT - 2.0f; + my += float(BND_WIDGET_HEIGHT) - 2.0f; bndMenuItem(_vg, mx, my, mw, BND_WIDGET_HEIGHT, BND_HOVER, BND_ICONID(18, 3), "Hovered"); - my += BND_WIDGET_HEIGHT - 2.0f; + my += float(BND_WIDGET_HEIGHT) - 2.0f; bndMenuItem(_vg, mx, my, mw, BND_WIDGET_HEIGHT, BND_ACTIVE, BND_ICONID(19, 3), "Active"); y = _y; diff --git a/examples/36-sky/sky.cpp b/examples/36-sky/sky.cpp index 2975faf5f..8104f7222 100644 --- a/examples/36-sky/sky.cpp +++ b/examples/36-sky/sky.cpp @@ -267,7 +267,7 @@ namespace private: void CalculateSunOrbit() { - float day = 30.0f * m_month + 15.0f; + const float day = 30.0f * float(m_month) + 15.0f; float lambda = 280.46f + 0.9856474f * day; lambda = bx::toRad(lambda); m_delta = bx::asin(bx::sin(m_eclipticObliquity) * bx::sin(lambda) );