HybridNativeTouchMode
This commit is contained in:
1 parent
94addc69f7
commit
c88753c7e9
6 files changed
+64
-63
No files matched your search
@@ -23,7 +23,7 @@ typedef NS_ENUM(NSInteger, OnScreenControlsLevel) {
|
||||
OnScreenControlsLevelAuto,
|
||||
OnScreenControlsLevelSimple,
|
||||
OnScreenControlsLevelFull,
|
||||
OnScreenControlsCustom,
|
||||
OnScreenControlsLevelCustom,
|
||||
|
||||
// Internal levels selected by ControllerSupport
|
||||
OnScreenControlsLevelAutoGCGamepad,
|
||||
|
||||
@@ -300,7 +300,7 @@ static float L3_Y;
|
||||
[self drawSticks];
|
||||
[self hideL3R3]; // Full controls don't need these they have the sticks
|
||||
break;
|
||||
case OnScreenControlsCustom:
|
||||
case OnScreenControlsLevelCustom:
|
||||
|
||||
[self setupComplexControls]; // Default postion for D-Pad set here
|
||||
[self setDPadCenter]; // Custom position for D-Pad set here
|
||||
|
||||
@@ -116,7 +116,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
|
||||
|
||||
onScreenControls = [[OnScreenControls alloc] initWithView:self controllerSup:controllerSupport streamConfig:streamConfig];
|
||||
OnScreenControlsLevel level = (OnScreenControlsLevel)[settings.onscreenControls integerValue];
|
||||
if (settings.touchMode.intValue != RELATIVE_TOUCH) {
|
||||
if (settings.touchMode.intValue != RELATIVE_TOUCH && settings.touchMode.intValue != REGULAR_NATIVE_TOUCH ) {
|
||||
Log(LOG_I, @"On-screen controls disabled in non-relative touch mode");
|
||||
[onScreenControls setLevel:OnScreenControlsLevelOff];
|
||||
}
|
||||
@@ -280,7 +280,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
|
||||
- (void) reloadOnScreenControlsWith:(ControllerSupport*)controllerSupport
|
||||
andConfig:(StreamConfiguration*)streamConfig {
|
||||
onScreenControls = [[OnScreenControls alloc] initWithView:self controllerSup:controllerSupport streamConfig:streamConfig];
|
||||
[onScreenControls setLevel:OnScreenControlsCustom];
|
||||
[onScreenControls setLevel:OnScreenControlsLevelCustom];
|
||||
}
|
||||
|
||||
- (OnScreenControlsLevel) getCurrentOscState {
|
||||
|
||||
Reference in new issue
Block a user