[Scummvm-cvs-logs] SF.net SVN: scummvm: [31849] scummvm/branches/gsoc2008-gui/graphics
Tanoku at users.sourceforge.net
Tanoku at users.sourceforge.net
Sat May 3 23:57:30 CEST 2008
Revision: 31849
http://scummvm.svn.sourceforge.net/scummvm/?rev=31849&view=rev
Author: Tanoku
Date: 2008-05-03 14:57:29 -0700 (Sat, 03 May 2008)
Log Message:
-----------
- More coding convention fixes.
- Aliased circles.
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-03 21:15:25 UTC (rev 31848)
+++ scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.cpp 2008-05-03 21:57:29 UTC (rev 31849)
@@ -34,7 +34,7 @@
inline uint32 fp_sqroot( uint32 x );
VectorRenderer *createRenderer() {
- return new VectorRendererAA<uint16,ColorMasks<565> >;
+ return new VectorRendererSpec<uint16,ColorMasks<565> >;
}
@@ -50,20 +50,20 @@
_system->clearOverlay();
_system->grabOverlay((OverlayColor*)_screen.pixels, _screen.w);
- vr->setSurface( &_screen );
- vr->setColor( 255, 0, 0 );
+ vr->setSurface(&_screen);
+ vr->setColor(255, 0, 0);
vr->fillSurface();
- vr->setColor( 255, 255, 0 );
+ vr->setColor(255, 255, 0);
_system->showOverlay();
- while( true ) { // draw!!
+ while(true) { // draw!!
- vr->setColor( 255, 255, 255 );
+ vr->setColor(255, 255, 255);
vr->fillSurface();
- vr->setColor( 255, 0, 0 );
- vr->drawLine( 25, 25, 125, 300 );
- vr->drawCircle( 250, 250, 100 );
+ vr->setColor(255, 0, 0 );
+ vr->drawLine(25, 25, 125, 300);
+ vr->drawCircle(250, 250, 100);
_system->copyRectToOverlay((OverlayColor*)_screen.getBasePtr(0, 0), _screen.w, 0, 0, _screen.w, _screen.w);
_system->updateScreen();
@@ -130,13 +130,13 @@
*ptr = (PixelType)(
(PixelFormat::kRedMask & ((idst & PixelFormat::kRedMask) +
((int)(((int)(isrc & PixelFormat::kRedMask) -
- (int)(idst & PixelFormat::kRedMask)) * alpha) >>8))) |
+ (int)(idst & PixelFormat::kRedMask)) * alpha) >> 8))) |
(PixelFormat::kGreenMask & ((idst & PixelFormat::kGreenMask) +
((int)(((int)(isrc & PixelFormat::kGreenMask) -
- (int)(idst & PixelFormat::kGreenMask)) * alpha) >>8))) |
+ (int)(idst & PixelFormat::kGreenMask)) * alpha) >> 8))) |
(PixelFormat::kBlueMask & ((idst & PixelFormat::kBlueMask) +
((int)(((int)(isrc & PixelFormat::kBlueMask) -
- (int)(idst & PixelFormat::kBlueMask)) * alpha) >>8))) );
+ (int)(idst & PixelFormat::kBlueMask)) * alpha) >> 8))) );
}
@@ -151,41 +151,41 @@
*ptr = (PixelType)Base::_color;
- if ( dx > dy ) {
- gradient = (uint32)(dy<<16)/(uint32)dx;
+ if (dx > dy) {
+ gradient = (uint32)(dy << 16) / (uint32)dx;
error_acc = 0;
- while( --dx ) {
+ while(--dx) {
error_tmp = error_acc;
error_acc += gradient;
- if ( error_acc <= error_tmp )
+ if (error_acc <= error_tmp)
ptr += pitch;
ptr += xdir;
- blendPixelPtr( ptr, (error_acc >> 8) ^ 0xFF );
- blendPixelPtr( ptr + pitch, (error_acc >> 8) & 0xFF );
+ blendPixelPtr(ptr, (error_acc >> 8) ^ 0xFF);
+ blendPixelPtr(ptr + pitch, (error_acc >> 8) & 0xFF);
}
} else {
- gradient = (uint32)(dx<<16)/(uint32)dy;
+ gradient = (uint32)(dx << 16) / (uint32)dy;
error_acc = 0;
- while( --dy ) {
+ while(--dy) {
error_tmp = error_acc;
error_acc += gradient;
- if ( error_acc <= error_tmp )
+ if (error_acc <= error_tmp)
ptr += xdir;
ptr += pitch;
- blendPixelPtr( ptr, (error_acc >> 8) ^ 0xFF );
- blendPixelPtr( ptr + xdir, (error_acc >> 8) & 0xFF );
+ blendPixelPtr(ptr, (error_acc >> 8) ^ 0xFF);
+ blendPixelPtr(ptr + xdir, (error_acc >> 8) & 0xFF);
}
}
- Base::putPixel( x2, y2 );
+ Base::putPixel(x2, y2);
}
template<typename PixelType, typename PixelFormat>
@@ -233,7 +233,7 @@
}
}
-inline uint32 fp_sqroot( uint32 x ) {
+inline uint32 fp_sqroot(uint32 x) {
register uint32 root, remHI, remLO, testDIV, count;
root = 0;
@@ -242,58 +242,88 @@
count = 23;
do {
- remHI = (remHI<<2) | (remLO>>30);
+ remHI = (remHI << 2) | (remLO >> 30);
remLO <<= 2;
root <<= 1;
- testDIV = (root<<1) + 1;
+ testDIV = (root <<1 ) + 1;
- if ( remHI >= testDIV ) {
+ if (remHI >= testDIV) {
remHI -= testDIV;
root++;
}
- } while( count-- );
+ } while(count--);
return root;
}
template<typename PixelType, typename PixelFormat>
-void VectorRendererAA<PixelType,PixelFormat>::
+void VectorRendererSpec<PixelType,PixelFormat>::
drawCircleAlg(int x1, int y1, int r) {
-#define __CIRCLE_SIM(x,y,a) { \
- blendPixel( x1 + (x), y1 + (y), a ); \
- blendPixel( x1 + (x), y1 - (y), a ); \
- blendPixel( x1 - (y), y1 + (x), a ); \
- blendPixel( x1 + (y), y1 + (x), a ); \
- blendPixel( x1 - (x), y1 + (y), a ); \
- blendPixel( x1 - (x), y1 - (y), a ); \
- blendPixel( x1 + (y), y1 - (x), a ); \
- blendPixel( x1 - (y), y1 - (x), a ); \
+#define __CIRCLE_SIM(x,y) { \
+ putPixel(x1 + (x), y1 + (y)); /* 1st quad */ \
+ putPixel(x1 + (y), y1 - (x)); \
+ putPixel(x1 - (x), y1 - (y)); /* 2nd quad */ \
+ putPixel(x1 - (y), y1 - (x)); \
+ putPixel(x1 - (y), y1 + (x)); /* 3rd quad */ \
+ putPixel(x1 - (x), y1 + (y)); \
+ putPixel(x1 + (y), y1 + (x)); /* 4th quad */ \
+ putPixel(x1 + (x), y1 - (y)); \
}
- // first quadrant
-/*#define __CIRCLE_SIM(x,y,a) { \
- blendPixel( x1 + (x), y1 - (y), a ); \
- blendPixel( x1 + (y), y1 - (x), a ); \
-}*/
+ int f = 1 - r;
+ int ddF_x = 0;
+ int ddF_y = -2 * r;
+ int x = 0;
+ int y = r;
+ __CIRCLE_SIM(x,y);
+
+ while(x++ < y) {
+ if(f >= 0) {
+ y--;
+ ddF_y += 2;
+ f += ddF_y;
+ }
+
+ ddF_x += 2;
+ f += ddF_x + 1;
+
+ __CIRCLE_SIM(x,y);
+ }
+}
+
+template<typename PixelType, typename PixelFormat>
+void VectorRendererAA<PixelType,PixelFormat>::
+drawCircleAlg(int x1, int y1, int r) {
+
+#define __WU_CIRCLE_SIM(x,y,a) { \
+ blendPixel(x1 + (x), y1 + (y), a); /* 1st quad */ \
+ blendPixel(x1 + (y), y1 - (x), a); \
+ blendPixel(x1 - (x), y1 - (y), a); /* 2nd quad */ \
+ blendPixel(x1 - (y), y1 - (x), a); \
+ blendPixel(x1 - (y), y1 + (x), a); /* 3rd quad */ \
+ blendPixel(x1 - (x), y1 + (y), a); \
+ blendPixel(x1 + (y), y1 + (x), a); /* 4th quad */ \
+ blendPixel(x1 + (x), y1 - (y), a); \
+}
int x = r;
int y = 0;
- uint32 rsq = (r*r)<<16;
+ uint32 rsq = (r * r) << 16;
uint32 T = 0, oldT;
- __CIRCLE_SIM( x, y, 255 );
+ __WU_CIRCLE_SIM(x, y, 255);
- while( x > y++ )
+ while(x > y++)
{
oldT = T;
- T = fp_sqroot( rsq - ((y*y)<<16) ) ^ 0xFFFF;
+ T = fp_sqroot(rsq - ((y * y) << 16)) ^ 0xFFFF;
- if ( T < oldT )
+ if (T < oldT)
x--;
- __CIRCLE_SIM( x, y, (T>>8) ^ 0xFF );
- __CIRCLE_SIM( x-1, y, (T>>8) & 0xFF );
+ __WU_CIRCLE_SIM(x, y, (T >> 8) ^ 0xFF);
+ __WU_CIRCLE_SIM(x-1, y, (T >> 8) & 0xFF);
}
}
Modified: scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h
===================================================================
--- scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h 2008-05-03 21:15:25 UTC (rev 31848)
+++ scummvm/branches/gsoc2008-gui/graphics/VectorRenderer.h 2008-05-03 21:57:29 UTC (rev 31849)
@@ -72,7 +72,7 @@
* @param y Vertical (Y) coordinate for the center of the circle
* @param r Radius of the circle.
*/
- virtual void drawCircle( int x, int y, int r ) = 0;
+ virtual void drawCircle(int x, int y, int r) = 0;
/**
* Gets the pixel pitch for the current drawing surface.
@@ -113,7 +113,7 @@
*
* @param surface Pointer to a Surface object.
*/
- virtual void setSurface( Surface *surface ){
+ virtual void setSurface(Surface *surface){
_activeSurface = surface;
}
@@ -137,7 +137,7 @@
* @param x Horizontal coordinate of the pixel.
* @param y Vertical coordinate of the pixel.
*/
- inline virtual void putPixel( int x, int y ) = 0;
+ inline virtual void putPixel(int x, int y) = 0;
/**
* Blends a single pixel on the surface with the given coordinates, with
@@ -147,7 +147,7 @@
* @param y Vertical coordinate of the pixel.
* @param alpha Alpha intensity of the pixel (0-255)
*/
- inline virtual void blendPixel( int x, int y, uint8 alpha ) = 0;
+ inline virtual void blendPixel(int x, int y, uint8 alpha) = 0;
protected:
@@ -209,7 +209,7 @@
void drawLine(int x1, int x2, int y1, int y2);
void drawCircle( int x, int y, int r ) {
- drawCircleAlg( x, y, r );
+ drawCircleAlg(x, y, r);
}
/**
@@ -249,8 +249,7 @@
* @see VectorRenderer::blendPixel()
*/
virtual inline void blendPixel( int x, int y, uint8 alpha ) {
- if ( alpha > 0 )
- putPixel( x, y );
+ putPixel(x, y);
}
protected:
@@ -269,7 +268,7 @@
/**
* @see VectorRenderer::drawCircleAlg()
*/
- virtual void drawCircleAlg(int x, int y, int r) {}
+ virtual void drawCircleAlg(int x, int y, int r);
PixelType _color; /** Color currently being used to draw on the renderer */
};
@@ -312,7 +311,7 @@
* @param ptr Pointer to the pixel where we must draw
* @param alpha Intensity of the pixel (0-255).
*/
- inline void blendPixelPtr( PixelType *ptr, uint8 alpha );
+ inline void blendPixelPtr(PixelType *ptr, uint8 alpha);
/**
* @see VectorRenderer::blendPixel()
@@ -321,12 +320,12 @@
* handled separately.
*/
inline void blendPixel( int x, int y, uint8 alpha ) {
- if ( alpha == 0 )
+ if (alpha == 0)
return;
- else if ( alpha < 255 )
- blendPixelPtr( (PixelType*)Base::_activeSurface->getBasePtr(x, y), alpha );
+ else if (alpha < 255)
+ blendPixelPtr((PixelType*)Base::_activeSurface->getBasePtr(x, y), alpha);
else
- Base::putPixel( x, y );
+ Base::putPixel(x, y);
}
/**
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