Skip to content

Commit dd8bbd4

Browse files
committed
Update demo
1 parent b68d5d4 commit dd8bbd4

File tree

5 files changed

+20
-9
lines changed

5 files changed

+20
-9
lines changed

deps/flecs.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16450,6 +16450,11 @@ ecs_observer_t* flecs_observer_init(
1645016450
"observers with only non-$this variable sources are not yet supported");
1645116451
(void)var_count;
1645216452

16453+
ecs_observable_t *observable = desc->observable;
16454+
if (!observable) {
16455+
observable = flecs_get_observable(world);
16456+
}
16457+
1645316458
o->run = desc->run;
1645416459
o->callback = desc->callback;
1645516460
o->ctx = desc->ctx;
@@ -16458,7 +16463,7 @@ ecs_observer_t* flecs_observer_init(
1645816463
o->ctx_free = desc->ctx_free;
1645916464
o->callback_ctx_free = desc->callback_ctx_free;
1646016465
o->run_ctx_free = desc->run_ctx_free;
16461-
o->observable = flecs_get_observable(world);
16466+
o->observable = observable;
1646216467
o->entity = entity;
1646316468
o->world = world;
1646416469
impl->term_index = desc->term_index_;
@@ -27417,7 +27422,6 @@ void flecs_rest_append_component_memory(
2741727422

2741827423
static
2741927424
void flecs_rest_append_component_traits(
27420-
ecs_world_t *world,
2742127425
ecs_component_record_t *cr,
2742227426
ecs_strbuf_t *reply)
2742327427
{
@@ -27459,7 +27463,7 @@ void flecs_rest_append_component_traits(
2745927463
ecs_strbuf_list_appendlit(reply, "\"Traversable\"");
2746027464
}
2746127465
if (flags & EcsPairIsTag) {
27462-
ecs_strbuf_list_appendlit(reply, "\"Tag\"");
27466+
ecs_strbuf_list_appendlit(reply, "\"PairIsTag\"");
2746327467
}
2746427468
if (flags & EcsIdWith) {
2746527469
ecs_strbuf_list_appendlit(reply, "\"With\"");
@@ -27587,7 +27591,7 @@ void flecs_rest_append_component(
2758727591
}
2758827592

2758927593
flecs_rest_append_component_memory(world, cr, reply, storage_bytes);
27590-
flecs_rest_append_component_traits(world, cr, reply);
27594+
flecs_rest_append_component_traits(cr, reply);
2759127595

2759227596
ecs_strbuf_list_pop(reply, "}");
2759327597
}

deps/flecs.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5124,8 +5124,14 @@ typedef struct ecs_observer_desc_t {
51245124
/** Callback to free run ctx. */
51255125
ecs_ctx_free_t run_ctx_free;
51265126

5127-
/** Used for internal purposes. Do not set. */
5127+
/** Observable with which to register the observer */
5128+
ecs_poly_t *observable;
5129+
5130+
/** Optional shared last event id for multiple observers. Ensures only one
5131+
* of the observers with the shared id gets triggered for an event */
51285132
int32_t *last_event_id;
5133+
5134+
/** Used for internal purposes */
51295135
int8_t term_index_;
51305136
ecs_flags32_t flags_;
51315137
} ecs_observer_desc_t;

etc/flecs_explorer.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

etc/flecs_explorer.wasm

4.2 KB
Binary file not shown.

etc/js/components/widgets/data-table.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<tr v-for="(row, i) in pagedData" :class="trCss(row)" @click="onSelect(row)">
3333
<td v-for="col in headers" :class="tdCss(i)">
3434
<template v-if="isEntity(col)">
35-
<template v-if="col.get(row) === '*' || col.get(row) === undefined">
35+
<template v-if="col.get(row) === undefined">
3636
<div class="data-table-none">
3737
None
3838
</div>
@@ -104,7 +104,8 @@ const limit = ref(50);
104104
const props = defineProps({
105105
headers: {type: Array, required: true },
106106
data: {type: Object, required: true },
107-
show_filter: {type: Boolean, required: false, default: false}
107+
show_filter: {type: Boolean, required: false, default: false},
108+
selectable: {type: Boolean, required: false, default: false}
108109
});
109110
110111
const filter = defineModel("filter");
@@ -242,7 +243,7 @@ function tdCss(i) {
242243
}
243244
244245
function trCss(result) {
245-
if (result.name) {
246+
if (props.selectable) {
246247
return "data-table-row-selectable";
247248
} else {
248249
return "";

0 commit comments

Comments
 (0)