Changeset 167:4a9556a866ac

Timestamp:

03/21/2012 11:19:14 PM (15 months ago)

Author:

Andreas Schaefer <gentryx@…>

Branch:

default

Message:

presentable version

Location:

src/examples/flowingcanvas

Files:

• canvascell.h (modified) (1 diff)
• canvasinitializer.h (modified) (1 diff)
• canvaswriter.h (modified) (5 diffs)
• flowwidget.h (modified) (2 diffs)
• interactivesimulator.h (modified) (1 diff)
• main.cu (modified) (2 diffs)

src/examples/flowingcanvas/canvascell.h

@@ -58 +58 @@
     static inline unsigned nanoSteps()
     {
-        return 5;
+        return 8;
     }
 

src/examples/flowingcanvas/canvasinitializer.h

@@ -11 +11 @@
 public:
     CanvasInitializer() :
-        // SimpleInitializer<CanvasCell>(Coord<2>(240, 135), 100)
-        SimpleInitializer<CanvasCell>(Coord<2>(320, 180), 100)
+        SimpleInitializer<CanvasCell>(Coord<2>(240, 135), 100)
+        // SimpleInitializer<CanvasCell>(Coord<2>(320, 180), 100)
         // SimpleInitializer<CanvasCell>(Coord<2>(384, 216), 100)
         // SimpleInitializer<CanvasCell>(Coord<2>(640, 360), 100)

src/examples/flowingcanvas/canvaswriter.h

@@ -63 +63 @@
         Writer<CanvasCell>("foo", _sim, 1),
         outputFrame(_outputFrame),
-        mode(5)
+        particleMode(3),
+        cameraMode(1)
     {}
 
@@ -71 +72 @@
     virtual void stepFinished()
     {
-        switch (mode) {
+        const typename Simulator<CanvasCell>::GridType *grid = sim->getGrid();
+
+        switch (particleMode) {
         case 0:
-            drawAttribute(SelectCameraPixel());
+            drawForce(grid, SelectForceVario());
             break;
         case 1:
-            drawAttribute(SelectCameraLevel());
+            drawForce(grid, SelectForceFixed());
             break;
         case 2:
-            drawForce(SelectForceVario());
+            drawForce(grid, SelectForceTotal());
             break;
         case 3:
-            drawForce(SelectForceFixed());
-            break;
-        case 4:
-            drawForce(SelectForceTotal());
-            break;
-        case 5:
-            drawParticles();
+            drawParticles(grid);
             break;
         default:
             break;
         }
+
+        switch (cameraMode) {
+        case 0:
+            drawAttribute(grid, SelectCameraPixel());
+            break;
+        case 1:
+            drawAttribute(grid, SelectCameraLevel());
+            break;
+        default:
+            break;
+        }
     }
 
@@ -100 +108 @@
 
 public slots:
-    virtual void cycleViewMode()
-    {
-        mode = (mode + 1) % 6;
+    virtual void cycleViewModeParticle()
+    {
+        particleMode = (particleMode + 1) % 4;
+    }
+
+    virtual void cycleViewModeCamera()
+    {
+        cameraMode = (cameraMode + 1) % 3;
     }
 
 private:
     QImage **outputFrame;
-    int mode;
+    int particleMode;
+    int cameraMode;
 
     template<typename SELECTOR>
-    void drawForce(const SELECTOR& selector)
+    void drawForce(const typename Simulator<CanvasCell>::GridType *grid, const SELECTOR& selector)
     {
         Coord<2> dim = sim->getInitializer()->gridDimensions();
-        const typename Simulator<CanvasCell>::GridType *grid = sim->getGrid();
        
         int spacingX = 10;
@@ -147 +160 @@
     // fixme: scale to image size
     template<typename SELECTOR>
-    void drawAttribute(const SELECTOR& selector)
+    void drawAttribute(const typename Simulator<CanvasCell>::GridType *grid, const SELECTOR& selector)
     {
         Coord<2> dim = sim->getInitializer()->gridDimensions();
-        const typename Simulator<CanvasCell>::GridType *grid = sim->getGrid();
        
         for (int y = 0; y < dim.y(); ++y) {
@@ -159 +171 @@
     }
 
-    void drawParticles()
+    void drawParticles(const typename Simulator<CanvasCell>::GridType *grid)
     {
         Coord<2> dim = sim->getInitializer()->gridDimensions();
-        const typename Simulator<CanvasCell>::GridType *grid = sim->getGrid();
-
         float factorX = 1.0 * (*outputFrame)->width()  / dim.x();
         float factorY = 1.0 * (*outputFrame)->height() / dim.y();

src/examples/flowingcanvas/flowwidget.h

@@ -36 +36 @@
         std::cout << "got key " << event->key() << "\n";
         if (event->key() == Qt::Key_Space) {
-            emit cycleViewMode();
+            emit cycleViewModeParticle();
+        }
+
+        if (event->key() == Qt::Key_Enter) {
+            emit cycleViewModeCamera();
         }
     }
@@ -57 +61 @@
 signals:
     void updateImage(QImage*);
-    void cycleViewMode();
+    void cycleViewModeParticle();
+    void cycleViewModeCamera();
 
 private:

src/examples/flowingcanvas/interactivesimulator.h

@@ -52 +52 @@
         update();
         incFrames();
-        std::cout << getFrames() << " " << fps() << " FPS\r";
+        // std::cout << "\r" << getFrames() << " " << fps() << " FPS";
     }
 

src/examples/flowingcanvas/main.cu

@@ -44 +44 @@
     QObject::connect(timerGrab, SIGNAL(timeout()),           grabber, SLOT(grab()));
 
-    QObject::connect(&flow,     SIGNAL(cycleViewMode()),     writer,  SLOT(cycleViewMode()));
+    QObject::connect(&flow,     SIGNAL(cycleViewModeParticle()), writer,  SLOT(cycleViewModeParticle()));
+    QObject::connect(&flow,     SIGNAL(cycleViewModeCamera()),   writer,  SLOT(cycleViewModeCamera()));
+
     QObject::connect(grabber,   SIGNAL(newFrame(char*, unsigned, unsigned)), 
                      sim,       SLOT(updateCam( char*, unsigned, unsigned)));
     QObject::connect(&flow,     SIGNAL(updateImage(QImage*)),
                      sim,       SLOT(renderImage(QImage*)));
+
     QObject::connect(&app,      SIGNAL(lastWindowClosed()),  sim,       SLOT(quit()));
     QObject::connect(&app,      SIGNAL(lastWindowClosed()),  timerFlow, SLOT(stop()));
@@ -62 +65 @@
     grabber->grab();
     timerFlow->start(10);
-    timerGrab->start(200);
+    timerGrab->start(100);
     timerInfo->start(5000);
     flow.show();