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.33 by roberfro, Mon Jun 30 14:25:14 2008 UTC vs.
Revision 1.37 by querten, Thu Jul 10 13:56:39 2008 UTC

#	Line 23 | Line 23
23		#pragma comment (lib,"opengl32.lib")
24		#pragma comment (lib,"glut.lib")
25		#pragma comment (lib,"glut32.lib")
26	<	#pragma comment (lib,"Includes/CURL/libcurl.lib")
26	>	#pragma comment (lib,"Includes/CURL/Lib/libcurl.lib")
27
28		#include <hash_map>
29		using namespace stdext;
30		typedef hash_map<unsigned int, char*, hash_compare<unsigned int, std::less<unsigned int> > > HASH_Map;
31		#endif
32	<
32	>
33	>	bool SCREENSAVER = false;
34
35		HASH_Map test;
36
#	Line 73 | Line 74 | FROG_Camera Cam;
74		bool MouseStates[3];
75
76		GLuint LogoTexture;
77	+	GLuint LogoTxtTexture;
78
79		double t = 0;
80
81		std::string inputVisFile;
82	+	std::string inputVisFileFromCard;
83		std::vector<std::string> inputGeom;
84
85	+	int updateVisFileTime = -1;
86	+
87		FROG_Events* events;
88		FROG_Element_Event* event;
89
#	Line 118 | Line 123 | void LoadCard(const char* inputCard );
123		void gl_select(int x, int y);
124		void list_hits(GLint hits, GLuint *names);
125
126	+	char* get_char_ptr(const std::string& str);
127	+	void* DownLoadFile(void* inputFile);
128	+	void updateEventsFile();
129	+
130	+
131		#endif
132

Diff Legend

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