Fix various build issuesin uncommon configurations
This commit is contained in:
@@ -265,7 +265,7 @@ bool DeployDataStep::Perform(CookingData& data)
|
|||||||
}
|
}
|
||||||
if (version.IsEmpty())
|
if (version.IsEmpty())
|
||||||
{
|
{
|
||||||
data.Error(String::Format(TEXT("Failed to find supported .NET {} version (min {}) for the current host platform."), maxVer, minVer));
|
data.Error(String::Format(TEXT("Failed to find supported .NET {} version (min {}) for {} platform."), maxVer, minVer, platformName));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -194,7 +194,6 @@ void Collider::UpdateLayerBits()
|
|||||||
// Own layer mask
|
// Own layer mask
|
||||||
const uint32 mask1 = Physics::LayerMasks[GetLayer()];
|
const uint32 mask1 = Physics::LayerMasks[GetLayer()];
|
||||||
|
|
||||||
ASSERT(_shape);
|
|
||||||
PhysicsBackend::SetShapeFilterMask(_shape, mask0, mask1);
|
PhysicsBackend::SetShapeFilterMask(_shape, mask0, mask1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
#if COMPILE_WITH_EMPTY_PHYSICS
|
#if COMPILE_WITH_EMPTY_PHYSICS
|
||||||
|
|
||||||
#include "Engine/Core/Log.h"
|
#include "Engine/Core/Log.h"
|
||||||
|
#include "Engine/Physics/PhysicsBackend.h"
|
||||||
#include "Engine/Physics/CollisionData.h"
|
#include "Engine/Physics/CollisionData.h"
|
||||||
#include "Engine/Physics/PhysicalMaterial.h"
|
#include "Engine/Physics/PhysicalMaterial.h"
|
||||||
#include "Engine/Physics/PhysicsScene.h"
|
#include "Engine/Physics/PhysicsScene.h"
|
||||||
@@ -226,26 +227,6 @@ bool PhysicsBackend::CheckConvex(void* scene, const Vector3& center, const Colli
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PhysicsBackend::OverlapBox(void* scene, const Vector3& center, const Vector3& halfExtents, Array<Collider*>& results, const Quaternion& rotation, uint32 layerMask, bool hitTriggers)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PhysicsBackend::OverlapSphere(void* scene, const Vector3& center, const float radius, Array<Collider*>& results, uint32 layerMask, bool hitTriggers)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PhysicsBackend::OverlapCapsule(void* scene, const Vector3& center, const float radius, const float height, Array<Collider*>& results, const Quaternion& rotation, uint32 layerMask, bool hitTriggers)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PhysicsBackend::OverlapConvex(void* scene, const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, Array<Collider*>& results, const Quaternion& rotation, uint32 layerMask, bool hitTriggers)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PhysicsBackend::OverlapBox(void* scene, const Vector3& center, const Vector3& halfExtents, Array<PhysicsColliderActor*>& results, const Quaternion& rotation, uint32 layerMask, bool hitTriggers)
|
bool PhysicsBackend::OverlapBox(void* scene, const Vector3& center, const Vector3& halfExtents, Array<PhysicsColliderActor*>& results, const Quaternion& rotation, uint32 layerMask, bool hitTriggers)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
@@ -353,7 +334,7 @@ Vector3 PhysicsBackend::GetRigidDynamicActorCenterOfMass(void* actor)
|
|||||||
return Vector3::Zero;
|
return Vector3::Zero;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PhysicsBackend::SetRigidDynamicActorCenterOfMassOffset(void* actor, const Float3& value)
|
void PhysicsBackend::AddRigidDynamicActorCenterOfMassOffset(void* actor, const Float3& value)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -698,6 +679,15 @@ void PhysicsBackend::SetControllerStepOffset(void* controller, float value)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Vector3 PhysicsBackend::GetControllerBasePosition(void* controller)
|
||||||
|
{
|
||||||
|
return Vector3::Zero;
|
||||||
|
}
|
||||||
|
|
||||||
|
void PhysicsBackend::SetControllerBasePosition(void* controller, const Vector3& value)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
Vector3 PhysicsBackend::GetControllerUpDirection(void* controller)
|
Vector3 PhysicsBackend::GetControllerUpDirection(void* controller)
|
||||||
{
|
{
|
||||||
return Vector3::Up;
|
return Vector3::Up;
|
||||||
|
|||||||
@@ -23,6 +23,10 @@ private:
|
|||||||
StringAnsiView _fullname;
|
StringAnsiView _fullname;
|
||||||
uint32 _types = 0;
|
uint32 _types = 0;
|
||||||
mutable uint32 _size = 0;
|
mutable uint32 _size = 0;
|
||||||
|
#else
|
||||||
|
StringAnsiView _name;
|
||||||
|
StringAnsiView _namespace;
|
||||||
|
StringAnsiView _fullname;
|
||||||
#endif
|
#endif
|
||||||
MAssembly* _assembly;
|
MAssembly* _assembly;
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ protected:
|
|||||||
#elif USE_NETCORE
|
#elif USE_NETCORE
|
||||||
void* _handle;
|
void* _handle;
|
||||||
StringAnsiView _name;
|
StringAnsiView _name;
|
||||||
|
#else
|
||||||
|
StringAnsiView _name;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
mutable MMethod* _addMethod;
|
mutable MMethod* _addMethod;
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ protected:
|
|||||||
void* _type;
|
void* _type;
|
||||||
int32 _fieldOffset;
|
int32 _fieldOffset;
|
||||||
StringAnsiView _name;
|
StringAnsiView _name;
|
||||||
|
#else
|
||||||
|
StringAnsiView _name;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MClass* _parentClass;
|
MClass* _parentClass;
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ protected:
|
|||||||
mutable void* _returnType;
|
mutable void* _returnType;
|
||||||
mutable Array<void*, InlinedAllocation<8>> _parameterTypes;
|
mutable Array<void*, InlinedAllocation<8>> _parameterTypes;
|
||||||
void CacheSignature() const;
|
void CacheSignature() const;
|
||||||
|
#else
|
||||||
|
StringAnsiView _name;
|
||||||
#endif
|
#endif
|
||||||
MClass* _parentClass;
|
MClass* _parentClass;
|
||||||
MVisibility _visibility;
|
MVisibility _visibility;
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ protected:
|
|||||||
#elif USE_NETCORE
|
#elif USE_NETCORE
|
||||||
void* _handle;
|
void* _handle;
|
||||||
StringAnsiView _name;
|
StringAnsiView _name;
|
||||||
|
#else
|
||||||
|
StringAnsiView _name;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
mutable MMethod* _getMethod;
|
mutable MMethod* _getMethod;
|
||||||
|
|||||||
@@ -93,6 +93,8 @@ ScriptingObject::ScriptingObject(const SpawnParams& params)
|
|||||||
: _gcHandle((MGCHandle)params.Managed)
|
: _gcHandle((MGCHandle)params.Managed)
|
||||||
#elif !COMPILE_WITHOUT_CSHARP
|
#elif !COMPILE_WITHOUT_CSHARP
|
||||||
: _gcHandle(params.Managed ? MCore::GCHandle::New(params.Managed) : 0)
|
: _gcHandle(params.Managed ? MCore::GCHandle::New(params.Managed) : 0)
|
||||||
|
#else
|
||||||
|
: _gcHandle(0)
|
||||||
#endif
|
#endif
|
||||||
, _type(params.Type)
|
, _type(params.Type)
|
||||||
, _id(params.ID)
|
, _id(params.ID)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#include "Engine/Core/RandomStream.h"
|
#include "Engine/Core/RandomStream.h"
|
||||||
#include "Engine/Core/Math/Vector3.h"
|
#include "Engine/Core/Math/Vector3.h"
|
||||||
#include "Engine/Core/Math/Ray.h"
|
#include "Engine/Core/Math/Ray.h"
|
||||||
|
#include "Engine/Core/Utilities.h"
|
||||||
#include "Engine/Platform/ConditionVariable.h"
|
#include "Engine/Platform/ConditionVariable.h"
|
||||||
#include "Engine/Profiler/Profiler.h"
|
#include "Engine/Profiler/Profiler.h"
|
||||||
#include "Engine/Threading/JobSystem.h"
|
#include "Engine/Threading/JobSystem.h"
|
||||||
@@ -27,7 +28,6 @@
|
|||||||
#include "Engine/Serialization/MemoryWriteStream.h"
|
#include "Engine/Serialization/MemoryWriteStream.h"
|
||||||
#include "Engine/Engine/Units.h"
|
#include "Engine/Engine/Units.h"
|
||||||
#if USE_EDITOR
|
#if USE_EDITOR
|
||||||
#include "Engine/Core/Utilities.h"
|
|
||||||
#include "Engine/Core/Types/StringView.h"
|
#include "Engine/Core/Types/StringView.h"
|
||||||
#include "Engine/Core/Types/DateTime.h"
|
#include "Engine/Core/Types/DateTime.h"
|
||||||
#include "Engine/Core/Types/TimeSpan.h"
|
#include "Engine/Core/Types/TimeSpan.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user