3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 23:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Separate fps counter and remove glut dependency

Browse source
This commit is contained in:
tamasmeszaros 2019-12-18 12:00:28 +01:00
parent acfaff3741
commit 472c4c885d
4 changed files with 73 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

68
sandboxes/opencsg/GLScene.cpp
View file

@ -1,5 +1,3 @@
#include <chrono>
#include "GLScene.hpp"
#include <libslic3r/Utils.hpp>
#include <libslic3r/SLAPrint.hpp>
@ -7,12 +5,6 @@
#include <GL/glew.h>
#ifdef __APPLE__
#include <GLUT/glut.h>
#else
#include <GL/glut.h>
#endif
#include <boost/log/trivial.hpp>
#ifndef NDEBUG
@ -54,60 +46,8 @@ inline void glAssertRecentCall() { }
namespace Slic3r { namespace GL {
Scene::Scene() = default;
Scene::~Scene() = default;
void renderfps () {
using Clock = std::chrono::high_resolution_clock;
using Duration = Clock::duration;
using TimePoint = Clock::time_point;
static std::ostringstream fpsStream;
static int frames = 0;
static TimePoint last = Clock::now();
static const double resolution = 0.01;
static double fps = 0.;
auto to_sec = [](Duration d) -> double {
return d.count() * double(Duration::period::num) / Duration::period::den;
};
++frames;
TimePoint msec = Clock::now();
double seconds = to_sec(msec - last);
if (seconds >= resolution) {
last = msec;
fps = 0.5 * (fps + frames / seconds);
fpsStream.str("");
fpsStream << "fps: " << std::setprecision(4) << fps << std::ends;
frames = 0;
}
glDisable(GL_DEPTH_TEST);
glLoadIdentity();
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
glColor3f(0.0f, 0.0f, 0.0f);
glRasterPos2f(-1.0f, -1.0f);
glDisable(GL_LIGHTING);
std::string s = fpsStream.str();
for (unsigned int i=0; i<s.size(); ++i) {
glutBitmapCharacter(GLUT_BITMAP_8_BY_13, s[i]);
}
glEnable(GL_LIGHTING);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glEnable(GL_DEPTH_TEST);
glFlush();
}
void Display::render_scene()
{
GLfloat color[] = {1.f, 1.f, 0.f, 0.f};
@ -367,12 +307,9 @@ Display::~Display()
}
void Display::set_active(long width, long height)
{
static int argc = 0;
{
if (!m_initialized) {
glewInit();
glutInit(&argc, nullptr);
m_initialized = true;
}
@ -415,7 +352,8 @@ void Display::repaint()
m_camera->view();
render_scene();
renderfps();
// renderfps();
m_fps_counter.update();
swap_buffers();
}