josh/dwss
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Spin: refactored initialization of monitor info; gave each monitor its own random switch time

Browse Source
This commit is contained in:
Josh Holtrop 2010-12-08 11:52:30 -05:00
parent 7d16486f8f
commit a3936d1e43
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
modes/Spin.cc
View File

@ -7,8 +7,6 @@
#include "Spin.h" #include "Spin.h"
#define SWITCH_TIME 5000
static const float directions[][3] = { static const float directions[][3] = {
{0, 0, 1}, {0, 0, -1}, {0, 1, 0}, {0, -1, 0}, {1, 0, 0}, {-1, 0, 0} {0, 0, 1}, {0, 0, -1}, {0, 1, 0}, {0, -1, 0}, {1, 0, 0}, {-1, 0, 0}
}; };
@ -17,11 +15,9 @@ Spin::Spin()
{ {
m_num_monitors = 1; m_num_monitors = 1;
m_monitor_info = new monitor_info_t[m_num_monitors]; m_monitor_info = new monitor_info_t[m_num_monitors];
m_monitor_info[0].direction = 1;
glGetFloatv(GL_MODELVIEW_MATRIX, &m_monitor_info[0].rotation[0]);
m_last_switch_ticks = 0;
m_last_ticks = 0; m_last_ticks = 0;
srand(time(NULL)); srand(time(NULL));
initMonitorInfo();
} }
Spin::~Spin() Spin::~Spin()
@ -32,18 +28,16 @@ Spin::~Spin()
bool Spin::expose (GnomeScreensaver & gs) bool Spin::expose (GnomeScreensaver & gs)
{ {
if (m_last_ticks == 0) if (m_last_ticks == 0)
m_last_switch_ticks = m_last_ticks = gs.getTicks(); m_last_ticks = gs.getTicks();
else if (gs.getTicks() - m_last_switch_ticks > SWITCH_TIME) else for (int i = 0; i < m_num_monitors; i++)
{ {
for (int i = 0; i < m_num_monitors; i++) if (gs.getTicks() - m_monitor_info[i].last_switch_ticks
> m_monitor_info[i].switch_time)
{ {
m_monitor_info[i].direction = (int) (rand() / (double)RAND_MAX * m_monitor_info[i].direction = getRandomDirection();
sizeof(directions) / sizeof(directions[0])); m_monitor_info[i].switch_time = getRandomSwitchTime();
if (m_monitor_info[i].direction m_monitor_info[i].last_switch_ticks = gs.getTicks();
>= sizeof(directions) / sizeof(directions[0]))
m_monitor_info[i].direction = 0;
} }
m_last_switch_ticks = gs.getTicks();
} }
int width = gs.getWidth() / m_num_monitors; int width = gs.getWidth() / m_num_monitors;
@ -84,15 +78,7 @@ bool Spin::configure (GnomeScreensaver & gs)
m_num_monitors = gs.getNumMonitors(); m_num_monitors = gs.getNumMonitors();
delete[] m_monitor_info; delete[] m_monitor_info;
m_monitor_info = new monitor_info_t[m_num_monitors]; m_monitor_info = new monitor_info_t[m_num_monitors];
for (int i = 0; i < m_num_monitors; i++) initMonitorInfo();
{
m_monitor_info[i].direction = (int) (rand() / (double)RAND_MAX *
sizeof(directions) / sizeof(directions[0]));
if (m_monitor_info[i].direction
>= sizeof(directions) / sizeof(directions[0]))
m_monitor_info[i].direction = 0;
glGetFloatv(GL_MODELVIEW_MATRIX, &m_monitor_info[i].rotation[0]);
}
return true; return true;
} }
@ -102,3 +88,27 @@ bool Spin::update (GnomeScreensaver & gs)
return true; return true;
} }
void Spin::initMonitorInfo()
{
for (int i = 0; i < m_num_monitors; i++)
{
m_monitor_info[i].direction = getRandomDirection();
glGetFloatv(GL_MODELVIEW_MATRIX, &m_monitor_info[i].rotation[0]);
m_monitor_info[i].switch_time = getRandomSwitchTime();
m_monitor_info[i].last_switch_ticks = 0;
}
}
int Spin::getRandomDirection()
{
int direction = (int) (rand() / (double)RAND_MAX *
sizeof(directions) / sizeof(directions[0]));
if (direction >= sizeof(directions) / sizeof(directions[0]))
direction = 0;
return direction;
}
uint32_t Spin::getRandomSwitchTime()
{
return 3000u + (uint32_t) (rand() / (double)RAND_MAX * 3000.0);
}

5
modes/Spin.h
View File

@ -19,13 +19,16 @@ class Spin : public Mode
int direction; int direction;
float rotation[16]; float rotation[16];
int switch_time; int switch_time;
uint32_t last_switch_ticks;
} monitor_info_t; } monitor_info_t;
protected: protected:
LogoBox m_logobox; LogoBox m_logobox;
int m_num_monitors; int m_num_monitors;
monitor_info_t *m_monitor_info; monitor_info_t *m_monitor_info;
unsigned int m_last_switch_ticks;
unsigned int m_last_ticks; unsigned int m_last_ticks;
void initMonitorInfo();
int getRandomDirection();
uint32_t getRandomSwitchTime();
}; };
#endif /* SPIN_H */ #endif /* SPIN_H */