Reset機能をつけてなんどもできるように

murawakimitsuhiro · Aug 30, 2017 · 0499928 · 0499928
1 parent 4bd49c7
commit 0499928
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/...oject.xcworkspace/xcuserdata/murawakimitsuhiro.xcuserdatad/UserInterfaceState.xcuserstate b/...oject.xcworkspace/xcuserdata/murawakimitsuhiro.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/bin/Brain-Fu_kDebug.app/Contents/MacOS/Brain-Fu_kDebug b/bin/Brain-Fu_kDebug.app/Contents/MacOS/Brain-Fu_kDebug
diff --git a/src/BrainController.cpp b/src/BrainController.cpp
@@ -18,6 +18,9 @@ void BrainController::setup() {
     setupOSCMessageReceive();
 }
 
+void BrainController::reload() {
+}
+
 //LINK OSC
 void BrainController::setupOSCMessageReceive() {
     /* /gain to gain */
@@ -32,18 +35,21 @@ void BrainController::update() {
         models[i].update();
     }
 
+    /*
     if (wasStart == 0) {
         return;
-    }
+    }*/
 
     //decomposed by time
-    if (isLearning > 0 && nextDecomposeNum/* * 3*/ - int(ofGetElapsedTimef()) < 0) {
+    if ((nextDecomposeNum+decomposeCount*BrainModelData::modelNum) * 0.3 - int(ofGetElapsedTimef()) < 0) {
+//    if (isLearning > 0 && nextDecomposeNum/* * 3*/ - int(ofGetElapsedTimef()) < 0) {
         models[nextDecomposeNum].startDecompose();
 
         if (nextDecomposeNum == BrainModelData::modelNum - 10) {
             nextDecomposeNum = 0;
+            decomposeCount++;
             for (int i=0; i<BrainModelData::modelNum; i++) {
-                models[i].setStateSolid();
+                models[i].reset();
             }
         } else {
             nextDecomposeNum++;

diff --git a/src/BrainController.hpp b/src/BrainController.hpp
@@ -38,6 +38,9 @@ class BrainController {
     void update();
     void draw();
     void drawWithMesh(ofxAssimpModelLoader mesh);
+    void reload();
+
+    int decomposeCount = 0;
 };
 
 #endif /* BrainController_hpp */
diff --git a/src/ofDecomposeModel.cpp b/src/ofDecomposeModel.cpp
@@ -33,6 +33,15 @@ void ofDecomposeModel::startDecompose() {
     }
 }
 
+void ofDecomposeModel::reset() {
+    setStateSolid();
+    decomposeBeginTime = 0;
+    vectors.clear();
+    speeds.clear();
+    colors.clear();
+    decomposeCount++;
+}
+
 void ofDecomposeModel::setStateSolid() {
     state = solid;
 }
@@ -46,7 +55,7 @@ void ofDecomposeModel::update() {
             if (vectors[i].z > 70) {
                 speeds[i].x = ofRandom(-12, 12);
                 speeds[i].y = ofRandom(-12, 12);
-                speeds[i].z = 5.5;
+                speeds[i].z = 6.5;//5.5;
 
                 //float alpha = (vectors[i].z - 100) / 100;
 
@@ -105,6 +114,6 @@ void ofDecomposeModel::drawDecomposing() {
     vbo.updateVertexData(vectorArray, vectors.size());
     vbo.updateColorData(colorArray, colors.size());
 
-    glPointSize(1);
+    glPointSize(0.01);
     vbo.draw(GL_POINTS, 0, vectors.size());
 }
diff --git a/src/ofDecomposeModel.hpp b/src/ofDecomposeModel.hpp
@@ -37,6 +37,9 @@ class ofDecomposeModel: public ofxAssimpModelLoader {
     void draw();
     void startDecompose();
     void setStateSolid();
+
+    void reset();
+    int decomposeCount = 0;
 };
 
 #endif /* ofDisassemblyModel_hpp */