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
dee8f8db
Unverified
Commit
dee8f8db
authored
May 19, 2020
by
Rémi Verschelde
Committed by
GitHub
May 19, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #38850 from akien-mga/style-clang-format-unnecessary-semicolons
Style: Fix unnecessary semicolons that confused clang-format
parents
74b5d683
ca3192d1
Show whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
64 additions
and
159 deletions
+64
-159
os.cpp
core/os/os.cpp
+2
-3
safe_refcount.cpp
core/safe_refcount.cpp
+16
-16
rigid_body_bullet.cpp
modules/bullet/rigid_body_bullet.cpp
+0
-5
camera_win.cpp
modules/camera/camera_win.cpp
+6
-10
camera_win.h
modules/camera/camera_win.h
+1
-1
nav_map.cpp
modules/gdnavigation/nav_map.cpp
+0
-1
mobile_vr_interface.cpp
modules/mobile_vr/mobile_vr_interface.cpp
+0
-6
mobile_vr_interface.h
modules/mobile_vr/mobile_vr_interface.h
+1
-1
video_stream_theora.cpp
modules/theora/video_stream_theora.cpp
+4
-7
PurchaseTask.java
...va/org/godotengine/godot/plugin/payment/PurchaseTask.java
+1
-1
thread_uwp.cpp
platform/uwp/thread_uwp.cpp
+0
-8
thread_uwp.h
platform/uwp/thread_uwp.h
+4
-4
proximity_group_3d.cpp
scene/3d/proximity_group_3d.cpp
+0
-9
proximity_group_3d.h
scene/3d/proximity_group_3d.h
+5
-5
xr_nodes.cpp
scene/3d/xr_nodes.cpp
+1
-35
xr_nodes.h
scene/3d/xr_nodes.h
+14
-14
audio_driver_dummy.cpp
servers/audio/audio_driver_dummy.cpp
+0
-8
audio_driver_dummy.h
servers/audio/audio_driver_dummy.h
+3
-3
physics_server_2d_sw.cpp
servers/physics_2d/physics_server_2d_sw.cpp
+0
-4
physics_server_2d_sw.h
servers/physics_2d/physics_server_2d_sw.h
+1
-1
physics_server_3d_sw.cpp
servers/physics_3d/physics_server_3d_sw.cpp
+0
-8
physics_server_3d_sw.h
servers/physics_3d/physics_server_3d_sw.h
+2
-2
xr_interface.cpp
servers/xr/xr_interface.cpp
+2
-2
xr_positional_tracker.cpp
servers/xr/xr_positional_tracker.cpp
+0
-4
xr_positional_tracker.h
servers/xr/xr_positional_tracker.h
+1
-1
No files found.
core/os/os.cpp
View file @
dee8f8db
...
@@ -94,10 +94,9 @@ uint64_t OS::get_system_time_msecs() const {
...
@@ -94,10 +94,9 @@ uint64_t OS::get_system_time_msecs() const {
return
0
;
return
0
;
}
}
void
OS
::
debug_break
(){
void
OS
::
debug_break
()
{
// something
// something
}
;
}
void
OS
::
_set_logger
(
CompositeLogger
*
p_logger
)
{
void
OS
::
_set_logger
(
CompositeLogger
*
p_logger
)
{
if
(
_logger
)
{
if
(
_logger
)
{
...
...
core/safe_refcount.cpp
View file @
dee8f8db
...
@@ -42,24 +42,27 @@
...
@@ -42,24 +42,27 @@
/* taken from boost */
\
/* taken from boost */
\
while (true) { \
while (true) { \
m_cpp_type tmp = static_cast<m_cpp_type const volatile &>(*(m_pw)); \
m_cpp_type tmp = static_cast<m_cpp_type const volatile &>(*(m_pw)); \
if (tmp == 0)
\
if (tmp == 0)
{
\
return 0;
/* if zero, can't add to it anymore */
\
return 0;
/* if zero, can't add to it anymore */
\
if (m_win_cmpxchg((m_win_type volatile *)(m_pw), tmp + 1, tmp) == tmp) \
} \
if (m_win_cmpxchg((m_win_type volatile *)(m_pw), tmp + 1, tmp) == tmp) { \
return tmp + 1; \
return tmp + 1; \
} \
}
}
#define ATOMIC_EXCHANGE_IF_GREATER_BODY(m_pw, m_val, m_win_type, m_win_cmpxchg, m_cpp_type) \
#define ATOMIC_EXCHANGE_IF_GREATER_BODY(m_pw, m_val, m_win_type, m_win_cmpxchg, m_cpp_type) \
while (true) { \
while (true) { \
m_cpp_type tmp = static_cast<m_cpp_type const volatile &>(*(m_pw)); \
m_cpp_type tmp = static_cast<m_cpp_type const volatile &>(*(m_pw)); \
if (tmp >= m_val)
\
if (tmp >= m_val)
{
\
return tmp;
/* already greater, or equal */
\
return tmp;
/* already greater, or equal */
\
if (m_win_cmpxchg((m_win_type volatile *)(m_pw), m_val, tmp) == tmp) \
} \
if (m_win_cmpxchg((m_win_type volatile *)(m_pw), m_val, tmp) == tmp) { \
return m_val; \
return m_val; \
} \
}
}
_ALWAYS_INLINE_
uint32_t
_atomic_conditional_increment_impl
(
volatile
uint32_t
*
pw
){
_ALWAYS_INLINE_
uint32_t
_atomic_conditional_increment_impl
(
volatile
uint32_t
*
pw
)
{
ATOMIC_CONDITIONAL_INCREMENT_BODY
(
pw
,
LONG
,
InterlockedCompareExchange
,
uint32_t
);
ATOMIC_CONDITIONAL_INCREMENT_BODY
(
pw
,
LONG
,
InterlockedCompareExchange
,
uint32_t
)
}
}
_ALWAYS_INLINE_
uint32_t
_atomic_decrement_impl
(
volatile
uint32_t
*
pw
)
{
_ALWAYS_INLINE_
uint32_t
_atomic_decrement_impl
(
volatile
uint32_t
*
pw
)
{
...
@@ -78,14 +81,12 @@ _ALWAYS_INLINE_ uint32_t _atomic_add_impl(volatile uint32_t *pw, volatile uint32
...
@@ -78,14 +81,12 @@ _ALWAYS_INLINE_ uint32_t _atomic_add_impl(volatile uint32_t *pw, volatile uint32
return
InterlockedAdd
((
LONG
volatile
*
)
pw
,
val
);
return
InterlockedAdd
((
LONG
volatile
*
)
pw
,
val
);
}
}
_ALWAYS_INLINE_
uint32_t
_atomic_exchange_if_greater_impl
(
volatile
uint32_t
*
pw
,
volatile
uint32_t
val
){
_ALWAYS_INLINE_
uint32_t
_atomic_exchange_if_greater_impl
(
volatile
uint32_t
*
pw
,
volatile
uint32_t
val
)
{
ATOMIC_EXCHANGE_IF_GREATER_BODY
(
pw
,
val
,
LONG
,
InterlockedCompareExchange
,
uint32_t
);
ATOMIC_EXCHANGE_IF_GREATER_BODY
(
pw
,
val
,
LONG
,
InterlockedCompareExchange
,
uint32_t
)
}
}
_ALWAYS_INLINE_
uint64_t
_atomic_conditional_increment_impl
(
volatile
uint64_t
*
pw
){
_ALWAYS_INLINE_
uint64_t
_atomic_conditional_increment_impl
(
volatile
uint64_t
*
pw
)
{
ATOMIC_CONDITIONAL_INCREMENT_BODY
(
pw
,
LONGLONG
,
InterlockedCompareExchange64
,
uint64_t
);
ATOMIC_CONDITIONAL_INCREMENT_BODY
(
pw
,
LONGLONG
,
InterlockedCompareExchange64
,
uint64_t
)
}
}
_ALWAYS_INLINE_
uint64_t
_atomic_decrement_impl
(
volatile
uint64_t
*
pw
)
{
_ALWAYS_INLINE_
uint64_t
_atomic_decrement_impl
(
volatile
uint64_t
*
pw
)
{
...
@@ -104,9 +105,8 @@ _ALWAYS_INLINE_ uint64_t _atomic_add_impl(volatile uint64_t *pw, volatile uint64
...
@@ -104,9 +105,8 @@ _ALWAYS_INLINE_ uint64_t _atomic_add_impl(volatile uint64_t *pw, volatile uint64
return
InterlockedAdd64
((
LONGLONG
volatile
*
)
pw
,
val
);
return
InterlockedAdd64
((
LONGLONG
volatile
*
)
pw
,
val
);
}
}
_ALWAYS_INLINE_
uint64_t
_atomic_exchange_if_greater_impl
(
volatile
uint64_t
*
pw
,
volatile
uint64_t
val
){
_ALWAYS_INLINE_
uint64_t
_atomic_exchange_if_greater_impl
(
volatile
uint64_t
*
pw
,
volatile
uint64_t
val
)
{
ATOMIC_EXCHANGE_IF_GREATER_BODY
(
pw
,
val
,
LONGLONG
,
InterlockedCompareExchange64
,
uint64_t
);
ATOMIC_EXCHANGE_IF_GREATER_BODY
(
pw
,
val
,
LONGLONG
,
InterlockedCompareExchange64
,
uint64_t
)
}
}
// The actual advertised functions; they'll call the right implementation
// The actual advertised functions; they'll call the right implementation
...
...
modules/bullet/rigid_body_bullet.cpp
View file @
dee8f8db
...
@@ -445,11 +445,6 @@ void RigidBodyBullet::assert_no_constraints() {
...
@@ -445,11 +445,6 @@ void RigidBodyBullet::assert_no_constraints() {
if
(
btBody
->
getNumConstraintRefs
())
{
if
(
btBody
->
getNumConstraintRefs
())
{
WARN_PRINT
(
"A body with a joints is destroyed. Please check the implementation in order to destroy the joint before the body."
);
WARN_PRINT
(
"A body with a joints is destroyed. Please check the implementation in order to destroy the joint before the body."
);
}
}
/*for(int i = btBody->getNumConstraintRefs()-1; 0<=i; --i){
btTypedConstraint* btConst = btBody->getConstraintRef(i);
JointBullet* joint = static_cast<JointBullet*>( btConst->getUserConstraintPtr() );
space->removeConstraint(joint);
}*/
}
}
void
RigidBodyBullet
::
set_activation_state
(
bool
p_active
)
{
void
RigidBodyBullet
::
set_activation_state
(
bool
p_active
)
{
...
...
modules/camera/camera_win.cpp
View file @
dee8f8db
...
@@ -53,9 +53,9 @@ public:
...
@@ -53,9 +53,9 @@ public:
void
deactivate_feed
();
void
deactivate_feed
();
};
};
CameraFeedWindows
::
CameraFeedWindows
(){
CameraFeedWindows
::
CameraFeedWindows
()
{
///@TODO implement this, should store information about our available camera
///@TODO implement this, should store information about our available camera
}
;
}
CameraFeedWindows
::~
CameraFeedWindows
()
{
CameraFeedWindows
::~
CameraFeedWindows
()
{
// make sure we stop recording if we are!
// make sure we stop recording if we are!
...
@@ -75,16 +75,16 @@ bool CameraFeedWindows::activate_feed() {
...
@@ -75,16 +75,16 @@ bool CameraFeedWindows::activate_feed() {
///@TODO we should probably have a callback method here that is being called by the
///@TODO we should probably have a callback method here that is being called by the
// camera API which provides frames and call back into the CameraServer to update our texture
// camera API which provides frames and call back into the CameraServer to update our texture
void
CameraFeedWindows
::
deactivate_feed
(){
void
CameraFeedWindows
::
deactivate_feed
()
{
///@TODO this should deactivate our camera and stop the process of capturing frames
///@TODO this should deactivate our camera and stop the process of capturing frames
}
;
}
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// CameraWindows - Subclass for our camera server on windows
// CameraWindows - Subclass for our camera server on windows
void
CameraWindows
::
add_active_cameras
(){
void
CameraWindows
::
add_active_cameras
()
{
///@TODO scan through any active cameras and create CameraFeedWindows objects for them
///@TODO scan through any active cameras and create CameraFeedWindows objects for them
}
;
}
CameraWindows
::
CameraWindows
()
{
CameraWindows
::
CameraWindows
()
{
// Find cameras active right now
// Find cameras active right now
...
@@ -92,7 +92,3 @@ CameraWindows::CameraWindows() {
...
@@ -92,7 +92,3 @@ CameraWindows::CameraWindows() {
// need to add something that will react to devices being connected/removed...
// need to add something that will react to devices being connected/removed...
};
};
CameraWindows
::~
CameraWindows
(){
};
modules/camera/camera_win.h
View file @
dee8f8db
...
@@ -40,7 +40,7 @@ private:
...
@@ -40,7 +40,7 @@ private:
public
:
public
:
CameraWindows
();
CameraWindows
();
~
CameraWindows
()
;
~
CameraWindows
()
{}
};
};
#endif
/* CAMERAWIN_H */
#endif
/* CAMERAWIN_H */
modules/gdnavigation/nav_map.cpp
View file @
dee8f8db
...
@@ -299,7 +299,6 @@ Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p
...
@@ -299,7 +299,6 @@ Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p
left
=
p
->
poly
->
points
[
prev
].
pos
;
left
=
p
->
poly
->
points
[
prev
].
pos
;
right
=
p
->
poly
->
points
[
prev_n
].
pos
;
right
=
p
->
poly
->
points
[
prev_n
].
pos
;
//if (CLOCK_TANGENT(apex_point,left,(left+right)*0.5).dot(up) < 0){
if
(
p
->
poly
->
clockwise
)
{
if
(
p
->
poly
->
clockwise
)
{
SWAP
(
left
,
right
);
SWAP
(
left
,
right
);
}
}
...
...
modules/mobile_vr/mobile_vr_interface.cpp
View file @
dee8f8db
...
@@ -448,12 +448,6 @@ void MobileVRInterface::process() {
...
@@ -448,12 +448,6 @@ void MobileVRInterface::process() {
};
};
};
};
void
MobileVRInterface
::
notification
(
int
p_what
){
_THREAD_SAFE_METHOD_
// nothing to do here, I guess we could pauze our sensors...
}
MobileVRInterface
::
MobileVRInterface
()
{
MobileVRInterface
::
MobileVRInterface
()
{
initialized
=
false
;
initialized
=
false
;
...
...
modules/mobile_vr/mobile_vr_interface.h
View file @
dee8f8db
...
@@ -142,7 +142,7 @@ public:
...
@@ -142,7 +142,7 @@ public:
virtual
void
commit_for_eye
(
XRInterface
::
Eyes
p_eye
,
RID
p_render_target
,
const
Rect2
&
p_screen_rect
);
virtual
void
commit_for_eye
(
XRInterface
::
Eyes
p_eye
,
RID
p_render_target
,
const
Rect2
&
p_screen_rect
);
virtual
void
process
();
virtual
void
process
();
virtual
void
notification
(
int
p_what
)
;
virtual
void
notification
(
int
p_what
)
{}
MobileVRInterface
();
MobileVRInterface
();
~
MobileVRInterface
();
~
MobileVRInterface
();
...
...
modules/theora/video_stream_theora.cpp
View file @
dee8f8db
...
@@ -581,9 +581,8 @@ bool VideoStreamPlaybackTheora::is_paused() const {
...
@@ -581,9 +581,8 @@ bool VideoStreamPlaybackTheora::is_paused() const {
return
paused
;
return
paused
;
};
};
void
VideoStreamPlaybackTheora
::
set_loop
(
bool
p_enable
){
void
VideoStreamPlaybackTheora
::
set_loop
(
bool
p_enable
)
{
}
};
bool
VideoStreamPlaybackTheora
::
has_loop
()
const
{
bool
VideoStreamPlaybackTheora
::
has_loop
()
const
{
return
false
;
return
false
;
...
@@ -605,10 +604,8 @@ float VideoStreamPlaybackTheora::get_playback_position() const {
...
@@ -605,10 +604,8 @@ float VideoStreamPlaybackTheora::get_playback_position() const {
return
get_time
();
return
get_time
();
};
};
void
VideoStreamPlaybackTheora
::
seek
(
float
p_time
){
void
VideoStreamPlaybackTheora
::
seek
(
float
p_time
)
{
}
// no
};
void
VideoStreamPlaybackTheora
::
set_mix_callback
(
AudioMixCallback
p_callback
,
void
*
p_userdata
)
{
void
VideoStreamPlaybackTheora
::
set_mix_callback
(
AudioMixCallback
p_callback
,
void
*
p_userdata
)
{
mix_callback
=
p_callback
;
mix_callback
=
p_callback
;
...
...
platform/android/java/plugins/godotpayment/src/main/java/org/godotengine/godot/plugin/payment/PurchaseTask.java
View file @
dee8f8db
...
@@ -56,7 +56,7 @@ abstract public class PurchaseTask {
...
@@ -56,7 +56,7 @@ abstract public class PurchaseTask {
PaymentsCache
pc
=
new
PaymentsCache
(
context
);
PaymentsCache
pc
=
new
PaymentsCache
(
context
);
Boolean
isBlocked
=
pc
.
getConsumableFlag
(
"block"
,
sku
);
Boolean
isBlocked
=
pc
.
getConsumableFlag
(
"block"
,
sku
);
/*
/*
if(isBlocked){
if(isBlocked)
{
Log.d("XXX", "Is awaiting payment confirmation");
Log.d("XXX", "Is awaiting payment confirmation");
error("Awaiting payment confirmation");
error("Awaiting payment confirmation");
return;
return;
...
...
platform/uwp/thread_uwp.cpp
View file @
dee8f8db
...
@@ -59,11 +59,3 @@ void ThreadUWP::make_default() {
...
@@ -59,11 +59,3 @@ void ThreadUWP::make_default() {
get_thread_id_func
=
get_thread_id_func_uwp
;
get_thread_id_func
=
get_thread_id_func_uwp
;
wait_to_finish_func
=
wait_to_finish_func_uwp
;
wait_to_finish_func
=
wait_to_finish_func_uwp
;
};
};
ThreadUWP
::
ThreadUWP
(){
};
ThreadUWP
::~
ThreadUWP
(){
};
platform/uwp/thread_uwp.h
View file @
dee8f8db
...
@@ -44,16 +44,16 @@ class ThreadUWP : public Thread {
...
@@ -44,16 +44,16 @@ class ThreadUWP : public Thread {
static
ID
get_thread_id_func_uwp
();
static
ID
get_thread_id_func_uwp
();
static
void
wait_to_finish_func_uwp
(
Thread
*
p_thread
);
static
void
wait_to_finish_func_uwp
(
Thread
*
p_thread
);
ThreadUWP
()
;
ThreadUWP
()
{}
public
:
public
:
virtual
ID
get_id
()
const
;
virtual
ID
get_id
()
const
;
static
void
make_default
();
static
void
make_default
();
~
ThreadUWP
()
;
~
ThreadUWP
()
{}
};
};
#endif
#endif
// UWP_ENABLED
#endif
#endif
// THREAD_UWP_H
scene/3d/proximity_group_3d.cpp
View file @
dee8f8db
...
@@ -179,14 +179,5 @@ void ProximityGroup3D::_bind_methods() {
...
@@ -179,14 +179,5 @@ void ProximityGroup3D::_bind_methods() {
};
};
ProximityGroup3D
::
ProximityGroup3D
()
{
ProximityGroup3D
::
ProximityGroup3D
()
{
group_version
=
0
;
dispatch_mode
=
MODE_PROXY
;
cell_size
=
1.0
;
grid_radius
=
Vector3
(
1
,
1
,
1
);
set_notify_transform
(
true
);
set_notify_transform
(
true
);
};
};
ProximityGroup3D
::~
ProximityGroup3D
(){
};
scene/3d/proximity_group_3d.h
View file @
dee8f8db
...
@@ -49,14 +49,14 @@ public:
...
@@ -49,14 +49,14 @@ public:
void
_notification
(
int
p_what
);
void
_notification
(
int
p_what
);
DispatchMode
dispatch_mode
;
DispatchMode
dispatch_mode
=
MODE_PROXY
;
Map
<
StringName
,
uint32_t
>
groups
;
Map
<
StringName
,
uint32_t
>
groups
;
String
group_name
;
String
group_name
;
float
cell_size
;
float
cell_size
=
1
.
0
;
Vector3
grid_radius
;
Vector3
grid_radius
=
Vector3
(
1
,
1
,
1
)
;
uint32_t
group_version
;
uint32_t
group_version
=
0
;
void
add_groups
(
int
*
p_cell
,
String
p_base
,
int
p_depth
);
void
add_groups
(
int
*
p_cell
,
String
p_base
,
int
p_depth
);
void
_new_group
(
StringName
p_name
);
void
_new_group
(
StringName
p_name
);
...
@@ -78,7 +78,7 @@ public:
...
@@ -78,7 +78,7 @@ public:
void
broadcast
(
String
p_name
,
Variant
p_params
);
void
broadcast
(
String
p_name
,
Variant
p_params
);
ProximityGroup3D
();
ProximityGroup3D
();
~
ProximityGroup3D
()
;
~
ProximityGroup3D
()
{}
};
};
VARIANT_ENUM_CAST
(
ProximityGroup3D
::
DispatchMode
);
VARIANT_ENUM_CAST
(
ProximityGroup3D
::
DispatchMode
);
...
...
scene/3d/xr_nodes.cpp
View file @
dee8f8db
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
/*************************************************************************/
/*************************************************************************/
#include "xr_nodes.h"
#include "xr_nodes.h"
#include "core/input/input.h"
#include "core/input/input.h"
#include "servers/xr/xr_interface.h"
#include "servers/xr/xr_interface.h"
#include "servers/xr_server.h"
#include "servers/xr_server.h"
...
@@ -168,14 +169,6 @@ Vector<Plane> XRCamera3D::get_frustum() const {
...
@@ -168,14 +169,6 @@ Vector<Plane> XRCamera3D::get_frustum() const {
return
cm
.
get_projection_planes
(
get_camera_transform
());
return
cm
.
get_projection_planes
(
get_camera_transform
());
};
};
XRCamera3D
::
XRCamera3D
(){
// nothing to do here yet for now..
};
XRCamera3D
::~
XRCamera3D
(){
// nothing to do here yet for now..
};
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
void
XRController3D
::
_notification
(
int
p_what
)
{
void
XRController3D
::
_notification
(
int
p_what
)
{
...
@@ -382,16 +375,6 @@ String XRController3D::get_configuration_warning() const {
...
@@ -382,16 +375,6 @@ String XRController3D::get_configuration_warning() const {
return
String
();
return
String
();
};
};
XRController3D
::
XRController3D
()
{
controller_id
=
1
;
is_active
=
true
;
button_states
=
0
;
};
XRController3D
::~
XRController3D
(){
// nothing to do here yet for now..
};
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
void
XRAnchor3D
::
_notification
(
int
p_what
)
{
void
XRAnchor3D
::
_notification
(
int
p_what
)
{
...
@@ -522,15 +505,6 @@ Ref<Mesh> XRAnchor3D::get_mesh() const {
...
@@ -522,15 +505,6 @@ Ref<Mesh> XRAnchor3D::get_mesh() const {
return
mesh
;
return
mesh
;
}
}
XRAnchor3D
::
XRAnchor3D
()
{
anchor_id
=
1
;
is_active
=
true
;
};
XRAnchor3D
::~
XRAnchor3D
(){
// nothing to do here yet for now..
};
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
String
XROrigin3D
::
get_configuration_warning
()
const
{
String
XROrigin3D
::
get_configuration_warning
()
const
{
...
@@ -615,11 +589,3 @@ void XROrigin3D::_notification(int p_what) {
...
@@ -615,11 +589,3 @@ void XROrigin3D::_notification(int p_what) {
}
}
}
}
};
};
XROrigin3D
::
XROrigin3D
()
{
tracked_camera
=
nullptr
;
};
XROrigin3D
::~
XROrigin3D
(){
// nothing to do here yet for now..
};
scene/3d/xr_nodes.h
View file @
dee8f8db
...
@@ -57,8 +57,8 @@ public:
...
@@ -57,8 +57,8 @@ public:
virtual
Vector3
project_position
(
const
Point2
&
p_point
,
float
p_z_depth
)
const
;
virtual
Vector3
project_position
(
const
Point2
&
p_point
,
float
p_z_depth
)
const
;
virtual
Vector
<
Plane
>
get_frustum
()
const
;
virtual
Vector
<
Plane
>
get_frustum
()
const
;
XRCamera3D
()
;
XRCamera3D
()
{}
~
XRCamera3D
()
;
~
XRCamera3D
()
{}
};
};
/*
/*
...
@@ -71,9 +71,9 @@ class XRController3D : public Node3D {
...
@@ -71,9 +71,9 @@ class XRController3D : public Node3D {
GDCLASS
(
XRController3D
,
Node3D
);
GDCLASS
(
XRController3D
,
Node3D
);
private
:
private
:
int
controller_id
;
int
controller_id
=
1
;
bool
is_active
;
bool
is_active
=
true
;
int
button_states
;
int
button_states
=
0
;
Ref
<
Mesh
>
mesh
;
Ref
<
Mesh
>
mesh
;
protected
:
protected
:
...
@@ -99,8 +99,8 @@ public:
...
@@ -99,8 +99,8 @@ public:
String
get_configuration_warning
()
const
;
String
get_configuration_warning
()
const
;
XRController3D
()
;
XRController3D
()
{}
~
XRController3D
()
;
~
XRController3D
()
{}
};
};
/*
/*
...
@@ -112,8 +112,8 @@ class XRAnchor3D : public Node3D {
...
@@ -112,8 +112,8 @@ class XRAnchor3D : public Node3D {
GDCLASS
(
XRAnchor3D
,
Node3D
);
GDCLASS
(
XRAnchor3D
,
Node3D
);
private
:
private
:
int
anchor_id
;
int
anchor_id
=
1
;
bool
is_active
;
bool
is_active
=
true
;
Vector3
size
;
Vector3
size
;
Ref
<
Mesh
>
mesh
;
Ref
<
Mesh
>
mesh
;
...
@@ -135,8 +135,8 @@ public:
...
@@ -135,8 +135,8 @@ public:
String
get_configuration_warning
()
const
;
String
get_configuration_warning
()
const
;
XRAnchor3D
()
;
XRAnchor3D
()
{}
~
XRAnchor3D
()
;
~
XRAnchor3D
()
{}
};
};
/*
/*
...
@@ -151,7 +151,7 @@ class XROrigin3D : public Node3D {
...
@@ -151,7 +151,7 @@ class XROrigin3D : public Node3D {
GDCLASS
(
XROrigin3D
,
Node3D
);
GDCLASS
(
XROrigin3D
,
Node3D
);
private
:
private
:
XRCamera3D
*
tracked_camera
;
XRCamera3D
*
tracked_camera
=
nullptr
;
protected
:
protected
:
void
_notification
(
int
p_what
);
void
_notification
(
int
p_what
);
...
@@ -166,8 +166,8 @@ public:
...
@@ -166,8 +166,8 @@ public:
float
get_world_scale
()
const
;
float
get_world_scale
()
const
;
void
set_world_scale
(
float
p_world_scale
);
void
set_world_scale
(
float
p_world_scale
);
XROrigin3D
()
;
XROrigin3D
()
{}
~
XROrigin3D
()
;
~
XROrigin3D
()
{}
};
};
#endif
/* XR_NODES_H */
#endif
/* XR_NODES_H */
servers/audio/audio_driver_dummy.cpp
View file @
dee8f8db
...
@@ -114,11 +114,3 @@ void AudioDriverDummy::finish() {
...
@@ -114,11 +114,3 @@ void AudioDriverDummy::finish() {
memdelete
(
thread
);
memdelete
(
thread
);
thread
=
nullptr
;
thread
=
nullptr
;
};
};
AudioDriverDummy
::
AudioDriverDummy
()
{
thread
=
nullptr
;
};
AudioDriverDummy
::~
AudioDriverDummy
(){
};
servers/audio/audio_driver_dummy.h
View file @
dee8f8db
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#include "core/os/thread.h"
#include "core/os/thread.h"
class
AudioDriverDummy
:
public
AudioDriver
{
class
AudioDriverDummy
:
public
AudioDriver
{
Thread
*
thread
;
Thread
*
thread
=
nullptr
;
Mutex
mutex
;
Mutex
mutex
;
int32_t
*
samples_in
;
int32_t
*
samples_in
;
...
@@ -67,8 +67,8 @@ public:
...
@@ -67,8 +67,8 @@ public:
virtual
void
unlock
();
virtual
void
unlock
();
virtual
void
finish
();
virtual
void
finish
();
AudioDriverDummy
()
;
AudioDriverDummy
()
{}
~
AudioDriverDummy
()
;
~
AudioDriverDummy
()
{}
};
};
#endif
#endif
servers/physics_2d/physics_server_2d_sw.cpp
View file @
dee8f8db
...
@@ -1344,7 +1344,3 @@ PhysicsServer2DSW::PhysicsServer2DSW() {
...
@@ -1344,7 +1344,3 @@ PhysicsServer2DSW::PhysicsServer2DSW() {
using_threads
=
int
(
ProjectSettings
::
get_singleton
()
->
get
(
"physics/2d/thread_model"
))
==
2
;
using_threads
=
int
(
ProjectSettings
::
get_singleton
()
->
get
(
"physics/2d/thread_model"
))
==
2
;
flushing_queries
=
false
;
flushing_queries
=
false
;
};
};
PhysicsServer2DSW
::~
PhysicsServer2DSW
(){
};
servers/physics_2d/physics_server_2d_sw.h
View file @
dee8f8db
...
@@ -288,7 +288,7 @@ public:
...
@@ -288,7 +288,7 @@ public:
int
get_process_info
(
ProcessInfo
p_info
);
int
get_process_info
(
ProcessInfo
p_info
);
PhysicsServer2DSW
();
PhysicsServer2DSW
();
~
PhysicsServer2DSW
()
;
~
PhysicsServer2DSW
()
{}
};
};
#endif
#endif
servers/physics_3d/physics_server_3d_sw.cpp
View file @
dee8f8db
...
@@ -1320,10 +1320,6 @@ void PhysicsServer3DSW::step(real_t p_step) {
...
@@ -1320,10 +1320,6 @@ void PhysicsServer3DSW::step(real_t p_step) {
#endif
#endif
}
}
void
PhysicsServer3DSW
::
sync
(){
};
void
PhysicsServer3DSW
::
flush_queries
()
{
void
PhysicsServer3DSW
::
flush_queries
()
{
#ifndef _3D_DISABLED
#ifndef _3D_DISABLED
...
@@ -1451,7 +1447,3 @@ PhysicsServer3DSW::PhysicsServer3DSW() {
...
@@ -1451,7 +1447,3 @@ PhysicsServer3DSW::PhysicsServer3DSW() {
active
=
true
;
active
=
true
;
flushing_queries
=
false
;
flushing_queries
=
false
;
};
};
PhysicsServer3DSW
::~
PhysicsServer3DSW
(){
};
servers/physics_3d/physics_server_3d_sw.h
View file @
dee8f8db
...
@@ -365,7 +365,7 @@ public:
...
@@ -365,7 +365,7 @@ public:
virtual
void
set_active
(
bool
p_active
);
virtual
void
set_active
(
bool
p_active
);
virtual
void
init
();
virtual
void
init
();
virtual
void
step
(
real_t
p_step
);
virtual
void
step
(
real_t
p_step
);
virtual
void
sync
()
;
virtual
void
sync
()
{}
virtual
void
flush_queries
();
virtual
void
flush_queries
();
virtual
void
finish
();
virtual
void
finish
();
...
@@ -374,7 +374,7 @@ public:
...
@@ -374,7 +374,7 @@ public:
int
get_process_info
(
ProcessInfo
p_info
);
int
get_process_info
(
ProcessInfo
p_info
);
PhysicsServer3DSW
();
PhysicsServer3DSW
();
~
PhysicsServer3DSW
()
;
~
PhysicsServer3DSW
()
{}
};
};
#endif
#endif
servers/xr/xr_interface.cpp
View file @
dee8f8db
...
@@ -134,9 +134,9 @@ bool XRInterface::get_anchor_detection_is_enabled() const {
...
@@ -134,9 +134,9 @@ bool XRInterface::get_anchor_detection_is_enabled() const {
return
false
;
return
false
;
};
};
void
XRInterface
::
set_anchor_detection_is_enabled
(
bool
p_enable
){
void
XRInterface
::
set_anchor_detection_is_enabled
(
bool
p_enable
)
{
// don't do anything here, this needs to be implemented on AR interface to enable/disable things like plane detection etc.
// don't do anything here, this needs to be implemented on AR interface to enable/disable things like plane detection etc.
}
;
}
int
XRInterface
::
get_camera_feed_id
()
{
int
XRInterface
::
get_camera_feed_id
()
{
// don't do anything here, this needs to be implemented on AR interface to enable/disable things like plane detection etc.
// don't do anything here, this needs to be implemented on AR interface to enable/disable things like plane detection etc.
...
...
servers/xr/xr_positional_tracker.cpp
View file @
dee8f8db
...
@@ -232,7 +232,3 @@ XRPositionalTracker::XRPositionalTracker() {
...
@@ -232,7 +232,3 @@ XRPositionalTracker::XRPositionalTracker() {
hand
=
TRACKER_HAND_UNKNOWN
;
hand
=
TRACKER_HAND_UNKNOWN
;
rumble
=
0.0
;
rumble
=
0.0
;
};
};
XRPositionalTracker
::~
XRPositionalTracker
(){
};
servers/xr/xr_positional_tracker.h
View file @
dee8f8db
...
@@ -96,7 +96,7 @@ public:
...
@@ -96,7 +96,7 @@ public:
Transform
get_transform
(
bool
p_adjust_by_reference_frame
)
const
;
Transform
get_transform
(
bool
p_adjust_by_reference_frame
)
const
;
XRPositionalTracker
();
XRPositionalTracker
();
~
XRPositionalTracker
()
;
~
XRPositionalTracker
()
{}
};
};
VARIANT_ENUM_CAST
(
XRPositionalTracker
::
TrackerHand
);
VARIANT_ENUM_CAST
(
XRPositionalTracker
::
TrackerHand
);
...
...
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