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

rework initial logo offsets

Browse Source
This commit is contained in:
Josh Holtrop 2011-10-12 12:28:58 -04:00
parent 07a2157fe6
commit 14b92e35af
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modes/Tunnel.cc
View File

@ -12,9 +12,10 @@
using namespace std; using namespace std;
#define N_INITIAL_LAYERS 5
#define N_LOGOS_PER_RING 12 #define N_LOGOS_PER_RING 12
#define RING_RADIUS 18 #define RING_RADIUS 18
#define BREAKOFF_DIST 20 #define BREAKOFF_DIST 80
#define RING_LAYER_DIST 10 #define RING_LAYER_DIST 10
Tunnel::Tunnel() Tunnel::Tunnel()
@ -36,7 +37,7 @@ bool Tunnel::expose (GnomeScreensaver & gs)
it++) it++)
{ {
glPushMatrix(); glPushMatrix();
glTranslatef(0, m_offset + it->offset + 50, 0); glTranslatef(0, m_offset + it->offset, 0);
glRotatef(it->trot, 0, 1, 0); glRotatef(it->trot, 0, 1, 0);
glTranslatef(RING_RADIUS, 0, 0); glTranslatef(RING_RADIUS, 0, 0);
glRotatef(-90.0, 0, 0, 1); glRotatef(-90.0, 0, 0, 1);
@ -62,14 +63,14 @@ bool Tunnel::configure (GnomeScreensaver & gs)
glViewport(0, 0, gs.getWidth(), gs.getHeight()); glViewport(0, 0, gs.getWidth(), gs.getHeight());
for (int i = 0; i < 5; i++) for (int i = 0; i < N_INITIAL_LAYERS; i++)
{ {
for (int j = 0; j < N_LOGOS_PER_RING; j++) for (int j = 0; j < N_LOGOS_PER_RING; j++)
{ {
float zrot = ((j + i) & 0x3) * 90.0; float zrot = ((j + i) & 0x3) * 90.0;
float trot = j * 360.0 / N_LOGOS_PER_RING; float trot = j * 360.0 / N_LOGOS_PER_RING;
LBStruct lbs = { LBStruct lbs = {
-i * RING_LAYER_DIST, (N_INITIAL_LAYERS - i) * RING_LAYER_DIST,
zrot, zrot,
trot, trot,
{0, 0, 1} {0, 0, 1}