From cccc31f53caa96f834e601318e87cd4cc52a652f Mon Sep 17 00:00:00 2001 From: ponchio Date: Wed, 1 Dec 2004 18:46:21 +0000 Subject: [PATCH] Microchanges. --- apps/nexus/nexusmt.cpp | 2 +- apps/nexus/nexusmt.h | 2 +- apps/nexus/nexusview.cpp | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/apps/nexus/nexusmt.cpp b/apps/nexus/nexusmt.cpp index 4685c5a9..cd5deffe 100644 --- a/apps/nexus/nexusmt.cpp +++ b/apps/nexus/nexusmt.cpp @@ -240,7 +240,7 @@ void NexusMt::Draw(vector &cells) { switch(mode) { case POINTS: glDrawArrays(GL_POINTS, 0, patch.nv); break; - case DEBUG: + case PATCHES: glColor3ub((cell * 27)%255, (cell * 37)%255, (cell * 87)%255); case SMOOTH: if(signature & NXS_FACES) diff --git a/apps/nexus/nexusmt.h b/apps/nexus/nexusmt.h index c7cb6e0f..fe17995e 100644 --- a/apps/nexus/nexusmt.h +++ b/apps/nexus/nexusmt.h @@ -108,7 +108,7 @@ class NexusMt: public Nexus { HIDDEN_LINE, FLAT_WIRE, FLAT, - DEBUG }; + PATCHES }; enum Component { COLOR = 0x1, NORMAL = 0x2, diff --git a/apps/nexus/nexusview.cpp b/apps/nexus/nexusview.cpp index ba9b6d6c..0fa02ab8 100644 --- a/apps/nexus/nexusview.cpp +++ b/apps/nexus/nexusview.cpp @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.22 2004/11/28 04:16:19 ponchio +*** empty log message *** + Revision 1.21 2004/11/28 01:23:26 ponchio Fixing borders... let's hope. @@ -250,6 +253,7 @@ int main(int argc, char *argv[]) { bool redraw = false; float fps = 0; float tframe = 0; + while( !quit ) { bool first = true; SDL_WaitEvent(&event); @@ -278,10 +282,10 @@ int main(int argc, char *argv[]) { ram_size *= 1.5; nexus.SetRamExtractionSize(ram_size); cerr << "Max extraction ram size: " << ram_size << endl; break; - + case SDLK_s: metric = NexusMt::FRUSTUM; break; case SDLK_p: mode = NexusMt::POINTS; nexus.SetMode(mode); break; - case SDLK_d: mode = NexusMt::DEBUG; nexus.SetMode(mode); break; + case SDLK_d: mode = NexusMt::PATCHES; nexus.SetMode(mode); break; case SDLK_f: mode = NexusMt::FLAT; nexus.SetMode(mode); break; case SDLK_m: mode = NexusMt::SMOOTH; nexus.SetMode(mode); break; @@ -390,10 +394,9 @@ int main(int argc, char *argv[]) { nexus.policy.Init(); nexus.tri_total = 0; nexus.tri_rendered = 0; - nexus.Extract(cells); - nexus.Draw(cells); - } else - nexus.Draw(cells); + nexus.Extract(cells); + } + nexus.Draw(cells); if(show_borders) { for(unsigned int i = 0; i < cells.size(); i++) {