mirror of
https://github.com/rive-app/rive-ios.git
synced 2026-01-18 17:11:28 +01:00
few bits to sort out - [x] make our mix of simulator/emulator consistent, settling on emulator - [x] passing the factory in works great for just in time asset decoding, but its not amazing when you want to decode ahead of time. - [x] couple of places left to pass this function signature through. (Question) is there a neater way to get this done, feels a bit like we are going back to parameter explosion a bit? - [x] should do a few examples, i think the complexity grows quite a bit in this one as you add caching, or callbacks - [x] should get the cached images/fonts to draw on init as well, either warming up cache, or jitting - [x] examples loading assets from the bundle (also there seem to be actual asset things too? should we use those?!) - [x] add test - [x] re-add "preview" project & rev the preview project once this has been deployed. (do this after new ios deploy) - [x] fix up race condition (see comment) https://github.com/rive-app/rive/assets/1216025/2c14330f-e8a4-481b-bc27-4807cabe3b82 (simple example, both swift ui and standard)  Diffs= fabb7f97f Ios out of band (#6232) Co-authored-by: Gordon Hayes <pggordonhayes@gmail.com> Co-authored-by: Maxwell Talbot <talbot.maxwell@gmail.com>
43 lines
1.3 KiB
Plaintext
43 lines
1.3 KiB
Plaintext
//
|
|
// FileAssetLoaderAdapter.m
|
|
// RiveRuntime
|
|
//
|
|
// Created by Maxwell Talbot on 07/11/2023.
|
|
// Copyright © 2023 Rive. All rights reserved.
|
|
//
|
|
|
|
#import <FileAssetLoaderAdapter.hpp>
|
|
#import <RiveFileAssetLoader.h>
|
|
#import <RiveFileAsset.h>
|
|
#import <RiveFactory.h>
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
rive::FileAssetLoaderAdapter::FileAssetLoaderAdapter(RiveFileAssetLoader* myLoader)
|
|
{
|
|
loader = myLoader;
|
|
}
|
|
|
|
bool rive::FileAssetLoaderAdapter::loadContents(rive::FileAsset& asset,
|
|
rive::Span<const uint8_t> bytes,
|
|
rive::Factory* factory)
|
|
{
|
|
NSData* data = [NSData dataWithBytes:bytes.data() length:bytes.size()];
|
|
RiveFactory* myFactory = [[RiveFactory alloc] initWithFactory:factory];
|
|
if (asset.is<rive::FontAsset>())
|
|
{
|
|
RiveFontAsset* fontAsset =
|
|
[[RiveFontAsset alloc] initWithFileAsset:asset.as<rive::FontAsset>()];
|
|
return [loader loadContentsWithAsset:fontAsset andData:data andFactory:myFactory];
|
|
}
|
|
else if (asset.is<rive::ImageAsset>())
|
|
{
|
|
RiveImageAsset* imageAsset =
|
|
[[RiveImageAsset alloc] initWithFileAsset:asset.as<rive::ImageAsset>()];
|
|
return [loader loadContentsWithAsset:imageAsset andData:data andFactory:myFactory];
|
|
}
|
|
return false;
|
|
}
|
|
|
|
NS_ASSUME_NONNULL_END
|