OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0032723: Draw Harness, ViewerTest - sloppy animation in WebGL

Browse Source 
Fixed emscripten_async_call() calls to use requestAnimationFrame() instead of setTimeout().
ViewerTest_EventManager::handleViewRedraw() - fixed queuing new onWasmRedrawView()
before previous one has been processed (leading to multiplying of pending redraws executed at the same time).
RWGltf_TriangulationReader::readDracoBuffer - suppressed CLang compilation warnings.
This commit is contained in:
kgv
2021-12-07 20:07:04 +03:00
committed by smoskvin
parent f4f9ce4b77
commit e3dae4a9f3
6 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ViewerTest/ViewerTest_EventManager.cxx
View File

@@ -38,17 +38,25 @@
#include <emscripten.h>
#include <emscripten/html5.h>
//! Callback flushing events and redrawing the WebGL canvas.
static void onWasmRedrawView (void* )
//=======================================================================
//function : onWasmRedrawView
//purpose :
//=======================================================================
void ViewerTest_EventManager::onWasmRedrawView (void* )
{
Handle(ViewerTest_EventManager) aViewCtrl = ViewerTest::CurrentEventManager();
if (!aViewCtrl.IsNull())
{
Handle(ViewerTest_EventManager) aViewCtrl = ViewerTest::CurrentEventManager();
aViewCtrl->myNbUpdateRequests = 0;
const Handle(V3d_View)& aView = ViewerTest::CurrentView();
const Handle(AIS_InteractiveContext)& aCtx = ViewerTest::GetAISContext();
if (!aViewCtrl.IsNull() && !aView.IsNull() && !aCtx.IsNull())
if (!aView.IsNull() && !aCtx.IsNull())
{
aViewCtrl->ProcessExpose();
}
}
}
#endif
Standard_IMPORT Standard_Boolean Draw_Interprete (const char* theCommand);
@@ -76,7 +84,7 @@ ViewerTest_EventManager::ViewerTest_EventManager (const Handle(V3d_View)&
myView (theView),
myToPickPnt (Standard_False),
myIsTmpContRedraw (Standard_False),
myUpdateRequests (0)
myNbUpdateRequests (0)
{
myViewAnimation = GlobalViewAnimation();
@@ -183,7 +191,6 @@ void ViewerTest_EventManager::ProcessExpose()
void ViewerTest_EventManager::handleViewRedraw (const Handle(AIS_InteractiveContext)& theCtx,
const Handle(V3d_View)& theView)
{
myUpdateRequests = 0;
AIS_ViewController::handleViewRedraw (theCtx, theView);
// On non-Windows platforms Aspect_Window::InvalidateContent() from rendering thread does not work as expected
@@ -202,10 +209,12 @@ void ViewerTest_EventManager::handleViewRedraw (const Handle(AIS_InteractiveCont
}
// ask more frames
++myUpdateRequests;
#if defined(__EMSCRIPTEN__)
emscripten_async_call (onWasmRedrawView, this, 0);
#endif
if (++myNbUpdateRequests == 1)
{
#if defined(__EMSCRIPTEN__)
emscripten_async_call (onWasmRedrawView, this, -1);
#endif
}
}
else if (myIsTmpContRedraw)
{
@@ -256,11 +265,11 @@ void ViewerTest_EventManager::ProcessInput()
// Queue onWasmRedrawView() callback to redraw canvas after all user input is flushed by browser.
// Redrawing viewer on every single message would be a pointless waste of resources,
// as user will see only the last drawn frame due to WebGL implementation details.
if (++myUpdateRequests == 1)
// -1 in emscripten_async_call() redirects to requestAnimationFrame();
// requestPostAnimationFrame() is a better under development alternative.
if (++myNbUpdateRequests == 1)
{
#if defined(__EMSCRIPTEN__)
emscripten_async_call (onWasmRedrawView, this, 0);
#endif
emscripten_async_call (onWasmRedrawView, this, -1);
}
#else
// handle synchronously

9
src/ViewerTest/ViewerTest_EventManager.hxx
View File

@@ -138,6 +138,13 @@ protected:
unsigned int theModifNew,
double theTimeStamp);
private:
#if defined(__EMSCRIPTEN__)
//! Callback flushing events and redrawing the WebGL canvas.
static void onWasmRedrawView (void* );
#endif
private:
Handle(AIS_InteractiveContext) myCtx;
@@ -148,7 +155,7 @@ private:
Standard_Boolean myToPickPnt;
Standard_Boolean myIsTmpContRedraw;
unsigned int myUpdateRequests; //!< counter for unhandled update requests
unsigned int myNbUpdateRequests; //!< counter for unhandled update requests
};