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

added a LightBounceBoxComparator to order logos by distance from viewer

Browse Source 
git-svn-id: svn://anubis/dwscr/trunk@102 5bef9df8-b654-44bb-925b-0ff18baa8f8c
This commit is contained in:
josh 2008-11-13 19:23:30 +00:00
parent 47c652a150
commit aac98e8699
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ss/LightBounce.cc
View File

@ -52,6 +52,13 @@ void LightBounceBox::updateDist(float x, float y, float z)
this->dist = (dx*dx) + (dy*dy) + (dz*dz); this->dist = (dx*dx) + (dy*dy) + (dz*dz);
} }
bool LightBounceBoxComparator::operator()(LightBounceBox * l1, LightBounceBox * l2)
{
return l1->getDist() > l2->getDist();
}
/* construct screensaver mode and do some basic OpenGL setup */ /* construct screensaver mode and do some basic OpenGL setup */
LightBounce::LightBounce(SSMain * _SSMain) : SSMode(_SSMain) LightBounce::LightBounce(SSMain * _SSMain) : SSMode(_SSMain)
{ {
@ -112,6 +119,7 @@ LightBounce::LightBounce(SSMain * _SSMain) : SSMode(_SSMain)
} }
glPushAttrib(GL_POLYGON_BIT); /* store CULL_FACE settings */ glPushAttrib(GL_POLYGON_BIT); /* store CULL_FACE settings */
// glEnable(GL_BLEND);
} }
LightBounce::~LightBounce() LightBounce::~LightBounce()
@ -142,6 +150,7 @@ void LightBounce::update()
{ {
m_boxes[i]->updateDist(viewer_x, viewer_y, viewer_z); m_boxes[i]->updateDist(viewer_x, viewer_y, viewer_z);
} }
sort(m_boxes.begin(), m_boxes.end(), m_comparator);
for (int i = 0; i < numMonitors; i++) for (int i = 0; i < numMonitors; i++)
{ {

8
ss/LightBounce.h
View File

@ -21,6 +21,7 @@ public:
~LightBounceBox(); ~LightBounceBox();
void draw() { glCallList(m_dl); } void draw() { glCallList(m_dl); }
void updateDist(float x, float y, float z); void updateDist(float x, float y, float z);
float getDist() { return dist; }
private: private:
float x; float x;
@ -34,6 +35,12 @@ private:
GLuint m_dl; GLuint m_dl;
}; };
class LightBounceBoxComparator
{
public:
bool operator()(LightBounceBox * l1, LightBounceBox * l2);
};
class LightBounce : public SSMode class LightBounce : public SSMode
{ {
public: public:
@ -41,6 +48,7 @@ public:
~LightBounce(); ~LightBounce();
void update(); void update();
protected: protected:
LightBounceBoxComparator m_comparator;
vector<LightBounceBox *> m_boxes; vector<LightBounceBox *> m_boxes;
LogoBox m_logoBox; LogoBox m_logoBox;
}; };