Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 22:59:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing warnings

Browse source
This commit is contained in:
samcake 2015-09-23 16:19:34 -07:00
parent 5176d51714
commit 9c44c3e4a4
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu/src/gpu/GLBackendInput.cpp
View file

@ -125,7 +125,7 @@ void GLBackend::updateInput() {
} }
// Manage Activation what was and what is expected now // Manage Activation what was and what is expected now
for (int i = 0; i < newActivation.size(); i++) { for (size_t i = 0; i < newActivation.size(); i++) {
bool newState = newActivation[i]; bool newState = newActivation[i];
if (newState != _input._attributeActivation[i]) { if (newState != _input._attributeActivation[i]) {
if (newState) { if (newState) {

8
tests/gpu-test/src/main.cpp
View file

@ -192,8 +192,6 @@ public:
} }
void draw() { void draw() {
static auto startTime = usecTimestampNow();
// Attempting to draw before we're visible and have a valid size will // Attempting to draw before we're visible and have a valid size will
// produce GL errors. // produce GL errors.
if (!isVisible() || _size.width() <= 0 || _size.height() <= 0) { if (!isVisible() || _size.width() <= 0 || _size.height() <= 0) {
@ -207,7 +205,7 @@ public:
batch.setViewportTransform({ 0, 0, _size.width() * devicePixelRatio(), _size.height() * devicePixelRatio() }); batch.setViewportTransform({ 0, 0, _size.width() * devicePixelRatio(), _size.height() * devicePixelRatio() });
batch.setProjectionTransform(_projectionMatrix); batch.setProjectionTransform(_projectionMatrix);
double t = _time.elapsed() * 1e-3; float t = _time.elapsed() * 1e-3f;
glm::vec3 unitscale { 1.0f }; glm::vec3 unitscale { 1.0f };
glm::vec3 up { 0.0f, 1.0f, 0.0f }; glm::vec3 up { 0.0f, 1.0f, 0.0f };
@ -356,9 +354,9 @@ public:
static auto startUsecs = usecTimestampNow(); static auto startUsecs = usecTimestampNow();
float seconds = getSeconds(startUsecs); float seconds = getSeconds(startUsecs);
seconds /= 4.0; seconds /= 4.0f;
int shapeIndex = ((int)seconds) % TYPE_COUNT; int shapeIndex = ((int)seconds) % TYPE_COUNT;
bool wire = seconds - floor(seconds) > 0.5f; bool wire = (seconds - floor(seconds) > 0.5f);
batch.setModelTransform(Transform()); batch.setModelTransform(Transform());
batch._glColor4f(0.8f, 0.25f, 0.25f, 1.0f); batch._glColor4f(0.8f, 0.25f, 0.25f, 1.0f);