berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

add Teapot.obj; fix Object Viewer

This commit is contained in:
nakst 2021-12-27 08:50:18 +00:00
parent 97830c84bf
commit db3f9584b2
2 changed files with 9968 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/mesa/obj_viewer.c
View File

@ -298,11 +298,11 @@ bool LoadModel(char *model, size_t modelBytes) {
return true; return true;
} }
int InstanceCallback(EsInstance *, EsMessage *message) { int InstanceCallback(EsInstance *instance, EsMessage *message) {
if (message->type == ES_MSG_INSTANCE_OPEN) { if (message->type == ES_MSG_INSTANCE_OPEN) {
size_t modelBytes; size_t modelBytes;
void *model = EsFileStoreReadAll(message->instanceOpen.file, &modelBytes); void *model = EsFileStoreReadAll(message->instanceOpen.file, &modelBytes);
EsInstanceOpenComplete(message, LoadModel(model, modelBytes), NULL, 0); EsInstanceOpenComplete(instance, message->instanceOpen.file, LoadModel(model, modelBytes), NULL, 0);
EsHeapFree(model, 0, NULL); EsHeapFree(model, 0, NULL);
loadedModel = true; loadedModel = true;
return ES_HANDLED; return ES_HANDLED;
@ -452,7 +452,7 @@ int main(int argc, char **argv) {
instance->callback = InstanceCallback; instance->callback = InstanceCallback;
EsWindowSetIcon(instance->window, ES_ICON_MODEL); EsWindowSetIcon(instance->window, ES_ICON_MODEL);
EsElement *canvas = EsCustomElementCreate(instance->window, ES_CELL_FILL, 0); EsElement *canvas = EsCustomElementCreate(instance->window, ES_CELL_FILL, 0);
canvas->messageUser = (EsUICallback) CanvasCallback; canvas->messageUser = (EsElementCallback) CanvasCallback;
EsElementStartAnimating(canvas); EsElementStartAnimating(canvas);
} }
} }

9965
res/Teapot.obj Normal file
View File

File diff suppressed because it is too large Load Diff