Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ActorPreviewWidget viewport manipulation. #17026

Merged
merged 1 commit into from Sep 13, 2019

Conversation

@pchote
Copy link
Member

pchote commented Sep 1, 2019

This PR implements another small step towards #10382. Separating the world and UI rendering means that this widget can't (ab)use the world-based renderers for the UI.

I'm hoping that we can live with the small amount of new duplication between UIModelRenderable and FinalizedUIModelRenderable - trying to merge the two in a simple way leads to a mess, and trying to merge them properly will be a waste of time as these will hopefully be removed in the voxel rewrite which I plan for later in the rendering PR series.

@pchote pchote force-pushed the pchote:actor-preview-widget branch from 14a113b to f2f0c1a Sep 1, 2019
Copy link
Contributor

teinarss left a comment

Looks good, found no issues while testing

@pchote pchote force-pushed the pchote:actor-preview-widget branch from f2f0c1a to af3ae7f Sep 4, 2019
@pchote

This comment has been minimized.

Copy link
Member Author

pchote commented Sep 4, 2019

Rebased.

@pchote pchote requested review from abcdefg30 and reaperrr Sep 9, 2019
@pchote pchote force-pushed the pchote:actor-preview-widget branch from af3ae7f to e6c5fbf Sep 12, 2019
@pchote

This comment has been minimized.

Copy link
Member Author

pchote commented Sep 12, 2019

Rebased again.

Copy link
Member

abcdefg30 left a comment

Didn't spot any obvious regressions during a quick check.

I suppose my comments below are not really important (i.e. no blockers) since you plan to remove this later (whenever that is) anyway.

OpenRA.Mods.Common/Graphics/UIModelRenderable.cs Outdated Show resolved Hide resolved
OpenRA.Mods.Common/Graphics/UIModelRenderable.cs Outdated Show resolved Hide resolved
@pchote pchote force-pushed the pchote:actor-preview-widget branch from e6c5fbf to 3ac4d8d Sep 12, 2019
@pchote

This comment has been minimized.

Copy link
Member Author

pchote commented Sep 12, 2019

Updated

@abcdefg30

This comment has been minimized.

Copy link
Member

abcdefg30 commented Sep 13, 2019

👍 still stands.

@abcdefg30 abcdefg30 merged commit a8b1762 into OpenRA:bleed Sep 13, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30

This comment has been minimized.

Copy link
Member

abcdefg30 commented Sep 13, 2019

@pchote pchote deleted the pchote:actor-preview-widget branch Sep 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.