Skip to content

Commit

Permalink
Documentation update for 3.0.19.16 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
kleinerm committed Nov 20, 2024
1 parent 57efaf1 commit d0b6e68
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 54 deletions.
2 changes: 2 additions & 0 deletions docs/PsychGLImageProcessing.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ soon with more useful infos...
[MakeTextureDrawShader](MakeTextureDrawShader) - Create GLSL shader for use with [Screen](Screen)('DrawTexture') and [Screen](Screen)('MakeTexture')
to apply on-the-fly texture filtering operations during texture draw.

[PsychColorCorrection](PsychColorCorrection) - Routines for gpu accelerated color correction via [PsychImaging](PsychImaging)().

[PsychHDR](PsychHDR) - Support and control stimulus display to HDR "High dynamic range" displays.

[PsychImaging](PsychImaging) - Generic setup routine for the imaging pipeline. Allows to setup
Expand Down
16 changes: 9 additions & 7 deletions docs/PsychImaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -683,13 +683,15 @@ actions:
with 10 bit precision per color channel (10 bpc / 30 bpp / "Deep color")
on graphics hardware that supports native 10 bpc framebuffers.

Under Linux, all AMD graphics cards since at least 2007, [NVidia](NVidia) graphics cards
since 2008, and Intel graphics chips since at least 2010 do support native
10 bit framebuffers. Intel graphics chips must use the X11 "intel" video driver
to output their 10 bit framebuffers with actual 10 bit precision, the alternative
"modesetting" video driver does not support output with more than 8 bit yet.
[XOrgConfCreator](XOrgConfCreator) will take care of this Intel quirk when creating a custom xorg.config
for such 10 bpc setups under Intel.
Under Linux, AMD graphics cards since at least the year 2007, [NVidia](NVidia) graphics
cards since 2008, and Intel graphics chips since at least 2010 do support native
10 bit framebuffers. Intel graphics chips must use the legacy X11 "intel" video driver
to output their 10 bit framebuffers with actual 10 bit precision on Ubuntu
20.04 LTS or earlier, as old "modesetting" video drivers do not support output
with more than 8 bit. On Ubuntu 22.04-LTS and later, the modern modesetting driver
can deal with 10 bpc output on all Intel graphics, so at least Ubuntu 22.04-LTS is
recommended. [XOrgConfCreator](XOrgConfCreator) will take care of these Intel quirks when creating a
custom xorg.config for such 10 bpc setups under Intel.

Under MS-Windows, many graphics cards of the professional class AMD/ATI Fire/Pro
series (2008 models and later), and all current models of the professional class
Expand Down
92 changes: 46 additions & 46 deletions docs/RenderDemo.md
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
# [RenderDemo](RenderDemo)
##### >[Psychtoolbox](Psychtoolbox)>[PsychDemos](PsychDemos)

[RenderDemo](RenderDemo)
[RenderDemo](RenderDemo)

Illustrates calibration interface for simple task of producing a uniform
color patch of desired CIE xyY coordinates.
Illustrates calibration interface for simple task of producing a uniform
color patch of desired CIE xyY coordinates.

The calculation is done with respect to the current PTB demonstration
calibration file.
The calculation is done with respect to the current PTB demonstration
calibration file.

The demo shows multiple different ways to implement this, starting with a
purely Matlab based method, progressing to more advanced methods. The
final demonstration shows how to do it automatically and graphics
hardware accelerated.
The demo shows multiple different ways to implement this, starting with a
purely Matlab based method, progressing to more advanced methods. The
final demonstration shows how to do it automatically and graphics
hardware accelerated.

### Demo 1:
### Demo 1:

The RGB values are gamma corrected and live in the range [0,1]. If they
contain 0 or 1, the xyY coordinates requested may have been out of gamut.
The RGB values are gamma corrected and live in the range [0,1]. If they
contain 0 or 1, the xyY coordinates requested may have been out of gamut.

A uniform color patch is displayed in the MATLAB figure window. This is
not a well-controlled display method, but does give a sense of the patch
color if the calibration file is a reasonable description of the display.
A uniform color patch is displayed in the MATLAB figure window. This is
not a well-controlled display method, but does give a sense of the patch
color if the calibration file is a reasonable description of the display.

Immediately afterwards, the same color patch is shown in a PTB onscreen
window, with the same gamma table loaded which was used during
calibration measurements. This should render an accurate stimulus.
Immediately afterwards, the same color patch is shown in a PTB onscreen
window, with the same gamma table loaded which was used during
calibration measurements. This should render an accurate stimulus.

Demo 2: As demo 1, but displaying in a onscreen window and performing the
gamma correction via proper inverse gamma lookup tables loaded into the
graphics card, thereby presenting on a linearized display, instead of
using the [SensorToSettings](SensorToSettings)() routine to adapt the stimulus to a
non-linearized display.
Demo 2: As demo 1, but displaying in a onscreen window and performing the
gamma correction via proper inverse gamma lookup tables loaded into the
graphics card, thereby presenting on a linearized display, instead of
using the [SensorToSettings](SensorToSettings)() routine to adapt the stimulus to a
non-linearized display.

The last two demos Demo 3 and Demo 4 require a recent graphics card and
perform all color space conversions and calibrated display automatically
and hardware accelerated on the graphics card. Any [NVidia](NVidia) [GeForce](GeForce)-8000 or
later, AMD Radeon X-1000 or later, or Intel HD graphics card should be
able to support these demos.
The last two demos Demo 3 and Demo 4 require a recent graphics card and
perform all color space conversions and calibrated display automatically
and hardware accelerated on the graphics card. Any [NVidia](NVidia) [GeForce](GeForce)-8000 or
later, AMD Radeon X-1000 or later, or Intel HD graphics card should be
able to support these demos.

Demo 3: The stimulus is defined in XYZ tristimulus color space and
converted automatically by [Screen](Screen)() into RGB output format, taking the
calibration data in 'cal' into account.
Demo 3: The stimulus is defined in XYZ tristimulus color space and
converted automatically by [Screen](Screen)() into RGB output format, taking the
calibration data in 'cal' into account.

Demo 4: The stimulus is directly defined in xyY chromacity + luminance
format and all conversions and calibrations are done automatically by
[Screen](Screen)().
Demo 4: The stimulus is directly defined in xyY chromacity + luminance
format and all conversions and calibrations are done automatically by
[Screen](Screen)().

4/26/97 dhb Wrote it.
7/25/97 dhb Better initialization.
3/12/98 dgp Use [Ask](Ask).
3/14/02 dhb Update for [OpenWindow](OpenWindow).
4/03/02 awi Merged in Windows changes. On Windows we do not copy the result to the clipboard.
4/13/02 awi Changed "[SetColorSpace](SetColorSpace)" to new name "[SetSensorColorSpace](SetSensorColorSpace)".
Changed "[LinearToSettings](LinearToSettings)" to new name "[SensorToSettings](SensorToSettings)".
12/21/02 dhb Remove reliance on now obsolete [OpenWindow](OpenWindow)/[CloseWindow](CloseWindow).
11/16/06 dhb Start getting this to work with PTB-3.
11/22/06 dhb Fixed except that [Ask](Ask)() needs to be fixed.
6/16/11 dhb The PTB display section was out of date and didn't work. I removed it.
1/26/13 mk Add standard PTB display, but also imaging pipeline based methods.
4/26/97 dhb Wrote it.
7/25/97 dhb Better initialization.
3/12/98 dgp Use [Ask](Ask).
3/14/02 dhb Update for [OpenWindow](OpenWindow).
4/03/02 awi Merged in Windows changes. On Windows we do not copy the result to the clipboard.
4/13/02 awi Changed "[SetColorSpace](SetColorSpace)" to new name "[SetSensorColorSpace](SetSensorColorSpace)".
Changed "[LinearToSettings](LinearToSettings)" to new name "[SensorToSettings](SensorToSettings)".
12/21/02 dhb Remove reliance on now obsolete [OpenWindow](OpenWindow)/[CloseWindow](CloseWindow).
11/16/06 dhb Start getting this to work with PTB-3.
11/22/06 dhb Fixed except that [Ask](Ask)() needs to be fixed.
6/16/11 dhb The PTB display section was out of date and didn't work. I removed it.
1/26/13 mk Add standard PTB display, but also imaging pipeline based methods.



Expand Down
2 changes: 1 addition & 1 deletion docs/Screen-FrameOval.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# [Screen('FrameOval')](Screen-FrameOval)
##### [Psychtoolbox](Psychtoolbox)>[Screen](Screen).{mex*} subfunction

Screen('FrameOval', windowPtr [, color] [, rect] [, penWidth] [, penHeight] [, penMode]);
Screen('FrameOval', windowPtr [,color] [,rect] [,penWidth] [,penHeight] [,penMode]);

Draw the outline of an oval inscribed in "rect". "color" is the clut index
(scalar or [r g b] triplet) that you want to poke into each pixel; default
Expand Down

0 comments on commit d0b6e68

Please sign in to comment.