Skip to content

Commit

Permalink
md files were modified.
Browse files Browse the repository at this point in the history
  • Loading branch information
kurokida committed Jul 29, 2020
1 parent 3123ec8 commit b3fb372
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/demo_explanation.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Note that if you define motion using the distance and time, you have to specify

## [origin_center.html](https://www.hes.kyushu-u.ac.jp/~kurokid/jspsychophysics/demos/origin_center.html)

This file demonstrates how to present objects using a coordinate with the center of the window as the origin. Set the origin_center property to true.
This file demonstrates how to present objects using a coordinate with the center of the window as the origin. Set the origin_center property to true (The default is false).

## [randomizedImages.html](https://www.hes.kyushu-u.ac.jp/~kurokid/jspsychophysics/demos/randomizedImages.html)

Expand Down
6 changes: 4 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ var circle_object = {
}
```

The origin of the coordinate is the top left of the canvas, and the unit is the pixel. The color can be specified using the HTML color names, hexadecimal (HEX) colors, and RGB values that are often used in a general HTML file.
The origin of the coordinate is the top left of the canvas, but the origin can be changed to the center of the window using the `origin_center` property. The unit is the pixel.

The color can be specified using the HTML color names, hexadecimal (HEX) colors, and RGB values that are often used in a general HTML file.

The **show_start_time** is the most notable property in this object, which enables to present the stimulus at the intended time. In this example, a white rectangle is presented 500 ms after beginning this trial, after another 500 ms, a red circle is presented until the response.

Expand Down Expand Up @@ -87,7 +89,7 @@ Note that if you use image and audio files in a trial, please preload them using
[The jspsych-psychophysics package includes a lot of demonstration files.](demo_explanation.md)

## Open Science Framework
- The data and materials of my paper are available at [Open Science Framework](https://doi.org/10.17605/OSF.IO/PJ4SB).
The data and materials of my paper are available at [Open Science Framework](https://doi.org/10.17605/OSF.IO/PJ4SB).

Copyright (c) 2019 Daiichiro Kuroki
Released under [the MIT license](https://opensource.org/licenses/MIT)
8 changes: 4 additions & 4 deletions docs/objectProperties.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ NOTE: The *horiz(vert)_pix_frame(sec)* can be automatically calculated using the
CAUTION: [The image and sound files must be preloaded in the jsPsych.init function manually](https://www.jspsych.org/overview/media-preloading/).

```javascript
var images = ['img/file1.png'];
var audio = ['audio/foo.mp3'];
var images = ['img/file1.png', 'img/file2.png'];
var audio = ['audio/file1.mp3', 'audio/file2.mp3'];

jsPsych.init({
timeline: [trial],
Expand Down Expand Up @@ -74,8 +74,8 @@ There are two ways to define a line. See, `demos/lines.html`.

|Property name|Type|Default Value|Description|
|---|---|---|---|
|x1, y1|numeric|undefined| The start position of line drawing.|
|x2, y2|numeric|undefined| The end position of line drawing.|
|x1, y1|numeric|undefined| The start position of static line drawing. This property can't be used for the moving line. And it can't be used both with the line_length and angle property.|
|x2, y2|numeric|undefined| The end position of static line drawing. This property can't be used for the moving line. And it can't be used both with the line_length and angle property.|
|line_length|numeric|undefined| The length of the line.|
|line_color|string|#000000 (black)|The color of the line.|
|angle|numeric|undefined| The angle of the line. Zero means a horizontal line.|
Expand Down

0 comments on commit b3fb372

Please sign in to comment.