diff --git a/tools/merger/sfw.h.inl b/tools/merger/sfw.h.inl index 2640b81..2d29559 100644 --- a/tools/merger/sfw.h.inl +++ b/tools/merger/sfw.h.inl @@ -32,11 +32,6 @@ SOFTWARE. #include #include -//--STRIP -//#include "core/int_types.h" -//#include "core/error_list.h" -//--STRIP -{{FILE:sfw/core/typedefs.h}} //--STRIP //no includes //--STRIP @@ -49,12 +44,59 @@ SOFTWARE. //no includes //--STRIP {{FILE:sfw/core/error_list.h}} +//--STRIP +//no includes +//--STRIP +{{FILE:sfw/core/logger.h}} + +//--STRIP +//#include "core/int_types.h" +//#include "core/error_list.h" +//--STRIP +{{FILE:sfw/core/typedefs.h}} + + +//--STRIP +//#include "core/int_types.h" +//--STRIP +{{FILE:sfw/core/stime.h}} +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/safe_refcount.h}} + //--STRIP //#include "core/logger.h" //#include "core/typedefs.h" //--STRIP {{FILE:sfw/core/error_macros.h}} + +//--STRIP +//#include "core/error_macros.h" +//#include "core/safe_refcount.h" +//--STRIP +{{FILE:sfw/core/memory.h}} + + +//--STRIP +//#include "core/error_list.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/mutex.h}} +//--STRIP +//#include "core/error_list.h" +//--STRIP +{{FILE:sfw/core/rw_lock.h}} +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/spin_lock.h}} +//--STRIP +//#include "core/mutex.h" +//--STRIP +{{FILE:sfw/core/thread_safe.h}} + //--STRIP //#include "core/error_macros.h" //#include "core/math_defs.h" @@ -65,32 +107,247 @@ SOFTWARE. {{FILE:sfw/core/math_funcs.h}} //--STRIP -//#include "core/typedefs.h" +//Simple almost dependencyless containers //--STRIP -{{FILE:sfw/core/safe_refcount.h}} -//--STRIP -//#include "core/mutex.h" -//--STRIP -{{FILE:sfw/core/thread_safe.h}} -//--STRIP -//#include "core/error_list.h" -//--STRIP -{{FILE:sfw/core/rw_lock.h}} -//--STRIP -//#include "core/error_list.h" -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/core/mutex.h}} -//--STRIP -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/core/spin_lock.h}} //--STRIP +//#include "core/error_list.h" //#include "core/error_macros.h" +//#include "core/memory.h" //#include "core/safe_refcount.h" //--STRIP -{{FILE:sfw/core/memory.h}} +{{FILE:sfw/core/cowdata.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/sort_array.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/rb_map.h}} +//--STRIP +//#include "core/memory.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/rb_set.h}} +//--STRIP +//#include "cowdata.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/vmap.h}} +//--STRIP +//#include "cowdata.h" +//#include "core/sort_array.h" +//#include "core/error_macros.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/vector.h}} +//--STRIP +//#include "core/vector.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/vset.h}} +//--STRIP +//#include "core/sort_array.h" +//#include "core/error_macros.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/list.h}} +//--STRIP +//#include "core/vector.h" +//--STRIP +{{FILE:sfw/core/ring_buffer.h}} +//--STRIP +//#include "core/memory.h" +//#include "spin_lock.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/paged_allocator.h}} +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/pool_allocator.h}} + +//--STRIP +//Strings they need vector.h, and cowdata.h +//--STRIP + +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/char_range.inc}} +//--STRIP +//#include "core/typedefs.h" +//#include "core/char_range.inc" +//--STRIP +{{FILE:sfw/core/char_utils.h}} +//--STRIP +//#include "cowdata.h" +//#include "core/vector.h" +//#include "char_utils.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/ustring.h}} + +//--STRIP +//#include "core/mutex.h" +//#include "core/safe_refcount.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/string_name.h}} + +//--STRIP +//Needs ustring.h +//--STRIP + +//--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 +{{FILE:sfw/core/pool_vector.h}} +//--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 +{{FILE:sfw/core/tight_local_vector.h}} +//--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 +{{FILE:sfw/core/local_vector.h}} + +//--STRIP +//Math classes +//--STRIP + +//--STRIP +//#include "core/math_funcs.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/color.h}} +//--STRIP +//#include "core/math_funcs.h" +//#include "core/error_macros.h" +//--STRIP +{{FILE:sfw/core/vector2.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/math_funcs.h" +//#include "core/vector2.h" +//--STRIP +{{FILE:sfw/core/vector2i.h}} +//--STRIP +//#include "core/vector2.h" // also includes math_funcs and ustring +//#include "core/vector2i.h" +//--STRIP +{{FILE:sfw/core/rect2.h}} +//--STRIP +//#include "core/vector2i.h" // also includes math_funcs and ustring +//--STRIP +{{FILE:sfw/core/rect2i.h}} +//--STRIP +//#include "core/math_funcs.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/vector3.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/math_funcs.h" +//--STRIP +{{FILE:sfw/core/vector3i.h}} +//--STRIP +//#include "core/math_defs.h" +//#include "core/math_funcs.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/vector4.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/math_funcs.h" +//--STRIP +{{FILE:sfw/core/vector4i.h}} + +//--STRIP +//#include "core/vector3.h" +//--STRIP +{{FILE:sfw/core/plane.h}} +//--STRIP +//#include "core/math_defs.h" +//#include "core/plane.h" +//#include "core/vector3.h" +//--STRIP +{{FILE:sfw/core/aabb.h}} +//--STRIP +//#include "core/aabb.h" +//#include "core/plane.h" +//#include "core/transform.h" +//#include "core/vector3.h" +//--STRIP +{{FILE:sfw/core/face3.h}} +//--STRIP +//#include "core/math_defs.h" +//#include "core/math_funcs.h" +//#include "core/vector3.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/quaternion.h}} +//--STRIP +//#include "core/vector.h" +//#include "core/math_defs.h" +//#include "core/vector3.h" +//#include "core/math_defs.h" +//#include "core/math_funcs.h" +//#include "core/ustring.h" +//#include "core/vector4.h" +//--STRIP +{{FILE:sfw/core/projection.h}} +//--STRIP +//#include "core/quaternion.h" +//#include "core/vector3.h" +//#include "core/vector3i.h" +//--STRIP +{{FILE:sfw/core/basis.h}} + +//--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 +{{FILE:sfw/core/transform_2d.h}} +//--STRIP +//#include "core/aabb.h" +//#include "core/basis.h" +//#include "core/plane.h" +//#include "core/vector3i.h" +//#include "core/pool_vector.h" +//--STRIP +{{FILE:sfw/core/transform.h}} + +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/pcg.h}} +//--STRIP +//#include "core/math_defs.h" +//#include "core/pcg.h" +//--STRIP +{{FILE:sfw/core/random_pcg.h}} + +//--STRIP +//hashfuncs.h Needs most math classes +//--STRIP //--STRIP //#include "core/aabb.h" @@ -111,13 +368,8 @@ SOFTWARE. {{FILE:sfw/core/hashfuncs.h}} //--STRIP -//#include "core/int_types.h" +//Containers that need hashfuncs.h //--STRIP -{{FILE:sfw/core/stime.h}} -//--STRIP -//no includes -//--STRIP -{{FILE:sfw/core/logger.h}} //--STRIP //#include "core/hashfuncs.h" @@ -125,28 +377,6 @@ SOFTWARE. //--STRIP {{FILE:sfw/core/pair.h}} //--STRIP -//#include "core/error_list.h" -//#include "core/error_macros.h" -//#include "core/memory.h" -//#include "core/safe_refcount.h" -//--STRIP -{{FILE:sfw/core/cowdata.h}} -//--STRIP -//#include "core/error_macros.h" -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/core/sort_array.h}} -//--STRIP -//#include "cowdata.h" -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/core/vmap.h}} -//--STRIP -//#include "core/error_macros.h" -//#include "core/memory.h" -//--STRIP -{{FILE:sfw/core/rb_map.h}} -//--STRIP //#include "core/hashfuncs.h" //#include "core/list.h" //#include "core/error_macros.h" @@ -156,17 +386,11 @@ SOFTWARE. //--STRIP {{FILE:sfw/core/og_hash_map.h}} //--STRIP -//#include "core/vector.h" -//#include "core/typedefs.h" +//#include "core/list.h" +//#include "core/og_hash_map.h" +//#include "core/pair.h" //--STRIP -{{FILE:sfw/core/vset.h}} -//--STRIP -//#include "cowdata.h" -//#include "core/sort_array.h" -//#include "core/error_macros.h" -//#include "core/memory.h" -//--STRIP -{{FILE:sfw/core/vector.h}} +{{FILE:sfw/core/ordered_hash_map.h}} //--STRIP //#include "core/hashfuncs.h" //#include "paged_allocator.h" @@ -177,226 +401,55 @@ SOFTWARE. //--STRIP {{FILE:sfw/core/hash_map.h}} //--STRIP -//#include "core/vector.h" -//--STRIP -{{FILE:sfw/core/ring_buffer.h}} -//--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 -{{FILE:sfw/core/pool_vector.h}} -//--STRIP -//#include "core/memory.h" -//#include "spin_lock.h" -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/core/paged_allocator.h}} -//--STRIP -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/core/pool_allocator.h}} -//--STRIP -//#include "core/sort_array.h" -//#include "core/error_macros.h" -//#include "core/memory.h" -//--STRIP -{{FILE:sfw/core/list.h}} -//--STRIP //#include "core/hash_map.h" //#include "core/hashfuncs.h" //#include "core/math_funcs.h" //#include "core/memory.h" //--STRIP {{FILE:sfw/core/hash_set.h}} -//--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 -{{FILE:sfw/core/tight_local_vector.h}} -//--STRIP -//#include "core/memory.h" -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/core/rb_set.h}} -//--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 -{{FILE:sfw/core/local_vector.h}} -//--STRIP -//#include "core/list.h" -//#include "core/og_hash_map.h" -//#include "core/pair.h" -//--STRIP -{{FILE:sfw/core/ordered_hash_map.h}} //--STRIP -//#include "core/mutex.h" -//#include "core/safe_refcount.h" -//#include "core/ustring.h" +//=================== OBJECT SECTION =================== //--STRIP -{{FILE:sfw/core/string_name.h}} //--STRIP -//#include "core/typedefs.h" +//Dependencyless stuff //--STRIP -{{FILE:sfw/core/char_range.inc}} -//--STRIP -//#include "core/typedefs.h" -//#include "core/char_range.inc" -//--STRIP -{{FILE:sfw/core/char_utils.h}} -//--STRIP -//#include "cowdata.h" -//#include "core/vector.h" -//#include "char_utils.h" -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/core/ustring.h}} -//--STRIP -//#include "core/math_funcs.h" -//#include "core/ustring.h" -//--STRIP -{{FILE:sfw/core/color.h}} - -//--STRIP -//#include "core/math_funcs.h" -//#include "core/ustring.h" -//--STRIP -{{FILE:sfw/core/vector3.h}} - -//--STRIP -//#include "core/vector3.h" -//--STRIP -{{FILE:sfw/core/plane.h}} -//--STRIP -//#include "core/math_defs.h" -//#include "core/plane.h" -//#include "core/vector3.h" -//--STRIP -{{FILE:sfw/core/aabb.h}} - -//--STRIP -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/core/pcg.h}} - -//--STRIP -//#include "core/math_defs.h" -//#include "core/pcg.h" -//--STRIP -{{FILE:sfw/core/random_pcg.h}} - -//--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 -{{FILE:sfw/core/transform_2d.h}} -//--STRIP -//#include "core/math_funcs.h" -//#include "core/error_macros.h" -//--STRIP -{{FILE:sfw/core/vector2.h}} -//--STRIP -//#include "core/error_macros.h" -//#include "core/math_funcs.h" -//#include "core/vector2.h" -//--STRIP -{{FILE:sfw/core/vector2i.h}} - -//--STRIP -//#include "core/math_defs.h" -//#include "core/math_funcs.h" -//#include "core/vector3.h" -//#include "core/ustring.h" -//--STRIP -{{FILE:sfw/core/quaternion.h}} - -//--STRIP -//#include "core/vector2.h" // also includes math_funcs and ustring -//#include "core/vector2i.h" -//--STRIP -{{FILE:sfw/core/rect2.h}} -//--STRIP -//#include "core/aabb.h" -//#include "core/plane.h" -//#include "core/transform.h" -//#include "core/vector3.h" -//--STRIP -{{FILE:sfw/core/face3.h}} -//--STRIP -//#include "core/math_defs.h" -//#include "core/math_funcs.h" -//#include "core/ustring.h" -//--STRIP -{{FILE:sfw/core/vector4.h}} -//--STRIP -//#include "core/vector2i.h" // also includes math_funcs and ustring -//--STRIP -{{FILE:sfw/core/rect2i.h}} -//--STRIP -//#include "core/vector.h" -//#include "core/math_defs.h" -//#include "core/vector3.h" -//#include "core/math_defs.h" -//#include "core/math_funcs.h" -//#include "core/ustring.h" -//#include "core/vector4.h" -//--STRIP -{{FILE:sfw/core/projection.h}} - -//--STRIP -//#include "core/error_macros.h" -//#include "core/math_funcs.h" -//--STRIP -{{FILE:sfw/core/vector3i.h}} -//--STRIP -//#include "core/error_macros.h" -//#include "core/math_funcs.h" -//--STRIP -{{FILE:sfw/core/vector4i.h}} -//--STRIP -//#include "core/quaternion.h" -//#include "core/vector3.h" -//#include "core/vector3i.h" -//--STRIP -{{FILE:sfw/core/basis.h}} -//--STRIP -//#include "core/aabb.h" -//#include "core/basis.h" -//#include "core/plane.h" -//#include "core/vector3i.h" -//#include "core/pool_vector.h" -//--STRIP -{{FILE:sfw/core/transform.h}} - -//--STRIP -//#include "core/hash_map.h" -//#include "core/rw_lock.h" -//#include "core/string_name.h" -//#include "core/ustring.h" -//#include "core/vector.h" -//#include "object/object_id.h" -//#include "object/variant.h" -//#include "object/dictionary.h" -//--STRIP -{{FILE:sfw/object/object.h}} //--STRIP //#include "core/typedefs.h" //--STRIP {{FILE:sfw/object/ref_ptr.h}} +//--STRIP +//#include "core/int_types.h" +//--STRIP +{{FILE:sfw/object/object_id.h}} +//--STRIP +//#include "core/memory.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/object/object_rc.h}} +//--STRIP +//#include "core/string_name.h" +//--STRIP +{{FILE:sfw/object/core_string_names.h}} + +//--STRIP +//Variants +//--STRIP + +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/object/array.h}} + +//--STRIP +//#include "core/list.h" +//#include "core/ustring.h" +//#include "object/array.h" +//--STRIP +{{FILE:sfw/object/dictionary.h}} + //--STRIP //#include "core/aabb.h" //#include "core/basis.h" @@ -419,37 +472,11 @@ SOFTWARE. //#include "object/object_id.h" //--STRIP {{FILE:sfw/object/variant.h}} + //--STRIP -//#include "core/list.h" -//#include "core/ustring.h" -//#include "object/array.h" +//Stuff that needs Variant //--STRIP -{{FILE:sfw/object/dictionary.h}} -//--STRIP -//#include "object/reference.h" -//#include "psignal.h" -//--STRIP -{{FILE:sfw/object/resource.h}} -//--STRIP -//#include "core/int_types.h" -//--STRIP -{{FILE:sfw/object/object_id.h}} -//--STRIP -//#include "core/memory.h" -//#include "core/typedefs.h" -//--STRIP -{{FILE:sfw/object/object_rc.h}} -//--STRIP -//#include "core/string_name.h" -//--STRIP -{{FILE:sfw/object/core_string_names.h}} -//--STRIP -//#include "core/memory.h" -//#include "core/safe_refcount.h" -//#include "object/object.h" -//#include "object/ref_ptr.h" -//--STRIP -{{FILE:sfw/object/reference.h}} + //--STRIP //#include "core/vector.h" //#include "core/ustring.h" @@ -457,10 +484,37 @@ SOFTWARE. //#include "object/reference.h" //--STRIP {{FILE:sfw/object/psignal.h}} + //--STRIP -//#include "core/typedefs.h" +//#include "core/hash_map.h" +//#include "core/rw_lock.h" +//#include "core/string_name.h" +//#include "core/ustring.h" +//#include "core/vector.h" +//#include "object/object_id.h" +//#include "object/variant.h" +//#include "object/dictionary.h" +//--STRIP +{{FILE:sfw/object/object.h}} + +//--STRIP +//#include "core/memory.h" +//#include "core/safe_refcount.h" +//#include "object/object.h" +//#include "object/ref_ptr.h" +//--STRIP +{{FILE:sfw/object/reference.h}} + +//--STRIP +//#include "object/reference.h" +//#include "psignal.h" +//--STRIP +{{FILE:sfw/object/resource.h}} + + +//--STRIP +//=================== RENDER CORE SECTION =================== //--STRIP -{{FILE:sfw/object/array.h}} //--STRIP //#include "core/projection.h" @@ -470,6 +524,8 @@ SOFTWARE. //#include "core/vector2.h" //--STRIP {{FILE:sfw/render_core/render_state.h}} + + //--STRIP //#include "core/color.h" //#include "core/rect2.h" @@ -479,6 +535,15 @@ SOFTWARE. //#include "core/vector2i.h" //--STRIP {{FILE:sfw/render_core/image.h}} +//--STRIP +//#include "core/vector2i.h" +//#include "object/resource.h" +//#include "render_core/3rd_glad.h" +//#include "render_core/image.h" +//--STRIP +{{FILE:sfw/render_core/texture.h}} + + //--STRIP //#include "core/vector.h" //#include "core/int_types.h" @@ -488,14 +553,53 @@ SOFTWARE. //--STRIP {{FILE:sfw/render_core/mesh.h}} //--STRIP +//{//{//FILE:sfw/render_core/primitive_meshes.h}} +//--STRIP +//--STRIP +//#include "render_core/mesh.h" +//--STRIP +{{FILE:sfw/render_core/mesh_utils.h}} + + +//--STRIP +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/render_core/keyboard.h}} +//--STRIP +//#include "core/transform_2d.h" +//#include "core/typedefs.h" +//#include "core/ustring.h" +//#include "object/resource.h" +//--STRIP +{{FILE:sfw/render_core/input_event.h}} +//--STRIP //#include "object/resource.h" //--STRIP {{FILE:sfw/render_core/shortcut.h}} //--STRIP +//#include "render_core/input_event.h" +//#include "object/object.h" +//#include "core/rb_map.h" +//--STRIP +{{FILE:sfw/render_core/input_map.h}} +//--STRIP +//#include "core/vector2i.h" +//#include "object/object.h" +//#include "core/rb_map.h" +//#include "core/rb_set.h" +//#include "core/thread_safe.h" +//#include "object/psignal.h" //#include "object/reference.h" //#include "render_core/input_event.h" //--STRIP -{{FILE:sfw/render_core/scene.h}} +{{FILE:sfw/render_core/input.h}} + + +//--STRIP +//#include "render_core/3rd_glad.h" +//#include "core/hash_map.h" +//--STRIP +{{FILE:sfw/render_core/shader.h}} //--STRIP //#include "core/projection.h" //#include "core/transform.h" @@ -510,75 +614,18 @@ SOFTWARE. //--STRIP {{FILE:sfw/render_core/color_material.h}} //--STRIP -//#include "core/transform_2d.h" -//#include "core/typedefs.h" -//#include "core/ustring.h" -//#include "object/resource.h" -//--STRIP -{{FILE:sfw/render_core/input_event.h}} -//--STRIP //#include "render_core/material.h" //#include "render_core/texture.h" //#include "render_core/render_state.h" //--STRIP {{FILE:sfw/render_core/color_material_2d.h}} //--STRIP -//#include "core/vector2i.h" -//#include "object/resource.h" -//#include "render_core/3rd_glad.h" -//#include "render_core/image.h" -//--STRIP -{{FILE:sfw/render_core/texture.h}} -//--STRIP //#include "render_core/material.h" //#include "render_core/texture.h" //#include "render_core/render_state.h" //--STRIP {{FILE:sfw/render_core/texture_material_2d.h}} //--STRIP -//#include "core/vector2i.h" -//#include "object/object.h" -//#include "core/rb_map.h" -//#include "core/rb_set.h" -//#include "core/thread_safe.h" -//#include "object/psignal.h" -//#include "object/reference.h" -//#include "render_core/input_event.h" -//--STRIP -{{FILE:sfw/render_core/input.h}} -//--STRIP -//#include "render_core/3rd_glad.h" -//#include "core/hash_map.h" -//--STRIP -{{FILE:sfw/render_core/shader.h}} -//--STRIP -//#include "render_core/input_event.h" -//#include "object/object.h" -//#include "core/rb_map.h" -//--STRIP -{{FILE:sfw/render_core/input_map.h}} -//--STRIP -//#include "render_core/material.h" -//#include "render_core/texture.h" -//#include "render_core/render_state.h" -//--STRIP -{{FILE:sfw/render_core/transparent_texture_material.h}} -//--STRIP -//#include "core/ustring.h" -//--STRIP -{{FILE:sfw/render_core/keyboard.h}} -//--STRIP -//{//{//FILE:sfw/render_core/primitive_meshes.h}} -//--STRIP - -//--STRIP -//#include "core/color.h" -//#include "core/ustring.h" -//#include "object/resource.h" -//#include "font_material.h" -//--STRIP -{{FILE:sfw/render_core/font.h}} -//--STRIP //#include "render_core/material.h" //#include "render_core/texture.h" //#include "render_core/render_state.h" @@ -591,16 +638,33 @@ SOFTWARE. //--STRIP {{FILE:sfw/render_core/colored_material.h}} //--STRIP -//#include "core/int_types.h" -//#include "object/object.h" +//#include "render_core/material.h" +//#include "render_core/texture.h" +//#include "render_core/render_state.h" +//--STRIP +{{FILE:sfw/render_core/font_material.h}} +//--STRIP +//#include "render_core/material.h" +//#include "render_core/texture.h" +//#include "render_core/render_state.h" +//--STRIP +{{FILE:sfw/render_core/transparent_texture_material.h}} + + +//--STRIP +//#include "core/color.h" +//#include "core/ustring.h" +//#include "object/resource.h" +//#include "font_material.h" +//--STRIP +{{FILE:sfw/render_core/font.h}} + + +//--STRIP //#include "object/reference.h" -//#include "render_core/scene.h" +//#include "render_core/input_event.h" //--STRIP -{{FILE:sfw/render_core/application.h}} -//--STRIP -//#include "render_core/mesh.h" -//--STRIP -{{FILE:sfw/render_core/mesh_utils.h}} +{{FILE:sfw/render_core/scene.h}} //--STRIP //#include "core/color.h" //#include "core/int_types.h" @@ -608,11 +672,17 @@ SOFTWARE. //--STRIP {{FILE:sfw/render_core/window.h}} //--STRIP -//#include "render_core/material.h" -//#include "render_core/texture.h" -//#include "render_core/render_state.h" +//#include "core/int_types.h" +//#include "object/object.h" +//#include "object/reference.h" +//#include "render_core/scene.h" +//--STRIP +{{FILE:sfw/render_core/application.h}} + + +//--STRIP +//=================== RENDER IMMEDIATE SECTION =================== //--STRIP -{{FILE:sfw/render_core/font_material.h}} //--STRIP //#include "core/color.h" @@ -626,19 +696,22 @@ SOFTWARE. {{FILE:sfw/render_immediate/renderer.h}} //--STRIP -//#include "render_objects/object_2d.h" +//=================== RENDER OBJCTS SECTION =================== +//--STRIP + +//--STRIP +//#include "object/object.h" //#include "core/transform_2d.h" -//#include "render_objects/mesh_instance_2d.h" //--STRIP -{{FILE:sfw/render_objects/sprite.h}} +{{FILE:sfw/render_objects/object_2d.h}} //--STRIP -//#include "core/vector.h" -//#include "render_objects/object_3d.h" -//#include "render_core/material.h" -//#include "render_core/mesh.h" +//#include "object/object.h" //#include "core/transform.h" //--STRIP -{{FILE:sfw/render_objects/mesh_instance_3d.h}} +{{FILE:sfw/render_objects/object_3d.h}} + + + //--STRIP //#include "render_core/3rd_glad.h" //#include "render_objects/object_2d.h" @@ -648,6 +721,19 @@ SOFTWARE. //--STRIP {{FILE:sfw/render_objects/camera_2d.h}} //--STRIP +//#include "core/vector.h" +//#include "render_core/material.h" +//#include "render_core/mesh.h" +//#include "core/transform.h" +//--STRIP +{{FILE:sfw/render_objects/mesh_instance_2d.h}} +//--STRIP +//#include "render_objects/object_2d.h" +//#include "core/transform_2d.h" +//#include "render_objects/mesh_instance_2d.h" +//--STRIP +{{FILE:sfw/render_objects/sprite.h}} +//--STRIP //#include "core/color.h" //#include "core/ustring.h" //#include "core/vector2.h" @@ -661,11 +747,8 @@ SOFTWARE. //#include "render_core/material.h" //--STRIP {{FILE:sfw/render_objects/tile_map.h}} -//--STRIP -//#include "object/object.h" -//#include "core/transform_2d.h" -//--STRIP -{{FILE:sfw/render_objects/object_2d.h}} + + //--STRIP //#include "render_objects/object_3d.h" //#include "render_core/3rd_glad.h" @@ -675,17 +758,13 @@ SOFTWARE. //--STRIP {{FILE:sfw/render_objects/camera_3d.h}} //--STRIP -//#include "object/object.h" -//#include "core/transform.h" -//--STRIP -{{FILE:sfw/render_objects/object_3d.h}} -//--STRIP //#include "core/vector.h" +//#include "render_objects/object_3d.h" //#include "render_core/material.h" //#include "render_core/mesh.h" //#include "core/transform.h" //--STRIP -{{FILE:sfw/render_objects/mesh_instance_2d.h}} +{{FILE:sfw/render_objects/mesh_instance_3d.h}} // expose glfw/glad apis