random-mirrors
/
librw
mirror of https://github.com/aap/librw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix additional MinGW warnings

This commit is contained in:
Cameron Cawley 2019-01-10 16:12:05 +00:00
parent da28d103c9
commit f2891e006b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d3d/rwd3d.h
View File

@ -1,5 +1,5 @@
#ifdef RW_D3D9
#define NOMINMAX
#define NOMINMAX 1
#include <d3d9.h>
#endif

10
tools/clumpview/ras_test.cpp
View File

@ -465,11 +465,11 @@ texfunc(Color t, Color f)
a = srTexUseAlpha ? t.a : f.a;
break;
}
r = clamp(r);
g = clamp(g);
b = clamp(b);
a = clamp(a);
Color v = { r, g, b, a };
Color v;
v.r = clamp(r);
v.g = clamp(g);
v.b = clamp(b);
v.a = clamp(a);
return v;
}

2
tools/imguitest/main.cpp
View File

@ -74,7 +74,7 @@ Draw(float timeDelta)
static bool show_another_window = false;
static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
rw::RGBA clearcol = { clear_color.x*255, clear_color.y*255, clear_color.z*255, clear_color.w*255 };
rw::RGBA clearcol = rw::makeRGBA(clear_color.x*255, clear_color.y*255, clear_color.z*255, clear_color.w*255);
Scene.camera->clear(&clearcol, rw::Camera::CLEARIMAGE|rw::Camera::CLEARZ);
Scene.camera->beginUpdate();