Skip to content

Commit 023f557

Browse files
authored
Merge pull request #1 from digitalillusions/fix-doc-language
Language Improvements
2 parents e9cd585 + 38da7a3 commit 023f557

File tree

11 files changed

+108
-104
lines changed

11 files changed

+108
-104
lines changed

docs/about.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
# Description
22

3-
This is an addon for Blender 3.1+ (might work with 2.8+ but has not been tested) that enables loading of file sequences. The addon comes bundled together with [meshio](https://github.com/nschloe/meshio) which enables the loading of geometric data from a multitude of [file formats](./format.md).
3+
This is an addon for Blender 3.1+ (it might work with 2.8+ but has not been tested) that enables loading of file sequences. The addon comes bundled together with [meshio](https://github.com/nschloe/meshio) which enables the loading of geometric data from a multitude of [file formats](./format.md).
44

5-
All data is loaded *just-in-time* when the Blender frame changes, in order to avoid excessive memory consumption. By default, the addon is able to load vertices, lines, triangles and quads. It is also able to automatically extract triangle and quad surface meshes from tetrahedral and hexahedral volume meshes. Scalar and vector attributes on vertices are also imported for visualization purposes.
5+
All data is loaded *just-in-time* when the Blender frame changes, in order to avoid excessive memory consumption. By default, the addon is able to load vertices, lines, triangles and quads. It is also able to automatically extract triangle and quad surface meshes from tetrahedral and hexahedral volume meshes. Scalar and vector attributes on vertices are also imported for visualization purposes.
66

77
## Basic usage
88

9-
Here is a gif to show the basic usage of this addon. In this gif, it shows how to load and render a sequence of particles data
9+
This video shows the basic usage of this addon, i.e. how to load and render a simple sequence of particle data
1010

1111
![usage](../images/usage.gif)
1212

1313
## Affected Blender Settings
1414

1515
This addon will change the value of `Preferences`->`Save & Load` ->`Default To` ->`Relative Paths` to `false`. Default value is `true`. For information can be found [here](https://docs.blender.org/manual/en/latest/editors/preferences/save_load.html#blend-files).
1616

17-
This addon will modify the `sys.path` variable of Blender python environment. It will add the path of this addon into `sys.path`.
18-
17+
This addon will also modify the `sys.path` variable of Blender python environment, by inserting the path of the addon itself. This makes it possible to use the bundled libraries.
1918

2019
## Dependencies
2120

22-
|name | link | license| description|
23-
|---|---|---|---|
24-
|meshio | [link](https://github.com/nschloe/meshio) | MIT| import the mesh|
25-
|fileseq | [link](https://github.com/justinfx/fileseq) | MIT | detect and load file sequences|
26-
| rich | [link](https://github.com/Textualize/rich) | MIT| dependency of meshio |
27-
| python-future | [link](https://github.com/PythonCharmers/python-future) | MIT| dependency of fileseq|
21+
| name | link | license | description |
22+
| ------------- | ------------------------------------------------------- | ------- | --------------------------- |
23+
| meshio | [link](https://github.com/nschloe/meshio) | MIT | Loading mesh data |
24+
| fileseq | [link](https://github.com/justinfx/fileseq) | MIT | Detection of file sequences |
25+
| rich | [link](https://github.com/Textualize/rich) | MIT | dependency of meshio |
26+
| python-future | [link](https://github.com/PythonCharmers/python-future) | MIT | dependency of fileseq |
2827

2928
## License
3029

docs/build.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# Build and install the addon
22

3-
43
## Build from source
54

6-
75
1. Clone the project to download both project and dependencies
86

97
```shell
@@ -19,11 +17,11 @@ python3 build_addon.py
1917

2018
## Download from release page
2119

22-
Or you can simply download the latest `.zip` file from the [release](https://github.com/InteractiveComputerGraphics/blender-sequence-loader/releases) page
20+
Or you can simply download the latest `.zip` file from the [releases](https://github.com/InteractiveComputerGraphics/blender-sequence-loader/releases) page.
2321

2422
## Install the zip file
2523

26-
You can check [here](https://docs.blender.org/manual/en/latest/editors/preferences/addons.html#installing-add-ons) for installing and enabling the addon.
24+
You can check the official Blender documentation [here](https://docs.blender.org/manual/en/latest/editors/preferences/addons.html#installing-add-ons) for installing and enabling addons.
2725

2826
## For developers
2927

@@ -39,17 +37,16 @@ ln -s extern/fileseq/src/fileseq fileseq
3937
ln -s extern/python-future/src/future/ future
4038
```
4139

42-
Then create a soft link to link from the [blender addon directory](https://docs.blender.org/manual/en/latest/advanced/blender_directory_layout.html)[^1] to the directory where you download and unzip the files. For example,
40+
Then create a soft link to link from the [blender addon directory](https://docs.blender.org/manual/en/latest/advanced/blender_directory_layout.html)[^1] to the directory where you download and unzip the files. For example this could look like this on MacOS,
41+
4342
```bash
4443
ln -s ~/Downloads/blender-sequence-loader ~/Library/Application Support/Blender/3.1/scripts/addons/blender-sequence-loader-dev
4544
```
4645

47-
[^1]: By default, `{USER}/scripts/addons`, `{USER}`: Location of configuration files (typically in the user’s home directory).
48-
46+
[^1]: By default, `{USER}/scripts/addons`, `{USER}`: Location of configuration files (typically in the user’s home directory).
4947

5048
### Windows Users
5149

5250
You can use [mklink](https://learn.microsoft.com/en-us/windows-server/administration/windows-commands/mklink) to do the same things as *-nix users. [^2]
5351

5452
[^2]: You will need either administrator permission, or [developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development).
55-

docs/conf.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626

2727
html_theme = "sphinx_rtd_theme"
2828
html_static_path = ['_static']
29+
source_suffix = {
30+
'.rst': 'restructuredtext',
31+
'.txt': 'markdown',
32+
'.md': 'markdown',
33+
}
2934

3035

3136
myst_heading_anchors = 2

docs/format.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ The additionally supported file formats are
4343

4444
## Add support for customized file formats
4545

46-
You can add support for your customized file formats. For example, if you want to support `.example` file formats.
46+
You can add support for your own customized file formats. For example, if you want to support `.example` file formats.
4747

4848
To do that,
4949
1. Create a `example.py` file in the folder additional_file_formats
5050
2. Implement a function `def readexample_to_meshio(filepath):`, which reads the file from `filepath`, then construct a [meshio.Mesh](https://github.com/nschloe/meshio/wiki/meshio-Mesh()-data-structure) object.
5151
3. Add `meshio.register_format("example", [".example"], readexample_to_meshio, {".example": None})` in the global space
5252
4. Add `from . import example` in `additional_file_formats/__init__.py`
5353

54-
You can check [additional_file_formats/bgeo.py](https://github.com/InteractiveComputerGraphics/blender-sequence-loader/blob/main/additional_file_formats/bgeo.py) as an example.
54+
You can check [additional_file_formats/bgeo.py](https://github.com/InteractiveComputerGraphics/blender-sequence-loader/blob/main/additional_file_formats/bgeo.py) as an example.

docs/frame.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

docs/frame.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Frame control
2+
=============
3+
4+
You can use Blenders `driver system <https://docs.blender.org/manual/en/latest/animation/drivers/index.html>`_ to control the frame of the sequence.
5+
6+
Default settings
7+
*****************
8+
9+
Each sequence has its own property ``Current Frame`` to control its frame. By default, the value equals to the `blender current frame <https://docs.blender.org/manual/en/latest/editors/timeline.html#frame-controls>`_.
10+
11+
.. image:: ../images/current_frame.png
12+
:align: center
13+
14+
Change the value
15+
*****************
16+
17+
Right click on the ``Current Frame`` property, then click ``Edit Driver``. You can check `here <https://docs.blender.org/manual/en/latest/animation/drivers/drivers_panel.html>`_ for more details about how to edit the driver.
18+
19+
.. image:: ../images/edit_driver.png
20+
:align: center

docs/global.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
# Global Settings
22

33
There are two global settings
4-
1. Print information: default on
5-
1. Auto Refresh: default off
4+
5+
1. Print information: default `true`
6+
1. Auto Refresh: default `false`
67

78
## Print information
89

9-
When this button toggled, it will print information about the sequence imported by this addon, such as name of the object into a file.
10+
When this button is toggled, it will print information about the sequence imported by this addon, such as name of the object, into a separate file.
1011

11-
The file has the name `bseq_{time}`, `{time}` is the time when rendering starts.
12+
The file has the naming pattern `bseq_{time}`, where `{time}` is the time when rendering is started.
1213

13-
The file will be in the same direction as [blender render output directory](https://docs.blender.org/manual/en/latest/editors/preferences/file_paths.html#render). [^1]
14+
The file will be located in the [blender render output directory](https://docs.blender.org/manual/en/latest/editors/preferences/file_paths.html#render). [^1]
1415

1516
![print](../images/print.png)
1617

1718
[^1]: By default the value is `/tmp`, and this directory does not exit on windows system. So when the directory does not exist, it won't print information into file.
1819

19-
2020
## Auto Refresh
2121

22-
When this button toggled, it will [refresh](./list.md#refresh) **all the sequence whenever frame changes**.
22+
When this button is toggled, it will [refresh](./list.md#refresh) **all the sequences whenever a frame change occurs**.
2323

24-
This option can be useful when some of the sequences are imported while the data is still being generated and not yet complete. Refreshing all the sequences can detect the frames added after being imported.
24+
This option can be useful when some of the sequences are imported while the data is still being generated and not yet complete. Refreshing all the sequences can detect the frames that were added after being initially imported.
2525

2626
![auto refresh](../images/auto_refresh.png)

docs/list.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,34 @@
22

33
By default, all supported file formats are simply imported as geometry (a collection of vertices, lines, triangles and quads). As such, you should be able to directly play/render the animation if it contains geometry.
44

5-
Note: When rendering the animation, please turn on the [Lock Interface](https://docs.blender.org/manual/en/latest/interface/window_system/topbar.html?#render-menu)[^1]. This will prevent artifacts from occurring, especially if the user continues to operate the Blender interface during the render process.
5+
Note: When rendering the animation, please turn on the [Lock Interface](https://docs.blender.org/manual/en/latest/interface/window_system/topbar.html?#render-menu)[^1]. This will prevent artifacts from occurring, especially if the user continues to operate the Blender interface during the render process. This is doubly relevant when using custom normals on meshes, as this might cause Blender to crash instead of just failing to load the correct geometry.
66

77
![lock](../images/lock.png)
88

9-
[^1]: Or maybe not, I am not 100% percent sure about this.
9+
[^1]: We have also had users stating that they are able to render perfectly well without enabling this setting, so you might be fine to disable this option if you need to.
1010

1111
## Imported Sequence
1212

13-
Here you can have an overview of all the sequence imported by this addon. And you can select either one of them, it will change [active object](https://docs.blender.org/manual/en/latest/scene_layout/object/selecting.html#selections-and-the-active-object) to it as well. When [active object](https://docs.blender.org/manual/en/latest/scene_layout/object/selecting.html#selections-and-the-active-object) changes, it will change the selection in this list view as well.
13+
Here you can have an overview of all the sequences imported by this addon. When selecting a sequence, it will change the selected [active object](https://docs.blender.org/manual/en/latest/scene_layout/object/selecting.html#selections-and-the-active-object) as well. Vice versa, when the [active object](https://docs.blender.org/manual/en/latest/scene_layout/object/selecting.html#selections-and-the-active-object) changes, it will change the selection in this list view as well.
1414

1515
![list](../images/list.png)
1616

1717
## Enable & Disable
1818

1919
It is possible to individually enable and disable sequences from updating when the animation frame changes. This is very useful when working with very large files or many sequences as it reduces the computational overhead of loading these sequences. Enabled means, that the sequence will be updated on frame change, and Disabled means that the sequence won't be updated on frame change.
2020

21-
To change individual sequence, you can click on the `ENABLED` or `DISABLED` button in the list view.
21+
To toggle an individual sequence, you can click on the `ENABLED` or `DISABLED` button in the list view.
2222

2323
![enable](../images/enable.png)
2424

2525
### Enable Selected & Disable Selected
2626

27-
When you want to enable or disable multiple sequences. You can [select](https://docs.blender.org/manual/en/latest/scene_layout/object/selecting.html) multiple objects, then click `Enable Selected` or `Disable Selected` to enable/disable all selected objects.
28-
27+
When you want to enable or disable multiple sequences, you can [select](https://docs.blender.org/manual/en/latest/scene_layout/object/selecting.html) multiple objects in the viewport, and then click `Enable Selected` or `Disable Selected` to enable/disable all selected objects.
2928

3029
## Current Frame
3130

32-
`Current Frame` shows the current frame of sequence being loaded. By default, the value is [blender current frame](https://docs.blender.org/manual/en/latest/editors/timeline.html#frame-controls). For advanced usage, you can find it [here](./frame.md).
31+
`Current Frame` shows the current frame of sequence being loaded. By default, the value is [blender current frame](https://docs.blender.org/manual/en/latest/editors/timeline.html#frame-controls). For advanced usage, you can refer [here](./frame.md).
3332

3433
## Refresh
3534

36-
Refresh Sequence can be useful when the sequence is imported while the data is still being generated and not yet complete. Refreshing the sequence can detect the frames added after being imported.
35+
`Refresh Sequence` can be useful when the sequence is imported while the data is still being generated and not yet complete. Refreshing the sequence can detect the frames added after being imported.

0 commit comments

Comments
 (0)