From 8d47a75758f7daaaa2b45ebf3aa31be6255fc718 Mon Sep 17 00:00:00 2001
From: Yoz Grahame <yoz@yoz.com>
Date: Mon, 26 Nov 2012 14:47:30 -0800
Subject: [PATCH] Commented out cubes, added particle count, misc cleanup

---
 main.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/main.cpp b/main.cpp
index 87cbc5c2c7..5010dcf1d5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -49,9 +49,6 @@
 #include "cloud.h"
 #include "agent.h"
 
-
-//TGAImg Img;
-
 using namespace std;
 
 //   Junk for talking to the Serial Port 
@@ -95,7 +92,7 @@ ParticleSystem balls(0,
                      0.0                        //  Gravity 
                      );
 
-Cloud cloud(0,                             //  Particles
+Cloud cloud(100000,                             //  Particles
             box,                                //  Bounding Box
             false                               //  Wrap
             );
@@ -243,6 +240,8 @@ void initDisplay(void)
     glEnable(GL_LIGHTING);
     glEnable(GL_LIGHT0);
     glEnable(GL_DEPTH_TEST);
+    
+    load_png_as_texture(texture_filename);
 }
 
 void init(void)
@@ -276,20 +275,24 @@ void init(void)
         myHead.setNoise(noise);
     }
     
+    // turning cubes off for the moment -
+    // uncomment to re-enable
+    /*
+
     int index = 0;
     float location[] = {0,0,0};
     float scale = 10.0;
     int j = 0;
     while (index < (MAX_CUBES/2)) {
+    
         index = 0;
         j++;
         makeCubes(location, scale, &index, cubes_position, cubes_scale, cubes_color);
         std::cout << "Run " << j << " Made " << index << " cubes\n";
         cube_count = index;
     }
+    */
     
-    //load_png_as_texture(texture_filename);
-
     if (serial_on)
     {
         //  Call readsensors for a while to get stable initial values on sensors    
@@ -525,8 +528,6 @@ void display(void)
     
         /* Draw Point Sprites */
     
-        load_png_as_texture(texture_filename);
-
         glDisable( GL_POINT_SPRITE_ARB );
         glDisable( GL_TEXTURE_2D );
         if (!display_head) cloud.render();