From: Brendan Hansen Date: Tue, 10 May 2022 01:54:49 +0000 (-0500) Subject: changed type_info to runtime.info X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=cbeef3f17a0c968b25f06194bd3b12b76b8a8d30;p=bar-game.git changed type_info to runtime.info --- diff --git a/src/entity/editor.onyx b/src/entity/editor.onyx index 47d57c8..54c49c2 100644 --- a/src/entity/editor.onyx +++ b/src/entity/editor.onyx @@ -10,6 +10,7 @@ use package core use package opengles use package glfw3 +#local type_info :: package runtime.info Editor_Range :: struct {min, max: f32;} Editor_Disabled :: struct {} diff --git a/src/entity/scene.onyx b/src/entity/scene.onyx index 77ce03d..cfcfad0 100644 --- a/src/entity/scene.onyx +++ b/src/entity/scene.onyx @@ -204,7 +204,7 @@ scene_create :: (width, height: f32) -> Scene { } #local scene_load_schematics :: (use this: ^Scene) { - use type_info; + use package runtime.info; index := 0; for type_table { @@ -234,7 +234,7 @@ scene_create :: (width, height: f32) -> Scene { comp_type := cast(type_expr) index; if !component_vtables->has(comp_type) { vtable := new(Component_Vtable, allocator=entity_allocator); - type_info.populate_struct_vtable(vtable, comp_type, safe=false); + (package runtime.info).populate_struct_vtable(vtable, comp_type, safe=false); component_vtables[comp_type] = vtable; } } @@ -272,6 +272,8 @@ scene_create_from_schematic :: (use this: ^Scene, schematic_name: str) -> ^Entit } scene_duplicate :: (use this: ^Scene, entity: ^Entity) -> ^Entity { + type_info :: package runtime.info + new_entity := this->make(); new_entity.flags = entity.flags; new_entity.schematic = entity.schematic; @@ -289,6 +291,8 @@ scene_duplicate :: (use this: ^Scene, entity: ^Entity) -> ^Entity { } scene_create_component :: (use this: ^Scene, component_type: type_expr) -> ^Component { + type_info :: package runtime.info + comp := cast(^Component) new(component_type, allocator=entity_allocator); comp.type = component_type; diff --git a/src/entity/store.onyx b/src/entity/store.onyx index 119ec47..b216ea4 100644 --- a/src/entity/store.onyx +++ b/src/entity/store.onyx @@ -15,7 +15,7 @@ scene_save_to_file :: (use this: ^Scene, filename: str) { // writer := ^stdio.print_writer; - use type_info; + use package runtime.info; for entities { info := cast(^Type_Info_Struct) get_type_info(it.schematic); @@ -38,7 +38,7 @@ scene_save_to_file :: (use this: ^Scene, filename: str) { } emit_struct_fields :: (v: any, dest: ^io.Writer, parent_name: str) { - use type_info; + use package runtime.info; info := cast(^Type_Info_Struct) get_type_info(v.type); assert(info.kind == .Struct, "Expected type to be a structure."); @@ -101,7 +101,7 @@ scene_load_from_file :: (use this: ^Scene, filename: str, reset_scene := true) { next_entity_id = 0; } - use type_info; + use package runtime.info; current_entity: ^Entity; current_component: ^Component; diff --git a/src/gfx/mesh.onyx b/src/gfx/mesh.onyx index db769a9..a269a7b 100644 --- a/src/gfx/mesh.onyx +++ b/src/gfx/mesh.onyx @@ -23,6 +23,7 @@ mesh_make :: (verticies: [] $T, indicies: [] u32, gl_hint := GL_STATIC_DRAW) -> glBindBuffer(GL_ARRAY_BUFFER, mesh.vertex_handle); glBufferData(GL_ARRAY_BUFFER, sizeof T * verticies.count, verticies.data, gl_hint); + type_info :: package runtime.info vertex_info := cast(^type_info.Type_Info_Struct) type_info.get_type_info(T); vertex_attr := 0; for attr: vertex_info.members { diff --git a/src/utils/any_utils.onyx b/src/utils/any_utils.onyx index f1d22ad..7ded215 100644 --- a/src/utils/any_utils.onyx +++ b/src/utils/any_utils.onyx @@ -18,7 +18,7 @@ ptr_to_any :: (x: ^$T) -> any { // symbols. // get_any_for_member :: (base: any, member_name: str) -> any { - use type_info; + use package runtime.info name := member_name; info := cast(^Type_Info_Struct) get_type_info(base.type); diff --git a/src/utils/asset_loader.onyx b/src/utils/asset_loader.onyx index ccf5f73..72abc95 100644 --- a/src/utils/asset_loader.onyx +++ b/src/utils/asset_loader.onyx @@ -25,7 +25,7 @@ load_assets :: () { } load_asset_bucket :: (bucket: ^Asset_Bucket_To_Load) { - use type_info; + use package runtime.info struct_info := cast(^Type_Info_Struct) get_type_info(bucket.type); if struct_info.kind != .Struct do return;