Skip to content
This repository was archived by the owner on Nov 8, 2024. It is now read-only.

Commit eb61d91

Browse files
committed
update doc
1 parent efde190 commit eb61d91

19 files changed

+27
-16
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
node_modules
2+
__pycache__
23
build/
34

45
.foldex.*

dist/libs/api.jsxinc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ DuGR.Group = {
172172
* Camera layers
173173
*/
174174
CAMERA: 'DuGR.type.camera',
175+
/**
176+
* 3D Model layers
177+
*/
178+
THREED_MODEL: 'DuGR.type.threeDModel',
175179
/**
176180
* Visible layers
177181
*/
@@ -455,6 +459,7 @@ DuGR.inGroups = function ( layer, groups, tag, and )
455459
else if (group == DuGR.Group.ADJUSTMENT ) ok = DuAELayer.isAdjustment( layer );
456460
else if (group == DuGR.Group.LIGHT ) ok = layer instanceof LightLayer;
457461
else if (group == DuGR.Group.CAMERA ) ok = layer instanceof CameraLayer;
462+
else if (group == DuGR.Group.THREED_MODEL ) ok = layer instanceof ThreeDModelLayer;
458463
else if (group == DuGR.Group.VISIBLE ) ok = layer.enabled;
459464
else if (group == DuGR.Group.SOUND ) ok = layer.hasAudio;
460465
else if (group == DuGR.Group.SOLO ) ok = layer.solo;

src-docs/docs/advanced/getting-started.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ The API and its documentation can be downloaded from **[RxLaboratory](https://rx
88

99
## Include it in your script
1010

11-
Just save the two files `DuGR_api.jsxinc` and `DuAEF_DuGR_api.jsxinc` in the folder where you're working and writing your own script.
11+
The DuGR API comes in a few files:
1212

13-
- `DuAEF_DuGR_api.jsxinc` is the complete API, including all dependencies. This is the one you should use by default.
13+
- `DuGR_API.jsxinc` is the complete API, including all dependencies. This is the only file you should include in your script by default.
1414

15-
- `DuGR_api.jsxinc` includes only the *DuGR API* without any dependencies. You'll have to include dependencies by yourself; The list of these dependencies can be found in the [API reference](http://dugr.rxlab.io/) (see *Requires* on the linked page). At the time we're writing this documentation, it's just *DuAEF*. You may use this file if you plan to combine several different API using *DuAEF*, to be sure to include it only once.
15+
- A Subfolder called `libs` contains the actual API code, separated in a few different libraries. These may be useful if you need to handle specific versions of these libraries, if you know what you're doing... Have a look at the main `DuGR_API.jsxinc` file if you want to see in which order they should be included in your scripts.
16+
17+
All these files (both the `.jsxinc` file and the `libs` folder) need to be located next to your script in the following examples.
1618

1719
### Using only DuGR
1820

19-
If you're only needing the DuGR API, you just have to include `DuAEF_Duik_api.jsxinc` at the beginning of your own script.
21+
If you're only needing the DuGR API, you just have to include `DuGR_API.jsxinc` at the beginning of your own script.
2022

2123
Here's an example.
2224

@@ -26,13 +28,13 @@ Here's an example.
2628
(function(thisObj)
2729
{
2830
// If you only need Duik, just include DuAEF_Duik_api at the beginning
29-
#include "DuAEF_DuGR_api.jsxinc";
31+
#include "DuGR_API.jsxinc";
3032

3133
```
3234
3335
### Combining the DuGR API with other APIs and DuAEF
3436
35-
If you're going to include APIs other than DuGR, you'll need to include everything separately to be sure that all frameworks are included only once. In this case, include `DuGR_api.jsxinc` and the other APIs at the beginning of your script.
37+
If you're going to include APIs other than DuGR, you'll need to include everything separately to be sure that all frameworks are included only once. In this case, include the APIs at the beginning of your script.
3638
3739
Here's an example:
3840
@@ -43,9 +45,8 @@ Here's an example:
4345
{
4446
// If you need to combine DuGR and other APIs like DuIO
4547
// Include DuAEF first, and then stand-alone APIs
46-
#include "DuAEF.jsxinc";
47-
#include "DuGR_api.jsxinc";
48-
#include "DuIO_api.jsxinc";
48+
#include "libs/DuAEF.jsxinc";
49+
#include "libs/api.jsxinc"; // DuGR API, you may rename it if needed.
4950

5051
// Now you can also include any other API which also depends on DuAEF or one of the above APIs
5152
#include "another_API.jsxinc"
@@ -114,7 +115,7 @@ Don't forget to close the anonymous function we've created at the beginning to a
114115
(function(thisObj)
115116
{
116117
// If you only need Duik, just include DuAEF_Duik_api at the beginning
117-
#include "DuAEF_DuGR_api.jsxinc";
118+
#include "DuGR_api.jsxinc";
118119

119120
// Running the init() method of DuAEF is required to setup everything properly.
120121
DuAEF.init( "YourScriptName", "1.0.0", "YourCompanyName" );

src-docs/docs/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ You'll find several folders and files.
2121
- *README.txt* contains a lot of information to help you get started with DuGR.
2222
- The *Help* folder contains these help pages. Double click on the file *index.html* to open it.
2323
- The *Tools* folder may contain some useful tools.
24-
- The *ScriptUI Panels* folder contains the actual *DuGR* script you need to install.
25-
- The *Scriptlets* folder contains small scripts you can assign to [keyboard shortcuts](#keyboard-shortcuts) for example.
24+
- The *Scripts* folder contains small scripts you can assign to [keyboard shortcuts](#keyboard-shortcuts) for example.
25+
- The *Scripts/ScriptUI Panels* folder contains the actual *DuGR* script you need to install.
2626

2727
### **3 - Install**
2828

src-docs/mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extra_javascript:
3131
site_dir: ../build/docs
3232
dev_addr: '127.0.0.1:8002'
3333
nav:
34-
- v5.1.x: index.md
34+
- v5.2.x: index.md
3535
- Install: install.md
3636
- Help: introduction.md
3737
- Settings: settings.md
-490 Bytes
Binary file not shown.

tools/assets/environment.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
{ "src": "./tools/assets/LICENSE.txt", "dest": "DuGR/LICENSE.txt"},
3030
{ "src": "./tools/assets/LICENSE.txt", "dest": "DuGR_API/LICENSE.txt"},
3131
{ "src": "./tools/assets/README.txt", "dest": "DuGR/README.txt"},
32-
{ "src": "./src/Scripts/DuGR_isolateGroup_comp viewer.jsx", "dest": "DuiGR_API/DuGR_isolateGroup_comp viewer.jsx"},
33-
{ "src": "./src/Scripts/DuGR_isolateGroup_timeline.jsx", "dest": "DuiGR_API/DuGR_isolateGroup_timeline.jsx"},
34-
{ "src": "./src/Scripts/DuGR_isolateGroup.jsx", "dest": "DuiGR_API/DuGR_isolateGroup.jsx"}
32+
{ "src": "./src/Scripts/DuGR_isolateGroup_comp viewer.jsx", "dest": "DuGR_API/DuGR_isolateGroup_comp viewer.jsx"},
33+
{ "src": "./src/Scripts/DuGR_isolateGroup_timeline.jsx", "dest": "DuGR_API/DuGR_isolateGroup_timeline.jsx"},
34+
{ "src": "./src/Scripts/DuGR_isolateGroup.jsx", "dest": "DuGR_API/DuGR_isolateGroup.jsx"}
3535
]
3636
}
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)