Skip to content

WIP V2.54.1 #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doranteseduardo merged 2 commits into from
Apr 8, 2026
Merged

WIP V2.54.1 #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99321e9
fix: getScene endpoint fixed, latest rvca, expose dev endpoint handle
benmotanoti Apr 8, 2026
03c24b5
fix: pass endpoint
benmotanoti Apr 8, 2026
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: 5 additions & 0 deletions ViroRenderer/VROARSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,11 @@ class VROARSession {
std::function<void(bool success, std::string error)> callback) {
if (callback) callback(false, "Not supported");
}
virtual void rvGetScene(
const std::string& sceneId,
std::function<void(bool success, std::string jsonData, std::string error)> callback) {
if (callback) callback(false, "", "Not supported");
}
virtual void rvGetSceneAssets(
const std::string& sceneId,
std::function<void(bool success, std::string jsonData, std::string error)> callback) {
Expand Down
31 changes: 28 additions & 3 deletions android/sharedCode/src/main/cpp/arcore/ARSceneController_JNI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,6 +922,29 @@ VRO_METHOD(void, nativeRvGetSceneAssets)(VRO_ARGS
});
}

VRO_METHOD(void, nativeRvGetScene)(VRO_ARGS
VRO_REF(VROARSceneController) arSceneControllerPtr,
jstring key_j,
jstring sceneId_j) {
std::string keyStr = VRO_STRING_STL(key_j);
std::string sceneIdStr = VRO_STRING_STL(sceneId_j);
std::weak_ptr<VROARScene> arScene_w = std::dynamic_pointer_cast<VROARScene>(
VRO_REF_GET(VROARSceneController, arSceneControllerPtr)->getScene());
VRO_WEAK weakObj = VRO_NEW_WEAK_GLOBAL_REF(obj);
VROPlatformDispatchAsyncRenderer([arScene_w, weakObj, keyStr, sceneIdStr] {
std::shared_ptr<VROARScene> arScene = arScene_w.lock();
std::shared_ptr<VROARSession> arSession = arScene ? arScene->getARSession() : nullptr;
if (!arSession) {
rvFireCloudResult(weakObj, keyStr, false, "", "AR session not available");
return;
}
arSession->rvGetScene(sceneIdStr,
[weakObj, keyStr](bool success, std::string jsonData, std::string error) {
rvFireCloudResult(weakObj, keyStr, success, jsonData, error);
});
});
}

VRO_METHOD(void, nativeResetPointCloudSurface)(VRO_ARGS
VRO_REF(VROARSceneController) arSceneControllerPtr) {
std::weak_ptr<VROARScene> arScene_w = std::dynamic_pointer_cast<VROARScene>(
Expand Down Expand Up @@ -1465,22 +1488,24 @@ VRO_METHOD(void, nativeResolveCloudAnchor)(VRO_ARGS
VRO_METHOD(void, nativeSetReactVisionConfig)(VRO_ARGS
VRO_REF(VROARSceneController) sceneController_j,
VRO_STRING apiKey_j,
VRO_STRING projectId_j) {
VRO_STRING projectId_j,
VRO_STRING endpoint_j) {
VRO_METHOD_PREAMBLE;

std::string apiKey = VRO_STRING_STL(apiKey_j);
std::string projectId = VRO_STRING_STL(projectId_j);
std::string endpoint = VRO_STRING_STL(endpoint_j);

std::weak_ptr<VROARScene> scene_w = std::dynamic_pointer_cast<VROARScene>(
VRO_REF_GET(VROARSceneController, sceneController_j)->getScene());

VROPlatformDispatchAsyncRenderer([scene_w, apiKey, projectId] {
VROPlatformDispatchAsyncRenderer([scene_w, apiKey, projectId, endpoint] {
std::shared_ptr<VROARScene> scene = scene_w.lock();
if (!scene) return;
std::shared_ptr<VROARSessionARCore> session =
std::dynamic_pointer_cast<VROARSessionARCore>(scene->getARSession());
if (!session) return;
session->setReactVisionConfig(apiKey, projectId);
session->setReactVisionConfig(apiKey, projectId, endpoint);
});
}

Expand Down
27 changes: 25 additions & 2 deletions android/sharedCode/src/main/cpp/arcore/VROARSessionARCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,11 @@ bool VROARSessionARCore::setAnchorDetection(
}

void VROARSessionARCore::setReactVisionConfig(const std::string &apiKey,
const std::string &projectId) {
const std::string &projectId,
const std::string &endpoint) {
_rvApiKey = apiKey;
_rvProjectId = projectId;
_rvEndpoint = endpoint;
// Credentials supplied — activate the ReactVision cloud anchor provider.
setCloudAnchorProvider(VROCloudAnchorProvider::ReactVision);
#if RVCCA_AVAILABLE
Expand All @@ -292,6 +294,7 @@ void VROARSessionARCore::setReactVisionConfig(const std::string &apiKey,
ReactVisionCCA::RVCCAGeospatialProvider::Config cfg;
cfg.apiKey = _rvApiKey;
cfg.projectId = _rvProjectId;
if (!_rvEndpoint.empty()) cfg.endpoint = _rvEndpoint;
_geospatialProviderRV = std::make_shared<ReactVisionCCA::RVCCAGeospatialProvider>(cfg);
pinfo("VROARSessionARCore: ReactVision Geospatial provider initialized");
}
Expand All @@ -311,7 +314,7 @@ void VROARSessionARCore::setCloudAnchorProvider(
// renderer-task batch.
if (!_cloudAnchorProviderRV && !_rvApiKey.empty() && !_rvProjectId.empty()) {
_cloudAnchorProviderRV = std::make_shared<VROCloudAnchorProviderReactVision>(
shared_from_this(), _rvApiKey, _rvProjectId);
shared_from_this(), _rvApiKey, _rvProjectId, _rvEndpoint);
// Improvement 1 + 6B: register as frame listener so onFrameDidRender()
// drives multi-frame host accumulation and resolve localization.
if (_synchronizer) {
Expand Down Expand Up @@ -2497,6 +2500,26 @@ void VROARSessionARCore::rvTrackCloudAnchorResolution(
if (callback) callback(false, "ReactVision cloud anchor provider not available");
}

void VROARSessionARCore::rvGetScene(
const std::string& sceneId,
std::function<void(bool, std::string, std::string)> callback) {
#if RVCCA_AVAILABLE
if (_cloudAnchorProviderRV) {
auto p = _cloudAnchorProviderRV->getProvider();
if (p) {
p->getScene(sceneId,
[callback](ReactVisionCCA::ApiResult<std::string> r) {
if (callback) {
callback(r.success, r.data, r.success ? "" : r.error.message);
}
});
return;
}
}
#endif
if (callback) callback(false, "", "ReactVision cloud anchor provider not available");
}

void VROARSessionARCore::rvGetSceneAssets(
const std::string& sceneId,
std::function<void(bool, std::string, std::string)> callback) {
Expand Down
6 changes: 5 additions & 1 deletion android/sharedCode/src/main/cpp/arcore/VROARSessionARCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ class VROARSessionARCore : public VROARSession,
Must be called before setCloudAnchorProvider(ReactVision).
Reads RVApiKey / RVProjectId from AndroidManifest meta-data if not called.
*/
void setReactVisionConfig(const std::string &apiKey, const std::string &projectId);
void setReactVisionConfig(const std::string &apiKey, const std::string &projectId,
const std::string &endpoint = "");

/*
Update the cached GPS pose used by getCameraGeospatialPose() when the
Expand Down Expand Up @@ -224,6 +225,8 @@ class VROARSessionARCore : public VROARSession,
double confidence, int matchCount, int inlierCount, int processingTimeMs,
const std::string& platform, const std::string& externalUserId,
std::function<void(bool, std::string)> callback) override;
void rvGetScene(const std::string& sceneId,
std::function<void(bool, std::string, std::string)> callback) override;
void rvGetSceneAssets(const std::string& sceneId,
std::function<void(bool, std::string, std::string)> callback) override;

Expand Down Expand Up @@ -369,6 +372,7 @@ class VROARSessionARCore : public VROARSession,
std::shared_ptr<VROCloudAnchorProviderReactVision> _cloudAnchorProviderRV;
std::string _rvApiKey;
std::string _rvProjectId;
std::string _rvEndpoint;

/*
Manages geospatial anchors via ReactVision backend.
Expand Down
1 change: 1 addition & 0 deletions android/sharedCode/src/main/cpp/arcore/VROCloudAnchorProviderReactVision.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class VROCloudAnchorProviderReactVision::Impl {
ReactVisionCCA::RVCCACloudAnchorProvider::Config cfg;
cfg.apiKey = apiKey;
cfg.projectId = projectId;
if (!endpoint.empty()) cfg.endpoint = endpoint;

// ARCore feature points have much lower confidence values than ARKit (typically
// 0.1–0.5 vs 0.8–1.0). The default minPointConfidence of 0.5 discards the
Expand Down
15 changes: 13 additions & 2 deletions android/sharedCode/src/main/java/com/viro/core/ARScene.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,11 @@ public void hostCloudAnchor(ARAnchor anchor, int ttlDays, CloudAnchorHostListene
* @hide
*/
public void setReactVisionConfig(String apiKey, String projectId) {
nativeSetReactVisionConfig(mNativeRef, apiKey, projectId);
setReactVisionConfig(apiKey, projectId, "");
}

public void setReactVisionConfig(String apiKey, String projectId, String endpoint) {
nativeSetReactVisionConfig(mNativeRef, apiKey, projectId, endpoint != null ? endpoint : "");
}

public void setGeospatialAnchorProvider(String provider) {
Expand Down Expand Up @@ -1389,6 +1393,12 @@ public void rvRemoveAssetFromCloudAnchor(String anchorId, String assetId,
nativeRvRemoveAssetFromCloudAnchor(mNativeRef, key, anchorId, assetId);
}

public void rvGetScene(String sceneId, RvCloudAnchorCallback callback) {
String key = "rvGetScene_" + System.nanoTime();
mRvCloudCallbacks.put(key, callback);
nativeRvGetScene(mNativeRef, key, sceneId);
}

public void rvGetSceneAssets(String sceneId, RvCloudAnchorCallback callback) {
String key = "rvGetSceneAssets_" + System.nanoTime();
mRvCloudCallbacks.put(key, callback);
Expand Down Expand Up @@ -1633,7 +1643,7 @@ public void setWorldMeshConfig(int stride, float minConfidence, float maxDepth,
private native void nativeRemoveARImageTargetDeclarative(long sceneControllerRef, long arImageTargetRef);
private native void nativeHostCloudAnchor(long sceneControllerRef, String anchorId, int ttlDays);
private native void nativeResolveCloudAnchor(long sceneControllerRef, String cloudAnchorId);
private native void nativeSetReactVisionConfig(long sceneControllerRef, String apiKey, String projectId);
private native void nativeSetReactVisionConfig(long sceneControllerRef, String apiKey, String projectId, String endpoint);
private native void nativeSetGeospatialAnchorProvider(long sceneControllerRef, String provider);
private native float nativeGetAmbientLightIntensity(long sceneControllerRef);
private native long nativeCreateAnchoredNode(long sceneControllerRef, float px, float py, float pz,
Expand Down Expand Up @@ -1696,6 +1706,7 @@ private native void nativeRvUpdateCloudAnchor(long sceneControllerRef, String ke
private native void nativeRvFindNearbyCloudAnchors(long sceneControllerRef, String key,
double lat, double lng,
double radius, int limit);
private native void nativeRvGetScene(long sceneControllerRef, String key, String sceneId);
private native void nativeRvGetSceneAssets(long sceneControllerRef, String key, String sceneId);
private native void nativeRvAttachAssetToCloudAnchor(long sceneControllerRef, String key,
String anchorId, String fileUrl,
Expand Down
Binary file modified android/sharedCode/src/main/jniLibs/arm64-v8a/libreactvisioncca.so
View file
Open in desktop
Binary file not shown.
Binary file modified android/sharedCode/src/main/jniLibs/armeabi-v7a/libreactvisioncca.so
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/reactvisioncca/arm64/libreactvisioncca.a
View file
Open in desktop
Binary file not shown.
Binary file modified ios/Libraries/reactvisioncca/arm64_simulator/libreactvisioncca.a
View file
Open in desktop
Binary file not shown.
23 changes: 22 additions & 1 deletion ios/ViroKit/VROARSessioniOS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,10 +527,12 @@ void VROARSessioniOS::setCloudAnchorProvider(VROCloudAnchorProvider provider) {
// Initialize ReactVision cloud anchor provider; reads credentials from Info.plist
NSString *apiKey = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RVApiKey"];
NSString *projectId = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RVProjectId"];
NSString *endpoint = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RVEndpoint"];

if (apiKey.length && projectId.length) {
if (_cloudAnchorProviderRV == nil) {
_cloudAnchorProviderRV = [[VROCloudAnchorProviderReactVision alloc]
initWithApiKey:apiKey projectId:projectId endpoint:nil];
initWithApiKey:apiKey projectId:projectId endpoint:endpoint];
if (_cloudAnchorProviderRV) {
pinfo("ReactVision Cloud Anchor provider initialized successfully");
} else {
Expand All @@ -545,6 +547,7 @@ void VROARSessioniOS::setCloudAnchorProvider(VROCloudAnchorProvider provider) {
ReactVisionCCA::RVCCAGeospatialProvider::Config cfg;
cfg.apiKey = std::string([apiKey UTF8String]);
cfg.projectId = std::string([projectId UTF8String]);
if (endpoint.length) cfg.endpoint = std::string([endpoint UTF8String]);
_rvGeoProjectId = cfg.projectId;
_geospatialProviderRV = std::make_shared<ReactVisionCCA::RVCCAGeospatialProvider>(cfg);
pinfo("ReactVision Geospatial provider initialized via setCloudAnchorProvider");
Expand Down Expand Up @@ -2503,6 +2506,24 @@ void VROARSessioniOS::rvTrackCloudAnchorResolution(
if (callback) callback(false, "ReactVision cloud anchor provider not available");
}

void VROARSessioniOS::rvGetScene(
const std::string& sceneId,
std::function<void(bool, std::string, std::string)> callback) {
#if RVCCA_AVAILABLE
auto p = [_cloudAnchorProviderRV cppProvider];
if (p) {
p->getScene(sceneId,
[callback](ReactVisionCCA::ApiResult<std::string> r) {
if (callback) {
callback(r.success, r.data, r.success ? "" : r.error.message);
}
});
return;
}
#endif
if (callback) callback(false, "", "ReactVision cloud anchor provider not available");
}

void VROARSessioniOS::rvGetSceneAssets(
const std::string& sceneId,
std::function<void(bool, std::string, std::string)> callback) {
Expand Down
2 changes: 2 additions & 0 deletions ios/ViroKit/VROARSessioniOS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ class API_AVAILABLE(ios(12.0)) VROARSessioniOS : public VROARSession, public std
double confidence, int matchCount, int inlierCount, int processingTimeMs,
const std::string& platform, const std::string& externalUserId,
std::function<void(bool, std::string)> callback) override;
void rvGetScene(const std::string& sceneId,
std::function<void(bool, std::string, std::string)> callback) override;
void rvGetSceneAssets(const std::string& sceneId,
std::function<void(bool, std::string, std::string)> callback) override;

Expand Down
1 change: 1 addition & 0 deletions ios/ViroKit/VROCloudAnchorProviderReactVision.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ - (nullable instancetype)initWithApiKey:(NSString *)apiKey
ReactVisionCCA::RVCCACloudAnchorProvider::Config cfg;
cfg.apiKey = apiKey.UTF8String;
cfg.projectId = projectId.UTF8String;
if (endpoint.length) cfg.endpoint = endpoint.UTF8String;
cfg.enableLogging = YES; // DEBUG: enable to trace SIFT pipeline

try {
Expand Down
Loading