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

21174 Make the Particle Emitter Easier to Use #10279

Merged
merged 6 commits into from Apr 26, 2017

Conversation

Projects
None yet
6 participants
@andrewd440
Contributor

andrewd440 commented Apr 25, 2017

For: https://worklist.net/21174

Functionality/Code Changes:

  • Moves the qml Edit tabview to separate file to allow function usage of fromScript() to respond to script messages.
  • Shows the particle explorer when selecting a particle entity.
  • Replaces color picker used in particle explorer with the one used in entity properties.
  • Always shows hand lasers while in edit mode.
  • Allows selecting particle entities with hand lasers while in edit mode.

Test Plan:

  • Enter VR mode with HMD and hand controllers active
  • Creating a particle entity should show the particle explorer tab.
  • Selecting a particle entity in the entity list should show the particle explorer tab.
  • Selecting a particle entity in edit mode with the hand lasers should show the particle explorer tab.
  • Particle entities should be selectable with hand lasers by selecting the particle overlay icon.
  • The color picker used for the particle explorer should match the one used on the entity properties tab.
  • When in edit mode and the stylus/finger is not active for the tablet, hand lasers should be shown.
@hifi-gustavo

This comment has been minimized.

Show comment
Hide comment
@hifi-gustavo

hifi-gustavo Apr 25, 2017

An admin must verify this patch for the pull request build to fire. Type "ok to test" to begin testing this pull request or "add to whitelist" to test this and all future pull requests from this collaborator.

hifi-gustavo commented Apr 25, 2017

An admin must verify this patch for the pull request build to fire. Type "ok to test" to begin testing this pull request or "add to whitelist" to test this and all future pull requests from this collaborator.

@andrewd440 andrewd440 changed the title from #21174 Make the Particle Emitter Easier to Use to 21174 Make the Particle Emitter Easier to Use Apr 25, 2017

@cozza13

This comment has been minimized.

Show comment
Hide comment
@cozza13

cozza13 Apr 25, 2017

Contributor

ok to test

Contributor

cozza13 commented Apr 25, 2017

ok to test

@cozza13

This comment has been minimized.

Show comment
Hide comment
@cozza13

cozza13 Apr 25, 2017

Contributor

add to whitelist

Contributor

cozza13 commented Apr 25, 2017

add to whitelist

@hifi-gustavo

This comment has been minimized.

Show comment
Hide comment
1 similar comment
@hifi-gustavo

This comment has been minimized.

Show comment
Hide comment
@Nex-Pro

This comment has been minimized.

Show comment
Hide comment
@Nex-Pro

Nex-Pro Apr 26, 2017

Contributor

Testing this win10 and Vive

Contributor

Nex-Pro commented Apr 26, 2017

Testing this win10 and Vive

@Nex-Pro

This comment has been minimized.

Show comment
Hide comment
@Nex-Pro

Nex-Pro Apr 26, 2017

Contributor

PASS

Tested with win10 and Vive.

Compared against master where the color pickers are almost useless.

Test Plan:

Enter VR mode with HMD and hand controllers active

Creating a particle entity should show the particle explorer tab. SUCCESS

Selecting a particle entity in the entity list should show the particle explorer tab. SUCCESS

Selecting a particle entity in edit mode with the hand lasers should show the particle explorer tab. SUCCESS

Particle entities should be selectable with hand lasers by selecting the particle overlay icon. NOT RELIABLE This is NOT due to this PR I see this issue in all builds. I may have to click many times to get a particle or light to select via the icon.

The color picker used for the particle explorer should match the one used on the entity properties tab. SUCCESS

When in edit mode and the stylus/finger is not active for the tablet, hand lasers should be SUCCESS

Contributor

Nex-Pro commented Apr 26, 2017

PASS

Tested with win10 and Vive.

Compared against master where the color pickers are almost useless.

Test Plan:

Enter VR mode with HMD and hand controllers active

Creating a particle entity should show the particle explorer tab. SUCCESS

Selecting a particle entity in the entity list should show the particle explorer tab. SUCCESS

Selecting a particle entity in edit mode with the hand lasers should show the particle explorer tab. SUCCESS

Particle entities should be selectable with hand lasers by selecting the particle overlay icon. NOT RELIABLE This is NOT due to this PR I see this issue in all builds. I may have to click many times to get a particle or light to select via the icon.

The color picker used for the particle explorer should match the one used on the entity properties tab. SUCCESS

When in edit mode and the stylus/finger is not active for the tablet, hand lasers should be SUCCESS

@zfox23

This comment has been minimized.

Show comment
Hide comment
@zfox23

zfox23 Apr 26, 2017

Member

Does this work on Desktop mode with toolbar?

If so, and the tabs -> spaces issue is fixed, I can dev-approve this.

Member

zfox23 commented Apr 26, 2017

Does this work on Desktop mode with toolbar?

If so, and the tabs -> spaces issue is fixed, I can dev-approve this.

@andrewd440

This comment has been minimized.

Show comment
Hide comment
@andrewd440

andrewd440 Apr 26, 2017

Contributor

Everything still works out on desktop mode from my testing, which the only that that changed is the color picker.

Contributor

andrewd440 commented Apr 26, 2017

Everything still works out on desktop mode from my testing, which the only that that changed is the color picker.

@zfox23

This comment has been minimized.

Show comment
Hide comment
@zfox23

zfox23 Apr 26, 2017

Member

Sweet, merged.

Member

zfox23 commented Apr 26, 2017

Sweet, merged.

@zfox23 zfox23 merged commit 9ace7a7 into highfidelity:master Apr 26, 2017

1 check was pending

default Build started sha1 is merged.
Details
@hifi-gustavo

This comment has been minimized.

Show comment
Hide comment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment