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

BF: window.viewScale and viewPos combine correctly #1011

Merged
merged 1 commit into from
Nov 21, 2015

Conversation

jeremygray
Copy link
Contributor

Per discussion here jeremygray@ff76914

  • viewScale works properly, including negative values to mirror-image flip
    this could support a new experiment setting to mirror the screen, for all stim except Text and maybe 1-2 others,
    but using a FBO might be a better way to go
  • viewScale combines correctly with viewPos and with viewOri (separately, not 3-way)
  • viewPos and viewOri do not combine correctly yet, so raise NotImplementedError
  • GL_PROJECTION code removed from Window.flip()
  • minor efficiency: no longer does a glRotate on every frame when none was requested (viewOri 0.)
  • new test added

- viewScale works properly, including negative values to mirror-image flip
  this could support a expereriment setting to mirror the screen, for all stim except Text and maybe 1-2 others,
  but using a FBO might be a better way to go
- viewScale combines correctly with viewPos and with viewOri (separately, not 3-way)
- viewPos and viewOri do not combine correctly yet, so raise NotImplementedError
- GL_PROJECTION code removed from Window.flip()
- minor efficiency: no longer does a glRotate on every frame when none was requested (viewOri 0.)
- new test added
@landscape-bot
Copy link

Code Health
Repository health increased by 0.01% when pulling d455842 on jeremygray:bf-window-viewScale-pos-ori into 556e79b on psychopy:master.

peircej added a commit that referenced this pull request Nov 21, 2015
BF: window.viewScale and viewPos combine correctly
@peircej peircej merged commit 44dffc0 into psychopy:master Nov 21, 2015
@jeremygray jeremygray deleted the bf-window-viewScale-pos-ori branch November 21, 2015 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants