[Scummvm-cvs-logs] SF.net SVN: scummvm: [31963] scummvm/branches/gsoc2008-gui/graphics

Tanoku at users.sourceforge.net Tanoku at users.sourceforge.net
Fri May 9 13:41:34 CEST 2008


Revision: 31963
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31963&view=rev
Author:   Tanoku
Date:     2008-05-09 04:41:34 -0700 (Fri, 09 May 2008)

Log Message:
-----------
- Code formating.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.cpp
    scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h

Modified: scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.cpp	2008-05-09 10:56:03 UTC (rev 31962)
+++ scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.cpp	2008-05-09 11:41:34 UTC (rev 31963)
@@ -67,7 +67,7 @@
 		vr->drawLine(25, 25, 125, 300);
 		vr->drawCircle(250, 250, 100);
 //		vr->drawSquare(150, 25, 100, 100, true);
-		vr->drawRoundedSquare( 150, 25, 8, 100, 75 );
+		vr->drawRoundedSquare(150, 25, 8, 100, 75);
 		_system->copyRectToOverlay((OverlayColor*)_screen.getBasePtr(0, 0), _screen.w, 0, 0, _screen.w, _screen.w);
 		_system->updateScreen();
 
@@ -93,10 +93,10 @@
 			ptr += pitch;
 		}
 	} else {
-		drawLine( x, y, x + w, y );
-		drawLine( x + w, y, x + w, y + w );
-		drawLine( x, y + w, x + w, y + w );
-		drawLine( x, y, x, y + w );
+		drawLine(x, y, x + w, y);
+		drawLine(x + w, y, x + w, y + w);
+		drawLine(x, y + w, x + w, y + w);
+		drawLine(x, y, x, y + w);
 	}
 }
 
@@ -297,7 +297,7 @@
 	bool fill = true;
 
 	px = 0;
-	py = pitch*y;
+	py = pitch * y;
 
 	*(ptr + y) = _color;
 	*(ptr - y) = _color;
@@ -372,7 +372,7 @@
 		}
 	}
 
-	px = p*x;
+	px = p * x;
 	py = 0;
 
 	while (x > y++)
@@ -391,11 +391,11 @@
 		a1 = ~a2;
 
 		if (fill) {
-			Common::set_to( ptr_tl - x - py, ptr_tr + x - py, Base::_color );
-			Common::set_to( ptr_tl - y - px, ptr_tr + y - px, Base::_color );
+			Common::set_to(ptr_tl - x - py, ptr_tr + x - py, Base::_color);
+			Common::set_to(ptr_tl - y - px, ptr_tr + y - px, Base::_color);
 
-			Common::set_to( ptr_bl - x + py, ptr_br + x + py, Base::_color );
-			Common::set_to( ptr_bl - y + px, ptr_br + y + px, Base::_color );
+			Common::set_to(ptr_bl - x + py, ptr_br + x + py, Base::_color);
+			Common::set_to(ptr_bl - y + px, ptr_br + y + px, Base::_color);
 		} else {
 			blendPixelPtr(ptr_tr + y - (px-p), a2);
 			blendPixelPtr(ptr_tr + x - 1 - py, a2);
@@ -436,8 +436,8 @@
 	bool fill = false;
 
 	PixelType *ptr = (PixelType *)Base::_activeSurface->getBasePtr(x1, y1);
-	px = p*x;
-	py = p*y;
+	px = p * x;
+	py = p * y;
 
 	*(ptr + x) = (PixelType)Base::_color;
 	*(ptr - x) = (PixelType)Base::_color;

Modified: scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h
===================================================================
--- scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h	2008-05-09 10:56:03 UTC (rev 31962)
+++ scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h	2008-05-09 11:41:34 UTC (rev 31963)
@@ -223,7 +223,7 @@
 	void drawSquare(int x, int y, int w, int h, bool fill);
 
 	void drawRoundedSquare(int x1, int y1, int r, int w, int h) {
-		drawRoundedSquareAlg( x1, y1, r, w, h );
+		drawRoundedSquareAlg(x1, y1, r, w, h);
 	}
 
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list