HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Code Actions Packages Releases Activity

Merge pull request #475 from lightest/gamma_correction_implementation

Browse Source 
Gamma correction implementation
This commit is contained in:
Alain Pitiot 2022-03-23 13:38:44 +01:00 committed by GitHub
commit 9e5d56863e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -27,6 +27,7 @@
"start": "npm run build"
},
"dependencies": {
"@pixi/filter-adjustment": "^4.1.3",
"esbuild-plugin-glsl": "^1.0.5",
"howler": "^2.2.1",
"log4javascript": "github:Ritzlgrmft/log4javascript",

2
src/core/PsychoJS.js
View File

@ -218,6 +218,7 @@ export class PsychoJS
name,
fullscr,
color,
gamma,
units,
waitBlanking,
autoLog,
@ -239,6 +240,7 @@ export class PsychoJS
name,
fullscr,
color,
gamma,
units,
waitBlanking,
autoLog,

12
src/core/Window.js
View File

@ -8,6 +8,7 @@
*/
import * as PIXI from "pixi.js-legacy";
import {AdjustmentFilter} from "@pixi/filter-adjustment";
import { MonotonicClock } from "../util/Clock.js";
import { Color } from "../util/Color.js";
import { PsychObject } from "../util/PsychObject.js";
@ -25,6 +26,7 @@ import { Logger } from "./Logger.js";
* @param {string} [options.name] the name of the window
* @param {boolean} [options.fullscr= false] whether or not to go fullscreen
* @param {Color} [options.color= Color('black')] the background color of the window
* @param {number} [options.gamma= 1] sets the delimiter for gamma correction. In other words gamma correction is calculated as pow(rgb, 1/gamma)
* @param {string} [options.units= 'pix'] the units of the window
* @param {boolean} [options.waitBlanking= false] whether or not to wait for all rendering operations to be done
* before flipping
@ -49,6 +51,7 @@ export class Window extends PsychObject
name,
fullscr = false,
color = new Color("black"),
gamma = 1,
units = "pix",
waitBlanking = false,
autoLog = true,
@ -59,11 +62,19 @@ export class Window extends PsychObject
// messages to be logged at the next "flip":
this._msgToBeLogged = [];
// storing AdjustmentFilter instance to access later;
this._adjustmentFilter = new AdjustmentFilter({
gamma
});
// list of all elements, in the order they are currently drawn:
this._drawList = [];
this._addAttribute("fullscr", fullscr);
this._addAttribute("color", color);
this._addAttribute("gamma", gamma, 1, () => {
this._adjustmentFilter.gamma = this._gamma;
});
this._addAttribute("units", units);
this._addAttribute("waitBlanking", waitBlanking);
this._addAttribute("autoLog", autoLog);
@ -428,6 +439,7 @@ export class Window extends PsychObject
// create a top-level PIXI container:
this._rootContainer = new PIXI.Container();
this._rootContainer.interactive = true;
this._rootContainer.filters = [this._adjustmentFilter];
// set the initial size of the PIXI renderer and the position of the root container:
Window._resizePixiRenderer(this);