ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/FastOpenGlDisplayer/soft/main.h
(Generate patch)

Comparing UserCode/FastOpenGlDisplayer/soft/main.h (file contents):
Revision 1.29 by querten, Sun Jun 29 11:36:17 2008 UTC vs.
Revision 1.41 by querten, Mon Jul 21 11:14:31 2008 UTC

# Line 1 | Line 1
1  
2 < // SimEvent.h: interface for the SimEvent class.
2 > // main.h
3   //
4   //////////////////////////////////////////////////////////////////////
5  
# Line 9 | Line 9
9   #ifdef linux
10   #include <GL/gl.h>
11   #include <GL/glu.h>
12 < #include "Includes/GLUT/glut.h"
13 < #include <ext/hash_map>
14 < using namespace __gnu_cxx;
15 < typedef hash_map<unsigned int, char*, hash<unsigned int>, equal_to<unsigned int> > HASH_Map;
12 > #include "Includes/GLUT/glut.h"
13   #else
14   #include <windows.h>
15   #include <gl/gl.h>
# Line 23 | Line 20
20   #pragma comment (lib,"opengl32.lib")
21   #pragma comment (lib,"glut.lib")
22   #pragma comment (lib,"glut32.lib")
23 <
27 < #include <hash_map>
28 < using namespace stdext;
29 < typedef hash_map<unsigned int, char*, hash_compare<unsigned int, std::less<unsigned int> > > HASH_Map;
23 > #pragma comment (lib,"Includes/CURL/Lib/libcurl.lib")
24   #endif
31 –
25  
26 < HASH_Map test;
26 > bool SCREENSAVER = false;
27  
28   #include <time.h>
29   time_t start;
# Line 45 | Line 38 | time_t end;
38  
39   #include "Includes/FROG/FROG_Element_Tools.h"
40  
41 < #include "Includes/FROG/Logo.h"
42 < #include "Includes/FROG/Texture.h"
41 > #include "Includes/FROG/FROG_Logo.h"
42 > #include "Includes/FROG/FROG_Texture.h"
43   #include "Includes/FROG/FROG_ReadCards.h"
51 – #include "Includes/FROG/FROG_Struct.h"
44   #include "Includes/FROG/FROG_Camera.h"
45 + #include "Includes/FROG/FROG_Net.h"
46 + #include "Includes/FROG/FROG_Net_Tools.h"
47 + #include "Includes/FROG/FROG_View_Tools.h"
48 +
49 + FROG_ReadCards* Card;
50 + FROG_Objects_Extended* frogObjects_;
51 +
52 + std::vector<FROG_View*> ActiveViews;
53 + FROG_View* ViewScreen;
54 + FROG_View* ViewMain;
55 +
56  
57  
58   int SAVE_WINDOW_W = 800;
# Line 58 | Line 61 | int SAVE_WINDOW_X = 10;
61   int SAVE_WINDOW_Y = 10;
62  
63  
64 +
65 +
66   bool  FULLSCREEN        = false;
67   int   WINDOW_WIDTH      = 800;
68   int   WINDOW_HEIGHT     = 600;
69   int   SCREENSHOT        = 0;
70 < char* SCREENSHOT_FORMAT = new char[255];
70 > char SCREENSHOT_FORMAT[255] = {"png"};
71  
72   int TEMP_I = 0;
68 –
69 – FROG_Camera Cam;
70 –
73   bool MouseStates[3];
74  
75   GLuint LogoTexture;
76 <
75 < double t = 0;
76 > GLuint LogoTxtTexture;
77  
78   std::string inputVisFile;
79 + std::string inputVisFileFromCard;
80   std::vector<std::string> inputGeom;
81  
82 + // MultiThreading Variables
83 + #ifdef linux
84 +   pthread_t Thread_H;
85 + #else
86 +   HANDLE Thread_H   = NULL;
87 +   DWORD  Thread_Id  = 0;
88 + #endif
89 + bool   Thread_Run = false;
90 +
91 +
92 +
93 + int updateVisFileTime = -1;
94 +
95   FROG_Events* events;
96   FROG_Element_Event* event;
97  
# Line 85 | Line 100 | FROG_Geometry* geom;
100   char gSim       = 0;
101   char gReco      = 15;
102  
103 < unsigned int mCLicked_DetId = 0;
103 > unsigned int mCLicked_DetId = (unsigned int) -1;
104   bool mDisplayMother  = false;
90 – int  mObj_I     = -1;
91 – int  mColl_I    = -1;
105   bool mLoading   = true;
106   int  mLoading_I = 0;
107  
108   int eventNumber = 0;
109  
110   bool  mHelpScreen= false;
98 – bool  mRotate    = true;
99 –
111  
112   bool stateChanged = false;
102 – float mDt                = 0.005f;
113  
114   bool print_FrameWork = false;
115  
116 < WidthAndColor WaC_BackGround        = {1.0 , 0.0 , 1.0 , 0.0 , 1.0};
117 < WidthAndColor WaC_Txt               = {1.0 , 0.0 , 1.0 , 1.0 , 1.0};
118 < WidthAndColor WaC_CMS_Framework     = {1.0 , 1.0 , 0.5 , 1.0 , 0.3};
119 < WidthAndColor WaC_LHC_Axis          = {3.0 , 1.0 , 0.5 , 1.0 , 0.3};
120 < WidthAndColor WaC_Selected_Object   = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
116 > float BackGround_Color[4] = {0.0 , 0.0 , 0.0 , 1.0};
117 > float Txt_Color[4]        = {0.0 , 1.0 , 1.0 , 1.0};
118 > float Framework_Color[4]  = {1.0 , 0.5 , 1.0 , 0.3};
119 > float Framework_Thickness =  1.0;
120 > float ZAxis_Color[4]      = {1.0 , 0.5 , 1.0 , 0.3};
121 > float ZAxis_Thickness     =  3;
122 >
123  
112 – FROG_ReadCards* Card;
124  
125   void reshape (int w, int h);
126   void display();
# Line 118 | Line 129 | void LoadCard(const char* inputCard );
129   void gl_select(int x, int y);
130   void list_hits(GLint hits, GLuint *names);
131  
132 +
133 + void updateEventsFile();
134 +
135 +
136   #endif
137  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines