Changeset 157:cad7f155bd52

Timestamp:

03/20/2012 03:40:41 AM (14 months ago)

Author:

Andreas Schaefer <gentryx@…>

Branch:

default

Message:

flowing canvas demo is awfully slow, but advection forces are looking good

Location:

src/examples

Files:

• flowingcanvas/CMakeLists.txt (modified) (1 diff)
• flowingcanvas/flowwidget.h (modified) (2 diffs)
• flowingcanvas/framegrabber.cpp (added)
• flowingcanvas/framegrabber.h (added)
• flowingcanvas/interactivesimulator.h (modified) (7 diffs)
• flowingcanvas/interactivesimulatorcpu.h (modified) (4 diffs)
• flowingcanvas/main.cpp (modified) (10 diffs)
• latticegas/fpscounter.h (modified) (1 diff)

src/examples/flowingcanvas/CMakeLists.txt

@@ -14 +14 @@
 set(MY_HEADERS
   flowwidget.h
+  framegrabber.h
   interactivesimulator.h)
 

src/examples/flowingcanvas/flowwidget.h

@@ -32 +32 @@
     void ping()
     {
-        emit updateImage((unsigned*)image.scanLine(0), image.width(), image.height());        
+        emit updateImage(&image);
         // if (simParamsHost.dumpFrames) 
         //     dumpFrame();
@@ -45 +45 @@
 
 signals:
-    void updateImage(unsigned *image, unsigned width, unsigned height);
+    void updateImage(QImage*);
 
 private:

src/examples/flowingcanvas/interactivesimulator.h

@@ -3 +3 @@
 
 #include <iostream>
+#include <QImage>
 #include <QObject>
 #include <QRunnable>
@@ -22 +23 @@
     void updateCam(char *rawFrame, unsigned width, unsigned height)
     {
+        // fixme: we could get raceconditions here as the simulator
+        // may not have consumed the last camera frame
+        int frameSize = 3 * width * height;
+        cameraFrameWidth  = width;
+        cameraFrameHeight = height;
+        cameraFrame.resize(frameSize);
+        std::copy(rawFrame, rawFrame + frameSize, &cameraFrame[0]);
+
+        newCameraFrame.release();
     }
 
@@ -27 +37 @@
     {
         if (newCameraFrame.tryAcquire()) 
-            loadStates();
+            readCam();
         if (newOutputFrameRequested.tryAcquire()) {
             renderOutput();
@@ -35 +45 @@
         update();
         incFrames();
-        ++t;
     }
 
-    void renderImage(unsigned *image, unsigned width, unsigned height) 
+    void renderImage(QImage *image) 
     {
         if (!running) {
@@ -45 +54 @@
 
         outputFrame = image;
-        outputFrameWidth = width;
-        outputFrameHeight = height;
         newOutputFrameRequested.release();
         newOutputFrameAvailable.acquire();
     }
 
-    virtual void loadStates() = 0;
+    virtual void readCam() = 0;
     virtual void renderOutput() = 0;
     virtual void update() = 0;
@@ -65 +72 @@
         while (running) {
             step();
-            std::cout << t << " " << fps() << " FPS\r";
+            std::cout << getFrames() << " " << fps() << " FPS\r";
         }
-        std::cout << "run done\n";
-        std::cout << "newOutputFrameRequested: " << newOutputFrameRequested.available() << "\n"
-                  << "newOutputFrameAvailable: " << newOutputFrameAvailable.available() << "\n"
-                  << "newCameraFrame:          " << newCameraFrame.available() << "\n";
     }
 
     void quit()
     {
-        std::cout << "i've been told to quit\n";
         running = false;
     }
 
 protected:
-    int t;
     volatile bool running;
     QSemaphore newOutputFrameRequested;
@@ -86 +87 @@
     QSemaphore newCameraFrame;
 
-    unsigned *outputFrame;
-    volatile unsigned outputFrameWidth;
-    volatile unsigned outputFrameHeight;
+    QImage *outputFrame;
+    SuperVector<unsigned char> cameraFrame;
+    int cameraFrameWidth;
+    int cameraFrameHeight;
 };
 

src/examples/flowingcanvas/interactivesimulatorcpu.h

@@ -13 +13 @@
 public:
     typedef typename CELL_TYPE::Topology Topology;
-    typedef Grid<CELL_TYPE, Topology> GridType;
+    typedef typename SerialSimulator<CELL_TYPE>::GridType GridType;
     InteractiveSimulatorCPU(QObject *parent, Initializer<CELL_TYPE> *initializer) :
         InteractiveSimulator(parent),
@@ -20 +20 @@
 
     virtual ~InteractiveSimulatorCPU()
+    {}
+
+    virtual void readCam()
     {
-        std::cout << "InteractiveSimulatorCPU dying\n";
-    }
+        Coord<2> dim = sim.getInitializer()->gridDimensions();
+        // fixme: ugly hack
+        GridType *grid = (GridType*)sim.getGrid();
+        float factorX = 1.0 * cameraFrameWidth  / dim.x();
+        float factorY = 1.0 * cameraFrameHeight / dim.y();
 
-    virtual void loadStates()
-    {
-        std::cout << "loadStates()\n";
+        for (int y = 0; y < dim.y(); ++y) {
+            for (int x = 0; x < dim.x(); ++x) {
+                Coord<2> c(x, y);
+                (*grid)[c].readCam(&cameraFrame[0], factorX, factorY, cameraFrameWidth, cameraFrameHeight);
+            }
+        }
     }
 
@@ -33 +42 @@
     {
         Coord<2> dim = sim.getInitializer()->gridDimensions();
-        const typename SerialSimulator<CELL_TYPE>::GridType *grid = sim.getGrid();
-        int maxX = std::min((int)outputFrameWidth,  dim.x());
-        int maxY = std::min((int)outputFrameHeight, dim.y());
+        const GridType *grid = sim.getGrid();
+       
 
-        for (int y = 0; y < maxY; ++y) {
-            for (int x = 0; x < maxX; ++x) {
-                outputFrame[y * outputFrameWidth + x] = (*grid)[Coord<2>(x, y)].toColor();
+        int spacingX = 10;
+        int spacingY = 10;
+        float factorX = 1.0 * outputFrame->width()  / dim.x();
+        float factorY = 1.0 * outputFrame->height() / dim.y();
+
+        QPainter p(outputFrame);
+        p.setBrush(QBrush(Qt::black));
+        p.drawRect(0, 0, outputFrame->width(), outputFrame->height());
+        p.setBrush(QBrush(Qt::white));
+        p.setPen(QPen(Qt::white));
+
+        for (int y = 0; y < dim.y(); y += spacingY) {
+            for (int x = 0; x < dim.x(); x += spacingX) {
+                int startX = (x + 0.5) * factorX;
+                int startY = (y + 0.5) * factorY;
+                // float force0 = (*grid)[Coord<2>(x, y)].forceFixed[0];
+                // float force1 = (*grid)[Coord<2>(x, y)].forceFixed[1];
+                // float force0 = (*grid)[Coord<2>(x, y)].forceVario[0];
+                // float force1 = (*grid)[Coord<2>(x, y)].forceVario[1];
+                float force0 = (*grid)[Coord<2>(x, y)].forceVario[0] * 0.5 + 0.5 * (*grid)[Coord<2>(x, y)].forceFixed[0];
+                float force1 = (*grid)[Coord<2>(x, y)].forceVario[1] * 0.5 + 0.5 * (*grid)[Coord<2>(x, y)].forceFixed[1];
+                int offsetX = force0 * spacingX * factorX * 0.8;
+                int offsetY = force1 * spacingY * factorY * 0.8;
+                int endX = startX + offsetX;
+                int endY = startY + offsetY;
+                p.drawLine(startX, startY, endX, endY); 
+                QRectF rec(endX - spacingX * 0.1, endY - spacingY * 0.1, spacingX * 0.2, spacingY * 0.2);
+                p.drawPie(rec, 0, 5760);
             }
         }
+
+        // for (int y = 0; y < dim.y(); ++y) {
+        //     for (int x = 0; x < dim.x(); ++x) {
+        //         unsigned col = (0xff << 24) + ((int)((*grid)[Coord<2>(x, y)].cameraLevel * 250) << 16);
+        //         outputFrame->setPixel(x, y, col);
+        //     }
+        // }
+        
+        // for (int y = 0; y < dim.y(); ++y) {
+        //     for (int x = 0; x < dim.x(); ++x) {
+        //         outputFrame->setPixel(x, y, (*grid)[Coord<2>(x, y)].cameraPixel);
+        //     }
+        // }
     }
 
@@ -51 +97 @@
 private:
     SerialSimulator<CELL_TYPE> sim;
-    std::vector<unsigned> frame;
+
 };
 

src/examples/flowingcanvas/main.cpp

@@ -3 +3 @@
 #include <QThreadPool>
 #include <libgeodecomp/examples/flowingcanvas/flowwidget.h>
+#include <libgeodecomp/examples/flowingcanvas/framegrabber.h>
 #include <libgeodecomp/examples/flowingcanvas/interactivesimulatorcpu.h>
 #include <libgeodecomp/io/simpleinitializer.h>
@@ -32 +33 @@
     static const int TILE_WIDTH = 4;
     static const int TILE_HEIGHT = 4;
-
+    
     static inline unsigned nanoSteps()
     {
@@ -41 +42 @@
         Coord<2> _pos = Coord<2>(), 
         bool _forceSet = false,
-        FloatCoord<2> _forceFixed = FloatCoord<2>()) 
+        FloatCoord<2> _forceFixed = FloatCoord<2>()) :
+        cameraLevel(0)
     {
         pos[0] = _pos.x();
@@ -57 +59 @@
         pos[0] = oldSelf.pos[0];
         pos[1] = oldSelf.pos[1];
+        cameraPixel = oldSelf.cameraPixel;
+
         forceSet = oldSelf.forceSet;
         if (forceSet) {
@@ -72 +76 @@
         }
 
-        // camera = std::min(0, oldSelf.camera - 1);
-        // smoothCam = (hood[Coord<2>(0, -1)].smoothCam +
-        //              hood[Coord<2>(-1, 0)].smoothCam +
-        //              hood[Coord<2>(1,  0)].smoothCam +
-        //              hood[Coord<2>(0,  1)].smoothCam) * 0.25;
-
-        // if ((camera < hood[Coord<2>(0, -1)].camera) ||
-        //     (camera < hood[Coord<2>(-1, 0)].camera) ||
-        //     (camera < hood[Coord<2>( 1, 0)].camera) ||
-        //     (camera < hood[Coord<2>(0,  1)].camera)) {
-        //     smoothCam = camera;
-        // }
+        cameraLevel = (hood[Coord<2>(0, -1)].cameraLevel +
+                       hood[Coord<2>(-1, 0)].cameraLevel +
+                       hood[Coord<2>(1,  0)].cameraLevel +
+                       hood[Coord<2>(0,  1)].cameraLevel) * 0.25;
+        
+        float gradientX = hood[Coord<2>(1, 0)].cameraLevel - hood[Coord<2>(-1, 0)].cameraLevel;
+        float gradientY = hood[Coord<2>(0, 1)].cameraLevel - hood[Coord<2>(0, -1)].cameraLevel;
+        forceVario[0] = 0;
+        if ((gradientX > 0.011) || (gradientX < -0.011)) {
+            forceVario[0] = 0.01 / gradientX;
+        } else {
+            forceVario[0] = 0;
+        }
+
+        if ((gradientY > 0.011) || (gradientY < -0.011)) {
+            forceVario[1] = 0.01 / gradientY;
+        } else {
+            forceVario[1] = 0;
+        }
 
 //         float gradient[2];
@@ -106 +117 @@
     }
 
-    unsigned toColor() const 
-    {
-        unsigned a = 0xff;
-        unsigned r = 128 + 120 * forceFixed[0];
-        unsigned g = 0;
-        unsigned b = 0;
-        return
-            (a << 24) +
-            (r << 16) +
-            (g <<  8) +
-            (b <<  0);
-    }
-
-private:
-    char color[TILE_HEIGHT][TILE_WIDTH][3];
+    void readCam(unsigned char *frame, const float& factorX, const float& factorY, const int& width, const int& height)
+    {
+        int posX = pos[0] * factorX;
+        int posY = pos[1] * factorY;
+        
+        int index = posY * width * 3 + posX * 3;
+        cameraPixel = (0xff << 24) + 
+            (frame[index + 0] << 16) +
+            (frame[index + 1] <<  8) +
+            (frame[index + 2] <<  0);
+
+        int val = (int)frame[index + 0] + (int)frame[index + 1] + (int)frame[index + 2];
+        if (val < 500) {
+            cameraLevel = 1.0;
+        } else {
+            cameraLevel = std::max(0.0, cameraLevel - 0.05);
+        }
+    }
+
+    // fixme:
+// private:
+    unsigned color[TILE_HEIGHT][TILE_WIDTH];
+    unsigned cameraPixel;
     float pos[2];
     bool forceSet;
 
-    float camera;
-    float smoothCam;
+    float cameraLevel;
     float forceVario[2];
     float forceFixed[2];
@@ -141 +159 @@
 public:
     CanvasInitializer() :
-        SimpleInitializer<CanvasCell>(Coord<2>(640, 360), 100)
+        // SimpleInitializer<CanvasCell>(Coord<2>(240, 135), 100)
+        SimpleInitializer<CanvasCell>(Coord<2>(320, 180), 100)
+        // SimpleInitializer<CanvasCell>(Coord<2>(640, 360), 100)
     {}
 
@@ -155 +175 @@
             if ((c.x() == 100) && (c.y() >= 100) && (c.y() <= 200)) {
                 setForce = true;
+                force.c[1] = -1;
+            }
+            if ((c.x() == 200) && (c.y() >= 100) && (c.y() <= 200)) {
+                setForce = true;
                 force.c[1] = 1;
-            }
-            if ((c.x() == 200) && (c.y() >= 100) && (c.y() <= 200)) {
-                setForce = true;
-                force.c[1] = -1;
             }
             if ((c.y() == 100) && (c.x() >= 100) && (c.x() <= 200)) {
@@ -184 +204 @@
         &flow,
         new CanvasInitializer());
+    FrameGrabber *grabber = new FrameGrabber(true, &flow);
 
     QTimer *timerFlow = new QTimer(&flow);
-    // QTimer *timerGrab = new QTimer(&flow);
+    QTimer *timerGrab = new QTimer(&flow);
     QTimer *timerInfo = new QTimer(&flow);
 
     QObject::connect(timerInfo, SIGNAL(timeout()),           &flow,   SLOT(info()));
-    // QObject::connect(timerInfo, SIGNAL(timeout()),           grabber, SLOT(info()));
+    QObject::connect(timerInfo, SIGNAL(timeout()),           grabber, SLOT(info()));
     QObject::connect(timerInfo, SIGNAL(timeout()),           sim,     SLOT(info()));
     QObject::connect(timerFlow, SIGNAL(timeout()),           &flow,   SLOT(ping()));
-    // QObject::connect(timerGrab, SIGNAL(timeout()),           grabber, SLOT(grab()));
-
-    QObject::connect(&flow,     SIGNAL(updateImage(unsigned*, unsigned, unsigned)),
-                     sim,       SLOT(renderImage(unsigned*, unsigned, unsigned)));
+    QObject::connect(timerGrab, SIGNAL(timeout()),           grabber, SLOT(grab()));
+
+    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()));
-    // QObject::connect(&app,      SIGNAL(lastWindowClosed()),  timerGrab, SLOT(stop()));
+    QObject::connect(&app,      SIGNAL(lastWindowClosed()),  timerGrab, SLOT(stop()));
     QObject::connect(&app,      SIGNAL(lastWindowClosed()),  timerInfo, SLOT(stop()));
 
@@ -206 +229 @@
 
 
-    // grabber->grab();
-    timerFlow->start(10);
-    // timerGrab->start(5000);
+    grabber->grab();
+    timerFlow->start(50);
+    timerGrab->start(500);
     timerInfo->start(5000);
     flow.show();

src/examples/latticegas/fpscounter.h

@@ -20 +20 @@
     }
 
+    long long getFrames()
+    {
+        return frames;
+    }
+
     double fps()
     {