Relintai/sfw
1
0
Fork 0
mirror of https://github.com/Relintai/sfw.git synced 2024-12-20 21:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sfwl build.

Browse Source
This commit is contained in:
Relintai 2024-01-07 12:05:28 +01:00
parent a94242a768
commit 7bd2e4f121
9 changed files with 11 additions and 21621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
sfwl/core/hashfuncs.h
View File

@ -7,17 +7,8 @@
/*************************************************************************/ /*************************************************************************/
//--STRIP //--STRIP
#include "core/aabb.h"
#include "core/math_defs.h" #include "core/math_defs.h"
#include "core/math_funcs.h" #include "core/math_funcs.h"
#include "core/rect2.h"
#include "core/rect2i.h"
#include "core/vector2.h"
#include "core/vector2i.h"
#include "core/vector3.h"
#include "core/vector3i.h"
#include "core/vector4.h"
#include "core/vector4i.h"
#include "core/string_name.h" #include "core/string_name.h"
#include "core/ustring.h" #include "core/ustring.h"
#include "core/typedefs.h" #include "core/typedefs.h"
@ -306,66 +297,6 @@ struct HashMapHasherDefault {
static _FORCE_INLINE_ uint32_t hash(const int16_t p_int) { return hash_fmix32(p_int); } static _FORCE_INLINE_ uint32_t hash(const int16_t p_int) { return hash_fmix32(p_int); }
static _FORCE_INLINE_ uint32_t hash(const uint8_t p_int) { return hash_fmix32(p_int); } static _FORCE_INLINE_ uint32_t hash(const uint8_t p_int) { return hash_fmix32(p_int); }
static _FORCE_INLINE_ uint32_t hash(const int8_t p_int) { return hash_fmix32(p_int); } static _FORCE_INLINE_ uint32_t hash(const int8_t p_int) { return hash_fmix32(p_int); }
static _FORCE_INLINE_ uint32_t hash(const Vector2i &p_vec) {
uint32_t h = hash_murmur3_one_32(p_vec.x);
h = hash_murmur3_one_32(p_vec.y, h);
return hash_fmix32(h);
}
static _FORCE_INLINE_ uint32_t hash(const Vector3i &p_vec) {
uint32_t h = hash_murmur3_one_32(p_vec.x);
h = hash_murmur3_one_32(p_vec.y, h);
h = hash_murmur3_one_32(p_vec.z, h);
return hash_fmix32(h);
}
static _FORCE_INLINE_ uint32_t hash(const Vector4i &p_vec) {
uint32_t h = hash_murmur3_one_32(p_vec.x);
h = hash_murmur3_one_32(p_vec.y, h);
h = hash_murmur3_one_32(p_vec.z, h);
h = hash_murmur3_one_32(p_vec.w, h);
return hash_fmix32(h);
}
static _FORCE_INLINE_ uint32_t hash(const Vector2 &p_vec) {
uint32_t h = hash_murmur3_one_real(p_vec.x);
h = hash_murmur3_one_real(p_vec.y, h);
return hash_fmix32(h);
}
static _FORCE_INLINE_ uint32_t hash(const Vector3 &p_vec) {
uint32_t h = hash_murmur3_one_real(p_vec.x);
h = hash_murmur3_one_real(p_vec.y, h);
h = hash_murmur3_one_real(p_vec.z, h);
return hash_fmix32(h);
}
static _FORCE_INLINE_ uint32_t hash(const Vector4 &p_vec) {
uint32_t h = hash_murmur3_one_real(p_vec.x);
h = hash_murmur3_one_real(p_vec.y, h);
h = hash_murmur3_one_real(p_vec.z, h);
h = hash_murmur3_one_real(p_vec.w, h);
return hash_fmix32(h);
}
static _FORCE_INLINE_ uint32_t hash(const Rect2i &p_rect) {
uint32_t h = hash_murmur3_one_32(p_rect.position.x);
h = hash_murmur3_one_32(p_rect.position.y, h);
h = hash_murmur3_one_32(p_rect.size.x, h);
h = hash_murmur3_one_32(p_rect.size.y, h);
return hash_fmix32(h);
}
static _FORCE_INLINE_ uint32_t hash(const Rect2 &p_rect) {
uint32_t h = hash_murmur3_one_real(p_rect.position.x);
h = hash_murmur3_one_real(p_rect.position.y, h);
h = hash_murmur3_one_real(p_rect.size.x, h);
h = hash_murmur3_one_real(p_rect.size.y, h);
return hash_fmix32(h);
}
static _FORCE_INLINE_ uint32_t hash(const AABB &p_aabb) {
uint32_t h = hash_murmur3_one_real(p_aabb.position.x);
h = hash_murmur3_one_real(p_aabb.position.y, h);
h = hash_murmur3_one_real(p_aabb.position.z, h);
h = hash_murmur3_one_real(p_aabb.size.x, h);
h = hash_murmur3_one_real(p_aabb.size.y, h);
h = hash_murmur3_one_real(p_aabb.size.z, h);
return hash_fmix32(h);
}
}; };
template <typename T> template <typename T>
@ -389,20 +320,6 @@ struct HashMapComparatorDefault<double> {
} }
}; };
template <>
struct HashMapComparatorDefault<Vector2> {
static bool compare(const Vector2 &p_lhs, const Vector2 &p_rhs) {
return ((p_lhs.x == p_rhs.x) || (Math::is_nan(p_lhs.x) && Math::is_nan(p_rhs.x))) && ((p_lhs.y == p_rhs.y) || (Math::is_nan(p_lhs.y) && Math::is_nan(p_rhs.y)));
}
};
template <>
struct HashMapComparatorDefault<Vector3> {
static bool compare(const Vector3 &p_lhs, const Vector3 &p_rhs) {
return ((p_lhs.x == p_rhs.x) || (Math::is_nan(p_lhs.x) && Math::is_nan(p_rhs.x))) && ((p_lhs.y == p_rhs.y) || (Math::is_nan(p_lhs.y) && Math::is_nan(p_rhs.y))) && ((p_lhs.z == p_rhs.z) || (Math::is_nan(p_lhs.z) && Math::is_nan(p_rhs.z)));
}
};
constexpr uint32_t HASH_TABLE_SIZE_MAX = 29; constexpr uint32_t HASH_TABLE_SIZE_MAX = 29;
const uint32_t hash_table_size_primes[HASH_TABLE_SIZE_MAX] = { const uint32_t hash_table_size_primes[HASH_TABLE_SIZE_MAX] = {

5
sfwl/core/ustring.cpp
View File

@ -10,7 +10,6 @@
//--STRIP //--STRIP
#include "core/ustring.h" #include "core/ustring.h"
#include "core/color.h"
#include "core/math_funcs.h" #include "core/math_funcs.h"
#include "core/memory.h" #include "core/memory.h"
#include "ucaps.h" #include "ucaps.h"
@ -4564,10 +4563,6 @@ bool String::is_valid_unsigned_integer() const {
return true; return true;
} }
bool String::is_valid_html_color() const {
return Color::html_is_valid(*this);
}
bool String::is_valid_filename() const { bool String::is_valid_filename() const {
String stripped = strip_edges(); String stripped = strip_edges();
if (*this != stripped) { if (*this != stripped) {

1
sfwl/core/ustring.h
View File

@ -480,7 +480,6 @@ public:
bool is_valid_integer() const; bool is_valid_integer() const;
bool is_valid_float() const; bool is_valid_float() const;
bool is_valid_hex_number(bool p_with_prefix) const; bool is_valid_hex_number(bool p_with_prefix) const;
bool is_valid_html_color() const;
bool is_valid_ip_address() const; bool is_valid_ip_address() const;
bool is_valid_filename() const; bool is_valid_filename() const;
bool is_valid_bool() const; bool is_valid_bool() const;

1968
sfwl/object/variant.cpp
View File

File diff suppressed because it is too large Load Diff

120
sfwl/object/variant.h
View File

@ -7,21 +7,9 @@
/*************************************************************************/ /*************************************************************************/
//--STRIP //--STRIP
#include "core/aabb.h" #include "core/math_defs.h"
#include "core/basis.h"
#include "core/color.h"
#include "core/face3.h"
#include "core/plane.h"
#include "core/pool_vector.h" #include "core/pool_vector.h"
#include "core/projection.h"
#include "core/quaternion.h"
#include "core/transform.h"
#include "core/transform_2d.h"
#include "core/ustring.h" #include "core/ustring.h"
#include "core/vector3.h"
#include "core/vector3i.h"
#include "core/vector4.h"
#include "core/vector4i.h"
#include "object/array.h" #include "object/array.h"
#include "object/dictionary.h" #include "object/dictionary.h"
#include "object/ref_ptr.h" #include "object/ref_ptr.h"
@ -35,13 +23,6 @@ typedef PoolVector<uint8_t> PoolByteArray;
typedef PoolVector<int> PoolIntArray; typedef PoolVector<int> PoolIntArray;
typedef PoolVector<real_t> PoolRealArray; typedef PoolVector<real_t> PoolRealArray;
typedef PoolVector<String> PoolStringArray; typedef PoolVector<String> PoolStringArray;
typedef PoolVector<Vector2> PoolVector2Array;
typedef PoolVector<Vector2i> PoolVector2iArray;
typedef PoolVector<Vector3> PoolVector3Array;
typedef PoolVector<Vector3i> PoolVector3iArray;
typedef PoolVector<Vector4> PoolVector4Array;
typedef PoolVector<Vector4i> PoolVector4iArray;
typedef PoolVector<Color> PoolColorArray;
// Temporary workaround until c++11 alignas() // Temporary workaround until c++11 alignas()
#ifdef __GNUC__ #ifdef __GNUC__
@ -70,26 +51,7 @@ public:
REAL, REAL,
STRING, STRING,
// math types
RECT2,
RECT2I,
VECTOR2,
VECTOR2I,
VECTOR3,
VECTOR3I,
VECTOR4,
VECTOR4I,
PLANE,
QUATERNION,
AABB,
BASIS,
TRANSFORM,
TRANSFORM2D,
PROJECTION,
// misc types // misc types
COLOR,
OBJECT, OBJECT,
STRING_NAME, STRING_NAME,
DICTIONARY, DICTIONARY,
@ -100,13 +62,6 @@ public:
POOL_INT_ARRAY, POOL_INT_ARRAY,
POOL_REAL_ARRAY, POOL_REAL_ARRAY,
POOL_STRING_ARRAY, POOL_STRING_ARRAY,
POOL_VECTOR2_ARRAY,
POOL_VECTOR2I_ARRAY,
POOL_VECTOR3_ARRAY,
POOL_VECTOR3I_ARRAY,
POOL_VECTOR4_ARRAY,
POOL_VECTOR4I_ARRAY,
POOL_COLOR_ARRAY,
VARIANT_MAX // 38 VARIANT_MAX // 38
@ -139,11 +94,6 @@ private:
bool _bool; bool _bool;
int64_t _int; int64_t _int;
double _real; double _real;
Transform2D *_transform2d;
::AABB *_aabb;
Basis *_basis;
Transform *_transform;
Projection *_projection;
void *_ptr; //generic pointer void *_ptr; //generic pointer
uint8_t _mem[sizeof(ObjData) > (sizeof(real_t) * 4) ? sizeof(ObjData) : (sizeof(real_t) * 4)]; uint8_t _mem[sizeof(ObjData) > (sizeof(real_t) * 4) ? sizeof(ObjData) : (sizeof(real_t) * 4)];
} _data GCC_ALIGNED_8; } _data GCC_ALIGNED_8;
@ -188,23 +138,7 @@ public:
operator double() const; operator double() const;
operator String() const; operator String() const;
operator StringName() const; operator StringName() const;
operator Rect2() const;
operator Rect2i() const;
operator Vector2() const;
operator Vector2i() const;
operator Vector3() const;
operator Vector3i() const;
operator Vector4() const;
operator Vector4i() const;
operator Plane() const;
operator ::AABB() const;
operator Quaternion() const;
operator Basis() const;
operator Transform() const;
operator Transform2D() const;
operator Projection() const;
operator Color() const;
operator RefPtr() const; operator RefPtr() const;
operator Object *() const; operator Object *() const;
@ -216,15 +150,6 @@ public:
operator PoolVector<int>() const; operator PoolVector<int>() const;
operator PoolVector<real_t>() const; operator PoolVector<real_t>() const;
operator PoolVector<String>() const; operator PoolVector<String>() const;
operator PoolVector<Vector2>() const;
operator PoolVector<Vector2i>() const;
operator PoolVector<Vector3>() const;
operator PoolVector<Vector3i>() const;
operator PoolVector<Vector4>() const;
operator PoolVector<Vector4i>() const;
operator PoolVector<Color>() const;
operator PoolVector<Plane>() const;
operator PoolVector<Face3>() const;
operator Vector<Variant>() const; operator Vector<Variant>() const;
operator Vector<uint8_t>() const; operator Vector<uint8_t>() const;
@ -232,15 +157,6 @@ public:
operator Vector<real_t>() const; operator Vector<real_t>() const;
operator Vector<String>() const; operator Vector<String>() const;
operator Vector<StringName>() const; operator Vector<StringName>() const;
operator Vector<Vector3>() const;
operator Vector<Vector3i>() const;
operator Vector<Vector4>() const;
operator Vector<Vector4i>() const;
operator Vector<Color>() const;
operator Vector<Vector2>() const;
operator Vector<Vector2i>() const;
operator Vector<Plane>() const;
// some core type enums to convert to // some core type enums to convert to
operator Margin() const; operator Margin() const;
@ -267,40 +183,16 @@ public:
Variant(const StringName &p_string); Variant(const StringName &p_string);
Variant(const char *const p_cstring); Variant(const char *const p_cstring);
Variant(const CharType *p_wstring); Variant(const CharType *p_wstring);
Variant(const Vector2 &p_vector2);
Variant(const Vector2i &p_vector2);
Variant(const Rect2 &p_rect2);
Variant(const Rect2i &p_rect2);
Variant(const Vector3 &p_vector3);
Variant(const Vector3i &p_vector3);
Variant(const Vector4 &p_vector4);
Variant(const Vector4i &p_vector4);
Variant(const Projection &p_projection);
Variant(const Plane &p_plane);
Variant(const ::AABB &p_aabb);
Variant(const Quaternion &p_quat);
Variant(const Basis &p_matrix);
Variant(const Transform2D &p_transform);
Variant(const Transform &p_transform);
Variant(const Color &p_color);
Variant(const RefPtr &p_resource); Variant(const RefPtr &p_resource);
Variant(const Object *p_object); Variant(const Object *p_object);
Variant(const Dictionary &p_dictionary); Variant(const Dictionary &p_dictionary);
Variant(const Array &p_array); Variant(const Array &p_array);
Variant(const PoolVector<Plane> &p_array);
Variant(const PoolVector<uint8_t> &p_raw_array); Variant(const PoolVector<uint8_t> &p_raw_array);
Variant(const PoolVector<int> &p_int_array); Variant(const PoolVector<int> &p_int_array);
Variant(const PoolVector<real_t> &p_real_array); Variant(const PoolVector<real_t> &p_real_array);
Variant(const PoolVector<String> &p_string_array); Variant(const PoolVector<String> &p_string_array);
Variant(const PoolVector<Vector3> &p_vector3_array);
Variant(const PoolVector<Vector3i> &p_vector3_array);
Variant(const PoolVector<Color> &p_color_array);
Variant(const PoolVector<Face3> &p_face_array);
Variant(const PoolVector<Vector2> &p_vector2_array);
Variant(const PoolVector<Vector2i> &p_vector2_array);
Variant(const PoolVector<Vector4> &p_vector4_array);
Variant(const PoolVector<Vector4i> &p_vector4_array);
Variant(const Vector<Variant> &p_array); Variant(const Vector<Variant> &p_array);
Variant(const Vector<uint8_t> &p_array); Variant(const Vector<uint8_t> &p_array);
@ -308,14 +200,6 @@ public:
Variant(const Vector<real_t> &p_array); Variant(const Vector<real_t> &p_array);
Variant(const Vector<String> &p_array); Variant(const Vector<String> &p_array);
Variant(const Vector<StringName> &p_array); Variant(const Vector<StringName> &p_array);
Variant(const Vector<Vector3> &p_array);
Variant(const Vector<Vector3i> &p_array);
Variant(const Vector<Color> &p_array);
Variant(const Vector<Plane> &p_array);
Variant(const Vector<Vector2> &p_array);
Variant(const Vector<Vector2i> &p_array);
Variant(const Vector<Vector4> &p_array);
Variant(const Vector<Vector4i> &p_array);
// If this changes the table in variant_op must be updated // If this changes the table in variant_op must be updated
enum Operator { enum Operator {

3615
sfwl/object/variant_op.cpp
View File

File diff suppressed because it is too large Load Diff

2
tools/doc/run.sh Executable file
View File

@ -0,0 +1,2 @@
./game ../merger/out/full/sfw.h

10845
tools/doc/sfwl.cpp
View File

File diff suppressed because it is too large Load Diff

4993
tools/doc/sfwl.h
View File

File diff suppressed because it is too large Load Diff