Text archives Help
- From:
- To:
- Subject: [Manta] r2282 - in trunk: Engine/Display SwigInterface
- Date: Wed, 4 Jun 2008 23:39:12 -0600 (MDT)
Author: abe
Date: Wed Jun 4 23:39:12 2008
New Revision: 2282
Modified:
trunk/Engine/Display/SyncDisplay.cc
trunk/Engine/Display/SyncDisplay.h
trunk/SwigInterface/wxManta.py
Log:
Fixed a bug that occurred when the resolution was specified on the
runwxmanta.py command line.
M SwigInterface/wxManta.py
Added abort() method which causes a thread waiting for a frame to be
ready to continue. This condition arises if you want to discontinue
using the sync display without displaying the last frame.
M Engine/Display/SyncDisplay.cc
M Engine/Display/SyncDisplay.h
Modified: trunk/Engine/Display/SyncDisplay.cc
==============================================================================
--- trunk/Engine/Display/SyncDisplay.cc (original)
+++ trunk/Engine/Display/SyncDisplay.cc Wed Jun 4 23:39:12 2008
@@ -117,3 +117,7 @@
_framedone.up();
// sync_lock.lock(); cerr << "dr::_framedone.up() .. done\n";
sync_lock.unlock();
}
+
+void SyncDisplay::abort() {
+ _frameready.up();
+}
Modified: trunk/Engine/Display/SyncDisplay.h
==============================================================================
--- trunk/Engine/Display/SyncDisplay.h (original)
+++ trunk/Engine/Display/SyncDisplay.h Wed Jun 4 23:39:12 2008
@@ -76,6 +76,7 @@
void waitOnFrameReady(); // blocks until a frame is ready
void renderFrame();
void doneRendering();
+ void abort(); // Frees a thread waiting on frameready.
Image const* getCurrentImage() { return current_image; }
private:
Modified: trunk/SwigInterface/wxManta.py
==============================================================================
--- trunk/SwigInterface/wxManta.py (original)
+++ trunk/SwigInterface/wxManta.py Wed Jun 4 23:39:12 2008
@@ -400,7 +400,7 @@
# Create a display channel.
self.channelID = self.engine.createChannel( display, camera,
- use_stereo, xres, yres )
+ use_stereo,
renderSize[0], renderSize[1] )
# Basic scene.
initialize_callback( self, self.engine )
- [Manta] r2282 - in trunk: Engine/Display SwigInterface, abe, 06/04/2008
Archive powered by MHonArc 2.6.16.