Fix merge conflicts from develop sync: Vector2 Scale and rendering features#15
Closed
Copilot wants to merge 3 commits into
Closed
Fix merge conflicts from develop sync: Vector2 Scale and rendering features#15Copilot wants to merge 3 commits into
Copilot wants to merge 3 commits into
Conversation
…features Agent-Logs-Url: https://github.com/TrainWrack/TombEngine/sessions/eeb30453-a1e0-423e-9279-9fc2a1199c56 Co-authored-by: TrainWrack <120750885+TrainWrack@users.noreply.github.com>
Agent-Logs-Url: https://github.com/TrainWrack/TombEngine/sessions/eeb30453-a1e0-423e-9279-9fc2a1199c56 Co-authored-by: TrainWrack <120750885+TrainWrack@users.noreply.github.com>
Agent-Logs-Url: https://github.com/TrainWrack/TombEngine/sessions/eeb30453-a1e0-423e-9279-9fc2a1199c56 Co-authored-by: TrainWrack <120750885+TrainWrack@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
TrainWrack
May 19, 2026 00:42
View session
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Checklist
CHANGELOG.mdfile on the branch/fork (if it is an internal change, this is not needed).Links to issue(s) this pull request concerns (if applicable)
N/A
Pull request description
Merge with
developintroduced breaking changes to renderer string API. The original PR changedScalefromfloattoVector2but merge left inconsistent types causing C2446/C2440 errors.Core Type Changes
Scalechanged fromfloattoVector2; addedRotation,Priority,Blend,HasScissor,ScissorRectVector2(stringScale.yfor scalar operations, full Vector2 for DrawString)Vector2 scaleandfloat rotationparametersFeature Additions
HasActiveDisplayScissor()/GetActiveDisplayScissor()to DisplaySpriteRendererStringToDrawandRendererDisplaySpriteToDrawAPI Changes
Implementation Notes
DrawAllStrings()now manages blend state and scissor state per string with SpriteBatch restart on changeAddStringInternal()handles both float and Vector2 scale overloads