From: Gabriel Dunne <gdunne@quilime.com>
Date: Sat, 27 Apr 2013 03:30:57 +0000 (-0700)
Subject: Some updates
X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=HEAD;p=stars.git

Some updates
---

diff --git a/intern/Global.cpp b/intern/Global.cpp
index 85e6e09..a261a89 100755
--- a/intern/Global.cpp
+++ b/intern/Global.cpp
@@ -10,33 +10,31 @@ Global *Global::instance;
 Global::Global()
 {
     srand(982);
-    glEnable(GL_LINE_SMOOTH);
-    glEnable(GL_POINT_SMOOTH);
-    glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
 
     ////////////////////////////////////////////////
     _PERFORM_ = false;
     ////////////////////////////////////////////////
 
     instance = this;
-
-
     for (int i = 0; i < 20000; i++ ){
         rnd.push_back(randomFloat());
     }
+
+    glEnable(GL_LINE_SMOOTH);
+    glEnable(GL_POINT_SMOOTH);
+    glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
+
     for ( int i=0; i < 10000; i++){
         thingies.push_back(new Thingy());
         thingies.back()->z = ((rnd[i+7] - .5) * 1000000000);
     }
-    movecount = 0;
-
-
 
+    movecount = 0;
     toggleFullScreen();
     hideMouse();
 
     if ( !_PERFORM_ ) {
-        ifstream infile("20-min_1440x1050.txt");
+        ifstream infile("media/20-min_1440x1050.txt");
         while(  infile.good()  ) {
             int p;
             infile >> p;
@@ -61,10 +59,11 @@ void Global::loop()
     }
     else {
         rnd.clear();
-        for (int i = 0; i < 20000; i++ ){
+        for(int i = 0; i < 20000; i++){
             rnd.push_back(randomFloat());
         }
         vector<Thingy*>::iterator it;
+
         int cnt = 0;
         for(it=thingies.begin();it!=thingies.end();it++)
         {
@@ -79,7 +78,7 @@ void Global::loop()
     int MPOS = 0;
     if (_PERFORM_) {
         MPOS = mouseX();
-        capture.push_back(mouseX());
+        capture.push_back(MPOS);
     } else {
         MPOS = move[movecount];
     }