From 173a1ec5abaa09b35359c9e4f40fc2dbb222a03b Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 13 Jan 2024 19:00:29 +0100 Subject: [PATCH] Strip the include guards when merging the headers. --- sfw/core/aabb.h | 4 +++ sfw/core/basis.h | 5 +++ sfw/core/char_range.inc | 4 +++ sfw/core/char_utils.h | 4 +++ sfw/core/color.h | 4 +++ sfw/core/cowdata.h | 4 +++ sfw/core/dir_access.h | 5 ++- sfw/core/error_list.h | 4 +++ sfw/core/error_macros.h | 4 +++ sfw/core/face3.h | 4 +++ sfw/core/file_access.cpp | 28 +--------------- sfw/core/file_access.h | 33 +++---------------- sfw/core/hash_map.h | 4 +++ sfw/core/hash_set.h | 4 +++ sfw/core/hashfuncs.h | 4 +++ sfw/core/inet_address.h | 4 +++ sfw/core/list.h | 4 +++ sfw/core/local_vector.h | 4 +++ sfw/core/logger.h | 5 ++- sfw/core/marshalls.h | 6 ++++ sfw/core/math_defs.h | 4 +++ sfw/core/math_funcs.h | 4 +++ sfw/core/memory.h | 4 +++ sfw/core/mutex.h | 4 +++ sfw/core/og_hash_map.h | 4 +++ sfw/core/ordered_hash_map.h | 4 +++ sfw/core/paged_allocator.h | 4 +++ sfw/core/pair.h | 4 +++ sfw/core/pcg.h | 4 +++ sfw/core/plane.h | 4 +++ sfw/core/pool_allocator.h | 4 +++ sfw/core/pool_vector.h | 4 +++ sfw/core/projection.h | 11 ++++--- sfw/core/quaternion.h | 4 +++ sfw/core/random_pcg.h | 4 +++ sfw/core/rb_map.h | 4 +++ sfw/core/rb_set.h | 4 +++ sfw/core/rect2.h | 4 +++ sfw/core/rect2i.h | 5 +++ sfw/core/ring_buffer.h | 4 +++ sfw/core/rw_lock.h | 4 +++ sfw/core/safe_refcount.h | 4 +++ sfw/core/sfw_core.h | 5 ++- sfw/core/socket.h | 4 +++ sfw/core/sort_array.h | 4 +++ sfw/core/spin_lock.h | 5 +++ sfw/core/stime.h | 4 +++ sfw/core/string_name.h | 4 +++ sfw/core/sub_process.h | 4 +++ sfw/core/thread.h | 4 +++ sfw/core/thread_safe.h | 4 +++ sfw/core/tight_local_vector.h | 4 +++ sfw/core/transform.h | 4 +++ sfw/core/transform_2d.h | 4 +++ sfw/core/typedefs.h | 4 +++ sfw/core/ucaps.h | 5 +++ sfw/core/ustring.h | 4 +++ sfw/core/vector.h | 4 +++ sfw/core/vector2.h | 4 +++ sfw/core/vector2i.h | 4 +++ sfw/core/vector3.h | 4 +++ sfw/core/vector3i.h | 10 ++++-- sfw/core/vector4.h | 10 ++++-- sfw/core/vector4i.h | 10 ++++-- sfw/core/version.h | 4 +++ sfw/core/vmap.h | 5 +++ sfw/core/vset.h | 4 +++ sfw/object/array.h | 4 +++ sfw/object/core_string_names.h | 4 +++ sfw/object/dictionary.h | 4 +++ sfw/object/object.h | 4 +++ sfw/object/object_id.h | 4 +++ sfw/object/object_rc.h | 4 +++ sfw/object/psignal.h | 4 +++ sfw/object/ref_ptr.h | 4 +++ sfw/object/reference.h | 4 +++ sfw/object/resource.h | 4 +++ sfw/object/variant.h | 5 +++ sfw/render_core/application.h | 4 +++ sfw/render_core/color_material.h | 4 +++ sfw/render_core/color_material_2d.h | 5 ++- sfw/render_core/colored_material.h | 4 +++ sfw/render_core/font.h | 4 +++ sfw/render_core/font_material.h | 4 +++ sfw/render_core/image.h | 4 +++ sfw/render_core/input.h | 4 +++ sfw/render_core/input_event.h | 4 +++ sfw/render_core/input_map.h | 4 +++ sfw/render_core/keyboard.h | 4 +++ sfw/render_core/material.h | 4 +++ sfw/render_core/mesh.h | 4 +++ sfw/render_core/mesh_utils.h | 4 +++ sfw/render_core/render_state.h | 5 ++- sfw/render_core/scene.h | 4 +++ sfw/render_core/shader.h | 4 +++ sfw/render_core/shortcut.h | 4 +++ sfw/render_core/texture.h | 4 +++ sfw/render_core/texture_material.h | 4 +++ sfw/render_core/texture_material_2d.h | 4 +++ .../transparent_texture_material.h | 4 +++ sfw/render_core/window.h | 4 +++ sfw/render_immediate/renderer.h | 4 +++ sfw/render_objects/camera_2d.h | 4 +++ sfw/render_objects/camera_3d.h | 4 +++ sfw/render_objects/mesh_instance_2d.h | 4 +++ sfw/render_objects/mesh_instance_3d.h | 4 +++ sfw/render_objects/object_2d.h | 5 ++- sfw/render_objects/object_3d.h | 4 +++ sfw/render_objects/sprite.h | 5 ++- sfw/render_objects/text_2d.h | 4 +++ sfw/render_objects/tile_map.h | 4 +++ tools/merger/sfw_core.h.inl | 1 + tools/merger/sfw_full.h.inl | 1 + 113 files changed, 464 insertions(+), 75 deletions(-) diff --git a/sfw/core/aabb.h b/sfw/core/aabb.h index 15def54..407b225 100644 --- a/sfw/core/aabb.h +++ b/sfw/core/aabb.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef AABB_H #define AABB_H +//--STRIP /*************************************************************************/ /* aabb.h */ @@ -434,4 +436,6 @@ AABB AABB::quantized(real_t p_unit) const { return ret; } +//--STRIP #endif // AABB_H +//--STRIP diff --git a/sfw/core/basis.h b/sfw/core/basis.h index b4dd654..6f94b91 100644 --- a/sfw/core/basis.h +++ b/sfw/core/basis.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef BASIS_H #define BASIS_H +//--STRIP /*************************************************************************/ /* basis.h */ @@ -377,4 +379,7 @@ Basis Basis::lerp(const Basis &p_to, const real_t &p_weight) const { return b; } + +//--STRIP #endif // BASIS_H +//--STRIP diff --git a/sfw/core/char_range.inc b/sfw/core/char_range.inc index da9a9ee..3fe945f 100644 --- a/sfw/core/char_range.inc +++ b/sfw/core/char_range.inc @@ -3,8 +3,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #ifndef CHAR_RANGE_INC #define CHAR_RANGE_INC +//--STRIP //--STRIP #include "core/typedefs.h" @@ -1430,4 +1432,6 @@ static CharRange xid_continue[] = { { 0x0, 0x0 }, }; +//--STRIP #endif // CHAR_RANGE_INC +//--STRIP diff --git a/sfw/core/char_utils.h b/sfw/core/char_utils.h index 3e8912f..4714c11 100644 --- a/sfw/core/char_utils.h +++ b/sfw/core/char_utils.h @@ -3,8 +3,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #ifndef CHAR_UTILS_H #define CHAR_UTILS_H +//--STRIP //--STRIP #include "core/typedefs.h" @@ -86,4 +88,6 @@ static _FORCE_INLINE_ bool is_underscore(char32_t p_char) { return (p_char == '_'); } +//--STRIP #endif // CHAR_UTILS_H +//--STRIP diff --git a/sfw/core/color.h b/sfw/core/color.h index 22f49dc..b4d6096 100644 --- a/sfw/core/color.h +++ b/sfw/core/color.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef COLOR_H #define COLOR_H +//--STRIP /*************************************************************************/ /* color.h */ @@ -240,4 +242,6 @@ bool Color::operator<(const Color &p_color) const { } } +//--STRIP #endif +//--STRIP diff --git a/sfw/core/cowdata.h b/sfw/core/cowdata.h index b9ac1aa..416a4ac 100644 --- a/sfw/core/cowdata.h +++ b/sfw/core/cowdata.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef COWDATA_H_ #define COWDATA_H_ +//--STRIP /*************************************************************************/ /* cowdata.h */ @@ -368,4 +370,6 @@ CowData::~CowData() { _unref(_ptr); } +//--STRIP #endif /* COW_H_ */ +//--STRIP diff --git a/sfw/core/dir_access.h b/sfw/core/dir_access.h index af46540..59a3729 100644 --- a/sfw/core/dir_access.h +++ b/sfw/core/dir_access.h @@ -1,6 +1,7 @@ - +//--STRIP #ifndef DIR_ACCESS_H #define DIR_ACCESS_H +//--STRIP /*************************************************************************/ /* dir_access.h */ @@ -135,4 +136,6 @@ struct DirAccessRef { } }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/error_list.h b/sfw/core/error_list.h index 521e534..848c268 100644 --- a/sfw/core/error_list.h +++ b/sfw/core/error_list.h @@ -3,8 +3,10 @@ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #ifndef ERROR_LIST_H #define ERROR_LIST_H +//--STRIP /** Error List. Please never compare an error against FAILED * Either do result != OK , or !result. This way, Error fail @@ -65,4 +67,6 @@ enum Error { ERR_PRINTER_ON_FIRE, /// the parallel port printer is engulfed in flames }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/error_macros.h b/sfw/core/error_macros.h index 4733076..55e7344 100644 --- a/sfw/core/error_macros.h +++ b/sfw/core/error_macros.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef ERROR_MACROS_H #define ERROR_MACROS_H +//--STRIP //--STRIP #include "core/logger.h" @@ -291,4 +293,6 @@ _FORCE_INLINE_ void _RLOG_MACRO_TEMPLATE_FUNC(STR str, A p0, B p1, C p2, D p3, E #define DEV_CHECK_ONCE(m_cond) #endif +//--STRIP #endif +//--STRIP diff --git a/sfw/core/face3.h b/sfw/core/face3.h index 4be131d..7bfee7d 100644 --- a/sfw/core/face3.h +++ b/sfw/core/face3.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef FACE3_H #define FACE3_H +//--STRIP /*************************************************************************/ /* face3.h */ @@ -230,4 +232,6 @@ bool Face3::intersects_aabb2(const AABB &p_aabb) const { return true; } +//--STRIP #endif // FACE3_H +//--STRIP diff --git a/sfw/core/file_access.cpp b/sfw/core/file_access.cpp index ffe4110..ac01961 100644 --- a/sfw/core/file_access.cpp +++ b/sfw/core/file_access.cpp @@ -1,33 +1,7 @@ /*************************************************************************/ /* file_access.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 diff --git a/sfw/core/file_access.h b/sfw/core/file_access.h index 4870bec..4648ce7 100644 --- a/sfw/core/file_access.h +++ b/sfw/core/file_access.h @@ -1,36 +1,11 @@ - +//--STRIP #ifndef FILE_ACCESS_H #define FILE_ACCESS_H +//--STRIP /*************************************************************************/ /* file_access.h */ -/*************************************************************************/ -/* 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 @@ -209,4 +184,6 @@ struct FileAccessRef { } }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/hash_map.h b/sfw/core/hash_map.h index 0a2e863..181965b 100644 --- a/sfw/core/hash_map.h +++ b/sfw/core/hash_map.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef HASH_MAP_H #define HASH_MAP_H +//--STRIP /*************************************************************************/ /* hash_map.h */ @@ -640,4 +642,6 @@ private: } }; +//--STRIP #endif // HASH_MAP_H +//--STRIP diff --git a/sfw/core/hash_set.h b/sfw/core/hash_set.h index 82a7c7d..dcb24b4 100644 --- a/sfw/core/hash_set.h +++ b/sfw/core/hash_set.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef HASH_SET_H #define HASH_SET_H +//--STRIP /*************************************************************************/ /* hash_set.h */ @@ -479,4 +481,6 @@ public: } }; +//--STRIP #endif // HASH_SET_H +//--STRIP diff --git a/sfw/core/hashfuncs.h b/sfw/core/hashfuncs.h index 3084d8d..fd1fba7 100644 --- a/sfw/core/hashfuncs.h +++ b/sfw/core/hashfuncs.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef HASHFUNCS_H #define HASHFUNCS_H +//--STRIP /*************************************************************************/ /* hashfuncs.h */ @@ -499,4 +501,6 @@ static _FORCE_INLINE_ uint32_t fastmod(const uint32_t n, const uint64_t c, const #endif // _MSC_VER } +//--STRIP #endif // HASHFUNCS_H +//--STRIP diff --git a/sfw/core/inet_address.h b/sfw/core/inet_address.h index 08cef17..cb219bc 100755 --- a/sfw/core/inet_address.h +++ b/sfw/core/inet_address.h @@ -19,8 +19,10 @@ // Author: Tao An +//--STRIP #ifndef INET_ADDRESS_H #define INET_ADDRESS_H +//--STRIP //On windows link to ws2_32 @@ -94,4 +96,6 @@ private: bool _is_unspecified; }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/list.h b/sfw/core/list.h index fe1bc05..eee64ed 100644 --- a/sfw/core/list.h +++ b/sfw/core/list.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef GLOBALS_LIST_H #define GLOBALS_LIST_H +//--STRIP /*************************************************************************/ /* list.h */ @@ -674,4 +676,6 @@ public: }; }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/local_vector.h b/sfw/core/local_vector.h index dd712df..1f43016 100644 --- a/sfw/core/local_vector.h +++ b/sfw/core/local_vector.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef LOCAL_VECTOR_H #define LOCAL_VECTOR_H +//--STRIP /*************************************************************************/ /* local_vector.h */ @@ -296,4 +298,6 @@ template class LocalVectori : public LocalVector { }; +//--STRIP #endif // LOCAL_VECTOR_H +//--STRIP diff --git a/sfw/core/logger.h b/sfw/core/logger.h index 7fba994..c532b28 100644 --- a/sfw/core/logger.h +++ b/sfw/core/logger.h @@ -1,6 +1,7 @@ - +//--STRIP #ifndef LOGGER_H #define LOGGER_H +//--STRIP class String; @@ -71,4 +72,6 @@ public: static void log_ret_ptr(String *str); }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/marshalls.h b/sfw/core/marshalls.h index cf3bed3..f34c113 100644 --- a/sfw/core/marshalls.h +++ b/sfw/core/marshalls.h @@ -1,13 +1,17 @@ +//--STRIP #ifndef MARSHALLS_H #define MARSHALLS_H +//--STRIP /*************************************************************************/ /* marshalls.h */ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ +//--STRIP #include "core/int_types.h" #include "core/math_defs.h" +//--STRIP /** * Miscellaneous helpers for marshalling data types, and encoding @@ -139,4 +143,6 @@ static inline double decode_double(const uint8_t *p_arr) { return md.d; } +//--STRIP #endif +//--STRIP diff --git a/sfw/core/math_defs.h b/sfw/core/math_defs.h index 192b375..d28ddc8 100644 --- a/sfw/core/math_defs.h +++ b/sfw/core/math_defs.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef MATH_DEFS_H #define MATH_DEFS_H +//--STRIP /*************************************************************************/ /* math_defs.h */ @@ -95,4 +97,6 @@ typedef double real_t; typedef float real_t; #endif +//--STRIP #endif // MATH_DEFS_H +//--STRIP diff --git a/sfw/core/math_funcs.h b/sfw/core/math_funcs.h index b2bd32c..7fb67ac 100644 --- a/sfw/core/math_funcs.h +++ b/sfw/core/math_funcs.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef MATH_FUNCS_H #define MATH_FUNCS_H +//--STRIP /*************************************************************************/ /* math_funcs.h */ @@ -641,4 +643,6 @@ public: } }; +//--STRIP #endif // MATH_FUNCS_H +//--STRIP diff --git a/sfw/core/memory.h b/sfw/core/memory.h index a23debf..58fd6e3 100644 --- a/sfw/core/memory.h +++ b/sfw/core/memory.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef MEMORY_H #define MEMORY_H +//--STRIP /*************************************************************************/ /* memory.h */ @@ -179,4 +181,6 @@ struct _GlobalNilClass { static _GlobalNil _nil; }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/mutex.h b/sfw/core/mutex.h index 86c3ade..865de85 100644 --- a/sfw/core/mutex.h +++ b/sfw/core/mutex.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef MUTEX_H #define MUTEX_H +//--STRIP /*************************************************************************/ /* mutex.h */ @@ -94,4 +96,6 @@ using BinaryMutex = MutexImpl; // Non-recursive, handle with care #endif // !NO_THREADS +//--STRIP #endif // MUTEX_H +//--STRIP diff --git a/sfw/core/og_hash_map.h b/sfw/core/og_hash_map.h index cc80345..7470ed8 100644 --- a/sfw/core/og_hash_map.h +++ b/sfw/core/og_hash_map.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef GHASH_MAP_H #define GHASH_MAP_H +//--STRIP /*************************************************************************/ /* og_hash_map.h */ @@ -578,4 +580,6 @@ public: } }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/ordered_hash_map.h b/sfw/core/ordered_hash_map.h index be7e23d..07bd369 100644 --- a/sfw/core/ordered_hash_map.h +++ b/sfw/core/ordered_hash_map.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef ORDERED_HASH_MAP_H #define ORDERED_HASH_MAP_H +//--STRIP /*************************************************************************/ /* ordered_hash_map.h */ @@ -284,4 +286,6 @@ public: } }; +//--STRIP #endif // ORDERED_HASH_MAP_H +//--STRIP diff --git a/sfw/core/paged_allocator.h b/sfw/core/paged_allocator.h index 3317f22..0aa11da 100644 --- a/sfw/core/paged_allocator.h +++ b/sfw/core/paged_allocator.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef PAGED_ALLOCATOR_H #define PAGED_ALLOCATOR_H +//--STRIP /*************************************************************************/ /* paged_allocator.h */ @@ -107,4 +109,6 @@ public: } }; +//--STRIP #endif // PAGED_ALLOCATOR_H +//--STRIP diff --git a/sfw/core/pair.h b/sfw/core/pair.h index 812bc40..5b1983b 100644 --- a/sfw/core/pair.h +++ b/sfw/core/pair.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef PAIR_H #define PAIR_H +//--STRIP /*************************************************************************/ /* pair.h */ @@ -89,4 +91,6 @@ struct KeyValueSort { } }; +//--STRIP #endif // PAIR_H +//--STRIP diff --git a/sfw/core/pcg.h b/sfw/core/pcg.h index 082e446..6c3b630 100644 --- a/sfw/core/pcg.h +++ b/sfw/core/pcg.h @@ -1,8 +1,10 @@ // *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 #ifndef RANDOM_H #define RANDOM_H +//--STRIP //--STRIP #include "core/typedefs.h" @@ -15,4 +17,6 @@ uint32_t pcg32_random_r(pcg32_random_t* rng); void pcg32_srandom_r(pcg32_random_t* rng, uint64_t initstate, uint64_t initseq); uint32_t pcg32_boundedrand_r(pcg32_random_t* rng, uint32_t bound); +//--STRIP #endif // RANDOM_H +//--STRIP diff --git a/sfw/core/plane.h b/sfw/core/plane.h index 6c32b12..5ead4d8 100644 --- a/sfw/core/plane.h +++ b/sfw/core/plane.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef PLANE_H #define PLANE_H +//--STRIP /*************************************************************************/ /* plane.h */ @@ -104,4 +106,6 @@ bool Plane::operator!=(const Plane &p_plane) const { return normal != p_plane.normal || d != p_plane.d; } +//--STRIP #endif // PLANE_H +//--STRIP diff --git a/sfw/core/pool_allocator.h b/sfw/core/pool_allocator.h index 7ed6a5d..daa3729 100644 --- a/sfw/core/pool_allocator.h +++ b/sfw/core/pool_allocator.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef POOL_ALLOCATOR_H #define POOL_ALLOCATOR_H +//--STRIP /*************************************************************************/ /* pool_allocator.h */ @@ -124,4 +126,6 @@ public: virtual ~PoolAllocator(); }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/pool_vector.h b/sfw/core/pool_vector.h index 5ffc6f5..456a2d6 100644 --- a/sfw/core/pool_vector.h +++ b/sfw/core/pool_vector.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef POOL_VECTOR_H #define POOL_VECTOR_H +//--STRIP /*************************************************************************/ /* pool_vector.h */ @@ -709,4 +711,6 @@ void PoolVector::sort() { sorter.sort(w.ptr(), len); } +//--STRIP #endif // POOL_VECTOR_H +//--STRIP diff --git a/sfw/core/projection.h b/sfw/core/projection.h index 72d1255..b1d1da1 100644 --- a/sfw/core/projection.h +++ b/sfw/core/projection.h @@ -1,11 +1,13 @@ +//--STRIP +#ifndef PROJECTION_H +#define PROJECTION_H +//--STRIP + /*************************************************************************/ /* projection.h */ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ -#ifndef PROJECTION_H -#define PROJECTION_H - //--STRIP #include "core/vector.h" #include "core/math_defs.h" @@ -163,5 +165,6 @@ Vector3 Projection::xform(const Vector3 &p_vec3) const { real_t w = matrix[0][3] * p_vec3.x + matrix[1][3] * p_vec3.y + matrix[2][3] * p_vec3.z + matrix[3][3]; return ret / w; } - +//--STRIP #endif // PROJECTION_H +//--STRIP diff --git a/sfw/core/quaternion.h b/sfw/core/quaternion.h index 5cf00c4..1badbc8 100644 --- a/sfw/core/quaternion.h +++ b/sfw/core/quaternion.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef QUATERNION_H #define QUATERNION_H +//--STRIP /*************************************************************************/ /* quaternion.h */ @@ -229,4 +231,6 @@ bool Quaternion::operator!=(const Quaternion &p_quat) const { return x != p_quat.x || y != p_quat.y || z != p_quat.z || w != p_quat.w; } +//--STRIP #endif +//--STRIP diff --git a/sfw/core/random_pcg.h b/sfw/core/random_pcg.h index 088f3a5..9541ada 100644 --- a/sfw/core/random_pcg.h +++ b/sfw/core/random_pcg.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RANDOM_PCG_H #define RANDOM_PCG_H +//--STRIP /*************************************************************************/ /* random_pcg.h */ @@ -115,4 +117,6 @@ public: int random(int p_from, int p_to); }; +//--STRIP #endif // RANDOM_PCG_H +//--STRIP diff --git a/sfw/core/rb_map.h b/sfw/core/rb_map.h index 67de2a0..7c71ab1 100644 --- a/sfw/core/rb_map.h +++ b/sfw/core/rb_map.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RB_MAP_H #define RB_MAP_H +//--STRIP /*************************************************************************/ /* rb_map.h */ @@ -652,4 +654,6 @@ public: } }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/rb_set.h b/sfw/core/rb_set.h index 43f254f..3e9c34f 100644 --- a/sfw/core/rb_set.h +++ b/sfw/core/rb_set.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RB_SET_H #define RB_SET_H +//--STRIP /*************************************************************************/ /* rb_set.h */ @@ -606,4 +608,6 @@ public: } }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/rect2.h b/sfw/core/rect2.h index da3f2fc..ebee942 100644 --- a/sfw/core/rect2.h +++ b/sfw/core/rect2.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RECT2_H #define RECT2_H +//--STRIP /*************************************************************************/ /* rect2.h */ @@ -337,4 +339,6 @@ struct _NO_DISCARD_CLASS_ Rect2 { } }; +//--STRIP #endif // RECT2_H +//--STRIP diff --git a/sfw/core/rect2i.h b/sfw/core/rect2i.h index c4796a2..46fae29 100644 --- a/sfw/core/rect2i.h +++ b/sfw/core/rect2i.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RECT2I_H #define RECT2I_H +//--STRIP /*************************************************************************/ /* rect2i.h */ @@ -8,6 +10,7 @@ //--STRIP #include "core/vector2i.h" // also includes math_funcs and ustring +#include "core/rect2.h" //--STRIP struct _NO_DISCARD_CLASS_ Rect2i { @@ -230,4 +233,6 @@ struct _NO_DISCARD_CLASS_ Rect2i { } }; +//--STRIP #endif // RECT2_H +//--STRIP diff --git a/sfw/core/ring_buffer.h b/sfw/core/ring_buffer.h index d8c3146..a10d7f2 100644 --- a/sfw/core/ring_buffer.h +++ b/sfw/core/ring_buffer.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RINGBUFFER_H #define RINGBUFFER_H +//--STRIP /*************************************************************************/ /* ring_buffer.h */ @@ -196,4 +198,6 @@ public: ~RingBuffer(){}; }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/rw_lock.h b/sfw/core/rw_lock.h index 93d9e95..9c9a754 100644 --- a/sfw/core/rw_lock.h +++ b/sfw/core/rw_lock.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RWLOCK_H #define RWLOCK_H +//--STRIP /*************************************************************************/ /* rw_lock.h */ @@ -90,4 +92,6 @@ public: } }; +//--STRIP #endif // RWLOCK_H +//--STRIP diff --git a/sfw/core/safe_refcount.h b/sfw/core/safe_refcount.h index d8d9b79..e1129d2 100644 --- a/sfw/core/safe_refcount.h +++ b/sfw/core/safe_refcount.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SAFE_REFCOUNT_H #define SAFE_REFCOUNT_H +//--STRIP /*************************************************************************/ /* safe_refcount.h */ @@ -307,4 +309,6 @@ public: #endif +//--STRIP #endif // SAFE_REFCOUNT_H +//--STRIP diff --git a/sfw/core/sfw_core.h b/sfw/core/sfw_core.h index 92585a4..106a9bb 100644 --- a/sfw/core/sfw_core.h +++ b/sfw/core/sfw_core.h @@ -1,6 +1,7 @@ - +//--STRIP #ifndef SFW_CORE_H #define SFW_CORE_H +//--STRIP class SFWCore { public: @@ -11,4 +12,6 @@ protected: static bool _initialized; }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/socket.h b/sfw/core/socket.h index 57d13a1..c1ab840 100755 --- a/sfw/core/socket.h +++ b/sfw/core/socket.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SOCKET_H #define SOCKET_H +//--STRIP //Based on: @@ -61,4 +63,6 @@ public: InetAddress _address; }; +//--STRIP #endif // SOCKET_H +//--STRIP diff --git a/sfw/core/sort_array.h b/sfw/core/sort_array.h index 379149d..73fb83d 100644 --- a/sfw/core/sort_array.h +++ b/sfw/core/sort_array.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SORT_ARRAY_H #define SORT_ARRAY_H +//--STRIP /*************************************************************************/ /* sort_array.h */ @@ -297,4 +299,6 @@ public: #undef ERR_BAD_COMPARE +//--STRIP #endif // SORT_ARRAY_H +//--STRIP diff --git a/sfw/core/spin_lock.h b/sfw/core/spin_lock.h index b993f73..396bf40 100644 --- a/sfw/core/spin_lock.h +++ b/sfw/core/spin_lock.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SPIN_LOCK_H #define SPIN_LOCK_H +//--STRIP /*************************************************************************/ /* spin_lock.h */ @@ -25,4 +27,7 @@ public: locked.clear(std::memory_order_release); } }; + +//--STRIP #endif // SPIN_LOCK_H +//--STRIP diff --git a/sfw/core/stime.h b/sfw/core/stime.h index 3351373..70d845d 100644 --- a/sfw/core/stime.h +++ b/sfw/core/stime.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef STIME_H #define STIME_H +//--STRIP // ----------------------------------------------------------------------------- // time framework utils @@ -26,4 +28,6 @@ public: static void sleep_ns(double us); }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/string_name.h b/sfw/core/string_name.h index 6a97ff6..33b1a0a 100644 --- a/sfw/core/string_name.h +++ b/sfw/core/string_name.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef STRING_NAME_H #define STRING_NAME_H +//--STRIP /*************************************************************************/ /* string_name.h */ @@ -205,4 +207,6 @@ StringName _scs_create(const char *p_chr, bool p_static = false); //#define SNAME(m_arg) ([]() -> const StringName & { static StringName sname = _scs_create(m_arg, true); return sname; })() +//--STRIP #endif // STRING_NAME_H +//--STRIP diff --git a/sfw/core/sub_process.h b/sfw/core/sub_process.h index f91fb3b..0ea2da1 100644 --- a/sfw/core/sub_process.h +++ b/sfw/core/sub_process.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SUB_PROCESS_H #define SUB_PROCESS_H +//--STRIP /*************************************************************************/ /* sub_process.h */ @@ -193,4 +195,6 @@ struct SubProcessRef { } }; +//--STRIP #endif +//--STRIP diff --git a/sfw/core/thread.h b/sfw/core/thread.h index a8b3276..3129935 100644 --- a/sfw/core/thread.h +++ b/sfw/core/thread.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef THREAD_H #define THREAD_H +//--STRIP /*************************************************************************/ /* thread.h */ @@ -92,4 +94,6 @@ public: #endif }; +//--STRIP #endif // THREAD_H +//--STRIP diff --git a/sfw/core/thread_safe.h b/sfw/core/thread_safe.h index 4c58395..51365d7 100644 --- a/sfw/core/thread_safe.h +++ b/sfw/core/thread_safe.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef THREAD_SAFE_H #define THREAD_SAFE_H +//--STRIP /*************************************************************************/ /* thread_safe.h */ @@ -15,4 +17,6 @@ #define _THREAD_SAFE_LOCK_ _thread_safe_.lock(); #define _THREAD_SAFE_UNLOCK_ _thread_safe_.unlock(); +//--STRIP #endif +//--STRIP diff --git a/sfw/core/tight_local_vector.h b/sfw/core/tight_local_vector.h index 3e404e8..f21a97d 100644 --- a/sfw/core/tight_local_vector.h +++ b/sfw/core/tight_local_vector.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TIGHT_LOCAL_VECTOR_H #define TIGHT_LOCAL_VECTOR_H +//--STRIP /*************************************************************************/ /* tight_local_vector.h */ @@ -292,4 +294,6 @@ template class TightLocalVectori : public TightLocalVector { }; +//--STRIP #endif // TIGHT_LOCAL_VECTOR_H +//--STRIP diff --git a/sfw/core/transform.h b/sfw/core/transform.h index 40cb79d..e40cee8 100644 --- a/sfw/core/transform.h +++ b/sfw/core/transform.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TRANSFORM_H #define TRANSFORM_H +//--STRIP /*************************************************************************/ /* transform.h */ @@ -299,4 +301,6 @@ _FORCE_INLINE_ Plane Transform::xform_inv_fast(const Plane &p_plane, const Trans return Plane(normal, d); } +//--STRIP #endif // TRANSFORM_H +//--STRIP diff --git a/sfw/core/transform_2d.h b/sfw/core/transform_2d.h index f31faa7..53e9e0f 100644 --- a/sfw/core/transform_2d.h +++ b/sfw/core/transform_2d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TRANSFORM_2D_H #define TRANSFORM_2D_H +//--STRIP /*************************************************************************/ /* transform_2d.h */ @@ -302,4 +304,6 @@ PoolVector Transform2D::xform_inv(const PoolVector &p_array) return array; } +//--STRIP #endif // TRANSFORM_2D_H +//--STRIP diff --git a/sfw/core/typedefs.h b/sfw/core/typedefs.h index 198b3b0..f13c6f2 100644 --- a/sfw/core/typedefs.h +++ b/sfw/core/typedefs.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TYPEDEFS_H #define TYPEDEFS_H +//--STRIP /*************************************************************************/ /* typedefs.h */ @@ -403,4 +405,6 @@ struct _GlobalLock { #define HAS_TRIVIAL_COPY(T) __has_trivial_copy(T) #endif +//--STRIP #endif // TYPEDEFS_H +//--STRIP diff --git a/sfw/core/ucaps.h b/sfw/core/ucaps.h index 0c7a051..a70b0d3 100644 --- a/sfw/core/ucaps.h +++ b/sfw/core/ucaps.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef UCAPS_H #define UCAPS_H +//--STRIP /*************************************************************************/ /* ucaps.h */ @@ -1386,4 +1388,7 @@ static int _find_lower(int ch) { return ch; } + +//--STRIP #endif +//--STRIP diff --git a/sfw/core/ustring.h b/sfw/core/ustring.h index 184e587..f5318b9 100644 --- a/sfw/core/ustring.h +++ b/sfw/core/ustring.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef USTRING_H #define USTRING_H +//--STRIP /*************************************************************************/ /* ustring.h */ @@ -604,4 +606,6 @@ String RTR(const String &); bool select_word(const String &p_s, int p_col, int &r_beg, int &r_end); +//--STRIP #endif // USTRING_H +//--STRIP diff --git a/sfw/core/vector.h b/sfw/core/vector.h index 3d8e16b..c66176c 100644 --- a/sfw/core/vector.h +++ b/sfw/core/vector.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef VECTOR_H #define VECTOR_H +//--STRIP /*************************************************************************/ /* vector.h */ @@ -171,4 +173,6 @@ bool Vector::push_back(T p_elem) { return false; } +//--STRIP #endif +//--STRIP diff --git a/sfw/core/vector2.h b/sfw/core/vector2.h index c34fb6f..45a16c6 100644 --- a/sfw/core/vector2.h +++ b/sfw/core/vector2.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef VECTOR2_H #define VECTOR2_H +//--STRIP /*************************************************************************/ /* vector2.h */ @@ -278,4 +280,6 @@ Vector2 Vector2::linear_interpolate(const Vector2 &p_a, const Vector2 &p_b, real typedef Vector2 Size2; typedef Vector2 Point2; +//--STRIP #endif // VECTOR2_H +//--STRIP diff --git a/sfw/core/vector2i.h b/sfw/core/vector2i.h index b4fa602..2a3e164 100644 --- a/sfw/core/vector2i.h +++ b/sfw/core/vector2i.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef VECTOR2I_H #define VECTOR2I_H +//--STRIP /*************************************************************************/ /* vector2i.h */ @@ -140,4 +142,6 @@ Vector2i Vector2i::linear_interpolate(const Vector2i &p_to, real_t p_weight) con typedef Vector2i Size2i; typedef Vector2i Point2i; +//--STRIP #endif // VECTOR2_H +//--STRIP diff --git a/sfw/core/vector3.h b/sfw/core/vector3.h index 0b6587f..0b7fded 100644 --- a/sfw/core/vector3.h +++ b/sfw/core/vector3.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef VECTOR3_H #define VECTOR3_H +//--STRIP /*************************************************************************/ /* vector3.h */ @@ -481,4 +483,6 @@ bool Vector3::is_equal_approxt(const Vector3 &p_v, real_t p_tolerance) const { return Math::is_equal_approx(x, p_v.x, p_tolerance) && Math::is_equal_approx(y, p_v.y, p_tolerance) && Math::is_equal_approx(z, p_v.z, p_tolerance); } +//--STRIP #endif // VECTOR3_H +//--STRIP diff --git a/sfw/core/vector3i.h b/sfw/core/vector3i.h index b6cc3c5..6eb33a2 100644 --- a/sfw/core/vector3i.h +++ b/sfw/core/vector3i.h @@ -1,11 +1,13 @@ +//--STRIP +#ifndef VECTOR3I_H +#define VECTOR3I_H +//--STRIP + /*************************************************************************/ /* vector3i.h */ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ -#ifndef VECTOR3I_H -#define VECTOR3I_H - //--STRIP #include "core/error_macros.h" #include "core/math_funcs.h" @@ -306,4 +308,6 @@ void Vector3i::zero() { typedef Vector3i Size3i; typedef Vector3i Point3i; +//--STRIP #endif // VECTOR3I_H +//--STRIP diff --git a/sfw/core/vector4.h b/sfw/core/vector4.h index aa4c868..ada22c8 100644 --- a/sfw/core/vector4.h +++ b/sfw/core/vector4.h @@ -1,11 +1,13 @@ +//--STRIP +#ifndef VECTOR4_H +#define VECTOR4_H +//--STRIP + /*************************************************************************/ /* vector4.h */ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ -#ifndef VECTOR4_H -#define VECTOR4_H - //--STRIP #include "core/math_defs.h" #include "core/math_funcs.h" @@ -289,4 +291,6 @@ _FORCE_INLINE_ Vector4 operator*(const int64_t p_scalar, const Vector4 &p_vec) { return p_vec * p_scalar; } +//--STRIP #endif // VECTOR4_H +//--STRIP diff --git a/sfw/core/vector4i.h b/sfw/core/vector4i.h index 22afb4f..dc67076 100644 --- a/sfw/core/vector4i.h +++ b/sfw/core/vector4i.h @@ -1,11 +1,13 @@ +//--STRIP +#ifndef VECTOR4I_H +#define VECTOR4I_H +//--STRIP + /*************************************************************************/ /* vector4i.h */ /* From https://github.com/Relintai/pandemonium_engine (MIT) */ /*************************************************************************/ -#ifndef VECTOR4I_H -#define VECTOR4I_H - //--STRIP #include "core/error_macros.h" #include "core/math_funcs.h" @@ -332,4 +334,6 @@ void Vector4i::zero() { typedef Vector4i Size4i; typedef Vector4i Point4i; +//--STRIP #endif // VECTOR4I_H +//--STRIP diff --git a/sfw/core/version.h b/sfw/core/version.h index d6a40f3..e1881dd 100644 --- a/sfw/core/version.h +++ b/sfw/core/version.h @@ -1,6 +1,10 @@ +//--STRIP #ifndef SFW_VERSION_H #define SFW_VERSION_H +//--STRIP #define SFW_VERSION 1 +//--STRIP #endif +//--STRIP diff --git a/sfw/core/vmap.h b/sfw/core/vmap.h index 8045625..e974590 100644 --- a/sfw/core/vmap.h +++ b/sfw/core/vmap.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef VMAP_H #define VMAP_H +//--STRIP /*************************************************************************/ /* vmap.h */ @@ -176,4 +178,7 @@ public: return *this; } }; + +//--STRIP #endif // VMAP_H +//--STRIP diff --git a/sfw/core/vset.h b/sfw/core/vset.h index d67690b..a8921ca 100644 --- a/sfw/core/vset.h +++ b/sfw/core/vset.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef VSET_H #define VSET_H +//--STRIP /*************************************************************************/ /* vset.h */ @@ -115,4 +117,6 @@ public: } }; +//--STRIP #endif // VSET_H +//--STRIP diff --git a/sfw/object/array.h b/sfw/object/array.h index aaaaddd..09b8978 100644 --- a/sfw/object/array.h +++ b/sfw/object/array.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef ARRAY_H #define ARRAY_H +//--STRIP /*************************************************************************/ /* array.h */ @@ -89,4 +91,6 @@ public: ~Array(); }; +//--STRIP #endif // ARRAY_H +//--STRIP diff --git a/sfw/object/core_string_names.h b/sfw/object/core_string_names.h index 29acf05..80abf2e 100644 --- a/sfw/object/core_string_names.h +++ b/sfw/object/core_string_names.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef CORE_STRING_NAMES_H #define CORE_STRING_NAMES_H +//--STRIP /*************************************************************************/ /* core_string_names.h */ @@ -65,4 +67,6 @@ public: StringName a8; }; +//--STRIP #endif // SCENE_STRING_NAMES_H +//--STRIP diff --git a/sfw/object/dictionary.h b/sfw/object/dictionary.h index d14a251..9526fea 100644 --- a/sfw/object/dictionary.h +++ b/sfw/object/dictionary.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef DICTIONARY_H #define DICTIONARY_H +//--STRIP /*************************************************************************/ /* dictionary.h */ @@ -69,4 +71,6 @@ public: ~Dictionary(); }; +//--STRIP #endif // DICTIONARY_H +//--STRIP diff --git a/sfw/object/object.h b/sfw/object/object.h index 55a6f92..344545f 100644 --- a/sfw/object/object.h +++ b/sfw/object/object.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef OBJECT_H #define OBJECT_H +//--STRIP //--STRIP #include "core/hash_map.h" @@ -280,4 +282,6 @@ public: } }; +//--STRIP #endif +//--STRIP diff --git a/sfw/object/object_id.h b/sfw/object/object_id.h index 3cba6fe..e887cdf 100644 --- a/sfw/object/object_id.h +++ b/sfw/object/object_id.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef OBJECTID_H #define OBJECTID_H +//--STRIP /*************************************************************************/ /* object_id.h */ @@ -12,4 +14,6 @@ typedef uint64_t ObjectID; +//--STRIP #endif +//--STRIP diff --git a/sfw/object/object_rc.h b/sfw/object/object_rc.h index eae71c9..e59aa7a 100644 --- a/sfw/object/object_rc.h +++ b/sfw/object/object_rc.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef OBJECTRC_H #define OBJECTRC_H +//--STRIP /*************************************************************************/ /* object_rc.h */ @@ -51,4 +53,6 @@ public: } }; +//--STRIP #endif +//--STRIP diff --git a/sfw/object/psignal.h b/sfw/object/psignal.h index 2d6d435..11a817b 100644 --- a/sfw/object/psignal.h +++ b/sfw/object/psignal.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SIGNAL_H #define SIGNAL_H +//--STRIP //--STRIP #include "core/vector.h" @@ -171,4 +173,6 @@ bool Signal::is_connected(T *obj, void (*func)(T*, Signal *)) { return false; } +//--STRIP #endif +//--STRIP diff --git a/sfw/object/ref_ptr.h b/sfw/object/ref_ptr.h index 0f1c9c4..9da7002 100644 --- a/sfw/object/ref_ptr.h +++ b/sfw/object/ref_ptr.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef REF_PTR_H #define REF_PTR_H +//--STRIP /*************************************************************************/ /* ref_ptr.h */ @@ -35,4 +37,6 @@ public: ~RefPtr(); }; +//--STRIP #endif // REF_PTR_H +//--STRIP diff --git a/sfw/object/reference.h b/sfw/object/reference.h index 948ef52..ee7e7ca 100644 --- a/sfw/object/reference.h +++ b/sfw/object/reference.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef REFERENCE_H #define REFERENCE_H +//--STRIP /*************************************************************************/ /* reference.h */ @@ -267,4 +269,6 @@ public: }; */ +//--STRIP #endif +//--STRIP diff --git a/sfw/object/resource.h b/sfw/object/resource.h index 6ed1fb2..8f839a4 100644 --- a/sfw/object/resource.h +++ b/sfw/object/resource.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RESOURCE_H #define RESOURCE_H +//--STRIP //--STRIP #include "object/reference.h" @@ -22,4 +24,6 @@ public: virtual ~Resource(); }; +//--STRIP #endif +//--STRIP diff --git a/sfw/object/variant.h b/sfw/object/variant.h index 27ebb34..d17c205 100644 --- a/sfw/object/variant.h +++ b/sfw/object/variant.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef VARIANT_H #define VARIANT_H +//--STRIP /*************************************************************************/ /* variant.h */ @@ -437,4 +439,7 @@ const Variant::ObjData &Variant::_get_obj() const { } String vformat(const String &p_text, const Variant &p1 = Variant(), const Variant &p2 = Variant(), const Variant &p3 = Variant(), const Variant &p4 = Variant(), const Variant &p5 = Variant()); + +//--STRIP #endif +//--STRIP diff --git a/sfw/render_core/application.h b/sfw/render_core/application.h index 57578d6..7d17a9d 100644 --- a/sfw/render_core/application.h +++ b/sfw/render_core/application.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef APPLICATION_H #define APPLICATION_H +//--STRIP //--STRIP #include "core/int_types.h" @@ -69,4 +71,6 @@ protected: real_t _time_scale; }; +//--STRIP #endif // APPLICATION_H +//--STRIP diff --git a/sfw/render_core/color_material.h b/sfw/render_core/color_material.h index ea9a9da..ebeaba1 100644 --- a/sfw/render_core/color_material.h +++ b/sfw/render_core/color_material.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef COLOR_MATERIAL_H #define COLOR_MATERIAL_H +//--STRIP //--STRIP #include "render_core/material.h" @@ -28,4 +30,6 @@ public: int32_t model_view_matrix_location; }; +//--STRIP #endif +//--STRIP diff --git a/sfw/render_core/color_material_2d.h b/sfw/render_core/color_material_2d.h index 1bf1652..0dca8bf 100644 --- a/sfw/render_core/color_material_2d.h +++ b/sfw/render_core/color_material_2d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef COLOR_MATERIAL_2D_H #define COLOR_MATERIAL_2D_H +//--STRIP //--STRIP #include "render_core/material.h" @@ -29,5 +31,6 @@ public: int32_t projection_matrix_location; int32_t model_view_matrix_location; }; - +//--STRIP #endif // COLORED_MATERIAL_H +//--STRIP diff --git a/sfw/render_core/colored_material.h b/sfw/render_core/colored_material.h index eac1ee6..7e5b2f1 100644 --- a/sfw/render_core/colored_material.h +++ b/sfw/render_core/colored_material.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef COLORED_MATERIAL_H #define COLORED_MATERIAL_H +//--STRIP //--STRIP #include "render_core/material.h" @@ -30,4 +32,6 @@ public: Color color; }; +//--STRIP #endif // COLORED_MATERIAL_H +//--STRIP diff --git a/sfw/render_core/font.h b/sfw/render_core/font.h index d95ddc4..f53dff6 100644 --- a/sfw/render_core/font.h +++ b/sfw/render_core/font.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef FONT_RENDERER_H #define FONT_RENDERER_H +//--STRIP // ----------------------------------------------------------------------------- // font framework originally from FWK @@ -133,4 +135,6 @@ protected: Vector _texture_offsets; }; +//--STRIP #endif +//--STRIP diff --git a/sfw/render_core/font_material.h b/sfw/render_core/font_material.h index ea53f22..3b7349e 100644 --- a/sfw/render_core/font_material.h +++ b/sfw/render_core/font_material.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef FONT_MATERIAL_H #define FONT_MATERIAL_H +//--STRIP //--STRIP #include "render_core/material.h" @@ -34,4 +36,6 @@ public: Ref texture; }; +//--STRIP #endif // TEXT_MATERIAL_H +//--STRIP diff --git a/sfw/render_core/image.h b/sfw/render_core/image.h index 5dc0da8..9948aab 100644 --- a/sfw/render_core/image.h +++ b/sfw/render_core/image.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef IMAGE_H #define IMAGE_H +//--STRIP /*************************************************************************/ /* image.h */ @@ -252,4 +254,6 @@ public: ~Image(); }; +//--STRIP #endif +//--STRIP diff --git a/sfw/render_core/input.h b/sfw/render_core/input.h index fae4a1a..c07777d 100644 --- a/sfw/render_core/input.h +++ b/sfw/render_core/input.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef INPUT_H #define INPUT_H +//--STRIP /*************************************************************************/ /* input.h */ @@ -216,4 +218,6 @@ protected: static Input *singleton; }; +//--STRIP #endif // INPUT_H +//--STRIP diff --git a/sfw/render_core/input_event.h b/sfw/render_core/input_event.h index 9617fd7..94953f5 100644 --- a/sfw/render_core/input_event.h +++ b/sfw/render_core/input_event.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef INPUT_EVENT_H #define INPUT_EVENT_H +//--STRIP /*************************************************************************/ /* input_event.h */ @@ -294,4 +296,6 @@ public: ~InputEventShortCut(); }; +//--STRIP #endif +//--STRIP diff --git a/sfw/render_core/input_map.h b/sfw/render_core/input_map.h index d2f9b10..0dcc751 100644 --- a/sfw/render_core/input_map.h +++ b/sfw/render_core/input_map.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef INPUT_MAP_H #define INPUT_MAP_H +//--STRIP /*************************************************************************/ /* input_map.h */ @@ -64,4 +66,6 @@ public: InputMap(); }; +//--STRIP #endif // INPUT_MAP_H +//--STRIP diff --git a/sfw/render_core/keyboard.h b/sfw/render_core/keyboard.h index 9c76ec3..c923185 100644 --- a/sfw/render_core/keyboard.h +++ b/sfw/render_core/keyboard.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef KEYBOARD_H #define KEYBOARD_H +//--STRIP /*************************************************************************/ /* keyboard.h */ @@ -302,4 +304,6 @@ int keycode_get_count(); int keycode_get_value_by_index(int p_index); const char *keycode_get_name_by_index(int p_index); +//--STRIP #endif +//--STRIP diff --git a/sfw/render_core/material.h b/sfw/render_core/material.h index 8fe2d37..b3ae3c3 100644 --- a/sfw/render_core/material.h +++ b/sfw/render_core/material.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef MATERIAL_H #define MATERIAL_H +//--STRIP //--STRIP #include "core/projection.h" @@ -39,4 +41,6 @@ protected: void set_uniform(int32_t p_uniform, const Projection &p_matrix); }; +//--STRIP #endif // MATERIAL_H +//--STRIP diff --git a/sfw/render_core/mesh.h b/sfw/render_core/mesh.h index cc858b5..826160e 100644 --- a/sfw/render_core/mesh.h +++ b/sfw/render_core/mesh.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef MESH_H #define MESH_H +//--STRIP //--STRIP #include "core/aabb.h" @@ -73,4 +75,6 @@ protected: uint32_t indices_vbo_size; }; +//--STRIP #endif // MESH_H +//--STRIP diff --git a/sfw/render_core/mesh_utils.h b/sfw/render_core/mesh_utils.h index fd33391..a235534 100644 --- a/sfw/render_core/mesh_utils.h +++ b/sfw/render_core/mesh_utils.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef MESH_UTILS_H #define MESH_UTILS_H +//--STRIP //--STRIP #include "render_core/mesh.h" @@ -19,4 +21,6 @@ public: static void create_point(Ref mesh); }; +//--STRIP #endif +//--STRIP diff --git a/sfw/render_core/render_state.h b/sfw/render_core/render_state.h index 3843425..9515a79 100644 --- a/sfw/render_core/render_state.h +++ b/sfw/render_core/render_state.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RENDER_STATE_H #define RENDER_STATE_H +//--STRIP //--STRIP #include "core/projection.h" @@ -21,5 +23,6 @@ public: //TODO should probably add the current shader here, and active material etc. }; - +//--STRIP #endif // RENDER_STATE_H +//--STRIP diff --git a/sfw/render_core/scene.h b/sfw/render_core/scene.h index a98d78e..c19c167 100644 --- a/sfw/render_core/scene.h +++ b/sfw/render_core/scene.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SCENE_H #define SCENE_H +//--STRIP //--STRIP #include "object/reference.h" @@ -18,4 +20,6 @@ public: virtual ~Scene(); }; +//--STRIP #endif // APPLICATION_H +//--STRIP diff --git a/sfw/render_core/shader.h b/sfw/render_core/shader.h index 53ce707..72f3d65 100644 --- a/sfw/render_core/shader.h +++ b/sfw/render_core/shader.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SHADER_H #define SHADER_H +//--STRIP //--STRIP #include "render_core/3rd_glad.h" @@ -58,4 +60,6 @@ protected: HashMap shaders; }; +//--STRIP #endif // SHADER_H +//--STRIP diff --git a/sfw/render_core/shortcut.h b/sfw/render_core/shortcut.h index 882cd7b..4f0be8a 100644 --- a/sfw/render_core/shortcut.h +++ b/sfw/render_core/shortcut.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SHORTCUT_H #define SHORTCUT_H +//--STRIP /*************************************************************************/ /* shortcut.h */ @@ -30,4 +32,6 @@ private: Ref shortcut; }; +//--STRIP #endif // SHORTCUT_H +//--STRIP diff --git a/sfw/render_core/texture.h b/sfw/render_core/texture.h index 91ccbc9..12cefd0 100644 --- a/sfw/render_core/texture.h +++ b/sfw/render_core/texture.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TEXTURE_H #define TEXTURE_H +//--STRIP //--STRIP #include "core/vector2i.h" @@ -67,4 +69,6 @@ protected: uint32_t _fbo; }; +//--STRIP #endif // TEXTURE_H +//--STRIP diff --git a/sfw/render_core/texture_material.h b/sfw/render_core/texture_material.h index 7c36925..19d3304 100644 --- a/sfw/render_core/texture_material.h +++ b/sfw/render_core/texture_material.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TEXTURE_MATERIAL_H #define TEXTURE_MATERIAL_H +//--STRIP //--STRIP #include "render_core/material.h" @@ -35,4 +37,6 @@ public: Ref texture; }; +//--STRIP #endif // COLORED_MATERIAL_H +//--STRIP diff --git a/sfw/render_core/texture_material_2d.h b/sfw/render_core/texture_material_2d.h index 9ae6ab6..a46611b 100644 --- a/sfw/render_core/texture_material_2d.h +++ b/sfw/render_core/texture_material_2d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TEXTURE_MATERIAL_2D_H #define TEXTURE_MATERIAL_2D_H +//--STRIP //--STRIP #include "render_core/material.h" @@ -34,4 +36,6 @@ public: Ref texture; }; +//--STRIP #endif // COLORED_MATERIAL_H +//--STRIP diff --git a/sfw/render_core/transparent_texture_material.h b/sfw/render_core/transparent_texture_material.h index 404174c..374e88f 100644 --- a/sfw/render_core/transparent_texture_material.h +++ b/sfw/render_core/transparent_texture_material.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TRANSPARENT_TEXTURE_MATERIAL_H #define TRANSPARENT_TEXTURE_MATERIAL_H +//--STRIP //--STRIP #include "render_core/material.h" @@ -34,4 +36,6 @@ public: Ref texture; }; +//--STRIP #endif // COLORED_MATERIAL_H +//--STRIP diff --git a/sfw/render_core/window.h b/sfw/render_core/window.h index bf249b2..86f9875 100644 --- a/sfw/render_core/window.h +++ b/sfw/render_core/window.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef WINDOW_H #define WINDOW_H +//--STRIP // ----------------------------------------------------------------------------- // window framework @@ -179,4 +181,6 @@ protected: unsigned int cursor_enums[7]; }; +//--STRIP #endif +//--STRIP diff --git a/sfw/render_immediate/renderer.h b/sfw/render_immediate/renderer.h index bdf4178..3c39a34 100644 --- a/sfw/render_immediate/renderer.h +++ b/sfw/render_immediate/renderer.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef RENDERER_H #define RENDERER_H +//--STRIP //--STRIP #include "core/color.h" @@ -94,4 +96,6 @@ private: Vector camera_2d_model_view_matrix_stack; }; +//--STRIP #endif +//--STRIP diff --git a/sfw/render_objects/camera_2d.h b/sfw/render_objects/camera_2d.h index ac6c2b8..891829c 100644 --- a/sfw/render_objects/camera_2d.h +++ b/sfw/render_objects/camera_2d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef CAMERA_2D_H #define CAMERA_2D_H +//--STRIP //--STRIP #include "render_core/3rd_glad.h" @@ -44,4 +46,6 @@ protected: Transform _projection_matrix; }; +//--STRIP #endif // CAMERA_H +//--STRIP diff --git a/sfw/render_objects/camera_3d.h b/sfw/render_objects/camera_3d.h index b67335f..40fe84a 100644 --- a/sfw/render_objects/camera_3d.h +++ b/sfw/render_objects/camera_3d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef CAMERA_3D_H #define CAMERA_3D_H +//--STRIP //--STRIP #include "render_core/3rd_glad.h" @@ -73,4 +75,6 @@ public: ~FrustumCamera(); }; +//--STRIP #endif // CAMERA_H +//--STRIP diff --git a/sfw/render_objects/mesh_instance_2d.h b/sfw/render_objects/mesh_instance_2d.h index 4cff120..caffa59 100644 --- a/sfw/render_objects/mesh_instance_2d.h +++ b/sfw/render_objects/mesh_instance_2d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef MESH_INSTACE_2D_H #define MESH_INSTACE_2D_H +//--STRIP //--STRIP #include "object_2d.h" @@ -29,4 +31,6 @@ public: Vector children; }; +//--STRIP #endif // MESH_INSTACE_H +//--STRIP diff --git a/sfw/render_objects/mesh_instance_3d.h b/sfw/render_objects/mesh_instance_3d.h index 8f5646a..663782e 100644 --- a/sfw/render_objects/mesh_instance_3d.h +++ b/sfw/render_objects/mesh_instance_3d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef MESH_INSTACE_3D_H #define MESH_INSTACE_3D_H +//--STRIP //--STRIP #include "core/vector.h" @@ -27,4 +29,6 @@ public: Vector children; }; +//--STRIP #endif // MESH_INSTACE_H +//--STRIP diff --git a/sfw/render_objects/object_2d.h b/sfw/render_objects/object_2d.h index 885eb92..9f47c48 100644 --- a/sfw/render_objects/object_2d.h +++ b/sfw/render_objects/object_2d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef OBJECT_2D_H #define OBJECT_2D_H +//--STRIP //--STRIP #include "object/object.h" @@ -17,5 +19,6 @@ public: Transform2D transform; }; - +//--STRIP #endif // OBJECT_2D_h +//--STRIP diff --git a/sfw/render_objects/object_3d.h b/sfw/render_objects/object_3d.h index 65d399b..6a0bc5a 100644 --- a/sfw/render_objects/object_3d.h +++ b/sfw/render_objects/object_3d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef OBJECT_3D_H #define OBJECT_3D_H +//--STRIP //--STRIP #include "object/object.h" @@ -17,4 +19,6 @@ public: Transform transform; }; +//--STRIP #endif // OBJECT_3D_h +//--STRIP diff --git a/sfw/render_objects/sprite.h b/sfw/render_objects/sprite.h index b202fa4..5ea5a5d 100644 --- a/sfw/render_objects/sprite.h +++ b/sfw/render_objects/sprite.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef SPRITE_H #define SPRITE_H +//--STRIP //--STRIP #include "render_objects/object_2d.h" @@ -29,5 +31,6 @@ public: float region_height; }; - +//--STRIP #endif // SPRITE_H +//--STRIP diff --git a/sfw/render_objects/text_2d.h b/sfw/render_objects/text_2d.h index d91d331..417a54c 100644 --- a/sfw/render_objects/text_2d.h +++ b/sfw/render_objects/text_2d.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TEXT_2D_H #define TEXT_2D_H +//--STRIP //--STRIP #include "core/color.h" @@ -45,4 +47,6 @@ protected: Vector2 _text_size; }; +//--STRIP #endif // MESH_INSTACE_H +//--STRIP diff --git a/sfw/render_objects/tile_map.h b/sfw/render_objects/tile_map.h index 025b0c6..4f631d1 100644 --- a/sfw/render_objects/tile_map.h +++ b/sfw/render_objects/tile_map.h @@ -1,5 +1,7 @@ +//--STRIP #ifndef TILE_MAP_H #define TILE_MAP_H +//--STRIP //--STRIP #include "render_objects/object_2d.h" @@ -36,4 +38,6 @@ public: Ref material; }; +//--STRIP #endif +//--STRIP diff --git a/tools/merger/sfw_core.h.inl b/tools/merger/sfw_core.h.inl index daf8fed..e6b832c 100644 --- a/tools/merger/sfw_core.h.inl +++ b/tools/merger/sfw_core.h.inl @@ -261,6 +261,7 @@ {{FILE:sfw/core/rect2.h}} //--STRIP //#include "core/vector2i.h" // also includes math_funcs and ustring +//#include "core/rect2.h" //--STRIP {{FILE:sfw/core/rect2i.h}} //--STRIP diff --git a/tools/merger/sfw_full.h.inl b/tools/merger/sfw_full.h.inl index 6583876..40f1fb5 100644 --- a/tools/merger/sfw_full.h.inl +++ b/tools/merger/sfw_full.h.inl @@ -261,6 +261,7 @@ {{FILE:sfw/core/rect2.h}} //--STRIP //#include "core/vector2i.h" // also includes math_funcs and ustring +//#include "core/rect2.h" //--STRIP {{FILE:sfw/core/rect2i.h}} //--STRIP