Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
0ca17116
Commit
0ca17116
authored
Mar 07, 2020
by
Bastiaan Olij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARVRController.is_button_pressed requires to return a boolean
parent
d4b31c69
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ARVRController.xml
doc/classes/ARVRController.xml
+1
-1
arvr_nodes.cpp
scene/3d/arvr_nodes.cpp
+1
-1
arvr_nodes.h
scene/3d/arvr_nodes.h
+1
-1
No files found.
doc/classes/ARVRController.xml
View file @
0ca17116
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
</description>
</description>
</method>
</method>
<method
name=
"is_button_pressed"
qualifiers=
"const"
>
<method
name=
"is_button_pressed"
qualifiers=
"const"
>
<return
type=
"
int
"
>
<return
type=
"
bool
"
>
</return>
</return>
<argument
index=
"0"
name=
"button"
type=
"int"
>
<argument
index=
"0"
name=
"button"
type=
"int"
>
</argument>
</argument>
...
...
scene/3d/arvr_nodes.cpp
View file @
0ca17116
...
@@ -300,7 +300,7 @@ int ARVRController::get_joystick_id() const {
...
@@ -300,7 +300,7 @@ int ARVRController::get_joystick_id() const {
return
tracker
->
get_joy_id
();
return
tracker
->
get_joy_id
();
};
};
int
ARVRController
::
is_button_pressed
(
int
p_button
)
const
{
bool
ARVRController
::
is_button_pressed
(
int
p_button
)
const
{
int
joy_id
=
get_joystick_id
();
int
joy_id
=
get_joystick_id
();
if
(
joy_id
==
-
1
)
{
if
(
joy_id
==
-
1
)
{
return
false
;
return
false
;
...
...
scene/3d/arvr_nodes.h
View file @
0ca17116
...
@@ -88,7 +88,7 @@ public:
...
@@ -88,7 +88,7 @@ public:
String
get_controller_name
(
void
)
const
;
String
get_controller_name
(
void
)
const
;
int
get_joystick_id
()
const
;
int
get_joystick_id
()
const
;
int
is_button_pressed
(
int
p_button
)
const
;
bool
is_button_pressed
(
int
p_button
)
const
;
float
get_joystick_axis
(
int
p_axis
)
const
;
float
get_joystick_axis
(
int
p_axis
)
const
;
real_t
get_rumble
()
const
;
real_t
get_rumble
()
const
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment