ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/FastOpenGlDisplayer/soft/main.h

Comparing UserCode/FastOpenGlDisplayer/soft/main.h (file contents):
Revision 1.14 by roberfro, Mon Apr 28 11:47:49 2008 UTC vs.
Revision 1.17 by querten, Thu May 1 07:35:42 2008 UTC

#	Line 48 | Line 48 | time_t end;
48		#include "Texture.h"
49		#include "ReadCards.h"
50		#include "FROG_Struct.h"
51	+	#include "FROG_Camera.h"
52		#include "ObjectInfo.h"
53
54		int SAVE_WINDOW_W = 800;
#	Line 62 | Line 63 | int SCREENSHOT = 0;
63
64		int TEMP_I = 0;
65
66	<	float CAM_R  = 700;
66	<	float CAM_tx = 0.0;
67	<	float CAM_ty = 0.0;
66	>	FROG_Camera Cam;
67
68		int CMS_TRACKER_RADIUS = 129;
69		int CMS_TRACKER_LENGTH = 300;
#	Line 119 | Line 118 | int eventNumber = 0;
118
119		bool  mHelpScreen= false;
120		bool  mRotate    = true;
121	+
122	+
123	+	bool stateChanged = false;
124		float mDt                = 0.005f;
125
126	+	bool print_FrameWork = false;
127	+
128
129		GLint Menu_Geom_Tracker = 0;
130		GLint Menu_Geom_Ecal    = 0;
#	Line 136 | Line 140 | WidthAndColor WaC_Txt               = {1
140		WidthAndColor WaC_CMS_Framework     = {1.0 , 1.0 , 0.5 , 1.0 , 0.3};
141		WidthAndColor WaC_LHC_Axis          = {3.0 , 1.0 , 0.5 , 1.0 , 0.3};
142		WidthAndColor WaC_Default_SimTrack  = {2.0 , 0.0 , 1.0 , 1.0 , 1.0};
143	<	WidthAndColor WaC_Selected_SimTrack = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
143	>	WidthAndColor WaC_Selected_Object   = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
144
145		std::vector<IdAndWidthAndColor*> WaC_SimTracks;
146	+	std::vector<IdAndWidthAndColor*> WaC_RecoTracks;
147
148		void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
149		void reshape (int w, int h);
#	Line 161 | Line 166 | void LoadCard(const char* inputCard );
166		void gl_select(int x, int y);
167		void list_hits(GLint hits, GLuint *names);
168
164	–
169		#endif
170

Diff Legend

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