Code formatting

WindowManager.cpp

@@ -51,7 +51,11 @@ bool WindowManager::initialize()
 
 	m_VideoModeFlags = SDL_OPENGL | SDL_RESIZABLE;
 
-        Uint32 bitPerPixel = SDL_VideoModeOK(m_DesktopWidth, m_DesktopHeight, m_DesktopBitsPerPixel, m_VideoModeFlags);
+	Uint32 bitPerPixel = SDL_VideoModeOK(
+							m_DesktopWidth,
+							m_DesktopHeight,
+							m_DesktopBitsPerPixel,
+							m_VideoModeFlags);
 
 	if ( !bitPerPixel) {
 		cerr << "Video mode not supported: " << SDL_GetError() << endl;
@@ -68,13 +72,19 @@ bool WindowManager::initialize()
 	//SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 	//SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
+	//SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
 
-        // 4x FSAA, way too heavy on many machines :-)
+	// 4x FSAA, way too heavy on some machines :-)
 	// FIXME: without it polygon fonts look really ugly :-(
+	// TODO: should be controlled with config values (coupled to disabling text rendering?)
 	SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
 	SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
 
-        m_DisplaySurface = SDL_SetVideoMode(m_DesktopWidth, m_DesktopHeight, m_DesktopBitsPerPixel, m_VideoModeFlags);
+	m_DisplaySurface = SDL_SetVideoMode(
+							m_DesktopWidth,
+							m_DesktopHeight,
+							m_DesktopBitsPerPixel,
+							m_VideoModeFlags);
 
 	if (m_DisplaySurface == NULL) {
 		cerr << "Could not acquire rendering surface: " << SDL_GetError() << endl;
@@ -109,10 +119,8 @@ void WindowManager::eventLoop()
 
 	static double i = 0.0;
 
-    while ( SDL_WaitEvent(&event) )
-    {
-        if( event.type == SDL_USEREVENT && event.user.code == RenderEvent )
-        {
+	while (SDL_WaitEvent(&event) ) {
+		if (event.type == SDL_USEREVENT && event.user.code == RenderEvent) {
 #ifdef DEBUG_VALGRIND
 			if(i < 0.25) {
 #endif
@@ -125,67 +133,92 @@ void WindowManager::eventLoop()
 			}
 #endif      
 		}
-        else if( event.type == SDL_USEREVENT && event.user.code == BOINCUpdateEvent)
-        {
+		else if (event.type == SDL_USEREVENT && event.user.code
+		        == BOINCUpdateEvent) {
 
 		}
-        else if( event.motion.state & (SDL_BUTTON(1) | SDL_BUTTON(3)) && event.type == SDL_MOUSEMOTION )
-        {
-            if(event.motion.state & SDL_BUTTON(1))
-            {
+		else if (event.motion.state & (SDL_BUTTON(1) | SDL_BUTTON(3)) &&
+				 event.type == SDL_MOUSEMOTION) {
+			
+			if (event.motion.state & SDL_BUTTON(1)) {
 				graphics->rotateSphere(event.motion.xrel, event.motion.yrel);
 			}
-            else if(event.motion.state & SDL_BUTTON(3))
-            {
+			else if (event.motion.state & SDL_BUTTON(3)) {
 				graphics->zoomSphere(event.motion.yrel);
 			}
 		}
-        else if (event.type == SDL_VIDEORESIZE)
-        {
+		else if (event.type == SDL_VIDEORESIZE) {
 			m_CurrentWidth = event.resize.w;
 			m_CurrentHeight = event.resize.h;
-            m_DisplaySurface = SDL_SetVideoMode( m_CurrentWidth, m_CurrentHeight, m_DesktopBitsPerPixel, m_VideoModeFlags);
+			
+			m_DisplaySurface = SDL_SetVideoMode(
+									m_CurrentWidth,
+									m_CurrentHeight,
+									m_DesktopBitsPerPixel,
+									m_VideoModeFlags);
+			
 			graphics->resize(m_CurrentWidth, m_CurrentHeight);
 		}
-        else if( event.type == SDL_QUIT || (event.type == SDL_KEYDOWN && event.key.keysym.sym == SDLK_ESCAPE) )
-        {
-            if (m_DisplaySurface) SDL_FreeSurface(m_DisplaySurface);
+		else if (event.type == SDL_QUIT ||
+				(event.type == SDL_KEYDOWN && event.key.keysym.sym == SDLK_ESCAPE)) {
+			
+			if (m_DisplaySurface) {
+				SDL_FreeSurface(m_DisplaySurface);
+			}
 
 			exit(0);
 		}
-        else if( event.type == SDL_KEYDOWN )
-        {
-            switch(event.key.keysym.sym)
-            {
+		else if (event.type == SDL_KEYDOWN) {
+			switch (event.key.keysym.sym) {
 				case SDLK_s:
-                graphics->setFeature(graphics->STARS, graphics->isFeature(graphics->STARS) ? false : true);
+					graphics->setFeature(
+							graphics->STARS,
+					        graphics->isFeature(graphics->STARS) ? false : true);
 					break;
 				case SDLK_c:
-                graphics->setFeature(graphics->CONSTELLATIONS, graphics->isFeature(graphics->CONSTELLATIONS) ? false : true);
+					graphics->setFeature(
+					        graphics->CONSTELLATIONS,
+					        graphics->isFeature(graphics->CONSTELLATIONS) ? false : true);
 					break;
 				case SDLK_o:
-                graphics->setFeature(graphics->OBSERVATORIES, graphics->isFeature(graphics->OBSERVATORIES) ? false : true);
+					graphics->setFeature(
+					        graphics->OBSERVATORIES,
+					        graphics->isFeature(graphics->OBSERVATORIES) ? false : true);
 					break;
 				case SDLK_x:
-                graphics->setFeature(graphics->XRAYS, graphics->isFeature(graphics->XRAYS) ? false : true);
+					graphics->setFeature(
+							graphics->XRAYS,
+					        graphics->isFeature(graphics->XRAYS) ? false : true);
 					break;
 				case SDLK_p:
-                graphics->setFeature(graphics->PULSARS, graphics->isFeature(graphics->PULSARS) ? false : true);
+					graphics->setFeature(
+							graphics->PULSARS,
+					        graphics->isFeature(graphics->PULSARS) ? false : true);
 					break;
 				case SDLK_r:
-                graphics->setFeature(graphics->SNRS, graphics->isFeature(graphics->SNRS) ? false : true);
+					graphics->setFeature(
+							graphics->SNRS,
+					        graphics->isFeature(graphics->SNRS) ? false : true);
 					break;
 				case SDLK_g:
-                graphics->setFeature(graphics->GLOBE, graphics->isFeature(graphics->GLOBE) ? false : true);
+					graphics->setFeature(
+							graphics->GLOBE,
+					        graphics->isFeature(graphics->GLOBE) ? false : true);
 					break;
 				case SDLK_a:
-                graphics->setFeature(graphics->AXES, graphics->isFeature(graphics->AXES) ? false : true);
+					graphics->setFeature(
+							graphics->AXES,
+					        graphics->isFeature(graphics->AXES) ? false : true);
 					break;
 				case SDLK_i:
-                graphics->setFeature(graphics->SEARCHINFO, graphics->isFeature(graphics->SEARCHINFO) ? false : true);
+					graphics->setFeature(
+							graphics->SEARCHINFO,
+					        graphics->isFeature(graphics->SEARCHINFO) ? false : true);
 					break;
 				case SDLK_l:
-                graphics->setFeature(graphics->LOGO, graphics->isFeature(graphics->LOGO) ? false : true);
+					graphics->setFeature(
+							graphics->LOGO,
+					        graphics->isFeature(graphics->LOGO) ? false : true);
 					break;
 				case SDLK_RETURN:
 					toggleFullscreen();
@@ -221,10 +254,11 @@ Uint32 WindowManager::timerCallbackRenderEvent( Uint32 interval, void *param )
 
 	SDL_PushEvent(&event);
 
-    return( interval );
+	return interval;
 }
 
-Uint32 WindowManager::timerCallbackBOINCUpdateEvent( Uint32 interval, void *param )
+Uint32 WindowManager::timerCallbackBOINCUpdateEvent(Uint32 interval,
+        void *param)
 {
 	SDL_Event event;
 	SDL_UserEvent userevent;
@@ -239,7 +273,7 @@ Uint32 WindowManager::timerCallbackBOINCUpdateEvent( Uint32 interval, void *para
 
 	SDL_PushEvent(&event);
 
-    return( interval );
+	return interval;
 }
 
 int WindowManager::windowWidth() const