GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.2

Browse Source 
# Conflicts:
#	Source/Engine/Platform/Network.h
This commit is contained in:
Wojtek Figat
2021-03-22 11:26:36 +01:00
parent de02131d0a 39a6d0d292
commit 40c537d114
116 changed files with 1782 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Audio/AudioListener.cpp
View File

@@ -63,7 +63,7 @@ void AudioListener::OnTransformChanged()
// Base
Actor::OnTransformChanged();
_box = BoundingBox(_transform.Translation, _transform.Translation);
_box = BoundingBox(_transform.Translation);
_sphere = BoundingSphere(_transform.Translation, 0.0f);
if (IsActiveInHierarchy())

2
Source/Engine/Audio/AudioSource.cpp
View File

@@ -461,7 +461,7 @@ void AudioSource::OnTransformChanged()
// Base
Actor::OnTransformChanged();
_box = BoundingBox(_transform.Translation, _transform.Translation);
_box = BoundingBox(_transform.Translation);
_sphere = BoundingSphere(_transform.Translation, 0.0f);
if (IsActiveInHierarchy() && SourceIDs.HasItems())