Bläddra i källkod

Removed addDropShadow from ScreenLabel

Ivan Safrin 12 år sedan
förälder
incheckning
8f94050c5b
2 ändrade filer med 3 tillägg och 31 borttagningar
  1. 2 14
      Core/Contents/Include/PolyScreenLabel.h
  2. 1 17
      Core/Contents/Source/PolyScreenLabel.cpp

+ 2 - 14
Core/Contents/Include/PolyScreenLabel.h

@@ -47,17 +47,7 @@ namespace Polycode {
 		
 		
 			virtual Entity *Clone(bool deepClone, bool ignoreEditorOnly);
 			virtual Entity *Clone(bool deepClone, bool ignoreEditorOnly);
 			virtual void applyClone(Entity *clone, bool deepClone, bool ignoreEditorOnly);
 			virtual void applyClone(Entity *clone, bool deepClone, bool ignoreEditorOnly);
-		
-			/**
-			* Adds a drop shadow to the label.
-			* @param color Color of the drop shadow.
-			* @param size Size of the drop shadow in pixels.
-			* @param offsetX Horizontal offset of the drop shadow.
-			* @param offsetY Vertical offset of the drop shadow.			
-			*/
-			void addDropShadow(Color color, Number size, Number offsetX, Number offsetY);
-			
-			
+					
 			/**
 			/**
 			* Sets a new text to the screen label.
 			* Sets a new text to the screen label.
 			* @param newText Text to set.
 			* @param newText Text to set.
@@ -77,9 +67,7 @@ namespace Polycode {
 			
 			
 		protected:
 		protected:
 			
 			
-			void updateTexture();
-			
+			void updateTexture();			
 			Label *label;
 			Label *label;
-			ScreenImage *dropShadowImage;
 	};
 	};
 }
 }

+ 1 - 17
Core/Contents/Source/PolyScreenLabel.cpp

@@ -35,18 +35,15 @@ using namespace Polycode;
 
 
 ScreenLabel::ScreenLabel(const String& text, int size, const String& fontName, int amode, bool premultiplyAlpha) : ScreenShape(ScreenShape::SHAPE_RECT,1,1) {
 ScreenLabel::ScreenLabel(const String& text, int size, const String& fontName, int amode, bool premultiplyAlpha) : ScreenShape(ScreenShape::SHAPE_RECT,1,1) {
 	label = new Label(CoreServices::getInstance()->getFontManager()->getFontByName(fontName), text, size, amode, premultiplyAlpha);
 	label = new Label(CoreServices::getInstance()->getFontManager()->getFontByName(fontName), text, size, amode, premultiplyAlpha);
-	dropShadowImage = NULL;
 	texture = NULL;
 	texture = NULL;
 	updateTexture();
 	updateTexture();
-	positionMode = POSITION_TOPLEFT;	
-	dropShadowImage = NULL;
+	positionMode = POSITION_TOPLEFT;
 	colorAffectsChildren = false;
 	colorAffectsChildren = false;
 	positionAtBaseline = true;
 	positionAtBaseline = true;
 }
 }
 
 
 ScreenLabel::~ScreenLabel() {
 ScreenLabel::~ScreenLabel() {
 	delete label;
 	delete label;
-	delete dropShadowImage;
 }
 }
 
 
 Label *ScreenLabel::getLabel() const {
 Label *ScreenLabel::getLabel() const {
@@ -65,19 +62,6 @@ void ScreenLabel::applyClone(Entity *clone, bool deepClone, bool ignoreEditorOnl
 	_clone->positionAtBaseline = positionAtBaseline;
 	_clone->positionAtBaseline = positionAtBaseline;
 }
 }
 
 
-void ScreenLabel::addDropShadow(Color color, Number size, Number offsetX, Number offsetY) {
-	delete dropShadowImage;
-	Image *labelImage = new Image(label);
-	labelImage->fastBlur(size);
-	dropShadowImage = new ScreenImage(labelImage);	
-	delete labelImage;
-	addChild(dropShadowImage);
-	dropShadowImage->setColor(color);
-	dropShadowImage->setPositionMode(POSITION_TOPLEFT);
-	dropShadowImage->setPosition(offsetX, offsetY);
-	dropShadowImage->getMesh()->getPolygon(0)->flipUVY();
-}
-
 const String& ScreenLabel::getText() const {
 const String& ScreenLabel::getText() const {
 	return label->getText();
 	return label->getText();
 }	
 }