maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

namespace change and add camera extraction from GLTF

Browse Source
This commit is contained in:
Nick Fisher
2022-01-20 19:55:41 +08:00
parent 77a68a11de
commit dc3f9e9be8
11 changed files with 90 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ios/Classes/FilamentMethodCallHandler.h
View File

@@ -11,8 +11,8 @@ static const id VIEW_TYPE = @"holovox.app/filament_view";
@interface FilamentMethodCallHandler : FlutterMethodChannel
- (void)handleMethodCall:(FlutterMethodCall* _Nonnull)call result:( FlutterResult _Nonnull)result;
- (holovox::FilamentViewer*) _viewer;
- (holovox::ResourceBuffer)loadResource:(const char* const)path;
- (polyvox::FilamentViewer*) _viewer;
- (polyvox::ResourceBuffer)loadResource:(const char* const)path;
- (void)freeResource:(void*)mem size:(size_t)size misc:(void*)misc;
- (void)ready;
- (instancetype)initWithController:(FilamentViewController*)controller

14
ios/Classes/FilamentMethodCallHandler.mm
View File

@@ -4,7 +4,7 @@
static const FilamentMethodCallHandler* _handler;
static holovox::ResourceBuffer loadResourceGlobal(const char* name) {
static polyvox::ResourceBuffer loadResourceGlobal(const char* name) {
return [_handler loadResource:name];
}
@@ -16,7 +16,7 @@ static void* freeResourceGlobal(void* mem, size_t size, void* misc) {
@implementation FilamentMethodCallHandler {
FilamentViewController *_controller;
FlutterMethodChannel* _channel;
holovox::FilamentViewer* _viewer;
polyvox::FilamentViewer* _viewer;
void* _layer;
NSObject<FlutterPluginRegistrar>* _registrar;
@@ -43,9 +43,9 @@ static void* freeResourceGlobal(void* mem, size_t size, void* misc) {
- (void)handleMethodCall:(FlutterMethodCall* _Nonnull)call result:(FlutterResult _Nonnull )result {
if([@"initialize" isEqualToString:call.method]) {
if(!call.arguments)
_viewer = new holovox::FilamentViewer(_layer, nullptr, nullptr, loadResourceGlobal, freeResourceGlobal);
_viewer = new polyvox::FilamentViewer(_layer, nullptr, nullptr, loadResourceGlobal, freeResourceGlobal);
else
_viewer = new holovox::FilamentViewer(_layer, [call.arguments[0] UTF8String], [call.arguments[1] UTF8String], loadResourceGlobal, freeResourceGlobal);
_viewer = new polyvox::FilamentViewer(_layer, [call.arguments[0] UTF8String], [call.arguments[1] UTF8String], loadResourceGlobal, freeResourceGlobal);
[_controller setViewer:_viewer];
[_controller startDisplayLink];
result(@"OK");
@@ -123,7 +123,7 @@ static void* freeResourceGlobal(void* mem, size_t size, void* misc) {
_viewer->playAnimation([call.arguments intValue]);
result(@"OK");
} else if([@"getTargetNames" isEqualToString:call.method]) {
holovox::StringList list = _viewer->getTargetNames([call.arguments UTF8String]);
polyvox::StringList list = _viewer->getTargetNames([call.arguments UTF8String]);
NSMutableArray* asArray = [NSMutableArray arrayWithCapacity:list.count];
for(int i = 0; i < list.count; i++) {
asArray[i] = [NSString stringWithFormat:@"%s", list.strings[i]];
@@ -152,7 +152,7 @@ static void* freeResourceGlobal(void* mem, size_t size, void* misc) {
}
}
- (holovox::ResourceBuffer)loadResource:(const char* const)path {
- (polyvox::ResourceBuffer)loadResource:(const char* const)path {
NSString* p = [NSString stringWithFormat:@"%s", path];
NSString* key = [_registrar lookupKeyForAsset:p];
NSString* nsPath = [[NSBundle mainBundle] pathForResource:key
@@ -165,7 +165,7 @@ static void* freeResourceGlobal(void* mem, size_t size, void* misc) {
NSData* buffer = [NSData dataWithContentsOfFile:nsPath];
void* cpy = malloc([buffer length]);
memcpy(cpy, [buffer bytes], [buffer length]); // can we avoid this copy somehow?
holovox::ResourceBuffer rbuf(cpy, [buffer length]);
polyvox::ResourceBuffer rbuf(cpy, [buffer length]);
return rbuf;
}

2
ios/Classes/FilamentNativeViewFactory.mm
View File

@@ -30,7 +30,7 @@
@implementation FilamentNativeView {
FilamentView* _view;
FilamentViewController* _controller;
holovox::FilamentViewer* _viewer;
polyvox::FilamentViewer* _viewer;
FilamentMethodCallHandler* _handler;
void* _layer;
}

2
ios/Classes/FilamentView.h
View File

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
*
*/
@interface FilamentView : UIView
- (void)setViewer:(holovox::FilamentViewer*)viewer;
- (void)setViewer:(polyvox::FilamentViewer*)viewer;
@end
NS_ASSUME_NONNULL_END

6
ios/Classes/FilamentView.mm
View File

@@ -23,14 +23,14 @@ using namespace std;
@interface FilamentView ()
- (void)initCommon;
- (void)setViewer:(holovox::FilamentViewer*)viewer;
- (void)setViewer:(polyvox::FilamentViewer*)viewer;
@end
@implementation FilamentView {
holovox::FilamentViewer* _viewer;
polyvox::FilamentViewer* _viewer;
}
- (void)setViewer:(holovox::FilamentViewer*)viewer {
- (void)setViewer:(polyvox::FilamentViewer*)viewer {
_viewer = viewer;
_viewer->updateViewportAndCameraProjection(self.bounds.size.width, self.bounds.size.height, self.contentScaleFactor);
}

2
ios/Classes/FilamentViewController.h
View File

@@ -23,7 +23,7 @@
@interface FilamentViewController : UIViewController
@property(weak, nonatomic) IBOutlet FilamentView* modelView;
- (void)setViewer:(holovox::FilamentViewer*)viewer;
- (void)setViewer:(polyvox::FilamentViewer*)viewer;
- (void)startDisplayLink;
- (void)stopDisplayLink;

4
ios/Classes/FilamentViewController.mm
View File

@@ -22,7 +22,7 @@
@implementation FilamentViewController {
CADisplayLink* _displayLink;
NSObject<FlutterPluginRegistrar>* _registrar;
holovox::FilamentViewer* _viewer;
polyvox::FilamentViewer* _viewer;
FilamentView* _view;
}
@@ -35,7 +35,7 @@
return self;
}
- (void)setViewer:(holovox::FilamentViewer*)viewer {
- (void)setViewer:(polyvox::FilamentViewer*)viewer {
_viewer = viewer;
[_view setViewer:_viewer];
}