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 rendering glitch masks #2526

Merged
merged 8 commits into from Jul 12, 2019

Conversation

@peircej
Copy link
Member

commented Jul 11, 2019

No description provided.

peircej added some commits Jul 3, 2019

BF: the fix to texture wrapping should not have been applied to mask=…
…None

When mask=None we're currently setting a 2x2 mask of ones BUT if
wrapping=False and interpolate=True, the clamped edge is assumed to be
surrounded by zeros that then get interpolated into the image and give it
a slighty reduced opacity.

For now we disable the clamping for all mask creation, but in future we should
handle this better by one of:
  - turn off multitexture for mask=None altogether (just use single texture)
  - use pre-loaded common textures of higher resolution so that we could
    have clamping on and the interpolation would then provide nicer
    antialiasing?
TESTS: Pin pyglet to >=1.3, <1.4
Revert this once GH-2518 has been resolved.

# Conflicts:
#	conda/environment-2.7.yml
#	conda/environment-3.6.yml
#	conda/environment-3.7.yml
@codecov-io

This comment has been minimized.

Copy link

commented Jul 11, 2019

Codecov Report

Merging #2526 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2526      +/-   ##
==========================================
+ Coverage   44.52%   44.53%   +0.01%     
==========================================
  Files         232      232              
  Lines       40289    40290       +1     
  Branches     6924     6924              
==========================================
+ Hits        17937    17942       +5     
  Misses      20456    20456              
+ Partials     1896     1892       -4
Impacted Files Coverage Δ
psychopy/visual/image.py 93.12% <ø> (ø) ⬆️
psychopy/visual/basevisual.py 68.75% <100%> (+0.05%) ⬆️
psychopy/__init__.py 73.07% <100%> (ø) ⬆️
psychopy/tools/wizard.py 73.3% <0%> (-0.44%) ⬇️
psychopy/visual/textbox/__init__.py 43.5% <0%> (ø) ⬆️
psychopy/app/dialogs.py 27.68% <0%> (ø) ⬆️
psychopy/app/builder/dialogs/dlgsConditions.py 7.51% <0%> (ø) ⬆️
...ychopy/localization/generateTranslationTemplate.py 0% <0%> (ø) ⬆️
psychopy/visual/window.py 66.58% <0%> (+0.7%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 846f2c3...4267a5d. Read the comment docs.

@coveralls

This comment has been minimized.

Copy link

commented Jul 11, 2019

Coverage Status

Coverage increased (+0.01%) to 49.248% when pulling 4267a5d on peircej:fix-renderingGlitchMasks into 846f2c3 on psychopy:master.

@peircej peircej merged commit 9ea13ee into psychopy:master Jul 12, 2019

2 checks passed

LGTM analysis: Python No new or fixed alerts
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.