Skip to content

Commit

Permalink
Fix build name and typos mentioned in PR 4
Browse files Browse the repository at this point in the history
  • Loading branch information
LucaScheller committed Oct 3, 2023
1 parent a11cc5a commit f067f94
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_houdini.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build USD Asset Resolvers against Houdini
name: Build USD Asset Resolvers against Houdini (Linux/Windows)

on:
release:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This repository holds reference implementations for [Usd](https://openusd.org/re
## Installation
To build the various resolvers, follow the instructions in the [install guide](https://lucascheller.github.io/VFX-UsdAssetResolver/installation/requirements.html).

> :info: This guide currently covers compiling against Houdini on Linux and Windows. Alternatively you can also download a pre-compiled builds on our [release page](https://github.com/LucaScheller/VFX-UsdAssetResolver/releases). To load the resolver, you must specify a few environment variables, see our [environment variables](https://lucascheller.github.io/VFX-UsdAssetResolver/resolvers/overview.html#environment-variables) section for more details. Alternatively you can also source the setup.sh file in the root of this repo when working in Linux to get a pre-configured environment.
> [!IMPORTANT] This guide currently covers compiling against Houdini on Linux and Windows. Alternatively you can also download a pre-compiled builds on our [release page](https://github.com/LucaScheller/VFX-UsdAssetResolver/releases). To load the resolver, you must specify a few environment variables, see our [environment variables](https://lucascheller.github.io/VFX-UsdAssetResolver/resolvers/overview.html#environment-variables) section for more details. Alternatively you can also source the setup.sh file in the root of this repo when working in Linux to get a pre-configured environment.
## Feature Overview

Expand Down
8 changes: 5 additions & 3 deletions docs.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
REM Clean existing builds
rmdir %~dp0docs\book /S /Q
REM Source setup
set REPO_ROOT=%~dp0
REM Clean existing build
rmdir %REPO_ROOT%docs\book /S /Q
REM Build book
mdbook serve --open %~dp0\docs
mdbook serve --open %REPO_ROOT%docs
8 changes: 1 addition & 7 deletions docs.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# Source setup
export REPO_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && (pwd -W 2> /dev/null || pwd))
# Clean existing builds
# Clean existing build
rm -R ${REPO_ROOT}/docs/book
# Build Python code based on doc strings. This only needs to be done on API changes.
# Generate python venv
# $HFS/python/bin/python -m venv ${REPO_ROOT}/tools/python
# source ${REPO_ROOT}/tools/python/bin/activate
# python -m pip install pydoc-markdown
# This is currently not being used as pydoc-markdown fails to detect all docstrings.
# Build book
mdbook serve --open ${REPO_ROOT}/docs
10 changes: 5 additions & 5 deletions docs/src/resolvers/ExampleSetup/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Content of a USD file located at `/workspace/shots/shotA/shotA.usd`
```python
#usda 1.0
def "testAssetA" (
prepend references = @assetA/assetA.usd@</box>
prepend references = @assetA/assetA.usd@</asset>
)
{
}
Expand All @@ -56,18 +56,18 @@ Content of the USD file located at `/workspace/shots/shotA/shotA_mapping.usd`
)
```

Content of the USD files located at `/workspace/assets/assetA/assetA.usd` and `/workspace/assets/assetA/assetA_v002.usd`
Content of the USD files located at `/workspace/assets/assetA/assetA.usd` and `/workspace/assets/assetA/assetA_v001.usd`
```python
#usda 1.0
def Cube "box" ()
def Cube "asset" ()
{
double size = 2
}
```
Content of the USD file located at `/workspace/assets/assetA/assetA.usd` and `/workspace/assets/assetA/assetA_v001.usd`
Content of the USD file located at `/workspace/assets/assetA/assetA.usd` and `/workspace/assets/assetA/assetA_v002.usd`
```python
#usda 1.0
def Cylinder "box" ()
def Cylinder "asset" ()
{
}
```
2 changes: 1 addition & 1 deletion files/box.usda
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#usda 1.0
def Cube "box" ()
def Cube "example" ()
{
double size = 2
}
2 changes: 1 addition & 1 deletion files/cylinder.usda
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#usda 1.0
def Cylinder "box" ()
def Cylinder "example" ()
{
}
2 changes: 1 addition & 1 deletion files/workspace/assets/assetA/assetA.usd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#usda 1.0
def Cube "box" ()
def Cube "asset" ()
{
double size = 2
}
2 changes: 1 addition & 1 deletion files/workspace/assets/assetA/assetA_v001.usd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#usda 1.0
def Cube "box" ()
def Cube "asset" ()
{
double size = 2
}
2 changes: 1 addition & 1 deletion files/workspace/assets/assetA/assetA_v002.usd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#usda 1.0
def Cylinder "box" ()
def Cylinder "asset" ()
{
}
2 changes: 1 addition & 1 deletion files/workspace/shots/shotA/shotA.usd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#usda 1.0
def "testAssetA" (
prepend references = @assetA/assetA.usd@</box>
prepend references = @assetA/assetA.usd@</asset>
)
{
}

0 comments on commit f067f94

Please sign in to comment.