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

replaced directions and rotations array with generic per-monitor info structure array

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

39
modes/Spin.cc
View File

@ -16,10 +16,9 @@ static const float directions[][3] = {
Spin::Spin() Spin::Spin()
{ {
m_num_monitors = 1; m_num_monitors = 1;
m_directions = new int[m_num_monitors]; m_monitor_info = new monitor_info_t[m_num_monitors];
m_directions[0] = 1; m_monitor_info[0].direction = 1;
m_rotations = new matrix_t[m_num_monitors]; glGetFloatv(GL_MODELVIEW_MATRIX, &m_monitor_info[0].rotation[0]);
glGetFloatv(GL_MODELVIEW_MATRIX, &m_rotations[0][0]);
m_last_switch_ticks = 0; m_last_switch_ticks = 0;
m_last_ticks = 0; m_last_ticks = 0;
srand(time(NULL)); srand(time(NULL));
@ -27,8 +26,7 @@ Spin::Spin()
Spin::~Spin() Spin::~Spin()
{ {
delete[] m_directions; delete[] m_monitor_info;
delete[] m_rotations;
} }
bool Spin::expose (GnomeScreensaver & gs) bool Spin::expose (GnomeScreensaver & gs)
@ -39,10 +37,11 @@ bool Spin::expose (GnomeScreensaver & gs)
{ {
for (int i = 0; i < m_num_monitors; i++) for (int i = 0; i < m_num_monitors; i++)
{ {
m_directions[i] = (int) (rand() / (double)RAND_MAX * m_monitor_info[i].direction = (int) (rand() / (double)RAND_MAX *
sizeof(directions) / sizeof(directions[0])); sizeof(directions) / sizeof(directions[0]));
if (m_directions[i] >= sizeof(directions) / sizeof(directions[0])) if (m_monitor_info[i].direction
m_directions[i] = 0; >= sizeof(directions) / sizeof(directions[0]))
m_monitor_info[i].direction = 0;
} }
m_last_switch_ticks = gs.getTicks(); m_last_switch_ticks = gs.getTicks();
} }
@ -54,14 +53,15 @@ bool Spin::expose (GnomeScreensaver & gs)
{ {
glViewport(width * monitor_num, 0, width, gs.getHeight()); glViewport(width * monitor_num, 0, width, gs.getHeight());
glLoadMatrixf(&m_rotations[monitor_num][0]); glLoadMatrixf(&m_monitor_info[monitor_num].rotation[0]);
int direction = m_directions[monitor_num]; int direction = m_monitor_info[monitor_num].direction;
glRotatef((gs.getTicks() - m_last_ticks) / 1000.0 * 360.0 / 4.0, glRotatef((gs.getTicks() - m_last_ticks) / 1000.0 * 360.0 / 4.0,
directions[direction][0], directions[direction][0],
directions[direction][1], directions[direction][1],
directions[direction][2]); directions[direction][2]);
glGetFloatv(GL_MODELVIEW_MATRIX, &m_rotations[monitor_num][0]); glGetFloatv(GL_MODELVIEW_MATRIX,
&m_monitor_info[monitor_num].rotation[0]);
m_logobox.draw(); m_logobox.draw();
} }
@ -82,17 +82,16 @@ bool Spin::configure (GnomeScreensaver & gs)
gluLookAt(0, 0, 10, 0, 0, 0, 0, 1, 0); gluLookAt(0, 0, 10, 0, 0, 0, 0, 1, 0);
m_num_monitors = gs.getNumMonitors(); m_num_monitors = gs.getNumMonitors();
delete[] m_directions; delete[] m_monitor_info;
delete[] m_rotations; m_monitor_info = new monitor_info_t[m_num_monitors];
m_directions = new int[m_num_monitors];
m_rotations = new matrix_t[m_num_monitors];
for (int i = 0; i < m_num_monitors; i++) for (int i = 0; i < m_num_monitors; i++)
{ {
m_directions[i] = (int) (rand() / (double)RAND_MAX * m_monitor_info[i].direction = (int) (rand() / (double)RAND_MAX *
sizeof(directions) / sizeof(directions[0])); sizeof(directions) / sizeof(directions[0]));
if (m_directions[i] >= sizeof(directions) / sizeof(directions[0])) if (m_monitor_info[i].direction
m_directions[i] = 0; >= sizeof(directions) / sizeof(directions[0]))
glGetFloatv(GL_MODELVIEW_MATRIX, &m_rotations[i][0]); m_monitor_info[i].direction = 0;
glGetFloatv(GL_MODELVIEW_MATRIX, &m_monitor_info[i].rotation[0]);
} }
return true; return true;

10
modes/Spin.h
View File

@ -14,12 +14,16 @@ class Spin : public Mode
bool expose (GnomeScreensaver & gs); bool expose (GnomeScreensaver & gs);
bool configure (GnomeScreensaver & gs); bool configure (GnomeScreensaver & gs);
bool update (GnomeScreensaver & gs); bool update (GnomeScreensaver & gs);
typedef float matrix_t[16]; typedef struct monitor_info_s
{
int direction;
float rotation[16];
int switch_time;
} monitor_info_t;
protected: protected:
LogoBox m_logobox; LogoBox m_logobox;
int * m_directions;
matrix_t * m_rotations;
int m_num_monitors; int m_num_monitors;
monitor_info_t *m_monitor_info;
unsigned int m_last_switch_ticks; unsigned int m_last_switch_ticks;
unsigned int m_last_ticks; unsigned int m_last_ticks;
}; };