[Sheepengine-cvs] sheep/src/common/meshio XXXLOADER.cpp,1.6,1.7 XXXLOADER.h,1.4,1.5 aseloader.cpp,1.5,1.6 aseloader.h,1.3,1.4 imeshloader.h,1.6,1.7 loadmesh.h,1.4,1.5 objloader.cpp,1.6,1.7 objloader.h,1.5,1.6 smartloader.cpp,1.5,1.6 smartloader.h,1.4,1.5 triloader.cpp,1.8,1.9 triloader.h,1.4,1.5

[Jonathan P. <jp...@us...>]

Update of /cvsroot/sheepengine/sheep/src/common/meshio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31142/src/common/meshio

Modified Files:
	XXXLOADER.cpp XXXLOADER.h aseloader.cpp aseloader.h 
	imeshloader.h loadmesh.h objloader.cpp objloader.h 
	smartloader.cpp smartloader.h triloader.cpp triloader.h 
Log Message:
dictoon's remaining changes :
- htmlstream removed
- ProgressMonitor renamed to IProgressMonitor
- ConsoleProgressMonitor no longer single-line
- misc const improvements
- BinaryStream rewritten
- Stopwatch class


Index: aseloader.cpp
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/aseloader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aseloader.cpp	13 May 2004 23:12:25 -0000	1.5
--- aseloader.cpp	30 Oct 2004 15:55:07 -0000	1.6
***************
*** 22,26 ****
  
  #include "aseloader.h"	// include first
! #include "common/misc/progressmonitor.h"
  #include "common/misc/stringutils.h"
  
--- 22,26 ----
  
  #include "aseloader.h"	// include first
! #include "common/misc/iprogressmonitor.h"
  #include "common/misc/stringutils.h"
  
***************
*** 71,75 ****
  					 IMeshBuilder &builder,
  					 int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					 ProgressMonitor *progmon /*= 0*/) throw(IMeshLoader::LoadingException)
  {
  	m_path = StringUtils::GetPath(filename);
--- 71,76 ----
  					 IMeshBuilder &builder,
  					 int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					 IProgressMonitor *progmon /*= 0*/)
! 	throw(IMeshLoader::LoadingException)
  {
  	m_path = StringUtils::GetPath(filename);

Index: smartloader.h
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/smartloader.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** smartloader.h	13 May 2004 23:12:25 -0000	1.4
--- smartloader.h	30 Oct 2004 15:55:07 -0000	1.5
***************
*** 31,35 ****
  
  	class IMeshBuilder;
! 	class ProgressMonitor;
  
  	class SmartLoader : public IMeshLoader {
--- 31,35 ----
  
  	class IMeshBuilder;
! 	class IProgressMonitor;
  
  	class SmartLoader : public IMeshLoader {
***************
*** 42,46 ****
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			ProgressMonitor *progmon = 0
  		) throw(LoadingException);
  	};
--- 42,46 ----
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			IProgressMonitor *progmon = 0
  		) throw(LoadingException);
  	};

Index: objloader.h
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/objloader.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** objloader.h	13 May 2004 23:12:25 -0000	1.5
--- objloader.h	30 Oct 2004 15:55:07 -0000	1.6
***************
*** 36,40 ****
  namespace sheep {
  
! 	class ProgressMonitor;
  
  	class OBJLoader : public IMeshLoader {
--- 36,40 ----
  namespace sheep {
  
! 	class IProgressMonitor;
  
  	class OBJLoader : public IMeshLoader {
***************
*** 69,73 ****
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			ProgressMonitor *progmon = 0
  		) throw(LoadingException);
  
--- 69,73 ----
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			IProgressMonitor *progmon = 0
  		) throw(LoadingException);
  
***************
*** 106,110 ****
  		int m_option_mask;
  
! 		ProgressMonitor *m_progmon;	//!< May be 0.
  
  		FILE *m_file;
--- 106,110 ----
  		int m_option_mask;
  
! 		IProgressMonitor *m_progmon;	//!< May be 0.
  
  		FILE *m_file;

Index: loadmesh.h
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/loadmesh.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** loadmesh.h	13 May 2004 23:12:25 -0000	1.4
--- loadmesh.h	30 Oct 2004 15:55:07 -0000	1.5
***************
*** 36,40 ****
  		const std::string &filename,
  		int option_mask = IMeshLoader::DEFAULT_CONFIGURATION_BIT,
! 		ProgressMonitor *progmon = 0)
  	{
  		MeshBuilder builder;
--- 36,40 ----
  		const std::string &filename,
  		int option_mask = IMeshLoader::DEFAULT_CONFIGURATION_BIT,
! 		IProgressMonitor *progmon = 0)
  	{
  		MeshBuilder builder;

Index: imeshloader.h
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/imeshloader.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** imeshloader.h	13 May 2004 23:12:25 -0000	1.6
--- imeshloader.h	30 Oct 2004 15:55:07 -0000	1.7
***************
*** 32,36 ****
  
  	class IMeshBuilder;
! 	class ProgressMonitor;
  
  	class IMeshLoader {
--- 32,36 ----
  
  	class IMeshBuilder;
! 	class IProgressMonitor;
  
  	class IMeshLoader {
***************
*** 78,82 ****
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			ProgressMonitor *progmon = 0
  		) throw(LoadingException) = 0;
  	};
--- 78,82 ----
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			IProgressMonitor *progmon = 0
  		) throw(LoadingException) = 0;
  	};

Index: objloader.cpp
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/objloader.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** objloader.cpp	13 May 2004 23:12:25 -0000	1.6
--- objloader.cpp	30 Oct 2004 15:55:07 -0000	1.7
***************
*** 23,27 ****
  #include "objloader.h"	// include first
  #include "common/math/point3.h"
! #include "common/misc/progressmonitor.h"
  #include "common/misc/stringutils.h"
  #include "triangulator.h"
--- 23,27 ----
  #include "objloader.h"	// include first
  #include "common/math/point3.h"
! #include "common/misc/iprogressmonitor.h"
  #include "common/misc/stringutils.h"
  #include "triangulator.h"
***************
*** 61,65 ****
  					 IMeshBuilder &builder,
  					 int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					 ProgressMonitor *progmon /*= 0*/) throw(IMeshLoader::LoadingException)
  {
  	m_path = StringUtils::GetPath(filename);
--- 61,66 ----
  					 IMeshBuilder &builder,
  					 int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					 IProgressMonitor *progmon /*= 0*/)
! 	throw(IMeshLoader::LoadingException)
  {
  	m_path = StringUtils::GetPath(filename);

Index: smartloader.cpp
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/smartloader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** smartloader.cpp	13 May 2004 23:12:25 -0000	1.5
--- smartloader.cpp	30 Oct 2004 15:55:07 -0000	1.6
***************
*** 22,26 ****
  
  #include "smartloader.h"	// include first
! #include "common/misc/progressmonitor.h"
  #include "common/misc/stringutils.h"
  #include "imeshbuilder.h"
--- 22,26 ----
  
  #include "smartloader.h"	// include first
! #include "common/misc/iprogressmonitor.h"
  #include "common/misc/stringutils.h"
  #include "imeshbuilder.h"
***************
*** 39,43 ****
  					   IMeshBuilder &builder,
  					   int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					   ProgressMonitor *progmon /*= 0*/) throw(IMeshLoader::LoadingException)
  {
  	const string ext = StringUtils::GetExtension(filename);
--- 39,44 ----
  					   IMeshBuilder &builder,
  					   int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					   IProgressMonitor *progmon /*= 0*/)
! 	throw(IMeshLoader::LoadingException)
  {
  	const string ext = StringUtils::GetExtension(filename);

Index: aseloader.h
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/aseloader.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aseloader.h	13 May 2004 23:12:25 -0000	1.3
--- aseloader.h	30 Oct 2004 15:55:07 -0000	1.4
***************
*** 36,40 ****
  namespace sheep {
  
! 	class ProgressMonitor;
  
  	class ASELoader : public IMeshLoader {
--- 36,40 ----
  namespace sheep {
  
! 	class IProgressMonitor;
  
  	class ASELoader : public IMeshLoader {
***************
*** 58,62 ****
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			ProgressMonitor *progmon = 0
  		) throw(LoadingException);
  
--- 58,62 ----
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			IProgressMonitor *progmon = 0
  		) throw(LoadingException);
  
***************
*** 97,101 ****
  		int m_option_mask;
  
! 		ProgressMonitor *m_progmon;	//!< May be 0.
  
  		FILE *m_file;
--- 97,101 ----
  		int m_option_mask;
  
! 		IProgressMonitor *m_progmon;	//!< May be 0.
  
  		FILE *m_file;

Index: XXXLOADER.cpp
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/XXXLOADER.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** XXXLOADER.cpp	13 May 2004 23:12:25 -0000	1.6
--- XXXLOADER.cpp	30 Oct 2004 15:55:06 -0000	1.7
***************
*** 22,26 ****
  
  #include "XXXLOADER.h"	// include first
! #include "common/misc/progressmonitor.h"
  #include "common/misc/stringutils.h"
  
--- 22,26 ----
  
  #include "XXXLOADER.h"	// include first
! #include "common/misc/iprogressmonitor.h"
  #include "common/misc/stringutils.h"
  
***************
*** 42,46 ****
  					 IMeshBuilder &builder,
  					 int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					 ProgressMonitor *progmon /*= 0*/) throw(IMeshLoader::LoadingException)
  {
  	m_path = StringUtils::GetPath(filename);
--- 42,47 ----
  					 IMeshBuilder &builder,
  					 int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					 IProgressMonitor *progmon /*= 0*/)
! 	throw(IMeshLoader::LoadingException)
  {
  	m_path = StringUtils::GetPath(filename);

Index: XXXLOADER.h
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/XXXLOADER.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XXXLOADER.h	13 May 2004 23:12:25 -0000	1.4
--- XXXLOADER.h	30 Oct 2004 15:55:07 -0000	1.5
***************
*** 33,37 ****
  namespace sheep {
  
! 	class ProgressMonitor;
  
  	class XXXLoader : public IMeshLoader {
--- 33,37 ----
  namespace sheep {
  
! 	class IProgressMonitor;
  
  	class XXXLoader : public IMeshLoader {
***************
*** 43,47 ****
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			ProgressMonitor *progmon = 0
  		) throw(LoadingException);
  
--- 43,47 ----
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			IProgressMonitor *progmon = 0
  		) throw(LoadingException);
  
***************
*** 54,58 ****
  		int m_option_mask;
  
! 		ProgressMonitor *m_progmon;	//!< May be 0.
  
  		FILE *m_file;
--- 54,58 ----
  		int m_option_mask;
  
! 		IProgressMonitor *m_progmon;	//!< May be 0.
  
  		FILE *m_file;

Index: triloader.h
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/triloader.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** triloader.h	13 May 2004 23:12:25 -0000	1.4
--- triloader.h	30 Oct 2004 15:55:07 -0000	1.5
***************
*** 35,39 ****
  namespace sheep {
  
! 	class ProgressMonitor;
  
  	class TRILoader : public IMeshLoader {
--- 35,39 ----
  namespace sheep {
  
! 	class IProgressMonitor;
  
  	class TRILoader : public IMeshLoader {
***************
*** 57,61 ****
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			ProgressMonitor *progmon = 0
  		) throw(LoadingException);
  
--- 57,61 ----
  			IMeshBuilder &builder,
  			int option_mask = DEFAULT_CONFIGURATION_BIT,
! 			IProgressMonitor *progmon = 0
  		) throw(LoadingException);
  
***************
*** 69,73 ****
  		int m_option_mask;
  
! 		ProgressMonitor *m_progmon;	//!< May be 0.
  
  		BinaryStream m_stream;
--- 69,73 ----
  		int m_option_mask;
  
! 		IProgressMonitor *m_progmon;	//!< May be 0.
  
  		BinaryStream m_stream;

Index: triloader.cpp
===================================================================
RCS file: /cvsroot/sheepengine/sheep/src/common/meshio/triloader.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** triloader.cpp	13 May 2004 23:12:25 -0000	1.8
--- triloader.cpp	30 Oct 2004 15:55:07 -0000	1.9
***************
*** 22,26 ****
  
  #include "triloader.h"	// include first
! #include "common/misc/progressmonitor.h"
  #include "common/misc/stringutils.h"
  #include "common/misc/types.h"
--- 22,26 ----
  
  #include "triloader.h"	// include first
! #include "common/misc/iprogressmonitor.h"
  #include "common/misc/stringutils.h"
  #include "common/misc/types.h"
***************
*** 43,47 ****
  					 IMeshBuilder &builder,
  					 int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					 ProgressMonitor *progmon /*= 0*/) throw(IMeshLoader::LoadingException)
  {
  	m_path = StringUtils::GetPath(filename);
--- 43,48 ----
  					 IMeshBuilder &builder,
  					 int option_mask /*= DEFAULT_CONFIGURATION_BIT*/,
! 					 IProgressMonitor *progmon /*= 0*/)
! 	throw(IMeshLoader::LoadingException)
  {
  	m_path = StringUtils::GetPath(filename);