[Moss-devel] CVS: moss/3Dsia/client/3Dcf/src Makefile.am,1.6,1.7 Model.cxx,1.1,1.2 main.cxx,1.8,1.9

[Felix Morgner <address@hidden>]

Update of /cvsroot/moss/moss/3Dsia/client/3Dcf/src
In directory subversions:/tmp/cvs-serv25293/src

Modified Files:
        Makefile.am Model.cxx main.cxx 
Log Message:
Added class CCfg


Index: Makefile.am
===================================================================
RCS file: /cvsroot/moss/moss/3Dsia/client/3Dcf/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.am 16 May 2003 08:52:57 -0000      1.6
--- Makefile.am 16 May 2003 17:47:18 -0000      1.7
***************
*** 4,7 ****
  INCLUDES=-I../include
  
! 3df_client_SOURCES = main.cxx World.cxx Model.cxx
  3df_client_LDADD = $(lflags) $(glflags)
--- 4,7 ----
  INCLUDES=-I../include
  
! 3df_client_SOURCES = main.cxx World.cxx Model.cxx Cfg.cxx
  3df_client_LDADD = $(lflags) $(glflags)

Index: Model.cxx
===================================================================
RCS file: /cvsroot/moss/moss/3Dsia/client/3Dcf/src/Model.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Model.cxx   16 May 2003 08:51:52 -0000      1.1
--- Model.cxx   16 May 2003 17:47:18 -0000      1.2
***************
*** 33,37 ****
  
  #include "Model.h"
! 
  
  using namespace std;
--- 33,37 ----
  
  #include "Model.h"
! #include "Cfg.h"
  
  using namespace std;
***************
*** 43,47 ****
    m_bFailure = false;
    m_sModelName = "";
!   }
  
  CModel::~CModel()
--- 43,47 ----
    m_bFailure = false;
    m_sModelName = "";
!   } // CModel::CModel(int nParams, char* aszParams[])
  
  CModel::~CModel()
***************
*** 50,71 ****
    } // CModel::~CModel()
  
! int CModel::GetModelName(int nParams, char* aszParams[])
    {
-   int opt;
-   while((opt = getopt(nParams, aszParams, "m")) != -1)
-     {
-     switch(opt)
-       {
-       case 'm':
-         m_sModelName = optarg;
-       m_bFailure = false;
-       break;
-       
-       default:
-         cout << "Unknown option " << (char)optopt << endl;
-         m_bFailure = true;
-       break;
-       } // switch(opt)
-     } // while((opt = getopt(nParams, aszParams, "m")) != -1)
    return 0;
    } // int CModel::GetModelName()
--- 50,55 ----
    } // CModel::~CModel()
  
! int CModel::GetModelName()
    {
    return 0;
    } // int CModel::GetModelName()

Index: main.cxx
===================================================================
RCS file: /cvsroot/moss/moss/3Dsia/client/3Dcf/src/main.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** main.cxx    16 May 2003 08:52:27 -0000      1.8
--- main.cxx    16 May 2003 17:47:18 -0000      1.9
***************
*** 34,37 ****
--- 34,38 ----
  #include "World.h"
  #include "Model.h"
+ #include "Cfg.h"
  #include <unistd.h>
  
***************
*** 40,43 ****
--- 41,45 ----
  CWorld* g_poWorld = 0;
  CModel* g_poModel = 0;
+ CCfg* g_poCfg = 0;
  
  void DrawScene()
***************
*** 78,98 ****
    }
  
- void GetModelName(int nParams, char* aszParams[])
-   {
-   if(g_poModel == 0) return;
-   g_poModel->GetModelName(nParams, aszParams);
-   }
- 
  int main(int nParams, char* aszParams[])
    {
    g_poWorld = new CWorld(nParams, aszParams);
    g_poModel = new CModel(nParams, aszParams);
! 
!   GetModelName(nParams, aszParams);
! 
!   if(g_poModel->m_bFailure == true)
!     {
!     exit(0);
!     }
  /*
    g_poWorld->CallbackSet("DrawScene", DrawScene)
--- 80,88 ----
    }
  
  int main(int nParams, char* aszParams[])
    {
    g_poWorld = new CWorld(nParams, aszParams);
    g_poModel = new CModel(nParams, aszParams);
!   g_poCfg = new CCfg();
  /*
    g_poWorld->CallbackSet("DrawScene", DrawScene)
***************
*** 114,117 ****
--- 104,108 ----
    delete g_poWorld;
    delete g_poModel;
+   delete g_poCfg;
  
    } // int main(int nParams, char* aszParams[])