Skip to content

Commit

Permalink
fix more static scene and ci
Browse files Browse the repository at this point in the history
  • Loading branch information
leanmendoza committed Oct 29, 2024
1 parent 98fda0b commit ebb4c44
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
if: success() || failure()
uses: actions/upload-artifact@v4
with:
name: snapshots
name: coverage-snapshots
path: |
tests/snapshots/scenes/comparison/**/*
tests/snapshots/avatar-image-generation/comparison/**/*
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
if: success() || failure()
uses: actions/upload-artifact@v4
with:
name: snapshots
name: docker-snapshots
path: |
${{ github.workspace }}/avatar-output/**/*
${{ github.workspace }}/scenes-output/**/*
6 changes: 3 additions & 3 deletions godot/src/tool/scene_renderer/scene-test-input.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
"camera": {
"position": {
"x": 8,
"y": 20,
"y": 25,
"z": -8
},
"target": {
"x": 8,
"y": 0,
"z": -8
},
"orthoSize": 20,
"orthoSize": 25,
"projection": "ortho"
}
},
"payload": [
{
"coords": "72,-10"
"coords": "73,-6"
}
]
}
4 changes: 4 additions & 0 deletions godot/src/tool/scene_renderer/scene_orchestor.gd
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ func _process(_delta):


func _on_timer_timeout():
# Continue only when every pointer around was fetched
if Global.scene_fetcher.scene_entity_coordinator.is_busy():
return

if current_payload_index >= scenes_to_process.scenes.size():
Global.testing_tools.exit_gracefully(0)
return
Expand Down
5 changes: 5 additions & 0 deletions lib/src/realm/scene_entity_coordinator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,11 @@ impl SceneEntityCoordinator {
self.cache_scene_data.remove(&scene_id);
self.update_position(self.current_position.0, self.current_position.1);
}

#[func]
pub fn is_busy(&self) -> bool {
!(self.requested_city_pointers.is_empty() && self.requested_entity.is_empty())
}
}

#[godot_api]
Expand Down
6 changes: 3 additions & 3 deletions tests/scene-renderer-test-input.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
"camera": {
"position": {
"x": 8,
"y": 20,
"y": 25,
"z": -8
},
"target": {
"x": 8,
"y": 0,
"z": -8
},
"orthoSize": 20,
"orthoSize": 25,
"projection": "ortho"
}
},
"payload": [
{
"coords": "72,-10"
"coords": "73,-6"
}
]
}
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ebb4c44

Please sign in to comment.