diff --git a/sfw/core/aabb.cpp b/sfw/core/aabb.cpp index e318889..afe7e71 100644 --- a/sfw/core/aabb.cpp +++ b/sfw/core/aabb.cpp @@ -3,7 +3,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/aabb.h" +//--STRIP real_t AABB::get_volume() const { return size.x * size.y * size.z; diff --git a/sfw/core/basis.cpp b/sfw/core/basis.cpp index 12e40f7..89b8687 100644 --- a/sfw/core/basis.cpp +++ b/sfw/core/basis.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/basis.h" #include "core/math_funcs.h" +//--STRIP #define cofac(row1, col1, row2, col2) \ (rows[row1][col1] * rows[row2][col2] - rows[row1][col2] * rows[row2][col1]) @@ -1175,3 +1177,5 @@ Basis Basis::looking_at(const Vector3 &p_target, const Vector3 &p_up) { basis.set_columns(v_x, v_y, v_z); return basis; } + +#undef cofac diff --git a/sfw/core/basis.h b/sfw/core/basis.h index 999abbd..b4dd654 100644 --- a/sfw/core/basis.h +++ b/sfw/core/basis.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/quaternion.h" #include "core/vector3.h" #include "core/vector3i.h" +//--STRIP struct _NO_DISCARD_CLASS_ Basis { Vector3 rows[3] = { diff --git a/sfw/core/char_range.inc b/sfw/core/char_range.inc index 9eddc66..da9a9ee 100644 --- a/sfw/core/char_range.inc +++ b/sfw/core/char_range.inc @@ -6,7 +6,9 @@ #ifndef CHAR_RANGE_INC #define CHAR_RANGE_INC +//--STRIP #include "core/typedefs.h" +//--STRIP struct CharRange { char32_t start; diff --git a/sfw/core/char_utils.h b/sfw/core/char_utils.h index 3af012d..3e8912f 100644 --- a/sfw/core/char_utils.h +++ b/sfw/core/char_utils.h @@ -6,9 +6,11 @@ #ifndef CHAR_UTILS_H #define CHAR_UTILS_H +//--STRIP #include "core/typedefs.h" #include "core/char_range.inc" +//--STRIP static _FORCE_INLINE_ bool is_unicode_identifier_start(char32_t c) { for (int i = 0; xid_start[i].start != 0; i++) { diff --git a/sfw/core/color.cpp b/sfw/core/color.cpp index 8f4c0b5..bfc71de 100644 --- a/sfw/core/color.cpp +++ b/sfw/core/color.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/color.h" #include "core/math_funcs.h" +//--STRIP uint32_t Color::to_argb32() const { uint32_t c = (uint8_t)Math::round(a * 255); diff --git a/sfw/core/color.h b/sfw/core/color.h index 3c12fda..22f49dc 100644 --- a/sfw/core/color.h +++ b/sfw/core/color.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/math_funcs.h" #include "core/ustring.h" +//--STRIP struct _NO_DISCARD_CLASS_ Color { union { diff --git a/sfw/core/cowdata.h b/sfw/core/cowdata.h index 9cadcbe..b9ac1aa 100644 --- a/sfw/core/cowdata.h +++ b/sfw/core/cowdata.h @@ -6,12 +6,14 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include #include "core/error_list.h" #include "core/error_macros.h" #include "core/memory.h" #include "core/safe_refcount.h" +//--STRIP template class Vector; diff --git a/sfw/core/error_macros.h b/sfw/core/error_macros.h index fa3e1c3..4733076 100644 --- a/sfw/core/error_macros.h +++ b/sfw/core/error_macros.h @@ -1,8 +1,10 @@ #ifndef ERROR_MACROS_H #define ERROR_MACROS_H +//--STRIP #include "core/logger.h" #include "core/typedefs.h" +//--STRIP // Based on Godot Engine's error_macros.h // MIT License diff --git a/sfw/core/face3.cpp b/sfw/core/face3.cpp index 3e919a9..30c0a22 100644 --- a/sfw/core/face3.cpp +++ b/sfw/core/face3.cpp @@ -3,7 +3,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "face3.h" +//--STRIP int Face3::split_by_plane(const Plane &p_plane, Face3 p_res[3], bool p_is_point_over[3]) const { ERR_FAIL_COND_V(is_degenerate(), 0); diff --git a/sfw/core/face3.h b/sfw/core/face3.h index 29b0973..4be131d 100644 --- a/sfw/core/face3.h +++ b/sfw/core/face3.h @@ -6,10 +6,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/aabb.h" #include "core/plane.h" #include "core/transform.h" #include "core/vector3.h" +//--STRIP struct _NO_DISCARD_CLASS_ Face3 { enum Side { diff --git a/sfw/core/hash_map.h b/sfw/core/hash_map.h index effe7c5..0a2e863 100644 --- a/sfw/core/hash_map.h +++ b/sfw/core/hash_map.h @@ -6,12 +6,14 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/hashfuncs.h" #include "paged_allocator.h" #include "pair.h" #include "core/math_funcs.h" #include "core/memory.h" #include "list.h" +//--STRIP /** * A HashMap implementation that uses open addressing with Robin Hood hashing. diff --git a/sfw/core/hash_set.h b/sfw/core/hash_set.h index 1b49e4e..82a7c7d 100644 --- a/sfw/core/hash_set.h +++ b/sfw/core/hash_set.h @@ -6,10 +6,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/hash_map.h" #include "core/hashfuncs.h" #include "core/math_funcs.h" #include "core/memory.h" +//--STRIP /** * Implementation of Set using a bidi indexed hash map. diff --git a/sfw/core/hashfuncs.h b/sfw/core/hashfuncs.h index 5b9fd9a..3084d8d 100644 --- a/sfw/core/hashfuncs.h +++ b/sfw/core/hashfuncs.h @@ -6,6 +6,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/aabb.h" #include "core/math_defs.h" #include "core/math_funcs.h" @@ -20,6 +21,7 @@ #include "core/string_name.h" #include "core/ustring.h" #include "core/typedefs.h" +//--STRIP /** * Hashing functions diff --git a/sfw/core/list.h b/sfw/core/list.h index 08178c7..fe1bc05 100644 --- a/sfw/core/list.h +++ b/sfw/core/list.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/sort_array.h" #include "core/error_macros.h" #include "core/memory.h" +//--STRIP /** * Generic Templatized Linked List Implementation. diff --git a/sfw/core/local_vector.h b/sfw/core/local_vector.h index a1e6e10..dd712df 100644 --- a/sfw/core/local_vector.h +++ b/sfw/core/local_vector.h @@ -6,11 +6,13 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/pool_vector.h" #include "core/sort_array.h" #include "core/vector.h" #include "core/error_macros.h" #include "core/memory.h" +//--STRIP template class LocalVector { diff --git a/sfw/core/logger.cpp b/sfw/core/logger.cpp index 673f3f7..45ab91f 100644 --- a/sfw/core/logger.cpp +++ b/sfw/core/logger.cpp @@ -1,10 +1,12 @@ +//--STRIP #include "core/logger.h" #include "core/ustring.h" #include #include +//--STRIP void RLogger::print_trace(const String &str) { print_trace(str.utf8().get_data()); diff --git a/sfw/core/math_funcs.cpp b/sfw/core/math_funcs.cpp index 7483323..e2211f4 100644 --- a/sfw/core/math_funcs.cpp +++ b/sfw/core/math_funcs.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/math_funcs.h" #include "core/error_macros.h" +//--STRIP RandomPCG Math::default_rand(RandomPCG::DEFAULT_SEED, RandomPCG::DEFAULT_INC); diff --git a/sfw/core/math_funcs.h b/sfw/core/math_funcs.h index 37b2ccd..b2bd32c 100644 --- a/sfw/core/math_funcs.h +++ b/sfw/core/math_funcs.h @@ -6,6 +6,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/error_macros.h" #include "core/math_defs.h" #include "core/random_pcg.h" @@ -15,6 +16,7 @@ #include #include +//--STRIP class Math { static RandomPCG default_rand; diff --git a/sfw/core/memory.cpp b/sfw/core/memory.cpp index ca6edc9..56c69c0 100644 --- a/sfw/core/memory.cpp +++ b/sfw/core/memory.cpp @@ -3,6 +3,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/memory.h" #include "core/error_macros.h" @@ -10,6 +11,7 @@ #include #include +//--STRIP void *operator new(size_t p_size, const char *p_description) { return Memory::alloc_static(p_size, false); diff --git a/sfw/core/memory.h b/sfw/core/memory.h index 97bfb54..a23debf 100644 --- a/sfw/core/memory.h +++ b/sfw/core/memory.h @@ -6,10 +6,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/error_macros.h" #include "core/safe_refcount.h" #include +//--STRIP #ifndef PAD_ALIGN #define PAD_ALIGN 16 //must always be greater than this at much diff --git a/sfw/core/mutex.cpp b/sfw/core/mutex.cpp index 868b59f..5ecf493 100644 --- a/sfw/core/mutex.cpp +++ b/sfw/core/mutex.cpp @@ -3,7 +3,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/mutex.h" +//--STRIP static Mutex _global_mutex; diff --git a/sfw/core/mutex.h b/sfw/core/mutex.h index 1bb9ced..86c3ade 100644 --- a/sfw/core/mutex.h +++ b/sfw/core/mutex.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/error_list.h" #include "core/typedefs.h" +//--STRIP #if !defined(NO_THREADS) diff --git a/sfw/core/og_hash_map.h b/sfw/core/og_hash_map.h index bb2235b..cc80345 100644 --- a/sfw/core/og_hash_map.h +++ b/sfw/core/og_hash_map.h @@ -6,12 +6,14 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/hashfuncs.h" #include "core/list.h" #include "core/error_macros.h" #include "core/math_funcs.h" #include "core/memory.h" #include "core/ustring.h" +//--STRIP /** * @class OGHashMap diff --git a/sfw/core/ordered_hash_map.h b/sfw/core/ordered_hash_map.h index b75c39d..be7e23d 100644 --- a/sfw/core/ordered_hash_map.h +++ b/sfw/core/ordered_hash_map.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/list.h" #include "core/og_hash_map.h" #include "core/pair.h" +//--STRIP /** * A hash map which allows to iterate elements in insertion order. diff --git a/sfw/core/paged_allocator.h b/sfw/core/paged_allocator.h index 799448c..3317f22 100644 --- a/sfw/core/paged_allocator.h +++ b/sfw/core/paged_allocator.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/memory.h" #include "spin_lock.h" #include "core/typedefs.h" +//--STRIP template class PagedAllocator { diff --git a/sfw/core/pair.h b/sfw/core/pair.h index 4814501..812bc40 100644 --- a/sfw/core/pair.h +++ b/sfw/core/pair.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/hashfuncs.h" #include "core/typedefs.h" +//--STRIP template struct Pair { diff --git a/sfw/core/pcg.cpp b/sfw/core/pcg.cpp index 4eac733..a7a2849 100644 --- a/sfw/core/pcg.cpp +++ b/sfw/core/pcg.cpp @@ -1,7 +1,9 @@ // *Really* minimal PCG32 code / (c) 2014 M.E. O'Neill / pcg-random.org // Licensed under Apache License 2.0 (NO WARRANTY, etc. see website) +//--STRIP #include "core/pcg.h" +//--STRIP uint32_t pcg32_random_r(pcg32_random_t* rng) { diff --git a/sfw/core/pcg.h b/sfw/core/pcg.h index 0faab73..082e446 100644 --- a/sfw/core/pcg.h +++ b/sfw/core/pcg.h @@ -4,7 +4,9 @@ #ifndef RANDOM_H #define RANDOM_H +//--STRIP #include "core/typedefs.h" +//--STRIP #define PCG_DEFAULT_INC_64 1442695040888963407ULL diff --git a/sfw/core/plane.cpp b/sfw/core/plane.cpp index ff1b501..3b26c4b 100644 --- a/sfw/core/plane.cpp +++ b/sfw/core/plane.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/plane.h" #include "core/math_funcs.h" +//--STRIP void Plane::set_normal(const Vector3 &p_normal) { normal = p_normal; diff --git a/sfw/core/plane.h b/sfw/core/plane.h index 4f4bde3..6c32b12 100644 --- a/sfw/core/plane.h +++ b/sfw/core/plane.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector3.h" +//--STRIP struct _NO_DISCARD_CLASS_ Plane { Vector3 normal; diff --git a/sfw/core/pool_allocator.cpp b/sfw/core/pool_allocator.cpp index 573540f..57a712a 100644 --- a/sfw/core/pool_allocator.cpp +++ b/sfw/core/pool_allocator.cpp @@ -3,12 +3,14 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "pool_allocator.h" #include "core/error_macros.h" #include "core/memory.h" #include +//--STRIP #define COMPACT_CHUNK(m_entry, m_to_pos) \ do { \ @@ -559,3 +561,5 @@ PoolAllocator::~PoolAllocator() { memdelete_arr(entry_array); memdelete_arr(entry_indices); } + +#undef COMPACT_CHUNK diff --git a/sfw/core/pool_allocator.h b/sfw/core/pool_allocator.h index d69a4b1..7ed6a5d 100644 --- a/sfw/core/pool_allocator.h +++ b/sfw/core/pool_allocator.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/typedefs.h" +//--STRIP /** @author Juan Linietsky diff --git a/sfw/core/pool_vector.cpp b/sfw/core/pool_vector.cpp index 68acfc6..7634106 100644 --- a/sfw/core/pool_vector.cpp +++ b/sfw/core/pool_vector.cpp @@ -3,7 +3,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/pool_vector.h" +//--STRIP Mutex pool_vector_lock; diff --git a/sfw/core/pool_vector.h b/sfw/core/pool_vector.h index dc8d8d1..5ffc6f5 100644 --- a/sfw/core/pool_vector.h +++ b/sfw/core/pool_vector.h @@ -6,12 +6,14 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/memory.h" #include "core/mutex.h" #include "pool_allocator.h" #include "rw_lock.h" #include "core/safe_refcount.h" #include "core/ustring.h" +//--STRIP struct MemoryPool { //avoid accessing these directly, must be public for template access diff --git a/sfw/core/projection.cpp b/sfw/core/projection.cpp index 3da66de..56c7dfc 100644 --- a/sfw/core/projection.cpp +++ b/sfw/core/projection.cpp @@ -3,6 +3,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/projection.h" #include "core/aabb.h" @@ -10,6 +11,7 @@ #include "core/plane.h" #include "core/rect2.h" #include "core/transform.h" +//--STRIP float Projection::determinant() const { return matrix[0][3] * matrix[1][2] * matrix[2][1] * matrix[3][0] - matrix[0][2] * matrix[1][3] * matrix[2][1] * matrix[3][0] - diff --git a/sfw/core/projection.h b/sfw/core/projection.h index d7a0bb8..72d1255 100644 --- a/sfw/core/projection.h +++ b/sfw/core/projection.h @@ -6,10 +6,12 @@ #ifndef PROJECTION_H #define PROJECTION_H +//--STRIP #include "core/vector.h" #include "core/math_defs.h" #include "core/vector3.h" #include "core/vector4.h" +//--STRIP struct AABB; struct Plane; diff --git a/sfw/core/quaternion.cpp b/sfw/core/quaternion.cpp index 28a8ea4..bdac75f 100644 --- a/sfw/core/quaternion.cpp +++ b/sfw/core/quaternion.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/quaternion.h" #include "core/basis.h" +//--STRIP real_t Quaternion::angle_to(const Quaternion &p_to) const { real_t d = dot(p_to); diff --git a/sfw/core/quaternion.h b/sfw/core/quaternion.h index 05ffc69..5cf00c4 100644 --- a/sfw/core/quaternion.h +++ b/sfw/core/quaternion.h @@ -6,10 +6,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/math_defs.h" #include "core/math_funcs.h" #include "core/vector3.h" #include "core/ustring.h" +//--STRIP struct _NO_DISCARD_CLASS_ Quaternion { union { diff --git a/sfw/core/random_pcg.cpp b/sfw/core/random_pcg.cpp index 9cc303b..44a11ab 100644 --- a/sfw/core/random_pcg.cpp +++ b/sfw/core/random_pcg.cpp @@ -3,10 +3,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/random_pcg.h" #include "core/stime.h" #include "core/error_macros.h" +//--STRIP RandomPCG::RandomPCG(uint64_t p_seed, uint64_t p_inc) : pcg(), diff --git a/sfw/core/random_pcg.h b/sfw/core/random_pcg.h index c7804d0..088f3a5 100644 --- a/sfw/core/random_pcg.h +++ b/sfw/core/random_pcg.h @@ -6,11 +6,13 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include #include "core/math_defs.h" #include "core/pcg.h" +//--STRIP #if defined(__GNUC__) || (_llvm_has_builtin(__builtin_clz)) #define CLZ32(x) __builtin_clz(x) diff --git a/sfw/core/rb_map.h b/sfw/core/rb_map.h index bce974b..67de2a0 100644 --- a/sfw/core/rb_map.h +++ b/sfw/core/rb_map.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/error_macros.h" #include "core/memory.h" +//--STRIP // based on the very nice implementation of rb-trees by: // https://web.archive.org/web/20120507164830/http://web.mit.edu/~emin/www/source_code/red_black_tree/index.html diff --git a/sfw/core/rb_set.h b/sfw/core/rb_set.h index ae56cc5..43f254f 100644 --- a/sfw/core/rb_set.h +++ b/sfw/core/rb_set.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/memory.h" #include "core/typedefs.h" +//--STRIP // based on the very nice implementation of rb-trees by: // https://web.archive.org/web/20120507164830/http://web.mit.edu/~emin/www/source_code/red_black_tree/index.html diff --git a/sfw/core/rect2.cpp b/sfw/core/rect2.cpp index 089ab69..112d0ea 100644 --- a/sfw/core/rect2.cpp +++ b/sfw/core/rect2.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/transform_2d.h" // Includes rect2.h but Rect2 needs Transform2D #include "core/rect2i.h" +//--STRIP bool Rect2::is_equal_approx(const Rect2 &p_rect) const { return position.is_equal_approx(p_rect.position) && size.is_equal_approx(p_rect.size); diff --git a/sfw/core/rect2.h b/sfw/core/rect2.h index bc039b5..da3f2fc 100644 --- a/sfw/core/rect2.h +++ b/sfw/core/rect2.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector2.h" // also includes math_funcs and ustring #include "core/vector2i.h" +//--STRIP struct Transform2D; struct Rect2i; diff --git a/sfw/core/rect2i.cpp b/sfw/core/rect2i.cpp index 33f80ea..96f5b70 100644 --- a/sfw/core/rect2i.cpp +++ b/sfw/core/rect2i.cpp @@ -3,7 +3,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/transform_2d.h" // Includes rect2.h but Rect2 needs Transform2D +//--STRIP Rect2i::operator String() const { return "[P: " + position.operator String() + ", S: " + size + "]"; diff --git a/sfw/core/rect2i.h b/sfw/core/rect2i.h index fd1100f..c4796a2 100644 --- a/sfw/core/rect2i.h +++ b/sfw/core/rect2i.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector2i.h" // also includes math_funcs and ustring +//--STRIP struct _NO_DISCARD_CLASS_ Rect2i { Point2i position; diff --git a/sfw/core/ring_buffer.h b/sfw/core/ring_buffer.h index 51f4b6a..d8c3146 100644 --- a/sfw/core/ring_buffer.h +++ b/sfw/core/ring_buffer.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector.h" +//--STRIP template class RingBuffer { diff --git a/sfw/core/rw_lock.h b/sfw/core/rw_lock.h index 68e4aa9..93d9e95 100644 --- a/sfw/core/rw_lock.h +++ b/sfw/core/rw_lock.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/error_list.h" +//--STRIP #if !defined(NO_THREADS) diff --git a/sfw/core/safe_refcount.cpp b/sfw/core/safe_refcount.cpp index 18990d7..720e3e6 100644 --- a/sfw/core/safe_refcount.cpp +++ b/sfw/core/safe_refcount.cpp @@ -5,9 +5,11 @@ #if defined(DEBUG_ENABLED) && !defined(NO_THREADS) +//--STRIP #include "core/safe_refcount.h" #include "core/error/error_macros.h" +//--STRIP // On C++14 we don't have std::atomic::is_always_lockfree, so this is the best we can do void check_lockless_atomics() { diff --git a/sfw/core/safe_refcount.h b/sfw/core/safe_refcount.h index 4aebe0d..d8d9b79 100644 --- a/sfw/core/safe_refcount.h +++ b/sfw/core/safe_refcount.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/typedefs.h" +//--STRIP #if !defined(NO_THREADS) diff --git a/sfw/core/sort_array.h b/sfw/core/sort_array.h index 93c1b0a..379149d 100644 --- a/sfw/core/sort_array.h +++ b/sfw/core/sort_array.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/error_macros.h" #include "core/typedefs.h" +//--STRIP #define ERR_BAD_COMPARE(cond) \ if (unlikely(cond)) { \ @@ -293,4 +295,6 @@ public: } }; +#undef ERR_BAD_COMPARE + #endif // SORT_ARRAY_H diff --git a/sfw/core/spin_lock.h b/sfw/core/spin_lock.h index a02f269..b993f73 100644 --- a/sfw/core/spin_lock.h +++ b/sfw/core/spin_lock.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/typedefs.h" #include +//--STRIP class SpinLock { std::atomic_flag locked = ATOMIC_FLAG_INIT; diff --git a/sfw/core/stime.cpp b/sfw/core/stime.cpp index 67a7729..43597d4 100644 --- a/sfw/core/stime.cpp +++ b/sfw/core/stime.cpp @@ -1,12 +1,14 @@ // ---------------------------------------------------------------------------- // time +//--STRIP #include "core/stime.h" #include #include #include #include +//--STRIP #if 0 uint64_t STime::time_gpu() { diff --git a/sfw/core/stime.h b/sfw/core/stime.h index f4274a1..3351373 100644 --- a/sfw/core/stime.h +++ b/sfw/core/stime.h @@ -5,7 +5,9 @@ // time framework utils // - originally by rlyeh, public domain. +//--STRIP #include "core/int_types.h" +//--STRIP class STime { public: diff --git a/sfw/core/string_name.cpp b/sfw/core/string_name.cpp index 1bae56b..cd2a9c9 100644 --- a/sfw/core/string_name.cpp +++ b/sfw/core/string_name.cpp @@ -3,7 +3,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/string_name.h" +//--STRIP StaticCString StaticCString::create(const char *p_ptr) { StaticCString scs; diff --git a/sfw/core/string_name.h b/sfw/core/string_name.h index 8f97676..6a97ff6 100644 --- a/sfw/core/string_name.h +++ b/sfw/core/string_name.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/mutex.h" #include "core/safe_refcount.h" #include "core/ustring.h" +//--STRIP struct StaticCString { const char *ptr; diff --git a/sfw/core/thread_safe.h b/sfw/core/thread_safe.h index 7267f31..4c58395 100644 --- a/sfw/core/thread_safe.h +++ b/sfw/core/thread_safe.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/mutex.h" +//--STRIP #define _THREAD_SAFE_CLASS_ mutable Mutex _thread_safe_; #define _THREAD_SAFE_METHOD_ MutexLock _thread_safe_method_(_thread_safe_); diff --git a/sfw/core/tight_local_vector.h b/sfw/core/tight_local_vector.h index 84ab78f..3e404e8 100644 --- a/sfw/core/tight_local_vector.h +++ b/sfw/core/tight_local_vector.h @@ -6,11 +6,13 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/pool_vector.h" #include "core/sort_array.h" #include "core/vector.h" #include "core/error_macros.h" #include "core/memory.h" +//--STRIP // It grows strictly as much as needed. (The vanilla LocalVector is what you want in most cases). template diff --git a/sfw/core/transform.cpp b/sfw/core/transform.cpp index 8e99e77..f118401 100644 --- a/sfw/core/transform.cpp +++ b/sfw/core/transform.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/transform.h" #include "core/math_funcs.h" +//--STRIP void Transform::invert() { basis.transpose(); diff --git a/sfw/core/transform.h b/sfw/core/transform.h index bedfe12..40cb79d 100644 --- a/sfw/core/transform.h +++ b/sfw/core/transform.h @@ -6,11 +6,13 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/aabb.h" #include "core/basis.h" #include "core/plane.h" #include "core/vector3i.h" #include "core/pool_vector.h" +//--STRIP struct _NO_DISCARD_CLASS_ Transform { Basis basis; diff --git a/sfw/core/transform_2d.cpp b/sfw/core/transform_2d.cpp index 48ff3f8..2eb1a72 100644 --- a/sfw/core/transform_2d.cpp +++ b/sfw/core/transform_2d.cpp @@ -3,7 +3,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/transform_2d.h" +//--STRIP void Transform2D::invert() { // FIXME: this function assumes the basis is a rotation matrix, with no scaling. diff --git a/sfw/core/transform_2d.h b/sfw/core/transform_2d.h index 3cefb45..f31faa7 100644 --- a/sfw/core/transform_2d.h +++ b/sfw/core/transform_2d.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/pool_vector.h" #include "core/rect2.h" // also includes vector2, math_funcs, and ustring #include "core/rect2i.h" // also includes vector2i, math_funcs, and ustring +//--STRIP struct _NO_DISCARD_CLASS_ Transform2D { // Warning #1: basis of Transform2D is stored differently from Basis. In terms of columns array, the basis matrix looks like "on paper": diff --git a/sfw/core/typedefs.h b/sfw/core/typedefs.h index 6be82bf..198b3b0 100644 --- a/sfw/core/typedefs.h +++ b/sfw/core/typedefs.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include +//--STRIP /** * Basic definitions and simple functions to be used everywhere. @@ -120,9 +122,11 @@ T *_nullptr() { #undef CONNECT_DEFERRED // override from Windows SDK, clashes with Object enum #endif +//--STRIP #include "core/int_types.h" #include "core/error_list.h" +//--STRIP /** Generic ABS function, for math uses please use Math::abs */ diff --git a/sfw/core/ustring.cpp b/sfw/core/ustring.cpp index 1b8cbeb..e54da02 100644 --- a/sfw/core/ustring.cpp +++ b/sfw/core/ustring.cpp @@ -7,6 +7,7 @@ #define _CRT_SECURE_NO_WARNINGS // to disable build-time warning which suggested to use strcpy_s instead strcpy #endif +//--STRIP #include "core/ustring.h" #include "core/color.h" @@ -21,6 +22,7 @@ #include #include #endif +//--STRIP #if defined(MINGW_ENABLED) || defined(_MSC_VER) #define snprintf _snprintf_s diff --git a/sfw/core/ustring.h b/sfw/core/ustring.h index e8981f4..184e587 100644 --- a/sfw/core/ustring.h +++ b/sfw/core/ustring.h @@ -6,10 +6,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "cowdata.h" #include "core/vector.h" #include "char_utils.h" #include "core/typedefs.h" +//--STRIP /*************************************************************************/ /* CharProxy */ diff --git a/sfw/core/vector.h b/sfw/core/vector.h index d125dbe..3d8e16b 100644 --- a/sfw/core/vector.h +++ b/sfw/core/vector.h @@ -12,10 +12,12 @@ * Vector container. Regular Vector Container. Use with care and for smaller arrays when possible. Use PoolVector for large arrays. */ +//--STRIP #include "cowdata.h" #include "core/sort_array.h" #include "core/error_macros.h" #include "core/memory.h" +//--STRIP template class VectorWriteProxy { diff --git a/sfw/core/vector2.cpp b/sfw/core/vector2.cpp index 532a0e7..aad7a62 100644 --- a/sfw/core/vector2.cpp +++ b/sfw/core/vector2.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector2.h" #include "core/ustring.h" +//--STRIP real_t Vector2::angle() const { return Math::atan2(y, x); diff --git a/sfw/core/vector2.h b/sfw/core/vector2.h index 52fc7ab..c34fb6f 100644 --- a/sfw/core/vector2.h +++ b/sfw/core/vector2.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/math_funcs.h" #include "core/error_macros.h" +//--STRIP class String; diff --git a/sfw/core/vector2i.cpp b/sfw/core/vector2i.cpp index c1b11e9..2602c88 100644 --- a/sfw/core/vector2i.cpp +++ b/sfw/core/vector2i.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector2i.h" #include "core/ustring.h" +//--STRIP Vector2i Vector2i::clamp(const Vector2i &p_min, const Vector2i &p_max) const { return Vector2i( diff --git a/sfw/core/vector2i.h b/sfw/core/vector2i.h index bdaf6ca..b4fa602 100644 --- a/sfw/core/vector2i.h +++ b/sfw/core/vector2i.h @@ -6,10 +6,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/error_macros.h" #include "core/math_funcs.h" #include "core/vector2.h" +//--STRIP class String; diff --git a/sfw/core/vector3.cpp b/sfw/core/vector3.cpp index 0614375..ccdf5e8 100644 --- a/sfw/core/vector3.cpp +++ b/sfw/core/vector3.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector3.h" #include "core/basis.h" +//--STRIP void Vector3::rotate(const Vector3 &p_axis, real_t p_phi) { *this = Basis(p_axis, p_phi).xform(*this); diff --git a/sfw/core/vector3.h b/sfw/core/vector3.h index 66519ec..0b6587f 100644 --- a/sfw/core/vector3.h +++ b/sfw/core/vector3.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/math_funcs.h" #include "core/ustring.h" +//--STRIP struct Basis; diff --git a/sfw/core/vector3i.cpp b/sfw/core/vector3i.cpp index e4f7946..c8bf73c 100644 --- a/sfw/core/vector3i.cpp +++ b/sfw/core/vector3i.cpp @@ -3,10 +3,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector3i.h" #include "core/vector3.h" #include "core/ustring.h" +//--STRIP void Vector3i::set_axis(const int p_axis, const int32_t p_value) { ERR_FAIL_INDEX(p_axis, 3); diff --git a/sfw/core/vector3i.h b/sfw/core/vector3i.h index a988dd3..b6cc3c5 100644 --- a/sfw/core/vector3i.h +++ b/sfw/core/vector3i.h @@ -6,8 +6,10 @@ #ifndef VECTOR3I_H #define VECTOR3I_H +//--STRIP #include "core/error_macros.h" #include "core/math_funcs.h" +//--STRIP class String; struct Vector3; diff --git a/sfw/core/vector4.cpp b/sfw/core/vector4.cpp index d985895..dad471d 100644 --- a/sfw/core/vector4.cpp +++ b/sfw/core/vector4.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector4.h" #include "core/basis.h" +//--STRIP void Vector4::set_axis(const int p_axis, const real_t p_value) { ERR_FAIL_INDEX(p_axis, 4); diff --git a/sfw/core/vector4.h b/sfw/core/vector4.h index f5e835b..aa4c868 100644 --- a/sfw/core/vector4.h +++ b/sfw/core/vector4.h @@ -6,9 +6,11 @@ #ifndef VECTOR4_H #define VECTOR4_H +//--STRIP #include "core/math_defs.h" #include "core/math_funcs.h" #include "core/ustring.h" +//--STRIP struct _NO_DISCARD_CLASS_ Vector4 { enum Axis { diff --git a/sfw/core/vector4i.cpp b/sfw/core/vector4i.cpp index 8a9ada5..1253eff 100644 --- a/sfw/core/vector4i.cpp +++ b/sfw/core/vector4i.cpp @@ -3,10 +3,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector4i.h" #include "core/vector4.h" #include "core/ustring.h" +//--STRIP void Vector4i::set_axis(const int p_axis, const int32_t p_value) { ERR_FAIL_INDEX(p_axis, 4); diff --git a/sfw/core/vector4i.h b/sfw/core/vector4i.h index e1a5249..22afb4f 100644 --- a/sfw/core/vector4i.h +++ b/sfw/core/vector4i.h @@ -6,8 +6,10 @@ #ifndef VECTOR4I_H #define VECTOR4I_H +//--STRIP #include "core/error_macros.h" #include "core/math_funcs.h" +//--STRIP class String; struct Vector4; diff --git a/sfw/core/vmap.h b/sfw/core/vmap.h index 2815c29..8045625 100644 --- a/sfw/core/vmap.h +++ b/sfw/core/vmap.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "cowdata.h" #include "core/typedefs.h" +//--STRIP template class VMap { diff --git a/sfw/core/vset.h b/sfw/core/vset.h index 6e38c7a..d67690b 100644 --- a/sfw/core/vset.h +++ b/sfw/core/vset.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector.h" #include "core/typedefs.h" +//--STRIP template class VSet { diff --git a/sfw/object/array.cpp b/sfw/object/array.cpp index 115d911..50738ee 100644 --- a/sfw/object/array.cpp +++ b/sfw/object/array.cpp @@ -3,6 +3,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "array.h" #include "core/hashfuncs.h" @@ -10,6 +11,7 @@ #include "object/object.h" #include "object/variant.h" #include "core/ustring.h" +//--STRIP class ArrayPrivate { public: diff --git a/sfw/object/array.h b/sfw/object/array.h index 2280656..aaaaddd 100644 --- a/sfw/object/array.h +++ b/sfw/object/array.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/typedefs.h" +//--STRIP class Variant; class ArrayPrivate; diff --git a/sfw/object/core_string_names.cpp b/sfw/object/core_string_names.cpp index 2741fee..5033459 100644 --- a/sfw/object/core_string_names.cpp +++ b/sfw/object/core_string_names.cpp @@ -3,7 +3,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core_string_names.h" +//--STRIP CoreStringNames *CoreStringNames::singleton = nullptr; diff --git a/sfw/object/core_string_names.h b/sfw/object/core_string_names.h index a55d5e4..29acf05 100644 --- a/sfw/object/core_string_names.h +++ b/sfw/object/core_string_names.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/string_name.h" +//--STRIP class CoreStringNames { public: diff --git a/sfw/object/dictionary.cpp b/sfw/object/dictionary.cpp index 8a7e84c..bcf3916 100644 --- a/sfw/object/dictionary.cpp +++ b/sfw/object/dictionary.cpp @@ -3,12 +3,14 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "dictionary.h" #include "core/ordered_hash_map.h" #include "core/safe_refcount.h" #include "object/variant.h" +//--STRIP struct DictionaryPrivate { SafeRefCount refcount; diff --git a/sfw/object/dictionary.h b/sfw/object/dictionary.h index 10762b7..d14a251 100644 --- a/sfw/object/dictionary.h +++ b/sfw/object/dictionary.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/list.h" #include "core/ustring.h" #include "object/array.h" +//--STRIP class Variant; diff --git a/sfw/object/object.cpp b/sfw/object/object.cpp index 44459e1..dfd4431 100644 --- a/sfw/object/object.cpp +++ b/sfw/object/object.cpp @@ -1,9 +1,11 @@ +//--STRIP #include "object/object.h" #include "core/error_macros.h" #include "core/logger.h" #include "object/core_string_names.h" #include "object/object_rc.h" +//--STRIP void Object::set(const StringName &p_name, const Variant &p_value, bool *r_valid) { if (p_name == CoreStringNames::get_singleton()->_meta) { diff --git a/sfw/object/object.h b/sfw/object/object.h index 1badc0d..993185b 100644 --- a/sfw/object/object.h +++ b/sfw/object/object.h @@ -1,6 +1,7 @@ #ifndef OBJECT_H #define OBJECT_H +//--STRIP #include "core/hash_map.h" #include "core/rw_lock.h" #include "core/string_name.h" @@ -10,6 +11,7 @@ #include "object/variant.h" #include "object/dictionary.h" +//--STRIP /*************************************************************************/ /* object.h */ diff --git a/sfw/object/object_id.h b/sfw/object/object_id.h index a5ec4e8..3cba6fe 100644 --- a/sfw/object/object_id.h +++ b/sfw/object/object_id.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/int_types.h" +//--STRIP typedef uint64_t ObjectID; diff --git a/sfw/object/object_rc.h b/sfw/object/object_rc.h index cee9339..eae71c9 100644 --- a/sfw/object/object_rc.h +++ b/sfw/object/object_rc.h @@ -6,10 +6,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/memory.h" #include "core/typedefs.h" #include +//--STRIP class Object; diff --git a/sfw/object/psignal.cpp b/sfw/object/psignal.cpp index aa8307c..62f941f 100644 --- a/sfw/object/psignal.cpp +++ b/sfw/object/psignal.cpp @@ -1,4 +1,6 @@ +//--STRIP #include "psignal.h" +//--STRIP void Signal::connect_static(void (*func)(Signal *)) { StaticSignalEntry *se = new StaticSignalEntry(); diff --git a/sfw/object/psignal.h b/sfw/object/psignal.h index 22bf01b..8a3a5a7 100644 --- a/sfw/object/psignal.h +++ b/sfw/object/psignal.h @@ -1,11 +1,13 @@ #ifndef SIGNAL_H #define SIGNAL_H +//--STRIP #include "core/vector.h" #include "core/ustring.h" #include "object/variant.h" #include "object/reference.h" +//--STRIP class Signal { public: diff --git a/sfw/object/ref_ptr.cpp b/sfw/object/ref_ptr.cpp index a5c3dff..eace787 100644 --- a/sfw/object/ref_ptr.cpp +++ b/sfw/object/ref_ptr.cpp @@ -1,38 +1,14 @@ /*************************************************************************/ /* ref_ptr.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* PANDEMONIUM ENGINE */ -/* https://github.com/Relintai/pandemonium_engine */ -/*************************************************************************/ -/* Copyright (c) 2022-present Péter Magyar. */ -/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ -/* Copyright (c) 2007-2022 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. */ +/* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "ref_ptr.h" #include "object/reference.h" #include "object/resource.h" +//--STRIP void RefPtr::operator=(const RefPtr &p_other) { Ref *ref = reinterpret_cast *>(&data[0]); diff --git a/sfw/object/ref_ptr.h b/sfw/object/ref_ptr.h index 8d0ee7a..0f1c9c4 100644 --- a/sfw/object/ref_ptr.h +++ b/sfw/object/ref_ptr.h @@ -12,7 +12,9 @@ * It's basically an opaque container of a Reference reference, so Variant can use it. */ +//--STRIP #include "core/typedefs.h" +//--STRIP class RefPtr { enum { diff --git a/sfw/object/reference.cpp b/sfw/object/reference.cpp index 85a3ec9..896da76 100644 --- a/sfw/object/reference.cpp +++ b/sfw/object/reference.cpp @@ -1,4 +1,6 @@ +//--STRIP #include "object/reference.h" +//--STRIP /*************************************************************************/ /* reference.cpp */ diff --git a/sfw/object/reference.h b/sfw/object/reference.h index 55b62c0..202ba37 100644 --- a/sfw/object/reference.h +++ b/sfw/object/reference.h @@ -6,10 +6,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/memory.h" #include "core/safe_refcount.h" #include "object/object.h" #include "object/ref_ptr.h" +//--STRIP class Reference : public Object { SFW_OBJECT(Reference, Object); diff --git a/sfw/object/resource.cpp b/sfw/object/resource.cpp index 8e42f38..2a0751a 100644 --- a/sfw/object/resource.cpp +++ b/sfw/object/resource.cpp @@ -1,4 +1,6 @@ +//--STRIP #include "resource.h" +//--STRIP void Resource::emit_changed() { changed.emit(this); diff --git a/sfw/object/resource.h b/sfw/object/resource.h index 0312401..5719b69 100644 --- a/sfw/object/resource.h +++ b/sfw/object/resource.h @@ -1,9 +1,11 @@ #ifndef RESOURCE_H #define RESOURCE_H +//--STRIP #include "object/reference.h" #include "psignal.h" +//--STRIP class Resource : public Reference { SFW_OBJECT(Resource, Reference); diff --git a/sfw/object/variant.cpp b/sfw/object/variant.cpp index 62b0cea..6a9c8a0 100644 --- a/sfw/object/variant.cpp +++ b/sfw/object/variant.cpp @@ -3,17 +3,16 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "variant.h" -//#include "core/core_string_names.h" -//#include "core/io/marshalls.h" - #include "core/math_funcs.h" #include "object/core_string_names.h" #include "object/object.h" #include "object/object_rc.h" #include "object/resource.h" +//--STRIP String Variant::get_type_name(Variant::Type p_type) { switch (p_type) { diff --git a/sfw/object/variant.h b/sfw/object/variant.h index 717def3..27ebb34 100644 --- a/sfw/object/variant.h +++ b/sfw/object/variant.h @@ -6,6 +6,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/aabb.h" #include "core/basis.h" #include "core/color.h" @@ -25,6 +26,7 @@ #include "object/dictionary.h" #include "object/ref_ptr.h" #include "object/object_id.h" +//--STRIP class Object; class ObjectRC; diff --git a/sfw/object/variant_op.cpp b/sfw/object/variant_op.cpp index ce6598a..a079c40 100644 --- a/sfw/object/variant_op.cpp +++ b/sfw/object/variant_op.cpp @@ -3,12 +3,14 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "variant.h" #include "object/core_string_names.h" #include "object/object.h" #include "object/object_rc.h" #include "object/resource.h" +//--STRIP #define CASE_TYPE_ALL(PREFIX, OP) \ CASE_TYPE(PREFIX, OP, INT) \ diff --git a/sfw/render_core/application.cpp b/sfw/render_core/application.cpp index 0661262..2c03259 100644 --- a/sfw/render_core/application.cpp +++ b/sfw/render_core/application.cpp @@ -1,3 +1,4 @@ +//--STRIP #include "render_core/application.h" #include "core/math_defs.h" @@ -10,6 +11,7 @@ #include "core/pool_vector.h" #include "core/string_name.h" #include "object/core_string_names.h" +//--STRIP void Application::input_event(const Ref &event) { ERR_FAIL_COND(scene.is_null()); diff --git a/sfw/render_core/application.h b/sfw/render_core/application.h index feab475..26520c9 100644 --- a/sfw/render_core/application.h +++ b/sfw/render_core/application.h @@ -1,6 +1,7 @@ #ifndef APPLICATION_H #define APPLICATION_H +//--STRIP #include "core/int_types.h" #include @@ -8,6 +9,7 @@ #include "object/reference.h" #include "render_core/scene.h" +//--STRIP class AppWindow; class InputEvent; diff --git a/sfw/render_core/color_material.h b/sfw/render_core/color_material.h index 3adaceb..f2f2ad1 100644 --- a/sfw/render_core/color_material.h +++ b/sfw/render_core/color_material.h @@ -1,9 +1,11 @@ #ifndef COLOR_MATERIAL_H #define COLOR_MATERIAL_H +//--STRIP #include "render_core/material.h" #include "render_core/render_state.h" +//--STRIP class ColorMaterial : public Material { SFW_OBJECT(ColorMaterial, Material); diff --git a/sfw/render_core/color_material_2d.h b/sfw/render_core/color_material_2d.h index 41ceaa9..cd8c332 100644 --- a/sfw/render_core/color_material_2d.h +++ b/sfw/render_core/color_material_2d.h @@ -1,10 +1,12 @@ #ifndef COLOR_MATERIAL_2D_H #define COLOR_MATERIAL_2D_H +//--STRIP #include "render_core/material.h" #include "render_core/texture.h" #include "render_core/render_state.h" +//--STRIP class ColorMaterial2D : public Material { SFW_OBJECT(ColorMaterial2D, Material); diff --git a/sfw/render_core/colored_material.h b/sfw/render_core/colored_material.h index 48b75c9..7bad48e 100644 --- a/sfw/render_core/colored_material.h +++ b/sfw/render_core/colored_material.h @@ -1,11 +1,13 @@ #ifndef COLORED_MATERIAL_H #define COLORED_MATERIAL_H +//--STRIP #include "render_core/material.h" #include "core/color.h" #include "render_core/render_state.h" +//--STRIP class ColoredMaterial : public Material { public: diff --git a/sfw/render_core/font.cpp b/sfw/render_core/font.cpp index 745d1a8..a7bc34b 100644 --- a/sfw/render_core/font.cpp +++ b/sfw/render_core/font.cpp @@ -28,6 +28,7 @@ // http://bitmapmania.m78.com // cooz@m78.com +//--STRIP #include "font.h" #include "window.h" @@ -42,6 +43,7 @@ #include "render_core/image.h" #include "render_core/mesh.h" #include "render_core/texture.h" +//--STRIP void Font::load_default(const float size, const uint32_t flags) { font_face_from_mem(bm_mini_ttf, 20176, size, flags); diff --git a/sfw/render_core/font.h b/sfw/render_core/font.h index 4a57611..d95ddc4 100644 --- a/sfw/render_core/font.h +++ b/sfw/render_core/font.h @@ -5,12 +5,14 @@ // font framework originally from FWK // - rlyeh, public domain +//--STRIP #include "core/color.h" #include "core/ustring.h" #include "object/resource.h" #include "font_material.h" +//--STRIP class Image; class Texture; diff --git a/sfw/render_core/font_material.h b/sfw/render_core/font_material.h index 57982fa..46b6a53 100644 --- a/sfw/render_core/font_material.h +++ b/sfw/render_core/font_material.h @@ -1,10 +1,12 @@ #ifndef FONT_MATERIAL_H #define FONT_MATERIAL_H +//--STRIP #include "render_core/material.h" #include "render_core/texture.h" #include "render_core/render_state.h" +//--STRIP class FontMaterial : public Material { SFW_OBJECT(FontMaterial, Material); diff --git a/sfw/render_core/image.cpp b/sfw/render_core/image.cpp index c35f2fa..2216904 100644 --- a/sfw/render_core/image.cpp +++ b/sfw/render_core/image.cpp @@ -3,6 +3,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "render_core/image.h" #include "core/error_macros.h" @@ -23,6 +24,7 @@ //{{FILE:3rd_stb_image_write.h}} //--- #undef freelist +//--STRIP const char *Image::format_names[Image::FORMAT_MAX] = { "Lum8", // luminance diff --git a/sfw/render_core/image.h b/sfw/render_core/image.h index 0634b37..5dc0da8 100644 --- a/sfw/render_core/image.h +++ b/sfw/render_core/image.h @@ -6,12 +6,14 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/color.h" #include "core/rect2.h" #include "core/rect2i.h" #include "object/reference.h" #include "core/vector.h" #include "core/vector2i.h" +//--STRIP class Image : public Reference { SFW_OBJECT(Image, Reference); diff --git a/sfw/render_core/input.cpp b/sfw/render_core/input.cpp index f044655..c453919 100644 --- a/sfw/render_core/input.cpp +++ b/sfw/render_core/input.cpp @@ -3,6 +3,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "input.h" #include "core/logger.h" @@ -14,6 +15,7 @@ #include "render_core/window.h" #include "render_core/3rd_glfw3.h" +//--STRIP Input *Input::get_singleton() { return singleton; diff --git a/sfw/render_core/input.h b/sfw/render_core/input.h index 6eef5bb..fae4a1a 100644 --- a/sfw/render_core/input.h +++ b/sfw/render_core/input.h @@ -6,6 +6,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/vector2i.h" #include "object/object.h" #include "core/rb_map.h" @@ -14,6 +15,7 @@ #include "object/psignal.h" #include "object/reference.h" #include "render_core/input_event.h" +//--STRIP class Application; struct GLFWwindow; diff --git a/sfw/render_core/input_event.cpp b/sfw/render_core/input_event.cpp index e06a121..d29516c 100644 --- a/sfw/render_core/input_event.cpp +++ b/sfw/render_core/input_event.cpp @@ -3,11 +3,13 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "input_event.h" #include "render_core/input_map.h" #include "render_core/keyboard.h" #include "render_core/shortcut.h" +//--STRIP const int InputEvent::DEVICE_ID_TOUCH_MOUSE = -1; const int InputEvent::DEVICE_ID_INTERNAL = -2; diff --git a/sfw/render_core/input_event.h b/sfw/render_core/input_event.h index 4197a72..9617fd7 100644 --- a/sfw/render_core/input_event.h +++ b/sfw/render_core/input_event.h @@ -6,10 +6,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/transform_2d.h" #include "core/typedefs.h" #include "core/ustring.h" #include "object/resource.h" +//--STRIP /** * Input Event classes. These are used in the main loop. diff --git a/sfw/render_core/input_map.cpp b/sfw/render_core/input_map.cpp index fde00cd..2b44c7b 100644 --- a/sfw/render_core/input_map.cpp +++ b/sfw/render_core/input_map.cpp @@ -3,10 +3,12 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "input_map.h" #include "render_core/input.h" #include "render_core/keyboard.h" +//--STRIP InputMap *InputMap::singleton = nullptr; diff --git a/sfw/render_core/input_map.h b/sfw/render_core/input_map.h index 8203c44..d2f9b10 100644 --- a/sfw/render_core/input_map.h +++ b/sfw/render_core/input_map.h @@ -6,9 +6,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "render_core/input_event.h" #include "object/object.h" #include "core/rb_map.h" +//--STRIP class InputMap : public Object { SFW_OBJECT(InputMap, Object); diff --git a/sfw/render_core/keyboard.cpp b/sfw/render_core/keyboard.cpp index 80b564e..4e3ac7c 100644 --- a/sfw/render_core/keyboard.cpp +++ b/sfw/render_core/keyboard.cpp @@ -3,7 +3,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "keyboard.h" +//--STRIP struct _KeyCodeText { int code; diff --git a/sfw/render_core/keyboard.h b/sfw/render_core/keyboard.h index fda30bc..b7c300e 100644 --- a/sfw/render_core/keyboard.h +++ b/sfw/render_core/keyboard.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/ustring.h" +//--STRIP /* Special Key: diff --git a/sfw/render_core/material.cpp b/sfw/render_core/material.cpp index ccc58e1..0306e1e 100644 --- a/sfw/render_core/material.cpp +++ b/sfw/render_core/material.cpp @@ -1,6 +1,8 @@ +//--STRIP #include "render_core/material.h" #include +//--STRIP void Material::bind() { //csak main thread! diff --git a/sfw/render_core/material.h b/sfw/render_core/material.h index 7f3dbee..487b279 100644 --- a/sfw/render_core/material.h +++ b/sfw/render_core/material.h @@ -1,11 +1,13 @@ #ifndef MATERIAL_H #define MATERIAL_H +//--STRIP #include "core/projection.h" #include "core/transform.h" #include "core/transform_2d.h" #include "object/reference.h" #include "render_core/shader.h" +//--STRIP class Material : public Reference { SFW_OBJECT(Material, Reference); diff --git a/sfw/render_core/mesh.cpp b/sfw/render_core/mesh.cpp index 70ce8d9..d57bd04 100644 --- a/sfw/render_core/mesh.cpp +++ b/sfw/render_core/mesh.cpp @@ -1,6 +1,8 @@ +//--STRIP #include "render_core/mesh.h" #include "render_core/shader.h" +//--STRIP void Mesh::add_vertex2(float x, float y) { vertices.push_back(x); diff --git a/sfw/render_core/mesh.h b/sfw/render_core/mesh.h index 5a06fbb..2a01d8c 100644 --- a/sfw/render_core/mesh.h +++ b/sfw/render_core/mesh.h @@ -1,6 +1,7 @@ #ifndef MESH_H #define MESH_H +//--STRIP #include "core/vector.h" #include "core/int_types.h" #include "core/color.h" @@ -8,6 +9,7 @@ #include "object/resource.h" #include "render_core/3rd_glad.h" +//--STRIP class Mesh : public Resource { SFW_OBJECT(Mesh, Resource); diff --git a/sfw/render_core/mesh_utils.cpp b/sfw/render_core/mesh_utils.cpp index ca5e28c..efc1ae4 100644 --- a/sfw/render_core/mesh_utils.cpp +++ b/sfw/render_core/mesh_utils.cpp @@ -1,4 +1,6 @@ +//--STRIP #include "render_core/mesh_utils.h" +//--STRIP void MeshUtils::create_cone(Mesh *mesh) { if (!mesh) diff --git a/sfw/render_core/mesh_utils.h b/sfw/render_core/mesh_utils.h index f62c24f..0b1b124 100644 --- a/sfw/render_core/mesh_utils.h +++ b/sfw/render_core/mesh_utils.h @@ -1,7 +1,9 @@ #ifndef MESH_UTILS_H #define MESH_UTILS_H +//--STRIP #include "render_core/mesh.h" +//--STRIP class MeshUtils { public: diff --git a/sfw/render_core/primitive_meshes.cpp b/sfw/render_core/primitive_meshes.cpp index 383bd8f..3c17afc 100644 --- a/sfw/render_core/primitive_meshes.cpp +++ b/sfw/render_core/primitive_meshes.cpp @@ -3,6 +3,7 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "primitive_meshes.h" #include "servers/rendering_server.h" @@ -11,6 +12,7 @@ #include "scene/resources/theme.h" #include "thirdparty/misc/clipper.hpp" #include "thirdparty/misc/triangulator.h" +//--STRIP /** PrimitiveMesh diff --git a/sfw/render_core/primitive_meshes.h b/sfw/render_core/primitive_meshes.h index 46d9340..1c50956 100644 --- a/sfw/render_core/primitive_meshes.h +++ b/sfw/render_core/primitive_meshes.h @@ -6,8 +6,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "scene/resources/font/font.h" #include "scene/resources/mesh/mesh.h" +//--STRIP ///@TODO probably should change a few integers to unsigned integers... diff --git a/sfw/render_core/render_state.cpp b/sfw/render_core/render_state.cpp index a535aff..fb22666 100644 --- a/sfw/render_core/render_state.cpp +++ b/sfw/render_core/render_state.cpp @@ -1,4 +1,6 @@ +//--STRIP #include "render_core/render_state.h" +//--STRIP Transform RenderState::camera_transform_3d; Transform RenderState::model_view_matrix_3d; diff --git a/sfw/render_core/render_state.h b/sfw/render_core/render_state.h index adbf4de..3843425 100644 --- a/sfw/render_core/render_state.h +++ b/sfw/render_core/render_state.h @@ -1,11 +1,13 @@ #ifndef RENDER_STATE_H #define RENDER_STATE_H +//--STRIP #include "core/projection.h" #include "core/transform.h" #include "core/vector3.h" #include "core/transform_2d.h" #include "core/vector2.h" +//--STRIP class RenderState { public: diff --git a/sfw/render_core/scene.cpp b/sfw/render_core/scene.cpp index 7bf6aee..c5b641d 100644 --- a/sfw/render_core/scene.cpp +++ b/sfw/render_core/scene.cpp @@ -1,6 +1,8 @@ +//--STRIP #include "render_core/scene.h" #include "render_core/input_event.h" +//--STRIP void Scene::input_event(const Ref &event) { } diff --git a/sfw/render_core/scene.h b/sfw/render_core/scene.h index 323a861..a98d78e 100644 --- a/sfw/render_core/scene.h +++ b/sfw/render_core/scene.h @@ -1,8 +1,10 @@ #ifndef SCENE_H #define SCENE_H +//--STRIP #include "object/reference.h" #include "render_core/input_event.h" +//--STRIP class Scene : public Reference { SFW_OBJECT(Scene, Reference); diff --git a/sfw/render_core/shader.cpp b/sfw/render_core/shader.cpp index 6845039..ecd33f0 100644 --- a/sfw/render_core/shader.cpp +++ b/sfw/render_core/shader.cpp @@ -1,6 +1,8 @@ +//--STRIP #include "render_core/shader.h" #include +//--STRIP bool Shader::bind() { if (current_shader != this) { diff --git a/sfw/render_core/shader.h b/sfw/render_core/shader.h index 5c2c52b..3d4c0f9 100644 --- a/sfw/render_core/shader.h +++ b/sfw/render_core/shader.h @@ -1,8 +1,10 @@ #ifndef SHADER_H #define SHADER_H +//--STRIP #include "render_core/3rd_glad.h" #include "core/hash_map.h" +//--STRIP class Shader { public: diff --git a/sfw/render_core/shortcut.cpp b/sfw/render_core/shortcut.cpp index 78ac0d2..35fe2dc 100644 --- a/sfw/render_core/shortcut.cpp +++ b/sfw/render_core/shortcut.cpp @@ -3,9 +3,11 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "shortcut.h" #include "render_core/input_event.h" +//--STRIP void ShortCut::set_shortcut(const Ref &p_shortcut) { shortcut = p_shortcut; diff --git a/sfw/render_core/shortcut.h b/sfw/render_core/shortcut.h index a2ddd1b..882cd7b 100644 --- a/sfw/render_core/shortcut.h +++ b/sfw/render_core/shortcut.h @@ -6,7 +6,9 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "object/resource.h" +//--STRIP class InputEvent; diff --git a/sfw/render_core/texture.cpp b/sfw/render_core/texture.cpp index 1d3c0a6..1b5f332 100644 --- a/sfw/render_core/texture.cpp +++ b/sfw/render_core/texture.cpp @@ -1,9 +1,11 @@ +//--STRIP #include "render_core/texture.h" #include "core/memory.h" #include #include "render_core/window.h" +//--STRIP void Texture::create_from_image(const Ref &img) { if (_image == img) { diff --git a/sfw/render_core/texture.h b/sfw/render_core/texture.h index 753862c..f41f35a 100644 --- a/sfw/render_core/texture.h +++ b/sfw/render_core/texture.h @@ -1,11 +1,13 @@ #ifndef TEXTURE_H #define TEXTURE_H +//--STRIP #include "core/vector2i.h" #include "object/resource.h" #include "render_core/3rd_glad.h" #include "render_core/image.h" +//--STRIP class Texture : public Resource { SFW_OBJECT(Texture, Resource); diff --git a/sfw/render_core/texture_material.h b/sfw/render_core/texture_material.h index 3cc11cb..f3f0a23 100644 --- a/sfw/render_core/texture_material.h +++ b/sfw/render_core/texture_material.h @@ -1,10 +1,12 @@ #ifndef TEXTURE_MATERIAL_H #define TEXTURE_MATERIAL_H +//--STRIP #include "render_core/material.h" #include "render_core/texture.h" #include "render_core/render_state.h" +//--STRIP class TextureMaterial : public Material { SFW_OBJECT(TextureMaterial, Material); diff --git a/sfw/render_core/texture_material_2d.h b/sfw/render_core/texture_material_2d.h index 5a4248f..f95f79f 100644 --- a/sfw/render_core/texture_material_2d.h +++ b/sfw/render_core/texture_material_2d.h @@ -1,10 +1,12 @@ #ifndef TEXTURE_MATERIAL_2D_H #define TEXTURE_MATERIAL_2D_H +//--STRIP #include "render_core/material.h" #include "render_core/texture.h" #include "render_core/render_state.h" +//--STRIP class TextureMaterial2D : public Material { SFW_OBJECT(TextureMaterial2D, Material); diff --git a/sfw/render_core/transparent_texture_material.h b/sfw/render_core/transparent_texture_material.h index 710ebb8..5f6eb73 100644 --- a/sfw/render_core/transparent_texture_material.h +++ b/sfw/render_core/transparent_texture_material.h @@ -1,10 +1,12 @@ #ifndef TRANSPARENT_TEXTURE_MATERIAL_H #define TRANSPARENT_TEXTURE_MATERIAL_H +//--STRIP #include "render_core/material.h" #include "render_core/texture.h" #include "render_core/render_state.h" +//--STRIP class TransparentTextureMaterial : public Material { SFW_OBJECT(TransparentTextureMaterial, Material); diff --git a/sfw/render_core/window.cpp b/sfw/render_core/window.cpp index 49c25a5..cc97e5c 100644 --- a/sfw/render_core/window.cpp +++ b/sfw/render_core/window.cpp @@ -1,6 +1,7 @@ //----------------------------------------------------------------------------- // fps locking +//--STRIP #include "render_core/window.h" #define GLAD_GL_IMPLEMENTATION // glad @@ -29,6 +30,7 @@ #include "core/vector4.h" #include "render_core/application.h" #include "render_core/input.h" +//--STRIP /* static volatile float framerate = 0; diff --git a/sfw/render_core/window.h b/sfw/render_core/window.h index 173383d..13b7afb 100644 --- a/sfw/render_core/window.h +++ b/sfw/render_core/window.h @@ -9,9 +9,11 @@ // @todo: if WINDOW_PORTRAIT && exist portrait monitor, use that instead of primary one // @todo: WINDOW_TRAY +//--STRIP #include "core/color.h" #include "core/int_types.h" #include "core/vector2.h" +//--STRIP struct GLFWwindow; struct GLFWcursor; diff --git a/sfw/render_immediate/renderer.cpp b/sfw/render_immediate/renderer.cpp index b04e75c..dcc642e 100644 --- a/sfw/render_immediate/renderer.cpp +++ b/sfw/render_immediate/renderer.cpp @@ -1,3 +1,4 @@ +//--STRIP #include "renderer.h" #include "render_core/color_material_2d.h" @@ -10,6 +11,7 @@ #include "render_core/window.h" #include "render_core/render_state.h" +//--STRIP bool Renderer::get_depth_buffer_enable() const { return _depth_buffer; diff --git a/sfw/render_immediate/renderer.h b/sfw/render_immediate/renderer.h index e1ecb57..7620dc3 100644 --- a/sfw/render_immediate/renderer.h +++ b/sfw/render_immediate/renderer.h @@ -1,6 +1,7 @@ #ifndef RENDERER_H #define RENDERER_H +//--STRIP #include "core/color.h" #include "core/rect2.h" #include "core/transform.h" @@ -9,6 +10,7 @@ #include "object/object.h" #include "object/reference.h" +//--STRIP class Mesh; class Material; diff --git a/sfw/render_objects/camera_2d.cpp b/sfw/render_objects/camera_2d.cpp index abafacc..e20f169 100644 --- a/sfw/render_objects/camera_2d.cpp +++ b/sfw/render_objects/camera_2d.cpp @@ -1,8 +1,10 @@ +//--STRIP #include "render_objects/camera_2d.h" #include "core/math_funcs.h" #include "render_core/render_state.h" +//--STRIP Transform2D Camera2D::get_model_view_matrix() { return _model_view_matrix; diff --git a/sfw/render_objects/camera_2d.h b/sfw/render_objects/camera_2d.h index 0baec82..ac6c2b8 100644 --- a/sfw/render_objects/camera_2d.h +++ b/sfw/render_objects/camera_2d.h @@ -1,6 +1,7 @@ #ifndef CAMERA_2D_H #define CAMERA_2D_H +//--STRIP #include "render_core/3rd_glad.h" #include "render_objects/object_2d.h" @@ -8,6 +9,7 @@ #include "core/transform.h" #include "core/transform_2d.h" #include "core/vector2.h" +//--STRIP class Camera2D : public Object2D { SFW_OBJECT(Camera2D, Object2D); diff --git a/sfw/render_objects/camera_3d.cpp b/sfw/render_objects/camera_3d.cpp index 1eeddad..5da2fc8 100644 --- a/sfw/render_objects/camera_3d.cpp +++ b/sfw/render_objects/camera_3d.cpp @@ -1,8 +1,10 @@ +//--STRIP #include "render_objects/camera_3d.h" #include "core/math_funcs.h" #include "render_core/render_state.h" +//--STRIP Transform Camera3D::get_camera_transform() { return _camera_transform; diff --git a/sfw/render_objects/camera_3d.h b/sfw/render_objects/camera_3d.h index c9800cc..b67335f 100644 --- a/sfw/render_objects/camera_3d.h +++ b/sfw/render_objects/camera_3d.h @@ -1,6 +1,7 @@ #ifndef CAMERA_3D_H #define CAMERA_3D_H +//--STRIP #include "render_core/3rd_glad.h" #include "render_objects/object_3d.h" @@ -8,6 +9,7 @@ #include "core/projection.h" #include "core/transform.h" #include "core/vector3.h" +//--STRIP class Camera3D : public Object3D { SFW_OBJECT(Camera3D, Object3D); diff --git a/sfw/render_objects/mesh_instance_2d.cpp b/sfw/render_objects/mesh_instance_2d.cpp index abe5ff6..cfb2415 100644 --- a/sfw/render_objects/mesh_instance_2d.cpp +++ b/sfw/render_objects/mesh_instance_2d.cpp @@ -1,6 +1,8 @@ +//--STRIP #include "render_objects/mesh_instance_2d.h" #include "render_objects/camera_2d.h" +//--STRIP void MeshInstance2D::render() { if (!mesh.is_valid()) { diff --git a/sfw/render_objects/mesh_instance_2d.h b/sfw/render_objects/mesh_instance_2d.h index d30c76e..119f7fa 100644 --- a/sfw/render_objects/mesh_instance_2d.h +++ b/sfw/render_objects/mesh_instance_2d.h @@ -1,12 +1,14 @@ #ifndef MESH_INSTACE_2D_H #define MESH_INSTACE_2D_H +//--STRIP #include "core/vector.h" #include "render_core/material.h" #include "render_core/mesh.h" #include "core/transform.h" +//--STRIP class MeshInstance2D { public: diff --git a/sfw/render_objects/mesh_instance_3d.cpp b/sfw/render_objects/mesh_instance_3d.cpp index f115c96..3676132 100644 --- a/sfw/render_objects/mesh_instance_3d.cpp +++ b/sfw/render_objects/mesh_instance_3d.cpp @@ -1,6 +1,8 @@ +//--STRIP #include "render_objects/mesh_instance_3d.h" #include "render_objects/camera_3d.h" +//--STRIP void MeshInstance3D::render() { if (!mesh) { diff --git a/sfw/render_objects/mesh_instance_3d.h b/sfw/render_objects/mesh_instance_3d.h index 24d0b6d..c5fe135 100644 --- a/sfw/render_objects/mesh_instance_3d.h +++ b/sfw/render_objects/mesh_instance_3d.h @@ -1,6 +1,7 @@ #ifndef MESH_INSTACE_3D_H #define MESH_INSTACE_3D_H +//--STRIP #include "core/vector.h" #include "render_objects/object_3d.h" @@ -9,6 +10,7 @@ #include "render_core/mesh.h" #include "core/transform.h" +//--STRIP class MeshInstance3D : public Object3D { public: diff --git a/sfw/render_objects/object_2d.cpp b/sfw/render_objects/object_2d.cpp index 24cd893..8f90fb6 100644 --- a/sfw/render_objects/object_2d.cpp +++ b/sfw/render_objects/object_2d.cpp @@ -1,5 +1,6 @@ +//--STRIP #include "render_objects/object_2d.h" - +//--STRIP Object2D::Object2D() { } diff --git a/sfw/render_objects/object_2d.h b/sfw/render_objects/object_2d.h index c568529..885eb92 100644 --- a/sfw/render_objects/object_2d.h +++ b/sfw/render_objects/object_2d.h @@ -1,9 +1,11 @@ #ifndef OBJECT_2D_H #define OBJECT_2D_H +//--STRIP #include "object/object.h" #include "core/transform_2d.h" +//--STRIP class Object2D : public Object { SFW_OBJECT(Object2D, Object); diff --git a/sfw/render_objects/object_3d.cpp b/sfw/render_objects/object_3d.cpp index 6892082..3f37411 100644 --- a/sfw/render_objects/object_3d.cpp +++ b/sfw/render_objects/object_3d.cpp @@ -1,5 +1,6 @@ +//--STRIP #include "render_objects/object_3d.h" - +//--STRIP Object3D::Object3D() { } diff --git a/sfw/render_objects/object_3d.h b/sfw/render_objects/object_3d.h index 7b096ca..65d399b 100644 --- a/sfw/render_objects/object_3d.h +++ b/sfw/render_objects/object_3d.h @@ -1,9 +1,11 @@ #ifndef OBJECT_3D_H #define OBJECT_3D_H +//--STRIP #include "object/object.h" #include "core/transform.h" +//--STRIP class Object3D : public Object { SFW_OBJECT(Object3D, Object); diff --git a/sfw/render_objects/sprite.cpp b/sfw/render_objects/sprite.cpp index e12dabc..a55efc2 100644 --- a/sfw/render_objects/sprite.cpp +++ b/sfw/render_objects/sprite.cpp @@ -1,4 +1,6 @@ +//--STRIP #include "render_objects/sprite.h" +//--STRIP void Sprite::render() { /* diff --git a/sfw/render_objects/sprite.h b/sfw/render_objects/sprite.h index 23434f0..b202fa4 100644 --- a/sfw/render_objects/sprite.h +++ b/sfw/render_objects/sprite.h @@ -1,10 +1,12 @@ #ifndef SPRITE_H #define SPRITE_H +//--STRIP #include "render_objects/object_2d.h" #include "core/transform_2d.h" #include "render_objects/mesh_instance_2d.h" +//--STRIP class Sprite : public Object2D { public: diff --git a/sfw/render_objects/text_2d.cpp b/sfw/render_objects/text_2d.cpp index 2378d20..70b06ed 100644 --- a/sfw/render_objects/text_2d.cpp +++ b/sfw/render_objects/text_2d.cpp @@ -1,9 +1,11 @@ +//--STRIP #include "render_objects/text_2d.h" #include "render_core/font.h" #include "render_core/font_material.h" #include "render_core/mesh.h" #include "render_objects/camera_2d.h" +//--STRIP Color Text2D::get_text_color() const { return _text_color; diff --git a/sfw/render_objects/text_2d.h b/sfw/render_objects/text_2d.h index f0b6cfa..d91d331 100644 --- a/sfw/render_objects/text_2d.h +++ b/sfw/render_objects/text_2d.h @@ -1,6 +1,7 @@ #ifndef TEXT_2D_H #define TEXT_2D_H +//--STRIP #include "core/color.h" #include "core/ustring.h" #include "core/vector2.h" @@ -8,6 +9,7 @@ #include "object/reference.h" #include "object_2d.h" +//--STRIP class Font; class FontMaterial; diff --git a/sfw/render_objects/tile_map.cpp b/sfw/render_objects/tile_map.cpp index 3d26f90..227f63c 100644 --- a/sfw/render_objects/tile_map.cpp +++ b/sfw/render_objects/tile_map.cpp @@ -1,6 +1,8 @@ +//--STRIP #include "render_objects/tile_map.h" #include "render_objects/camera_2d.h" +//--STRIP void TileMap::build_mesh() { if (!mesh.is_valid()) { diff --git a/sfw/render_objects/tile_map.h b/sfw/render_objects/tile_map.h index e29375e..025b0c6 100644 --- a/sfw/render_objects/tile_map.h +++ b/sfw/render_objects/tile_map.h @@ -1,11 +1,13 @@ #ifndef TILE_MAP_H #define TILE_MAP_H +//--STRIP #include "render_objects/object_2d.h" #include "render_core/mesh.h" #include "render_core/material.h" +//--STRIP class TileMap : public Object2D { SFW_OBJECT(TileMap, Object2D); diff --git a/tools/merger/sfw.h.inl b/tools/merger/sfw.h.inl index dd46f2a..2640b81 100644 --- a/tools/merger/sfw.h.inl +++ b/tools/merger/sfw.h.inl @@ -33,7 +33,8 @@ SOFTWARE. #include //--STRIP -//no includes +//#include "core/int_types.h" +//#include "core/error_list.h" //--STRIP {{FILE:sfw/core/typedefs.h}} //--STRIP