brossferatu/coven
Public Access
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvements

Browse Source
This commit is contained in:
Daniel Bross
2024-12-01 17:55:08 +01:00
parent 80de060002
commit 1077800334
6 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/entity.jai
View File

@@ -79,7 +79,7 @@ Entity :: struct {
// Physics
body : Physics_Body; @DontSerialize
collider : Collider; @DontSerialize
collider : Collider;
// End physics
#if NETWORKING {
@@ -174,6 +174,10 @@ mark_entity_deleted :: (e: *Entity) {
}
destroy_entity :: (e: *Entity) {
if e.collider.mesh.vertices.data != null {
array_free(e.collider.mesh.vertices);
}
for 0..e.renderable.num_nodes-1 {
node_data := e.renderable.nodes[it];

7
core/scene.jai
View File

@@ -124,6 +124,13 @@ unload_scene :: (scene: *Scene) {
free(scene);
}
switch_to_scene :: (scene_name: string) {
new_scene := load_scene(scene_name);
unload_scene(engine.current_scene);
engine.current_scene = new_scene;
}
reload_scene :: (scene: *Scene) {
name := copy_temporary_string(scene.name);
unload_scene(engine.current_scene);

29
metaprogram.jai
View File

@@ -92,12 +92,22 @@ generate_member_ui :: (type: *Type_Info_Struct, builder: *String_Builder, path:
}
if it.type.type == {
//case .STRUCT; {
// info_struct := cast(*Type_Info_Struct) it.type;
// generate_member_serialization(info_struct, builder, new_path);
//}
case .STRUCT; {
info_struct := cast(*Type_Info_Struct) it.type;
if info_struct.name == "Vector3" {
print_to_builder(builder, "\tui_vector_field(tprint(\"%\"), *e.%);\n", new_path, new_path);
} else {
generate_member_ui(info_struct, builder, new_path);
}
}
//case .BOOL; #through;
//case .FLOAT; #through;
case .STRING; {
print_to_builder(builder, "\tui_textfield(tprint(\"%\"), *e.%);\n", new_path, new_path);
//ui_textfield :: (label: string, text: *string, identifier: s64 = 0, loc := #caller_location) {
}
case .FLOAT; {
print_to_builder(builder, "\tui_float_field(tprint(\"%\"), *e.%);\n", new_path, new_path);
}
//case .ENUM; #through;
case .INTEGER; {
print_to_builder(builder, "\tui_int_field(tprint(\"%\"), *e.%);\n", new_path, new_path);
@@ -122,6 +132,9 @@ generate_member_serialization :: (type: *Type_Info_Struct, builder: *String_Buil
info_struct := cast(*Type_Info_Struct) it.type;
generate_member_serialization(info_struct, builder, new_path);
}
case .STRING; {
print_to_builder(builder, "\tprint_to_builder(builder, \"%: \%\\n\", e.%);\n", new_path, new_path);
}
case .BOOL; #through;
case .FLOAT; #through;
case .ENUM; #through;
@@ -147,6 +160,10 @@ generate_member_deserialization :: (type: *Type_Info_Struct, builder: *String_Bu
info_struct := cast(*Type_Info_Struct) it.type;
generate_member_deserialization(info_struct, builder, new_path);
}
case .STRING; {
print_to_builder(builder, "\t\t\t\tcase \"%\";\n", new_path);
print_to_builder(builder, "\t\t\t\tif values[1].count > 0 { e.%1 = copy_string(trim(values[1])); }\n", new_path);
}
case .BOOL; #through;
case .FLOAT; #through;
case .ENUM; #through;
@@ -428,7 +445,7 @@ generate_code :: (w: Workspace) {
add_build_string(build_string, w);
// We'll print out the added code just to show at compile-time what we are doing:
print("Adding build string:\n%\n", build_string);
//print("Adding build string:\n%\n", build_string);
}
generated_code := false;

6
module.jai
View File

@@ -36,6 +36,8 @@ Engine_Core :: struct {
procs: struct {
on_scene_loaded: (*Scene, Engine_Mode);
on_pre_scene_loaded: (*Scene, Engine_Mode);
on_trigger_enter: (*Entity, *Entity);
on_trigger_exit: (*Entity, *Entity);
}
paused: bool;
@@ -115,6 +117,10 @@ coven_run :: (game_update_proc: (float), game_update_post_physics_proc: (float))
update_physics(engine.current_scene, clamped_dt);
game_update_post_physics_proc(clamped_dt);
}
} else {
if engine.current_scene != null {
update_trigger_mesh_colliders(engine.current_scene);
}
}
if engine.current_scene != null {

33
physics/physics.jai
View File

@@ -26,9 +26,6 @@ Trigger_Overlap :: struct {
MAX_TRIGGER_OVERLAPS :: 16;
on_trigger_enter_callback : (*Entity, *Entity);
on_trigger_exit_callback : (*Entity, *Entity);
Collision_Layers :: enum_flags {
NONE;
@@ -52,17 +49,17 @@ Collider :: struct {
layer: Collision_Layers = .LAYER1;
collides_with_layers: Collision_Layers = .LAYER1;
aabb: AABB;
override_aabb: bool;
aabb: AABB;
union {
sphere: Sphere;
mesh : Mesh_Collider;
sphere: Sphere; @DontSerialize
mesh : Mesh_Collider; @DontSerialize
}
overlaps: [MAX_TRIGGER_OVERLAPS] Trigger_Overlap;
num_overlaps: s64;
overlaps: [MAX_TRIGGER_OVERLAPS] Trigger_Overlap; @DontSerialize
num_overlaps: s64; @DontSerialize
ignore: bool;
ignore: bool; @DontSerialize
}
Physics_Body :: struct {
@@ -95,6 +92,16 @@ update_mesh_collider :: (e: *Entity) {
e.collider.mesh.is_baked = true;
}
update_trigger_mesh_colliders :: (scene: *Scene) {
for e: scene.entities {
if e.flags & .TRIGGER {
if e.collider.type == .MESH {
update_mesh_collider(e);
}
}
}
}
update_mesh_colliders :: (scene: *Scene) {
for e: scene.entities {
if e.flags & .COLLISION {
@@ -187,8 +194,8 @@ add_trigger_overlap_if_new :: (triggered_entity: *Entity, triggered_by_entity: *
}
}
if on_trigger_enter_callback != null {
on_trigger_enter_callback(triggered_entity, triggered_by_entity);
if engine.procs.on_trigger_enter != null {
engine.procs.on_trigger_enter(triggered_entity, triggered_by_entity);
}
triggered_entity.collider.overlaps[triggered_entity.collider.num_overlaps] = .{ triggered_by_entity, frame_index };
@@ -288,8 +295,8 @@ update_physics :: (scene: *Scene, dt: float) {
defer index += 1;
if e.collider.overlaps[index].frame_index < frame_index {
if on_trigger_exit_callback != null {
on_trigger_exit_callback(e, e.collider.overlaps[index].entity);
if engine.procs.on_trigger_exit != null {
engine.procs.on_trigger_exit(e, e.collider.overlaps[index].entity);
}
if e.collider.num_overlaps > 1 {

12
ui/widgets.jai
View File

@@ -285,6 +285,17 @@ ui_int_field :: (label: string, value: *int, identifier: s64 = 0, loc := #caller
ui_set_next_size_x(.CHILDREN_SUM, 1);
}
ui_float_field :: (label: string, value: *float, identifier: s64 = 0, loc := #caller_location) {
ui_container_layout(identifier=identifier, loc=loc);
ui_set_next_size_x(.CHILDREN_SUM);
ui_push_parent(ui_state.last_box, .LEFT, .HORIZONTAL);
{
ui_label(label);
ui_float_field(value, identifier);
}
ui_pop_parent();
}
ui_float_field :: (value: *float, identifier: s64 = 0, loc := #caller_location) {
ui_set_next_background_color(.{0.0,1.0,1.0,0.0});
ui_set_next_border_color(.{0.3,0.3,0.3,1.0});
@@ -350,6 +361,7 @@ ui_float_field :: (value: *float, identifier: s64 = 0, loc := #caller_location)
case "7";#through;
case "8";#through;
case "9";#through;
case "-";#through;
case "."; {
if !(text_str == "." && (array_contains(text_widget._number_text, #char ".") || text_widget._number_text.count == 0)) {
text_widget._number_text.data[text_widget._number_text.count] = text_str[0];