[aedGUI-cvs] aedGUI/src aedRect.cpp,NONE,1.1 aedStaticText.cpp,1.36,1.37

[Rodrigo H. <kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7380

Modified Files:
	aedStaticText.cpp 
Added Files:
	aedRect.cpp 
Log Message:
aedFont now uses a vector of surfaces for text rendering

Index: aedStaticText.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedStaticText.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** aedStaticText.cpp	21 May 2004 14:24:23 -0000	1.36
--- aedStaticText.cpp	21 May 2004 15:06:51 -0000	1.37
***************
*** 121,126 ****
  	for(;;)
  	  {
- 	    // the following doesn't quite work
- 	    // yet
  	    temp2 = temp.substr(0,m_Font->getMaxCharLen(m_Surface,
  							dest.x,
--- 121,124 ----

--- NEW FILE: aedRect.cpp ---
#include "aedRect.h"

bool aedRect::intersectRect(const SDL_Rect& rect1, const SDL_Rect& rect2)
{
  //This function was taken and modified from ParaGUI
  int px0,py0,px1,py1;
  int cx0,cy0,cx1,cy1;
  int rx0,ry0,rx1,ry1;
  
  // get coordinates of the rectangles
  px0 = rect1.x;
  py0 = rect1.y;
  px1 = rect1.x + rect1.w - 1;
  py1 = rect1.y + rect1.h - 1;
  
  cx0 = rect2.x;
  cy0 = rect2.y;
  cx1 = rect2.x + rect2.w - 1;
  cy1 = rect2.y + rect2.h - 1;
  
  // check if the rectangles intersect
  if(/*(cx0 < px0) && */(cx1 < px0))
    return false;
  
  if((cx0 > px1) /*&& (cx1 > px1)*/)
    return false;
  
  if(/*(cy0 < py0) && */(cy1 < py0))
    return false;
  
  if((cy0 > py1) /*&& (cy1 > py1)*/)
    return false;
  
  // intersect x
  if(cx0 <= px0)
    rx0 = px0;
  else
    rx0 = cx0;
  
  if(cx1 >= px1)
    rx1 = px1;
  else
    rx1 = cx1;
  
  // intersect y
  if(cy0 <= py0)
    ry0 = py0;
  else
    ry0 = cy0;
  
  if(cy1 >= py1)
    ry1 = py1;
  else
    ry1 = cy1;
  
  // fill in result rect
  m_X = rx0;
  m_Y = ry0;
  m_W = (rx1-rx0)+1;
  m_H = (ry1-ry0)+1;
  return true;
};