world & oscillation fix attempts

CLOUDS/CLOUDS.vcxproj

@@ -259,7 +259,7 @@ xcopy /e /i /y "$(ProjectDir)..\..\..\addons\ofxTimeline\libs\sndfile\export\vs\
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <PreprocessorDefinitions>NO_TIMER;CLOUDS_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler;..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\addons\ofxAutoReloadedShader\src;..\..\..\addons\ofxAnimationPrimitives\src;..\..\..\addons\ofxColorPalettes\src;..\..\..\addons\ofxBillboard\src;..\..\..\addons\ofxBox2d\libs\triangle;..\..\..\addons\ofxBox2d\libs\Box2D\Collision\Shapes;..\..\..\addons\ofxBox2d\libs\Box2D\Dynamics\Joints;..\..\..\addons\ofxBox2d\libs\Box2D\Dynamics\Contacts;..\..\..\addons\ofxBox2d\libs\Box2D\Dynamics;..\..\..\addons\ofxBox2d\libs\Box2D\Common;..\..\..\addons\ofxBox2d\libs\Box2D\Collision;..\..\..\addons\ofxBox2d\libs\Box2D;..\..\..\addons\ofxBox2d\src;..\..\..\addons\ofxBinaryMesh\src;..\..\..\addons\ofxCameraSaveLoad\src;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxFTGL\libs\FTGL\lib;..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxGameCamera\src;..\..\..\addons\ofxGpuParticles\src;..\..\..\addons\ofxJSON\libs\jsoncpp\include;..\..\..\addons\ofxJSON\libs\jsoncpp\include\json;..\..\..\addons\ofxJSON\libs\jsoncpp\src;..\..\..\addons\ofxJSON\src;..\..\..\addons\ofxMarchingCubes\src;..\..\..\addons\ofxMPMFluid\src;..\..\..\addons\ofxMSACore\src;..\..\..\addons\ofxMSAObjCPointer\src;..\..\..\addons\ofxMSAPhysics\src;..\..\..\addons\ofxNearestNeighbour\libs\nanoflann\include;..\..\..\addons\ofxNearestNeighbour\src;..\..\..\addons\ofxObjLoader\libs\glm;..\..\..\addons\ofxObjLoader\src;..\..\..\addons\ofxOcean\libs\kiss\tools;..\..\..\addons\ofxOcean\libs\kiss\src;..\..\..\addons\ofxOcean\libs\kiss\include;..\..\..\addons\ofxOcean\src;..\..\..\addons\ofxOpenSteer\libs\opensteer\include;..\..\..\addons\ofxOpenSteer\libs\opensteer\include\OpenSteer;..\..\..\addons\ofxOpenSteer\libs\opensteer\src;..\..\..\addons\ofxOpenSteer\src;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32;..\..\..\addons\ofxOsc\libs\oscpack\src\osc;..\..\..\addons\ofxOsc\libs\oscpack\src\ip;..\..\..\addons\ofxOsc\libs\oscpack\src;..\..\..\addons\ofxOsc\libs\oscpack;..\..\..\addons\ofxOsc\src;..\..\..\addons\ofxPostProcessing\src;..\..\..\addons\ofxPtf\src;..\..\..\addons\ofxRegex;..\..\..\addons\ofxSimpleSpline\src;..\..\..\addons\ofxSimpleSurface\src;..\..\..\addons\ofxSubtitles\src;..\..\..\addons\ofxTextWriter\src;..\..\..\addons\ofxGenerative\src;..\CloudsLibrary\src;..\CloudsLibrary\src\Input;..\CloudsLibrary\src\Sound\RTCMix\src;..\CloudsLibrary\src\Sound;..\CloudsLibrary\src\SecondaryDisplay\Sender;..\CloudsLibrary\src\StoryEngine;..\CloudsLibrary\src\RGBD;..\CloudsLibrary\src\RGBD\Portal;..\CloudsLibrary\src\RGBD\GPUParticles;..\CloudsLibrary\src\RGBD\BackgroundParticles;..\CloudsLibrary\src\RGBD\HUD;..\CloudsLibrary\src\VisualSystemsLibrary;..\CloudsLibrary\src\VisualSystemsPrivate\Process18\vs_src;..\CloudsLibrary\src\VisualSystemsPrivate\Process11\vs_src;..\CloudsLibrary\src\VisualSystemsPrivate\LIA\vs_src;..\CloudsLibrary\src\VisualSystems\YellowTail\vs_src\yt;..\CloudsLibrary\src\VisualSystems\YellowTail\vs_src;..\CloudsLibrary\src\VisualSystems\Xstatic\vs_src;..\CloudsLibrary\src\VisualSystems\WormHole\vs_src;..\CloudsLibrary\src\VisualSystems\World\vs_src;..\CloudsLibrary\src\VisualSystems\Voro\vs_src\voro++;..\CloudsLibrary\src\VisualSystems\Voro\vs_src;..\CloudsLibrary\src\VisualSystems\Vision\vs_src;..\CloudsLibrary\src\VisualSystems\VerletForm\vs_src;..\CloudsLibrary\src\VisualSystems\VectorFlow\vs_src;..\CloudsLibrary\src\VisualSystems\Twitter\vs_src;..\CloudsLibrary\src\VisualSystems\Terrain\vs_src;..\CloudsLibrary\src\VisualSystems\Swim\vs_src\utils;..\CloudsLibrary\src\VisualSystems\Swim\vs_src;..\CloudsLibrary\src\VisualSystems\Schlabberbox\vs_src;..\CloudsLibrary\src\VisualSystems\Satoruhiga\vs_src;..\CloudsLibrary\src\VisualSystems\RGBDVideo\vs_src;..\CloudsLibrary\src\VisualSystems\Replicator\vs_src;..\CloudsLibrary\src\VisualSystems\RandomDigits2\vs_src;..\CloudsLibrary\src\VisualSystems\PhotoGlitch\vs_src;..\CloudsLibrary\src\VisualSystems\Paradox\vs_src;..\CloudsLibrary\src\VisualSystems\Pages\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5SpinningSolids\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5TextUniverse\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5Spaghetti\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5SpaceJunk\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5SeaOfLines\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5NoiseSphere\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5Machine\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5Hackpact\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5Fifteen\vs_src;..\CloudsLibrary\src\VisualSystems\Orbit\vs_src;..\CloudsLibrary\src\VisualSystems\Oscillations\vs_src;..\CloudsLibrary\src\VisualSystems\Ocean\vs_src;..\CloudsLibrary\src\VisualSystems\Neurons\vs_src;..\CloudsLibrary\src\VisualSystems\Metaballs\vs_src;..\CloudsLibrary\src\VisualSystems\Memory\vs_src;..\CloudsLibrary\src\VisualSystems\MazeGenerator\vs_src;..\CloudsLibrary\src\VisualSystems\MazeGenerator2\vs_src;..\CloudsLibrary\src\VisualSystems\MarchingCubes\vs_src;..\CloudsLibrary\src\VisualSystems\Mandala\vs_src;..\CloudsLibrary\src\VisualSystems\LSystem\vs_src;..\CloudsLibrary\src\VisualSystems\LinePoem\vs_src;..\CloudsLibrary\src\VisualSystems\LaplacianTunnel\vs_src;..\CloudsLibrary\src\VisualSystems\Histogram\vs_src;..\CloudsLibrary\src\VisualSystems\GesturePaint\vs_src;..\CloudsLibrary\src\VisualSystems\ForkingPaths\vs_src;..\CloudsLibrary\src\VisualSystems\Empty\vs_src;..\CloudsLibrary\src\VisualSystems\Flying\vs_src;..\CloudsLibrary\src\VisualSystems\Flocking\vs_src;..\CloudsLibrary\src\VisualSystems\Fireworks\vs_src;..\CloudsLibrary\src\VisualSystems\ExampleVectorMath\vs_src;..\CloudsLibrary\src\VisualSystems\ExampleOpenSteer\vs_src;..\CloudsLibrary\src\VisualSystems\ExampleMPMFluid\vs_src;..\CloudsLibrary\src\VisualSystems\ExampleBox2D\vs_src;..\CloudsLibrary\src\VisualSystems\DrawnLine\vs_src;..\CloudsLibrary\src\VisualSystems\DataCascade\vs_src;..\CloudsLibrary\src\VisualSystems\CubeCraft\vs_src;..\CloudsLibrary\src\VisualSystems\Cosmic\vs_src;..\CloudsLibrary\src\VisualSystems\Connectors\vs_src;..\CloudsLibrary\src\VisualSystems\Colony\vs_src;..\CloudsLibrary\src\VisualSystems\Code\vs_src\Panels;..\CloudsLibrary\src\VisualSystems\Code\vs_src;..\CloudsLibrary\src\VisualSystems\Cities\vs_src;..\CloudsLibrary\src\VisualSystems\Circuit\vs_src;..\CloudsLibrary\src\VisualSystems\CirclePacking\vs_src;..\CloudsLibrary\src\VisualSystems\Chromogram\vs_src;..\CloudsLibrary\src\VisualSystems\Balloons\vs_src;..\CloudsLibrary\src\VisualSystems\BallDroppings\vs_src;..\CloudsLibrary\src\VisualSystems\Automata\vs_src;..\CloudsLibrary\src\VisualSystems\Astrolabe\vs_src;..\CloudsLibrary\src\VisualSystems\3DModelLoader\vs_src;..\CloudsLibrary\src\VisualSystems\2DVideo\vs_src;..\CloudsLibrary\src\VisualSystems\_Intro\vs_src;..\CloudsLibrary\src\VisualSystems\_ClusterMap\vs_src;..\CloudsLibrary\src\VisualSystems\Ripples\vs_src;..\CloudsLibrary\src\VisualSystems\Rulez\vs_src\ofxRules\src\actions;..\CloudsLibrary\src\VisualSystems\Scrape\vs_src;..\CloudsLibrary\src\VisualSystems\Rulez\vs_src;..\CloudsLibrary\src\VisualSystems\Rulez\vs_src\ofxRules\src;src</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -285,7 +285,7 @@ xcopy /e /i /y "$(ProjectDir)..\..\..\addons\ofxTimeline\libs\sndfile\export\vs6
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <PreprocessorDefinitions>CLOUDS_INTERLUDE_NAV=1;OCULUS_RIFT=1;CLOUDS_APP=1;NO_TIMER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler;..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include;..\..\..\addons\ofxAssimpModelLoader\src;..\..\..\addons\ofxAutoReloadedShader\src;..\..\..\addons\ofxAnimationPrimitives\src;..\..\..\addons\ofxColorPalettes\src;..\..\..\addons\ofxBillboard\src;..\..\..\addons\ofxBox2d\libs\triangle;..\..\..\addons\ofxBox2d\libs\Box2D\Collision\Shapes;..\..\..\addons\ofxBox2d\libs\Box2D\Dynamics\Joints;..\..\..\addons\ofxBox2d\libs\Box2D\Dynamics\Contacts;..\..\..\addons\ofxBox2d\libs\Box2D\Dynamics;..\..\..\addons\ofxBox2d\libs\Box2D\Common;..\..\..\addons\ofxBox2d\libs\Box2D\Collision;..\..\..\addons\ofxBox2d\libs\Box2D;..\..\..\addons\ofxBox2d\src;..\..\..\addons\ofxBinaryMesh\src;..\..\..\addons\ofxCameraSaveLoad\src;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxFTGL\libs\FTGL\lib;..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxGameCamera\src;..\..\..\addons\ofxGpuParticles\src;..\..\..\addons\ofxJSON\libs\jsoncpp\include;..\..\..\addons\ofxJSON\libs\jsoncpp\include\json;..\..\..\addons\ofxJSON\libs\jsoncpp\src;..\..\..\addons\ofxJSON\src;..\..\..\addons\ofxMarchingCubes\src;..\..\..\addons\ofxMPMFluid\src;..\..\..\addons\ofxMSACore\src;..\..\..\addons\ofxMSAObjCPointer\src;..\..\..\addons\ofxMSAPhysics\src;..\..\..\addons\ofxNearestNeighbour\libs\nanoflann\include;..\..\..\addons\ofxNearestNeighbour\src;..\..\..\addons\ofxObjLoader\libs\glm;..\..\..\addons\ofxObjLoader\src;..\..\..\addons\ofxOcean\libs\kiss\tools;..\..\..\addons\ofxOcean\libs\kiss\src;..\..\..\addons\ofxOcean\libs\kiss\include;..\..\..\addons\ofxOcean\src;..\..\..\addons\ofxOpenSteer\libs\opensteer\include;..\..\..\addons\ofxOpenSteer\libs\opensteer\include\OpenSteer;..\..\..\addons\ofxOpenSteer\libs\opensteer\src;..\..\..\addons\ofxOpenSteer\src;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32;..\..\..\addons\ofxOsc\libs\oscpack\src\osc;..\..\..\addons\ofxOsc\libs\oscpack\src\ip;..\..\..\addons\ofxOsc\libs\oscpack\src;..\..\..\addons\ofxOsc\libs\oscpack;..\..\..\addons\ofxOsc\src;..\..\..\addons\ofxPostProcessing\src;..\..\..\addons\ofxPtf\src;..\..\..\addons\ofxRegex;..\..\..\addons\ofxSimpleSpline\src;..\..\..\addons\ofxSimpleSurface\src;..\..\..\addons\ofxSubtitles\src;..\..\..\addons\ofxTextWriter\src;..\..\..\addons\ofxGenerative\src;..\CloudsLibrary\src;..\CloudsLibrary\src\Input;..\CloudsLibrary\src\Sound\RTCMix\src;..\CloudsLibrary\src\Sound;..\CloudsLibrary\src\SecondaryDisplay\Sender;..\CloudsLibrary\src\StoryEngine;..\CloudsLibrary\src\RGBD;..\CloudsLibrary\src\RGBD\Portal;..\CloudsLibrary\src\RGBD\GPUParticles;..\CloudsLibrary\src\RGBD\BackgroundParticles;..\CloudsLibrary\src\RGBD\HUD;..\CloudsLibrary\src\VisualSystemsLibrary;..\CloudsLibrary\src\VisualSystemsPrivate\Process18\vs_src;..\CloudsLibrary\src\VisualSystemsPrivate\Process11\vs_src;..\CloudsLibrary\src\VisualSystemsPrivate\LIA\vs_src;..\CloudsLibrary\src\VisualSystems\YellowTail\vs_src\yt;..\CloudsLibrary\src\VisualSystems\YellowTail\vs_src;..\CloudsLibrary\src\VisualSystems\Xstatic\vs_src;..\CloudsLibrary\src\VisualSystems\WormHole\vs_src;..\CloudsLibrary\src\VisualSystems\World\vs_src;..\CloudsLibrary\src\VisualSystems\Voro\vs_src\voro++;..\CloudsLibrary\src\VisualSystems\Voro\vs_src;..\CloudsLibrary\src\VisualSystems\Vision\vs_src;..\CloudsLibrary\src\VisualSystems\VerletForm\vs_src;..\CloudsLibrary\src\VisualSystems\VectorFlow\vs_src;..\CloudsLibrary\src\VisualSystems\Twitter\vs_src;..\CloudsLibrary\src\VisualSystems\Terrain\vs_src;..\CloudsLibrary\src\VisualSystems\Swim\vs_src\utils;..\CloudsLibrary\src\VisualSystems\Swim\vs_src;..\CloudsLibrary\src\VisualSystems\Schlabberbox\vs_src;..\CloudsLibrary\src\VisualSystems\Satoruhiga\vs_src;..\CloudsLibrary\src\VisualSystems\RGBDVideo\vs_src;..\CloudsLibrary\src\VisualSystems\Replicator\vs_src;..\CloudsLibrary\src\VisualSystems\RandomDigits2\vs_src;..\CloudsLibrary\src\VisualSystems\PhotoGlitch\vs_src;..\CloudsLibrary\src\VisualSystems\Paradox\vs_src;..\CloudsLibrary\src\VisualSystems\Pages\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5SpinningSolids\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5TextUniverse\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5Spaghetti\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5SpaceJunk\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5SeaOfLines\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5NoiseSphere\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5Machine\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5Hackpact\vs_src;..\CloudsLibrary\src\VisualSystems\OpenP5Fifteen\vs_src;..\CloudsLibrary\src\VisualSystems\Orbit\vs_src;..\CloudsLibrary\src\VisualSystems\Oscillations\vs_src;..\CloudsLibrary\src\VisualSystems\Ocean\vs_src;..\CloudsLibrary\src\VisualSystems\Neurons\vs_src;..\CloudsLibrary\src\VisualSystems\Metaballs\vs_src;..\CloudsLibrary\src\VisualSystems\Memory\vs_src;..\CloudsLibrary\src\VisualSystems\MazeGenerator\vs_src;..\CloudsLibrary\src\VisualSystems\MazeGenerator2\vs_src;..\CloudsLibrary\src\VisualSystems\MarchingCubes\vs_src;..\CloudsLibrary\src\VisualSystems\Mandala\vs_src;..\CloudsLibrary\src\VisualSystems\LSystem\vs_src;..\CloudsLibrary\src\VisualSystems\LinePoem\vs_src;..\CloudsLibrary\src\VisualSystems\LaplacianTunnel\vs_src;..\CloudsLibrary\src\VisualSystems\Histogram\vs_src;..\CloudsLibrary\src\VisualSystems\GesturePaint\vs_src;..\CloudsLibrary\src\VisualSystems\ForkingPaths\vs_src;..\CloudsLibrary\src\VisualSystems\Empty\vs_src;..\CloudsLibrary\src\VisualSystems\Flying\vs_src;..\CloudsLibrary\src\VisualSystems\Flocking\vs_src;..\CloudsLibrary\src\VisualSystems\Fireworks\vs_src;..\CloudsLibrary\src\VisualSystems\ExampleVectorMath\vs_src;..\CloudsLibrary\src\VisualSystems\ExampleOpenSteer\vs_src;..\CloudsLibrary\src\VisualSystems\ExampleMPMFluid\vs_src;..\CloudsLibrary\src\VisualSystems\ExampleBox2D\vs_src;..\CloudsLibrary\src\VisualSystems\DrawnLine\vs_src;..\CloudsLibrary\src\VisualSystems\DataCascade\vs_src;..\CloudsLibrary\src\VisualSystems\CubeCraft\vs_src;..\CloudsLibrary\src\VisualSystems\Cosmic\vs_src;..\CloudsLibrary\src\VisualSystems\Connectors\vs_src;..\CloudsLibrary\src\VisualSystems\Colony\vs_src;..\CloudsLibrary\src\VisualSystems\Code\vs_src\Panels;..\CloudsLibrary\src\VisualSystems\Code\vs_src;..\CloudsLibrary\src\VisualSystems\Cities\vs_src;..\CloudsLibrary\src\VisualSystems\Circuit\vs_src;..\CloudsLibrary\src\VisualSystems\CirclePacking\vs_src;..\CloudsLibrary\src\VisualSystems\Chromogram\vs_src;..\CloudsLibrary\src\VisualSystems\Balloons\vs_src;..\CloudsLibrary\src\VisualSystems\BallDroppings\vs_src;..\CloudsLibrary\src\VisualSystems\Automata\vs_src;..\CloudsLibrary\src\VisualSystems\Astrolabe\vs_src;..\CloudsLibrary\src\VisualSystems\3DModelLoader\vs_src;..\CloudsLibrary\src\VisualSystems\2DVideo\vs_src;..\CloudsLibrary\src\VisualSystems\_Intro\vs_src;..\CloudsLibrary\src\VisualSystems\_ClusterMap\vs_src;..\CloudsLibrary\src\VisualSystems\Ripples\vs_src;..\CloudsLibrary\src\VisualSystems\Rulez\vs_src\ofxRules\src\actions;..\CloudsLibrary\src\VisualSystems\Scrape\vs_src;..\CloudsLibrary\src\VisualSystems\Rulez\vs_src;..\CloudsLibrary\src\VisualSystems\Rulez\vs_src\ofxRules\src;src</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>

CloudsLibrary/src/VisualSystems/Oscillations/vs_src/CloudsVisualSystemOscillations.cpp

@@ -4,19 +4,8 @@
 
 #include "CloudsVisualSystemOscillations.h"
 
-//#include "CloudsRGBDVideoPlayer.h"
-//#ifdef AVF_PLAYER
-//#include "ofxAVFVideoPlayer.h"
-//#endif
-
-//These methods let us add custom GUI parameters and respond to their events
-
-
-
-
 void CloudsVisualSystemOscillations::selfSetupGui(){
 
-    //Using James' values.
     float length = (gui->getGlobalCanvasWidth()-gui->getWidgetSpacing()*5)/3.;
     float dim = gui->getGlobalSliderHeight();
 
@@ -219,9 +208,10 @@ void CloudsVisualSystemOscillations::selfDraw(){
 
 	ofPushStyle();
 	ofEnableAlphaBlending();
-    glPushAttrib(GL_LINE_SMOOTH | GL_DEPTH_TEST | GL_POINT_SIZE);
-    glDisable( GL_LINE_SMOOTH );
-    glHint( GL_LINE_SMOOTH_HINT, GL_NICEST );
+
+    //glPushAttrib(GL_LINE_SMOOTH | GL_DEPTH_TEST | GL_POINT_SIZE);
+    //glDisable( GL_LINE_SMOOTH );
+    //glHint( GL_LINE_SMOOTH_HINT, GL_NICEST );
     ofDisableDepthTest();
 //    ofEnableBlendMode(OF_BLENDMODE_ADD);
     if (displayGrid) {
@@ -233,9 +223,7 @@ void CloudsVisualSystemOscillations::selfDraw(){
         grid.drawWireframe();
         glDisable(GL_LINE_STIPPLE);
     }
-
-
-
+
     //TODO: Customize
     glPointSize(2.0);
 
@@ -254,9 +242,11 @@ void CloudsVisualSystemOscillations::selfDraw(){
     oscillator.setUniform2f("resolution",width,height);
 
     ofSetLineWidth(CurveLineWidth);
+
 	mesh.draw();
     oscillator.end();
-    glPopAttrib();
+
+//    glPopAttrib();
 	ofPopStyle();
 }
 

CloudsLibrary/src/VisualSystems/World/vs_src/CloudsVisualSystemWorld.cpp

@@ -527,19 +527,28 @@ void CloudsVisualSystemWorld::selfDraw()
 
     //  STARS & CONSTELATIONS ( outside the pushMatrix )
     //
+	ofPushStyle();
+	ofEnableAlphaBlending();
     glPointSize(1.1);
-	ofSetLineWidth(.1);
+	ofSetLineWidth(2);
+	ofMesh starMesh;
+	ofMesh lineMesh;
     for(int i = 0; i < stars.size(); i++){
         if (stars[i]->constName == selectedConstelation && constelationRnd >= 1.0 ){
             stars[i]->constAlpha = ofLerp(stars[i]->constAlpha,constelationMax,0.01);
         } else {
             stars[i]->constAlpha = ofLerp(stars[i]->constAlpha,constelationMin,0.01);
         }
-        stars[i]->draw();
+        stars[i]->draw(starMesh, lineMesh);
     }
+	starMesh.drawVertices();
+	lineMesh.setMode(OF_PRIMITIVE_LINES);
+	lineMesh.draw();
+	ofPopStyle();
 
     glDisable(GL_NORMALIZE);
     ofDisableDepthTest();
+
 
 }
 

CloudsLibrary/src/VisualSystems/World/vs_src/wStar.cpp

@@ -24,19 +24,26 @@ void wStar::place( float _ra, float _dec){
     this->set(decRot * raRot * ofPoint(0,0,-1000));
 }
 
-void wStar::draw(){
-    ofPushStyle();
-
-    ofSetColor(ofFloatColor(1.0,ofNoise(x,y,z*ofGetElapsedTimef()*0.005)*1.5 ));
-    glBegin(GL_POINTS);
-    glVertex3f(x,y,z);
-    glEnd();
+void wStar::draw(ofMesh& starMesh, ofMesh& lineMesh){
+ //   ofPushStyle();
+
+	starMesh.addColor(ofFloatColor(1.0,ofNoise(x,y,z*ofGetElapsedTimef()*0.005)*1.5 ));
+	starMesh.addVertex(*this);
+
+//    ofSetColor();
+//    glBegin(GL_POINTS);
+//    glVertex3f(x,y,z);
+//    glEnd();
 
     if (connect != NULL){
-        ofSetColor(ofFloatColor(0.8,constAlpha));
-        ofSetLineWidth(2.0);
-        ofLine(*this, *connect);
+		lineMesh.addColor(ofFloatColor(0.8,constAlpha));
+		lineMesh.addColor(ofFloatColor(0.8,constAlpha));
+//        ofSetColor();
+//        ofSetLineWidth(2.0);
+		lineMesh.addVertex(*this);
+		lineMesh.addVertex(*connect);
+//        ofLine(*this, *connect);
     }
 
-    ofPopStyle();
+//    ofPopStyle();
 }

CloudsLibrary/src/VisualSystems/World/vs_src/wStar.h

@@ -15,7 +15,7 @@ class wStar : public ofPoint {
 	wStar();
 
     void    place( float _ra, float _dec );
-	void	draw();
+	void	draw(ofMesh& starMesh, ofMesh& lineMesh);
 
     string  constName;
     float   constAlpha;

VSOscillations/src/main.cpp

@@ -5,7 +5,4 @@ int main(){
 	ofSetupOpenGL(1224, 768, OF_WINDOW);
 	ofRunApp(new testApp()); // start the app
 
-//    ofEnableSmoothing();
-    ofEnableAlphaBlending();
-
 }