Merge branch 'VSCandyMountains' of https://github.com/obviousjim/CLOUDS…

… into feature-64

CloudsData/visualsystems/CandyMountains/Presets/first timeline/TimeInfo.xml

@@ -0,0 +1,6 @@
+<timeinfo>
+    <indefinite>0</indefinite>
+    <duration>60.000000000</duration>
+    <introDuration>0.000000000</introDuration>
+    <outroDuration>0.000000000</outroDuration>
+</timeinfo>

CloudsData/visualsystems/CandyMountains/Presets/first timeline/Timeline/IntroOutro.xml

@@ -0,0 +1 @@
+<keyframes />

CloudsData/visualsystems/CandyMountains/Presets/first timeline/Timeline/cameraTrack.xml

@@ -0,0 +1 @@
+<keyframes />

CloudsData/visualsystems/CandyMountains/Presets/first timeline/Timeline/first timeline_inout.xml

@@ -0,0 +1,4 @@
+<inout>
+    <in>0.000000000</in>
+    <out>1.000000000</out>
+</inout>

CloudsData/visualsystems/CandyMountains/Presets/first timeline/Timeline/first timeline_zoomer.xml

@@ -0,0 +1,4 @@
+<zoom>
+    <min>0.000000000</min>
+    <max>1.000000000</max>
+</zoom>

CloudsLibrary/src/VisualSystems/CandyMountains/vs_src/CloudsVisualSystemCandyMountains.cpp

@@ -0,0 +1,254 @@
+#include "testApp.h"
+
+
+//--------------------------------------------------------------
+void testApp::setup(){
+
+    ofSetFrameRate(30);
+    ofSetDepthTest(true);
+    state = 3;
+
+    aa.playStems(0);
+    cs.setup();
+    cs.gui->setVisible(false);
+
+//    vector<ofFloatColor> colors;
+//    for (int i = 0; i < 13; i++) {
+//        colors.push_back(ofFloatColor(ofRandomuf()));
+//    }
+
+//    for (int i = 0; i < 13; i++) {
+//        cs.addColorRef(&colors[i]);
+//    }
+
+    cs.assignRandom(true);
+
+    tm.setup(&aa, &cs);
+    cm.setup(&tm);
+    lm.setup(&cs);
+    pm.setup();
+
+    useLights = true;
+
+    setupGUI();
+
+    cm.cam.setupPerspective(false);
+    updateCam = false;
+
+
+
+}
+
+//--------------------------------------------------------------
+void testApp::update(){
+    aa.updateAnalytics();
+
+//    cs.setHue(ofMap(aa.kurtosisSmoothed.getMean(), 0, aa.maxKurtosis[0], 0.0, 1.0));
+    cs.setSaturation(ofMap(aa.centroidSmoothed.getMean(), 30, 55, 0.0, 1.0));
+    cs.setBrightness(aa.ampSmoothed.getMean());
+    cs.setDistance(ofMap(aa.pitchSmoothed.getMedian(), 50, 90, 0.0, 0.5));
+
+    tm.update();
+    cm.update();
+    lm.update();
+
+    gui->update();
+
+}
+
+//--------------------------------------------------------------
+void testApp::draw(){
+
+    ofEnableAlphaBlending();
+
+    if (state == 0) {
+        pm.post.begin(cm.cam);
+        if (useLights) lm.begin();
+
+        ofFloatColor bgColor = cs.colorScheme[0][0];
+        float complementHue = bgColor.getHue() + 0.5;
+        if (complementHue > 1.0) complementHue-=1.0;
+        bgColor.setHue(complementHue);
+        bgColor.setSaturation(bgColor.getSaturation() - 0.2);
+
+        ofBackground(bgColor);
+        tm.draw();
+
+        if (useLights) lm.end();
+        pm.post.end();
+    }
+    else if (state == 1) {
+        cs.draw();
+    }
+    else if (state == 2) {
+        aa.drawAnalytics();
+    }
+    else if (state == 3) {
+
+        ofFloatColor gradientStart = cs.colorScheme[0][0];
+        float complementHue = gradientStart.getHue() + 0.5;
+        if (complementHue > 1.0) complementHue-=1.0;
+        ofFloatColor gradientEnd;
+        gradientEnd.setHue(complementHue);
+        gradientEnd.setSaturation(gradientStart.getSaturation() - 0.2);
+
+        ofBackgroundGradient(gradientEnd, gradientStart);
+
+        cm.cam.begin();
+        lm.begin();
+        tm.draw();
+        lm.end();
+        cm.cam.end();
+
+    }
+
+    ofDisableAlphaBlending();
+}
+
+
+
+//--------------------------------------------------------------
+void testApp::setupGUI(){
+
+    float dim = 16;
+	float xInit = OFX_UI_GLOBAL_WIDGET_SPACING;
+    float length = 255-xInit;
+
+    gui = new ofxUICanvas(0, 0, length+xInit, ofGetHeight());
+
+    gui->addFPSSlider("FPS SLIDER", length-xInit, dim*.25, 60);
+    gui->addSpacer(length-xInit, 1);
+    gui->addSlider("camX", -260, 260, &cm.camX, length-xInit, dim);
+    gui->addSlider("camY", 0.0, 500, &cm.camY, length-xInit, dim);
+    gui->addSpacer(length-xInit, 1);
+    gui->addSlider("lookatX", -260, 260, &cm.lookatX, length-xInit, dim);
+    gui->addSlider("lookatY", -500, 500, &cm.lookatY, length-xInit, dim);
+
+    gui->toggleVisible();
+    ofAddListener(gui->newGUIEvent,this,&testApp::guiEvent);
+}
+
+
+//--------------------------------------------------------------
+void testApp::guiEvent(ofxUIEventArgs &e){
+    string name = e.widget->getName();
+    int kind = e.widget->getKind();
+
+}
+
+
+
+//--------------------------------------------------------------
+void testApp::keyPressed(int key){
+    pm.keyPressed(key);
+
+    switch (key) {
+
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+        case '0':
+            aa.setMode(key - 48);
+            break;
+
+
+        case 'f':
+            ofToggleFullscreen();
+            break;
+
+        case 'g':
+            gui->toggleVisible();
+            cs.gui->toggleVisible();
+            break;
+
+
+        case 's':
+            state = (state + 1) % 4;
+            if (state == 0){
+                cs.gui->setVisible(false);
+            }
+            else if (state == 1) {
+                gui->setVisible(false);
+                cs.gui->setVisible(true);
+            }
+            else if (state == 2) {
+                gui->setVisible(false);
+                cs.gui->setVisible(false);
+            }
+            break;
+
+        case 'p':
+            aa.playStems(0);
+            break;
+
+        case 'r':
+            cs.assignRandom(true);
+            break;
+
+        case 'k':
+
+            cout << "kurtosis " << aa.audioFeatures[0]->spectralFeatures["kurtosis"] << endl;
+            break;
+
+        case 'l':
+            useLights = !useLights;
+            break;
+
+//        case 'n':
+//			shouldRenderNormals ^= true;
+//			break;
+//		case 'q':
+//			shouldUseFlatShading ^= true;
+//			break;
+
+        case 'c':
+            updateCam = !updateCam;
+            break;
+    }
+}
+
+//--------------------------------------------------------------
+void testApp::keyReleased(int key){
+
+}
+
+//--------------------------------------------------------------
+void testApp::mouseMoved(int x, int y ){
+
+}
+
+//--------------------------------------------------------------
+void testApp::mouseDragged(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void testApp::mousePressed(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void testApp::mouseReleased(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void testApp::windowResized(int w, int h){
+
+}
+
+//--------------------------------------------------------------
+void testApp::gotMessage(ofMessage msg){
+
+}
+
+//--------------------------------------------------------------
+void testApp::dragEvent(ofDragInfo dragInfo){ 
+
+}

CloudsLibrary/src/VisualSystems/CandyMountains/vs_src/CloudsVisualSystemCandyMountains.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include "ofMain.h"
+
+#include "ofxPostProcessing.h"
+#include "ofxUI.h"
+#include "ofxMeshUtils.h"
+
+
+#include "audioAnalytics.h"
+#include "colorSchemeDesigner.h"
+#include "terrainManager.h"
+#include "cameraManager.h"
+#include "lightManager.h"
+#include "postProcManager.h"
+
+#include "decayer.h"
+
+class testApp : public ofBaseApp{
+
+public:
+    void setup();
+    void update();
+    void draw();
+
+    void setupGUI();
+    void guiEvent(ofxUIEventArgs &e);
+
+    void keyPressed(int key);
+    void keyReleased(int key);
+    void mouseMoved(int x, int y );
+    void mouseDragged(int x, int y, int button);
+    void mousePressed(int x, int y, int button);
+    void mouseReleased(int x, int y, int button);
+    void windowResized(int w, int h);
+    void dragEvent(ofDragInfo dragInfo);
+    void gotMessage(ofMessage msg);
+
+
+	audioAnalytics aa;
+    colorSchemeDesigner cs;
+    terrainManager tm;
+    cameraManager cm;
+    lightManager lm;
+    postProcManager pm;
+
+    int state;
+
+    ofxUICanvas *gui;
+
+    bool useLights;
+    bool updateCam;
+
+};