Handle health rect using float coords down to the rendering

Author: Mauller

GeneralsMD/Code/GameEngine/Include/GameClient/Display.h

@@ -136,9 +136,15 @@ class Display : public SubsystemInterface
 	/// draw a rect border on the display in pixel coordinates with the specified color
 	virtual void drawOpenRect( Int startX, Int startY, Int width, Int height,
 														 Real lineWidth, UnsignedInt lineColor ) = 0;
+	/// draw a rect border on the display in pixel coordinates with the specified color
+	virtual void drawOpenRect( Real startX, Real startY, Real width, Real height,
+		Real lineWidth, UnsignedInt lineColor) = 0;
 	/// draw a filled rect on the display in pixel coords with the specified color
 	virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
 														 UnsignedInt color ) = 0;
+	/// draw a filled rect on the display in float pixel coords with the specified color
+	virtual void drawFillRect( Real startX, Real startY, Real width, Real height,
+														 UnsignedInt color ) = 0;
 
 	/// Draw a percentage of a rectange, much like a clock
 	virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) = 0;

GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h

@@ -756,22 +756,22 @@ class Drawable : public Thing,
 	void drawUIText( void );				///< draw the group number of this unit // public so gameclient can call
 private:
 	// "icon" drawing methods **************
-	void drawConstructPercent( const IRegion2D *healthBarRegion );  ///< display % construction complete
-	void drawCaption( const IRegion2D *healthBarRegion );						///< draw caption
-	void drawAmmo( const IRegion2D *healthBarRegion );							///< draw icons
-	void drawContained( const IRegion2D *healthBarRegion );					///< draw icons
-	void drawVeterancy( const IRegion2D *healthBarRegion );					///< draw veterency information
-
-	void drawEmoticon( const IRegion2D* healthBarRegion );
-	void drawHealthBar( const IRegion2D* healthBarRegion );					///< draw heath bar
-	void drawHealing( const IRegion2D* healthBarRegion );						///< draw icons
-	void drawEnthusiastic( const IRegion2D* healthBarRegin );				///< draw icons
+	void drawConstructPercent( const Region2D *healthBarRegion );  ///< display % construction complete
+	void drawCaption( const Region2D *healthBarRegion );						///< draw caption
+	void drawAmmo( const Region2D *healthBarRegion );							///< draw icons
+	void drawContained( const Region2D *healthBarRegion );					///< draw icons
+	void drawVeterancy( const Region2D *healthBarRegion );					///< draw veterency information
+
+	void drawEmoticon( const Region2D* healthBarRegion );
+	void drawHealthBar( const Region2D* healthBarRegion );					///< draw heath bar
+	void drawHealing( const Region2D* healthBarRegion );						///< draw icons
+	void drawEnthusiastic( const Region2D* healthBarRegin );				///< draw icons
 #ifdef ALLOW_DEMORALIZE
-	void drawDemoralized( const IRegion2D* healthBarRegion );				///< draw icons
+	void drawDemoralized( const Region2D* healthBarRegion );				///< draw icons
 #endif
-	void drawBombed( const IRegion2D* healthBarRegion );						///< draw icons
-	void drawDisabled( const IRegion2D* healthBarRegion );					///< draw icons
-	void drawBattlePlans( const IRegion2D* healthBarRegion );				///< Icons rendering for active battle plan statii
+	void drawBombed( const Region2D* healthBarRegion );						///< draw icons
+	void drawDisabled( const Region2D* healthBarRegion );					///< draw icons
+	void drawBattlePlans( const Region2D* healthBarRegion );				///< Icons rendering for active battle plan statii
 
 	Bool drawsAnyUIText( void );
 

GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h

@@ -37,6 +37,9 @@ typedef std::vector<ICoord3D> Coord3DVector;
 extern Bool ClipLine2D( ICoord2D *p1, ICoord2D *p2, ICoord2D *c1, ICoord2D *c2,
 												IRegion2D *clipRegion );
 
+extern Bool ClipLine2D(Coord2D* p1, Coord2D* p2, Coord2D* c1, Coord2D* c2,
+	IRegion2D* clipRegion);
+
 ///< IntersectLine2D will take two segments delimited by ab and cd and will return whether
 ///< they intersect within the length of ab. They will also return the intersection point out
 ///< intersection if it is non-NULL.

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

@@ -2664,7 +2664,7 @@ void Drawable::draw()
 /** Compute the health bar region based on the health of the object and the
 	* zoom level of the camera */
 // ------------------------------------------------------------------------------------------------
-static Bool computeHealthRegion( const Drawable *draw, IRegion2D& region )
+static Bool computeHealthRegion( const Drawable *draw, Region2D& region )
 {
 
 	// sanity
@@ -2740,8 +2740,8 @@ void Drawable::drawIconUI( void )
 {
 	if( TheGameLogic->getDrawIconUI() && (TheScriptEngine->getFade()==ScriptEngine::FADE_NONE) )
 	{
-		IRegion2D healthBarRegionStorage;
-		const IRegion2D* healthBarRegion = NULL;
+		Region2D healthBarRegionStorage;
+		const Region2D* healthBarRegion = NULL;
 		if (computeHealthRegion(this, healthBarRegionStorage))
 			healthBarRegion = &healthBarRegionStorage; //both data and a PointerAsFlag for logic in the methods below
 
@@ -2824,7 +2824,7 @@ void Drawable::setEmoticon( const AsciiString &name, Int duration )
 }
 
 //------------------------------------------------------------------------------------------------
-void Drawable::drawEmoticon( const IRegion2D *healthBarRegion )
+void Drawable::drawEmoticon( const Region2D *healthBarRegion )
 {
 	if( hasIconInfo() && getIconInfo()->m_icon[ ICON_EMOTICON ] )
 	{
@@ -2859,7 +2859,7 @@ void Drawable::drawEmoticon( const IRegion2D *healthBarRegion )
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
+void Drawable::drawAmmo( const Region2D *healthBarRegion )
 {
 	const Object *obj = getObject();
 
@@ -2913,7 +2913,7 @@ void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void Drawable::drawContained( const IRegion2D *healthBarRegion )
+void Drawable::drawContained( const Region2D *healthBarRegion )
 {
 	const Object *obj = getObject();
 
@@ -2987,7 +2987,7 @@ void Drawable::drawContained( const IRegion2D *healthBarRegion )
 }
 
 //-------------------------------------------------------------------------------------------------
-void Drawable::drawBattlePlans( const IRegion2D *healthBarRegion )
+void Drawable::drawBattlePlans( const Region2D *healthBarRegion )
 {
 	Object *obj = getObject();
 	if( !obj || !healthBarRegion )
@@ -3096,8 +3096,8 @@ void Drawable::drawUIText()
 	// GameClient caches a list of us drawables during Drawablepostdraw()
 	// then our group numbers get spit out last, so they draw in front
 
-	const IRegion2D* healthBarRegion = NULL;
-	IRegion2D healthBarRegionStorage;
+	const Region2D* healthBarRegion = NULL;
+	Region2D healthBarRegionStorage;
 	if (computeHealthRegion(this, healthBarRegionStorage))
 		healthBarRegion = &healthBarRegionStorage; //both data and a PointerAsFlag for logic in the methods below
 
@@ -3210,7 +3210,7 @@ void Drawable::drawUIText()
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void Drawable::drawHealing(const IRegion2D* healthBarRegion)
+void Drawable::drawHealing(const Region2D* healthBarRegion)
 {
 
 	const Object *obj = getObject();
@@ -3304,7 +3304,7 @@ void Drawable::drawHealing(const IRegion2D* healthBarRegion)
 // ------------------------------------------------------------------------------------------------
 /** This enthusiastic effect is TEMPORARY for the multiplayer test */
 // ------------------------------------------------------------------------------------------------
-void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
+void Drawable::drawEnthusiastic(const Region2D* healthBarRegion)
 {
 
 	const Object *obj = getObject();
@@ -3376,7 +3376,7 @@ void Drawable::drawEnthusiastic(const IRegion2D* healthBarRegion)
 #ifdef ALLOW_DEMORALIZE
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void Drawable::drawDemoralized(const IRegion2D* healthBarRegion)
+void Drawable::drawDemoralized(const Region2D* healthBarRegion)
 {
 
 	const Object *obj = getObject();
@@ -3433,7 +3433,7 @@ enum
 };
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-void Drawable::drawBombed(const IRegion2D* healthBarRegion)
+void Drawable::drawBombed(const Region2D* healthBarRegion)
 {
 
 	const Object *obj = getObject();
@@ -3612,7 +3612,7 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 // ------------------------------------------------------------------------------------------------
 /** Draw any icon information that needs to be drawn */
 // ------------------------------------------------------------------------------------------------
-void Drawable::drawDisabled(const IRegion2D* healthBarRegion)
+void Drawable::drawDisabled(const Region2D* healthBarRegion)
 {
 
 	const Object *obj = getObject();
@@ -3670,7 +3670,7 @@ void Drawable::drawDisabled(const IRegion2D* healthBarRegion)
 //-------------------------------------------------------------------------------------------------
 /** Draw construction percent for drawables that have objects that are "under construction" */
 //-------------------------------------------------------------------------------------------------
-void Drawable::drawConstructPercent( const IRegion2D *healthBarRegion )
+void Drawable::drawConstructPercent( const Region2D *healthBarRegion )
 {
 
 	// this data is in an attached object
@@ -3735,7 +3735,7 @@ void Drawable::drawConstructPercent( const IRegion2D *healthBarRegion )
 //-------------------------------------------------------------------------------------------------
 /** Draw caption */
 //-------------------------------------------------------------------------------------------------
-void Drawable::drawCaption( const IRegion2D *healthBarRegion )
+void Drawable::drawCaption( const Region2D *healthBarRegion )
 {
 	if (!m_captionDisplayString)
 		return;
@@ -3771,7 +3771,7 @@ void Drawable::drawCaption( const IRegion2D *healthBarRegion )
 // ------------------------------------------------------------------------------------------------
 /** Draw any veterency markers that should be displayed */
 // ------------------------------------------------------------------------------------------------
-void Drawable::drawVeterancy( const IRegion2D *healthBarRegion )
+void Drawable::drawVeterancy( const Region2D *healthBarRegion )
 {
 	// get object from drawble
 	Object* obj = getObject();
@@ -3819,7 +3819,7 @@ void Drawable::drawVeterancy( const IRegion2D *healthBarRegion )
 // ------------------------------------------------------------------------------------------------
 /** Draw health bar information for drawable */
 // ------------------------------------------------------------------------------------------------
-void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
+void Drawable::drawHealthBar(const Region2D* healthBarRegion)
 {
 	if (!healthBarRegion)
 		return;
@@ -3918,9 +3918,18 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 		}
 
 		Real healthBoxWidth = healthBarRegion->width();
-		Real healthBoxHeight = max((Int)defaultHealthBoxHeight, healthBarRegion->height());
+		Real healthBoxHeight = max(defaultHealthBoxHeight, healthBarRegion->height());
 		Real healthBoxOutlineSize = floorf(1.0f * TheInGameUI->getUnitHealthbarScaleFactor());
 
+		//TheDisplay->drawFillRect( healthBarRegion->lo.x - 2, healthBarRegion->lo.y - 12,
+		//													healthBoxWidth + 5, healthBoxHeight + 5,
+		//													GameMakeColor(255,0,0,255) );
+
+		//TheDisplay->drawFillRectf( healthBarRegion->lo.x, healthBarRegion->lo.y - 10,
+		//													healthBoxWidth * healthRatio, 4.6,
+		//													color );
+
+
 		// draw a filled bar for the health
 		// TheSuperHackers @info this takes up the whole size of the health rect area, the border is drawn over the top
 		// This simplifies the handling of the health bar
@@ -3930,12 +3939,12 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 
 		// draw the health blend line but only for intermediate resolutions
 		// TheSuperHackers @info we adjust the line down by the thickness of the border to keep it with one line of exposed pixels
-		if (fmod(healthBoxHeight, defaultHealthBoxHeight) > 0.0f) {
-			Color outlineBlendColor = outlineColor - 0x77000000;
-			TheDisplay->drawLine( healthBarRegion->lo.x, healthBarRegion->lo.y + healthBoxOutlineSize,
-																healthBarRegion->lo.x + healthBoxWidth * healthRatio, healthBarRegion->lo.y + healthBoxOutlineSize,
-																healthBoxOutlineSize + 1.0f, outlineBlendColor);
-		}
+		//if (fmod(healthBoxHeight, defaultHealthBoxHeight) > 0.0f) {
+		//	Color outlineBlendColor = outlineColor - 0x77000000;
+		//	TheDisplay->drawLine( healthBarRegion->lo.x, healthBarRegion->lo.y + healthBoxOutlineSize,
+		//														healthBarRegion->lo.x + healthBoxWidth * healthRatio, healthBarRegion->lo.y + healthBoxOutlineSize,
+		//														healthBoxOutlineSize + 1.0f, outlineBlendColor);
+		//}
 
 		// draw the health box outline
 		// TheSuperHackers @info when drawing the outline, the underlying function grows the outline towards the center of the region