[Moss-devel] CVS: moss/3Dsia/client/3Dcf/include World.h,1.5,1.6

[Felix Morgner <address@hidden>]

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

Modified Files:
        World.h 
Log Message:
added DrawLabel and MouseMotion


Index: World.h
===================================================================
RCS file: /cvsroot/moss/moss/3Dsia/client/3Dcf/include/World.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** World.h     10 Nov 2002 16:38:15 -0000      1.5
--- World.h     2 Feb 2003 16:12:18 -0000       1.6
***************
*** 39,44 ****
  //#include <GL/glu.h>
  #include <GL/glut.h>
  //#include "KeyboardMsg.h"
- 
  #define ACSIZE  8
  
--- 39,45 ----
  //#include <GL/glu.h>
  #include <GL/glut.h>
+ #include <fstream>
+ #include <string>
  //#include "KeyboardMsg.h"
  #define ACSIZE  8
  
***************
*** 46,49 ****
--- 47,52 ----
  //#define KEY_ESCAPE 27
  
+ using namespace std;
+ 
  class CWorld
    {
***************
*** 60,63 ****
--- 63,74 ----
      double m_dZrot;
      
+     int nFirst;
+     int nDragging;
+     int nZooming;
+     
+     int nMouseX;
+     int nMouseY;
+     int nMouseZ;
+ 
      /// the position of the base light
      GLfloat m_afLightPosition[4];
***************
*** 65,69 ****
      GLfloat m_afMaterialAmbient[4];
      GLfloat m_afMaterialSpecular[4];
!   
    public:
               CWorld(int nParams, char* aszParams[]);
--- 76,80 ----
      GLfloat m_afMaterialAmbient[4];
      GLfloat m_afMaterialSpecular[4];
! 
    public:
               CWorld(int nParams, char* aszParams[]);
***************
*** 84,88 ****
      /// Funciton called if any mouse event appears
      void MouseFunction(int nButton, int nState, int x, int y);
!     
    }; // class CWorld
  
--- 95,104 ----
      /// Funciton called if any mouse event appears
      void MouseFunction(int nButton, int nState, int x, int y);
! 
!     /// Function Which draws a string
!     void DrawLabel(int row, string sLabel);
! 
!     /// Function called every time a mousebutton i pressed and mouse moves
!     void MouseMotion(int x, int y);
    }; // class CWorld