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

Spin: replaced 6 orthogonal directions with a completely random axis

Browse Source
This commit is contained in:
Josh Holtrop 2010-12-08 13:03:38 -05:00
parent a3936d1e43
commit 34a8729811
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modes/Spin.cc
View File

@ -1,16 +1,13 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <math.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#include "Spin.h" #include "Spin.h"
static const float directions[][3] = {
{0, 0, 1}, {0, 0, -1}, {0, 1, 0}, {0, -1, 0}, {1, 0, 0}, {-1, 0, 0}
};
Spin::Spin() Spin::Spin()
{ {
m_num_monitors = 1; m_num_monitors = 1;
@ -34,7 +31,7 @@ bool Spin::expose (GnomeScreensaver & gs)
if (gs.getTicks() - m_monitor_info[i].last_switch_ticks if (gs.getTicks() - m_monitor_info[i].last_switch_ticks
> m_monitor_info[i].switch_time) > m_monitor_info[i].switch_time)
{ {
m_monitor_info[i].direction = getRandomDirection(); getRandomAxis(&m_monitor_info[i].axis);
m_monitor_info[i].switch_time = getRandomSwitchTime(); m_monitor_info[i].switch_time = getRandomSwitchTime();
m_monitor_info[i].last_switch_ticks = gs.getTicks(); m_monitor_info[i].last_switch_ticks = gs.getTicks();
} }
@ -49,11 +46,10 @@ bool Spin::expose (GnomeScreensaver & gs)
glLoadMatrixf(&m_monitor_info[monitor_num].rotation[0]); glLoadMatrixf(&m_monitor_info[monitor_num].rotation[0]);
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], m_monitor_info[monitor_num].axis[0],
directions[direction][1], m_monitor_info[monitor_num].axis[1],
directions[direction][2]); m_monitor_info[monitor_num].axis[2]);
glGetFloatv(GL_MODELVIEW_MATRIX, glGetFloatv(GL_MODELVIEW_MATRIX,
&m_monitor_info[monitor_num].rotation[0]); &m_monitor_info[monitor_num].rotation[0]);
@ -92,20 +88,20 @@ void Spin::initMonitorInfo()
{ {
for (int i = 0; i < m_num_monitors; i++) for (int i = 0; i < m_num_monitors; i++)
{ {
m_monitor_info[i].direction = getRandomDirection(); getRandomAxis(&m_monitor_info[i].axis);
glGetFloatv(GL_MODELVIEW_MATRIX, &m_monitor_info[i].rotation[0]); glGetFloatv(GL_MODELVIEW_MATRIX, &m_monitor_info[i].rotation[0]);
m_monitor_info[i].switch_time = getRandomSwitchTime(); m_monitor_info[i].switch_time = getRandomSwitchTime();
m_monitor_info[i].last_switch_ticks = 0; m_monitor_info[i].last_switch_ticks = 0;
} }
} }
int Spin::getRandomDirection() void Spin::getRandomAxis(float (*axis)[3])
{ {
int direction = (int) (rand() / (double)RAND_MAX * double alpha = rand() / (double)RAND_MAX * 2.0 * M_PI;
sizeof(directions) / sizeof(directions[0])); double beta = rand() / (double)RAND_MAX * M_PI;
if (direction >= sizeof(directions) / sizeof(directions[0])) (*axis)[0] = cos(alpha) * sin(beta);
direction = 0; (*axis)[1] = sin(alpha) * sin(beta);
return direction; (*axis)[2] = cos(beta);
} }
uint32_t Spin::getRandomSwitchTime() uint32_t Spin::getRandomSwitchTime()

4
modes/Spin.h
View File

@ -16,7 +16,7 @@ class Spin : public Mode
bool update (GnomeScreensaver & gs); bool update (GnomeScreensaver & gs);
typedef struct monitor_info_s typedef struct monitor_info_s
{ {
int direction; float axis[3];
float rotation[16]; float rotation[16];
int switch_time; int switch_time;
uint32_t last_switch_ticks; uint32_t last_switch_ticks;
@ -27,7 +27,7 @@ class Spin : public Mode
monitor_info_t *m_monitor_info; monitor_info_t *m_monitor_info;
unsigned int m_last_ticks; unsigned int m_last_ticks;
void initMonitorInfo(); void initMonitorInfo();
int getRandomDirection(); void getRandomAxis(float (*axis)[3]);
uint32_t getRandomSwitchTime(); uint32_t getRandomSwitchTime();
}; };