Skip to content

Commit

Permalink
update regressions
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jerboa-app
Jerboa-app committed Oct 23, 2024
1 parent e43066d commit 0c43373
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 54 deletions.
42 changes: 24 additions & 18 deletions tests/regression/user-macos/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ int main(int argv, char ** argc)
jGL::DesktopDisplay display(glm::ivec2(resX, resY), "Shape", conf);

glewInit();

jGLInstance = std::move(std::make_unique<jGL::GL::OpenGLInstance>(display.getRes()));

jGL::OrthoCam camera(resX, resY, glm::vec2(0.0,0.0));
Expand All @@ -31,22 +31,28 @@ int main(int argv, char ** argc)
32
);

std::vector<std::shared_ptr<jGL::Shape>> shapes;
std::vector<jGL::Shape> shapes;

RNG rng;

std::vector<jGL::Transform> trans;
std::vector<glm::vec4> cols;

trans.reserve(64);
shapes.reserve(64);
cols.reserve(64);

for (unsigned i = 0; i < 64; i++)
{
trans.push_back(jGL::Transform(rng.nextFloat(), rng.nextFloat(), 0.0, 0.1f));
cols.push_back(glm::vec4(rng.nextFloat(), rng.nextFloat(), rng.nextFloat(), 1.0));

shapes.push_back
(
std::make_shared<jGL::Shape>
(
trans[i],
glm::vec4(rng.nextFloat(), rng.nextFloat(), rng.nextFloat(), 1.0)
)
{
&trans[i],
&cols[i]
}
);

circles->add(shapes[i], std::to_string(i));
Expand Down Expand Up @@ -74,10 +80,10 @@ int main(int argv, char ** argc)
auto tr = circles->getTransform(std::to_string(i));
trans[i] = jGL::Transform
(
tr.x+dt*(rng.nextFloat()-0.5),
tr.y+dt*(rng.nextFloat()-0.5),
tr.theta,
tr.scaleX
tr->x+dt*(rng.nextFloat()-0.5),
tr->y+dt*(rng.nextFloat()-0.5),
tr->theta,
tr->scaleX
);
}

Expand All @@ -89,20 +95,20 @@ int main(int argv, char ** argc)
delta += deltas[n];
}
delta /= 60.0;

std::stringstream debugText;

double mouseX, mouseY;
display.mousePosition(mouseX,mouseY);

debugText << "Delta: " << fixedLengthNumber(delta,6)
<< " ( FPS: " << fixedLengthNumber(1.0/delta,4)
<< " ( FPS: " << fixedLengthNumber(1.0/delta,4)
<< ")\n"
<< "Render draw time: \n"
<< "Render draw time: \n"
<< " " << fixedLengthNumber(rdt, 6) << "\n"
<< "Mouse (" << fixedLengthNumber(mouseX,4)
<< ","
<< fixedLengthNumber(mouseY,4)
<< "Mouse (" << fixedLengthNumber(mouseX,4)
<< ","
<< fixedLengthNumber(mouseY,4)
<< ")\n";

jGLInstance->text(
Expand All @@ -128,7 +134,7 @@ int main(int argv, char ** argc)

deltas[frameId] = duration_cast<duration<double>>(tock-tic).count();
frameId = (frameId+1) % 60;

}

jGLInstance->finish();
Expand Down
42 changes: 24 additions & 18 deletions tests/regression/user-mingw/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ int main(int argv, char ** argc)
jGL::DesktopDisplay display(glm::ivec2(resX, resY), "Shape", conf);

glewInit();

jGLInstance = std::move(std::make_unique<jGL::GL::OpenGLInstance>(display.getRes()));

jGL::OrthoCam camera(resX, resY, glm::vec2(0.0,0.0));
Expand All @@ -31,22 +31,28 @@ int main(int argv, char ** argc)
32
);

std::vector<std::shared_ptr<jGL::Shape>> shapes;
std::vector<jGL::Shape> shapes;

RNG rng;

std::vector<jGL::Transform> trans;
std::vector<glm::vec4> cols;

trans.reserve(64);
shapes.reserve(64);
cols.reserve(64);

for (unsigned i = 0; i < 64; i++)
{
trans.push_back(jGL::Transform(rng.nextFloat(), rng.nextFloat(), 0.0, 0.1f));
cols.push_back(glm::vec4(rng.nextFloat(), rng.nextFloat(), rng.nextFloat(), 1.0));

shapes.push_back
(
std::make_shared<jGL::Shape>
(
trans[i],
glm::vec4(rng.nextFloat(), rng.nextFloat(), rng.nextFloat(), 1.0)
)
{
&trans[i],
&cols[i]
}
);

circles->add(shapes[i], std::to_string(i));
Expand Down Expand Up @@ -74,10 +80,10 @@ int main(int argv, char ** argc)
auto tr = circles->getTransform(std::to_string(i));
trans[i] = jGL::Transform
(
tr.x+dt*(rng.nextFloat()-0.5),
tr.y+dt*(rng.nextFloat()-0.5),
tr.theta,
tr.scaleX
tr->x+dt*(rng.nextFloat()-0.5),
tr->y+dt*(rng.nextFloat()-0.5),
tr->theta,
tr->scaleX
);
}

Expand All @@ -89,20 +95,20 @@ int main(int argv, char ** argc)
delta += deltas[n];
}
delta /= 60.0;

std::stringstream debugText;

double mouseX, mouseY;
display.mousePosition(mouseX,mouseY);

debugText << "Delta: " << fixedLengthNumber(delta,6)
<< " ( FPS: " << fixedLengthNumber(1.0/delta,4)
<< " ( FPS: " << fixedLengthNumber(1.0/delta,4)
<< ")\n"
<< "Render draw time: \n"
<< "Render draw time: \n"
<< " " << fixedLengthNumber(rdt, 6) << "\n"
<< "Mouse (" << fixedLengthNumber(mouseX,4)
<< ","
<< fixedLengthNumber(mouseY,4)
<< "Mouse (" << fixedLengthNumber(mouseX,4)
<< ","
<< fixedLengthNumber(mouseY,4)
<< ")\n";

jGLInstance->text(
Expand All @@ -128,7 +134,7 @@ int main(int argv, char ** argc)

deltas[frameId] = duration_cast<duration<double>>(tock-tic).count();
frameId = (frameId+1) % 60;

}

jGLInstance->finish();
Expand Down
42 changes: 24 additions & 18 deletions tests/regression/user/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ int main(int argv, char ** argc)
jGL::DesktopDisplay display(glm::ivec2(resX, resY), "Shape", conf);

glewInit();

jGLInstance = std::move(std::make_unique<jGL::GL::OpenGLInstance>(display.getRes()));

jGL::OrthoCam camera(resX, resY, glm::vec2(0.0,0.0));
Expand All @@ -31,22 +31,28 @@ int main(int argv, char ** argc)
32
);

std::vector<std::shared_ptr<jGL::Shape>> shapes;
std::vector<jGL::Shape> shapes;

RNG rng;

std::vector<jGL::Transform> trans;
std::vector<glm::vec4> cols;

trans.reserve(64);
shapes.reserve(64);
cols.reserve(64);

for (unsigned i = 0; i < 64; i++)
{
trans.push_back(jGL::Transform(rng.nextFloat(), rng.nextFloat(), 0.0, 0.1f));
cols.push_back(glm::vec4(rng.nextFloat(), rng.nextFloat(), rng.nextFloat(), 1.0));

shapes.push_back
(
std::make_shared<jGL::Shape>
(
trans[i],
glm::vec4(rng.nextFloat(), rng.nextFloat(), rng.nextFloat(), 1.0)
)
{
&trans[i],
&cols[i]
}
);

circles->add(shapes[i], std::to_string(i));
Expand Down Expand Up @@ -74,10 +80,10 @@ int main(int argv, char ** argc)
auto tr = circles->getTransform(std::to_string(i));
trans[i] = jGL::Transform
(
tr.x+dt*(rng.nextFloat()-0.5),
tr.y+dt*(rng.nextFloat()-0.5),
tr.theta,
tr.scaleX
tr->x+dt*(rng.nextFloat()-0.5),
tr->y+dt*(rng.nextFloat()-0.5),
tr->theta,
tr->scaleX
);
}

Expand All @@ -89,20 +95,20 @@ int main(int argv, char ** argc)
delta += deltas[n];
}
delta /= 60.0;

std::stringstream debugText;

double mouseX, mouseY;
display.mousePosition(mouseX,mouseY);

debugText << "Delta: " << fixedLengthNumber(delta,6)
<< " ( FPS: " << fixedLengthNumber(1.0/delta,4)
<< " ( FPS: " << fixedLengthNumber(1.0/delta,4)
<< ")\n"
<< "Render draw time: \n"
<< "Render draw time: \n"
<< " " << fixedLengthNumber(rdt, 6) << "\n"
<< "Mouse (" << fixedLengthNumber(mouseX,4)
<< ","
<< fixedLengthNumber(mouseY,4)
<< "Mouse (" << fixedLengthNumber(mouseX,4)
<< ","
<< fixedLengthNumber(mouseY,4)
<< ")\n";

jGLInstance->text(
Expand All @@ -128,7 +134,7 @@ int main(int argv, char ** argc)

deltas[frameId] = duration_cast<duration<double>>(tock-tic).count();
frameId = (frameId+1) % 60;

}

jGLInstance->finish();
Expand Down

0 comments on commit 0c43373

Please sign in to comment.