Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
use flake .
# Enable nix development environment if installed
if has nix; then
use flake .
fi
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: cargo test
shell: bash
run: |
export KITTYCAD_API_TOKEN=${{secrets.KITTYCAD_API_TOKEN}}
export ZOO_API_TOKEN=${{secrets.KITTYCAD_API_TOKEN}}
just test-with-coverage
env:
RUST_BACKTRACE: 1
Expand Down
8 changes: 5 additions & 3 deletions modeling-session/examples/cube_png.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ const CUBE_WIDTH: LengthUnit = LengthUnit(100.0);
#[tokio::main(flavor = "current_thread")]
async fn main() -> Result<()> {
// Set up the API client.
let kittycad_api_token = env::var("KITTYCAD_API_TOKEN").context("You must set $KITTYCAD_API_TOKEN")?;
let kittycad_api_client = kittycad::Client::new(kittycad_api_token);
let token = env::var("ZOO_API_TOKEN")
.or_else(|_| env::var("KITTYCAD_API_TOKEN")) // legacy name
.context("You must set $ZOO_API_TOKEN")?;
let client = kittycad::Client::new(token);

// Where should the final PNG be saved?
let img_output_path = env::var("IMAGE_OUTPUT_PATH").unwrap_or_else(|_| "model.png".to_owned());

let session_builder = SessionBuilder {
client: kittycad_api_client,
client,
fps: Some(10),
unlocked_framerate: Some(false),
video_res_height: Some(720),
Expand Down
8 changes: 5 additions & 3 deletions modeling-session/examples/cube_png_batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ const CUBE_WIDTH: LengthUnit = LengthUnit(100.0);
#[tokio::main(flavor = "current_thread")]
async fn main() -> Result<()> {
// Set up the API client.
let kittycad_api_token = env::var("KITTYCAD_API_TOKEN").context("You must set $KITTYCAD_API_TOKEN")?;
let kittycad_api_client = kittycad::Client::new(kittycad_api_token);
let token = env::var("ZOO_API_TOKEN")
.or_else(|_| env::var("KITTYCAD_API_TOKEN")) // legacy name
.context("You must set $ZOO_API_TOKEN")?;
let client = kittycad::Client::new(token);

// Where should the final PNG be saved?
let img_output_path = env::var("IMAGE_OUTPUT_PATH").unwrap_or_else(|_| "model_batched.png".to_owned());

let session_builder = SessionBuilder {
client: kittycad_api_client,
client,
fps: Some(10),
unlocked_framerate: Some(false),
video_res_height: Some(720),
Expand Down
8 changes: 5 additions & 3 deletions modeling-session/examples/lsystem_png_batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ use uuid::Uuid;
#[tokio::main(flavor = "current_thread")]
async fn main() -> Result<()> {
// Set up the API client.
let kittycad_api_token = env::var("KITTYCAD_API_TOKEN").context("You must set $KITTYCAD_API_TOKEN")?;
let kittycad_api_client = kittycad::Client::new(kittycad_api_token);
let token = env::var("ZOO_API_TOKEN")
.or_else(|_| env::var("KITTYCAD_API_TOKEN")) // legacy name
.context("You must set $ZOO_API_TOKEN")?;
let client = kittycad::Client::new(token);

// Where should the final PNG be saved?
let img_output_path = env::var("IMAGE_OUTPUT_PATH").unwrap_or_else(|_| "model_lsystem_batched.png".to_owned());

let session_builder = SessionBuilder {
client: kittycad_api_client,
client,
fps: Some(10),
unlocked_framerate: Some(false),
video_res_height: Some(720),
Expand Down