feat: updated engine version to 4.4-rc1
This commit is contained in:
Sara
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
81
engine/modules/jolt_physics/misc/jolt_stream_wrappers.h
Normal file
81
engine/modules/jolt_physics/misc/jolt_stream_wrappers.h
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
/**************************************************************************/
|
||||
/* jolt_stream_wrappers.h */
|
||||
/**************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
/* https://godotengine.org */
|
||||
/**************************************************************************/
|
||||
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
|
||||
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
|
||||
/* */
|
||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
||||
/* a copy of this software and associated documentation files (the */
|
||||
/* "Software"), to deal in the Software without restriction, including */
|
||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
||||
/* the following conditions: */
|
||||
/* */
|
||||
/* The above copyright notice and this permission notice shall be */
|
||||
/* included in all copies or substantial portions of the Software. */
|
||||
/* */
|
||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
|
||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef JOLT_STREAM_WRAPPERS_H
|
||||
#define JOLT_STREAM_WRAPPERS_H
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
|
||||
#include "core/io/file_access.h"
|
||||
|
||||
#include "Jolt/Jolt.h"
|
||||
|
||||
#include "Jolt/Core/StreamIn.h"
|
||||
#include "Jolt/Core/StreamOut.h"
|
||||
|
||||
class JoltStreamOutputWrapper final : public JPH::StreamOut {
|
||||
Ref<FileAccess> file_access;
|
||||
|
||||
public:
|
||||
explicit JoltStreamOutputWrapper(const Ref<FileAccess> &p_file_access) :
|
||||
file_access(p_file_access) {}
|
||||
|
||||
virtual void WriteBytes(const void *p_data, size_t p_bytes) override {
|
||||
file_access->store_buffer(static_cast<const uint8_t *>(p_data), static_cast<uint64_t>(p_bytes));
|
||||
}
|
||||
|
||||
virtual bool IsFailed() const override {
|
||||
return file_access->get_error() != OK;
|
||||
}
|
||||
};
|
||||
|
||||
class JoltStreamInputWrapper final : public JPH::StreamIn {
|
||||
Ref<FileAccess> file_access;
|
||||
|
||||
public:
|
||||
explicit JoltStreamInputWrapper(const Ref<FileAccess> &p_file_access) :
|
||||
file_access(p_file_access) {}
|
||||
|
||||
virtual void ReadBytes(void *p_data, size_t p_bytes) override {
|
||||
file_access->get_buffer(static_cast<uint8_t *>(p_data), static_cast<uint64_t>(p_bytes));
|
||||
}
|
||||
|
||||
virtual bool IsEOF() const override {
|
||||
return file_access->eof_reached();
|
||||
}
|
||||
|
||||
virtual bool IsFailed() const override {
|
||||
return file_access->get_error() != OK;
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif // JOLT_STREAM_WRAPPERS_H
|
||||
147
engine/modules/jolt_physics/misc/jolt_type_conversions.h
Normal file
147
engine/modules/jolt_physics/misc/jolt_type_conversions.h
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
/**************************************************************************/
|
||||
/* jolt_type_conversions.h */
|
||||
/**************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
/* https://godotengine.org */
|
||||
/**************************************************************************/
|
||||
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
|
||||
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
|
||||
/* */
|
||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
||||
/* a copy of this software and associated documentation files (the */
|
||||
/* "Software"), to deal in the Software without restriction, including */
|
||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
||||
/* the following conditions: */
|
||||
/* */
|
||||
/* The above copyright notice and this permission notice shall be */
|
||||
/* included in all copies or substantial portions of the Software. */
|
||||
/* */
|
||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
|
||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef JOLT_TYPE_CONVERSIONS_H
|
||||
#define JOLT_TYPE_CONVERSIONS_H
|
||||
|
||||
#include "core/math/aabb.h"
|
||||
#include "core/math/color.h"
|
||||
#include "core/math/plane.h"
|
||||
#include "core/math/quaternion.h"
|
||||
#include "core/math/transform_3d.h"
|
||||
#include "core/string/ustring.h"
|
||||
|
||||
#include "Jolt/Jolt.h"
|
||||
|
||||
#include "Jolt/Core/Color.h"
|
||||
#include "Jolt/Geometry/AABox.h"
|
||||
#include "Jolt/Geometry/Plane.h"
|
||||
#include "Jolt/Math/Mat44.h"
|
||||
#include "Jolt/Math/Quat.h"
|
||||
#include "Jolt/Math/Vec3.h"
|
||||
|
||||
_FORCE_INLINE_ Vector3 to_godot(const JPH::Vec3 &p_vec) {
|
||||
return Vector3((real_t)p_vec.GetX(), (real_t)p_vec.GetY(), (real_t)p_vec.GetZ());
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ Vector3 to_godot(const JPH::DVec3 &p_vec) {
|
||||
return Vector3((real_t)p_vec.GetX(), (real_t)p_vec.GetY(), (real_t)p_vec.GetZ());
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ Basis to_godot(const JPH::Quat &p_quat) {
|
||||
return Basis(Quaternion(p_quat.GetX(), p_quat.GetY(), p_quat.GetZ(), p_quat.GetW()));
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ Transform3D to_godot(const JPH::Mat44 &p_mat) {
|
||||
return Transform3D(
|
||||
Vector3(p_mat(0, 0), p_mat(1, 0), p_mat(2, 0)),
|
||||
Vector3(p_mat(0, 1), p_mat(1, 1), p_mat(2, 1)),
|
||||
Vector3(p_mat(0, 2), p_mat(1, 2), p_mat(2, 2)),
|
||||
Vector3(p_mat(0, 3), p_mat(1, 3), p_mat(2, 3)));
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ Color to_godot(const JPH::Color &p_color) {
|
||||
const float r = (float)p_color.r;
|
||||
const float g = (float)p_color.g;
|
||||
const float b = (float)p_color.b;
|
||||
const float a = (float)p_color.a;
|
||||
|
||||
return Color(
|
||||
r == 0.0f ? 0.0f : 255.0f / r,
|
||||
g == 0.0f ? 0.0f : 255.0f / g,
|
||||
b == 0.0f ? 0.0f : 255.0f / b,
|
||||
a == 0.0f ? 0.0f : 255.0f / a);
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ String to_godot(const JPH::String &p_str) {
|
||||
return String::utf8(p_str.c_str(), (int)p_str.length());
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ AABB to_godot(const JPH::AABox &p_aabb) {
|
||||
return AABB(to_godot(p_aabb.mMin), to_godot(p_aabb.mMax - p_aabb.mMin));
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ Plane to_godot(const JPH::Plane &p_plane) {
|
||||
return Plane(to_godot(p_plane.GetNormal()), (real_t)p_plane.GetConstant());
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ JPH::Vec3 to_jolt(const Vector3 &p_vec) {
|
||||
return JPH::Vec3((float)p_vec.x, (float)p_vec.y, (float)p_vec.z);
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ JPH::Quat to_jolt(const Basis &p_basis) {
|
||||
const Quaternion quat = p_basis.get_quaternion().normalized();
|
||||
return JPH::Quat((float)quat.x, (float)quat.y, (float)quat.z, (float)quat.w);
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ JPH::Mat44 to_jolt(const Transform3D &p_transform) {
|
||||
const Basis &b = p_transform.basis;
|
||||
const Vector3 &o = p_transform.origin;
|
||||
|
||||
return JPH::Mat44(
|
||||
JPH::Vec4(b[0][0], b[1][0], b[2][0], 0.0f),
|
||||
JPH::Vec4(b[0][1], b[1][1], b[2][1], 0.0f),
|
||||
JPH::Vec4(b[0][2], b[1][2], b[2][2], 0.0f),
|
||||
JPH::Vec3(o.x, o.y, o.z));
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ JPH::Color to_jolt(const Color &p_color) {
|
||||
return JPH::Color((JPH::uint32)p_color.to_abgr32());
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ JPH::String to_jolt(const String &p_str) {
|
||||
const CharString str_utf8 = p_str.utf8();
|
||||
return JPH::String(str_utf8.get_data(), (size_t)str_utf8.length());
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ JPH::AABox to_jolt(const AABB &p_aabb) {
|
||||
return JPH::AABox(to_jolt(p_aabb.position), to_jolt(p_aabb.position + p_aabb.size));
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ JPH::Plane to_jolt(const Plane &p_plane) {
|
||||
return JPH::Plane(to_jolt(p_plane.normal), (float)p_plane.d);
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ JPH::RVec3 to_jolt_r(const Vector3 &p_vec) {
|
||||
return JPH::RVec3(p_vec.x, p_vec.y, p_vec.z);
|
||||
}
|
||||
|
||||
_FORCE_INLINE_ JPH::RMat44 to_jolt_r(const Transform3D &p_transform) {
|
||||
const Basis &b = p_transform.basis;
|
||||
const Vector3 &o = p_transform.origin;
|
||||
|
||||
return JPH::RMat44(
|
||||
JPH::Vec4(b[0][0], b[1][0], b[2][0], 0.0f),
|
||||
JPH::Vec4(b[0][1], b[1][1], b[2][1], 0.0f),
|
||||
JPH::Vec4(b[0][2], b[1][2], b[2][2], 0.0f),
|
||||
JPH::RVec3(o.x, o.y, o.z));
|
||||
}
|
||||
|
||||
#endif // JOLT_TYPE_CONVERSIONS_H
|
||||
Loading…
Add table
Add a link
Reference in a new issue