Skip to content
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

Jump to bottom

Fix constant char arrays #3216

Merged
merged 1 commit into from
Apr 22, 2020
Merged

Fix constant char arrays #3216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
100 changes: 50 additions & 50 deletions app/src/main/cpp/VRBrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,56 +10,56 @@

namespace {

const char* kDispatchCreateWidgetName = "dispatchCreateWidget";
const char* kDispatchCreateWidgetSignature = "(ILandroid/graphics/SurfaceTexture;II)V";
const char* kDispatchCreateWidgetLayerName = "dispatchCreateWidgetLayer";
const char* kDispatchCreateWidgetLayerSignature = "(ILandroid/view/Surface;IIJ)V";
const char* kHandleMotionEventName = "handleMotionEvent";
const char* kHandleMotionEventSignature = "(IIZZFF)V";
const char* kHandleScrollEventName = "handleScrollEvent";
const char* kHandleScrollEventSignature = "(IIFF)V";
const char* kHandleAudioPoseName = "handleAudioPose";
const char* kHandleAudioPoseSignature = "(FFFFFFF)V";
const char* kHandleGestureName = "handleGesture";
const char* kHandleGestureSignature = "(I)V";
const char* kHandleResizeName = "handleResize";
const char* kHandleResizeSignature = "(IFF)V";
const char* kHandleMoveEndName = "handleMoveEnd";
const char* kHandleMoveEndSignature = "(IFFFF)V";
const char* kHandleBackEventName = "handleBack";
const char* kHandleBackEventSignature = "()V";
const char* kRegisterExternalContextName = "registerExternalContext";
const char* kRegisterExternalContextSignature = "(J)V";
const char* kOnEnterWebXRName = "onEnterWebXR";
const char* kOnEnterWebXRSignature = "()V";
const char* kOnExitWebXRName = "onExitWebXR";
const char* kOnExitWebXRSignature = "()V";
const char* kOnDismissWebXRInterstitialName = "onDismissWebXRInterstitial";
const char* kOnDismissWebXRInterstitialSignature = "()V";
const char* kRenderPointerLayerName = "renderPointerLayer";
const char* kRenderPointerLayerSignature = "(Landroid/view/Surface;J)V";
const char* kGetStorageAbsolutePathName = "getStorageAbsolutePath";
const char* kGetStorageAbsolutePathSignature = "()Ljava/lang/String;";
const char* kIsOverrideEnvPathEnabledName = "isOverrideEnvPathEnabled";
const char* kIsOverrideEnvPathEnabledSignature = "()Z";
const char* kGetActiveEnvironment = "getActiveEnvironment";
const char* kGetActiveEnvironmentSignature = "()Ljava/lang/String;";
const char* kGetPointerColor = "getPointerColor";
const char* kGetPointerColorSignature = "()I";
const char* kAreLayersEnabled = "areLayersEnabled";
const char* kAreLayersEnabledSignature = "()Z";
const char* kSetDeviceType = "setDeviceType";
const char* kSetDeviceTypeSignature = "(I)V";
const char* kHaltActivity = "haltActivity";
const char* kHaltActivitySignature = "(I)V";
const char* kHandlePoorPerformance = "handlePoorPerformance";
const char* kHandlePoorPerformanceSignature = "()V";
const char* kOnAppLink = "onAppLink";
const char* kOnAppLinkSignature = "(Ljava/lang/String;)V";
const char* kDisableLayers = "disableLayers";
const char* kDisableLayersSignature = "()V";
const char* kAppendAppNotesToCrashReport = "appendAppNotesToCrashReport";
const char* kAppendAppNotesToCrashReportSignature = "(Ljava/lang/String;)V";
const char* const kDispatchCreateWidgetName = "dispatchCreateWidget";
const char* const kDispatchCreateWidgetSignature = "(ILandroid/graphics/SurfaceTexture;II)V";
const char* const kDispatchCreateWidgetLayerName = "dispatchCreateWidgetLayer";
const char* const kDispatchCreateWidgetLayerSignature = "(ILandroid/view/Surface;IIJ)V";
const char* const kHandleMotionEventName = "handleMotionEvent";
const char* const kHandleMotionEventSignature = "(IIZZFF)V";
const char* const kHandleScrollEventName = "handleScrollEvent";
const char* const kHandleScrollEventSignature = "(IIFF)V";
const char* const kHandleAudioPoseName = "handleAudioPose";
const char* const kHandleAudioPoseSignature = "(FFFFFFF)V";
const char* const kHandleGestureName = "handleGesture";
const char* const kHandleGestureSignature = "(I)V";
const char* const kHandleResizeName = "handleResize";
const char* const kHandleResizeSignature = "(IFF)V";
const char* const kHandleMoveEndName = "handleMoveEnd";
const char* const kHandleMoveEndSignature = "(IFFFF)V";
const char* const kHandleBackEventName = "handleBack";
const char* const kHandleBackEventSignature = "()V";
const char* const kRegisterExternalContextName = "registerExternalContext";
const char* const kRegisterExternalContextSignature = "(J)V";
const char* const kOnEnterWebXRName = "onEnterWebXR";
const char* const kOnEnterWebXRSignature = "()V";
const char* const kOnExitWebXRName = "onExitWebXR";
const char* const kOnExitWebXRSignature = "()V";
const char* const kOnDismissWebXRInterstitialName = "onDismissWebXRInterstitial";
const char* const kOnDismissWebXRInterstitialSignature = "()V";
const char* const kRenderPointerLayerName = "renderPointerLayer";
const char* const kRenderPointerLayerSignature = "(Landroid/view/Surface;J)V";
const char* const kGetStorageAbsolutePathName = "getStorageAbsolutePath";
const char* const kGetStorageAbsolutePathSignature = "()Ljava/lang/String;";
const char* const kIsOverrideEnvPathEnabledName = "isOverrideEnvPathEnabled";
const char* const kIsOverrideEnvPathEnabledSignature = "()Z";
const char* const kGetActiveEnvironment = "getActiveEnvironment";
const char* const kGetActiveEnvironmentSignature = "()Ljava/lang/String;";
const char* const kGetPointerColor = "getPointerColor";
const char* const kGetPointerColorSignature = "()I";
const char* const kAreLayersEnabled = "areLayersEnabled";
const char* const kAreLayersEnabledSignature = "()Z";
const char* const kSetDeviceType = "setDeviceType";
const char* const kSetDeviceTypeSignature = "(I)V";
const char* const kHaltActivity = "haltActivity";
const char* const kHaltActivitySignature = "(I)V";
const char* const kHandlePoorPerformance = "handlePoorPerformance";
const char* const kHandlePoorPerformanceSignature = "()V";
const char* const kOnAppLink = "onAppLink";
const char* const kOnAppLinkSignature = "(Ljava/lang/String;)V";
const char* const kDisableLayers = "disableLayers";
const char* const kDisableLayersSignature = "()V";
const char* const kAppendAppNotesToCrashReport = "appendAppNotesToCrashReport";
const char* const kAppendAppNotesToCrashReportSignature = "(Ljava/lang/String;)V";

JNIEnv* sEnv = nullptr;
jclass sBrowserClass = nullptr;
Expand Down
11 changes: 7 additions & 4 deletions app/src/picovr/cpp/VRBrowserPico.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,19 @@

namespace {

const char* sUpdateHapticsName = "updateHaptics";
const char* sUpdateHapticsSignature = "(IFF)V";
const char* sCancelAllHapticsName = "cancelAllHaptics";
const char* sCancelAllHapticsSignature = "()V";
const char* const sUpdateHapticsName = "updateHaptics";
const char* const sUpdateHapticsSignature = "(IFF)V";
const char* const sCancelAllHapticsName = "cancelAllHaptics";
const char* const sCancelAllHapticsSignature = "()V";
const char* const kGetGazeIndex = "getGazeIndex";
const char* const kGetGazeIndexSignature = "()I";

JNIEnv* sEnv = nullptr;
jclass sBrowserClass = nullptr;
jobject sActivity = nullptr;
jmethodID sUpdateHaptics = nullptr;
jmethodID sCancelAllHaptics = nullptr;
jmethodID sGetGazeIndex = nullptr;
}

namespace crow {
Expand Down
30 changes: 11 additions & 19 deletions app/src/picovr/cpp/VRBrowserPico.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,21 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#pragma once
#include "vrb/MacroUtils.h"
#ifndef VRBROWSER_PICO_H
#define VRBROWSER_PICO_H

#include <memory>
#include <string>
#include <jni.h>
#include <functional>

namespace {
const char *kGetGazeIndex = "getGazeIndex";
const char *kGetGazeIndexSignature = "()I";

jmethodID sGetGazeIndex = nullptr;
}

namespace crow {

namespace VRBrowserPico {
void InitializeJava(JNIEnv* aEnv, jobject aActivity);
void ShutdownJava();
void UpdateHaptics(jint aControllerIndex, jfloat aIntensity, jfloat aDuration);
void CancelAllHaptics();
int32_t GetGazeIndex();
} // namespace VRBrowser;
namespace VRBrowserPico {
void InitializeJava(JNIEnv* aEnv, jobject aActivity);
void ShutdownJava();
void UpdateHaptics(jint aControllerIndex, jfloat aIntensity, jfloat aDuration);
void CancelAllHaptics();
int32_t GetGazeIndex();
} // namespace VRBrowser;

} // namespace crow

#endif // VRBROWSER_PICO_H