X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FRWGltf%2FRWGltf_CafReader.cxx;h=0b8e4e6e98e14e17f68b0f169ba16292eba8b079;hb=7e785937b3e65df86f35364e1036e446d6339cec;hpb=99289bed0a3c89d0fe9d2025d3452c0f66c7c9e1

diff --git a/src/RWGltf/RWGltf_CafReader.cxx b/src/RWGltf/RWGltf_CafReader.cxx
index aa9203753c..0b8e4e6e98 100644
--- a/src/RWGltf/RWGltf_CafReader.cxx
+++ b/src/RWGltf/RWGltf_CafReader.cxx
@@ -21,7 +21,7 @@
 #include <BRep_Tool.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
-#include <Message_ProgressSentry.hxx>
+#include <Message_ProgressScope.hxx>
 #include <OSD_OpenFile.hxx>
 #include <OSD_ThreadPool.hxx>
 
@@ -42,13 +42,13 @@ public:
   //! Main constructor.
   CafReader_GltfReaderFunctor (RWGltf_CafReader* myCafReader,
                                NCollection_Vector<TopoDS_Face>& theFaceList,
-                               Message_ProgressSentry& theSentry,
+                               const Message_ProgressRange& theProgress,
                                const OSD_ThreadPool::Launcher& theThreadPool,
                                const TCollection_AsciiString& theErrPrefix)
   : myCafReader (myCafReader),
     myFaceList  (&theFaceList),
-    mySentry    (&theSentry),
     myErrPrefix (theErrPrefix),
+    myProgress  (theProgress, "Loading glTF triangulation", Max (1, theFaceList.Size())),
     myThreadPool(theThreadPool),
     myTlsData   (theThreadPool.LowerThreadIndex(), theThreadPool.UpperThreadIndex())
   {
@@ -77,11 +77,11 @@ public:
     if (myThreadPool.HasThreads())
     {
       Standard_Mutex::Sentry aLock (&myMutex);
-      mySentry->Next();
+      myProgress.Next();
     }
     else
     {
-      mySentry->Next();
+      myProgress.Next();
     }
   }
 
@@ -89,13 +89,11 @@ private:
 
   RWGltf_CafReader* myCafReader;
   NCollection_Vector<TopoDS_Face>* myFaceList;
-  Message_ProgressSentry*   mySentry;
   TCollection_AsciiString   myErrPrefix;
   mutable Standard_Mutex    myMutex;
+  mutable Message_ProgressScope myProgress;
   const OSD_ThreadPool::Launcher& myThreadPool;
-  mutable NCollection_Array1<GltfReaderTLS>
-                            myTlsData;
-
+  mutable NCollection_Array1<GltfReaderTLS> myTlsData;
 };
 
 //================================================================
@@ -116,9 +114,12 @@ RWGltf_CafReader::RWGltf_CafReader()
 // Purpose  :
 //================================================================
 Standard_Boolean RWGltf_CafReader::performMesh (const TCollection_AsciiString& theFile,
-                                                const Handle(Message_ProgressIndicator)& theProgress,
+                                                const Message_ProgressRange& theProgress,
                                                 const Standard_Boolean theToProbe)
 {
+  Message_ProgressScope aPSentry (theProgress, "Reading glTF", 2);
+  aPSentry.Show();
+
   std::ifstream aFile;
   OSD_OpenStream (aFile, theFile.ToCString(), std::ios::in | std::ios::binary);
   if (!aFile.is_open()
@@ -256,13 +257,13 @@ Standard_Boolean RWGltf_CafReader::performMesh (const TCollection_AsciiString& t
   }
 #endif
 
-  if (!aDoc.Parse (theProgress))
+  if (!aDoc.Parse (aPSentry.Next()))
   {
     return false;
   }
 
   if (!theToProbe
-   && !readLateData (aDoc.FaceList(), theFile, theProgress))
+   && !readLateData (aDoc.FaceList(), theFile, aPSentry.Next()))
   {
     return false;
   }
@@ -286,14 +287,13 @@ Handle(RWGltf_PrimitiveArrayReader) RWGltf_CafReader::createMeshReaderContext()
 //================================================================
 Standard_Boolean RWGltf_CafReader::readLateData (NCollection_Vector<TopoDS_Face>& theFaces,
                                                  const TCollection_AsciiString& theFile,
-                                                 const Handle(Message_ProgressIndicator)& theProgress)
+                                                 const Message_ProgressRange& theProgress)
 {
-  Message_ProgressSentry aPSentryTris (theProgress, "Loading glTF triangulation", 0, Max (1, theFaces.Size()), 1);
   const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
   const int aNbThreads = myToParallel ? Min (theFaces.Size(), aThreadPool->NbDefaultThreadsToLaunch()) : 1;
   OSD_ThreadPool::Launcher aLauncher (*aThreadPool, aNbThreads);
 
-  CafReader_GltfReaderFunctor aFunctor (this, theFaces, aPSentryTris, aLauncher,
+  CafReader_GltfReaderFunctor aFunctor (this, theFaces, theProgress, aLauncher,
                                         TCollection_AsciiString ("File '") + theFile + "' defines invalid glTF!\n");
   aLauncher.Perform (theFaces.Lower(), theFaces.Upper() + 1, aFunctor);
   return Standard_True;