Skip to content

Commit

Permalink
Export proxy and testing at runtime.
Browse files Browse the repository at this point in the history
Works in the viewer now with a trimmed audio clip.

Diffs=
473dbcb5c Export proxy and testing at runtime. (#6950)

Co-authored-by: Luigi Rosso <luigi-rosso@users.noreply.github.com>
  • Loading branch information
luigi-rosso and luigi-rosso committed Mar 29, 2024
1 parent fc1d270 commit 820ce85
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a69bfba11ec4a116b8712af0b685aa27a5309e43
473dbcb5ccba6d5cb077f762ac7094ca492d6319
6 changes: 5 additions & 1 deletion viewer/src/viewer_content/scene_content.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include "rive/math/aabb.hpp"
#include "rive/assets/image_asset.hpp"
#include "viewer/viewer_content.hpp"
#include "rive/relative_local_asset_loader.hpp"

#ifdef RIVE_RENDERER_TESS
#include "viewer/sample_tools/sample_atlas_packer.hpp"
#endif
Expand Down Expand Up @@ -382,7 +384,9 @@ class SceneContent : public ViewerContent
std::unique_ptr<ViewerContent> ViewerContent::Scene(const char filename[])
{
auto bytes = LoadFile(filename);
if (auto file = rive::File::import(bytes, RiveFactory()))
rive::RelativeLocalAssetLoader loader(filename);
rive::ImportResult result;
if (auto file = rive::File::import(bytes, RiveFactory(), &result, &loader))
{
return rivestd::make_unique<SceneContent>(filename, std::move(file));
}
Expand Down

0 comments on commit 820ce85

Please sign in to comment.