Fixed input caret rendering

Fixed an issue with rendering multiple elements with the same depth

BansheeEngine/Source/BsGUIInputBox.cpp

@@ -84,8 +84,9 @@ namespace BansheeEngine
 		UINT32 numElements = mImageSprite->getNumRenderElements();
 		numElements += mTextSprite->getNumRenderElements();
 
-		if(mCaretShown && GUIManager::instance().getCaretBlinkState())
-			numElements += mTextSprite->getNumRenderElements();
+		/*if(mCaretShown && GUIManager::instance().getCaretBlinkState())*/
+		if(mCaretShown)
+			numElements += mCaretSprite->getNumRenderElements();
 
 		if(mSelectionShown)
 		{
@@ -127,7 +128,8 @@ namespace BansheeEngine
 		TEXT_SPRITE_DESC textDesc = getTextDesc();
 		mTextSprite->update(textDesc);
 
-		if(mCaretShown && GUIManager::instance().getCaretBlinkState())
+		/*if(mCaretShown && GUIManager::instance().getCaretBlinkState())*/
+		if(mCaretShown)
 		{
 			IMAGE_SPRITE_DESC mCaretDesc;
 			mCaretDesc.offset = getCaretPosition();
@@ -196,15 +198,16 @@ namespace BansheeEngine
 			return mImageSprite;
 		}
 
-		if(mCaretShown && GUIManager::instance().getCaretBlinkState())
+		/*if(mCaretShown && GUIManager::instance().getCaretBlinkState())*/
+		if(mCaretShown)
 		{
 			oldNumElements = newNumElements;
-			newNumElements += mImageSprite->getNumRenderElements();
+			newNumElements += mCaretSprite->getNumRenderElements();
 
 			if(renderElemIdx < newNumElements)
 			{
 				localRenderElemIdx = renderElemIdx - oldNumElements;
-				return mImageSprite;
+				return mCaretSprite;
 			}
 		}
 
@@ -255,9 +258,9 @@ namespace BansheeEngine
 		if(sprite == mImageSprite)
 			return _getDepth();
 		else if(sprite == mTextSprite || sprite == mCaretSprite)
-			return _getDepth() + 2;
+			return _getDepth() - 2;
 		else // Selection sprites
-			return _getDepth() + 1;
+			return _getDepth() - 1;
 	}
 
 	void GUIInputBox::fillBuffer(UINT8* vertices, UINT8* uv, UINT32* indices, UINT32 startingQuad, UINT32 maxNumQuads, 
@@ -364,7 +367,10 @@ namespace BansheeEngine
 					else
 					{
 						if(mCaretPos > 0)
+						{
 							mText.erase(mCaretPos - 1);
+							mCaretPos--;
+						}
 					}
 
 					markAsDirty();

BansheeEngine/Source/BsGUIManager.cpp

@@ -244,7 +244,9 @@ namespace BansheeEngine
 
 				// Compare pointers just to differentiate between two elements with the same depth, their order doesn't really matter, but std::set
 				// requires all elements to be unique
-				return aDepth > bDepth || (aDepth ==bDepth && a.element > b.element); 
+				return (aDepth > bDepth) || 
+					(aDepth == bDepth && a.element > b.element) || 
+					(aDepth == bDepth && a.element == b.element && a.renderElement > b.renderElement); 
 			};
 
 			Set<GUIGroupElement, std::function<bool(const GUIGroupElement&, const GUIGroupElement&)>>::type allElements(elemComp);
@@ -539,14 +541,16 @@ namespace BansheeEngine
 				mActiveMouseButton = guiButton;
 			}
 
-			if(mKeyboardFocusElement != nullptr && mMouseOverElement != mKeyboardFocusElement)
-				mKeyboardFocusElement->_setFocus(false);
-
 			if(mMouseOverElement != nullptr)
+			{
+				if(mKeyboardFocusElement != nullptr && mMouseOverElement != mKeyboardFocusElement)
+					mKeyboardFocusElement->_setFocus(false);
+
 				mMouseOverElement->_setFocus(true);
 
-			mKeyboardFocusElement = mMouseOverElement;
-			mKeyboardFocusWidget = mMouseOverWidget;
+				mKeyboardFocusElement = mMouseOverElement;
+				mKeyboardFocusWidget = mMouseOverWidget;
+			}
 		}
 		
 		event.markAsUsed();

BansheeEngine/Source/BsTextSprite.cpp

@@ -171,7 +171,7 @@ namespace BansheeEngine
 			lineDesc.startChar = curCharIdx;
 			lineDesc.endChar = curCharIdx + line.getNumChars();
 			lineDesc.lineHeight = line.getYOffset();
-			lineDesc.lineYStart = vertOffset + curY + desc.offset.y;
+			lineDesc.lineYStart = vertOffset + cachedLineY + desc.offset.y;
 
 			mLineDescs.push_back(lineDesc);
 
@@ -189,7 +189,7 @@ namespace BansheeEngine
 		{
 			if(charIdx >= idx && charIdx < renderElem.numQuads)
 			{
-				UINT32 localIdx = charIdx - idx;
+				UINT32 localIdx = (charIdx - idx) * 4;
 
 				Rect charRect;
 				charRect.x = Math::RoundToInt(renderElem.vertices[localIdx + 0].x);

TODO.txt

@@ -26,6 +26,8 @@ IMMEDIATE:
 	- SpriteTexture keeps a static reference to DUmmyTexture which I need to release before shutdown
 
 TextBox needed elements:
+ - Space doesn't register as a character which means I won't be able to place input caret if the last character is a space
+   - Make spaces inivisble characters?
  - Render element: background texture and a text sprite
  - Keyboard focus: Mouse click gives focus, tabbing between elements gives focus (TODO: explore how will tabbing work)
  - Input: All characters get forwarded to element with focus